diff --git a/Assets/jelycho/Code/Player/FPPCamera.cs b/Assets/jelycho/Code/Player/FPPCamera.cs index f521532..04a6af4 100644 --- a/Assets/jelycho/Code/Player/FPPCamera.cs +++ b/Assets/jelycho/Code/Player/FPPCamera.cs @@ -86,6 +86,14 @@ namespace RebootReality.jelycho.Player { Pitch = Mathf.Clamp(Pitch, m_PitchMin, m_PitchMax); Yaw += x * sens; + + while (Yaw < 0.0f) { + Yaw += 360.0f; + } + + while (Yaw > 360.0f) { + Yaw -= 360.0f; + } } public void SetLookDirection(Vector3 forward) { diff --git a/Assets/jelycho/Code/Player/PlayerActor.cs b/Assets/jelycho/Code/Player/PlayerActor.cs index 19246fc..6fc9ae4 100755 --- a/Assets/jelycho/Code/Player/PlayerActor.cs +++ b/Assets/jelycho/Code/Player/PlayerActor.cs @@ -1,6 +1,7 @@ -using System.Collections.Generic; -using Oddworm.Framework; +using System; +using System.Collections.Generic; using R3; +using RebootKit.Engine.Extensions; using RebootKit.Engine.Main; using RebootKit.Engine.Network; using RebootKit.Engine.Simulation; @@ -115,7 +116,7 @@ namespace RebootReality.jelycho.Player { } } - List m_AdditionalMountedActor = new List(); + readonly List m_AdditionalMountedActor = new List(); protected override IActorData CreateActorData() { return new PlayerActorData { }; @@ -640,7 +641,7 @@ namespace RebootReality.jelycho.Player { m_CameraBobbingTransitionSpeed * deltaTime); // m_Camera.SetBobbing(m_CurrentCameraBobbing); m_Camera.SetBobbing(0.0f); - + // m_CameraSpring.UpdateSpring(deltaTime, // m_CharacterForwardTransform.up, // m_CharacterForwardTransform.right, @@ -825,6 +826,9 @@ namespace RebootReality.jelycho.Player { // @MARK: Common // void TickCharacterRotation(float dt) { + float3 targetCharacterForward = math.normalize(LookDirection.With(y: 0.0f)); + float3 currentCharacterForward = math.normalize(m_CharacterForwardTransform.forward.With(y: 0.0f)); + float angleDeg = Mathf.DeltaAngle(m_Camera.Yaw, m_Locomotion.YawRotation); bool rotateCharacter = false; @@ -845,14 +849,21 @@ namespace RebootReality.jelycho.Player { if (!rotateCharacter && math.abs(velocityForward) > 0.01f) { rotateCharacter = true; } - + if (rotateCharacter) { m_CharacterTurnVelocity = rotateCharacterSpeed * dt; m_CharacterTurnVelocitySmooth = m_CharacterTurnVelocity; + // var newForward = Vector3.RotateTowards(currentCharacterForward, + // targetCharacterForward, + // math.radians(m_CharacterTurnVelocity), + // 0.0f); + // m_CharacterForwardTransform.forward = newForward; + float newYaw = Mathf.MoveTowardsAngle(m_Locomotion.YawRotation, m_Camera.Yaw, m_CharacterTurnVelocity); + newYaw = m_Camera.Yaw; // s_Logger.Info($"YAW: {newYaw}"); m_Locomotion.YawRotation = newYaw; } diff --git a/Assets/jelycho/Code/Player/PlayerAnimator.cs b/Assets/jelycho/Code/Player/PlayerAnimator.cs index a948032..104512a 100644 --- a/Assets/jelycho/Code/Player/PlayerAnimator.cs +++ b/Assets/jelycho/Code/Player/PlayerAnimator.cs @@ -104,7 +104,7 @@ namespace RebootReality.jelycho.Player { var strafeLeftPlayable = AnimationClipPlayable.Create(graph, m_StrafeLeftClip); var turnRightPlayable = AnimationClipPlayable.Create(graph, m_TurnRightClip); var turnLeftPlayable = AnimationClipPlayable.Create(graph, m_TurnLeftClip); - + m_Mixer.ConnectInput(0, idlePlayable, 0, 1.0f); m_Mixer.ConnectInput(1, runForwardPlayable, 0, 0.0f); m_Mixer.ConnectInput(2, runBackwardsPlayable, 0, 0.0f); diff --git a/Assets/jelycho/Worlds/dev/scn_map_dev.unity b/Assets/jelycho/Worlds/dev/scn_map_dev.unity index 9082849..c6c2572 100644 --- a/Assets/jelycho/Worlds/dev/scn_map_dev.unity +++ b/Assets/jelycho/Worlds/dev/scn_map_dev.unity @@ -2200,6 +2200,37 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 90, y: 0, z: 90} +--- !u!1 &609498660 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 609498661} + m_Layer: 7 + m_Name: Character Look Forward + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &609498661 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 609498660} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1.25, y: 0, z: 0.472} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 324963253396746438} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &622122863 GameObject: m_ObjectHideFlags: 0 @@ -5855,6 +5886,150 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d2b9417a775b0c240ae113df746b9470, type: 3} +--- !u!1 &3932872693167015 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7644568519421315996} + - component: {fileID: 7809623816046939342} + m_Layer: 7 + m_Name: asrc_footstep + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &99598591642097643 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7948159831234974209} + serializedVersion: 2 + m_LocalRotation: {x: -0.050292086, y: 0.048715312, z: -0.6940488, w: -0.71651495} + m_LocalPosition: {x: 0.0142, y: 0.0923, z: 0.0251} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4576733507724330996} + m_LocalEulerAnglesHint: {x: 171.97, y: 180, z: -91.82501} +--- !u!1 &181326564235970392 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 718478511977106825} + - component: {fileID: 2501403851517987837} + m_Layer: 7 + m_Name: Head Aim + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &324963253396746438 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4273128337990293631} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 19.24534, y: 0.5, z: -17.375595} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4208645513262253616} + - {fileID: 7488198725507576124} + - {fileID: 609498661} + - {fileID: 4576733507724331008} + - {fileID: 7644568519421315996} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &718478511977106825 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 181326564235970392} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1.539, z: 1.03} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2941215237091855643} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &772258152550737563 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4576733507724330955} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fd9bb0d58ecf466d8fe6d4cd19b51e5c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_AudioSource: {fileID: 7809623816046939342} +--- !u!1 &1129611344868787608 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7488198725507576124} + m_Layer: 7 + m_Name: Character Forward + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &1243501412143149474 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4959437352305364523} + m_Layer: 7 + m_Name: hand_right_slot_dagger + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1315621045141192215 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8903513239504561363} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2941215237091855643} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1945001101671076745 PrefabInstance: m_ObjectHideFlags: 0 @@ -5912,6 +6087,60 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f6c7f1f3dc685c4448356f4ea740544b, type: 3} +--- !u!114 &2121855616852686240 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7109033839808684458} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e3c430f382484144e925c097c2d33cfe, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Weight: 1 + m_Data: + m_ConstrainedObject: {fileID: 4576733507724331004} + m_SourceObjects: + m_Length: 1 + m_Item0: + transform: {fileID: 4208645513262253616} + weight: 1 + m_Item1: + transform: {fileID: 0} + weight: 0 + m_Item2: + transform: {fileID: 0} + weight: 0 + m_Item3: + transform: {fileID: 0} + weight: 0 + m_Item4: + transform: {fileID: 0} + weight: 0 + m_Item5: + transform: {fileID: 0} + weight: 0 + m_Item6: + transform: {fileID: 0} + weight: 0 + m_Item7: + transform: {fileID: 0} + weight: 0 + m_Offset: {x: 0, y: 0, z: 0} + m_MinLimit: -10 + m_MaxLimit: 10 + m_AimAxis: 4 + m_UpAxis: 2 + m_WorldUpType: 0 + m_WorldUpObject: {fileID: 0} + m_WorldUpAxis: 2 + m_MaintainOffset: 0 + m_ConstrainedAxes: + x: 1 + y: 1 + z: 0 --- !u!1001 &2226069322246609429 PrefabInstance: m_ObjectHideFlags: 0 @@ -5989,6 +6218,197 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0df53bd579ab9f243a72724eb9876498, type: 3} +--- !u!114 &2486395001432189757 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3324667285387657420} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 70b342d8ce5c2fd48b8fa3147d48d1d1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Weight: 1 + m_Effectors: [] +--- !u!114 &2487073196171222364 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3336373662471273737} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e3c430f382484144e925c097c2d33cfe, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Weight: 1 + m_Data: + m_ConstrainedObject: {fileID: 4576733507724331003} + m_SourceObjects: + m_Length: 1 + m_Item0: + transform: {fileID: 4208645513262253616} + weight: 1 + m_Item1: + transform: {fileID: 0} + weight: 0 + m_Item2: + transform: {fileID: 0} + weight: 0 + m_Item3: + transform: {fileID: 0} + weight: 0 + m_Item4: + transform: {fileID: 0} + weight: 0 + m_Item5: + transform: {fileID: 0} + weight: 0 + m_Item6: + transform: {fileID: 0} + weight: 0 + m_Item7: + transform: {fileID: 0} + weight: 0 + m_Offset: {x: 0, y: 0, z: 0} + m_MinLimit: -15 + m_MaxLimit: 15 + m_AimAxis: 4 + m_UpAxis: 2 + m_WorldUpType: 0 + m_WorldUpObject: {fileID: 0} + m_WorldUpAxis: 2 + m_MaintainOffset: 0 + m_ConstrainedAxes: + x: 1 + y: 1 + z: 0 +--- !u!114 &2501403851517987837 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 181326564235970392} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e3c430f382484144e925c097c2d33cfe, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Weight: 1 + m_Data: + m_ConstrainedObject: {fileID: 4576733507724331000} + m_SourceObjects: + m_Length: 1 + m_Item0: + transform: {fileID: 4208645513262253616} + weight: 1 + m_Item1: + transform: {fileID: 0} + weight: 0 + m_Item2: + transform: {fileID: 0} + weight: 0 + m_Item3: + transform: {fileID: 0} + weight: 0 + m_Item4: + transform: {fileID: 0} + weight: 0 + m_Item5: + transform: {fileID: 0} + weight: 0 + m_Item6: + transform: {fileID: 0} + weight: 0 + m_Item7: + transform: {fileID: 0} + weight: 0 + m_Offset: {x: 0, y: 0, z: 0} + m_MinLimit: -180 + m_MaxLimit: 180 + m_AimAxis: 4 + m_UpAxis: 2 + m_WorldUpType: 1 + m_WorldUpObject: {fileID: 0} + m_WorldUpAxis: 2 + m_MaintainOffset: 0 + m_ConstrainedAxes: + x: 1 + y: 1 + z: 1 +--- !u!1 &2526454673669709653 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7802640181365859200} + - component: {fileID: 3135169804875755412} + m_Layer: 7 + m_Name: Spine2 Aim X + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2613042493795146389 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8408927116131674345} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2941215237091855643} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2672001727532698603 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4576733507724330955} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fff0960ef4ea6e04eac66b4a7fd2189d, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RigLayers: + - m_Rig: {fileID: 2486395001432189757} + m_Active: 1 + m_Effectors: [] +--- !u!4 &2941215237091855643 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3324667285387657420} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2613042493795146389} + - {fileID: 3748194455723732375} + - {fileID: 7506077225381353461} + - {fileID: 7802640181365859200} + - {fileID: 1315621045141192215} + - {fileID: 718478511977106825} + m_Father: {fileID: 4576733507724331008} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &3026954056875179785 PrefabInstance: m_ObjectHideFlags: 0 @@ -6046,6 +6466,77 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: af74bf895bdf3d94fac018dcbc0a13ed, type: 3} +--- !u!114 &3135169804875755412 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2526454673669709653} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e3c430f382484144e925c097c2d33cfe, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Weight: 1 + m_Data: + m_ConstrainedObject: {fileID: 4576733507724331002} + m_SourceObjects: + m_Length: 1 + m_Item0: + transform: {fileID: 4208645513262253616} + weight: 1 + m_Item1: + transform: {fileID: 0} + weight: 0 + m_Item2: + transform: {fileID: 0} + weight: 0 + m_Item3: + transform: {fileID: 0} + weight: 0 + m_Item4: + transform: {fileID: 0} + weight: 0 + m_Item5: + transform: {fileID: 0} + weight: 0 + m_Item6: + transform: {fileID: 0} + weight: 0 + m_Item7: + transform: {fileID: 0} + weight: 0 + m_Offset: {x: 0, y: 0, z: 0} + m_MinLimit: -20 + m_MaxLimit: 20 + m_AimAxis: 4 + m_UpAxis: 2 + m_WorldUpType: 0 + m_WorldUpObject: {fileID: 0} + m_WorldUpAxis: 2 + m_MaintainOffset: 0 + m_ConstrainedAxes: + x: 1 + y: 0 + z: 0 +--- !u!1 &3324667285387657420 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2941215237091855643} + - component: {fileID: 2486395001432189757} + m_Layer: 7 + m_Name: Rig + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!1001 &3335188186334991367 PrefabInstance: m_ObjectHideFlags: 0 @@ -6135,6 +6626,929 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 972c6cd5ba00fa143a466d6fd55fc7b2, type: 3} +--- !u!1 &3336373662471273737 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7506077225381353461} + - component: {fileID: 2487073196171222364} + m_Layer: 7 + m_Name: Spine1 Aim + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3695065850975546467 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9044193904260104243} + serializedVersion: 2 + m_LocalRotation: {x: 0.57864237, y: 0.40390524, z: 0.56028163, w: 0.43372583} + m_LocalPosition: {x: 0.001, y: 0.09, z: 0.0785} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4576733507724330977} + m_LocalEulerAnglesHint: {x: 177.172, y: -90.233, z: -72.672} +--- !u!4 &3748194455723732375 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7109033839808684458} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2941215237091855643} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &4191238448025848107 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4208645513262253616} + m_Layer: 7 + m_Name: Head Aim Target + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4208645513262253616 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4191238448025848107} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0.209, z: 0.85} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 324963253396746438} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &4273128337990293631 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 324963253396746438} + - component: {fileID: 6525179493255374784} + m_Layer: 7 + m_Name: a_player + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1001 &4576733507724330953 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 324963253396746438} + m_Modifications: + - target: {fileID: -9070493210130169274, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8596388577142912850, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_UpdateWhenOffscreen + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8006009767450596044, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -7657966619581158213, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -7547733204030175338, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_UpdateWhenOffscreen + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -7547733204030175338, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: f7f24b7c2c04b4e4c83b667f297f31f0, type: 2} + - target: {fileID: -7360747449169001873, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -7121769801107515815, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -6658497938237567018, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_UpdateWhenOffscreen + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -6658497938237567018, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: d8118a5a95cec6d4fbf607714e8a2997, type: 2} + - target: {fileID: -6621945745981909287, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -6442368477639947363, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_UpdateWhenOffscreen + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -6442368477639947363, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 40059039dc965cf48ab8a11bbabf65bf, type: 2} + - target: {fileID: -6370085079684087283, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -6234591296559379751, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -6170625038081293824, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -6091572578137625569, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -6056541330796499132, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -5561550452697079657, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -5195048882033904264, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -5002453598556046594, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -4977968359372665659, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -4790141867476305986, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_UpdateWhenOffscreen + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -4790141867476305986, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 625e6f763a93cb644a90bf3dc9b32a73, type: 2} + - target: {fileID: -4728426434207774260, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -4332706925441422008, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -3799395697873186154, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -3542885339558904099, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -3499613539700318821, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -3478013746326755454, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -3214267034143217929, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -3086436065929644917, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -2084811680363313996, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -1781356600409242780, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -1425791611860619382, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -1268151995469589007, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -1094870013247265488, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_UpdateWhenOffscreen + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -938983531534324846, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -751476226918971245, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -552831747908440785, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -290750445479886849, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -203856693384778745, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -76546954072915012, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 9171100556185337, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 291606427768416478, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 342413542054669853, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 414117464747255840, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 579163500693744052, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_UpdateWhenOffscreen + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 579163500693744052, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 193f9063c91417f478feb53e13f8f486, type: 2} + - target: {fileID: 710183102880238943, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 740220410705241247, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_UpdateWhenOffscreen + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 740220410705241247, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: e57ea1110ba105241a9928330e3ab71d, type: 2} + - target: {fileID: 919132149155446097, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Name + value: Character_Player + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 1064914028055504534, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 1082271958561512970, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 1339101018200438765, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 1500937377208012460, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 1711505207429034123, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 1751384141052031026, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_UpdateWhenOffscreen + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1751384141052031026, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 81d4d9bf7808f7c4d8f04c5d6d4e24f8, type: 2} + - target: {fileID: 2158975759703390516, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 2586065998465600510, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 2674498840362988503, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_UpdateWhenOffscreen + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2674498840362988503, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 193f9063c91417f478feb53e13f8f486, type: 2} + - target: {fileID: 2704082784192306828, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 2715566404302941441, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 2729413168405115760, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_UpdateWhenOffscreen + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2729413168405115760, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 19da97ffc585eb04d92afe43e3aeaf1b, type: 2} + - target: {fileID: 2974574644326920799, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_UpdateWhenOffscreen + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2974574644326920799, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 094d2de13e8a92e4caf3313c9e14d9d0, type: 2} + - target: {fileID: 3047284246813455858, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 3135921509060577837, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 3229974624025153192, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 3588849560313704984, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 3641397698559495349, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 3844593680406075547, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 3882815353823017779, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 3948933247560734027, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 4114030615378554161, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 4237274458221626025, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 4441848305933595309, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 4549111882529890269, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 4579671374381230136, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 4691356734749045086, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_UpdateWhenOffscreen + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4716888685388451424, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 5866666021909216657, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5866666021909216657, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Controller + value: + objectReference: {fileID: 9100000, guid: 9079de55fa2742d4b9a583c8acdc36bd, type: 2} + - target: {fileID: 5866666021909216657, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_CullingMode + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5866666021909216657, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_AnimatePhysics + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5866666021909216657, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_WarningMessage + value: + objectReference: {fileID: 0} + - target: {fileID: 5866666021909216657, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_ApplyRootMotion + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6371836146868173509, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 6445470562081106951, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 0cc2f3d0e3d9930439e2533e10afdf95, type: 2} + - target: {fileID: 6514210125699187276, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 6647190717571849481, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_UpdateWhenOffscreen + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6647190717571849481, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 40059039dc965cf48ab8a11bbabf65bf, type: 2} + - target: {fileID: 6665061660520709789, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 6777337534489714065, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_UpdateWhenOffscreen + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7363479242261063072, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 7470169179194899816, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_UpdateWhenOffscreen + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7732535366517880319, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 7776229726456038893, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 7833282959318594594, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_UpdateWhenOffscreen + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7833282959318594594, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 094d2de13e8a92e4caf3313c9e14d9d0, type: 2} + - target: {fileID: 8030707958198045491, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 8331603097011181245, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 8335907118470890241, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_UpdateWhenOffscreen + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8335907118470890241, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 19da97ffc585eb04d92afe43e3aeaf1b, type: 2} + - target: {fileID: 8509722215188012327, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 40059039dc965cf48ab8a11bbabf65bf, type: 2} + - target: {fileID: 8682389886489130434, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_UpdateWhenOffscreen + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8682389886489130434, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 0cc2f3d0e3d9930439e2533e10afdf95, type: 2} + - target: {fileID: 8817898888258712963, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 8953972740105248388, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 8995019436906131058, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 9037727976738196030, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: e74130c49b009364f90d176af44766be, type: 3} + insertIndex: -1 + addedObject: {fileID: 2941215237091855643} + - targetCorrespondingSourceObject: {fileID: 6502182839619065283, guid: e74130c49b009364f90d176af44766be, type: 3} + insertIndex: -1 + addedObject: {fileID: 99598591642097643} + - targetCorrespondingSourceObject: {fileID: 1852576806548013000, guid: e74130c49b009364f90d176af44766be, type: 3} + insertIndex: -1 + addedObject: {fileID: 3695065850975546467} + - targetCorrespondingSourceObject: {fileID: 1852576806548013000, guid: e74130c49b009364f90d176af44766be, type: 3} + insertIndex: -1 + addedObject: {fileID: 4959437352305364523} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: e74130c49b009364f90d176af44766be, type: 3} + insertIndex: -1 + addedObject: {fileID: 2672001727532698603} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: e74130c49b009364f90d176af44766be, type: 3} + insertIndex: -1 + addedObject: {fileID: 7080456088002083888} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: e74130c49b009364f90d176af44766be, type: 3} + insertIndex: -1 + addedObject: {fileID: 772258152550737563} + m_SourcePrefab: {fileID: 100100000, guid: e74130c49b009364f90d176af44766be, type: 3} +--- !u!95 &4576733507724330954 stripped +Animator: + m_CorrespondingSourceObject: {fileID: 5866666021909216657, guid: e74130c49b009364f90d176af44766be, type: 3} + m_PrefabInstance: {fileID: 4576733507724330953} + m_PrefabAsset: {fileID: 0} +--- !u!1 &4576733507724330955 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: e74130c49b009364f90d176af44766be, type: 3} + m_PrefabInstance: {fileID: 4576733507724330953} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4576733507724330956 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2916570863362053800, guid: e74130c49b009364f90d176af44766be, type: 3} + m_PrefabInstance: {fileID: 4576733507724330953} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4576733507724330957 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 608321761475470972, guid: e74130c49b009364f90d176af44766be, type: 3} + m_PrefabInstance: {fileID: 4576733507724330953} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4576733507724330958 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -3746190272939815206, guid: e74130c49b009364f90d176af44766be, type: 3} + m_PrefabInstance: {fileID: 4576733507724330953} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4576733507724330959 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -2770666803903516498, guid: e74130c49b009364f90d176af44766be, type: 3} + m_PrefabInstance: {fileID: 4576733507724330953} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4576733507724330960 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -6874584590210671055, guid: e74130c49b009364f90d176af44766be, type: 3} + m_PrefabInstance: {fileID: 4576733507724330953} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4576733507724330961 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -2072040086291044643, guid: e74130c49b009364f90d176af44766be, type: 3} + m_PrefabInstance: {fileID: 4576733507724330953} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4576733507724330962 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -6768225281626788248, guid: e74130c49b009364f90d176af44766be, type: 3} + m_PrefabInstance: {fileID: 4576733507724330953} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4576733507724330963 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5372056943023685468, guid: e74130c49b009364f90d176af44766be, type: 3} + m_PrefabInstance: {fileID: 4576733507724330953} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4576733507724330964 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1189529853000058984, guid: e74130c49b009364f90d176af44766be, type: 3} + m_PrefabInstance: {fileID: 4576733507724330953} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4576733507724330965 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1092408308860062549, guid: e74130c49b009364f90d176af44766be, type: 3} + m_PrefabInstance: {fileID: 4576733507724330953} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4576733507724330966 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -2899422035419094908, guid: e74130c49b009364f90d176af44766be, type: 3} + m_PrefabInstance: {fileID: 4576733507724330953} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4576733507724330967 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -104578136787704052, guid: e74130c49b009364f90d176af44766be, type: 3} + m_PrefabInstance: {fileID: 4576733507724330953} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4576733507724330968 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -6024149945523619558, guid: e74130c49b009364f90d176af44766be, type: 3} + m_PrefabInstance: {fileID: 4576733507724330953} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4576733507724330969 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6341119541397085964, guid: e74130c49b009364f90d176af44766be, type: 3} + m_PrefabInstance: {fileID: 4576733507724330953} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4576733507724330970 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3667946887678727147, guid: e74130c49b009364f90d176af44766be, type: 3} + m_PrefabInstance: {fileID: 4576733507724330953} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4576733507724330971 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5097370190579632962, guid: e74130c49b009364f90d176af44766be, type: 3} + m_PrefabInstance: {fileID: 4576733507724330953} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4576733507724330972 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -5480977901411583989, guid: e74130c49b009364f90d176af44766be, type: 3} + m_PrefabInstance: {fileID: 4576733507724330953} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4576733507724330973 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -1070350730909333850, guid: e74130c49b009364f90d176af44766be, type: 3} + m_PrefabInstance: {fileID: 4576733507724330953} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4576733507724330974 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -7219772299731422950, guid: e74130c49b009364f90d176af44766be, type: 3} + m_PrefabInstance: {fileID: 4576733507724330953} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4576733507724330975 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -870823317777057635, guid: e74130c49b009364f90d176af44766be, type: 3} + m_PrefabInstance: {fileID: 4576733507724330953} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4576733507724330976 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8447082967072642302, guid: e74130c49b009364f90d176af44766be, type: 3} + m_PrefabInstance: {fileID: 4576733507724330953} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4576733507724330977 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1852576806548013000, guid: e74130c49b009364f90d176af44766be, type: 3} + m_PrefabInstance: {fileID: 4576733507724330953} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4576733507724330978 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2563496969622287784, guid: e74130c49b009364f90d176af44766be, type: 3} + m_PrefabInstance: {fileID: 4576733507724330953} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4576733507724330979 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6000407479487422213, guid: e74130c49b009364f90d176af44766be, type: 3} + m_PrefabInstance: {fileID: 4576733507724330953} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4576733507724330980 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7078722787440015773, guid: e74130c49b009364f90d176af44766be, type: 3} + m_PrefabInstance: {fileID: 4576733507724330953} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4576733507724330981 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8068027186691560116, guid: e74130c49b009364f90d176af44766be, type: 3} + m_PrefabInstance: {fileID: 4576733507724330953} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4576733507724330982 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6655383506977046455, guid: e74130c49b009364f90d176af44766be, type: 3} + m_PrefabInstance: {fileID: 4576733507724330953} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4576733507724330983 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4747904710347621765, guid: e74130c49b009364f90d176af44766be, type: 3} + m_PrefabInstance: {fileID: 4576733507724330953} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4576733507724330984 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -5665043316445423941, guid: e74130c49b009364f90d176af44766be, type: 3} + m_PrefabInstance: {fileID: 4576733507724330953} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4576733507724330985 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1564860333797465651, guid: e74130c49b009364f90d176af44766be, type: 3} + m_PrefabInstance: {fileID: 4576733507724330953} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4576733507724330986 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -2594260964506120097, guid: e74130c49b009364f90d176af44766be, type: 3} + m_PrefabInstance: {fileID: 4576733507724330953} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4576733507724330987 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3183749884578473501, guid: e74130c49b009364f90d176af44766be, type: 3} + m_PrefabInstance: {fileID: 4576733507724330953} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4576733507724330988 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -2389525917609993686, guid: e74130c49b009364f90d176af44766be, type: 3} + m_PrefabInstance: {fileID: 4576733507724330953} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4576733507724330989 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8255111157037086696, guid: e74130c49b009364f90d176af44766be, type: 3} + m_PrefabInstance: {fileID: 4576733507724330953} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4576733507724330990 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -1864740628597940677, guid: e74130c49b009364f90d176af44766be, type: 3} + m_PrefabInstance: {fileID: 4576733507724330953} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4576733507724330991 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7666680083751660616, guid: e74130c49b009364f90d176af44766be, type: 3} + m_PrefabInstance: {fileID: 4576733507724330953} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4576733507724330992 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1330755669629619180, guid: e74130c49b009364f90d176af44766be, type: 3} + m_PrefabInstance: {fileID: 4576733507724330953} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4576733507724330993 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8191740002585371210, guid: e74130c49b009364f90d176af44766be, type: 3} + m_PrefabInstance: {fileID: 4576733507724330953} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4576733507724330994 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -6857788192064577062, guid: e74130c49b009364f90d176af44766be, type: 3} + m_PrefabInstance: {fileID: 4576733507724330953} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4576733507724330995 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5048025441337412694, guid: e74130c49b009364f90d176af44766be, type: 3} + m_PrefabInstance: {fileID: 4576733507724330953} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4576733507724330996 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6502182839619065283, guid: e74130c49b009364f90d176af44766be, type: 3} + m_PrefabInstance: {fileID: 4576733507724330953} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4576733507724330997 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -1812909498023395591, guid: e74130c49b009364f90d176af44766be, type: 3} + m_PrefabInstance: {fileID: 4576733507724330953} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4576733507724330998 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -3432401550182100168, guid: e74130c49b009364f90d176af44766be, type: 3} + m_PrefabInstance: {fileID: 4576733507724330953} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4576733507724330999 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -6803169544883306252, guid: e74130c49b009364f90d176af44766be, type: 3} + m_PrefabInstance: {fileID: 4576733507724330953} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4576733507724331000 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -3321919801592875672, guid: e74130c49b009364f90d176af44766be, type: 3} + m_PrefabInstance: {fileID: 4576733507724330953} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4576733507724331001 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6515712193588681746, guid: e74130c49b009364f90d176af44766be, type: 3} + m_PrefabInstance: {fileID: 4576733507724330953} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4576733507724331002 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 366175167995203695, guid: e74130c49b009364f90d176af44766be, type: 3} + m_PrefabInstance: {fileID: 4576733507724330953} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4576733507724331003 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8021001004253913084, guid: e74130c49b009364f90d176af44766be, type: 3} + m_PrefabInstance: {fileID: 4576733507724330953} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4576733507724331004 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -3480699329000672020, guid: e74130c49b009364f90d176af44766be, type: 3} + m_PrefabInstance: {fileID: 4576733507724330953} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4576733507724331005 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8169382868667117632, guid: e74130c49b009364f90d176af44766be, type: 3} + m_PrefabInstance: {fileID: 4576733507724330953} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4576733507724331006 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2559285840627121667, guid: e74130c49b009364f90d176af44766be, type: 3} + m_PrefabInstance: {fileID: 4576733507724330953} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4576733507724331007 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5465940246521907071, guid: e74130c49b009364f90d176af44766be, type: 3} + m_PrefabInstance: {fileID: 4576733507724330953} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4576733507724331008 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e74130c49b009364f90d176af44766be, type: 3} + m_PrefabInstance: {fileID: 4576733507724330953} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4959437352305364523 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1243501412143149474} + serializedVersion: 2 + m_LocalRotation: {x: -0.63801676, y: 0.76654166, z: -0.047073357, w: -0.055969384} + m_LocalPosition: {x: -0.001, y: 0.099, z: 0.038} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4576733507724330977} + m_LocalEulerAnglesHint: {x: 171.745, y: 1.4900055, z: -259.436} --- !u!1001 &6013030520165920174 PrefabInstance: m_ObjectHideFlags: 0 @@ -6192,6 +7606,53 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 62859e612944db44ba211d6ef5724242, type: 3} +--- !u!114 &6119191922772079091 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8408927116131674345} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fdb90b913935e644baaa86c076d788e0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Weight: 1 + m_Data: + m_ConstrainedObject: {fileID: 4576733507724331007} + m_SourceObjects: + m_Length: 1 + m_Item0: + transform: {fileID: 7488198725507576124} + weight: 1 + m_Item1: + transform: {fileID: 0} + weight: 0 + m_Item2: + transform: {fileID: 0} + weight: 0 + m_Item3: + transform: {fileID: 0} + weight: 0 + m_Item4: + transform: {fileID: 0} + weight: 0 + m_Item5: + transform: {fileID: 0} + weight: 0 + m_Item6: + transform: {fileID: 0} + weight: 0 + m_Item7: + transform: {fileID: 0} + weight: 0 + m_Offset: {x: 0, y: 0, z: 0} + m_ConstrainedAxes: + x: 0 + y: 1 + z: 0 + m_MaintainOffset: 0 --- !u!1001 &6129090245799837616 PrefabInstance: m_ObjectHideFlags: 0 @@ -6360,6 +7821,36 @@ PrefabInstance: addedObject: {fileID: 1652750280} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: bc7013398e9f3d244a780cb018250f14, type: 3} +--- !u!114 &6525179493255374784 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4273128337990293631} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 960522ea44ce4513aea34826f00bc19c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Animator: {fileID: 4576733507724330954} + m_Root: + k__BackingField: root + m_TransitionSpeed: 5 + m_Layers: + - node: + rid: 8982226241937735788 + mask: {fileID: 0} + isAdditive: 0 + targetWeight: 1 + references: + version: 2 + RefIds: + - rid: 8982226241937735788 + type: {class: AnimationClipNode, ns: RebootKit.Engine.Animations, asm: RebootKit.Engine} + data: + k__BackingField: Base + Clip: {fileID: 5522812681064789136, guid: e74130c49b009364f90d176af44766be, type: 3} --- !u!1001 &6754207955607356793 PrefabInstance: m_ObjectHideFlags: 0 @@ -6449,6 +7940,393 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 89264bc756687404181f32626dfab4d9, type: 3} +--- !u!114 &7080456088002083888 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4576733507724330955} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b2d8418b0b9634b1892b0268dd9c2743, type: 3} + m_Name: + m_EditorClassIdentifier: + boneShape: 1 + drawBones: 1 + drawTripods: 0 + boneSize: 1 + tripodSize: 1 + boneColor: {r: 0, g: 0, b: 1, a: 0.5} + m_Transforms: + - {fileID: 4576733507724331007} + - {fileID: 4576733507724331006} + - {fileID: 4576733507724331005} + - {fileID: 4576733507724331004} + - {fileID: 4576733507724331003} + - {fileID: 4576733507724331002} + - {fileID: 4576733507724331001} + - {fileID: 4576733507724331000} + - {fileID: 4576733507724330999} + - {fileID: 4576733507724330998} + - {fileID: 4576733507724330997} + - {fileID: 4576733507724330996} + - {fileID: 4576733507724330995} + - {fileID: 4576733507724330994} + - {fileID: 4576733507724330993} + - {fileID: 4576733507724330992} + - {fileID: 4576733507724330991} + - {fileID: 4576733507724330990} + - {fileID: 4576733507724330989} + - {fileID: 4576733507724330988} + - {fileID: 4576733507724330987} + - {fileID: 4576733507724330986} + - {fileID: 4576733507724330985} + - {fileID: 4576733507724330984} + - {fileID: 4576733507724330983} + - {fileID: 4576733507724330982} + - {fileID: 4576733507724330981} + - {fileID: 4576733507724330980} + - {fileID: 4576733507724330979} + - {fileID: 4576733507724330978} + - {fileID: 4576733507724330977} + - {fileID: 4576733507724330976} + - {fileID: 4576733507724330975} + - {fileID: 4576733507724330974} + - {fileID: 4576733507724330973} + - {fileID: 4576733507724330972} + - {fileID: 4576733507724330971} + - {fileID: 4576733507724330970} + - {fileID: 4576733507724330969} + - {fileID: 4576733507724330968} + - {fileID: 4576733507724330967} + - {fileID: 4576733507724330966} + - {fileID: 4576733507724330965} + - {fileID: 4576733507724330964} + - {fileID: 4576733507724330963} + - {fileID: 4576733507724330962} + - {fileID: 4576733507724330961} + - {fileID: 4576733507724330960} + - {fileID: 4576733507724330959} + - {fileID: 4576733507724330958} + - {fileID: 4576733507724330957} + - {fileID: 4576733507724330956} +--- !u!1 &7109033839808684458 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3748194455723732375} + - component: {fileID: 2121855616852686240} + m_Layer: 7 + m_Name: Spine Aim + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7488198725507576124 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1129611344868787608} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 324963253396746438} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &7506077225381353461 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3336373662471273737} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2941215237091855643} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &7644568519421315996 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3932872693167015} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 324963253396746438} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &7802640181365859200 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2526454673669709653} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2941215237091855643} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &7809623816046939342 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3932872693167015} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: -7246246608557242452, guid: 95a6b2fae6891e9428abd9f1d02ef54d, type: 2} + m_audioClip: {fileID: 8300000, guid: 5716155335402be4393584059b4ff19d, type: 3} + m_Resource: {fileID: 8300000, guid: 5716155335402be4393584059b4ff19d, type: 3} + m_PlayOnAwake: 0 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!1 &7948159831234974209 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 99598591642097643} + m_Layer: 7 + m_Name: hand_left_slot_dagger + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &7983532708053980432 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8903513239504561363} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e3c430f382484144e925c097c2d33cfe, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Weight: 1 + m_Data: + m_ConstrainedObject: {fileID: 4576733507724331002} + m_SourceObjects: + m_Length: 1 + m_Item0: + transform: {fileID: 4208645513262253616} + weight: 1 + m_Item1: + transform: {fileID: 0} + weight: 0 + m_Item2: + transform: {fileID: 0} + weight: 0 + m_Item3: + transform: {fileID: 0} + weight: 0 + m_Item4: + transform: {fileID: 0} + weight: 0 + m_Item5: + transform: {fileID: 0} + weight: 0 + m_Item6: + transform: {fileID: 0} + weight: 0 + m_Item7: + transform: {fileID: 0} + weight: 0 + m_Offset: {x: 0, y: 0, z: 0} + m_MinLimit: -90 + m_MaxLimit: 90 + m_AimAxis: 4 + m_UpAxis: 2 + m_WorldUpType: 0 + m_WorldUpObject: {fileID: 0} + m_WorldUpAxis: 2 + m_MaintainOffset: 0 + m_ConstrainedAxes: + x: 0 + y: 1 + z: 0 +--- !u!1 &8408927116131674345 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2613042493795146389} + - component: {fileID: 6119191922772079091} + - component: {fileID: 8408927116131674346} + m_Layer: 7 + m_Name: Character Rotation + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &8408927116131674346 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8408927116131674345} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e3c430f382484144e925c097c2d33cfe, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Weight: 1 + m_Data: + m_ConstrainedObject: {fileID: 4576733507724331007} + m_SourceObjects: + m_Length: 1 + m_Item0: + transform: {fileID: 609498661} + weight: 1 + m_Item1: + transform: {fileID: 0} + weight: 0 + m_Item2: + transform: {fileID: 0} + weight: 0 + m_Item3: + transform: {fileID: 0} + weight: 0 + m_Item4: + transform: {fileID: 0} + weight: 0 + m_Item5: + transform: {fileID: 0} + weight: 0 + m_Item6: + transform: {fileID: 0} + weight: 0 + m_Item7: + transform: {fileID: 0} + weight: 0 + m_Offset: {x: 0, y: 0, z: 0} + m_MinLimit: -180 + m_MaxLimit: 180 + m_AimAxis: 4 + m_UpAxis: 2 + m_WorldUpType: 0 + m_WorldUpObject: {fileID: 0} + m_WorldUpAxis: 2 + m_MaintainOffset: 0 + m_ConstrainedAxes: + x: 0 + y: 1 + z: 0 --- !u!1001 &8694581317741800515 PrefabInstance: m_ObjectHideFlags: 0 @@ -6506,6 +8384,39 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2bc4b78daa0582a41a43d02ae219339a, type: 3} +--- !u!1 &8903513239504561363 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1315621045141192215} + - component: {fileID: 7983532708053980432} + m_Layer: 7 + m_Name: Spine2 Aim Y + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &9044193904260104243 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3695065850975546467} + m_Layer: 7 + m_Name: hand_right_slot_egg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 @@ -6542,3 +8453,4 @@ SceneRoots: - {fileID: 1196992586} - {fileID: 1388994043} - {fileID: 1305276974} + - {fileID: 324963253396746438} diff --git a/Assets/jelycho/core/player/Character_Player.fbx.meta b/Assets/jelycho/core/player/Character_Player.fbx.meta index 304cd03..0d2dee9 100644 --- a/Assets/jelycho/core/player/Character_Player.fbx.meta +++ b/Assets/jelycho/core/player/Character_Player.fbx.meta @@ -111,13 +111,13 @@ ModelImporter: loop: 0 hasAdditiveReferencePose: 0 loopTime: 1 - loopBlend: 1 + loopBlend: 0 loopBlendOrientation: 0 loopBlendPositionY: 0 loopBlendPositionXZ: 0 - keepOriginalOrientation: 1 + keepOriginalOrientation: 0 keepOriginalPositionY: 1 - keepOriginalPositionXZ: 1 + keepOriginalPositionXZ: 0 heightFromFeet: 0 mirror: 0 bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 diff --git a/Assets/jelycho/core/player/a_player.prefab b/Assets/jelycho/core/player/a_player.prefab index 1f06cd4..3179215 100644 --- a/Assets/jelycho/core/player/a_player.prefab +++ b/Assets/jelycho/core/player/a_player.prefab @@ -772,7 +772,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 00a9f9c2ce4a41fdaadcfb24c4233127, type: 3} m_Name: m_EditorClassIdentifier: - m_RigBuilder: {fileID: 5341614616933970905} m_ReAnimator: {fileID: 3871962590503854066} m_HandsLayerIndex: 2 onQuickAttackFinished: @@ -818,7 +817,6 @@ MonoBehaviour: mask: {fileID: 0} isAdditive: 0 targetWeight: 0 - tickMode: 0 references: version: 2 RefIds: diff --git a/Packages/manifest.json b/Packages/manifest.json index 03f58ce..270acf9 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -5,6 +5,7 @@ "com.cysharp.unitask": "https://github.com/Cysharp/UniTask.git?path=src/UniTask/Assets/Plugins/UniTask", "com.cysharp.zlinq": "https://github.com/Cysharp/ZLinq.git?path=src/ZLinq.Unity/Assets/ZLinq.Unity", "com.github-glitchenzo.nugetforunity": "https://github.com/GlitchEnzo/NuGetForUnity.git?path=/src/NuGetForUnity", + "com.greenbamboogames.playablegraphmonitor": "https://github.com/SolarianZ/UnityPlayableGraphMonitorTool.git", "com.oddworm.dbgdraw": "https://github.com/pschraut/UnityDbgDraw.git#1.2.0", "com.unity.2d.sprite": "1.0.0", "com.unity.addressables": "2.2.2", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 0384a36..8f15704 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -39,6 +39,13 @@ "dependencies": {}, "hash": "fe31ad0904abee296b5ea72c6073157accba59e8" }, + "com.greenbamboogames.playablegraphmonitor": { + "version": "https://github.com/SolarianZ/UnityPlayableGraphMonitorTool.git", + "depth": 0, + "source": "git", + "dependencies": {}, + "hash": "79a77b0c18ac605ad3dbf9b7b72e27696beafb75" + }, "com.oddworm.dbgdraw": { "version": "https://github.com/pschraut/UnityDbgDraw.git#1.2.0", "depth": 0,