commit 308fe6285c74f44886741a5e867040329d671740 parent 64dc811f8af6c0968e262bbf67600e88284ba651 Author: PlutoTank <qwolkensperg@gmail.com> Date: Thu, 6 Feb 2020 20:58:14 -0500 Rotatable Scriptable Object logic added Diffstat:
15 files changed, 267 insertions(+), 151 deletions(-)
diff --git a/Assets/Prefabs/Slimes/Slime.prefab b/Assets/Prefabs/Slimes/Slime.prefab @@ -450,6 +450,7 @@ SkinnedMeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -873,7 +874,7 @@ Rigidbody: m_AngularDrag: 0.5 m_UseGravity: 1 m_IsKinematic: 0 - m_Interpolate: 0 + m_Interpolate: 1 m_Constraints: 80 m_CollisionDetection: 1 --- !u!65 &1562335568724729083 @@ -913,9 +914,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f000a30a6f766c54f9d7a83a0c226e75, type: 3} m_Name: m_EditorClassIdentifier: - rotSpeed: 6 - alignmentDamping: 0.2 - maxAngularVelocity: 14 + rotatableLogic: {fileID: 11400000, guid: 4dcab7b274e6dee409036e488bd1993f, type: 2} --- !u!114 &1533019556350475861 MonoBehaviour: m_ObjectHideFlags: 0 @@ -928,7 +927,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2ccd8232d0c288f46b989ad9148a12bb, type: 3} m_Name: m_EditorClassIdentifier: - movementSpeed: 10 + movementSpeed: 14 --- !u!114 &1963935554026982 MonoBehaviour: m_ObjectHideFlags: 0 @@ -971,8 +970,6 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!114 &8860697156266351435 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1028,31 +1025,25 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3} m_Name: m_EditorClassIdentifier: - m_Actions: {fileID: -944628639613478452, guid: e5353b3c2a300ce458b25d1e62215e9c, - type: 3} + m_Actions: {fileID: 0} m_NotificationBehavior: 2 m_UIInputModule: {fileID: 0} m_DeviceLostEvent: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.InputSystem.PlayerInput+DeviceLostEvent, Unity.InputSystem, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_DeviceRegainedEvent: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.InputSystem.PlayerInput+DeviceRegainedEvent, Unity.InputSystem, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_ControlsChangedEvent: + m_PersistentCalls: + m_Calls: [] m_ActionEvents: - m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.InputSystem.PlayerInput+ActionEvent, Unity.InputSystem, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_ActionId: 550962d9-e533-414f-aa32-f29e5dfa9019 m_ActionName: VSGameplay/Horizontal[/Keyboard/a,/Keyboard/d,/XInputControllerWindows/leftStick/left,/XInputControllerWindows/leftStick/right] - m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.InputSystem.PlayerInput+ActionEvent, Unity.InputSystem, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_ActionId: e4869e00-a1d9-457d-98b7-3520944918a3 m_ActionName: VSGameplay/Vertical[/Keyboard/s,/Keyboard/w,/XInputControllerWindows/leftStick/down,/XInputControllerWindows/leftStick/up] m_NeverAutoSwitchControlSchemes: 0 @@ -1711,6 +1702,7 @@ SkinnedMeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -7950,6 +7942,7 @@ ParticleSystemRenderer: m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 + m_RayTracingMode: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: diff --git a/Assets/Scripts/Slimecing/Characters/SlimeMovementController.cs b/Assets/Scripts/Slimecing/Characters/SlimeMovementController.cs @@ -1,7 +1,8 @@ -using Slimecing.SimpleComponents.Movement; +using Slimecing.Character; +using Slimecing.SimpleComponents.Movement; using UnityEngine; -namespace Slimecing.Character +namespace Slimecing.Characters { [RequireComponent(typeof(RbRotatable))] public class SlimeMovementController : CharacterMovementController @@ -17,15 +18,7 @@ namespace Slimecing.Character { Move(); - if (_move == Vector2.zero) - { - if (!_rotatable.StoppedAngVel) - { - //_rotatable.StopAngularVelocity(); - //Debug.Log("Stopping angular vel"); - } - } - else + if (_move != Vector2.zero) { _rotatable.RotateToVector(new Vector3(_move.x, 0, _move.y)); } diff --git a/Assets/Scripts/Slimecing/SimpleComponents/Movement/RbRotatable.cs b/Assets/Scripts/Slimecing/SimpleComponents/Movement/RbRotatable.cs @@ -1,77 +1,35 @@ using System; +using Slimecing.SimpleComponents.Movement.Rotatable_Types; using UnityEngine; +using UnityEngine.Serialization; namespace Slimecing.SimpleComponents.Movement { [RequireComponent(typeof(Rigidbody))] public class RbRotatable : MonoBehaviour { - [SerializeField] protected float rotSpeed; - [SerializeField] protected float alignmentDamping; - [SerializeField] private float maxAngularVelocity; - private bool _slowedAngVel; - private bool _stoppedAngVel; - private Rigidbody rb; - - public bool StoppedAngVel => _stoppedAngVel; + [SerializeField] private RotatableLogic rotatableLogic; + private RotatableLogic currentRotatableLogic; private void Awake() { - rb = GetComponent<Rigidbody>(); - rb.maxAngularVelocity = maxAngularVelocity; - } - - public void RotateToVector(Vector3 desiredLookAt) - { - Quaternion targetRotation = Quaternion.LookRotation(desiredLookAt); - - if (Quaternion.Angle(transform.rotation, targetRotation) < 13) - { - if (!_slowedAngVel) - { - SlowAngularVelocity(); - } - transform.rotation = Quaternion.Slerp(transform.rotation, targetRotation, rotSpeed); - return; - } - - if (_slowedAngVel) - _slowedAngVel = false; - if (_stoppedAngVel) - _stoppedAngVel = false; - - Quaternion deltaRotation = Quaternion.Inverse(transform.rotation) * targetRotation; - Vector3 deltaAngles = GetRelativeAngles(deltaRotation.eulerAngles); - Vector3 spaceDeltaAngles = transform.TransformDirection(deltaAngles); - Vector3 rotationVelocity = spaceDeltaAngles * rotSpeed * Time.deltaTime; - rb.AddTorque(rotationVelocity - rb.angularVelocity, ForceMode.Impulse); + InitializeRotatableLogic(); } - private Vector3 GetRelativeAngles(Vector3 angles) + private void InitializeRotatableLogic() { - Vector3 relativeAngles = angles; - if (relativeAngles.x > 180f) - relativeAngles.x -= 360f; - if (relativeAngles.y > 180f) - relativeAngles.y -= 360f; - if (relativeAngles.z > 180f) - relativeAngles.z -= 360f; - - return relativeAngles; + if (rotatableLogic == null) return; + Debug.Log("Stating Rotatable Logic"); + currentRotatableLogic = rotatableLogic; + rotatableLogic.Initialize(GetComponent<Rigidbody>(), transform); } - public void SlowAngularVelocity() - { - rb.angularVelocity *= 0.5f; - _slowedAngVel = true; - } - - public void StopAngularVelocity() + public void RotateToVector(Vector3 desiredLookAt) { - rb.angularVelocity = Vector3.zero; - _stoppedAngVel = true; + if (rotatableLogic == null) return; + if (rotatableLogic != currentRotatableLogic) InitializeRotatableLogic(); + rotatableLogic.RotateToVector(desiredLookAt); } - } } diff --git a/Assets/Scripts/Slimecing/SimpleComponents/Movement/Rotatable Types.meta b/Assets/Scripts/Slimecing/SimpleComponents/Movement/Rotatable Types.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 56969ed9b2a8fdc47b291a86da4c3679 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Slimecing/SimpleComponents/Movement/Rotatable Types/RotatableLogic.cs b/Assets/Scripts/Slimecing/SimpleComponents/Movement/Rotatable Types/RotatableLogic.cs @@ -0,0 +1,28 @@ +using UnityEngine; + +namespace Slimecing.SimpleComponents.Movement.Rotatable_Types +{ + public abstract class RotatableLogic : ScriptableObject + { + [SerializeField] protected float rotSpeed; + protected Rigidbody rb; + protected Transform objectTransform; + protected bool stoppedAngVel; + + public virtual void Initialize(Rigidbody rbody, Transform body) + { + rb = rbody; + objectTransform = body; + } + + public abstract void RotateToVector(Vector3 desiredLookAt); + + public void StopAngularVelocity() + { + if (rb == null) return; + rb.angularVelocity = Vector3.zero; + stoppedAngVel = true; + } + + } +} diff --git a/Assets/Scripts/Slimecing/SimpleComponents/Movement/Rotatable Types/RotatableLogic.cs.meta b/Assets/Scripts/Slimecing/SimpleComponents/Movement/Rotatable Types/RotatableLogic.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: dd890ad6e13ffe04fb3500ce4f510576 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Slimecing/SimpleComponents/Movement/Rotatable Types/SimpleRotatableLogicSO.cs b/Assets/Scripts/Slimecing/SimpleComponents/Movement/Rotatable Types/SimpleRotatableLogicSO.cs @@ -0,0 +1,14 @@ +using UnityEngine; + +namespace Slimecing.SimpleComponents.Movement.Rotatable_Types +{ + [CreateAssetMenu(fileName = "SimpleRotater", menuName = "Movement/Rotation/SimpleRotater")] + public class SimpleRotatableLogicSO : RotatableLogic + { + public override void RotateToVector(Vector3 desiredLookAt) + { + objectTransform.rotation = Quaternion.Slerp(objectTransform.rotation, + Quaternion.LookRotation(desiredLookAt), rotSpeed * Time.deltaTime); + } + } +} diff --git a/Assets/Scripts/Slimecing/SimpleComponents/Movement/Rotatable Types/SimpleRotatableLogicSO.cs.meta b/Assets/Scripts/Slimecing/SimpleComponents/Movement/Rotatable Types/SimpleRotatableLogicSO.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: fe77af1d41ef89041a3e262d9bbb6fea +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Slimecing/SimpleComponents/Movement/Rotatable Types/SimpleRotater.asset b/Assets/Scripts/Slimecing/SimpleComponents/Movement/Rotatable Types/SimpleRotater.asset @@ -0,0 +1,15 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe77af1d41ef89041a3e262d9bbb6fea, type: 3} + m_Name: SimpleRotater + m_EditorClassIdentifier: + rotSpeed: 6 diff --git a/Assets/Scripts/Slimecing/SimpleComponents/Movement/Rotatable Types/SimpleRotater.asset.meta b/Assets/Scripts/Slimecing/SimpleComponents/Movement/Rotatable Types/SimpleRotater.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4dcab7b274e6dee409036e488bd1993f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Slimecing/SimpleComponents/Movement/Rotatable Types/TorqueRotatableLogicSO.cs b/Assets/Scripts/Slimecing/SimpleComponents/Movement/Rotatable Types/TorqueRotatableLogicSO.cs @@ -0,0 +1,65 @@ +using UnityEngine; + +namespace Slimecing.SimpleComponents.Movement.Rotatable_Types +{ + [CreateAssetMenu(fileName = "TorqueRotater", menuName = "Movement/Rotation/TorqueRotater")] + public class TorqueRotatableLogicSO : RotatableLogic + { + [SerializeField] protected float alignmentDamping; + [SerializeField] private float maxAngularVelocity; + + private bool _slowedAngVel; + + public override void Initialize(Rigidbody rbody, Transform body) + { + rb = rbody; + objectTransform = body; + rb.maxAngularVelocity = maxAngularVelocity; + } + + public override void RotateToVector(Vector3 desiredLookAt) + { + Quaternion targetRotation = Quaternion.LookRotation(desiredLookAt); + + if (Quaternion.Angle(objectTransform.rotation, targetRotation) < 13) + { + if (!_slowedAngVel) + { + SlowAngularVelocity(); + } + objectTransform.rotation = Quaternion.Slerp(objectTransform.rotation, targetRotation, rotSpeed); + return; + } + + if (_slowedAngVel) + _slowedAngVel = false; + if (stoppedAngVel) + stoppedAngVel = false; + + Quaternion deltaRotation = Quaternion.Inverse(objectTransform.rotation) * targetRotation; + Vector3 deltaAngles = GetRelativeAngles(deltaRotation.eulerAngles); + Vector3 spaceDeltaAngles = objectTransform.TransformDirection(deltaAngles); + Vector3 rotationVelocity = rotSpeed * Time.deltaTime * spaceDeltaAngles; + rb.AddTorque(rotationVelocity - rb.angularVelocity, ForceMode.Impulse); + } + + private Vector3 GetRelativeAngles(Vector3 angles) + { + Vector3 relativeAngles = angles; + if (relativeAngles.x > 180f) + relativeAngles.x -= 360f; + if (relativeAngles.y > 180f) + relativeAngles.y -= 360f; + if (relativeAngles.z > 180f) + relativeAngles.z -= 360f; + + return relativeAngles; + } + + private void SlowAngularVelocity() + { + rb.angularVelocity *= 0.5f; + _slowedAngVel = true; + } + } +} diff --git a/Assets/Scripts/Slimecing/SimpleComponents/Movement/Rotatable Types/TorqueRotatableLogicSO.cs.meta b/Assets/Scripts/Slimecing/SimpleComponents/Movement/Rotatable Types/TorqueRotatableLogicSO.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 1b92bac0fbcf050478e0937a4f4ddfac +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Slimecing/SimpleComponents/Movement/Rotatable Types/TorqueRotater.asset b/Assets/Scripts/Slimecing/SimpleComponents/Movement/Rotatable Types/TorqueRotater.asset @@ -0,0 +1,17 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b92bac0fbcf050478e0937a4f4ddfac, type: 3} + m_Name: TorqueRotater + m_EditorClassIdentifier: + rotSpeed: 6 + alignmentDamping: 0.2 + maxAngularVelocity: 14 diff --git a/Assets/Scripts/Slimecing/SimpleComponents/Movement/Rotatable Types/TorqueRotater.asset.meta b/Assets/Scripts/Slimecing/SimpleComponents/Movement/Rotatable Types/TorqueRotater.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 947a0ce24b800da4dac9f191823c3f2d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_Scenes/TestScene.unity b/Assets/_Scenes/TestScene.unity @@ -96,6 +96,7 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaAO: 1 m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} m_UseShadowmask: 1 --- !u!196 &4 @@ -166,8 +167,6 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 0 - m_TypeName: Slimecing.SOEventSystem.UnityEvents.UnityTriggerEvent, Assembly-CSharp, - Version=0.0.0.0, Culture=neutral, PublicKeyToken=null --- !u!114 &28711379 MonoBehaviour: m_ObjectHideFlags: 0 @@ -221,8 +220,6 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 0 - m_TypeName: Slimecing.SOEventSystem.UnityEvents.UnityCollisionEvent, Assembly-CSharp, - Version=0.0.0.0, Culture=neutral, PublicKeyToken=null --- !u!1001 &165370663 PrefabInstance: m_ObjectHideFlags: 0 @@ -230,6 +227,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 1450437300, guid: e4b1cb76851c2d54eaa71187b01811dd, type: 3} + propertyPath: m_Camera + value: + objectReference: {fileID: 619456896} - target: {fileID: 1531394410883810673, guid: e4b1cb76851c2d54eaa71187b01811dd, type: 3} propertyPath: m_Name @@ -290,35 +291,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 1079583451375536456, guid: e4b1cb76851c2d54eaa71187b01811dd, - type: 3} - propertyPath: m_Enabled - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1450437300, guid: e4b1cb76851c2d54eaa71187b01811dd, type: 3} - propertyPath: m_Camera - value: - objectReference: {fileID: 619456896} - - target: {fileID: 1551138524290547143, guid: e4b1cb76851c2d54eaa71187b01811dd, - type: 3} - propertyPath: m_Interpolate - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4936583700566548586, guid: e4b1cb76851c2d54eaa71187b01811dd, - type: 3} - propertyPath: rotSpeed - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 4936583700566548586, guid: e4b1cb76851c2d54eaa71187b01811dd, - type: 3} - propertyPath: alignmentDamping - value: 0.2 - objectReference: {fileID: 0} - - target: {fileID: 4936583700566548586, guid: e4b1cb76851c2d54eaa71187b01811dd, - type: 3} - propertyPath: maxAngularVelocity - value: 14 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e4b1cb76851c2d54eaa71187b01811dd, type: 3} --- !u!1 &364079739 @@ -381,6 +353,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -473,6 +446,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -565,6 +539,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -643,6 +618,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -734,8 +710,6 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_TypeName: Slimecing.SOEventSystem.UnityEvents.UnityGameObjectEvent, Assembly-CSharp, - Version=0.0.0.0, Culture=neutral, PublicKeyToken=null --- !u!114 &619456894 MonoBehaviour: m_ObjectHideFlags: 0 @@ -763,8 +737,6 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_TypeName: Slimecing.SOEventSystem.UnityEvents.UnityGameObjectEvent, Assembly-CSharp, - Version=0.0.0.0, Culture=neutral, PublicKeyToken=null --- !u!20 &619456896 stripped Camera: m_CorrespondingSourceObject: {fileID: 20959982129881372, guid: 527f194984da0eb4082c0dca4748d5aa, @@ -817,6 +789,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -888,8 +861,9 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 640845172} m_Enabled: 1 - serializedVersion: 9 + serializedVersion: 10 m_Type: 1 + m_Shape: 0 m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} m_Intensity: 1 m_Range: 10 @@ -1056,6 +1030,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1148,6 +1123,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1187,6 +1163,26 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 697181799} m_Modifications: + - target: {fileID: 4085933206505632715, guid: 9f43c038616794d4499e7810e8b5a1cf, + type: 3} + propertyPath: m_Size.y + value: 35 + objectReference: {fileID: 0} + - target: {fileID: 4085933206505632715, guid: 9f43c038616794d4499e7810e8b5a1cf, + type: 3} + propertyPath: m_Center.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4085933206505632715, guid: 9f43c038616794d4499e7810e8b5a1cf, + type: 3} + propertyPath: m_Size.z + value: 85 + objectReference: {fileID: 0} + - target: {fileID: 4085933206505632715, guid: 9f43c038616794d4499e7810e8b5a1cf, + type: 3} + propertyPath: m_Size.x + value: 85 + objectReference: {fileID: 0} - target: {fileID: 4917678568368033409, guid: 9f43c038616794d4499e7810e8b5a1cf, type: 3} propertyPath: m_Name @@ -1252,26 +1248,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4085933206505632715, guid: 9f43c038616794d4499e7810e8b5a1cf, - type: 3} - propertyPath: m_Size.y - value: 35 - objectReference: {fileID: 0} - - target: {fileID: 4085933206505632715, guid: 9f43c038616794d4499e7810e8b5a1cf, - type: 3} - propertyPath: m_Center.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4085933206505632715, guid: 9f43c038616794d4499e7810e8b5a1cf, - type: 3} - propertyPath: m_Size.z - value: 85 - objectReference: {fileID: 0} - - target: {fileID: 4085933206505632715, guid: 9f43c038616794d4499e7810e8b5a1cf, - type: 3} - propertyPath: m_Size.x - value: 85 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9f43c038616794d4499e7810e8b5a1cf, type: 3} --- !u!4 &1313295119 stripped @@ -1357,6 +1333,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1479,6 +1456,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1571,6 +1549,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1663,6 +1642,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1742,8 +1722,6 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_TypeName: UnityEngine.InputSystem.PlayerInputManager+PlayerJoinedEvent, Unity.InputSystem, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_PlayerLeftEvent: m_PersistentCalls: m_Calls: @@ -1758,8 +1736,6 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_TypeName: UnityEngine.InputSystem.PlayerInputManager+PlayerLeftEvent, Unity.InputSystem, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_JoinAction: m_UseReference: 0 m_Action: @@ -1806,11 +1782,6 @@ PrefabInstance: propertyPath: m_Name value: Camera objectReference: {fileID: 0} - - target: {fileID: 114368316905943310, guid: 527f194984da0eb4082c0dca4748d5aa, - type: 3} - propertyPath: players.Array.data[0] - value: - objectReference: {fileID: 0} - target: {fileID: 4234973402822312, guid: 527f194984da0eb4082c0dca4748d5aa, type: 3} propertyPath: m_LocalPosition.x value: 5.34 @@ -1855,5 +1826,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 114368316905943310, guid: 527f194984da0eb4082c0dca4748d5aa, + type: 3} + propertyPath: players.Array.data[0] + value: + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 527f194984da0eb4082c0dca4748d5aa, type: 3}