From 33d19846dc07ece5c2065720ec552a69fd6e23a5 Mon Sep 17 00:00:00 2001 From: RochesterX Date: Fri, 10 Jan 2025 18:41:02 -0500 Subject: [PATCH 01/25] New Folder For Testing --- Assets/New Folder For Testing.meta | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 Assets/New Folder For Testing.meta diff --git a/Assets/New Folder For Testing.meta b/Assets/New Folder For Testing.meta new file mode 100644 index 0000000..0f205ef --- /dev/null +++ b/Assets/New Folder For Testing.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 902a3e40c4fe7c64690b99710e736c55 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: From 30eda583a14a9b4e286474e9f10bb7ace9354c16 Mon Sep 17 00:00:00 2001 From: RochesterX Date: Fri, 10 Jan 2025 18:41:37 -0500 Subject: [PATCH 02/25] Script --- Assets/New Folder For Testing/Test.cs | 16 ++++++++++++++++ Assets/New Folder For Testing/Test.cs.meta | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 Assets/New Folder For Testing/Test.cs create mode 100644 Assets/New Folder For Testing/Test.cs.meta diff --git a/Assets/New Folder For Testing/Test.cs b/Assets/New Folder For Testing/Test.cs new file mode 100644 index 0000000..86752c9 --- /dev/null +++ b/Assets/New Folder For Testing/Test.cs @@ -0,0 +1,16 @@ +using UnityEngine; + +public class Test : MonoBehaviour +{ + // Start is called once before the first execution of Update after the MonoBehaviour is created + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/Assets/New Folder For Testing/Test.cs.meta b/Assets/New Folder For Testing/Test.cs.meta new file mode 100644 index 0000000..19ce88b --- /dev/null +++ b/Assets/New Folder For Testing/Test.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: ca02decb56ef91c40af52d499e1659c0 \ No newline at end of file From e95c8897f0f586fb219d228cebe8a8217a37442a Mon Sep 17 00:00:00 2001 From: RochesterX Date: Mon, 13 Jan 2025 14:15:28 -0500 Subject: [PATCH 03/25] Remove test folder --- Assets/New Folder For Testing.meta | 8 -------- Assets/New Folder For Testing/Test.cs | 16 ---------------- Assets/New Folder For Testing/Test.cs.meta | 2 -- 3 files changed, 26 deletions(-) delete mode 100644 Assets/New Folder For Testing.meta delete mode 100644 Assets/New Folder For Testing/Test.cs delete mode 100644 Assets/New Folder For Testing/Test.cs.meta diff --git a/Assets/New Folder For Testing.meta b/Assets/New Folder For Testing.meta deleted file mode 100644 index 0f205ef..0000000 --- a/Assets/New Folder For Testing.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 902a3e40c4fe7c64690b99710e736c55 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/New Folder For Testing/Test.cs b/Assets/New Folder For Testing/Test.cs deleted file mode 100644 index 86752c9..0000000 --- a/Assets/New Folder For Testing/Test.cs +++ /dev/null @@ -1,16 +0,0 @@ -using UnityEngine; - -public class Test : MonoBehaviour -{ - // Start is called once before the first execution of Update after the MonoBehaviour is created - void Start() - { - - } - - // Update is called once per frame - void Update() - { - - } -} diff --git a/Assets/New Folder For Testing/Test.cs.meta b/Assets/New Folder For Testing/Test.cs.meta deleted file mode 100644 index 19ce88b..0000000 --- a/Assets/New Folder For Testing/Test.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: ca02decb56ef91c40af52d499e1659c0 \ No newline at end of file From 4be2e20865b178e43e1be1bcb2051e02fbfd5664 Mon Sep 17 00:00:00 2001 From: RochesterX Date: Mon, 13 Jan 2025 15:58:50 -0500 Subject: [PATCH 04/25] Make platformer player movement 100% physics-based --- .../Games/Platformer/Ground.physicsMaterial2D | 14 +++++++++++ .../Platformer/Ground.physicsMaterial2D.meta | 8 ++++++ .../Games/Platformer/Platformer Player.prefab | 4 ++- .../Platformer/PlatformerPlayerMovement.cs | 25 +++++++++++++++---- .../Games/Platformer/Player.physicsMaterial2D | 14 +++++++++++ .../Platformer/Player.physicsMaterial2D.meta | 8 ++++++ 6 files changed, 67 insertions(+), 6 deletions(-) create mode 100644 Assets/Games/Platformer/Ground.physicsMaterial2D create mode 100644 Assets/Games/Platformer/Ground.physicsMaterial2D.meta create mode 100644 Assets/Games/Platformer/Player.physicsMaterial2D create mode 100644 Assets/Games/Platformer/Player.physicsMaterial2D.meta diff --git a/Assets/Games/Platformer/Ground.physicsMaterial2D b/Assets/Games/Platformer/Ground.physicsMaterial2D new file mode 100644 index 0000000..db40d00 --- /dev/null +++ b/Assets/Games/Platformer/Ground.physicsMaterial2D @@ -0,0 +1,14 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!62 &6200000 +PhysicsMaterial2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Ground + serializedVersion: 2 + friction: 0 + bounciness: 0 + m_FrictionCombine: 1 + m_BounceCombine: 4 diff --git a/Assets/Games/Platformer/Ground.physicsMaterial2D.meta b/Assets/Games/Platformer/Ground.physicsMaterial2D.meta new file mode 100644 index 0000000..eefebcf --- /dev/null +++ b/Assets/Games/Platformer/Ground.physicsMaterial2D.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c29c2a30d0b3d4a9b95031c5dfbd222a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 6200000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Games/Platformer/Platformer Player.prefab b/Assets/Games/Platformer/Platformer Player.prefab index 421163e..907e81b 100644 --- a/Assets/Games/Platformer/Platformer Player.prefab +++ b/Assets/Games/Platformer/Platformer Player.prefab @@ -187,11 +187,13 @@ MonoBehaviour: serializedVersion: 2 m_Bits: 64 walkSpeed: 5 + walkSpeedFactor: 30 + maxSpeed: 5 virtualAxisX: 0 virtualButtonJump: 0 virtualButtonJumpLastFrame: 0 turnaroundMultiplier: 2 - walkSmooth: 0 + walkSmooth: 0.98 secondsToFullSpeed: 0 jumpSpeed: 17 coyoteTime: 0.1 diff --git a/Assets/Games/Platformer/PlatformerPlayerMovement.cs b/Assets/Games/Platformer/PlatformerPlayerMovement.cs index 2041720..c183157 100644 --- a/Assets/Games/Platformer/PlatformerPlayerMovement.cs +++ b/Assets/Games/Platformer/PlatformerPlayerMovement.cs @@ -14,6 +14,8 @@ public class PlayerMovement : MonoBehaviour [Header("Movement")] public float walkSpeed; + public float walkSpeedFactor = 1f; + public float maxSpeed = 5f; public float virtualAxisX; public float virtualButtonJump; public float virtualButtonJumpLastFrame; @@ -65,7 +67,6 @@ public class PlayerMovement : MonoBehaviour HorizontalMovement(); - Land(); } @@ -123,7 +124,18 @@ public class PlayerMovement : MonoBehaviour private void HorizontalMovement() { - body.linearVelocity = new Vector2(virtualAxisX * walkSpeed, body.linearVelocity.y); + //body.linearVelocity = new Vector2(virtualAxisX * walkSpeed, body.linearVelocity.y); + body.AddForce(new Vector2(virtualAxisX * walkSpeed * walkSpeedFactor, 0), ForceMode2D.Force); + + if (Mathf.Abs(body.linearVelocityX) >= maxSpeed) + { + body.linearVelocity = new Vector2(Mathf.Sign(body.linearVelocityX) * maxSpeed, body.linearVelocity.y); + } + + //if (!IsPhysicallyGrounded()) + //{ + body.linearVelocityX *= walkSmooth; + //} if (transform.position == positionLastFrame && (InputSystem.actions.FindAction($"Player {player} Move").ReadValue().x == 0)) { @@ -135,6 +147,12 @@ public class PlayerMovement : MonoBehaviour private void UpdateVirtualAxis() { + virtualButtonJump = InputSystem.actions.FindAction($"Player {player} Action").ReadValue(); + virtualButtonJumpLastFrame = InputSystem.actions.FindAction($"Player {player} Action").WasPressedThisFrame() ? 1 : 0; + + virtualAxisX = InputSystem.actions.FindAction($"Player {player} Move").ReadValue().x; + return; + // From https://discussions.unity.com/t/manually-smooth-input-getaxisraw/225141/4 float basicallyRawAxis = InputSystem.actions.FindAction($"Player {player} Move").ReadValue().x; float sensitivity = 3; @@ -158,9 +176,6 @@ public class PlayerMovement : MonoBehaviour { turnaroundMultiplier = 1; } - - virtualButtonJump = InputSystem.actions.FindAction($"Player {player} Action").ReadValue(); - virtualButtonJumpLastFrame = InputSystem.actions.FindAction($"Player {player} Action").WasPressedThisFrame() ? 1 : 0; } private void OnTriggerEnter2D(Collider2D collision) { diff --git a/Assets/Games/Platformer/Player.physicsMaterial2D b/Assets/Games/Platformer/Player.physicsMaterial2D new file mode 100644 index 0000000..13e03db --- /dev/null +++ b/Assets/Games/Platformer/Player.physicsMaterial2D @@ -0,0 +1,14 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!62 &6200000 +PhysicsMaterial2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Player + serializedVersion: 2 + friction: 0 + bounciness: 0 + m_FrictionCombine: 1 + m_BounceCombine: 4 diff --git a/Assets/Games/Platformer/Player.physicsMaterial2D.meta b/Assets/Games/Platformer/Player.physicsMaterial2D.meta new file mode 100644 index 0000000..daa6cad --- /dev/null +++ b/Assets/Games/Platformer/Player.physicsMaterial2D.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 522e8bb901c31496c91921bd603c0e8b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 6200000 + userData: + assetBundleName: + assetBundleVariant: From c8bd31c51478e790d6630f859a8bb138d9c01326 Mon Sep 17 00:00:00 2001 From: RochesterX Date: Mon, 13 Jan 2025 16:41:29 -0500 Subject: [PATCH 05/25] Meet bones --- .DS_Store | Bin 0 -> 6148 bytes Assets/.DS_Store | Bin 0 -> 6148 bytes Assets/Games/.DS_Store | Bin 0 -> 6148 bytes Assets/Games/Platformer/Bones.anim | 1549 ++++++++++++++++++ Assets/Games/Platformer/Bones.anim.meta | 8 + Assets/Games/Platformer/Platformer.unity | 759 +++++++++ Assets/Games/Platformer/Root.controller | 72 + Assets/Games/Platformer/Root.controller.meta | 8 + Assets/Games/Platformer/Square.png | Bin 0 -> 388 bytes Assets/Games/Platformer/Square.png.meta | 179 ++ 10 files changed, 2575 insertions(+) create mode 100644 .DS_Store create mode 100644 Assets/.DS_Store create mode 100644 Assets/Games/.DS_Store create mode 100644 Assets/Games/Platformer/Bones.anim create mode 100644 Assets/Games/Platformer/Bones.anim.meta create mode 100644 Assets/Games/Platformer/Root.controller create mode 100644 Assets/Games/Platformer/Root.controller.meta create mode 100755 Assets/Games/Platformer/Square.png create mode 100644 Assets/Games/Platformer/Square.png.meta diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..f870d6072699a3aa753300191033b09f6f3d69dc GIT binary patch literal 6148 zcmeHK%}T>S5Z-NTO(;SRDjpZS7OYmJ#Y>F!1&ruHr8XpJFlI}W+CwSis4wKB_&m<+ zZVtiVQN+%a-EVe&b~7Jze;8xjn}>&tIgBw28X`xfM$laAYM5X|uI9*D7A&%9kjS8B zqQ7XuZ*Q|RmccJ#)$jiZrb(RTz1}BpG+P_(P0O-6*1i8E7k)m;=b1N|-Qws<$|NZD zNpKxUi?OqPF4KGxr_oF$#9;&>cQ8Upp+@w#UxyayjUV{$RN3iskUA z*A>V8lhw+$cJ>cWFUQZxODf+qjT{(PvSqM@cTg%7z525>k?AAY%bYTnkQg8ahyh|? z9T_mEfz?^Z;;Ck0fEf6Z0o)%1G(^{6p;2ue(BbtN{VhZk(D5ySC=9v=3yt6b;W`yi zr*iYe;5r@b!o;}-3ynIRakVncV^%I7FI=q-cA>%4;Q4<6f0^1x zel>+g!~iky&lupXkw5aFD08-cD-X|F0qp@A3dR+vfPh}P1i%3Ikv-+qet|l~xdsc3 UI1AcUIv`yH6d}|R1HZt)7h2>?wEzGB literal 0 HcmV?d00001 diff --git a/Assets/.DS_Store b/Assets/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..837018ba6ca03962006fe298e0a30427e2b50aca GIT binary patch literal 6148 zcmeHKPfNov6i?iyEkoEr#bdzh!0ALbyp%feZbc6&v!z3eT{G6s9>$T1{Kr% zO%r~5gIzM8joFATfB#1?iK8^@bUyh;t=`z&vMj4raZu`h za1)L4VQc4HCYc{4qp3=W!V!er-$qF&b63uiFjcvpc38G;4_kZld9N+Hz5b#t=KbSN zTby)H7Yp0kJvcnO8otEiM80VnIqj&BJ>VbC#HXao-k*QtOy zm76C9*XdvvCeATfXw>P9tCe9MvvT=(;c9iT3l+||qmg=IfEZY1pr(f{tp6AA%Tzw{ zS5s(23=jkVi~(LBcmo$UWoqlU?P0AI&>o?oU|fL;2%i$mHoTNM?_xy{Dzjx%i(NCe&K<^}NBu&66hDve zC7C!j4_*Y_d+_p0^70z;Z%G;e5RGAbAD{#P4mvUCVzIy|PCjQj+d~xk8TX)|4_)YB z$@Ui%pm((m;0FrO{vgqbo@HjJw+<}m_mScSA{o}{E!lvI6;>1s;*b3=DjSK$uZf!>a)(C{f}XQ4*Y=R#Ki=l*$m0n3-3i=jR%tV5(=R zXY_jy^ERNGZK)BSX`Y^13>-iXD}xjxD+42tvp@3Xlx~Oh9v) zz$$|*Er2YjE<*zYkZhmz!SKuCd;EY*V^0^ykO=p;=M?!E6a`og&i?&>KD(=vfJW1* vpxukDa(~OJoZNG}>~H>$?+;BGnLu{)XdLGdXf;^W2r|mk)z4*}Q$iB}Ou Date: Mon, 13 Jan 2025 16:46:25 -0500 Subject: [PATCH 06/25] Name Bones --- Assets/Games/Platformer/Platformer.unity | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/Games/Platformer/Platformer.unity b/Assets/Games/Platformer/Platformer.unity index 9c48b53..5e39b19 100644 --- a/Assets/Games/Platformer/Platformer.unity +++ b/Assets/Games/Platformer/Platformer.unity @@ -12158,7 +12158,7 @@ GameObject: - component: {fileID: 1355961160} - component: {fileID: 1355961159} m_Layer: 0 - m_Name: Root + m_Name: Bones m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 From 34d46ecb17684d04e98ccd7d61cb559cfe134f86 Mon Sep 17 00:00:00 2001 From: RochesterX Date: Mon, 13 Jan 2025 18:52:40 -0500 Subject: [PATCH 07/25] Bones: Physics Edition --- Assets/Games/Platformer/Bones.anim | 322 +++++++++++++++++- Assets/Games/Platformer/Platformer.unity | 410 ++++++++++++++++++++++- Assets/Games/Trevor.meta | 8 + Assets/Games/Trevor/Trevor.cs | 18 + Assets/Games/Trevor/Trevor.cs.meta | 2 + Assets/Games/Trevor/Trevor.unity | 365 ++++++++++++++++++++ Assets/Games/Trevor/Trevor.unity.meta | 7 + 7 files changed, 1120 insertions(+), 12 deletions(-) create mode 100644 Assets/Games/Trevor.meta create mode 100644 Assets/Games/Trevor/Trevor.cs create mode 100644 Assets/Games/Trevor/Trevor.cs.meta create mode 100644 Assets/Games/Trevor/Trevor.unity create mode 100644 Assets/Games/Trevor/Trevor.unity.meta diff --git a/Assets/Games/Platformer/Bones.anim b/Assets/Games/Platformer/Bones.anim index 7bf04d0..c9daecf 100644 --- a/Assets/Games/Platformer/Bones.anim +++ b/Assets/Games/Platformer/Bones.anim @@ -63,6 +63,15 @@ AnimationClip: - serializedVersion: 3 time: 0.33333334 value: {x: 0, y: 0, z: -42.013} + inSlope: {x: 0, y: 0, z: -42.79448} + outSlope: {x: 0, y: 0, z: -42.79448} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.48333332 + value: {x: 0, y: 0, z: -54.862} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -128,6 +137,15 @@ AnimationClip: weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.16666667 + value: {x: 0, y: 0, z: -79.361} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.33333334 value: {x: 0, y: 0, z: -30.241} @@ -230,6 +248,15 @@ AnimationClip: weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.33333334 + value: {x: 0, y: 0, z: 164.848} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.6666667 value: {x: 0, y: 0, z: 178.712} @@ -243,6 +270,40 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 path: Torso + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, z: 180} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.33333334 + value: {x: 0, y: 0, z: 192.912} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.6666667 + value: {x: 0, y: 0, z: 180} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: Torso/Head m_PositionCurves: - curve: serializedVersion: 2 @@ -360,6 +421,15 @@ AnimationClip: isPPtrCurve: 0 isIntCurve: 0 isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 2146230158 + attribute: 4 + script: {fileID: 0} + typeID: 4 + customType: 4 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 @@ -521,6 +591,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.48333332 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 time: 0.6666667 value: 0 @@ -560,6 +639,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.48333332 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 time: 0.6666667 value: 0 @@ -593,6 +681,15 @@ AnimationClip: - serializedVersion: 3 time: 0.33333334 value: -42.013 + inSlope: -42.79448 + outSlope: -42.79448 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.48333332 + value: -54.862 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -746,6 +843,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 time: 0.33333334 value: 0 @@ -785,6 +891,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 time: 0.33333334 value: 0 @@ -824,6 +939,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: -79.361 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 time: 0.33333334 value: -30.241 @@ -1097,6 +1221,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.33333334 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 time: 0.6666667 value: 0 @@ -1127,6 +1260,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.33333334 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 time: 0.6666667 value: 0 @@ -1157,6 +1299,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.33333334 + value: 164.848 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 time: 0.6666667 value: 178.712 @@ -1291,7 +1442,160 @@ AnimationClip: classID: 4 script: {fileID: 0} flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.33333334 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.x + path: Torso/Head + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.33333334 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.y + path: Torso/Head + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 180 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.33333334 + value: 192.912 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 180 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.z + path: Torso/Head + classID: 4 + script: {fileID: 0} + flags: 16 m_EulerEditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: Torso + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: Torso + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: Torso + classID: 4 + script: {fileID: 0} + flags: 0 - serializedVersion: 2 curve: serializedVersion: 2 @@ -1336,7 +1640,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.z - path: Torso/Arm R + path: Torso/Head classID: 4 script: {fileID: 0} flags: 0 @@ -1348,7 +1652,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.y - path: Torso/Arm R + path: Torso/Head classID: 4 script: {fileID: 0} flags: 0 @@ -1360,7 +1664,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.x - path: Torso/Arm R + path: Torso/Head classID: 4 script: {fileID: 0} flags: 0 @@ -1372,7 +1676,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.z - path: Torso/Leg L U + path: Torso/Arm R classID: 4 script: {fileID: 0} flags: 0 @@ -1384,7 +1688,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.y - path: Torso/Leg L U + path: Torso/Arm R classID: 4 script: {fileID: 0} flags: 0 @@ -1396,7 +1700,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.x - path: Torso/Leg L U + path: Torso/Arm R classID: 4 script: {fileID: 0} flags: 0 @@ -1480,7 +1784,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.z - path: Torso + path: Torso/Leg L U classID: 4 script: {fileID: 0} flags: 0 @@ -1492,7 +1796,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.y - path: Torso + path: Torso/Leg L U classID: 4 script: {fileID: 0} flags: 0 @@ -1504,7 +1808,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.x - path: Torso + path: Torso/Leg L U classID: 4 script: {fileID: 0} flags: 0 diff --git a/Assets/Games/Platformer/Platformer.unity b/Assets/Games/Platformer/Platformer.unity index 5e39b19..d53b16c 100644 --- a/Assets/Games/Platformer/Platformer.unity +++ b/Assets/Games/Platformer/Platformer.unity @@ -174,6 +174,7 @@ GameObject: m_Component: - component: {fileID: 36018669} - component: {fileID: 36018670} + - component: {fileID: 36018671} m_Layer: 0 m_Name: Arm L m_TagString: Untagged @@ -251,6 +252,52 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!61 &36018671 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 36018668} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: -0.25} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 1} + oldSize: {x: 0.0625, y: 0.5} + newSize: {x: 0.8125, y: 0.5625} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 0.0625, y: 0.5} + m_EdgeRadius: 0 --- !u!1 &56161603 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6546762253351562952, guid: ebfcd0c20e648c041b2f37e0de297d69, type: 3} @@ -266,6 +313,7 @@ GameObject: m_Component: - component: {fileID: 292682715} - component: {fileID: 292682716} + - component: {fileID: 292682717} m_Layer: 0 m_Name: Torso m_TagString: Untagged @@ -348,6 +396,52 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!61 &292682717 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 292682714} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: -0.25} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 1} + oldSize: {x: 0.0625, y: 0.5} + newSize: {x: 0.8125, y: 0.5625} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 0.0625, y: 0.5} + m_EdgeRadius: 0 --- !u!1 &348042967 GameObject: m_ObjectHideFlags: 0 @@ -358,6 +452,7 @@ GameObject: m_Component: - component: {fileID: 348042968} - component: {fileID: 348042969} + - component: {fileID: 348042970} m_Layer: 0 m_Name: Leg L L m_TagString: Untagged @@ -435,6 +530,52 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!61 &348042970 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 348042967} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: -0.25} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 1} + oldSize: {x: 0.0625, y: 0.5} + newSize: {x: 0.8125, y: 0.5625} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 0.0625, y: 0.5} + m_EdgeRadius: 0 --- !u!1001 &543363806 PrefabInstance: m_ObjectHideFlags: 0 @@ -12157,6 +12298,7 @@ GameObject: m_Component: - component: {fileID: 1355961160} - component: {fileID: 1355961159} + - component: {fileID: 1355961161} m_Layer: 0 m_Name: Bones m_TagString: Untagged @@ -12176,7 +12318,7 @@ Animator: m_Avatar: {fileID: 0} m_Controller: {fileID: 9100000, guid: 8a738d31dc8884ffeb8292972ba3cff6, type: 2} m_CullingMode: 0 - m_UpdateMode: 0 + m_UpdateMode: 1 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 m_StabilizeFeet: 0 @@ -12195,13 +12337,40 @@ Transform: m_GameObject: {fileID: 1355961158} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 25, y: -2, z: 0} + m_LocalPosition: {x: -2.16, y: 14.08, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 292682715} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!50 &1355961161 +Rigidbody2D: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1355961158} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDamping: 0 + m_AngularDamping: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 --- !u!1 &1399509873 GameObject: m_ObjectHideFlags: 0 @@ -12212,6 +12381,7 @@ GameObject: m_Component: - component: {fileID: 1399509874} - component: {fileID: 1399509875} + - component: {fileID: 1399509876} m_Layer: 0 m_Name: Leg R L m_TagString: Untagged @@ -12289,6 +12459,52 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!61 &1399509876 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1399509873} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: -0.25} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 1} + oldSize: {x: 0.0625, y: 0.5} + newSize: {x: 0.8125, y: 0.5625} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 0.0625, y: 0.5} + m_EdgeRadius: 0 --- !u!1 &1405104009 GameObject: m_ObjectHideFlags: 0 @@ -12299,6 +12515,7 @@ GameObject: m_Component: - component: {fileID: 1405104010} - component: {fileID: 1405104011} + - component: {fileID: 1405104012} m_Layer: 0 m_Name: Arm R m_TagString: Untagged @@ -12376,6 +12593,52 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!61 &1405104012 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1405104009} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: -0.25} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 1} + oldSize: {x: 0.0625, y: 0.5} + newSize: {x: 0.8125, y: 0.5625} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 0.0625, y: 0.5} + m_EdgeRadius: 0 --- !u!1 &1446289253 GameObject: m_ObjectHideFlags: 0 @@ -12386,6 +12649,7 @@ GameObject: m_Component: - component: {fileID: 1446289254} - component: {fileID: 1446289255} + - component: {fileID: 1446289256} m_Layer: 0 m_Name: Leg L U m_TagString: Untagged @@ -12464,6 +12728,52 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!61 &1446289256 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1446289253} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: -0.25} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 1} + oldSize: {x: 0.0625, y: 0.5} + newSize: {x: 0.8125, y: 0.5625} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 0.0625, y: 0.5} + m_EdgeRadius: 0 --- !u!1 &1674350449 GameObject: m_ObjectHideFlags: 0 @@ -12474,6 +12784,7 @@ GameObject: m_Component: - component: {fileID: 1674350450} - component: {fileID: 1674350451} + - component: {fileID: 1674350452} m_Layer: 0 m_Name: Head m_TagString: Untagged @@ -12495,7 +12806,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 292682715} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} --- !u!212 &1674350451 SpriteRenderer: m_ObjectHideFlags: 0 @@ -12551,6 +12862,52 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!61 &1674350452 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1674350449} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 0.5, y: 0.5} + newSize: {x: 0.8125, y: 0.5625} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 0.5, y: 0.5} + m_EdgeRadius: 0 --- !u!1 &1758254987 GameObject: m_ObjectHideFlags: 0 @@ -12639,6 +12996,7 @@ GameObject: m_Component: - component: {fileID: 1882468358} - component: {fileID: 1882468359} + - component: {fileID: 1882468360} m_Layer: 0 m_Name: Leg R U m_TagString: Untagged @@ -12717,6 +13075,52 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!61 &1882468360 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1882468357} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: -0.25} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 1} + oldSize: {x: 0.0625, y: 0.5} + newSize: {x: 0.8125, y: 0.5625} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 0.0625, y: 0.5} + m_EdgeRadius: 0 --- !u!1001 &2115507663656225473 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Games/Trevor.meta b/Assets/Games/Trevor.meta new file mode 100644 index 0000000..973bd5a --- /dev/null +++ b/Assets/Games/Trevor.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 66bb6b36bfc1e49c0b61e5685850417a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Games/Trevor/Trevor.cs b/Assets/Games/Trevor/Trevor.cs new file mode 100644 index 0000000..6f8eec8 --- /dev/null +++ b/Assets/Games/Trevor/Trevor.cs @@ -0,0 +1,18 @@ +using UnityEngine; +using UnityEngine.InputSystem; + +public class Trevor : MonoBehaviour +{ + [SerializeField] private float speed; + + void Start() + { + + } + + void Update() + { + Vector2 direction = InputSystem.actions.FindAction("Player 1 Move").ReadValue(); + transform.position += speed * (Vector3)direction * Time.deltaTime; + } +} diff --git a/Assets/Games/Trevor/Trevor.cs.meta b/Assets/Games/Trevor/Trevor.cs.meta new file mode 100644 index 0000000..bd53646 --- /dev/null +++ b/Assets/Games/Trevor/Trevor.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: ba8c0359d26a446ae8b41269b13ac727 \ No newline at end of file diff --git a/Assets/Games/Trevor/Trevor.unity b/Assets/Games/Trevor/Trevor.unity new file mode 100644 index 0000000..528423e --- /dev/null +++ b/Assets/Games/Trevor/Trevor.unity @@ -0,0 +1,365 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 10 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 3 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 13 + m_BakeOnSceneLoad: 0 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 0 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 12 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 1 + m_PVRDenoiserTypeDirect: 1 + m_PVRDenoiserTypeIndirect: 1 + m_PVRDenoiserTypeAO: 1 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 1 + m_PVRFilteringGaussRadiusAO: 1 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 + m_LightingDataAsset: {fileID: 20201, guid: 0000000000000000f000000000000000, type: 0} + m_LightingSettings: {fileID: 0} +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 3 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + buildHeightMesh: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &1235166319 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1235166322} + - component: {fileID: 1235166321} + - component: {fileID: 1235166320} + - component: {fileID: 1235166323} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!81 &1235166320 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1235166319} + m_Enabled: 1 +--- !u!20 &1235166321 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1235166319} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 1 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &1235166322 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1235166319} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1235166323 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1235166319} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_VolumeFrameworkUpdateModeOption: 2 + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_AllowXRRendering: 1 + m_AllowHDROutput: 1 + m_UseScreenCoordOverride: 0 + m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} + m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_Version: 2 + m_TaaSettings: + m_Quality: 3 + m_FrameInfluence: 0.1 + m_JitterScale: 1 + m_MipBias: 0 + m_VarianceClampScale: 0.9 + m_ContrastAdaptiveSharpening: 0 +--- !u!1 &1772125910 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1772125913} + - component: {fileID: 1772125912} + - component: {fileID: 1772125911} + m_Layer: 0 + m_Name: Square + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1772125911 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1772125910} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ba8c0359d26a446ae8b41269b13ac727, type: 3} + m_Name: + m_EditorClassIdentifier: + speed: 1 +--- !u!212 &1772125912 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1772125910} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &1772125913 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1772125910} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.8951967, y: -0.54096967, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 1235166322} + - {fileID: 1772125913} diff --git a/Assets/Games/Trevor/Trevor.unity.meta b/Assets/Games/Trevor/Trevor.unity.meta new file mode 100644 index 0000000..4f209c2 --- /dev/null +++ b/Assets/Games/Trevor/Trevor.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 5c0b2030ed36245158311e6d41e2d384 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: From 6dffb83a915fd32353d551388f50103ee91531e8 Mon Sep 17 00:00:00 2001 From: RochesterX Date: Tue, 14 Jan 2025 10:57:32 -0500 Subject: [PATCH 08/25] Add first brand asset --- Unity 5.png | Bin 0 -> 93139 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Unity 5.png diff --git a/Unity 5.png b/Unity 5.png new file mode 100644 index 0000000000000000000000000000000000000000..cbe81bf1f9767d84a4b731f8a638dded8e56ef1a GIT binary patch literal 93139 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 acC6dyA<=~<3o-uN2@^vL1Ek)gm;VD?Xb{H$ literal 0 HcmV?d00001 From b5cc70ad431df2af827a7d0c438b9fc8140fa424 Mon Sep 17 00:00:00 2001 From: RochesterX Date: Tue, 14 Jan 2025 11:40:09 -0500 Subject: [PATCH 09/25] Add player joining In the platformer scene, whenever you connect a new keyboard or controller, or interact with one already connected, a new player will be created and tied to that input device. Please try to break this system to make sure it works properly. --- .../Games/Platformer/Platformer Player.prefab | 31 + Assets/Games/Platformer/Platformer.unity | 233 +++--- .../Platformer/PlatformerCameraMovement.cs | 2 + .../Platformer/PlatformerPlayerMovement.cs | 35 +- .../Platformer/Player Actions.inputactions | 719 ++++++++++++++++++ .../Player Actions.inputactions.meta | 14 + Assets/PlayerManager.cs | 31 + Assets/PlayerManager.cs.meta | 2 + 8 files changed, 895 insertions(+), 172 deletions(-) create mode 100644 Assets/Games/Platformer/Player Actions.inputactions create mode 100644 Assets/Games/Platformer/Player Actions.inputactions.meta create mode 100644 Assets/PlayerManager.cs create mode 100644 Assets/PlayerManager.cs.meta diff --git a/Assets/Games/Platformer/Platformer Player.prefab b/Assets/Games/Platformer/Platformer Player.prefab index 907e81b..5f6f5dc 100644 --- a/Assets/Games/Platformer/Platformer Player.prefab +++ b/Assets/Games/Platformer/Platformer Player.prefab @@ -87,6 +87,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 627266363752542778} + - component: {fileID: 5205514565969078994} - component: {fileID: 4323437100190106747} - component: {fileID: 9112988359646506999} - component: {fileID: 2791557175355662981} @@ -115,6 +116,36 @@ Transform: - {fileID: 317069132541983608} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &5205514565969078994 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6546762253351562952} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Actions: {fileID: -944628639613478452, guid: 6cbaae0ad99590d468c8b501c0452c36, type: 3} + m_NotificationBehavior: 0 + m_UIInputModule: {fileID: 0} + m_DeviceLostEvent: + m_PersistentCalls: + m_Calls: [] + m_DeviceRegainedEvent: + m_PersistentCalls: + m_Calls: [] + m_ControlsChangedEvent: + m_PersistentCalls: + m_Calls: [] + m_ActionEvents: [] + m_NeverAutoSwitchControlSchemes: 0 + m_DefaultControlScheme: + m_DefaultActionMap: Player + m_SplitScreenIndex: -1 + m_Camera: {fileID: 0} --- !u!212 &4323437100190106747 SpriteRenderer: m_ObjectHideFlags: 0 diff --git a/Assets/Games/Platformer/Platformer.unity b/Assets/Games/Platformer/Platformer.unity index 5e39b19..4d9150e 100644 --- a/Assets/Games/Platformer/Platformer.unity +++ b/Assets/Games/Platformer/Platformer.unity @@ -251,11 +251,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &56161603 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6546762253351562952, guid: ebfcd0c20e648c041b2f37e0de297d69, type: 3} - m_PrefabInstance: {fileID: 2115507663656225473} - m_PrefabAsset: {fileID: 0} --- !u!1 &292682714 GameObject: m_ObjectHideFlags: 0 @@ -435,72 +430,96 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1001 &543363806 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 627266363752542778, guid: ebfcd0c20e648c041b2f37e0de297d69, type: 3} - propertyPath: m_LocalPosition.x - value: 12 - objectReference: {fileID: 0} - - target: {fileID: 627266363752542778, guid: ebfcd0c20e648c041b2f37e0de297d69, type: 3} - propertyPath: m_LocalPosition.y - value: 6.5 - objectReference: {fileID: 0} - - target: {fileID: 627266363752542778, guid: ebfcd0c20e648c041b2f37e0de297d69, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 627266363752542778, guid: ebfcd0c20e648c041b2f37e0de297d69, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 627266363752542778, guid: ebfcd0c20e648c041b2f37e0de297d69, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 627266363752542778, guid: ebfcd0c20e648c041b2f37e0de297d69, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 627266363752542778, guid: ebfcd0c20e648c041b2f37e0de297d69, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 627266363752542778, guid: ebfcd0c20e648c041b2f37e0de297d69, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 627266363752542778, guid: ebfcd0c20e648c041b2f37e0de297d69, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 627266363752542778, guid: ebfcd0c20e648c041b2f37e0de297d69, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6546762253351562952, guid: ebfcd0c20e648c041b2f37e0de297d69, type: 3} - propertyPath: m_Name - value: Player 2 - objectReference: {fileID: 0} - - target: {fileID: 9112988359646506999, guid: ebfcd0c20e648c041b2f37e0de297d69, type: 3} - propertyPath: player - value: 2 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: ebfcd0c20e648c041b2f37e0de297d69, type: 3} ---- !u!1 &543363807 stripped +--- !u!1 &640873643 GameObject: - m_CorrespondingSourceObject: {fileID: 6546762253351562952, guid: ebfcd0c20e648c041b2f37e0de297d69, type: 3} - m_PrefabInstance: {fileID: 543363806} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 640873645} + - component: {fileID: 640873644} + - component: {fileID: 640873646} + m_Layer: 0 + m_Name: Input + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &640873644 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 640873643} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 621567455fd1c4ceb811cc8a00b6a1a5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_NotificationBehavior: 0 + m_MaxPlayerCount: 4 + m_AllowJoining: 1 + m_JoinBehavior: 0 + m_PlayerJoinedEvent: + m_PersistentCalls: + m_Calls: [] + m_PlayerLeftEvent: + m_PersistentCalls: + m_Calls: [] + m_JoinAction: + m_UseReference: 0 + m_Action: + m_Name: Join + m_Type: 0 + m_ExpectedControlType: + m_Id: 1fb2e718-d8c9-40be-b4fe-4e9aca62a4e0 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_Reference: {fileID: 0} + m_PlayerPrefab: {fileID: 6546762253351562952, guid: ebfcd0c20e648c041b2f37e0de297d69, type: 3} + m_SplitScreen: 0 + m_MaintainAspectRatioInSplitScreen: 0 + m_FixedNumberOfSplitScreens: -1 + m_SplitScreenRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!4 &640873645 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 640873643} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -2.2500002, y: 16, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &640873646 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 640873643} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 33e0fad1e452e0140bc99e780d4dda4f, type: 3} + m_Name: + m_EditorClassIdentifier: + spawnPosition: {x: -2.25, y: 16} --- !u!1 &1178732237 GameObject: m_ObjectHideFlags: 0 @@ -12717,67 +12736,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1001 &2115507663656225473 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 627266363752542778, guid: ebfcd0c20e648c041b2f37e0de297d69, type: 3} - propertyPath: m_LocalPosition.x - value: -23.5 - objectReference: {fileID: 0} - - target: {fileID: 627266363752542778, guid: ebfcd0c20e648c041b2f37e0de297d69, type: 3} - propertyPath: m_LocalPosition.y - value: -4.5 - objectReference: {fileID: 0} - - target: {fileID: 627266363752542778, guid: ebfcd0c20e648c041b2f37e0de297d69, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 627266363752542778, guid: ebfcd0c20e648c041b2f37e0de297d69, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 627266363752542778, guid: ebfcd0c20e648c041b2f37e0de297d69, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 627266363752542778, guid: ebfcd0c20e648c041b2f37e0de297d69, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 627266363752542778, guid: ebfcd0c20e648c041b2f37e0de297d69, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 627266363752542778, guid: ebfcd0c20e648c041b2f37e0de297d69, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 627266363752542778, guid: ebfcd0c20e648c041b2f37e0de297d69, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 627266363752542778, guid: ebfcd0c20e648c041b2f37e0de297d69, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6546762253351562952, guid: ebfcd0c20e648c041b2f37e0de297d69, type: 3} - propertyPath: m_Name - value: Player 1 - objectReference: {fileID: 0} - - target: {fileID: 9112988359646506999, guid: ebfcd0c20e648c041b2f37e0de297d69, type: 3} - propertyPath: player - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: ebfcd0c20e648c041b2f37e0de297d69, type: 3} --- !u!1001 &8682934954266721942 PrefabInstance: m_ObjectHideFlags: 0 @@ -12789,19 +12747,7 @@ PrefabInstance: - target: {fileID: 1277363986118001863, guid: e659ce6dc4d58ff4f9726fa05e1bab20, type: 3} propertyPath: player value: - objectReference: {fileID: 56161603} - - target: {fileID: 1277363986118001863, guid: e659ce6dc4d58ff4f9726fa05e1bab20, type: 3} - propertyPath: players.Array.size - value: 2 objectReference: {fileID: 0} - - target: {fileID: 1277363986118001863, guid: e659ce6dc4d58ff4f9726fa05e1bab20, type: 3} - propertyPath: 'players.Array.data[0]' - value: - objectReference: {fileID: 56161603} - - target: {fileID: 1277363986118001863, guid: e659ce6dc4d58ff4f9726fa05e1bab20, type: 3} - propertyPath: 'players.Array.data[1]' - value: - objectReference: {fileID: 543363807} - target: {fileID: 2927715701766480068, guid: e659ce6dc4d58ff4f9726fa05e1bab20, type: 3} propertyPath: m_Name value: Platformer Camera @@ -12857,7 +12803,6 @@ SceneRoots: m_Roots: - {fileID: 8682934954266721942} - {fileID: 322321} - - {fileID: 2115507663656225473} - - {fileID: 543363806} - {fileID: 1758254989} - {fileID: 1355961160} + - {fileID: 640873645} diff --git a/Assets/Games/Platformer/PlatformerCameraMovement.cs b/Assets/Games/Platformer/PlatformerCameraMovement.cs index a78a70c..71741b9 100644 --- a/Assets/Games/Platformer/PlatformerCameraMovement.cs +++ b/Assets/Games/Platformer/PlatformerCameraMovement.cs @@ -17,6 +17,8 @@ public class PlatformerCameraMovement : MonoBehaviour private void Update() { + if (players.Count == 0) return; + Vector3 playerAverage = Vector3.zero; foreach (GameObject player in players) { diff --git a/Assets/Games/Platformer/PlatformerPlayerMovement.cs b/Assets/Games/Platformer/PlatformerPlayerMovement.cs index c183157..7cc70ff 100644 --- a/Assets/Games/Platformer/PlatformerPlayerMovement.cs +++ b/Assets/Games/Platformer/PlatformerPlayerMovement.cs @@ -30,6 +30,7 @@ public class PlayerMovement : MonoBehaviour private Rigidbody2D body; private BoxCollider2D collide; + private PlayerInput input; private Vector2 spawnPosition; @@ -52,6 +53,7 @@ public class PlayerMovement : MonoBehaviour body = GetComponent(); collide = GetComponent(); + input = GetComponent(); } private void Update() @@ -137,7 +139,7 @@ public class PlayerMovement : MonoBehaviour body.linearVelocityX *= walkSmooth; //} - if (transform.position == positionLastFrame && (InputSystem.actions.FindAction($"Player {player} Move").ReadValue().x == 0)) + if (transform.position == positionLastFrame && (input.actions.FindAction("Move").ReadValue().x == 0)) { virtualAxisX = 0; } @@ -147,36 +149,13 @@ public class PlayerMovement : MonoBehaviour private void UpdateVirtualAxis() { - virtualButtonJump = InputSystem.actions.FindAction($"Player {player} Action").ReadValue(); - virtualButtonJumpLastFrame = InputSystem.actions.FindAction($"Player {player} Action").WasPressedThisFrame() ? 1 : 0; + virtualButtonJump = input.actions.FindAction("Action").ReadValue(); + virtualButtonJumpLastFrame = input.actions.FindAction("Action").WasPressedThisFrame() ? 1 : 0; - virtualAxisX = InputSystem.actions.FindAction($"Player {player} Move").ReadValue().x; + virtualAxisX = input.actions.FindAction("Move").ReadValue().x; return; - - // From https://discussions.unity.com/t/manually-smooth-input-getaxisraw/225141/4 - float basicallyRawAxis = InputSystem.actions.FindAction($"Player {player} Move").ReadValue().x; - float sensitivity = 3; - float gravity = 3; - float time = Time.deltaTime; - - if (basicallyRawAxis != 0) - { - virtualAxisX = Mathf.Clamp(virtualAxisX + basicallyRawAxis * sensitivity * time * turnaroundMultiplier, -1f, 1f); - } - else - { - virtualAxisX = Mathf.Clamp01(Mathf.Abs(virtualAxisX) - gravity * time) * Mathf.Sign(virtualAxisX); - } - - if ((basicallyRawAxis > 0f && virtualAxisX < 0f) || (basicallyRawAxis < 0f && virtualAxisX > 0f)) - { - turnaroundMultiplier = 2; - } - else - { - turnaroundMultiplier = 1; - } } + private void OnTriggerEnter2D(Collider2D collision) { if (collision.gameObject.CompareTag("Platformer Hazard")) diff --git a/Assets/Games/Platformer/Player Actions.inputactions b/Assets/Games/Platformer/Player Actions.inputactions new file mode 100644 index 0000000..5d8da6a --- /dev/null +++ b/Assets/Games/Platformer/Player Actions.inputactions @@ -0,0 +1,719 @@ +{ + "name": "Player Actions", + "maps": [ + { + "name": "Player", + "id": "df70fa95-8a34-4494-b137-73ab6b9c7d37", + "actions": [ + { + "name": "Move", + "type": "Value", + "id": "351f2ccd-1f9f-44bf-9bec-d62ac5c5f408", + "expectedControlType": "Vector2", + "processors": "", + "interactions": "", + "initialStateCheck": true + }, + { + "name": "Action", + "type": "Button", + "id": "6c333d17-3450-4446-b7e0-a49595f68ba7", + "expectedControlType": "", + "processors": "", + "interactions": "", + "initialStateCheck": false + } + ], + "bindings": [ + { + "name": "", + "id": "978bfe49-cc26-4a3d-ab7b-7d7a29327403", + "path": "/leftStick", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Move", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "1635d3fe-58b6-4ba9-a4e2-f4b964f6b5c8", + "path": "/{Primary2DAxis}", + "interactions": "", + "processors": "", + "groups": "XR", + "action": "Move", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "9bcccf09-afdb-481c-80ec-fc1f2cb11ae3", + "path": "/dpad", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Move", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "WASD", + "id": "00ca640b-d935-4593-8157-c05846ea39b3", + "path": "Dpad", + "interactions": "", + "processors": "", + "groups": "", + "action": "Move", + "isComposite": true, + "isPartOfComposite": false + }, + { + "name": "up", + "id": "e2062cb9-1b15-46a2-838c-2f8d72a0bdd9", + "path": "/w", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Move", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "down", + "id": "320bffee-a40b-4347-ac70-c210eb8bc73a", + "path": "/s", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Move", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "left", + "id": "d2581a9b-1d11-4566-b27d-b92aff5fabbc", + "path": "/a", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Move", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "right", + "id": "fcfe95b8-67b9-4526-84b5-5d0bc98d6400", + "path": "/d", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Move", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "", + "id": "6f8632d2-312f-4559-8fdd-d17a3c226436", + "path": "/e", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Action", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "d5711f4f-d742-4cb9-ac9f-f3d91107e38a", + "path": "/buttonSouth", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Action", + "isComposite": false, + "isPartOfComposite": false + } + ] + }, + { + "name": "UI", + "id": "272f6d14-89ba-496f-b7ff-215263d3219f", + "actions": [ + { + "name": "Navigate", + "type": "PassThrough", + "id": "c95b2375-e6d9-4b88-9c4c-c5e76515df4b", + "expectedControlType": "Vector2", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "Submit", + "type": "Button", + "id": "7607c7b6-cd76-4816-beef-bd0341cfe950", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "Cancel", + "type": "Button", + "id": "15cef263-9014-4fd5-94d9-4e4a6234a6ef", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "Point", + "type": "PassThrough", + "id": "32b35790-4ed0-4e9a-aa41-69ac6d629449", + "expectedControlType": "Vector2", + "processors": "", + "interactions": "", + "initialStateCheck": true + }, + { + "name": "Click", + "type": "PassThrough", + "id": "3c7022bf-7922-4f7c-a998-c437916075ad", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": true + }, + { + "name": "RightClick", + "type": "PassThrough", + "id": "44b200b1-1557-4083-816c-b22cbdf77ddf", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "MiddleClick", + "type": "PassThrough", + "id": "dad70c86-b58c-4b17-88ad-f5e53adf419e", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "ScrollWheel", + "type": "PassThrough", + "id": "0489e84a-4833-4c40-bfae-cea84b696689", + "expectedControlType": "Vector2", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "TrackedDevicePosition", + "type": "PassThrough", + "id": "24908448-c609-4bc3-a128-ea258674378a", + "expectedControlType": "Vector3", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "TrackedDeviceOrientation", + "type": "PassThrough", + "id": "9caa3d8a-6b2f-4e8e-8bad-6ede561bd9be", + "expectedControlType": "Quaternion", + "processors": "", + "interactions": "", + "initialStateCheck": false + } + ], + "bindings": [ + { + "name": "Gamepad", + "id": "809f371f-c5e2-4e7a-83a1-d867598f40dd", + "path": "2DVector", + "interactions": "", + "processors": "", + "groups": "", + "action": "Navigate", + "isComposite": true, + "isPartOfComposite": false + }, + { + "name": "up", + "id": "14a5d6e8-4aaf-4119-a9ef-34b8c2c548bf", + "path": "/leftStick/up", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "up", + "id": "9144cbe6-05e1-4687-a6d7-24f99d23dd81", + "path": "/rightStick/up", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "down", + "id": "2db08d65-c5fb-421b-983f-c71163608d67", + "path": "/leftStick/down", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "down", + "id": "58748904-2ea9-4a80-8579-b500e6a76df8", + "path": "/rightStick/down", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "left", + "id": "8ba04515-75aa-45de-966d-393d9bbd1c14", + "path": "/leftStick/left", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "left", + "id": "712e721c-bdfb-4b23-a86c-a0d9fcfea921", + "path": "/rightStick/left", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "right", + "id": "fcd248ae-a788-4676-a12e-f4d81205600b", + "path": "/leftStick/right", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "right", + "id": "1f04d9bc-c50b-41a1-bfcc-afb75475ec20", + "path": "/rightStick/right", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "", + "id": "fb8277d4-c5cd-4663-9dc7-ee3f0b506d90", + "path": "/dpad", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "Joystick", + "id": "e25d9774-381c-4a61-b47c-7b6b299ad9f9", + "path": "2DVector", + "interactions": "", + "processors": "", + "groups": "", + "action": "Navigate", + "isComposite": true, + "isPartOfComposite": false + }, + { + "name": "up", + "id": "3db53b26-6601-41be-9887-63ac74e79d19", + "path": "/stick/up", + "interactions": "", + "processors": "", + "groups": "Joystick", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "down", + "id": "0cb3e13e-3d90-4178-8ae6-d9c5501d653f", + "path": "/stick/down", + "interactions": "", + "processors": "", + "groups": "Joystick", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "left", + "id": "0392d399-f6dd-4c82-8062-c1e9c0d34835", + "path": "/stick/left", + "interactions": "", + "processors": "", + "groups": "Joystick", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "right", + "id": "942a66d9-d42f-43d6-8d70-ecb4ba5363bc", + "path": "/stick/right", + "interactions": "", + "processors": "", + "groups": "Joystick", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "Keyboard", + "id": "ff527021-f211-4c02-933e-5976594c46ed", + "path": "2DVector", + "interactions": "", + "processors": "", + "groups": "", + "action": "Navigate", + "isComposite": true, + "isPartOfComposite": false + }, + { + "name": "up", + "id": "563fbfdd-0f09-408d-aa75-8642c4f08ef0", + "path": "/w", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "up", + "id": "eb480147-c587-4a33-85ed-eb0ab9942c43", + "path": "/upArrow", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "down", + "id": "2bf42165-60bc-42ca-8072-8c13ab40239b", + "path": "/s", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "down", + "id": "85d264ad-e0a0-4565-b7ff-1a37edde51ac", + "path": "/downArrow", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "left", + "id": "74214943-c580-44e4-98eb-ad7eebe17902", + "path": "/a", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "left", + "id": "cea9b045-a000-445b-95b8-0c171af70a3b", + "path": "/leftArrow", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "right", + "id": "8607c725-d935-4808-84b1-8354e29bab63", + "path": "/d", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "right", + "id": "4cda81dc-9edd-4e03-9d7c-a71a14345d0b", + "path": "/rightArrow", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "", + "id": "9e92bb26-7e3b-4ec4-b06b-3c8f8e498ddc", + "path": "*/{Submit}", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse;Gamepad;Touch;Joystick;XR", + "action": "Submit", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "82627dcc-3b13-4ba9-841d-e4b746d6553e", + "path": "*/{Cancel}", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse;Gamepad;Touch;Joystick;XR", + "action": "Cancel", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "c52c8e0b-8179-41d3-b8a1-d149033bbe86", + "path": "/position", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Point", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "e1394cbc-336e-44ce-9ea8-6007ed6193f7", + "path": "/position", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Point", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "5693e57a-238a-46ed-b5ae-e64e6e574302", + "path": "/touch*/position", + "interactions": "", + "processors": "", + "groups": "Touch", + "action": "Point", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "4faf7dc9-b979-4210-aa8c-e808e1ef89f5", + "path": "/leftButton", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Click", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "8d66d5ba-88d7-48e6-b1cd-198bbfef7ace", + "path": "/tip", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Click", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "47c2a644-3ebc-4dae-a106-589b7ca75b59", + "path": "/touch*/press", + "interactions": "", + "processors": "", + "groups": "Touch", + "action": "Click", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "bb9e6b34-44bf-4381-ac63-5aa15d19f677", + "path": "/trigger", + "interactions": "", + "processors": "", + "groups": "XR", + "action": "Click", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "38c99815-14ea-4617-8627-164d27641299", + "path": "/scroll", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "ScrollWheel", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "4c191405-5738-4d4b-a523-c6a301dbf754", + "path": "/rightButton", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "RightClick", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "24066f69-da47-44f3-a07e-0015fb02eb2e", + "path": "/middleButton", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "MiddleClick", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "7236c0d9-6ca3-47cf-a6ee-a97f5b59ea77", + "path": "/devicePosition", + "interactions": "", + "processors": "", + "groups": "XR", + "action": "TrackedDevicePosition", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "23e01e3a-f935-4948-8d8b-9bcac77714fb", + "path": "/deviceRotation", + "interactions": "", + "processors": "", + "groups": "XR", + "action": "TrackedDeviceOrientation", + "isComposite": false, + "isPartOfComposite": false + } + ] + } + ], + "controlSchemes": [ + { + "name": "Keyboard&Mouse", + "bindingGroup": "Keyboard&Mouse", + "devices": [ + { + "devicePath": "", + "isOptional": false, + "isOR": false + }, + { + "devicePath": "", + "isOptional": false, + "isOR": false + } + ] + }, + { + "name": "Gamepad", + "bindingGroup": "Gamepad", + "devices": [ + { + "devicePath": "", + "isOptional": false, + "isOR": false + } + ] + }, + { + "name": "Touch", + "bindingGroup": "Touch", + "devices": [ + { + "devicePath": "", + "isOptional": false, + "isOR": false + } + ] + }, + { + "name": "Joystick", + "bindingGroup": "Joystick", + "devices": [ + { + "devicePath": "", + "isOptional": false, + "isOR": false + } + ] + }, + { + "name": "XR", + "bindingGroup": "XR", + "devices": [ + { + "devicePath": "", + "isOptional": false, + "isOR": false + } + ] + } + ] +} \ No newline at end of file diff --git a/Assets/Games/Platformer/Player Actions.inputactions.meta b/Assets/Games/Platformer/Player Actions.inputactions.meta new file mode 100644 index 0000000..4bbc69d --- /dev/null +++ b/Assets/Games/Platformer/Player Actions.inputactions.meta @@ -0,0 +1,14 @@ +fileFormatVersion: 2 +guid: 6cbaae0ad99590d468c8b501c0452c36 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 8404be70184654265930450def6a9037, type: 3} + generateWrapperCode: 0 + wrapperCodePath: + wrapperClassName: + wrapperCodeNamespace: diff --git a/Assets/PlayerManager.cs b/Assets/PlayerManager.cs new file mode 100644 index 0000000..81c1eb2 --- /dev/null +++ b/Assets/PlayerManager.cs @@ -0,0 +1,31 @@ +using UnityEngine; +using UnityEngine.InputSystem; + +public class PlayerManager : MonoBehaviour +{ + [SerializeField] private Vector2 spawnPosition; + + private PlatformerCameraMovement playerCamera; + + private void Start() + { + GetComponent().onPlayerJoined += OnPlayerJoined; + GetComponent().onPlayerLeft += OnPlayerLeft; + + playerCamera = FindFirstObjectByType(); + } + + private void OnPlayerJoined(PlayerInput playerInput) + { + playerInput.transform.position = spawnPosition; + playerCamera.players.Add(playerInput.gameObject); + print("Player joined"); + } + + private void OnPlayerLeft(PlayerInput playerInput) + { + Destroy(playerInput.gameObject); + playerCamera.players.Remove(playerInput.gameObject); + print("Player left"); + } +} diff --git a/Assets/PlayerManager.cs.meta b/Assets/PlayerManager.cs.meta new file mode 100644 index 0000000..0a48977 --- /dev/null +++ b/Assets/PlayerManager.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 33e0fad1e452e0140bc99e780d4dda4f \ No newline at end of file From 9eb33be4bf1b3237653b7295cd56c7bd71818b89 Mon Sep 17 00:00:00 2001 From: RochesterX Date: Tue, 14 Jan 2025 11:47:29 -0500 Subject: [PATCH 10/25] Update UniversalRenderPipelineGlobalSettings.asset --- Assets/Settings/UniversalRenderPipelineGlobalSettings.asset | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset b/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset index dd5f125..5b22c74 100644 --- a/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset +++ b/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset @@ -54,6 +54,7 @@ MonoBehaviour: - rid: 7752762179098771474 - rid: 7752762179098771475 - rid: 7752762179098771476 + - rid: 8239426011147272263 m_RuntimeSettings: m_List: [] m_AssetVersion: 8 @@ -247,3 +248,7 @@ MonoBehaviour: m_ExportShaderVariants: 1 m_ShaderVariantLogLevel: 0 m_StripRuntimeDebugShaders: 1 + - rid: 8239426011147272263 + type: {class: UniversalRenderPipelineEditorAssets, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} + data: + m_DefaultSettingsVolumeProfile: {fileID: 11400000, guid: eda47df5b85f4f249abf7abd73db2cb2, type: 2} From 4e64f90a586b7617a248b5842816ae53532fcc0e Mon Sep 17 00:00:00 2001 From: RochesterX Date: Wed, 15 Jan 2025 13:34:36 -0500 Subject: [PATCH 11/25] Make PlayerManager a singleton; update to editor version 6000.0.33f1 --- .../Platformer/PlatformerCameraMovement.cs | 2 +- Assets/PlayerManager.cs | 25 +++++++++++++++++-- ProjectSettings/ProjectVersion.txt | 4 +-- 3 files changed, 26 insertions(+), 5 deletions(-) diff --git a/Assets/Games/Platformer/PlatformerCameraMovement.cs b/Assets/Games/Platformer/PlatformerCameraMovement.cs index 71741b9..af9dadf 100644 --- a/Assets/Games/Platformer/PlatformerCameraMovement.cs +++ b/Assets/Games/Platformer/PlatformerCameraMovement.cs @@ -17,7 +17,7 @@ public class PlatformerCameraMovement : MonoBehaviour private void Update() { - if (players.Count == 0) return; + if (PlayerManager.Instance.players.Count == 0) return; Vector3 playerAverage = Vector3.zero; foreach (GameObject player in players) diff --git a/Assets/PlayerManager.cs b/Assets/PlayerManager.cs index 81c1eb2..a4f22eb 100644 --- a/Assets/PlayerManager.cs +++ b/Assets/PlayerManager.cs @@ -1,12 +1,21 @@ +using System.Collections.Generic; using UnityEngine; using UnityEngine.InputSystem; public class PlayerManager : MonoBehaviour { + public static PlayerManager Instance; + + public List players; [SerializeField] private Vector2 spawnPosition; private PlatformerCameraMovement playerCamera; + private void Awake() + { + Init(); + } + private void Start() { GetComponent().onPlayerJoined += OnPlayerJoined; @@ -18,14 +27,26 @@ public class PlayerManager : MonoBehaviour private void OnPlayerJoined(PlayerInput playerInput) { playerInput.transform.position = spawnPosition; - playerCamera.players.Add(playerInput.gameObject); + players.Add(playerInput.gameObject); print("Player joined"); } private void OnPlayerLeft(PlayerInput playerInput) { Destroy(playerInput.gameObject); - playerCamera.players.Remove(playerInput.gameObject); + players.Remove(playerInput.gameObject); print("Player left"); } + + private void Init() + { + if (Instance == null) + { + Instance = this; + } + else + { + print("A PlayerManager already exists."); + } + } } diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index d1c9097..d5ce6c0 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 6000.0.32f1 -m_EditorVersionWithRevision: 6000.0.32f1 (b2e806cf271c) +m_EditorVersion: 6000.0.33f1 +m_EditorVersionWithRevision: 6000.0.33f1 (433b0a79340b) From 63775c51036603b792b9fb41215a88e33822ec83 Mon Sep 17 00:00:00 2001 From: RochesterX Date: Wed, 15 Jan 2025 14:07:17 -0500 Subject: [PATCH 12/25] Separate respawn script Make respawning a separate script; make Bones respawnable --- .../Games/Platformer/Platformer Player.prefab | 15 + Assets/Games/Platformer/Platformer.unity | 248 +- .../Platformer/PlatformerCameraMovement.cs | 6 +- .../Platformer/PlatformerPlayerMovement.cs | 19 +- Assets/RespawnOnTriggerEnter.cs | 28 + Assets/RespawnOnTriggerEnter.cs.meta | 2 + mono_crash.0.0.json | 8412 +++++++++++++++++ 7 files changed, 8572 insertions(+), 158 deletions(-) create mode 100644 Assets/RespawnOnTriggerEnter.cs create mode 100644 Assets/RespawnOnTriggerEnter.cs.meta create mode 100644 mono_crash.0.0.json diff --git a/Assets/Games/Platformer/Platformer Player.prefab b/Assets/Games/Platformer/Platformer Player.prefab index 5f6f5dc..2494725 100644 --- a/Assets/Games/Platformer/Platformer Player.prefab +++ b/Assets/Games/Platformer/Platformer Player.prefab @@ -90,6 +90,7 @@ GameObject: - component: {fileID: 5205514565969078994} - component: {fileID: 4323437100190106747} - component: {fileID: 9112988359646506999} + - component: {fileID: 8542321013335259419} - component: {fileID: 2791557175355662981} - component: {fileID: 3406519100105273690} - component: {fileID: 251648003544978305} @@ -231,6 +232,20 @@ MonoBehaviour: jumpLenience: 0.1 timeUnableToBeDeclaredNotJumping: 0.1 groundCheckDistance: 0.1 +--- !u!114 &8542321013335259419 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6546762253351562952} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8ce1d588594ee416e9ab629d0b8c07dd, type: 3} + m_Name: + m_EditorClassIdentifier: + spawnPoint: {x: 0, y: 0} + respawnTag: Platformer Hazard --- !u!61 &2791557175355662981 BoxCollider2D: m_ObjectHideFlags: 0 diff --git a/Assets/Games/Platformer/Platformer.unity b/Assets/Games/Platformer/Platformer.unity index d53b16c..141acc3 100644 --- a/Assets/Games/Platformer/Platformer.unity +++ b/Assets/Games/Platformer/Platformer.unity @@ -298,11 +298,6 @@ BoxCollider2D: m_AutoTiling: 0 m_Size: {x: 0.0625, y: 0.5} m_EdgeRadius: 0 ---- !u!1 &56161603 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6546762253351562952, guid: ebfcd0c20e648c041b2f37e0de297d69, type: 3} - m_PrefabInstance: {fileID: 2115507663656225473} - m_PrefabAsset: {fileID: 0} --- !u!1 &292682714 GameObject: m_ObjectHideFlags: 0 @@ -576,72 +571,97 @@ BoxCollider2D: m_AutoTiling: 0 m_Size: {x: 0.0625, y: 0.5} m_EdgeRadius: 0 ---- !u!1001 &543363806 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 627266363752542778, guid: ebfcd0c20e648c041b2f37e0de297d69, type: 3} - propertyPath: m_LocalPosition.x - value: 12 - objectReference: {fileID: 0} - - target: {fileID: 627266363752542778, guid: ebfcd0c20e648c041b2f37e0de297d69, type: 3} - propertyPath: m_LocalPosition.y - value: 6.5 - objectReference: {fileID: 0} - - target: {fileID: 627266363752542778, guid: ebfcd0c20e648c041b2f37e0de297d69, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 627266363752542778, guid: ebfcd0c20e648c041b2f37e0de297d69, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 627266363752542778, guid: ebfcd0c20e648c041b2f37e0de297d69, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 627266363752542778, guid: ebfcd0c20e648c041b2f37e0de297d69, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 627266363752542778, guid: ebfcd0c20e648c041b2f37e0de297d69, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 627266363752542778, guid: ebfcd0c20e648c041b2f37e0de297d69, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 627266363752542778, guid: ebfcd0c20e648c041b2f37e0de297d69, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 627266363752542778, guid: ebfcd0c20e648c041b2f37e0de297d69, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6546762253351562952, guid: ebfcd0c20e648c041b2f37e0de297d69, type: 3} - propertyPath: m_Name - value: Player 2 - objectReference: {fileID: 0} - - target: {fileID: 9112988359646506999, guid: ebfcd0c20e648c041b2f37e0de297d69, type: 3} - propertyPath: player - value: 2 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: ebfcd0c20e648c041b2f37e0de297d69, type: 3} ---- !u!1 &543363807 stripped +--- !u!1 &804358384 GameObject: - m_CorrespondingSourceObject: {fileID: 6546762253351562952, guid: ebfcd0c20e648c041b2f37e0de297d69, type: 3} - m_PrefabInstance: {fileID: 543363806} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 804358387} + - component: {fileID: 804358386} + - component: {fileID: 804358385} + m_Layer: 0 + m_Name: Player Manager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &804358385 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 804358384} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 33e0fad1e452e0140bc99e780d4dda4f, type: 3} + m_Name: + m_EditorClassIdentifier: + players: [] + spawnPosition: {x: -2, y: 15} +--- !u!114 &804358386 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 804358384} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 621567455fd1c4ceb811cc8a00b6a1a5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_NotificationBehavior: 0 + m_MaxPlayerCount: -1 + m_AllowJoining: 1 + m_JoinBehavior: 0 + m_PlayerJoinedEvent: + m_PersistentCalls: + m_Calls: [] + m_PlayerLeftEvent: + m_PersistentCalls: + m_Calls: [] + m_JoinAction: + m_UseReference: 0 + m_Action: + m_Name: + m_Type: 0 + m_ExpectedControlType: + m_Id: 9b26d698-45b8-4b09-bfa5-81c3a8afe391 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_Reference: {fileID: 0} + m_PlayerPrefab: {fileID: 6546762253351562952, guid: ebfcd0c20e648c041b2f37e0de297d69, type: 3} + m_SplitScreen: 0 + m_MaintainAspectRatioInSplitScreen: 0 + m_FixedNumberOfSplitScreens: -1 + m_SplitScreenRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!4 &804358387 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 804358384} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -2, y: 15, z: -10.092264} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1178732237 GameObject: m_ObjectHideFlags: 0 @@ -12299,6 +12319,7 @@ GameObject: - component: {fileID: 1355961160} - component: {fileID: 1355961159} - component: {fileID: 1355961161} + - component: {fileID: 1355961162} m_Layer: 0 m_Name: Bones m_TagString: Untagged @@ -12367,10 +12388,25 @@ Rigidbody2D: m_ExcludeLayers: serializedVersion: 2 m_Bits: 0 - m_Interpolate: 0 + m_Interpolate: 1 m_SleepingMode: 1 - m_CollisionDetection: 0 + m_CollisionDetection: 1 m_Constraints: 0 +--- !u!114 &1355961162 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1355961158} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8ce1d588594ee416e9ab629d0b8c07dd, type: 3} + m_Name: + m_EditorClassIdentifier: + spawnPoint: {x: 14.08, y: 14.08} + spawnPointIsInitialPosition: 1 + respawnTag: Platformer Hazard --- !u!1 &1399509873 GameObject: m_ObjectHideFlags: 0 @@ -13121,67 +13157,6 @@ BoxCollider2D: m_AutoTiling: 0 m_Size: {x: 0.0625, y: 0.5} m_EdgeRadius: 0 ---- !u!1001 &2115507663656225473 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 627266363752542778, guid: ebfcd0c20e648c041b2f37e0de297d69, type: 3} - propertyPath: m_LocalPosition.x - value: -23.5 - objectReference: {fileID: 0} - - target: {fileID: 627266363752542778, guid: ebfcd0c20e648c041b2f37e0de297d69, type: 3} - propertyPath: m_LocalPosition.y - value: -4.5 - objectReference: {fileID: 0} - - target: {fileID: 627266363752542778, guid: ebfcd0c20e648c041b2f37e0de297d69, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 627266363752542778, guid: ebfcd0c20e648c041b2f37e0de297d69, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 627266363752542778, guid: ebfcd0c20e648c041b2f37e0de297d69, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 627266363752542778, guid: ebfcd0c20e648c041b2f37e0de297d69, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 627266363752542778, guid: ebfcd0c20e648c041b2f37e0de297d69, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 627266363752542778, guid: ebfcd0c20e648c041b2f37e0de297d69, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 627266363752542778, guid: ebfcd0c20e648c041b2f37e0de297d69, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 627266363752542778, guid: ebfcd0c20e648c041b2f37e0de297d69, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6546762253351562952, guid: ebfcd0c20e648c041b2f37e0de297d69, type: 3} - propertyPath: m_Name - value: Player 1 - objectReference: {fileID: 0} - - target: {fileID: 9112988359646506999, guid: ebfcd0c20e648c041b2f37e0de297d69, type: 3} - propertyPath: player - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: ebfcd0c20e648c041b2f37e0de297d69, type: 3} --- !u!1001 &8682934954266721942 PrefabInstance: m_ObjectHideFlags: 0 @@ -13193,7 +13168,7 @@ PrefabInstance: - target: {fileID: 1277363986118001863, guid: e659ce6dc4d58ff4f9726fa05e1bab20, type: 3} propertyPath: player value: - objectReference: {fileID: 56161603} + objectReference: {fileID: 0} - target: {fileID: 1277363986118001863, guid: e659ce6dc4d58ff4f9726fa05e1bab20, type: 3} propertyPath: players.Array.size value: 2 @@ -13201,11 +13176,11 @@ PrefabInstance: - target: {fileID: 1277363986118001863, guid: e659ce6dc4d58ff4f9726fa05e1bab20, type: 3} propertyPath: 'players.Array.data[0]' value: - objectReference: {fileID: 56161603} + objectReference: {fileID: 0} - target: {fileID: 1277363986118001863, guid: e659ce6dc4d58ff4f9726fa05e1bab20, type: 3} propertyPath: 'players.Array.data[1]' value: - objectReference: {fileID: 543363807} + objectReference: {fileID: 0} - target: {fileID: 2927715701766480068, guid: e659ce6dc4d58ff4f9726fa05e1bab20, type: 3} propertyPath: m_Name value: Platformer Camera @@ -13261,7 +13236,6 @@ SceneRoots: m_Roots: - {fileID: 8682934954266721942} - {fileID: 322321} - - {fileID: 2115507663656225473} - - {fileID: 543363806} - {fileID: 1758254989} - {fileID: 1355961160} + - {fileID: 804358387} diff --git a/Assets/Games/Platformer/PlatformerCameraMovement.cs b/Assets/Games/Platformer/PlatformerCameraMovement.cs index af9dadf..f21fc57 100644 --- a/Assets/Games/Platformer/PlatformerCameraMovement.cs +++ b/Assets/Games/Platformer/PlatformerCameraMovement.cs @@ -3,8 +3,6 @@ using UnityEngine; public class PlatformerCameraMovement : MonoBehaviour { - public List players; - private Vector3 start; private Vector3 target; public float weight; @@ -17,7 +15,9 @@ public class PlatformerCameraMovement : MonoBehaviour private void Update() { - if (PlayerManager.Instance.players.Count == 0) return; + List players = PlayerManager.Instance.players; + + if (players.Count == 0) return; Vector3 playerAverage = Vector3.zero; foreach (GameObject player in players) diff --git a/Assets/Games/Platformer/PlatformerPlayerMovement.cs b/Assets/Games/Platformer/PlatformerPlayerMovement.cs index 7cc70ff..252e00b 100644 --- a/Assets/Games/Platformer/PlatformerPlayerMovement.cs +++ b/Assets/Games/Platformer/PlatformerPlayerMovement.cs @@ -31,9 +31,6 @@ public class PlayerMovement : MonoBehaviour private Rigidbody2D body; private BoxCollider2D collide; private PlayerInput input; - - private Vector2 spawnPosition; - private bool jumpInputStillValid = false; private float lastTimeJumpPressed; @@ -49,7 +46,7 @@ public class PlayerMovement : MonoBehaviour void Start() { - spawnPosition = transform.position; + GetComponent().spawnPoint = transform.position; body = GetComponent(); collide = GetComponent(); @@ -156,20 +153,6 @@ public class PlayerMovement : MonoBehaviour return; } - private void OnTriggerEnter2D(Collider2D collision) - { - if (collision.gameObject.CompareTag("Platformer Hazard")) - { - Respawn(); - } - } - - private void Respawn() - { - transform.position = spawnPosition; - body.linearVelocity = Vector2.zero; - } - public bool IsBasicallyGrounded() { if (IsPhysicallyGrounded()) diff --git a/Assets/RespawnOnTriggerEnter.cs b/Assets/RespawnOnTriggerEnter.cs new file mode 100644 index 0000000..ba6bde1 --- /dev/null +++ b/Assets/RespawnOnTriggerEnter.cs @@ -0,0 +1,28 @@ +using UnityEngine; + +public class RespawnOnTriggerEnter : MonoBehaviour +{ + public Vector2 spawnPoint; + public bool spawnPointIsInitialPosition = false; + public string respawnTag; + + private void Start() + { + if (spawnPointIsInitialPosition) + { + spawnPoint = transform.position; + } + } + + private void OnTriggerEnter2D(Collider2D other) + { + if (other.CompareTag(respawnTag)) + { + transform.position = spawnPoint; + if (TryGetComponent(out var rb)) + { + rb.linearVelocity = Vector2.zero; + } + } + } +} diff --git a/Assets/RespawnOnTriggerEnter.cs.meta b/Assets/RespawnOnTriggerEnter.cs.meta new file mode 100644 index 0000000..abfb7ff --- /dev/null +++ b/Assets/RespawnOnTriggerEnter.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 8ce1d588594ee416e9ab629d0b8c07dd \ No newline at end of file diff --git a/mono_crash.0.0.json b/mono_crash.0.0.json new file mode 100644 index 0000000..db823c1 --- /dev/null +++ b/mono_crash.0.0.json @@ -0,0 +1,8412 @@ +{ + "protocol_version" : "0.0.6", + "configuration" : { + "version" : "(6.13.0) (explicit/ab2cec9e)", + "tlc" : "__thread", + "sigsgev" : "normal", + "notifications" : "kqueue", + "architecture" : "arm64", + "disabled_features" : "com,shared_perfcounters", + "smallconfig" : "disabled", + "bigarrays" : "disabled", + "softdebug" : "enabled", + "interpreter" : "enabled", + "llvm_support" : "disabled", + "suspend" : "preemptive" + }, + "memory" : { + "Resident Size" : "1494597632", + "Virtual Size" : "430165950464", + "minor_gc_time" : "0", + "major_gc_time" : "27638252", + "minor_gc_count" : "0", + "major_gc_count" : "24", + "major_gc_time_concurrent" : "0" + }, + "threads" : [ + { + "is_managed" : false, + "offset_free_hash" : "0x0", + "offset_rich_hash" : "0x0", + "crashed" : false, + "native_thread_id" : "0x381b5f000", + "thread_info_addr" : "0x12544d400", + "thread_name" : "Thread Pool Worker", + "ctx" : { + "IP" : "0x188826ec8", + "SP" : "0x381b5edc0", + "BP" : "0x381b5ee50" + }, + "unmanaged_frames" : [ + { + "is_managed" : "false", + "native_address" : "0x3104ffad8", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x310635e38", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x3106361b0", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x310635f5c", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x310540d74", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x18889ede4", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x31058eaac", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x310636c20", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x310636acc", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x3106b5fc8", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x3106b5f50", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x1888682e4", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x1888630fc", + "native_offset" : "0x00000" + } + + ] + }, + { + "is_managed" : false, + "offset_free_hash" : "0x0", + "offset_rich_hash" : "0x0", + "crashed" : false, + "native_thread_id" : "0x310d27000", + "thread_info_addr" : "0x11797de00", + "thread_name" : "Finalizer", + "ctx" : { + "IP" : "0x188826eb0", + "SP" : "0x310d26de0", + "BP" : "0x310d26e50" + }, + "unmanaged_frames" : [ + { + "is_managed" : "false", + "native_address" : "0x3104ffad8", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x310635e38", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x3106361b0", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x310635f5c", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x310540d74", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x18889ede4", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x31066f7f8", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x310636c20", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x310636acc", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x3106b5fc8", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x3106b5f50", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x1888682e4", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x1888630fc", + "native_offset" : "0x00000" + } + + ] + }, + { + "is_managed" : true, + "offset_free_hash" : "0x17ab1ac60a", + "offset_rich_hash" : "0x17ab1ac879", + "crashed" : false, + "native_thread_id" : "0x336547000", + "thread_info_addr" : "0x125ac1c00", + "thread_name" : "tid_30fb7", + "ctx" : { + "IP" : "0x18882a6cc", + "SP" : "0x336545bb0", + "BP" : "0x336545c40" + }, + "managed_frames" : [ + { + "is_managed" : "false", + "native_address" : "unregistered" + } +, + { + "is_managed" : "true", + "guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", + "token" : "0x00000", + "native_offset" : "0x0", + "filename" : "mscorlib.dll", + "sizeofimage" : "0x470000", + "timestamp" : "0xcd46cd56", + "il_offset" : "0xffffffff" + } +, + { + "is_managed" : "true", + "guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", + "token" : "0x60020b2", + "native_offset" : "0x0", + "filename" : "mscorlib.dll", + "sizeofimage" : "0x470000", + "timestamp" : "0xcd46cd56", + "il_offset" : "0x00044" + } +, + { + "is_managed" : "true", + "guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", + "token" : "0x600209e", + "native_offset" : "0x0", + "filename" : "mscorlib.dll", + "sizeofimage" : "0x470000", + "timestamp" : "0xcd46cd56", + "il_offset" : "0x00014" + } +, + { + "is_managed" : "true", + "guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", + "token" : "0x600209d", + "native_offset" : "0x0", + "filename" : "mscorlib.dll", + "sizeofimage" : "0x470000", + "timestamp" : "0xcd46cd56", + "il_offset" : "0x00000" + } +, + { + "is_managed" : "true", + "guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", + "token" : "0x6002098", + "native_offset" : "0x0", + "filename" : "mscorlib.dll", + "sizeofimage" : "0x470000", + "timestamp" : "0xcd46cd56", + "il_offset" : "0x00019" + } +, + { + "is_managed" : "true", + "guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", + "token" : "0x600209a", + "native_offset" : "0x0", + "filename" : "mscorlib.dll", + "sizeofimage" : "0x470000", + "timestamp" : "0xcd46cd56", + "il_offset" : "0x00000" + } +, + { + "is_managed" : "true", + "guid" : "A3BFFBAE-B945-4750-AFBB-F3D363FB55F3", + "token" : "0x6003562", + "native_offset" : "0x0", + "filename" : "System.dll", + "sizeofimage" : "0x29a000", + "timestamp" : "0xda5b041f", + "il_offset" : "0x00056" + } +, + { + "is_managed" : "true", + "guid" : "A3BFFBAE-B945-4750-AFBB-F3D363FB55F3", + "token" : "0x6003564", + "native_offset" : "0x0", + "filename" : "System.dll", + "sizeofimage" : "0x29a000", + "timestamp" : "0xda5b041f", + "il_offset" : "0x0002d" + } +, + { + "is_managed" : "true", + "guid" : "05128D75-46F4-47F7-B777-CD3B48234DFB", + "token" : "0x600831c", + "native_offset" : "0x0", + "filename" : "UnityEditor.CoreModule.dll", + "sizeofimage" : "0x9c0000", + "timestamp" : "0xf536837f", + "il_offset" : "0x00058" + } +, + { + "is_managed" : "true", + "guid" : "05128D75-46F4-47F7-B777-CD3B48234DFB", + "token" : "0x600831d", + "native_offset" : "0x0", + "filename" : "UnityEditor.CoreModule.dll", + "sizeofimage" : "0x9c0000", + "timestamp" : "0xf536837f", + "il_offset" : "0x00007" + } +, + { + "is_managed" : "true", + "guid" : "05128D75-46F4-47F7-B777-CD3B48234DFB", + "token" : "0x6008322", + "native_offset" : "0x0", + "filename" : "UnityEditor.CoreModule.dll", + "sizeofimage" : "0x9c0000", + "timestamp" : "0xf536837f", + "il_offset" : "0x00000" + } +, + { + "is_managed" : "true", + "guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", + "token" : "0x6001f7d", + "native_offset" : "0x0", + "filename" : "mscorlib.dll", + "sizeofimage" : "0x470000", + "timestamp" : "0xcd46cd56", + "il_offset" : "0x00014" + } +, + { + "is_managed" : "true", + "guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", + "token" : "0x6001f25", + "native_offset" : "0x0", + "filename" : "mscorlib.dll", + "sizeofimage" : "0x470000", + "timestamp" : "0xcd46cd56", + "il_offset" : "0x00071" + } +, + { + "is_managed" : "true", + "guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", + "token" : "0x6001f23", + "native_offset" : "0x0", + "filename" : "mscorlib.dll", + "sizeofimage" : "0x470000", + "timestamp" : "0xcd46cd56", + "il_offset" : "0x00000" + } +, + { + "is_managed" : "true", + "guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", + "token" : "0x6001f22", + "native_offset" : "0x0", + "filename" : "mscorlib.dll", + "sizeofimage" : "0x470000", + "timestamp" : "0xcd46cd56", + "il_offset" : "0x0002b" + } +, + { + "is_managed" : "true", + "guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", + "token" : "0x6001f7f", + "native_offset" : "0x0", + "filename" : "mscorlib.dll", + "sizeofimage" : "0x470000", + "timestamp" : "0xcd46cd56", + "il_offset" : "0x00008" + } +, + { + "is_managed" : "true", + "guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", + "token" : "0x00000", + "native_offset" : "0x0", + "filename" : "mscorlib.dll", + "sizeofimage" : "0x470000", + "timestamp" : "0xcd46cd56", + "il_offset" : "0x00065" + } + + ], + "unmanaged_frames" : [ + { + "is_managed" : "false", + "native_address" : "0x3104ffad8", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x310635e38", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x3106361b0", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x310635f5c", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x310540d74", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x18889ede4", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x188868894", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x31068533c", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x310641b6c", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x3106419a0", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x310641c24", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x3106309c4", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x3105db080", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "true", + "guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", + "token" : "0x00000", + "native_offset" : "0x0", + "filename" : "mscorlib.dll", + "sizeofimage" : "0x470000", + "timestamp" : "0xcd46cd56", + "il_offset" : "0x00000" + } +, + { + "is_managed" : "true", + "guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", + "token" : "0x60020b2", + "native_offset" : "0x0", + "filename" : "mscorlib.dll", + "sizeofimage" : "0x470000", + "timestamp" : "0xcd46cd56", + "il_offset" : "0x00000" + } +, + { + "is_managed" : "true", + "guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", + "token" : "0x600209e", + "native_offset" : "0x0", + "filename" : "mscorlib.dll", + "sizeofimage" : "0x470000", + "timestamp" : "0xcd46cd56", + "il_offset" : "0x00000" + } +, + { + "is_managed" : "true", + "guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", + "token" : "0x600209d", + "native_offset" : "0x0", + "filename" : "mscorlib.dll", + "sizeofimage" : "0x470000", + "timestamp" : "0xcd46cd56", + "il_offset" : "0x00000" + } +, + { + "is_managed" : "true", + "guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", + "token" : "0x6002098", + "native_offset" : "0x0", + "filename" : "mscorlib.dll", + "sizeofimage" : "0x470000", + "timestamp" : "0xcd46cd56", + "il_offset" : "0x00000" + } +, + { + "is_managed" : "true", + "guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", + "token" : "0x600209a", + "native_offset" : "0x0", + "filename" : "mscorlib.dll", + "sizeofimage" : "0x470000", + "timestamp" : "0xcd46cd56", + "il_offset" : "0x00000" + } +, + { + "is_managed" : "true", + "guid" : "A3BFFBAE-B945-4750-AFBB-F3D363FB55F3", + "token" : "0x6003562", + "native_offset" : "0x0", + "filename" : "System.dll", + "sizeofimage" : "0x29a000", + "timestamp" : "0xda5b041f", + "il_offset" : "0x00000" + } +, + { + "is_managed" : "true", + "guid" : "A3BFFBAE-B945-4750-AFBB-F3D363FB55F3", + "token" : "0x6003564", + "native_offset" : "0x0", + "filename" : "System.dll", + "sizeofimage" : "0x29a000", + "timestamp" : "0xda5b041f", + "il_offset" : "0x00000" + } +, + { + "is_managed" : "true", + "guid" : "05128D75-46F4-47F7-B777-CD3B48234DFB", + "token" : "0x600831c", + "native_offset" : "0x0", + "filename" : "UnityEditor.CoreModule.dll", + "sizeofimage" : "0x9c0000", + "timestamp" : "0xf536837f", + "il_offset" : "0x00000" + } +, + { + "is_managed" : "true", + "guid" : "05128D75-46F4-47F7-B777-CD3B48234DFB", + "token" : "0x600831d", + "native_offset" : "0x0", + "filename" : "UnityEditor.CoreModule.dll", + "sizeofimage" : "0x9c0000", + "timestamp" : "0xf536837f", + "il_offset" : "0x00000" + } +, + { + "is_managed" : "true", + "guid" : "05128D75-46F4-47F7-B777-CD3B48234DFB", + "token" : "0x6008322", + "native_offset" : "0x0", + "filename" : "UnityEditor.CoreModule.dll", + "sizeofimage" : "0x9c0000", + "timestamp" : "0xf536837f", + "il_offset" : "0x00000" + } +, + { + "is_managed" : "true", + "guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", + "token" : "0x6001f7d", + "native_offset" : "0x0", + "filename" : "mscorlib.dll", + "sizeofimage" : "0x470000", + "timestamp" : "0xcd46cd56", + "il_offset" : "0x00000" + } +, + { + "is_managed" : "true", + "guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", + "token" : "0x6001f25", + "native_offset" : "0x0", + "filename" : "mscorlib.dll", + "sizeofimage" : "0x470000", + "timestamp" : "0xcd46cd56", + "il_offset" : "0x00000" + } +, + { + "is_managed" : "true", + "guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", + "token" : "0x6001f23", + "native_offset" : "0x0", + "filename" : "mscorlib.dll", + "sizeofimage" : "0x470000", + "timestamp" : "0xcd46cd56", + "il_offset" : "0x00000" + } +, + { + "is_managed" : "true", + "guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", + "token" : "0x6001f22", + "native_offset" : "0x0", + "filename" : "mscorlib.dll", + "sizeofimage" : "0x470000", + "timestamp" : "0xcd46cd56", + "il_offset" : "0x00000" + } +, + { + "is_managed" : "true", + "guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", + "token" : "0x6001f7f", + "native_offset" : "0x0", + "filename" : "mscorlib.dll", + "sizeofimage" : "0x470000", + "timestamp" : "0xcd46cd56", + "il_offset" : "0x00000" + } +, + { + "is_managed" : "true", + "guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", + "token" : "0x00000", + "native_offset" : "0x0", + "filename" : "mscorlib.dll", + "sizeofimage" : "0x470000", + "timestamp" : "0xcd46cd56", + "il_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x31048f6dc", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x310614ca8", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x310616670", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x310636d14", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x310636acc", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x3106b5fc8", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x3106b5f50", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x1888682e4", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x1888630fc", + "native_offset" : "0x00000" + } + + ] +}, +{ + "is_managed" : false, + "offset_free_hash" : "0x0", + "offset_rich_hash" : "0x0", + "crashed" : false, + "native_thread_id" : "0x36bc07000", + "thread_info_addr" : "0x122ff4200", + "thread_name" : "Thread Pool Worker", + "ctx" : { + "IP" : "0x188826ec8", + "SP" : "0x36bc06dc0", + "BP" : "0x36bc06e50" + }, + "unmanaged_frames" : [ + { + "is_managed" : "false", + "native_address" : "0x3104ffad8", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x310635e38", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x3106361b0", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x310635f5c", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x310540d74", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x18889ede4", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x31058eaac", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x310636c20", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x310636acc", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x3106b5fc8", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x3106b5f50", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x1888682e4", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x1888630fc", + "native_offset" : "0x00000" + } + + ] +}, +{ + "is_managed" : false, + "offset_free_hash" : "0x0", + "offset_rich_hash" : "0x0", + "crashed" : false, + "native_thread_id" : "0x383507000", + "thread_info_addr" : "0x124851400", + "thread_name" : "Thread Pool Worker", + "ctx" : { + "IP" : "0x188826ec8", + "SP" : "0x383506dc0", + "BP" : "0x383506e50" + }, + "unmanaged_frames" : [ + { + "is_managed" : "false", + "native_address" : "0x3104ffad8", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x310635e38", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x3106361b0", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x310635f5c", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x310540d74", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x18889ede4", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x31058eaac", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x310636c20", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x310636acc", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x3106b5fc8", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x3106b5f50", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x1888682e4", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x1888630fc", + "native_offset" : "0x00000" + } + + ] +}, +{ + "is_managed" : true, + "offset_free_hash" : "0x1491dfc54e", + "offset_rich_hash" : "0x1491dfc910", + "crashed" : false, + "native_thread_id" : "0x32d2b7000", + "thread_info_addr" : "0x316d50000", + "thread_name" : "Burst-CompilerThread-2", + "ctx" : { + "IP" : "0x18882a6cc", + "SP" : "0x32d2b5ae0", + "BP" : "0x32d2b5b70" + }, + "managed_frames" : [ + { + "is_managed" : "false", + "native_address" : "unregistered" + } +, + { + "is_managed" : "true", + "guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", + "token" : "0x00000", + "native_offset" : "0x0", + "filename" : "mscorlib.dll", + "sizeofimage" : "0x470000", + "timestamp" : "0xcd46cd56", + "il_offset" : "0xffffffff" + } +, + { + "is_managed" : "true", + "guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", + "token" : "0x60020b3", + "native_offset" : "0x0", + "filename" : "mscorlib.dll", + "sizeofimage" : "0x470000", + "timestamp" : "0xcd46cd56", + "il_offset" : "0x000c7" + } +, + { + "is_managed" : "true", + "guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", + "token" : "0x60020a5", + "native_offset" : "0x0", + "filename" : "mscorlib.dll", + "sizeofimage" : "0x470000", + "timestamp" : "0xcd46cd56", + "il_offset" : "0x000a1" + } +, + { + "is_managed" : "true", + "guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", + "token" : "0x60020a9", + "native_offset" : "0x0", + "filename" : "mscorlib.dll", + "sizeofimage" : "0x470000", + "timestamp" : "0xcd46cd56", + "il_offset" : "0x00000" + } +, + { + "is_managed" : "true", + "guid" : "A3BFFBAE-B945-4750-AFBB-F3D363FB55F3", + "token" : "0x60026ce", + "native_offset" : "0x0", + "filename" : "System.dll", + "sizeofimage" : "0x29a000", + "timestamp" : "0xda5b041f", + "il_offset" : "0x0006e" + } +, + { + "is_managed" : "true", + "guid" : "A3BFFBAE-B945-4750-AFBB-F3D363FB55F3", + "token" : "0x60026cd", + "native_offset" : "0x0", + "filename" : "System.dll", + "sizeofimage" : "0x29a000", + "timestamp" : "0xda5b041f", + "il_offset" : "0x0003c" + } +, + { + "is_managed" : "true", + "guid" : "A3BFFBAE-B945-4750-AFBB-F3D363FB55F3", + "token" : "0x60026c8", + "native_offset" : "0x0", + "filename" : "System.dll", + "sizeofimage" : "0x29a000", + "timestamp" : "0xda5b041f", + "il_offset" : "0x00000" + } +, + { + "is_managed" : "true", + "guid" : "69B504CF-34C5-4D68-8310-E60F1CE29D2E", + "token" : "0x6000b92", + "native_offset" : "0x0", + "filename" : "Burst.Compiler.IL.dll", + "sizeofimage" : "0x1aa000", + "timestamp" : "0x804eb2a0", + "il_offset" : "0x00024" + } +, + { + "is_managed" : "true", + "guid" : "69B504CF-34C5-4D68-8310-E60F1CE29D2E", + "token" : "0x6000be4", + "native_offset" : "0x0", + "filename" : "Burst.Compiler.IL.dll", + "sizeofimage" : "0x1aa000", + "timestamp" : "0x804eb2a0", + "il_offset" : "0x00070" + } +, + { + "is_managed" : "true", + "guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", + "token" : "0x6001f7d", + "native_offset" : "0x0", + "filename" : "mscorlib.dll", + "sizeofimage" : "0x470000", + "timestamp" : "0xcd46cd56", + "il_offset" : "0x00014" + } +, + { + "is_managed" : "true", + "guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", + "token" : "0x6001f25", + "native_offset" : "0x0", + "filename" : "mscorlib.dll", + "sizeofimage" : "0x470000", + "timestamp" : "0xcd46cd56", + "il_offset" : "0x00071" + } +, + { + "is_managed" : "true", + "guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", + "token" : "0x6001f23", + "native_offset" : "0x0", + "filename" : "mscorlib.dll", + "sizeofimage" : "0x470000", + "timestamp" : "0xcd46cd56", + "il_offset" : "0x00000" + } +, + { + "is_managed" : "true", + "guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", + "token" : "0x6001f22", + "native_offset" : "0x0", + "filename" : "mscorlib.dll", + "sizeofimage" : "0x470000", + "timestamp" : "0xcd46cd56", + "il_offset" : "0x0002b" + } +, + { + "is_managed" : "true", + "guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", + "token" : "0x6001f7f", + "native_offset" : "0x0", + "filename" : "mscorlib.dll", + "sizeofimage" : "0x470000", + "timestamp" : "0xcd46cd56", + "il_offset" : "0x00008" + } +, + { + "is_managed" : "true", + "guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", + "token" : "0x00000", + "native_offset" : "0x0", + "filename" : "mscorlib.dll", + "sizeofimage" : "0x470000", + "timestamp" : "0xcd46cd56", + "il_offset" : "0x00065" + } + + ], +"unmanaged_frames" : [ +{ + "is_managed" : "false", + "native_address" : "0x3104ffad8", + "native_offset" : "0x00000" + } +, +{ + "is_managed" : "false", + "native_address" : "0x310635e38", + "native_offset" : "0x00000" + } +, +{ + "is_managed" : "false", + "native_address" : "0x3106361b0", + "native_offset" : "0x00000" + } +, +{ + "is_managed" : "false", + "native_address" : "0x310635f5c", + "native_offset" : "0x00000" + } +, +{ + "is_managed" : "false", + "native_address" : "0x310540d74", + "native_offset" : "0x00000" + } +, +{ + "is_managed" : "false", + "native_address" : "0x18889ede4", + "native_offset" : "0x00000" + } +, +{ + "is_managed" : "false", + "native_address" : "0x188868894", + "native_offset" : "0x00000" + } +, +{ + "is_managed" : "false", + "native_address" : "0x31068533c", + "native_offset" : "0x00000" + } +, +{ + "is_managed" : "false", + "native_address" : "0x310642458", + "native_offset" : "0x00000" + } +, +{ + "is_managed" : "false", + "native_address" : "0x3106420b4", + "native_offset" : "0x00000" + } +, +{ + "is_managed" : "false", + "native_address" : "0x3106309c4", + "native_offset" : "0x00000" + } +, +{ + "is_managed" : "false", + "native_address" : "0x3105db080", + "native_offset" : "0x00000" + } +, +{ + "is_managed" : "true", + "guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", + "token" : "0x00000", + "native_offset" : "0x0", + "filename" : "mscorlib.dll", + "sizeofimage" : "0x470000", + "timestamp" : "0xcd46cd56", + "il_offset" : "0x00000" + } +, +{ + "is_managed" : "true", + "guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", + "token" : "0x60020b3", + "native_offset" : "0x0", + "filename" : "mscorlib.dll", + "sizeofimage" : "0x470000", + "timestamp" : "0xcd46cd56", + "il_offset" : "0x00000" + } +, +{ + "is_managed" : "true", + "guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", + "token" : "0x60020a5", + "native_offset" : "0x0", + "filename" : "mscorlib.dll", + "sizeofimage" : "0x470000", + "timestamp" : "0xcd46cd56", + "il_offset" : "0x00000" + } +, +{ + "is_managed" : "true", + "guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", + "token" : "0x60020a9", + "native_offset" : "0x0", + "filename" : "mscorlib.dll", + "sizeofimage" : "0x470000", + "timestamp" : "0xcd46cd56", + "il_offset" : "0x00000" + } +, +{ + "is_managed" : "true", + "guid" : "A3BFFBAE-B945-4750-AFBB-F3D363FB55F3", + "token" : "0x60026ce", + "native_offset" : "0x0", + "filename" : "System.dll", + "sizeofimage" : "0x29a000", + "timestamp" : "0xda5b041f", + "il_offset" : "0x00000" + } +, +{ + "is_managed" : "true", + "guid" : "A3BFFBAE-B945-4750-AFBB-F3D363FB55F3", + "token" : "0x60026cd", + "native_offset" : "0x0", + "filename" : "System.dll", + "sizeofimage" : "0x29a000", + "timestamp" : "0xda5b041f", + "il_offset" : "0x00000" + } +, +{ + "is_managed" : "true", + "guid" : "A3BFFBAE-B945-4750-AFBB-F3D363FB55F3", + "token" : "0x60026c8", + "native_offset" : "0x0", + "filename" : "System.dll", + "sizeofimage" : "0x29a000", + "timestamp" : "0xda5b041f", + "il_offset" : "0x00000" + } +, +{ + "is_managed" : "true", + "guid" : "69B504CF-34C5-4D68-8310-E60F1CE29D2E", + "token" : "0x6000b92", + "native_offset" : "0x0", + "filename" : "Burst.Compiler.IL.dll", + "sizeofimage" : "0x1aa000", + "timestamp" : "0x804eb2a0", + "il_offset" : "0x00000" + } +, +{ + "is_managed" : "true", + "guid" : "69B504CF-34C5-4D68-8310-E60F1CE29D2E", + "token" : "0x6000be4", + "native_offset" : "0x0", + "filename" : "Burst.Compiler.IL.dll", + "sizeofimage" : "0x1aa000", + "timestamp" : "0x804eb2a0", + "il_offset" : "0x00000" + } +, +{ + "is_managed" : "true", + "guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", + "token" : "0x6001f7d", + "native_offset" : "0x0", + "filename" : "mscorlib.dll", + "sizeofimage" : "0x470000", + "timestamp" : "0xcd46cd56", + "il_offset" : "0x00000" + } +, +{ + "is_managed" : "true", + "guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", + "token" : "0x6001f25", + "native_offset" : "0x0", + "filename" : "mscorlib.dll", + "sizeofimage" : "0x470000", + "timestamp" : "0xcd46cd56", + "il_offset" : "0x00000" + } +, +{ + "is_managed" : "true", + "guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", + "token" : "0x6001f23", + "native_offset" : "0x0", + "filename" : "mscorlib.dll", + "sizeofimage" : "0x470000", + "timestamp" : "0xcd46cd56", + "il_offset" : "0x00000" + } +, +{ + "is_managed" : "true", + "guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", + "token" : "0x6001f22", + "native_offset" : "0x0", + "filename" : "mscorlib.dll", + "sizeofimage" : "0x470000", + "timestamp" : "0xcd46cd56", + "il_offset" : "0x00000" + } +, +{ + "is_managed" : "true", + "guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", + "token" : "0x6001f7f", + "native_offset" : "0x0", + "filename" : "mscorlib.dll", + "sizeofimage" : "0x470000", + "timestamp" : "0xcd46cd56", + "il_offset" : "0x00000" + } +, +{ + "is_managed" : "true", + "guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", + "token" : "0x00000", + "native_offset" : "0x0", + "filename" : "mscorlib.dll", + "sizeofimage" : "0x470000", + "timestamp" : "0xcd46cd56", + "il_offset" : "0x00000" + } +, +{ + "is_managed" : "false", + "native_address" : "0x31048f6dc", + "native_offset" : "0x00000" + } +, +{ + "is_managed" : "false", + "native_address" : "0x310614ca8", + "native_offset" : "0x00000" + } +, +{ + "is_managed" : "false", + "native_address" : "0x310616670", + "native_offset" : "0x00000" + } +, +{ + "is_managed" : "false", + "native_address" : "0x310636d14", + "native_offset" : "0x00000" + } +, +{ + "is_managed" : "false", + "native_address" : "0x310636acc", + "native_offset" : "0x00000" + } +, +{ + "is_managed" : "false", + "native_address" : "0x3106b5fc8", + "native_offset" : "0x00000" + } +, +{ + "is_managed" : "false", + "native_address" : "0x3106b5f50", + "native_offset" : "0x00000" + } +, +{ + "is_managed" : "false", + "native_address" : "0x1888682e4", + "native_offset" : "0x00000" + } +, +{ + "is_managed" : "false", + "native_address" : "0x1888630fc", + "native_offset" : "0x00000" + } + +] +}, +{ +"is_managed" : true, +"offset_free_hash" : "0x1491dfc54e", +"offset_rich_hash" : "0x1491dfc910", +"crashed" : false, +"native_thread_id" : "0x32d6cf000", +"thread_info_addr" : "0x316cf8000", +"thread_name" : "Burst-CompilerThread-4", +"ctx" : { + "IP" : "0x18882a6cc", + "SP" : "0x32d6cdae0", + "BP" : "0x32d6cdb70" +}, +"managed_frames" : [ +{ + "is_managed" : "false", + "native_address" : "unregistered" + } +, +{ + "is_managed" : "true", + "guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", + "token" : "0x00000", + "native_offset" : "0x0", + "filename" : "mscorlib.dll", + "sizeofimage" : "0x470000", + "timestamp" : "0xcd46cd56", + "il_offset" : "0xffffffff" + } +, +{ + "is_managed" : "true", + "guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", + "token" : "0x60020b3", + "native_offset" : "0x0", + "filename" : "mscorlib.dll", + "sizeofimage" : "0x470000", + "timestamp" : "0xcd46cd56", + "il_offset" : "0x000c7" + } +, +{ + "is_managed" : "true", + "guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", + "token" : "0x60020a5", + "native_offset" : "0x0", + "filename" : "mscorlib.dll", + "sizeofimage" : "0x470000", + "timestamp" : "0xcd46cd56", + "il_offset" : "0x000a1" + } +, +{ + "is_managed" : "true", + "guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", + "token" : "0x60020a9", + "native_offset" : "0x0", + "filename" : "mscorlib.dll", + "sizeofimage" : "0x470000", + "timestamp" : "0xcd46cd56", + "il_offset" : "0x00000" + } +, +{ + "is_managed" : "true", + "guid" : "A3BFFBAE-B945-4750-AFBB-F3D363FB55F3", + "token" : "0x60026ce", + "native_offset" : "0x0", + "filename" : "System.dll", + "sizeofimage" : "0x29a000", + "timestamp" : "0xda5b041f", + "il_offset" : "0x0006e" + } +, +{ + "is_managed" : "true", + "guid" : "A3BFFBAE-B945-4750-AFBB-F3D363FB55F3", + "token" : "0x60026cd", + "native_offset" : "0x0", + "filename" : "System.dll", + "sizeofimage" : "0x29a000", + "timestamp" : "0xda5b041f", + "il_offset" : "0x0003c" + } +, +{ + "is_managed" : "true", + "guid" : "A3BFFBAE-B945-4750-AFBB-F3D363FB55F3", + "token" : "0x60026c8", + "native_offset" : "0x0", + "filename" : "System.dll", + "sizeofimage" : "0x29a000", + "timestamp" : "0xda5b041f", + "il_offset" : "0x00000" + } +, +{ + "is_managed" : "true", + "guid" : "69B504CF-34C5-4D68-8310-E60F1CE29D2E", + "token" : "0x6000b92", + "native_offset" : "0x0", + "filename" : "Burst.Compiler.IL.dll", + "sizeofimage" : "0x1aa000", + "timestamp" : "0x804eb2a0", + "il_offset" : "0x00024" + } +, +{ + "is_managed" : "true", + "guid" : "69B504CF-34C5-4D68-8310-E60F1CE29D2E", + "token" : "0x6000be4", + "native_offset" : "0x0", + "filename" : "Burst.Compiler.IL.dll", + "sizeofimage" : "0x1aa000", + "timestamp" : "0x804eb2a0", + "il_offset" : "0x00070" + } +, +{ + "is_managed" : "true", + "guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", + "token" : "0x6001f7d", + "native_offset" : "0x0", + "filename" : "mscorlib.dll", + "sizeofimage" : "0x470000", + "timestamp" : "0xcd46cd56", + "il_offset" : "0x00014" + } +, +{ + "is_managed" : "true", + "guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", + "token" : "0x6001f25", + "native_offset" : "0x0", + "filename" : "mscorlib.dll", + "sizeofimage" : "0x470000", + "timestamp" : "0xcd46cd56", + "il_offset" : "0x00071" + } +, +{ + "is_managed" : "true", + "guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", + "token" : "0x6001f23", + "native_offset" : "0x0", + "filename" : "mscorlib.dll", + "sizeofimage" : "0x470000", + "timestamp" : "0xcd46cd56", + "il_offset" : "0x00000" + } +, +{ + "is_managed" : "true", + "guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", + "token" : "0x6001f22", + "native_offset" : "0x0", + "filename" : "mscorlib.dll", + "sizeofimage" : "0x470000", + "timestamp" : "0xcd46cd56", + "il_offset" : "0x0002b" + } +, +{ + "is_managed" : "true", + "guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", + "token" : "0x6001f7f", + "native_offset" : "0x0", + "filename" : "mscorlib.dll", + "sizeofimage" : "0x470000", + "timestamp" : "0xcd46cd56", + "il_offset" : "0x00008" + } +, +{ + "is_managed" : "true", + "guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", + "token" : "0x00000", + "native_offset" : "0x0", + "filename" : "mscorlib.dll", + "sizeofimage" : "0x470000", + "timestamp" : "0xcd46cd56", + "il_offset" : "0x00065" + } + +], +"unmanaged_frames" : [ +{ +"is_managed" : "false", +"native_address" : "0x3104ffad8", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310635e38", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106361b0", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310635f5c", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310540d74", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x18889ede4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x188868894", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x31068533c", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310642458", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106420b4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106309c4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3105db080", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x00000", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x60020b3", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x60020a5", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x60020a9", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "A3BFFBAE-B945-4750-AFBB-F3D363FB55F3", +"token" : "0x60026ce", +"native_offset" : "0x0", +"filename" : "System.dll", +"sizeofimage" : "0x29a000", +"timestamp" : "0xda5b041f", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "A3BFFBAE-B945-4750-AFBB-F3D363FB55F3", +"token" : "0x60026cd", +"native_offset" : "0x0", +"filename" : "System.dll", +"sizeofimage" : "0x29a000", +"timestamp" : "0xda5b041f", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "A3BFFBAE-B945-4750-AFBB-F3D363FB55F3", +"token" : "0x60026c8", +"native_offset" : "0x0", +"filename" : "System.dll", +"sizeofimage" : "0x29a000", +"timestamp" : "0xda5b041f", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "69B504CF-34C5-4D68-8310-E60F1CE29D2E", +"token" : "0x6000b92", +"native_offset" : "0x0", +"filename" : "Burst.Compiler.IL.dll", +"sizeofimage" : "0x1aa000", +"timestamp" : "0x804eb2a0", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "69B504CF-34C5-4D68-8310-E60F1CE29D2E", +"token" : "0x6000be4", +"native_offset" : "0x0", +"filename" : "Burst.Compiler.IL.dll", +"sizeofimage" : "0x1aa000", +"timestamp" : "0x804eb2a0", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f7d", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f25", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f23", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f22", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f7f", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x00000", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x31048f6dc", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310614ca8", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310616670", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310636d14", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310636acc", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106b5fc8", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106b5f50", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1888682e4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1888630fc", +"native_offset" : "0x00000" +} + +] +}, +{ +"is_managed" : true, +"offset_free_hash" : "0x1491dfc54e", +"offset_rich_hash" : "0x1491dfc910", +"crashed" : false, +"native_thread_id" : "0x32dae7000", +"thread_info_addr" : "0x328a4ca00", +"thread_name" : "Burst-CompilerThread-6", +"ctx" : { +"IP" : "0x18882a6cc", +"SP" : "0x32dae5ae0", +"BP" : "0x32dae5b70" +}, +"managed_frames" : [ +{ +"is_managed" : "false", +"native_address" : "unregistered" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x00000", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0xffffffff" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x60020b3", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x000c7" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x60020a5", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x000a1" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x60020a9", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "A3BFFBAE-B945-4750-AFBB-F3D363FB55F3", +"token" : "0x60026ce", +"native_offset" : "0x0", +"filename" : "System.dll", +"sizeofimage" : "0x29a000", +"timestamp" : "0xda5b041f", +"il_offset" : "0x0006e" +} +, +{ +"is_managed" : "true", +"guid" : "A3BFFBAE-B945-4750-AFBB-F3D363FB55F3", +"token" : "0x60026cd", +"native_offset" : "0x0", +"filename" : "System.dll", +"sizeofimage" : "0x29a000", +"timestamp" : "0xda5b041f", +"il_offset" : "0x0003c" +} +, +{ +"is_managed" : "true", +"guid" : "A3BFFBAE-B945-4750-AFBB-F3D363FB55F3", +"token" : "0x60026c8", +"native_offset" : "0x0", +"filename" : "System.dll", +"sizeofimage" : "0x29a000", +"timestamp" : "0xda5b041f", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "69B504CF-34C5-4D68-8310-E60F1CE29D2E", +"token" : "0x6000b92", +"native_offset" : "0x0", +"filename" : "Burst.Compiler.IL.dll", +"sizeofimage" : "0x1aa000", +"timestamp" : "0x804eb2a0", +"il_offset" : "0x00024" +} +, +{ +"is_managed" : "true", +"guid" : "69B504CF-34C5-4D68-8310-E60F1CE29D2E", +"token" : "0x6000be4", +"native_offset" : "0x0", +"filename" : "Burst.Compiler.IL.dll", +"sizeofimage" : "0x1aa000", +"timestamp" : "0x804eb2a0", +"il_offset" : "0x00070" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f7d", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00014" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f25", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00071" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f23", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f22", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x0002b" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f7f", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00008" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x00000", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00065" +} + +], +"unmanaged_frames" : [ +{ +"is_managed" : "false", +"native_address" : "0x3104ffad8", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310635e38", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106361b0", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310635f5c", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310540d74", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x18889ede4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x188868894", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x31068533c", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310642458", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106420b4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106309c4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3105db080", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x00000", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x60020b3", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x60020a5", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x60020a9", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "A3BFFBAE-B945-4750-AFBB-F3D363FB55F3", +"token" : "0x60026ce", +"native_offset" : "0x0", +"filename" : "System.dll", +"sizeofimage" : "0x29a000", +"timestamp" : "0xda5b041f", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "A3BFFBAE-B945-4750-AFBB-F3D363FB55F3", +"token" : "0x60026cd", +"native_offset" : "0x0", +"filename" : "System.dll", +"sizeofimage" : "0x29a000", +"timestamp" : "0xda5b041f", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "A3BFFBAE-B945-4750-AFBB-F3D363FB55F3", +"token" : "0x60026c8", +"native_offset" : "0x0", +"filename" : "System.dll", +"sizeofimage" : "0x29a000", +"timestamp" : "0xda5b041f", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "69B504CF-34C5-4D68-8310-E60F1CE29D2E", +"token" : "0x6000b92", +"native_offset" : "0x0", +"filename" : "Burst.Compiler.IL.dll", +"sizeofimage" : "0x1aa000", +"timestamp" : "0x804eb2a0", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "69B504CF-34C5-4D68-8310-E60F1CE29D2E", +"token" : "0x6000be4", +"native_offset" : "0x0", +"filename" : "Burst.Compiler.IL.dll", +"sizeofimage" : "0x1aa000", +"timestamp" : "0x804eb2a0", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f7d", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f25", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f23", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f22", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f7f", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x00000", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x31048f6dc", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310614ca8", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310616670", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310636d14", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310636acc", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106b5fc8", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106b5f50", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1888682e4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1888630fc", +"native_offset" : "0x00000" +} + +] +}, +{ +"is_managed" : true, +"offset_free_hash" : "0x1491dfc54e", +"offset_rich_hash" : "0x1491dfc910", +"crashed" : false, +"native_thread_id" : "0x32deff000", +"thread_info_addr" : "0x3154f3e00", +"thread_name" : "Burst-CompilerThread-8", +"ctx" : { +"IP" : "0x18882a6cc", +"SP" : "0x32defdae0", +"BP" : "0x32defdb70" +}, +"managed_frames" : [ +{ +"is_managed" : "false", +"native_address" : "unregistered" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x00000", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0xffffffff" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x60020b3", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x000c7" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x60020a5", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x000a1" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x60020a9", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "A3BFFBAE-B945-4750-AFBB-F3D363FB55F3", +"token" : "0x60026ce", +"native_offset" : "0x0", +"filename" : "System.dll", +"sizeofimage" : "0x29a000", +"timestamp" : "0xda5b041f", +"il_offset" : "0x0006e" +} +, +{ +"is_managed" : "true", +"guid" : "A3BFFBAE-B945-4750-AFBB-F3D363FB55F3", +"token" : "0x60026cd", +"native_offset" : "0x0", +"filename" : "System.dll", +"sizeofimage" : "0x29a000", +"timestamp" : "0xda5b041f", +"il_offset" : "0x0003c" +} +, +{ +"is_managed" : "true", +"guid" : "A3BFFBAE-B945-4750-AFBB-F3D363FB55F3", +"token" : "0x60026c8", +"native_offset" : "0x0", +"filename" : "System.dll", +"sizeofimage" : "0x29a000", +"timestamp" : "0xda5b041f", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "69B504CF-34C5-4D68-8310-E60F1CE29D2E", +"token" : "0x6000b92", +"native_offset" : "0x0", +"filename" : "Burst.Compiler.IL.dll", +"sizeofimage" : "0x1aa000", +"timestamp" : "0x804eb2a0", +"il_offset" : "0x00024" +} +, +{ +"is_managed" : "true", +"guid" : "69B504CF-34C5-4D68-8310-E60F1CE29D2E", +"token" : "0x6000be4", +"native_offset" : "0x0", +"filename" : "Burst.Compiler.IL.dll", +"sizeofimage" : "0x1aa000", +"timestamp" : "0x804eb2a0", +"il_offset" : "0x00070" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f7d", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00014" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f25", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00071" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f23", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f22", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x0002b" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f7f", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00008" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x00000", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00065" +} + +], +"unmanaged_frames" : [ +{ +"is_managed" : "false", +"native_address" : "0x3104ffad8", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310635e38", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106361b0", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310635f5c", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310540d74", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x18889ede4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x188868894", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x31068533c", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310642458", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106420b4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106309c4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3105db080", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x00000", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x60020b3", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x60020a5", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x60020a9", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "A3BFFBAE-B945-4750-AFBB-F3D363FB55F3", +"token" : "0x60026ce", +"native_offset" : "0x0", +"filename" : "System.dll", +"sizeofimage" : "0x29a000", +"timestamp" : "0xda5b041f", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "A3BFFBAE-B945-4750-AFBB-F3D363FB55F3", +"token" : "0x60026cd", +"native_offset" : "0x0", +"filename" : "System.dll", +"sizeofimage" : "0x29a000", +"timestamp" : "0xda5b041f", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "A3BFFBAE-B945-4750-AFBB-F3D363FB55F3", +"token" : "0x60026c8", +"native_offset" : "0x0", +"filename" : "System.dll", +"sizeofimage" : "0x29a000", +"timestamp" : "0xda5b041f", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "69B504CF-34C5-4D68-8310-E60F1CE29D2E", +"token" : "0x6000b92", +"native_offset" : "0x0", +"filename" : "Burst.Compiler.IL.dll", +"sizeofimage" : "0x1aa000", +"timestamp" : "0x804eb2a0", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "69B504CF-34C5-4D68-8310-E60F1CE29D2E", +"token" : "0x6000be4", +"native_offset" : "0x0", +"filename" : "Burst.Compiler.IL.dll", +"sizeofimage" : "0x1aa000", +"timestamp" : "0x804eb2a0", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f7d", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f25", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f23", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f22", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f7f", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x00000", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x31048f6dc", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310614ca8", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310616670", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310636d14", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310636acc", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106b5fc8", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106b5f50", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1888682e4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1888630fc", +"native_offset" : "0x00000" +} + +] +}, +{ +"is_managed" : false, +"offset_free_hash" : "0x0", +"offset_rich_hash" : "0x0", +"crashed" : true, +"native_thread_id" : "0x1f21b0840", +"thread_info_addr" : "0x1178eb800", +"thread_name" : "tid_103", +"ctx" : { +"IP" : "0x18c7379c8", +"SP" : "0x16fb98d90", +"BP" : "0x16fb98da0" +}, +"unmanaged_frames" : [ +{ +"is_managed" : "false", +"native_address" : "0x3104ffad8", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310635e38", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106361b0", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310636800", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310541bc0", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310503bf8", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x31048c408", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x18889ede4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x102f6a7a4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x102f6a7a4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x102f6b204", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x188945370", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1889d620c", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1889d6154", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x188913fac", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x189ace6b8", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x102f6b648", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1020dedbc", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1020df2c4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x102420e00", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x102349414", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x102349e34", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x102304bd4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x101c1a2ec", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x102f54208", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x188945370", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1889d620c", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1889d6154", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x188913fac", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x189ace6b8", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x18c6113b4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x18ce2a5d8", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x102f6943c", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x18ca314f8", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x18c4b82b8", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x18c48ea84", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x102f69c1c", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x102f69f78", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1884e8274", +"native_offset" : "0x00000" +} + +] +}, +{ +"is_managed" : true, +"offset_free_hash" : "0x15de3beb90", +"offset_rich_hash" : "0x15de3bef15", +"crashed" : false, +"native_thread_id" : "0x32e317000", +"thread_info_addr" : "0x3282b0a00", +"thread_name" : "Burst-ProgressReporter", +"ctx" : { +"IP" : "0x18882a6cc", +"SP" : "0x32e3160b0", +"BP" : "0x32e316140" +}, +"managed_frames" : [ +{ +"is_managed" : "false", +"native_address" : "unregistered" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x00000", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0xffffffff" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f5d", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x0002f" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f50", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x0000e" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f52", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001ea2", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x0001d" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001ea1", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x000d9" +} +, +{ +"is_managed" : "true", +"guid" : "A3BFFBAE-B945-4750-AFBB-F3D363FB55F3", +"token" : "0x60026bc", +"native_offset" : "0x0", +"filename" : "System.dll", +"sizeofimage" : "0x29a000", +"timestamp" : "0xda5b041f", +"il_offset" : "0x00067" +} +, +{ +"is_managed" : "true", +"guid" : "A3BFFBAE-B945-4750-AFBB-F3D363FB55F3", +"token" : "0x60026bb", +"native_offset" : "0x0", +"filename" : "System.dll", +"sizeofimage" : "0x29a000", +"timestamp" : "0xda5b041f", +"il_offset" : "0x00006" +} +, +{ +"is_managed" : "true", +"guid" : "A3BFFBAE-B945-4750-AFBB-F3D363FB55F3", +"token" : "0x60026b7", +"native_offset" : "0x0", +"filename" : "System.dll", +"sizeofimage" : "0x29a000", +"timestamp" : "0xda5b041f", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "69B504CF-34C5-4D68-8310-E60F1CE29D2E", +"token" : "0x6001185", +"native_offset" : "0x0", +"filename" : "Burst.Compiler.IL.dll", +"sizeofimage" : "0x1aa000", +"timestamp" : "0x804eb2a0", +"il_offset" : "0x000c9" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f7d", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00014" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f25", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00071" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f23", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f22", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x0002b" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f7f", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00008" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x00000", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00065" +} + +], +"unmanaged_frames" : [ +{ +"is_managed" : "false", +"native_address" : "0x3104ffad8", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310635e38", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106361b0", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310635f5c", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310540d74", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x18889ede4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x188868894", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x31068533c", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310641b6c", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106419a0", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310670d38", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3105d9984", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x00000", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f5d", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f50", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f52", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001ea2", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001ea1", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "A3BFFBAE-B945-4750-AFBB-F3D363FB55F3", +"token" : "0x60026bc", +"native_offset" : "0x0", +"filename" : "System.dll", +"sizeofimage" : "0x29a000", +"timestamp" : "0xda5b041f", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "A3BFFBAE-B945-4750-AFBB-F3D363FB55F3", +"token" : "0x60026bb", +"native_offset" : "0x0", +"filename" : "System.dll", +"sizeofimage" : "0x29a000", +"timestamp" : "0xda5b041f", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "A3BFFBAE-B945-4750-AFBB-F3D363FB55F3", +"token" : "0x60026b7", +"native_offset" : "0x0", +"filename" : "System.dll", +"sizeofimage" : "0x29a000", +"timestamp" : "0xda5b041f", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "69B504CF-34C5-4D68-8310-E60F1CE29D2E", +"token" : "0x6001185", +"native_offset" : "0x0", +"filename" : "Burst.Compiler.IL.dll", +"sizeofimage" : "0x1aa000", +"timestamp" : "0x804eb2a0", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f7d", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f25", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f23", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f22", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f7f", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x00000", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x31048f6dc", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310614ca8", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310616670", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310636d14", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310636acc", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106b5fc8", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106b5f50", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1888682e4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1888630fc", +"native_offset" : "0x00000" +} + +] +}, +{ +"is_managed" : true, +"offset_free_hash" : "0x1224727402", +"offset_rich_hash" : "0x12247275cb", +"crashed" : false, +"native_thread_id" : "0x31d51f000", +"thread_info_addr" : "0x393e76e00", +"thread_name" : "Timer-Scheduler", +"ctx" : { +"IP" : "0x18882a6cc", +"SP" : "0x31d51dee0", +"BP" : "0x31d51df70" +}, +"managed_frames" : [ +{ +"is_managed" : "false", +"native_address" : "unregistered" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x00000", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0xffffffff" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x60020b2", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00044" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x600209e", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00014" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x600209d", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6002098", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00019" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x600209b", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x600215a", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x0003c" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f7d", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00014" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f25", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00071" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f23", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f22", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x0002b" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f7f", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00008" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x00000", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00065" +} + +], +"unmanaged_frames" : [ +{ +"is_managed" : "false", +"native_address" : "0x3104ffad8", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310635e38", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106361b0", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310635f5c", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310540d74", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x18889ede4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1888688c0", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310685314", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310641b6c", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106419a0", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310641c24", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106309c4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3105db080", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x00000", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x60020b2", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x600209e", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x600209d", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6002098", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x600209b", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x600215a", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f7d", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f25", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f23", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f22", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f7f", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x00000", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x31048f6dc", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310614ca8", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310616670", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310636d14", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310636acc", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106b5fc8", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106b5f50", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1888682e4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1888630fc", +"native_offset" : "0x00000" +} + +] +}, +{ +"is_managed" : false, +"offset_free_hash" : "0x0", +"offset_rich_hash" : "0x0", +"crashed" : false, +"native_thread_id" : "0x386417000", +"thread_info_addr" : "0x12490f800", +"thread_name" : "Thread Pool Worker", +"ctx" : { +"IP" : "0x188826ec8", +"SP" : "0x386416dc0", +"BP" : "0x386416e50" +}, +"unmanaged_frames" : [ +{ +"is_managed" : "false", +"native_address" : "0x3104ffad8", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310635e38", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106361b0", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310635f5c", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310540d74", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x18889ede4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x31058eaac", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310636c20", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310636acc", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106b5fc8", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106b5f50", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1888682e4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1888630fc", +"native_offset" : "0x00000" +} + +] +}, +{ +"is_managed" : false, +"offset_free_hash" : "0x0", +"offset_rich_hash" : "0x0", +"crashed" : false, +"native_thread_id" : "0x1708b7000", +"thread_info_addr" : "0x377236600", +"thread_name" : "tid_c213", +"ctx" : { +"IP" : "0x188826eb0", +"SP" : "0x1708b6d00", +"BP" : "0x1708b6d10" +}, +"unmanaged_frames" : [ +{ +"is_managed" : "false", +"native_address" : "0x3104ffad8", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310635e38", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106361b0", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310635f5c", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310540d74", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x18889ede4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1886b5b50", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1886b6204", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x10300c3e4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x100a0a4dc", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x100a0b934", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x100c3a474", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1888682e4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1888630fc", +"native_offset" : "0x00000" +} + +] +}, +{ +"is_managed" : false, +"offset_free_hash" : "0x0", +"offset_rich_hash" : "0x0", +"crashed" : false, +"native_thread_id" : "0x170943000", +"thread_info_addr" : "0x117bf7c00", +"thread_name" : "tid_11807", +"ctx" : { +"IP" : "0x188826eb0", +"SP" : "0x170942d00", +"BP" : "0x170942d10" +}, +"unmanaged_frames" : [ +{ +"is_managed" : "false", +"native_address" : "0x3104ffad8", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310635e38", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106361b0", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310635f5c", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310540d74", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x18889ede4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1886b5b50", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1886b6204", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x10300c3e4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x100a0a4dc", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x100a0b934", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x100c3a474", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1888682e4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1888630fc", +"native_offset" : "0x00000" +} + +] +}, +{ +"is_managed" : false, +"offset_free_hash" : "0x0", +"offset_rich_hash" : "0x0", +"crashed" : false, +"native_thread_id" : "0x36aa07000", +"thread_info_addr" : "0x124849600", +"thread_name" : "Thread Pool Worker", +"ctx" : { +"IP" : "0x188826ec8", +"SP" : "0x36aa06dc0", +"BP" : "0x36aa06e50" +}, +"unmanaged_frames" : [ +{ +"is_managed" : "false", +"native_address" : "0x3104ffad8", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310635e38", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106361b0", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310635f5c", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310540d74", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x18889ede4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x31058eaac", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310636c20", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310636acc", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106b5fc8", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106b5f50", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1888682e4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1888630fc", +"native_offset" : "0x00000" +} + +] +}, +{ +"is_managed" : false, +"offset_free_hash" : "0x0", +"offset_rich_hash" : "0x0", +"crashed" : false, +"native_thread_id" : "0x1709cf000", +"thread_info_addr" : "0x314149600", +"thread_name" : "tid_11707", +"ctx" : { +"IP" : "0x188826eb0", +"SP" : "0x1709ced00", +"BP" : "0x1709ced10" +}, +"unmanaged_frames" : [ +{ +"is_managed" : "false", +"native_address" : "0x3104ffad8", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310635e38", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106361b0", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310635f5c", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310540d74", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x18889ede4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1886b5b50", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1886b6204", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x10300c3e4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x100a0a4dc", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x100a0b934", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x100c3a474", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1888682e4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1888630fc", +"native_offset" : "0x00000" +} + +] +}, +{ +"is_managed" : false, +"offset_free_hash" : "0x0", +"offset_rich_hash" : "0x0", +"crashed" : false, +"native_thread_id" : "0x170a5b000", +"thread_info_addr" : "0x117dc9800", +"thread_name" : "tid_13f03", +"ctx" : { +"IP" : "0x188826eb0", +"SP" : "0x170a5ad00", +"BP" : "0x170a5ad10" +}, +"unmanaged_frames" : [ +{ +"is_managed" : "false", +"native_address" : "0x3104ffad8", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310635e38", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106361b0", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310635f5c", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310540d74", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x18889ede4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1886b5b50", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1886b6204", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x10300c3e4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x100a0a4dc", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x100a0b934", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x100c3a474", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1888682e4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1888630fc", +"native_offset" : "0x00000" +} + +] +}, +{ +"is_managed" : false, +"offset_free_hash" : "0x0", +"offset_rich_hash" : "0x0", +"crashed" : false, +"native_thread_id" : "0x381d6b000", +"thread_info_addr" : "0x3284d0000", +"thread_name" : "Thread Pool Worker", +"ctx" : { +"IP" : "0x188826ec8", +"SP" : "0x381d6adc0", +"BP" : "0x381d6ae50" +}, +"unmanaged_frames" : [ +{ +"is_managed" : "false", +"native_address" : "0x3104ffad8", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310635e38", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106361b0", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310635f5c", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310540d74", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x18889ede4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x31058eaac", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310636c20", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310636acc", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106b5fc8", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106b5f50", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1888682e4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1888630fc", +"native_offset" : "0x00000" +} + +] +}, +{ +"is_managed" : false, +"offset_free_hash" : "0x0", +"offset_rich_hash" : "0x0", +"crashed" : false, +"native_thread_id" : "0x310f33000", +"thread_info_addr" : "0x124846c00", +"thread_name" : "Debugger agent", +"ctx" : { +"IP" : "0x18882f7e4", +"SP" : "0x310f32ad0", +"BP" : "0x310f32af0" +}, +"unmanaged_frames" : [ +{ +"is_managed" : "false", +"native_address" : "0x3104ffad8", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310635e38", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106361b0", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310635f5c", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310540d74", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x18889ede4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x31056d978", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310566a80", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310636c20", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310636acc", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106b5fc8", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106b5f50", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1888682e4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1888630fc", +"native_offset" : "0x00000" +} + +] +}, +{ +"is_managed" : false, +"offset_free_hash" : "0x0", +"offset_rich_hash" : "0x0", +"crashed" : false, +"native_thread_id" : "0x170ae7000", +"thread_info_addr" : "0x328d60400", +"thread_name" : "tid_11a03", +"ctx" : { +"IP" : "0x188826eb0", +"SP" : "0x170ae6d00", +"BP" : "0x170ae6d10" +}, +"unmanaged_frames" : [ +{ +"is_managed" : "false", +"native_address" : "0x3104ffad8", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310635e38", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106361b0", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310635f5c", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310540d74", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x18889ede4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1886b5b50", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1886b6204", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x10300c3e4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x100a0a4dc", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x100a0b934", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x100c3a474", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1888682e4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1888630fc", +"native_offset" : "0x00000" +} + +] +}, +{ +"is_managed" : false, +"offset_free_hash" : "0x0", +"offset_rich_hash" : "0x0", +"crashed" : false, +"native_thread_id" : "0x356217000", +"thread_info_addr" : "0x3739a6800", +"thread_name" : "tid_23f3b", +"ctx" : { +"IP" : "0x188826eb0", +"SP" : "0x356216d00", +"BP" : "0x356216d10" +}, +"unmanaged_frames" : [ +{ +"is_managed" : "false", +"native_address" : "0x3104ffad8", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310635e38", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106361b0", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310635f5c", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310540d74", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x18889ede4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1886b5b50", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1886b6204", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x10300c3e4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x100a0a4dc", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x100a0b934", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x100c3a474", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1888682e4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1888630fc", +"native_offset" : "0x00000" +} + +] +}, +{ +"is_managed" : false, +"offset_free_hash" : "0x0", +"offset_rich_hash" : "0x0", +"crashed" : false, +"native_thread_id" : "0x170b73000", +"thread_info_addr" : "0x32e90c800", +"thread_name" : "tid_11b03", +"ctx" : { +"IP" : "0x188826eb0", +"SP" : "0x170b72d00", +"BP" : "0x170b72d10" +}, +"unmanaged_frames" : [ +{ +"is_managed" : "false", +"native_address" : "0x3104ffad8", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310635e38", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106361b0", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310635f5c", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310540d74", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x18889ede4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1886b5b50", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1886b6204", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x10300c3e4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x100a0a4dc", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x100a0b934", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x100c3a474", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1888682e4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1888630fc", +"native_offset" : "0x00000" +} + +] +}, +{ +"is_managed" : false, +"offset_free_hash" : "0x0", +"offset_rich_hash" : "0x0", +"crashed" : false, +"native_thread_id" : "0x170bff000", +"thread_info_addr" : "0x373babe00", +"thread_name" : "tid_13d03", +"ctx" : { +"IP" : "0x188826eb0", +"SP" : "0x170bfed00", +"BP" : "0x170bfed10" +}, +"unmanaged_frames" : [ +{ +"is_managed" : "false", +"native_address" : "0x3104ffad8", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310635e38", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106361b0", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310635f5c", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310540d74", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x18889ede4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1886b5b50", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1886b6204", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x10300c3e4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x100a0a4dc", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x100a0b934", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x100c3a474", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1888682e4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1888630fc", +"native_offset" : "0x00000" +} + +] +}, +{ +"is_managed" : false, +"offset_free_hash" : "0x0", +"offset_rich_hash" : "0x0", +"crashed" : false, +"native_thread_id" : "0x170c8b000", +"thread_info_addr" : "0x125028000", +"thread_name" : "tid_11c03", +"ctx" : { +"IP" : "0x188826eb0", +"SP" : "0x170c8ad00", +"BP" : "0x170c8ad10" +}, +"unmanaged_frames" : [ +{ +"is_managed" : "false", +"native_address" : "0x3104ffad8", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310635e38", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106361b0", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310635f5c", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310540d74", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x18889ede4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1886b5b50", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1886b6204", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x10300c3e4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x100a0a4dc", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x100a0b934", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x100c3a474", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1888682e4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1888630fc", +"native_offset" : "0x00000" +} + +] +}, +{ +"is_managed" : false, +"offset_free_hash" : "0x0", +"offset_rich_hash" : "0x0", +"crashed" : false, +"native_thread_id" : "0x170d17000", +"thread_info_addr" : "0x336cbe600", +"thread_name" : "tid_11d03", +"ctx" : { +"IP" : "0x188826eb0", +"SP" : "0x170d16d00", +"BP" : "0x170d16d10" +}, +"unmanaged_frames" : [ +{ +"is_managed" : "false", +"native_address" : "0x3104ffad8", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310635e38", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106361b0", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310635f5c", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310540d74", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x18889ede4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1886b5b50", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1886b6204", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x10300c3e4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x100a0a4dc", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x100a0b934", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x100c3a474", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1888682e4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1888630fc", +"native_offset" : "0x00000" +} + +] +}, +{ +"is_managed" : false, +"offset_free_hash" : "0x0", +"offset_rich_hash" : "0x0", +"crashed" : false, +"native_thread_id" : "0x383713000", +"thread_info_addr" : "0x336e0f600", +"thread_name" : "Thread Pool Worker", +"ctx" : { +"IP" : "0x188826ec8", +"SP" : "0x383712dc0", +"BP" : "0x383712e50" +}, +"unmanaged_frames" : [ +{ +"is_managed" : "false", +"native_address" : "0x3104ffad8", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310635e38", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106361b0", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310635f5c", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310540d74", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x18889ede4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x31058eaac", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310636c20", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310636acc", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106b5fc8", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106b5f50", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1888682e4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1888630fc", +"native_offset" : "0x00000" +} + +] +}, +{ +"is_managed" : true, +"offset_free_hash" : "0x1491dfc54e", +"offset_rich_hash" : "0x1491dfc910", +"crashed" : false, +"native_thread_id" : "0x32d0ab000", +"thread_info_addr" : "0x317db5200", +"thread_name" : "Burst-CompilerThread-1", +"ctx" : { +"IP" : "0x18882a6cc", +"SP" : "0x32d0a9ae0", +"BP" : "0x32d0a9b70" +}, +"managed_frames" : [ +{ +"is_managed" : "false", +"native_address" : "unregistered" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x00000", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0xffffffff" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x60020b3", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x000c7" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x60020a5", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x000a1" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x60020a9", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "A3BFFBAE-B945-4750-AFBB-F3D363FB55F3", +"token" : "0x60026ce", +"native_offset" : "0x0", +"filename" : "System.dll", +"sizeofimage" : "0x29a000", +"timestamp" : "0xda5b041f", +"il_offset" : "0x0006e" +} +, +{ +"is_managed" : "true", +"guid" : "A3BFFBAE-B945-4750-AFBB-F3D363FB55F3", +"token" : "0x60026cd", +"native_offset" : "0x0", +"filename" : "System.dll", +"sizeofimage" : "0x29a000", +"timestamp" : "0xda5b041f", +"il_offset" : "0x0003c" +} +, +{ +"is_managed" : "true", +"guid" : "A3BFFBAE-B945-4750-AFBB-F3D363FB55F3", +"token" : "0x60026c8", +"native_offset" : "0x0", +"filename" : "System.dll", +"sizeofimage" : "0x29a000", +"timestamp" : "0xda5b041f", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "69B504CF-34C5-4D68-8310-E60F1CE29D2E", +"token" : "0x6000b92", +"native_offset" : "0x0", +"filename" : "Burst.Compiler.IL.dll", +"sizeofimage" : "0x1aa000", +"timestamp" : "0x804eb2a0", +"il_offset" : "0x00024" +} +, +{ +"is_managed" : "true", +"guid" : "69B504CF-34C5-4D68-8310-E60F1CE29D2E", +"token" : "0x6000be4", +"native_offset" : "0x0", +"filename" : "Burst.Compiler.IL.dll", +"sizeofimage" : "0x1aa000", +"timestamp" : "0x804eb2a0", +"il_offset" : "0x00070" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f7d", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00014" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f25", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00071" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f23", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f22", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x0002b" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f7f", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00008" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x00000", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00065" +} + +], +"unmanaged_frames" : [ +{ +"is_managed" : "false", +"native_address" : "0x3104ffad8", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310635e38", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106361b0", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310635f5c", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310540d74", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x18889ede4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x188868894", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x31068533c", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310642458", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106420b4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106309c4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3105db080", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x00000", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x60020b3", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x60020a5", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x60020a9", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "A3BFFBAE-B945-4750-AFBB-F3D363FB55F3", +"token" : "0x60026ce", +"native_offset" : "0x0", +"filename" : "System.dll", +"sizeofimage" : "0x29a000", +"timestamp" : "0xda5b041f", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "A3BFFBAE-B945-4750-AFBB-F3D363FB55F3", +"token" : "0x60026cd", +"native_offset" : "0x0", +"filename" : "System.dll", +"sizeofimage" : "0x29a000", +"timestamp" : "0xda5b041f", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "A3BFFBAE-B945-4750-AFBB-F3D363FB55F3", +"token" : "0x60026c8", +"native_offset" : "0x0", +"filename" : "System.dll", +"sizeofimage" : "0x29a000", +"timestamp" : "0xda5b041f", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "69B504CF-34C5-4D68-8310-E60F1CE29D2E", +"token" : "0x6000b92", +"native_offset" : "0x0", +"filename" : "Burst.Compiler.IL.dll", +"sizeofimage" : "0x1aa000", +"timestamp" : "0x804eb2a0", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "69B504CF-34C5-4D68-8310-E60F1CE29D2E", +"token" : "0x6000be4", +"native_offset" : "0x0", +"filename" : "Burst.Compiler.IL.dll", +"sizeofimage" : "0x1aa000", +"timestamp" : "0x804eb2a0", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f7d", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f25", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f23", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f22", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f7f", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x00000", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x31048f6dc", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310614ca8", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310616670", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310636d14", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310636acc", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106b5fc8", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106b5f50", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1888682e4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1888630fc", +"native_offset" : "0x00000" +} + +] +}, +{ +"is_managed" : false, +"offset_free_hash" : "0x0", +"offset_rich_hash" : "0x0", +"crashed" : false, +"native_thread_id" : "0x38233f000", +"thread_info_addr" : "0x393174000", +"thread_name" : "Thread Pool Worker", +"ctx" : { +"IP" : "0x188826ec8", +"SP" : "0x38233edc0", +"BP" : "0x38233ee50" +}, +"unmanaged_frames" : [ +{ +"is_managed" : "false", +"native_address" : "0x3104ffad8", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310635e38", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106361b0", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310635f5c", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310540d74", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x18889ede4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x31058eaac", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310636c20", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310636acc", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106b5fc8", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106b5f50", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1888682e4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1888630fc", +"native_offset" : "0x00000" +} + +] +}, +{ +"is_managed" : true, +"offset_free_hash" : "0x1491dfc54e", +"offset_rich_hash" : "0x1491dfc910", +"crashed" : false, +"native_thread_id" : "0x32d4c3000", +"thread_info_addr" : "0x1171b7600", +"thread_name" : "Burst-CompilerThread-3", +"ctx" : { +"IP" : "0x18882a6cc", +"SP" : "0x32d4c1ae0", +"BP" : "0x32d4c1b70" +}, +"managed_frames" : [ +{ +"is_managed" : "false", +"native_address" : "unregistered" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x00000", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0xffffffff" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x60020b3", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x000c7" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x60020a5", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x000a1" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x60020a9", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "A3BFFBAE-B945-4750-AFBB-F3D363FB55F3", +"token" : "0x60026ce", +"native_offset" : "0x0", +"filename" : "System.dll", +"sizeofimage" : "0x29a000", +"timestamp" : "0xda5b041f", +"il_offset" : "0x0006e" +} +, +{ +"is_managed" : "true", +"guid" : "A3BFFBAE-B945-4750-AFBB-F3D363FB55F3", +"token" : "0x60026cd", +"native_offset" : "0x0", +"filename" : "System.dll", +"sizeofimage" : "0x29a000", +"timestamp" : "0xda5b041f", +"il_offset" : "0x0003c" +} +, +{ +"is_managed" : "true", +"guid" : "A3BFFBAE-B945-4750-AFBB-F3D363FB55F3", +"token" : "0x60026c8", +"native_offset" : "0x0", +"filename" : "System.dll", +"sizeofimage" : "0x29a000", +"timestamp" : "0xda5b041f", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "69B504CF-34C5-4D68-8310-E60F1CE29D2E", +"token" : "0x6000b92", +"native_offset" : "0x0", +"filename" : "Burst.Compiler.IL.dll", +"sizeofimage" : "0x1aa000", +"timestamp" : "0x804eb2a0", +"il_offset" : "0x00024" +} +, +{ +"is_managed" : "true", +"guid" : "69B504CF-34C5-4D68-8310-E60F1CE29D2E", +"token" : "0x6000be4", +"native_offset" : "0x0", +"filename" : "Burst.Compiler.IL.dll", +"sizeofimage" : "0x1aa000", +"timestamp" : "0x804eb2a0", +"il_offset" : "0x00070" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f7d", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00014" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f25", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00071" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f23", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f22", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x0002b" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f7f", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00008" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x00000", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00065" +} + +], +"unmanaged_frames" : [ +{ +"is_managed" : "false", +"native_address" : "0x3104ffad8", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310635e38", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106361b0", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310635f5c", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310540d74", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x18889ede4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x188868894", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x31068533c", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310642458", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106420b4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106309c4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3105db080", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x00000", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x60020b3", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x60020a5", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x60020a9", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "A3BFFBAE-B945-4750-AFBB-F3D363FB55F3", +"token" : "0x60026ce", +"native_offset" : "0x0", +"filename" : "System.dll", +"sizeofimage" : "0x29a000", +"timestamp" : "0xda5b041f", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "A3BFFBAE-B945-4750-AFBB-F3D363FB55F3", +"token" : "0x60026cd", +"native_offset" : "0x0", +"filename" : "System.dll", +"sizeofimage" : "0x29a000", +"timestamp" : "0xda5b041f", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "A3BFFBAE-B945-4750-AFBB-F3D363FB55F3", +"token" : "0x60026c8", +"native_offset" : "0x0", +"filename" : "System.dll", +"sizeofimage" : "0x29a000", +"timestamp" : "0xda5b041f", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "69B504CF-34C5-4D68-8310-E60F1CE29D2E", +"token" : "0x6000b92", +"native_offset" : "0x0", +"filename" : "Burst.Compiler.IL.dll", +"sizeofimage" : "0x1aa000", +"timestamp" : "0x804eb2a0", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "69B504CF-34C5-4D68-8310-E60F1CE29D2E", +"token" : "0x6000be4", +"native_offset" : "0x0", +"filename" : "Burst.Compiler.IL.dll", +"sizeofimage" : "0x1aa000", +"timestamp" : "0x804eb2a0", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f7d", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f25", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f23", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f22", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f7f", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x00000", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x31048f6dc", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310614ca8", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310616670", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310636d14", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310636acc", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106b5fc8", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106b5f50", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1888682e4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1888630fc", +"native_offset" : "0x00000" +} + +] +}, +{ +"is_managed" : true, +"offset_free_hash" : "0x1491dfc54e", +"offset_rich_hash" : "0x1491dfc910", +"crashed" : false, +"native_thread_id" : "0x32d8db000", +"thread_info_addr" : "0x317e51c00", +"thread_name" : "Burst-CompilerThread-5", +"ctx" : { +"IP" : "0x18882a6cc", +"SP" : "0x32d8d9ae0", +"BP" : "0x32d8d9b70" +}, +"managed_frames" : [ +{ +"is_managed" : "false", +"native_address" : "unregistered" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x00000", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0xffffffff" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x60020b3", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x000c7" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x60020a5", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x000a1" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x60020a9", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "A3BFFBAE-B945-4750-AFBB-F3D363FB55F3", +"token" : "0x60026ce", +"native_offset" : "0x0", +"filename" : "System.dll", +"sizeofimage" : "0x29a000", +"timestamp" : "0xda5b041f", +"il_offset" : "0x0006e" +} +, +{ +"is_managed" : "true", +"guid" : "A3BFFBAE-B945-4750-AFBB-F3D363FB55F3", +"token" : "0x60026cd", +"native_offset" : "0x0", +"filename" : "System.dll", +"sizeofimage" : "0x29a000", +"timestamp" : "0xda5b041f", +"il_offset" : "0x0003c" +} +, +{ +"is_managed" : "true", +"guid" : "A3BFFBAE-B945-4750-AFBB-F3D363FB55F3", +"token" : "0x60026c8", +"native_offset" : "0x0", +"filename" : "System.dll", +"sizeofimage" : "0x29a000", +"timestamp" : "0xda5b041f", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "69B504CF-34C5-4D68-8310-E60F1CE29D2E", +"token" : "0x6000b92", +"native_offset" : "0x0", +"filename" : "Burst.Compiler.IL.dll", +"sizeofimage" : "0x1aa000", +"timestamp" : "0x804eb2a0", +"il_offset" : "0x00024" +} +, +{ +"is_managed" : "true", +"guid" : "69B504CF-34C5-4D68-8310-E60F1CE29D2E", +"token" : "0x6000be4", +"native_offset" : "0x0", +"filename" : "Burst.Compiler.IL.dll", +"sizeofimage" : "0x1aa000", +"timestamp" : "0x804eb2a0", +"il_offset" : "0x00070" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f7d", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00014" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f25", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00071" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f23", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f22", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x0002b" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f7f", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00008" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x00000", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00065" +} + +], +"unmanaged_frames" : [ +{ +"is_managed" : "false", +"native_address" : "0x3104ffad8", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310635e38", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106361b0", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310635f5c", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310540d74", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x18889ede4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x188868894", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x31068533c", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310642458", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106420b4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106309c4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3105db080", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x00000", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x60020b3", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x60020a5", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x60020a9", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "A3BFFBAE-B945-4750-AFBB-F3D363FB55F3", +"token" : "0x60026ce", +"native_offset" : "0x0", +"filename" : "System.dll", +"sizeofimage" : "0x29a000", +"timestamp" : "0xda5b041f", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "A3BFFBAE-B945-4750-AFBB-F3D363FB55F3", +"token" : "0x60026cd", +"native_offset" : "0x0", +"filename" : "System.dll", +"sizeofimage" : "0x29a000", +"timestamp" : "0xda5b041f", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "A3BFFBAE-B945-4750-AFBB-F3D363FB55F3", +"token" : "0x60026c8", +"native_offset" : "0x0", +"filename" : "System.dll", +"sizeofimage" : "0x29a000", +"timestamp" : "0xda5b041f", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "69B504CF-34C5-4D68-8310-E60F1CE29D2E", +"token" : "0x6000b92", +"native_offset" : "0x0", +"filename" : "Burst.Compiler.IL.dll", +"sizeofimage" : "0x1aa000", +"timestamp" : "0x804eb2a0", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "69B504CF-34C5-4D68-8310-E60F1CE29D2E", +"token" : "0x6000be4", +"native_offset" : "0x0", +"filename" : "Burst.Compiler.IL.dll", +"sizeofimage" : "0x1aa000", +"timestamp" : "0x804eb2a0", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f7d", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f25", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f23", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f22", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f7f", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x00000", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x31048f6dc", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310614ca8", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310616670", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310636d14", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310636acc", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106b5fc8", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106b5f50", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1888682e4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1888630fc", +"native_offset" : "0x00000" +} + +] +}, +{ +"is_managed" : true, +"offset_free_hash" : "0x1491dfc54e", +"offset_rich_hash" : "0x1491dfc910", +"crashed" : false, +"native_thread_id" : "0x32dcf3000", +"thread_info_addr" : "0x124f98e00", +"thread_name" : "Burst-CompilerThread-7", +"ctx" : { +"IP" : "0x18882a6cc", +"SP" : "0x32dcf1ae0", +"BP" : "0x32dcf1b70" +}, +"managed_frames" : [ +{ +"is_managed" : "false", +"native_address" : "unregistered" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x00000", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0xffffffff" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x60020b3", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x000c7" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x60020a5", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x000a1" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x60020a9", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "A3BFFBAE-B945-4750-AFBB-F3D363FB55F3", +"token" : "0x60026ce", +"native_offset" : "0x0", +"filename" : "System.dll", +"sizeofimage" : "0x29a000", +"timestamp" : "0xda5b041f", +"il_offset" : "0x0006e" +} +, +{ +"is_managed" : "true", +"guid" : "A3BFFBAE-B945-4750-AFBB-F3D363FB55F3", +"token" : "0x60026cd", +"native_offset" : "0x0", +"filename" : "System.dll", +"sizeofimage" : "0x29a000", +"timestamp" : "0xda5b041f", +"il_offset" : "0x0003c" +} +, +{ +"is_managed" : "true", +"guid" : "A3BFFBAE-B945-4750-AFBB-F3D363FB55F3", +"token" : "0x60026c8", +"native_offset" : "0x0", +"filename" : "System.dll", +"sizeofimage" : "0x29a000", +"timestamp" : "0xda5b041f", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "69B504CF-34C5-4D68-8310-E60F1CE29D2E", +"token" : "0x6000b92", +"native_offset" : "0x0", +"filename" : "Burst.Compiler.IL.dll", +"sizeofimage" : "0x1aa000", +"timestamp" : "0x804eb2a0", +"il_offset" : "0x00024" +} +, +{ +"is_managed" : "true", +"guid" : "69B504CF-34C5-4D68-8310-E60F1CE29D2E", +"token" : "0x6000be4", +"native_offset" : "0x0", +"filename" : "Burst.Compiler.IL.dll", +"sizeofimage" : "0x1aa000", +"timestamp" : "0x804eb2a0", +"il_offset" : "0x00070" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f7d", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00014" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f25", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00071" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f23", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f22", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x0002b" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f7f", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00008" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x00000", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00065" +} + +], +"unmanaged_frames" : [ +{ +"is_managed" : "false", +"native_address" : "0x3104ffad8", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310635e38", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106361b0", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310635f5c", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310540d74", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x18889ede4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x188868894", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x31068533c", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310642458", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106420b4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106309c4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3105db080", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x00000", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x60020b3", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x60020a5", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x60020a9", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "A3BFFBAE-B945-4750-AFBB-F3D363FB55F3", +"token" : "0x60026ce", +"native_offset" : "0x0", +"filename" : "System.dll", +"sizeofimage" : "0x29a000", +"timestamp" : "0xda5b041f", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "A3BFFBAE-B945-4750-AFBB-F3D363FB55F3", +"token" : "0x60026cd", +"native_offset" : "0x0", +"filename" : "System.dll", +"sizeofimage" : "0x29a000", +"timestamp" : "0xda5b041f", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "A3BFFBAE-B945-4750-AFBB-F3D363FB55F3", +"token" : "0x60026c8", +"native_offset" : "0x0", +"filename" : "System.dll", +"sizeofimage" : "0x29a000", +"timestamp" : "0xda5b041f", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "69B504CF-34C5-4D68-8310-E60F1CE29D2E", +"token" : "0x6000b92", +"native_offset" : "0x0", +"filename" : "Burst.Compiler.IL.dll", +"sizeofimage" : "0x1aa000", +"timestamp" : "0x804eb2a0", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "69B504CF-34C5-4D68-8310-E60F1CE29D2E", +"token" : "0x6000be4", +"native_offset" : "0x0", +"filename" : "Burst.Compiler.IL.dll", +"sizeofimage" : "0x1aa000", +"timestamp" : "0x804eb2a0", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f7d", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f25", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f23", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f22", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f7f", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x00000", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x31048f6dc", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310614ca8", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310616670", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310636d14", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310636acc", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106b5fc8", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106b5f50", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1888682e4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1888630fc", +"native_offset" : "0x00000" +} + +] +}, +{ +"is_managed" : true, +"offset_free_hash" : "0x1491dfc54e", +"offset_rich_hash" : "0x1491dfc910", +"crashed" : false, +"native_thread_id" : "0x32e10b000", +"thread_info_addr" : "0x316daec00", +"thread_name" : "Burst-CompilerThread-9", +"ctx" : { +"IP" : "0x18882a6cc", +"SP" : "0x32e109ae0", +"BP" : "0x32e109b70" +}, +"managed_frames" : [ +{ +"is_managed" : "false", +"native_address" : "unregistered" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x00000", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0xffffffff" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x60020b3", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x000c7" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x60020a5", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x000a1" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x60020a9", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "A3BFFBAE-B945-4750-AFBB-F3D363FB55F3", +"token" : "0x60026ce", +"native_offset" : "0x0", +"filename" : "System.dll", +"sizeofimage" : "0x29a000", +"timestamp" : "0xda5b041f", +"il_offset" : "0x0006e" +} +, +{ +"is_managed" : "true", +"guid" : "A3BFFBAE-B945-4750-AFBB-F3D363FB55F3", +"token" : "0x60026cd", +"native_offset" : "0x0", +"filename" : "System.dll", +"sizeofimage" : "0x29a000", +"timestamp" : "0xda5b041f", +"il_offset" : "0x0003c" +} +, +{ +"is_managed" : "true", +"guid" : "A3BFFBAE-B945-4750-AFBB-F3D363FB55F3", +"token" : "0x60026c8", +"native_offset" : "0x0", +"filename" : "System.dll", +"sizeofimage" : "0x29a000", +"timestamp" : "0xda5b041f", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "69B504CF-34C5-4D68-8310-E60F1CE29D2E", +"token" : "0x6000b92", +"native_offset" : "0x0", +"filename" : "Burst.Compiler.IL.dll", +"sizeofimage" : "0x1aa000", +"timestamp" : "0x804eb2a0", +"il_offset" : "0x00024" +} +, +{ +"is_managed" : "true", +"guid" : "69B504CF-34C5-4D68-8310-E60F1CE29D2E", +"token" : "0x6000be4", +"native_offset" : "0x0", +"filename" : "Burst.Compiler.IL.dll", +"sizeofimage" : "0x1aa000", +"timestamp" : "0x804eb2a0", +"il_offset" : "0x00070" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f7d", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00014" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f25", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00071" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f23", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f22", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x0002b" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f7f", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00008" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x00000", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00065" +} + +], +"unmanaged_frames" : [ +{ +"is_managed" : "false", +"native_address" : "0x3104ffad8", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310635e38", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106361b0", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310635f5c", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310540d74", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x18889ede4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x188868894", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x31068533c", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310642458", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106420b4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106309c4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3105db080", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x00000", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x60020b3", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x60020a5", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x60020a9", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "A3BFFBAE-B945-4750-AFBB-F3D363FB55F3", +"token" : "0x60026ce", +"native_offset" : "0x0", +"filename" : "System.dll", +"sizeofimage" : "0x29a000", +"timestamp" : "0xda5b041f", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "A3BFFBAE-B945-4750-AFBB-F3D363FB55F3", +"token" : "0x60026cd", +"native_offset" : "0x0", +"filename" : "System.dll", +"sizeofimage" : "0x29a000", +"timestamp" : "0xda5b041f", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "A3BFFBAE-B945-4750-AFBB-F3D363FB55F3", +"token" : "0x60026c8", +"native_offset" : "0x0", +"filename" : "System.dll", +"sizeofimage" : "0x29a000", +"timestamp" : "0xda5b041f", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "69B504CF-34C5-4D68-8310-E60F1CE29D2E", +"token" : "0x6000b92", +"native_offset" : "0x0", +"filename" : "Burst.Compiler.IL.dll", +"sizeofimage" : "0x1aa000", +"timestamp" : "0x804eb2a0", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "69B504CF-34C5-4D68-8310-E60F1CE29D2E", +"token" : "0x6000be4", +"native_offset" : "0x0", +"filename" : "Burst.Compiler.IL.dll", +"sizeofimage" : "0x1aa000", +"timestamp" : "0x804eb2a0", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f7d", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f25", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f23", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f22", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x6001f7f", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "true", +"guid" : "3AACBE60-8A2F-468E-B6BB-1C15E219490D", +"token" : "0x00000", +"native_offset" : "0x0", +"filename" : "mscorlib.dll", +"sizeofimage" : "0x470000", +"timestamp" : "0xcd46cd56", +"il_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x31048f6dc", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310614ca8", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310616670", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310636d14", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310636acc", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106b5fc8", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106b5f50", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1888682e4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1888630fc", +"native_offset" : "0x00000" +} + +] +}, +{ +"is_managed" : false, +"offset_free_hash" : "0x0", +"offset_rich_hash" : "0x0", +"crashed" : false, +"native_thread_id" : "0x31e4ef000", +"thread_info_addr" : "0x3774e4e00", +"thread_name" : "tid_34daf", +"ctx" : { +"IP" : "0x18882a6cc", +"SP" : "0x31e4eec40", +"BP" : "0x31e4eecd0" +}, +"unmanaged_frames" : [ +{ +"is_managed" : "false", +"native_address" : "0x3104ffad8", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310635e38", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106361b0", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310635f5c", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310540d74", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x18889ede4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1888688c0", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310685314", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x31068eef4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x31058e2e0", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310636c20", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310636acc", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106b5fc8", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106b5f50", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1888682e4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1888630fc", +"native_offset" : "0x00000" +} + +] +}, +{ +"is_managed" : false, +"offset_free_hash" : "0x0", +"offset_rich_hash" : "0x0", +"crashed" : false, +"native_thread_id" : "0x345a87000", +"thread_info_addr" : "0x12615e400", +"thread_name" : "Thread Pool Worker", +"ctx" : { +"IP" : "0x188826ec8", +"SP" : "0x345a86dc0", +"BP" : "0x345a86e50" +}, +"unmanaged_frames" : [ +{ +"is_managed" : "false", +"native_address" : "0x3104ffad8", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310635e38", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106361b0", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310635f5c", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310540d74", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x18889ede4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x31058eaac", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310636c20", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310636acc", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106b5fc8", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106b5f50", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1888682e4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1888630fc", +"native_offset" : "0x00000" +} + +] +}, +{ +"is_managed" : false, +"offset_free_hash" : "0x0", +"offset_rich_hash" : "0x0", +"crashed" : false, +"native_thread_id" : "0x31e907000", +"thread_info_addr" : "0x124a5d000", +"thread_name" : "Thread Pool Worker", +"ctx" : { +"IP" : "0x188826ec8", +"SP" : "0x31e906dc0", +"BP" : "0x31e906e50" +}, +"unmanaged_frames" : [ +{ +"is_managed" : "false", +"native_address" : "0x3104ffad8", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310635e38", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106361b0", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310635f5c", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310540d74", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x18889ede4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x31058eaac", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310636c20", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310636acc", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106b5fc8", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106b5f50", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1888682e4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1888630fc", +"native_offset" : "0x00000" +} + +] +}, +{ +"is_managed" : false, +"offset_free_hash" : "0x0", +"offset_rich_hash" : "0x0", +"crashed" : false, +"native_thread_id" : "0x3176f7000", +"thread_info_addr" : "0x124a66800", +"thread_name" : "Thread Pool I/O Selector", +"ctx" : { +"IP" : "0x188831f9c", +"SP" : "0x3176f6af0", +"BP" : "0x3176f6cf0" +}, +"unmanaged_frames" : [ +{ +"is_managed" : "false", +"native_address" : "0x3104ffad8", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310635e38", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106361b0", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310635f5c", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310540d74", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x18889ede4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310687d88", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x31063b444", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x31063adc0", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310636c20", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x310636acc", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106b5fc8", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x3106b5f50", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1888682e4", +"native_offset" : "0x00000" +} +, +{ +"is_managed" : "false", +"native_address" : "0x1888630fc", +"native_offset" : "0x00000" +} + +] +} +] +} \ No newline at end of file From dc61c3c1d0828bede9af50400a5bec6aedfc1dd2 Mon Sep 17 00:00:00 2001 From: RochesterX Date: Wed, 15 Jan 2025 15:05:04 -0500 Subject: [PATCH 13/25] Project Restructure (PLEASE UPDATE AFTER COMMIT) --- .../Platformer.meta => Animations.meta} | 2 +- .../Platformer => Animations}/Bones.anim | 0 .../Platformer => Animations}/Bones.anim.meta | 0 .../Platformer => Animations}/Root.controller | 0 .../Root.controller.meta | 0 Assets/Fonts.meta | 8 ++++++++ Assets/Fonts/Fonts.meta | 8 ++++++++ Assets/{Hub => Fonts/Fonts}/Silkscreen.meta | 0 .../{Hub => Fonts/Fonts}/Silkscreen/OFL.txt | 0 .../Fonts}/Silkscreen/OFL.txt.meta | 0 .../Silkscreen/Silkscreen-Bold SDF.asset | 0 .../Silkscreen/Silkscreen-Bold SDF.asset.meta | 0 .../Fonts}/Silkscreen/Silkscreen-Bold.ttf | Bin .../Silkscreen/Silkscreen-Bold.ttf.meta | 0 .../Silkscreen/Silkscreen-Regular SDF.asset | 0 .../Silkscreen-Regular SDF.asset.meta | 0 .../Fonts}/Silkscreen/Silkscreen-Regular.ttf | Bin .../Silkscreen/Silkscreen-Regular.ttf.meta | 0 Assets/{ => Fonts}/TextMesh Pro.meta | 0 Assets/{ => Fonts}/TextMesh Pro/Fonts.meta | 0 .../Fonts/LiberationSans - OFL.txt | 0 .../Fonts/LiberationSans - OFL.txt.meta | 0 .../TextMesh Pro/Fonts/LiberationSans.ttf | Bin .../Fonts/LiberationSans.ttf.meta | 0 .../{ => Fonts}/TextMesh Pro/Resources.meta | 0 .../Resources/Fonts & Materials.meta | 0 .../LiberationSans SDF - Drop Shadow.mat | 0 .../LiberationSans SDF - Drop Shadow.mat.meta | 0 .../LiberationSans SDF - Fallback.asset | 0 .../LiberationSans SDF - Fallback.asset.meta | 0 .../LiberationSans SDF - Outline.mat | 0 .../LiberationSans SDF - Outline.mat.meta | 0 .../LiberationSans SDF.asset | 0 .../LiberationSans SDF.asset.meta | 0 .../LineBreaking Following Characters.txt | 0 ...LineBreaking Following Characters.txt.meta | 0 .../LineBreaking Leading Characters.txt | 0 .../LineBreaking Leading Characters.txt.meta | 0 .../TextMesh Pro/Resources/Sprite Assets.meta | 0 .../Resources/Sprite Assets/EmojiOne.asset | 0 .../Sprite Assets/EmojiOne.asset.meta | 0 .../TextMesh Pro/Resources/Style Sheets.meta | 0 .../Style Sheets/Default Style Sheet.asset | 0 .../Default Style Sheet.asset.meta | 0 .../TextMesh Pro/Resources/TMP Settings.asset | 0 .../Resources/TMP Settings.asset.meta | 0 Assets/{ => Fonts}/TextMesh Pro/Shaders.meta | 0 .../TextMesh Pro/Shaders/SDFFunctions.hlsl | 0 .../Shaders/SDFFunctions.hlsl.meta | 0 .../Shaders/TMP_Bitmap-Custom-Atlas.shader | 0 .../TMP_Bitmap-Custom-Atlas.shader.meta | 0 .../Shaders/TMP_Bitmap-Mobile.shader | 0 .../Shaders/TMP_Bitmap-Mobile.shader.meta | 0 .../TextMesh Pro/Shaders/TMP_Bitmap.shader | 0 .../Shaders/TMP_Bitmap.shader.meta | 0 .../Shaders/TMP_SDF Overlay.shader | 0 .../Shaders/TMP_SDF Overlay.shader.meta | 0 .../TextMesh Pro/Shaders/TMP_SDF SSD.shader | 0 .../Shaders/TMP_SDF SSD.shader.meta | 0 .../Shaders/TMP_SDF-HDRP LIT.shadergraph | 0 .../Shaders/TMP_SDF-HDRP LIT.shadergraph.meta | 0 .../Shaders/TMP_SDF-HDRP UNLIT.shadergraph | 0 .../TMP_SDF-HDRP UNLIT.shadergraph.meta | 0 .../Shaders/TMP_SDF-Mobile Masking.shader | 0 .../TMP_SDF-Mobile Masking.shader.meta | 0 .../Shaders/TMP_SDF-Mobile Overlay.shader | 0 .../TMP_SDF-Mobile Overlay.shader.meta | 0 .../Shaders/TMP_SDF-Mobile SSD.shader | 0 .../Shaders/TMP_SDF-Mobile SSD.shader.meta | 0 .../Shaders/TMP_SDF-Mobile-2-Pass.shader | 0 .../Shaders/TMP_SDF-Mobile-2-Pass.shader.meta | 0 .../Shaders/TMP_SDF-Mobile.shader | 0 .../Shaders/TMP_SDF-Mobile.shader.meta | 0 .../Shaders/TMP_SDF-Surface-Mobile.shader | 0 .../TMP_SDF-Surface-Mobile.shader.meta | 0 .../Shaders/TMP_SDF-Surface.shader | 0 .../Shaders/TMP_SDF-Surface.shader.meta | 0 .../Shaders/TMP_SDF-URP Lit.shadergraph | 0 .../Shaders/TMP_SDF-URP Lit.shadergraph.meta | 0 .../Shaders/TMP_SDF-URP Unlit.shadergraph | 0 .../TMP_SDF-URP Unlit.shadergraph.meta | 0 .../TextMesh Pro/Shaders/TMP_SDF.shader | 0 .../TextMesh Pro/Shaders/TMP_SDF.shader.meta | 0 .../TextMesh Pro/Shaders/TMP_Sprite.shader | 0 .../Shaders/TMP_Sprite.shader.meta | 0 .../TextMesh Pro/Shaders/TMPro.cginc | 0 .../TextMesh Pro/Shaders/TMPro.cginc.meta | 0 .../TextMesh Pro/Shaders/TMPro_Mobile.cginc | 0 .../Shaders/TMPro_Mobile.cginc.meta | 0 .../Shaders/TMPro_Properties.cginc | 0 .../Shaders/TMPro_Properties.cginc.meta | 0 .../TextMesh Pro/Shaders/TMPro_Surface.cginc | 0 .../Shaders/TMPro_Surface.cginc.meta | 0 Assets/{ => Fonts}/TextMesh Pro/Sprites.meta | 0 .../Sprites/EmojiOne Attribution.txt | 0 .../Sprites/EmojiOne Attribution.txt.meta | 0 .../TextMesh Pro/Sprites/EmojiOne.json | 0 .../TextMesh Pro/Sprites/EmojiOne.json.meta | 0 .../TextMesh Pro/Sprites/EmojiOne.png | Bin .../TextMesh Pro/Sprites/EmojiOne.png.meta | 0 Assets/Games/.DS_Store | Bin 6148 -> 6148 bytes Assets/Input System.meta | 8 ++++++++ .../InputSystem_Actions.inputactions | 0 .../InputSystem_Actions.inputactions.meta | 0 .../Player Actions.inputactions | 0 .../Player Actions.inputactions.meta | 0 Assets/Materials.meta | 8 ++++++++ .../Ground.physicsMaterial2D | 0 .../Ground.physicsMaterial2D.meta | 0 .../Player.physicsMaterial2D | 0 .../Player.physicsMaterial2D.meta | 0 Assets/Old.meta | 8 ++++++++ Assets/{ => Old}/Hub.meta | 0 .../{ => Old}/Hub/Button Animation.controller | 0 .../Hub/Button Animation.controller.meta | 0 Assets/{ => Old}/Hub/Hub.unity | 0 Assets/{ => Old}/Hub/Hub.unity.meta | 0 Assets/{ => Old}/Hub/HubManager.cs | 0 Assets/{ => Old}/Hub/HubManager.cs.meta | 0 Assets/{ => Old}/Hub/HubPolygonCreator.cs | 0 .../{ => Old}/Hub/HubPolygonCreator.cs.meta | 0 Assets/{ => Old}/Hub/Platformer.png | Bin Assets/{ => Old}/Hub/Platformer.png.meta | 0 Assets/{Games => Old}/Pong.meta | 0 .../Pong/Ball.physicsMaterial2D | 0 .../Pong/Ball.physicsMaterial2D.meta | 0 Assets/{Games => Old}/Pong/Paddle.prefab | 0 Assets/{Games => Old}/Pong/Paddle.prefab.meta | 0 Assets/{Games => Old}/Pong/Pong Goal.prefab | 0 .../{Games => Old}/Pong/Pong Goal.prefab.meta | 0 Assets/{Games => Old}/Pong/Pong.unity | 0 Assets/{Games => Old}/Pong/Pong.unity.meta | 0 .../{Games => Old}/Pong/PongBallBehavior.cs | 0 .../Pong/PongBallBehavior.cs.meta | 0 .../{Games => Old}/Pong/PongPaddleBehavior.cs | 0 .../Pong/PongPaddleBehavior.cs.meta | 0 Assets/{Games => Old}/Pong/PongScorekeeper.cs | 0 .../Pong/PongScorekeeper.cs.meta | 0 Assets/{Games => Old}/Pong/pong-score.asset | 0 .../{Games => Old}/Pong/pong-score.asset.meta | 0 Assets/{Games => Old}/Pong/pong-score.ttf | Bin .../{Games => Old}/Pong/pong-score.ttf.meta | 0 Assets/Prefabs.meta | 8 ++++++++ .../Player Camera.prefab} | 2 +- .../Player Camera.prefab.meta} | 0 .../Player.prefab} | 2 +- .../Player.prefab.meta} | 0 .../Tile Palette.prefab} | 2 +- .../Tile Palette.prefab.meta} | 0 Assets/Scenes.meta | 8 ++++++++ .../Platformer => Scenes}/Platformer.unity | 0 .../Platformer.unity.meta | 0 Assets/Scripts.meta | 8 ++++++++ .../PlatformerPlayerMovement.cs | 0 .../PlatformerPlayerMovement.cs.meta | 0 .../PlayerCameraMovement.cs} | 2 +- .../PlayerCameraMovement.cs.meta} | 0 Assets/{ => Scripts}/PlayerManager.cs | 4 ++-- Assets/{ => Scripts}/PlayerManager.cs.meta | 0 Assets/{ => Scripts}/RespawnOnTriggerEnter.cs | 0 .../RespawnOnTriggerEnter.cs.meta | 0 Assets/Sprites.meta | 8 ++++++++ .../{Games/Platformer => Sprites}/Square.png | Bin .../Platformer => Sprites}/Square.png.meta | 0 .../{Games/Platformer => Sprites}/Tiles.meta | 0 .../Platformer => Sprites}/Tiles/Square.asset | 0 .../Tiles/Square.asset.meta | 0 ProjectSettings/EditorBuildSettings.asset | 6 +++--- 168 files changed, 82 insertions(+), 10 deletions(-) rename Assets/{Games/Platformer.meta => Animations.meta} (77%) rename Assets/{Games/Platformer => Animations}/Bones.anim (100%) rename Assets/{Games/Platformer => Animations}/Bones.anim.meta (100%) rename Assets/{Games/Platformer => Animations}/Root.controller (100%) rename Assets/{Games/Platformer => Animations}/Root.controller.meta (100%) create mode 100644 Assets/Fonts.meta create mode 100644 Assets/Fonts/Fonts.meta rename Assets/{Hub => Fonts/Fonts}/Silkscreen.meta (100%) rename Assets/{Hub => Fonts/Fonts}/Silkscreen/OFL.txt (100%) rename Assets/{Hub => Fonts/Fonts}/Silkscreen/OFL.txt.meta (100%) rename Assets/{Hub => Fonts/Fonts}/Silkscreen/Silkscreen-Bold SDF.asset (100%) rename Assets/{Hub => Fonts/Fonts}/Silkscreen/Silkscreen-Bold SDF.asset.meta (100%) rename Assets/{Hub => Fonts/Fonts}/Silkscreen/Silkscreen-Bold.ttf (100%) rename Assets/{Hub => Fonts/Fonts}/Silkscreen/Silkscreen-Bold.ttf.meta (100%) rename Assets/{Hub => Fonts/Fonts}/Silkscreen/Silkscreen-Regular SDF.asset (100%) rename Assets/{Hub => Fonts/Fonts}/Silkscreen/Silkscreen-Regular SDF.asset.meta (100%) rename Assets/{Hub => Fonts/Fonts}/Silkscreen/Silkscreen-Regular.ttf (100%) rename Assets/{Hub => Fonts/Fonts}/Silkscreen/Silkscreen-Regular.ttf.meta (100%) rename Assets/{ => Fonts}/TextMesh Pro.meta (100%) rename Assets/{ => Fonts}/TextMesh Pro/Fonts.meta (100%) rename Assets/{ => Fonts}/TextMesh Pro/Fonts/LiberationSans - OFL.txt (100%) rename Assets/{ => Fonts}/TextMesh Pro/Fonts/LiberationSans - OFL.txt.meta (100%) rename Assets/{ => Fonts}/TextMesh Pro/Fonts/LiberationSans.ttf (100%) rename Assets/{ => Fonts}/TextMesh Pro/Fonts/LiberationSans.ttf.meta (100%) rename Assets/{ => Fonts}/TextMesh Pro/Resources.meta (100%) rename Assets/{ => Fonts}/TextMesh Pro/Resources/Fonts & Materials.meta (100%) rename Assets/{ => Fonts}/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Drop Shadow.mat (100%) rename Assets/{ => Fonts}/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Drop Shadow.mat.meta (100%) rename Assets/{ => Fonts}/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset (100%) rename Assets/{ => Fonts}/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset.meta (100%) rename Assets/{ => Fonts}/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Outline.mat (100%) rename Assets/{ => Fonts}/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Outline.mat.meta (100%) rename Assets/{ => Fonts}/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset (100%) rename Assets/{ => Fonts}/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset.meta (100%) rename Assets/{ => Fonts}/TextMesh Pro/Resources/LineBreaking Following Characters.txt (100%) rename Assets/{ => Fonts}/TextMesh Pro/Resources/LineBreaking Following Characters.txt.meta (100%) rename Assets/{ => Fonts}/TextMesh Pro/Resources/LineBreaking Leading Characters.txt (100%) rename Assets/{ => Fonts}/TextMesh Pro/Resources/LineBreaking Leading Characters.txt.meta (100%) rename Assets/{ => Fonts}/TextMesh Pro/Resources/Sprite Assets.meta (100%) rename Assets/{ => Fonts}/TextMesh Pro/Resources/Sprite Assets/EmojiOne.asset (100%) rename Assets/{ => Fonts}/TextMesh Pro/Resources/Sprite Assets/EmojiOne.asset.meta (100%) rename Assets/{ => Fonts}/TextMesh Pro/Resources/Style Sheets.meta (100%) rename Assets/{ => Fonts}/TextMesh Pro/Resources/Style Sheets/Default Style Sheet.asset (100%) rename Assets/{ => Fonts}/TextMesh Pro/Resources/Style Sheets/Default Style Sheet.asset.meta (100%) rename Assets/{ => Fonts}/TextMesh Pro/Resources/TMP Settings.asset (100%) rename Assets/{ => Fonts}/TextMesh Pro/Resources/TMP Settings.asset.meta (100%) rename Assets/{ => Fonts}/TextMesh Pro/Shaders.meta (100%) rename Assets/{ => Fonts}/TextMesh Pro/Shaders/SDFFunctions.hlsl (100%) rename Assets/{ => Fonts}/TextMesh Pro/Shaders/SDFFunctions.hlsl.meta (100%) rename Assets/{ => Fonts}/TextMesh Pro/Shaders/TMP_Bitmap-Custom-Atlas.shader (100%) rename Assets/{ => Fonts}/TextMesh Pro/Shaders/TMP_Bitmap-Custom-Atlas.shader.meta (100%) rename Assets/{ => Fonts}/TextMesh Pro/Shaders/TMP_Bitmap-Mobile.shader (100%) rename Assets/{ => Fonts}/TextMesh Pro/Shaders/TMP_Bitmap-Mobile.shader.meta (100%) rename Assets/{ => Fonts}/TextMesh Pro/Shaders/TMP_Bitmap.shader (100%) rename Assets/{ => Fonts}/TextMesh Pro/Shaders/TMP_Bitmap.shader.meta (100%) rename Assets/{ => Fonts}/TextMesh Pro/Shaders/TMP_SDF Overlay.shader (100%) rename Assets/{ => Fonts}/TextMesh Pro/Shaders/TMP_SDF Overlay.shader.meta (100%) rename Assets/{ => Fonts}/TextMesh Pro/Shaders/TMP_SDF SSD.shader (100%) rename Assets/{ => Fonts}/TextMesh Pro/Shaders/TMP_SDF SSD.shader.meta (100%) rename Assets/{ => Fonts}/TextMesh Pro/Shaders/TMP_SDF-HDRP LIT.shadergraph (100%) rename Assets/{ => Fonts}/TextMesh Pro/Shaders/TMP_SDF-HDRP LIT.shadergraph.meta (100%) rename Assets/{ => Fonts}/TextMesh Pro/Shaders/TMP_SDF-HDRP UNLIT.shadergraph (100%) rename Assets/{ => Fonts}/TextMesh Pro/Shaders/TMP_SDF-HDRP UNLIT.shadergraph.meta (100%) rename Assets/{ => Fonts}/TextMesh Pro/Shaders/TMP_SDF-Mobile Masking.shader (100%) rename Assets/{ => Fonts}/TextMesh Pro/Shaders/TMP_SDF-Mobile Masking.shader.meta (100%) rename Assets/{ => Fonts}/TextMesh Pro/Shaders/TMP_SDF-Mobile Overlay.shader (100%) rename Assets/{ => Fonts}/TextMesh Pro/Shaders/TMP_SDF-Mobile Overlay.shader.meta (100%) rename Assets/{ => Fonts}/TextMesh Pro/Shaders/TMP_SDF-Mobile SSD.shader (100%) rename Assets/{ => Fonts}/TextMesh Pro/Shaders/TMP_SDF-Mobile SSD.shader.meta (100%) rename Assets/{ => Fonts}/TextMesh Pro/Shaders/TMP_SDF-Mobile-2-Pass.shader (100%) rename Assets/{ => Fonts}/TextMesh Pro/Shaders/TMP_SDF-Mobile-2-Pass.shader.meta (100%) rename Assets/{ => Fonts}/TextMesh Pro/Shaders/TMP_SDF-Mobile.shader (100%) rename Assets/{ => Fonts}/TextMesh Pro/Shaders/TMP_SDF-Mobile.shader.meta (100%) rename Assets/{ => Fonts}/TextMesh Pro/Shaders/TMP_SDF-Surface-Mobile.shader (100%) rename Assets/{ => Fonts}/TextMesh Pro/Shaders/TMP_SDF-Surface-Mobile.shader.meta (100%) rename Assets/{ => Fonts}/TextMesh Pro/Shaders/TMP_SDF-Surface.shader (100%) rename Assets/{ => Fonts}/TextMesh Pro/Shaders/TMP_SDF-Surface.shader.meta (100%) rename Assets/{ => Fonts}/TextMesh Pro/Shaders/TMP_SDF-URP Lit.shadergraph (100%) rename Assets/{ => Fonts}/TextMesh Pro/Shaders/TMP_SDF-URP Lit.shadergraph.meta (100%) rename Assets/{ => Fonts}/TextMesh Pro/Shaders/TMP_SDF-URP Unlit.shadergraph (100%) rename Assets/{ => Fonts}/TextMesh Pro/Shaders/TMP_SDF-URP Unlit.shadergraph.meta (100%) rename Assets/{ => Fonts}/TextMesh Pro/Shaders/TMP_SDF.shader (100%) rename Assets/{ => Fonts}/TextMesh Pro/Shaders/TMP_SDF.shader.meta (100%) rename Assets/{ => Fonts}/TextMesh Pro/Shaders/TMP_Sprite.shader (100%) rename Assets/{ => Fonts}/TextMesh Pro/Shaders/TMP_Sprite.shader.meta (100%) rename Assets/{ => Fonts}/TextMesh Pro/Shaders/TMPro.cginc (100%) rename Assets/{ => Fonts}/TextMesh Pro/Shaders/TMPro.cginc.meta (100%) rename Assets/{ => Fonts}/TextMesh Pro/Shaders/TMPro_Mobile.cginc (100%) rename Assets/{ => Fonts}/TextMesh Pro/Shaders/TMPro_Mobile.cginc.meta (100%) rename Assets/{ => Fonts}/TextMesh Pro/Shaders/TMPro_Properties.cginc (100%) rename Assets/{ => Fonts}/TextMesh Pro/Shaders/TMPro_Properties.cginc.meta (100%) rename Assets/{ => Fonts}/TextMesh Pro/Shaders/TMPro_Surface.cginc (100%) rename Assets/{ => Fonts}/TextMesh Pro/Shaders/TMPro_Surface.cginc.meta (100%) rename Assets/{ => Fonts}/TextMesh Pro/Sprites.meta (100%) rename Assets/{ => Fonts}/TextMesh Pro/Sprites/EmojiOne Attribution.txt (100%) rename Assets/{ => Fonts}/TextMesh Pro/Sprites/EmojiOne Attribution.txt.meta (100%) rename Assets/{ => Fonts}/TextMesh Pro/Sprites/EmojiOne.json (100%) rename Assets/{ => Fonts}/TextMesh Pro/Sprites/EmojiOne.json.meta (100%) rename Assets/{ => Fonts}/TextMesh Pro/Sprites/EmojiOne.png (100%) rename Assets/{ => Fonts}/TextMesh Pro/Sprites/EmojiOne.png.meta (100%) create mode 100644 Assets/Input System.meta rename Assets/{Settings => Input System}/InputSystem_Actions.inputactions (100%) rename Assets/{Settings => Input System}/InputSystem_Actions.inputactions.meta (100%) rename Assets/{Games/Platformer => Input System}/Player Actions.inputactions (100%) rename Assets/{Games/Platformer => Input System}/Player Actions.inputactions.meta (100%) create mode 100644 Assets/Materials.meta rename Assets/{Games/Platformer => Materials}/Ground.physicsMaterial2D (100%) rename Assets/{Games/Platformer => Materials}/Ground.physicsMaterial2D.meta (100%) rename Assets/{Games/Platformer => Materials}/Player.physicsMaterial2D (100%) rename Assets/{Games/Platformer => Materials}/Player.physicsMaterial2D.meta (100%) create mode 100644 Assets/Old.meta rename Assets/{ => Old}/Hub.meta (100%) rename Assets/{ => Old}/Hub/Button Animation.controller (100%) rename Assets/{ => Old}/Hub/Button Animation.controller.meta (100%) rename Assets/{ => Old}/Hub/Hub.unity (100%) rename Assets/{ => Old}/Hub/Hub.unity.meta (100%) rename Assets/{ => Old}/Hub/HubManager.cs (100%) rename Assets/{ => Old}/Hub/HubManager.cs.meta (100%) rename Assets/{ => Old}/Hub/HubPolygonCreator.cs (100%) rename Assets/{ => Old}/Hub/HubPolygonCreator.cs.meta (100%) rename Assets/{ => Old}/Hub/Platformer.png (100%) rename Assets/{ => Old}/Hub/Platformer.png.meta (100%) rename Assets/{Games => Old}/Pong.meta (100%) rename Assets/{Games => Old}/Pong/Ball.physicsMaterial2D (100%) rename Assets/{Games => Old}/Pong/Ball.physicsMaterial2D.meta (100%) rename Assets/{Games => Old}/Pong/Paddle.prefab (100%) rename Assets/{Games => Old}/Pong/Paddle.prefab.meta (100%) rename Assets/{Games => Old}/Pong/Pong Goal.prefab (100%) rename Assets/{Games => Old}/Pong/Pong Goal.prefab.meta (100%) rename Assets/{Games => Old}/Pong/Pong.unity (100%) rename Assets/{Games => Old}/Pong/Pong.unity.meta (100%) rename Assets/{Games => Old}/Pong/PongBallBehavior.cs (100%) rename Assets/{Games => Old}/Pong/PongBallBehavior.cs.meta (100%) rename Assets/{Games => Old}/Pong/PongPaddleBehavior.cs (100%) rename Assets/{Games => Old}/Pong/PongPaddleBehavior.cs.meta (100%) rename Assets/{Games => Old}/Pong/PongScorekeeper.cs (100%) rename Assets/{Games => Old}/Pong/PongScorekeeper.cs.meta (100%) rename Assets/{Games => Old}/Pong/pong-score.asset (100%) rename Assets/{Games => Old}/Pong/pong-score.asset.meta (100%) rename Assets/{Games => Old}/Pong/pong-score.ttf (100%) rename Assets/{Games => Old}/Pong/pong-score.ttf.meta (100%) create mode 100644 Assets/Prefabs.meta rename Assets/{Games/Platformer/Platformer Camera.prefab => Prefabs/Player Camera.prefab} (99%) rename Assets/{Games/Platformer/Platformer Camera.prefab.meta => Prefabs/Player Camera.prefab.meta} (100%) rename Assets/{Games/Platformer/Platformer Player.prefab => Prefabs/Player.prefab} (99%) rename Assets/{Games/Platformer/Platformer Player.prefab.meta => Prefabs/Player.prefab.meta} (100%) rename Assets/{Games/Platformer/Tiles/New Tile Palette.prefab => Prefabs/Tile Palette.prefab} (99%) rename Assets/{Games/Platformer/Tiles/New Tile Palette.prefab.meta => Prefabs/Tile Palette.prefab.meta} (100%) create mode 100644 Assets/Scenes.meta rename Assets/{Games/Platformer => Scenes}/Platformer.unity (100%) rename Assets/{Games/Platformer => Scenes}/Platformer.unity.meta (100%) create mode 100644 Assets/Scripts.meta rename Assets/{Games/Platformer => Scripts}/PlatformerPlayerMovement.cs (100%) rename Assets/{Games/Platformer => Scripts}/PlatformerPlayerMovement.cs.meta (100%) rename Assets/{Games/Platformer/PlatformerCameraMovement.cs => Scripts/PlayerCameraMovement.cs} (93%) rename Assets/{Games/Platformer/PlatformerCameraMovement.cs.meta => Scripts/PlayerCameraMovement.cs.meta} (100%) rename Assets/{ => Scripts}/PlayerManager.cs (89%) rename Assets/{ => Scripts}/PlayerManager.cs.meta (100%) rename Assets/{ => Scripts}/RespawnOnTriggerEnter.cs (100%) rename Assets/{ => Scripts}/RespawnOnTriggerEnter.cs.meta (100%) create mode 100644 Assets/Sprites.meta rename Assets/{Games/Platformer => Sprites}/Square.png (100%) rename Assets/{Games/Platformer => Sprites}/Square.png.meta (100%) rename Assets/{Games/Platformer => Sprites}/Tiles.meta (100%) rename Assets/{Games/Platformer => Sprites}/Tiles/Square.asset (100%) rename Assets/{Games/Platformer => Sprites}/Tiles/Square.asset.meta (100%) diff --git a/Assets/Games/Platformer.meta b/Assets/Animations.meta similarity index 77% rename from Assets/Games/Platformer.meta rename to Assets/Animations.meta index 50671cd..8935b7c 100644 --- a/Assets/Games/Platformer.meta +++ b/Assets/Animations.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 980fb9ecb9b27d9499905c73ae3550c8 +guid: bb25819eeef5644cd85cc02e33fc36cb folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Games/Platformer/Bones.anim b/Assets/Animations/Bones.anim similarity index 100% rename from Assets/Games/Platformer/Bones.anim rename to Assets/Animations/Bones.anim diff --git a/Assets/Games/Platformer/Bones.anim.meta b/Assets/Animations/Bones.anim.meta similarity index 100% rename from Assets/Games/Platformer/Bones.anim.meta rename to Assets/Animations/Bones.anim.meta diff --git a/Assets/Games/Platformer/Root.controller b/Assets/Animations/Root.controller similarity index 100% rename from Assets/Games/Platformer/Root.controller rename to Assets/Animations/Root.controller diff --git a/Assets/Games/Platformer/Root.controller.meta b/Assets/Animations/Root.controller.meta similarity index 100% rename from Assets/Games/Platformer/Root.controller.meta rename to Assets/Animations/Root.controller.meta diff --git a/Assets/Fonts.meta b/Assets/Fonts.meta new file mode 100644 index 0000000..4147fa7 --- /dev/null +++ b/Assets/Fonts.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d77def305dca24a80bbecb5e7edfe7fe +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Fonts/Fonts.meta b/Assets/Fonts/Fonts.meta new file mode 100644 index 0000000..81e1009 --- /dev/null +++ b/Assets/Fonts/Fonts.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3337b4f183ba64e55bc42a2ac99ce62e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Hub/Silkscreen.meta b/Assets/Fonts/Fonts/Silkscreen.meta similarity index 100% rename from Assets/Hub/Silkscreen.meta rename to Assets/Fonts/Fonts/Silkscreen.meta diff --git a/Assets/Hub/Silkscreen/OFL.txt b/Assets/Fonts/Fonts/Silkscreen/OFL.txt similarity index 100% rename from Assets/Hub/Silkscreen/OFL.txt rename to Assets/Fonts/Fonts/Silkscreen/OFL.txt diff --git a/Assets/Hub/Silkscreen/OFL.txt.meta b/Assets/Fonts/Fonts/Silkscreen/OFL.txt.meta similarity index 100% rename from Assets/Hub/Silkscreen/OFL.txt.meta rename to Assets/Fonts/Fonts/Silkscreen/OFL.txt.meta diff --git a/Assets/Hub/Silkscreen/Silkscreen-Bold SDF.asset b/Assets/Fonts/Fonts/Silkscreen/Silkscreen-Bold SDF.asset similarity index 100% rename from Assets/Hub/Silkscreen/Silkscreen-Bold SDF.asset rename to Assets/Fonts/Fonts/Silkscreen/Silkscreen-Bold SDF.asset diff --git a/Assets/Hub/Silkscreen/Silkscreen-Bold SDF.asset.meta b/Assets/Fonts/Fonts/Silkscreen/Silkscreen-Bold SDF.asset.meta similarity index 100% rename from Assets/Hub/Silkscreen/Silkscreen-Bold SDF.asset.meta rename to Assets/Fonts/Fonts/Silkscreen/Silkscreen-Bold SDF.asset.meta diff --git a/Assets/Hub/Silkscreen/Silkscreen-Bold.ttf b/Assets/Fonts/Fonts/Silkscreen/Silkscreen-Bold.ttf similarity index 100% rename from Assets/Hub/Silkscreen/Silkscreen-Bold.ttf rename to Assets/Fonts/Fonts/Silkscreen/Silkscreen-Bold.ttf diff --git a/Assets/Hub/Silkscreen/Silkscreen-Bold.ttf.meta b/Assets/Fonts/Fonts/Silkscreen/Silkscreen-Bold.ttf.meta similarity index 100% rename from Assets/Hub/Silkscreen/Silkscreen-Bold.ttf.meta rename to Assets/Fonts/Fonts/Silkscreen/Silkscreen-Bold.ttf.meta diff --git a/Assets/Hub/Silkscreen/Silkscreen-Regular SDF.asset b/Assets/Fonts/Fonts/Silkscreen/Silkscreen-Regular SDF.asset similarity index 100% rename from Assets/Hub/Silkscreen/Silkscreen-Regular SDF.asset rename to Assets/Fonts/Fonts/Silkscreen/Silkscreen-Regular SDF.asset diff --git a/Assets/Hub/Silkscreen/Silkscreen-Regular SDF.asset.meta b/Assets/Fonts/Fonts/Silkscreen/Silkscreen-Regular SDF.asset.meta similarity index 100% rename from Assets/Hub/Silkscreen/Silkscreen-Regular SDF.asset.meta rename to Assets/Fonts/Fonts/Silkscreen/Silkscreen-Regular SDF.asset.meta diff --git a/Assets/Hub/Silkscreen/Silkscreen-Regular.ttf b/Assets/Fonts/Fonts/Silkscreen/Silkscreen-Regular.ttf similarity index 100% rename from Assets/Hub/Silkscreen/Silkscreen-Regular.ttf rename to Assets/Fonts/Fonts/Silkscreen/Silkscreen-Regular.ttf diff --git a/Assets/Hub/Silkscreen/Silkscreen-Regular.ttf.meta b/Assets/Fonts/Fonts/Silkscreen/Silkscreen-Regular.ttf.meta similarity index 100% rename from Assets/Hub/Silkscreen/Silkscreen-Regular.ttf.meta rename to Assets/Fonts/Fonts/Silkscreen/Silkscreen-Regular.ttf.meta diff --git a/Assets/TextMesh Pro.meta b/Assets/Fonts/TextMesh Pro.meta similarity index 100% rename from Assets/TextMesh Pro.meta rename to Assets/Fonts/TextMesh Pro.meta diff --git a/Assets/TextMesh Pro/Fonts.meta b/Assets/Fonts/TextMesh Pro/Fonts.meta similarity index 100% rename from Assets/TextMesh Pro/Fonts.meta rename to Assets/Fonts/TextMesh Pro/Fonts.meta diff --git a/Assets/TextMesh Pro/Fonts/LiberationSans - OFL.txt b/Assets/Fonts/TextMesh Pro/Fonts/LiberationSans - OFL.txt similarity index 100% rename from Assets/TextMesh Pro/Fonts/LiberationSans - OFL.txt rename to Assets/Fonts/TextMesh Pro/Fonts/LiberationSans - OFL.txt diff --git a/Assets/TextMesh Pro/Fonts/LiberationSans - OFL.txt.meta b/Assets/Fonts/TextMesh Pro/Fonts/LiberationSans - OFL.txt.meta similarity index 100% rename from Assets/TextMesh Pro/Fonts/LiberationSans - OFL.txt.meta rename to Assets/Fonts/TextMesh Pro/Fonts/LiberationSans - OFL.txt.meta diff --git a/Assets/TextMesh Pro/Fonts/LiberationSans.ttf b/Assets/Fonts/TextMesh Pro/Fonts/LiberationSans.ttf similarity index 100% rename from Assets/TextMesh Pro/Fonts/LiberationSans.ttf rename to Assets/Fonts/TextMesh Pro/Fonts/LiberationSans.ttf diff --git a/Assets/TextMesh Pro/Fonts/LiberationSans.ttf.meta b/Assets/Fonts/TextMesh Pro/Fonts/LiberationSans.ttf.meta similarity index 100% rename from Assets/TextMesh Pro/Fonts/LiberationSans.ttf.meta rename to Assets/Fonts/TextMesh Pro/Fonts/LiberationSans.ttf.meta diff --git a/Assets/TextMesh Pro/Resources.meta b/Assets/Fonts/TextMesh Pro/Resources.meta similarity index 100% rename from Assets/TextMesh Pro/Resources.meta rename to Assets/Fonts/TextMesh Pro/Resources.meta diff --git a/Assets/TextMesh Pro/Resources/Fonts & Materials.meta b/Assets/Fonts/TextMesh Pro/Resources/Fonts & Materials.meta similarity index 100% rename from Assets/TextMesh Pro/Resources/Fonts & Materials.meta rename to Assets/Fonts/TextMesh Pro/Resources/Fonts & Materials.meta diff --git a/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Drop Shadow.mat b/Assets/Fonts/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Drop Shadow.mat similarity index 100% rename from Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Drop Shadow.mat rename to Assets/Fonts/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Drop Shadow.mat diff --git a/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Drop Shadow.mat.meta b/Assets/Fonts/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Drop Shadow.mat.meta similarity index 100% rename from Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Drop Shadow.mat.meta rename to Assets/Fonts/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Drop Shadow.mat.meta diff --git a/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset b/Assets/Fonts/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset similarity index 100% rename from Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset rename to Assets/Fonts/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset diff --git a/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset.meta b/Assets/Fonts/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset.meta similarity index 100% rename from Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset.meta rename to Assets/Fonts/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset.meta diff --git a/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Outline.mat b/Assets/Fonts/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Outline.mat similarity index 100% rename from Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Outline.mat rename to Assets/Fonts/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Outline.mat diff --git a/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Outline.mat.meta b/Assets/Fonts/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Outline.mat.meta similarity index 100% rename from Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Outline.mat.meta rename to Assets/Fonts/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Outline.mat.meta diff --git a/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset b/Assets/Fonts/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset similarity index 100% rename from Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset rename to Assets/Fonts/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset diff --git a/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset.meta b/Assets/Fonts/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset.meta similarity index 100% rename from Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset.meta rename to Assets/Fonts/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset.meta diff --git a/Assets/TextMesh Pro/Resources/LineBreaking Following Characters.txt b/Assets/Fonts/TextMesh Pro/Resources/LineBreaking Following Characters.txt similarity index 100% rename from Assets/TextMesh Pro/Resources/LineBreaking Following Characters.txt rename to Assets/Fonts/TextMesh Pro/Resources/LineBreaking Following Characters.txt diff --git a/Assets/TextMesh Pro/Resources/LineBreaking Following Characters.txt.meta b/Assets/Fonts/TextMesh Pro/Resources/LineBreaking Following Characters.txt.meta similarity index 100% rename from Assets/TextMesh Pro/Resources/LineBreaking Following Characters.txt.meta rename to Assets/Fonts/TextMesh Pro/Resources/LineBreaking Following Characters.txt.meta diff --git a/Assets/TextMesh Pro/Resources/LineBreaking Leading Characters.txt b/Assets/Fonts/TextMesh Pro/Resources/LineBreaking Leading Characters.txt similarity index 100% rename from Assets/TextMesh Pro/Resources/LineBreaking Leading Characters.txt rename to Assets/Fonts/TextMesh Pro/Resources/LineBreaking Leading Characters.txt diff --git a/Assets/TextMesh Pro/Resources/LineBreaking Leading Characters.txt.meta b/Assets/Fonts/TextMesh Pro/Resources/LineBreaking Leading Characters.txt.meta similarity index 100% rename from Assets/TextMesh Pro/Resources/LineBreaking Leading Characters.txt.meta rename to Assets/Fonts/TextMesh Pro/Resources/LineBreaking Leading Characters.txt.meta diff --git a/Assets/TextMesh Pro/Resources/Sprite Assets.meta b/Assets/Fonts/TextMesh Pro/Resources/Sprite Assets.meta similarity index 100% rename from Assets/TextMesh Pro/Resources/Sprite Assets.meta rename to Assets/Fonts/TextMesh Pro/Resources/Sprite Assets.meta diff --git a/Assets/TextMesh Pro/Resources/Sprite Assets/EmojiOne.asset b/Assets/Fonts/TextMesh Pro/Resources/Sprite Assets/EmojiOne.asset similarity index 100% rename from Assets/TextMesh Pro/Resources/Sprite Assets/EmojiOne.asset rename to Assets/Fonts/TextMesh Pro/Resources/Sprite Assets/EmojiOne.asset diff --git a/Assets/TextMesh Pro/Resources/Sprite Assets/EmojiOne.asset.meta b/Assets/Fonts/TextMesh Pro/Resources/Sprite Assets/EmojiOne.asset.meta similarity index 100% rename from Assets/TextMesh Pro/Resources/Sprite Assets/EmojiOne.asset.meta rename to Assets/Fonts/TextMesh Pro/Resources/Sprite Assets/EmojiOne.asset.meta diff --git a/Assets/TextMesh Pro/Resources/Style Sheets.meta b/Assets/Fonts/TextMesh Pro/Resources/Style Sheets.meta similarity index 100% rename from Assets/TextMesh Pro/Resources/Style Sheets.meta rename to Assets/Fonts/TextMesh Pro/Resources/Style Sheets.meta diff --git a/Assets/TextMesh Pro/Resources/Style Sheets/Default Style Sheet.asset b/Assets/Fonts/TextMesh Pro/Resources/Style Sheets/Default Style Sheet.asset similarity index 100% rename from Assets/TextMesh Pro/Resources/Style Sheets/Default Style Sheet.asset rename to Assets/Fonts/TextMesh Pro/Resources/Style Sheets/Default Style Sheet.asset diff --git a/Assets/TextMesh Pro/Resources/Style Sheets/Default Style Sheet.asset.meta b/Assets/Fonts/TextMesh Pro/Resources/Style Sheets/Default Style Sheet.asset.meta similarity index 100% rename from Assets/TextMesh Pro/Resources/Style Sheets/Default Style Sheet.asset.meta rename to Assets/Fonts/TextMesh Pro/Resources/Style Sheets/Default Style Sheet.asset.meta diff --git a/Assets/TextMesh Pro/Resources/TMP Settings.asset b/Assets/Fonts/TextMesh Pro/Resources/TMP Settings.asset similarity index 100% rename from Assets/TextMesh Pro/Resources/TMP Settings.asset rename to Assets/Fonts/TextMesh Pro/Resources/TMP Settings.asset diff --git a/Assets/TextMesh Pro/Resources/TMP Settings.asset.meta b/Assets/Fonts/TextMesh Pro/Resources/TMP Settings.asset.meta similarity index 100% rename from Assets/TextMesh Pro/Resources/TMP Settings.asset.meta rename to Assets/Fonts/TextMesh Pro/Resources/TMP Settings.asset.meta diff --git a/Assets/TextMesh Pro/Shaders.meta b/Assets/Fonts/TextMesh Pro/Shaders.meta similarity index 100% rename from Assets/TextMesh Pro/Shaders.meta rename to Assets/Fonts/TextMesh Pro/Shaders.meta diff --git a/Assets/TextMesh Pro/Shaders/SDFFunctions.hlsl b/Assets/Fonts/TextMesh Pro/Shaders/SDFFunctions.hlsl similarity index 100% rename from Assets/TextMesh Pro/Shaders/SDFFunctions.hlsl rename to Assets/Fonts/TextMesh Pro/Shaders/SDFFunctions.hlsl diff --git a/Assets/TextMesh Pro/Shaders/SDFFunctions.hlsl.meta b/Assets/Fonts/TextMesh Pro/Shaders/SDFFunctions.hlsl.meta similarity index 100% rename from Assets/TextMesh Pro/Shaders/SDFFunctions.hlsl.meta rename to Assets/Fonts/TextMesh Pro/Shaders/SDFFunctions.hlsl.meta diff --git a/Assets/TextMesh Pro/Shaders/TMP_Bitmap-Custom-Atlas.shader b/Assets/Fonts/TextMesh Pro/Shaders/TMP_Bitmap-Custom-Atlas.shader similarity index 100% rename from Assets/TextMesh Pro/Shaders/TMP_Bitmap-Custom-Atlas.shader rename to Assets/Fonts/TextMesh Pro/Shaders/TMP_Bitmap-Custom-Atlas.shader diff --git a/Assets/TextMesh Pro/Shaders/TMP_Bitmap-Custom-Atlas.shader.meta b/Assets/Fonts/TextMesh Pro/Shaders/TMP_Bitmap-Custom-Atlas.shader.meta similarity index 100% rename from Assets/TextMesh Pro/Shaders/TMP_Bitmap-Custom-Atlas.shader.meta rename to Assets/Fonts/TextMesh Pro/Shaders/TMP_Bitmap-Custom-Atlas.shader.meta diff --git a/Assets/TextMesh Pro/Shaders/TMP_Bitmap-Mobile.shader b/Assets/Fonts/TextMesh Pro/Shaders/TMP_Bitmap-Mobile.shader similarity index 100% rename from Assets/TextMesh Pro/Shaders/TMP_Bitmap-Mobile.shader rename to Assets/Fonts/TextMesh Pro/Shaders/TMP_Bitmap-Mobile.shader diff --git a/Assets/TextMesh Pro/Shaders/TMP_Bitmap-Mobile.shader.meta b/Assets/Fonts/TextMesh Pro/Shaders/TMP_Bitmap-Mobile.shader.meta similarity index 100% rename from Assets/TextMesh Pro/Shaders/TMP_Bitmap-Mobile.shader.meta rename to Assets/Fonts/TextMesh Pro/Shaders/TMP_Bitmap-Mobile.shader.meta diff --git a/Assets/TextMesh Pro/Shaders/TMP_Bitmap.shader b/Assets/Fonts/TextMesh Pro/Shaders/TMP_Bitmap.shader similarity index 100% rename from Assets/TextMesh Pro/Shaders/TMP_Bitmap.shader rename to Assets/Fonts/TextMesh Pro/Shaders/TMP_Bitmap.shader diff --git a/Assets/TextMesh Pro/Shaders/TMP_Bitmap.shader.meta b/Assets/Fonts/TextMesh Pro/Shaders/TMP_Bitmap.shader.meta similarity index 100% rename from Assets/TextMesh Pro/Shaders/TMP_Bitmap.shader.meta rename to Assets/Fonts/TextMesh Pro/Shaders/TMP_Bitmap.shader.meta diff --git a/Assets/TextMesh Pro/Shaders/TMP_SDF Overlay.shader b/Assets/Fonts/TextMesh Pro/Shaders/TMP_SDF Overlay.shader similarity index 100% rename from Assets/TextMesh Pro/Shaders/TMP_SDF Overlay.shader rename to Assets/Fonts/TextMesh Pro/Shaders/TMP_SDF Overlay.shader diff --git a/Assets/TextMesh Pro/Shaders/TMP_SDF Overlay.shader.meta b/Assets/Fonts/TextMesh Pro/Shaders/TMP_SDF Overlay.shader.meta similarity index 100% rename from Assets/TextMesh Pro/Shaders/TMP_SDF Overlay.shader.meta rename to Assets/Fonts/TextMesh Pro/Shaders/TMP_SDF Overlay.shader.meta diff --git a/Assets/TextMesh Pro/Shaders/TMP_SDF SSD.shader b/Assets/Fonts/TextMesh Pro/Shaders/TMP_SDF SSD.shader similarity index 100% rename from Assets/TextMesh Pro/Shaders/TMP_SDF SSD.shader rename to Assets/Fonts/TextMesh Pro/Shaders/TMP_SDF SSD.shader diff --git a/Assets/TextMesh Pro/Shaders/TMP_SDF SSD.shader.meta b/Assets/Fonts/TextMesh Pro/Shaders/TMP_SDF SSD.shader.meta similarity index 100% rename from Assets/TextMesh Pro/Shaders/TMP_SDF SSD.shader.meta rename to Assets/Fonts/TextMesh Pro/Shaders/TMP_SDF SSD.shader.meta diff --git a/Assets/TextMesh Pro/Shaders/TMP_SDF-HDRP LIT.shadergraph b/Assets/Fonts/TextMesh Pro/Shaders/TMP_SDF-HDRP LIT.shadergraph similarity index 100% rename from Assets/TextMesh Pro/Shaders/TMP_SDF-HDRP LIT.shadergraph rename to Assets/Fonts/TextMesh Pro/Shaders/TMP_SDF-HDRP LIT.shadergraph diff --git a/Assets/TextMesh Pro/Shaders/TMP_SDF-HDRP LIT.shadergraph.meta b/Assets/Fonts/TextMesh Pro/Shaders/TMP_SDF-HDRP LIT.shadergraph.meta similarity index 100% rename from Assets/TextMesh Pro/Shaders/TMP_SDF-HDRP LIT.shadergraph.meta rename to Assets/Fonts/TextMesh Pro/Shaders/TMP_SDF-HDRP LIT.shadergraph.meta diff --git a/Assets/TextMesh Pro/Shaders/TMP_SDF-HDRP UNLIT.shadergraph b/Assets/Fonts/TextMesh Pro/Shaders/TMP_SDF-HDRP UNLIT.shadergraph similarity index 100% rename from Assets/TextMesh Pro/Shaders/TMP_SDF-HDRP UNLIT.shadergraph rename to Assets/Fonts/TextMesh Pro/Shaders/TMP_SDF-HDRP UNLIT.shadergraph diff --git a/Assets/TextMesh Pro/Shaders/TMP_SDF-HDRP UNLIT.shadergraph.meta b/Assets/Fonts/TextMesh Pro/Shaders/TMP_SDF-HDRP UNLIT.shadergraph.meta similarity index 100% rename from Assets/TextMesh Pro/Shaders/TMP_SDF-HDRP UNLIT.shadergraph.meta rename to Assets/Fonts/TextMesh Pro/Shaders/TMP_SDF-HDRP UNLIT.shadergraph.meta diff --git a/Assets/TextMesh Pro/Shaders/TMP_SDF-Mobile Masking.shader b/Assets/Fonts/TextMesh Pro/Shaders/TMP_SDF-Mobile Masking.shader similarity index 100% rename from Assets/TextMesh Pro/Shaders/TMP_SDF-Mobile Masking.shader rename to Assets/Fonts/TextMesh Pro/Shaders/TMP_SDF-Mobile Masking.shader diff --git a/Assets/TextMesh Pro/Shaders/TMP_SDF-Mobile Masking.shader.meta b/Assets/Fonts/TextMesh Pro/Shaders/TMP_SDF-Mobile Masking.shader.meta similarity index 100% rename from Assets/TextMesh Pro/Shaders/TMP_SDF-Mobile Masking.shader.meta rename to Assets/Fonts/TextMesh Pro/Shaders/TMP_SDF-Mobile Masking.shader.meta diff --git a/Assets/TextMesh Pro/Shaders/TMP_SDF-Mobile Overlay.shader b/Assets/Fonts/TextMesh Pro/Shaders/TMP_SDF-Mobile Overlay.shader similarity index 100% rename from Assets/TextMesh Pro/Shaders/TMP_SDF-Mobile Overlay.shader rename to Assets/Fonts/TextMesh Pro/Shaders/TMP_SDF-Mobile Overlay.shader diff --git a/Assets/TextMesh Pro/Shaders/TMP_SDF-Mobile Overlay.shader.meta b/Assets/Fonts/TextMesh Pro/Shaders/TMP_SDF-Mobile Overlay.shader.meta similarity index 100% rename from Assets/TextMesh Pro/Shaders/TMP_SDF-Mobile Overlay.shader.meta rename to Assets/Fonts/TextMesh Pro/Shaders/TMP_SDF-Mobile Overlay.shader.meta diff --git a/Assets/TextMesh Pro/Shaders/TMP_SDF-Mobile SSD.shader b/Assets/Fonts/TextMesh Pro/Shaders/TMP_SDF-Mobile SSD.shader similarity index 100% rename from Assets/TextMesh Pro/Shaders/TMP_SDF-Mobile SSD.shader rename to Assets/Fonts/TextMesh Pro/Shaders/TMP_SDF-Mobile SSD.shader diff --git a/Assets/TextMesh Pro/Shaders/TMP_SDF-Mobile SSD.shader.meta b/Assets/Fonts/TextMesh Pro/Shaders/TMP_SDF-Mobile SSD.shader.meta similarity index 100% rename from Assets/TextMesh Pro/Shaders/TMP_SDF-Mobile SSD.shader.meta rename to Assets/Fonts/TextMesh Pro/Shaders/TMP_SDF-Mobile SSD.shader.meta diff --git a/Assets/TextMesh Pro/Shaders/TMP_SDF-Mobile-2-Pass.shader b/Assets/Fonts/TextMesh Pro/Shaders/TMP_SDF-Mobile-2-Pass.shader similarity index 100% rename from Assets/TextMesh Pro/Shaders/TMP_SDF-Mobile-2-Pass.shader rename to Assets/Fonts/TextMesh Pro/Shaders/TMP_SDF-Mobile-2-Pass.shader diff --git a/Assets/TextMesh Pro/Shaders/TMP_SDF-Mobile-2-Pass.shader.meta b/Assets/Fonts/TextMesh Pro/Shaders/TMP_SDF-Mobile-2-Pass.shader.meta similarity index 100% rename from Assets/TextMesh Pro/Shaders/TMP_SDF-Mobile-2-Pass.shader.meta rename to Assets/Fonts/TextMesh Pro/Shaders/TMP_SDF-Mobile-2-Pass.shader.meta diff --git a/Assets/TextMesh Pro/Shaders/TMP_SDF-Mobile.shader b/Assets/Fonts/TextMesh Pro/Shaders/TMP_SDF-Mobile.shader similarity index 100% rename from Assets/TextMesh Pro/Shaders/TMP_SDF-Mobile.shader rename to Assets/Fonts/TextMesh Pro/Shaders/TMP_SDF-Mobile.shader diff --git a/Assets/TextMesh Pro/Shaders/TMP_SDF-Mobile.shader.meta b/Assets/Fonts/TextMesh Pro/Shaders/TMP_SDF-Mobile.shader.meta similarity index 100% rename from Assets/TextMesh Pro/Shaders/TMP_SDF-Mobile.shader.meta rename to Assets/Fonts/TextMesh Pro/Shaders/TMP_SDF-Mobile.shader.meta diff --git a/Assets/TextMesh Pro/Shaders/TMP_SDF-Surface-Mobile.shader b/Assets/Fonts/TextMesh Pro/Shaders/TMP_SDF-Surface-Mobile.shader similarity index 100% rename from Assets/TextMesh Pro/Shaders/TMP_SDF-Surface-Mobile.shader rename to Assets/Fonts/TextMesh Pro/Shaders/TMP_SDF-Surface-Mobile.shader diff --git a/Assets/TextMesh Pro/Shaders/TMP_SDF-Surface-Mobile.shader.meta b/Assets/Fonts/TextMesh Pro/Shaders/TMP_SDF-Surface-Mobile.shader.meta similarity index 100% rename from Assets/TextMesh Pro/Shaders/TMP_SDF-Surface-Mobile.shader.meta rename to Assets/Fonts/TextMesh Pro/Shaders/TMP_SDF-Surface-Mobile.shader.meta diff --git a/Assets/TextMesh Pro/Shaders/TMP_SDF-Surface.shader b/Assets/Fonts/TextMesh Pro/Shaders/TMP_SDF-Surface.shader similarity index 100% rename from Assets/TextMesh Pro/Shaders/TMP_SDF-Surface.shader rename to Assets/Fonts/TextMesh Pro/Shaders/TMP_SDF-Surface.shader diff --git a/Assets/TextMesh Pro/Shaders/TMP_SDF-Surface.shader.meta b/Assets/Fonts/TextMesh Pro/Shaders/TMP_SDF-Surface.shader.meta similarity index 100% rename from Assets/TextMesh Pro/Shaders/TMP_SDF-Surface.shader.meta rename to Assets/Fonts/TextMesh Pro/Shaders/TMP_SDF-Surface.shader.meta diff --git a/Assets/TextMesh Pro/Shaders/TMP_SDF-URP Lit.shadergraph b/Assets/Fonts/TextMesh Pro/Shaders/TMP_SDF-URP Lit.shadergraph similarity index 100% rename from Assets/TextMesh Pro/Shaders/TMP_SDF-URP Lit.shadergraph rename to Assets/Fonts/TextMesh Pro/Shaders/TMP_SDF-URP Lit.shadergraph diff --git a/Assets/TextMesh Pro/Shaders/TMP_SDF-URP Lit.shadergraph.meta b/Assets/Fonts/TextMesh Pro/Shaders/TMP_SDF-URP Lit.shadergraph.meta similarity index 100% rename from Assets/TextMesh Pro/Shaders/TMP_SDF-URP Lit.shadergraph.meta rename to Assets/Fonts/TextMesh Pro/Shaders/TMP_SDF-URP Lit.shadergraph.meta diff --git a/Assets/TextMesh Pro/Shaders/TMP_SDF-URP Unlit.shadergraph b/Assets/Fonts/TextMesh Pro/Shaders/TMP_SDF-URP Unlit.shadergraph similarity index 100% rename from Assets/TextMesh Pro/Shaders/TMP_SDF-URP Unlit.shadergraph rename to Assets/Fonts/TextMesh Pro/Shaders/TMP_SDF-URP Unlit.shadergraph diff --git a/Assets/TextMesh Pro/Shaders/TMP_SDF-URP Unlit.shadergraph.meta b/Assets/Fonts/TextMesh Pro/Shaders/TMP_SDF-URP Unlit.shadergraph.meta similarity index 100% rename from Assets/TextMesh Pro/Shaders/TMP_SDF-URP Unlit.shadergraph.meta rename to Assets/Fonts/TextMesh Pro/Shaders/TMP_SDF-URP Unlit.shadergraph.meta diff --git a/Assets/TextMesh Pro/Shaders/TMP_SDF.shader b/Assets/Fonts/TextMesh Pro/Shaders/TMP_SDF.shader similarity index 100% rename from Assets/TextMesh Pro/Shaders/TMP_SDF.shader rename to Assets/Fonts/TextMesh Pro/Shaders/TMP_SDF.shader diff --git a/Assets/TextMesh Pro/Shaders/TMP_SDF.shader.meta b/Assets/Fonts/TextMesh Pro/Shaders/TMP_SDF.shader.meta similarity index 100% rename from Assets/TextMesh Pro/Shaders/TMP_SDF.shader.meta rename to Assets/Fonts/TextMesh Pro/Shaders/TMP_SDF.shader.meta diff --git a/Assets/TextMesh Pro/Shaders/TMP_Sprite.shader b/Assets/Fonts/TextMesh Pro/Shaders/TMP_Sprite.shader similarity index 100% rename from Assets/TextMesh Pro/Shaders/TMP_Sprite.shader rename to Assets/Fonts/TextMesh Pro/Shaders/TMP_Sprite.shader diff --git a/Assets/TextMesh Pro/Shaders/TMP_Sprite.shader.meta b/Assets/Fonts/TextMesh Pro/Shaders/TMP_Sprite.shader.meta similarity index 100% rename from Assets/TextMesh Pro/Shaders/TMP_Sprite.shader.meta rename to Assets/Fonts/TextMesh Pro/Shaders/TMP_Sprite.shader.meta diff --git a/Assets/TextMesh Pro/Shaders/TMPro.cginc b/Assets/Fonts/TextMesh Pro/Shaders/TMPro.cginc similarity index 100% rename from Assets/TextMesh Pro/Shaders/TMPro.cginc rename to Assets/Fonts/TextMesh Pro/Shaders/TMPro.cginc diff --git a/Assets/TextMesh Pro/Shaders/TMPro.cginc.meta b/Assets/Fonts/TextMesh Pro/Shaders/TMPro.cginc.meta similarity index 100% rename from Assets/TextMesh Pro/Shaders/TMPro.cginc.meta rename to Assets/Fonts/TextMesh Pro/Shaders/TMPro.cginc.meta diff --git a/Assets/TextMesh Pro/Shaders/TMPro_Mobile.cginc b/Assets/Fonts/TextMesh Pro/Shaders/TMPro_Mobile.cginc similarity index 100% rename from Assets/TextMesh Pro/Shaders/TMPro_Mobile.cginc rename to Assets/Fonts/TextMesh Pro/Shaders/TMPro_Mobile.cginc diff --git a/Assets/TextMesh Pro/Shaders/TMPro_Mobile.cginc.meta b/Assets/Fonts/TextMesh Pro/Shaders/TMPro_Mobile.cginc.meta similarity index 100% rename from Assets/TextMesh Pro/Shaders/TMPro_Mobile.cginc.meta rename to Assets/Fonts/TextMesh Pro/Shaders/TMPro_Mobile.cginc.meta diff --git a/Assets/TextMesh Pro/Shaders/TMPro_Properties.cginc b/Assets/Fonts/TextMesh Pro/Shaders/TMPro_Properties.cginc similarity index 100% rename from Assets/TextMesh Pro/Shaders/TMPro_Properties.cginc rename to Assets/Fonts/TextMesh Pro/Shaders/TMPro_Properties.cginc diff --git a/Assets/TextMesh Pro/Shaders/TMPro_Properties.cginc.meta b/Assets/Fonts/TextMesh Pro/Shaders/TMPro_Properties.cginc.meta similarity index 100% rename from Assets/TextMesh Pro/Shaders/TMPro_Properties.cginc.meta rename to Assets/Fonts/TextMesh Pro/Shaders/TMPro_Properties.cginc.meta diff --git a/Assets/TextMesh Pro/Shaders/TMPro_Surface.cginc b/Assets/Fonts/TextMesh Pro/Shaders/TMPro_Surface.cginc similarity index 100% rename from Assets/TextMesh Pro/Shaders/TMPro_Surface.cginc rename to Assets/Fonts/TextMesh Pro/Shaders/TMPro_Surface.cginc diff --git a/Assets/TextMesh Pro/Shaders/TMPro_Surface.cginc.meta b/Assets/Fonts/TextMesh Pro/Shaders/TMPro_Surface.cginc.meta similarity index 100% rename from Assets/TextMesh Pro/Shaders/TMPro_Surface.cginc.meta rename to Assets/Fonts/TextMesh Pro/Shaders/TMPro_Surface.cginc.meta diff --git a/Assets/TextMesh Pro/Sprites.meta b/Assets/Fonts/TextMesh Pro/Sprites.meta similarity index 100% rename from Assets/TextMesh Pro/Sprites.meta rename to Assets/Fonts/TextMesh Pro/Sprites.meta diff --git a/Assets/TextMesh Pro/Sprites/EmojiOne Attribution.txt b/Assets/Fonts/TextMesh Pro/Sprites/EmojiOne Attribution.txt similarity index 100% rename from Assets/TextMesh Pro/Sprites/EmojiOne Attribution.txt rename to Assets/Fonts/TextMesh Pro/Sprites/EmojiOne Attribution.txt diff --git a/Assets/TextMesh Pro/Sprites/EmojiOne Attribution.txt.meta b/Assets/Fonts/TextMesh Pro/Sprites/EmojiOne Attribution.txt.meta similarity index 100% rename from Assets/TextMesh Pro/Sprites/EmojiOne Attribution.txt.meta rename to Assets/Fonts/TextMesh Pro/Sprites/EmojiOne Attribution.txt.meta diff --git a/Assets/TextMesh Pro/Sprites/EmojiOne.json b/Assets/Fonts/TextMesh Pro/Sprites/EmojiOne.json similarity index 100% rename from Assets/TextMesh Pro/Sprites/EmojiOne.json rename to Assets/Fonts/TextMesh Pro/Sprites/EmojiOne.json diff --git a/Assets/TextMesh Pro/Sprites/EmojiOne.json.meta b/Assets/Fonts/TextMesh Pro/Sprites/EmojiOne.json.meta similarity index 100% rename from Assets/TextMesh Pro/Sprites/EmojiOne.json.meta rename to Assets/Fonts/TextMesh Pro/Sprites/EmojiOne.json.meta diff --git a/Assets/TextMesh Pro/Sprites/EmojiOne.png b/Assets/Fonts/TextMesh Pro/Sprites/EmojiOne.png similarity index 100% rename from Assets/TextMesh Pro/Sprites/EmojiOne.png rename to Assets/Fonts/TextMesh Pro/Sprites/EmojiOne.png diff --git a/Assets/TextMesh Pro/Sprites/EmojiOne.png.meta b/Assets/Fonts/TextMesh Pro/Sprites/EmojiOne.png.meta similarity index 100% rename from Assets/TextMesh Pro/Sprites/EmojiOne.png.meta rename to Assets/Fonts/TextMesh Pro/Sprites/EmojiOne.png.meta diff --git a/Assets/Games/.DS_Store b/Assets/Games/.DS_Store index 0aa1c4a9b393aa5854e5351a660fd19d96a34a62..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6 100644 GIT binary patch delta 70 zcmZoMXfc=|#>AjHu~2NHo+1YW5HK<@2y7N){>HLdfq56xW_AvK4xj>{$am(+{342+ UKzW7)kiy9(Jj$D6L{=~Z01@sEU;qFB delta 338 zcmZoMXfc=|#>B)qF;Q%yo}wrd0|Nsi1A_nqLmERqLlHwRLn=ej#>C}}^&lB8h5&{f zhD3%EWZ9(h;)0}{{3M|Kwxoib%;FLQgKLaT%q*;I>>L~%+#IpN8TsYGC5a`a#ZHMu z(I8$(etu38jGdSimYG@}FCgNapI4HYnU`7w){vQ!3RDsko|%`DU+z?&Uz(Rv4AvYB zk>TLv(tFE@tQ82c!tkqGdwlp%(Q7|z!tF7ha5LMQ<4vNpt$<52}06Gl_7=a!G z170W%qdI{MtX?Y%F3QWv&r1i&Gcs;W{L3=gK!jy8H_%VO5Zjpeoq009h$1T}WE3VF Mib!t`5ZS^E0HO3#iU0rr diff --git a/Assets/Input System.meta b/Assets/Input System.meta new file mode 100644 index 0000000..77ab48e --- /dev/null +++ b/Assets/Input System.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 852f94971a1774c4c90a3daa6b74f237 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Settings/InputSystem_Actions.inputactions b/Assets/Input System/InputSystem_Actions.inputactions similarity index 100% rename from Assets/Settings/InputSystem_Actions.inputactions rename to Assets/Input System/InputSystem_Actions.inputactions diff --git a/Assets/Settings/InputSystem_Actions.inputactions.meta b/Assets/Input System/InputSystem_Actions.inputactions.meta similarity index 100% rename from Assets/Settings/InputSystem_Actions.inputactions.meta rename to Assets/Input System/InputSystem_Actions.inputactions.meta diff --git a/Assets/Games/Platformer/Player Actions.inputactions b/Assets/Input System/Player Actions.inputactions similarity index 100% rename from Assets/Games/Platformer/Player Actions.inputactions rename to Assets/Input System/Player Actions.inputactions diff --git a/Assets/Games/Platformer/Player Actions.inputactions.meta b/Assets/Input System/Player Actions.inputactions.meta similarity index 100% rename from Assets/Games/Platformer/Player Actions.inputactions.meta rename to Assets/Input System/Player Actions.inputactions.meta diff --git a/Assets/Materials.meta b/Assets/Materials.meta new file mode 100644 index 0000000..688dcb3 --- /dev/null +++ b/Assets/Materials.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3f45e0b9c973d406aba211a27921e1c5 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Games/Platformer/Ground.physicsMaterial2D b/Assets/Materials/Ground.physicsMaterial2D similarity index 100% rename from Assets/Games/Platformer/Ground.physicsMaterial2D rename to Assets/Materials/Ground.physicsMaterial2D diff --git a/Assets/Games/Platformer/Ground.physicsMaterial2D.meta b/Assets/Materials/Ground.physicsMaterial2D.meta similarity index 100% rename from Assets/Games/Platformer/Ground.physicsMaterial2D.meta rename to Assets/Materials/Ground.physicsMaterial2D.meta diff --git a/Assets/Games/Platformer/Player.physicsMaterial2D b/Assets/Materials/Player.physicsMaterial2D similarity index 100% rename from Assets/Games/Platformer/Player.physicsMaterial2D rename to Assets/Materials/Player.physicsMaterial2D diff --git a/Assets/Games/Platformer/Player.physicsMaterial2D.meta b/Assets/Materials/Player.physicsMaterial2D.meta similarity index 100% rename from Assets/Games/Platformer/Player.physicsMaterial2D.meta rename to Assets/Materials/Player.physicsMaterial2D.meta diff --git a/Assets/Old.meta b/Assets/Old.meta new file mode 100644 index 0000000..f87bade --- /dev/null +++ b/Assets/Old.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6e07e5716dfc6447ca4ce1ca48ff2834 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Hub.meta b/Assets/Old/Hub.meta similarity index 100% rename from Assets/Hub.meta rename to Assets/Old/Hub.meta diff --git a/Assets/Hub/Button Animation.controller b/Assets/Old/Hub/Button Animation.controller similarity index 100% rename from Assets/Hub/Button Animation.controller rename to Assets/Old/Hub/Button Animation.controller diff --git a/Assets/Hub/Button Animation.controller.meta b/Assets/Old/Hub/Button Animation.controller.meta similarity index 100% rename from Assets/Hub/Button Animation.controller.meta rename to Assets/Old/Hub/Button Animation.controller.meta diff --git a/Assets/Hub/Hub.unity b/Assets/Old/Hub/Hub.unity similarity index 100% rename from Assets/Hub/Hub.unity rename to Assets/Old/Hub/Hub.unity diff --git a/Assets/Hub/Hub.unity.meta b/Assets/Old/Hub/Hub.unity.meta similarity index 100% rename from Assets/Hub/Hub.unity.meta rename to Assets/Old/Hub/Hub.unity.meta diff --git a/Assets/Hub/HubManager.cs b/Assets/Old/Hub/HubManager.cs similarity index 100% rename from Assets/Hub/HubManager.cs rename to Assets/Old/Hub/HubManager.cs diff --git a/Assets/Hub/HubManager.cs.meta b/Assets/Old/Hub/HubManager.cs.meta similarity index 100% rename from Assets/Hub/HubManager.cs.meta rename to Assets/Old/Hub/HubManager.cs.meta diff --git a/Assets/Hub/HubPolygonCreator.cs b/Assets/Old/Hub/HubPolygonCreator.cs similarity index 100% rename from Assets/Hub/HubPolygonCreator.cs rename to Assets/Old/Hub/HubPolygonCreator.cs diff --git a/Assets/Hub/HubPolygonCreator.cs.meta b/Assets/Old/Hub/HubPolygonCreator.cs.meta similarity index 100% rename from Assets/Hub/HubPolygonCreator.cs.meta rename to Assets/Old/Hub/HubPolygonCreator.cs.meta diff --git a/Assets/Hub/Platformer.png b/Assets/Old/Hub/Platformer.png similarity index 100% rename from Assets/Hub/Platformer.png rename to Assets/Old/Hub/Platformer.png diff --git a/Assets/Hub/Platformer.png.meta b/Assets/Old/Hub/Platformer.png.meta similarity index 100% rename from Assets/Hub/Platformer.png.meta rename to Assets/Old/Hub/Platformer.png.meta diff --git a/Assets/Games/Pong.meta b/Assets/Old/Pong.meta similarity index 100% rename from Assets/Games/Pong.meta rename to Assets/Old/Pong.meta diff --git a/Assets/Games/Pong/Ball.physicsMaterial2D b/Assets/Old/Pong/Ball.physicsMaterial2D similarity index 100% rename from Assets/Games/Pong/Ball.physicsMaterial2D rename to Assets/Old/Pong/Ball.physicsMaterial2D diff --git a/Assets/Games/Pong/Ball.physicsMaterial2D.meta b/Assets/Old/Pong/Ball.physicsMaterial2D.meta similarity index 100% rename from Assets/Games/Pong/Ball.physicsMaterial2D.meta rename to Assets/Old/Pong/Ball.physicsMaterial2D.meta diff --git a/Assets/Games/Pong/Paddle.prefab b/Assets/Old/Pong/Paddle.prefab similarity index 100% rename from Assets/Games/Pong/Paddle.prefab rename to Assets/Old/Pong/Paddle.prefab diff --git a/Assets/Games/Pong/Paddle.prefab.meta b/Assets/Old/Pong/Paddle.prefab.meta similarity index 100% rename from Assets/Games/Pong/Paddle.prefab.meta rename to Assets/Old/Pong/Paddle.prefab.meta diff --git a/Assets/Games/Pong/Pong Goal.prefab b/Assets/Old/Pong/Pong Goal.prefab similarity index 100% rename from Assets/Games/Pong/Pong Goal.prefab rename to Assets/Old/Pong/Pong Goal.prefab diff --git a/Assets/Games/Pong/Pong Goal.prefab.meta b/Assets/Old/Pong/Pong Goal.prefab.meta similarity index 100% rename from Assets/Games/Pong/Pong Goal.prefab.meta rename to Assets/Old/Pong/Pong Goal.prefab.meta diff --git a/Assets/Games/Pong/Pong.unity b/Assets/Old/Pong/Pong.unity similarity index 100% rename from Assets/Games/Pong/Pong.unity rename to Assets/Old/Pong/Pong.unity diff --git a/Assets/Games/Pong/Pong.unity.meta b/Assets/Old/Pong/Pong.unity.meta similarity index 100% rename from Assets/Games/Pong/Pong.unity.meta rename to Assets/Old/Pong/Pong.unity.meta diff --git a/Assets/Games/Pong/PongBallBehavior.cs b/Assets/Old/Pong/PongBallBehavior.cs similarity index 100% rename from Assets/Games/Pong/PongBallBehavior.cs rename to Assets/Old/Pong/PongBallBehavior.cs diff --git a/Assets/Games/Pong/PongBallBehavior.cs.meta b/Assets/Old/Pong/PongBallBehavior.cs.meta similarity index 100% rename from Assets/Games/Pong/PongBallBehavior.cs.meta rename to Assets/Old/Pong/PongBallBehavior.cs.meta diff --git a/Assets/Games/Pong/PongPaddleBehavior.cs b/Assets/Old/Pong/PongPaddleBehavior.cs similarity index 100% rename from Assets/Games/Pong/PongPaddleBehavior.cs rename to Assets/Old/Pong/PongPaddleBehavior.cs diff --git a/Assets/Games/Pong/PongPaddleBehavior.cs.meta b/Assets/Old/Pong/PongPaddleBehavior.cs.meta similarity index 100% rename from Assets/Games/Pong/PongPaddleBehavior.cs.meta rename to Assets/Old/Pong/PongPaddleBehavior.cs.meta diff --git a/Assets/Games/Pong/PongScorekeeper.cs b/Assets/Old/Pong/PongScorekeeper.cs similarity index 100% rename from Assets/Games/Pong/PongScorekeeper.cs rename to Assets/Old/Pong/PongScorekeeper.cs diff --git a/Assets/Games/Pong/PongScorekeeper.cs.meta b/Assets/Old/Pong/PongScorekeeper.cs.meta similarity index 100% rename from Assets/Games/Pong/PongScorekeeper.cs.meta rename to Assets/Old/Pong/PongScorekeeper.cs.meta diff --git a/Assets/Games/Pong/pong-score.asset b/Assets/Old/Pong/pong-score.asset similarity index 100% rename from Assets/Games/Pong/pong-score.asset rename to Assets/Old/Pong/pong-score.asset diff --git a/Assets/Games/Pong/pong-score.asset.meta b/Assets/Old/Pong/pong-score.asset.meta similarity index 100% rename from Assets/Games/Pong/pong-score.asset.meta rename to Assets/Old/Pong/pong-score.asset.meta diff --git a/Assets/Games/Pong/pong-score.ttf b/Assets/Old/Pong/pong-score.ttf similarity index 100% rename from Assets/Games/Pong/pong-score.ttf rename to Assets/Old/Pong/pong-score.ttf diff --git a/Assets/Games/Pong/pong-score.ttf.meta b/Assets/Old/Pong/pong-score.ttf.meta similarity index 100% rename from Assets/Games/Pong/pong-score.ttf.meta rename to Assets/Old/Pong/pong-score.ttf.meta diff --git a/Assets/Prefabs.meta b/Assets/Prefabs.meta new file mode 100644 index 0000000..9c4cdc6 --- /dev/null +++ b/Assets/Prefabs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c704b1b36b7d142b788f61daf310e3e8 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Games/Platformer/Platformer Camera.prefab b/Assets/Prefabs/Player Camera.prefab similarity index 99% rename from Assets/Games/Platformer/Platformer Camera.prefab rename to Assets/Prefabs/Player Camera.prefab index 61bdbe2..289786e 100644 --- a/Assets/Games/Platformer/Platformer Camera.prefab +++ b/Assets/Prefabs/Player Camera.prefab @@ -14,7 +14,7 @@ GameObject: - component: {fileID: 1959672341225110449} - component: {fileID: 1277363986118001863} m_Layer: 0 - m_Name: Platformer Camera + m_Name: Player Camera m_TagString: MainCamera m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/Games/Platformer/Platformer Camera.prefab.meta b/Assets/Prefabs/Player Camera.prefab.meta similarity index 100% rename from Assets/Games/Platformer/Platformer Camera.prefab.meta rename to Assets/Prefabs/Player Camera.prefab.meta diff --git a/Assets/Games/Platformer/Platformer Player.prefab b/Assets/Prefabs/Player.prefab similarity index 99% rename from Assets/Games/Platformer/Platformer Player.prefab rename to Assets/Prefabs/Player.prefab index 2494725..0cde926 100644 --- a/Assets/Games/Platformer/Platformer Player.prefab +++ b/Assets/Prefabs/Player.prefab @@ -95,7 +95,7 @@ GameObject: - component: {fileID: 3406519100105273690} - component: {fileID: 251648003544978305} m_Layer: 0 - m_Name: Platformer Player + m_Name: Player m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/Games/Platformer/Platformer Player.prefab.meta b/Assets/Prefabs/Player.prefab.meta similarity index 100% rename from Assets/Games/Platformer/Platformer Player.prefab.meta rename to Assets/Prefabs/Player.prefab.meta diff --git a/Assets/Games/Platformer/Tiles/New Tile Palette.prefab b/Assets/Prefabs/Tile Palette.prefab similarity index 99% rename from Assets/Games/Platformer/Tiles/New Tile Palette.prefab rename to Assets/Prefabs/Tile Palette.prefab index cb364c7..7fb5954 100644 --- a/Assets/Games/Platformer/Tiles/New Tile Palette.prefab +++ b/Assets/Prefabs/Tile Palette.prefab @@ -168,7 +168,7 @@ GameObject: - component: {fileID: 5329665422453939977} - component: {fileID: 8908401859747575877} m_Layer: 0 - m_Name: New Tile Palette + m_Name: Tile Palette m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/Games/Platformer/Tiles/New Tile Palette.prefab.meta b/Assets/Prefabs/Tile Palette.prefab.meta similarity index 100% rename from Assets/Games/Platformer/Tiles/New Tile Palette.prefab.meta rename to Assets/Prefabs/Tile Palette.prefab.meta diff --git a/Assets/Scenes.meta b/Assets/Scenes.meta new file mode 100644 index 0000000..7ea769a --- /dev/null +++ b/Assets/Scenes.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f4be320e673104b95be60196db7d5f5f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Games/Platformer/Platformer.unity b/Assets/Scenes/Platformer.unity similarity index 100% rename from Assets/Games/Platformer/Platformer.unity rename to Assets/Scenes/Platformer.unity diff --git a/Assets/Games/Platformer/Platformer.unity.meta b/Assets/Scenes/Platformer.unity.meta similarity index 100% rename from Assets/Games/Platformer/Platformer.unity.meta rename to Assets/Scenes/Platformer.unity.meta diff --git a/Assets/Scripts.meta b/Assets/Scripts.meta new file mode 100644 index 0000000..e811579 --- /dev/null +++ b/Assets/Scripts.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d0b7eb72323d94208baf6c6122423920 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Games/Platformer/PlatformerPlayerMovement.cs b/Assets/Scripts/PlatformerPlayerMovement.cs similarity index 100% rename from Assets/Games/Platformer/PlatformerPlayerMovement.cs rename to Assets/Scripts/PlatformerPlayerMovement.cs diff --git a/Assets/Games/Platformer/PlatformerPlayerMovement.cs.meta b/Assets/Scripts/PlatformerPlayerMovement.cs.meta similarity index 100% rename from Assets/Games/Platformer/PlatformerPlayerMovement.cs.meta rename to Assets/Scripts/PlatformerPlayerMovement.cs.meta diff --git a/Assets/Games/Platformer/PlatformerCameraMovement.cs b/Assets/Scripts/PlayerCameraMovement.cs similarity index 93% rename from Assets/Games/Platformer/PlatformerCameraMovement.cs rename to Assets/Scripts/PlayerCameraMovement.cs index f21fc57..9ec814d 100644 --- a/Assets/Games/Platformer/PlatformerCameraMovement.cs +++ b/Assets/Scripts/PlayerCameraMovement.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using UnityEngine; -public class PlatformerCameraMovement : MonoBehaviour +public class PlayerCameraMovement : MonoBehaviour { private Vector3 start; private Vector3 target; diff --git a/Assets/Games/Platformer/PlatformerCameraMovement.cs.meta b/Assets/Scripts/PlayerCameraMovement.cs.meta similarity index 100% rename from Assets/Games/Platformer/PlatformerCameraMovement.cs.meta rename to Assets/Scripts/PlayerCameraMovement.cs.meta diff --git a/Assets/PlayerManager.cs b/Assets/Scripts/PlayerManager.cs similarity index 89% rename from Assets/PlayerManager.cs rename to Assets/Scripts/PlayerManager.cs index a4f22eb..07175ae 100644 --- a/Assets/PlayerManager.cs +++ b/Assets/Scripts/PlayerManager.cs @@ -9,7 +9,7 @@ public class PlayerManager : MonoBehaviour public List players; [SerializeField] private Vector2 spawnPosition; - private PlatformerCameraMovement playerCamera; + private PlayerCameraMovement playerCamera; private void Awake() { @@ -21,7 +21,7 @@ public class PlayerManager : MonoBehaviour GetComponent().onPlayerJoined += OnPlayerJoined; GetComponent().onPlayerLeft += OnPlayerLeft; - playerCamera = FindFirstObjectByType(); + playerCamera = FindFirstObjectByType(); } private void OnPlayerJoined(PlayerInput playerInput) diff --git a/Assets/PlayerManager.cs.meta b/Assets/Scripts/PlayerManager.cs.meta similarity index 100% rename from Assets/PlayerManager.cs.meta rename to Assets/Scripts/PlayerManager.cs.meta diff --git a/Assets/RespawnOnTriggerEnter.cs b/Assets/Scripts/RespawnOnTriggerEnter.cs similarity index 100% rename from Assets/RespawnOnTriggerEnter.cs rename to Assets/Scripts/RespawnOnTriggerEnter.cs diff --git a/Assets/RespawnOnTriggerEnter.cs.meta b/Assets/Scripts/RespawnOnTriggerEnter.cs.meta similarity index 100% rename from Assets/RespawnOnTriggerEnter.cs.meta rename to Assets/Scripts/RespawnOnTriggerEnter.cs.meta diff --git a/Assets/Sprites.meta b/Assets/Sprites.meta new file mode 100644 index 0000000..bb8041f --- /dev/null +++ b/Assets/Sprites.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e9d38b588037d4a43b51f8f59c9a1a79 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Games/Platformer/Square.png b/Assets/Sprites/Square.png similarity index 100% rename from Assets/Games/Platformer/Square.png rename to Assets/Sprites/Square.png diff --git a/Assets/Games/Platformer/Square.png.meta b/Assets/Sprites/Square.png.meta similarity index 100% rename from Assets/Games/Platformer/Square.png.meta rename to Assets/Sprites/Square.png.meta diff --git a/Assets/Games/Platformer/Tiles.meta b/Assets/Sprites/Tiles.meta similarity index 100% rename from Assets/Games/Platformer/Tiles.meta rename to Assets/Sprites/Tiles.meta diff --git a/Assets/Games/Platformer/Tiles/Square.asset b/Assets/Sprites/Tiles/Square.asset similarity index 100% rename from Assets/Games/Platformer/Tiles/Square.asset rename to Assets/Sprites/Tiles/Square.asset diff --git a/Assets/Games/Platformer/Tiles/Square.asset.meta b/Assets/Sprites/Tiles/Square.asset.meta similarity index 100% rename from Assets/Games/Platformer/Tiles/Square.asset.meta rename to Assets/Sprites/Tiles/Square.asset.meta diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 0e22417..e766f6f 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -6,13 +6,13 @@ EditorBuildSettings: serializedVersion: 2 m_Scenes: - enabled: 1 - path: Assets/Hub/Hub.unity + path: Assets/Old/Hub/Hub.unity guid: 218f4d2e730ae4d5a8ac6b2a48440175 - enabled: 1 - path: Assets/Games/Pong/Pong.unity + path: Assets/Old/Pong/Pong.unity guid: 8c9cfa26abfee488c85f1582747f6a02 - enabled: 1 - path: Assets/Games/Platformer/Platformer.unity + path: Assets/Scenes/Platformer.unity guid: 7ced54d002210494abdbf0bcaa120835 m_configObjects: com.unity.input.settings.actions: {fileID: -944628639613478452, guid: 2bcd2660ca9b64942af0de543d8d7100, type: 3} From 004260b6e195e85dcb70bc21911a3391f9c5a1e0 Mon Sep 17 00:00:00 2001 From: RochesterX Date: Wed, 15 Jan 2025 15:44:42 -0500 Subject: [PATCH 14/25] Add Bones's Friend, Ligaments --- Assets/Scenes/Platformer.unity | 1179 ++++++++++++++++++++++++++++++++ 1 file changed, 1179 insertions(+) diff --git a/Assets/Scenes/Platformer.unity b/Assets/Scenes/Platformer.unity index 141acc3..105eaee 100644 --- a/Assets/Scenes/Platformer.unity +++ b/Assets/Scenes/Platformer.unity @@ -298,6 +298,105 @@ BoxCollider2D: m_AutoTiling: 0 m_Size: {x: 0.0625, y: 0.5} m_EdgeRadius: 0 +--- !u!1 &174433046 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 174433050} + - component: {fileID: 174433049} + - component: {fileID: 174433048} + - component: {fileID: 174433047} + m_Layer: 0 + m_Name: Ligaments + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &174433047 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 174433046} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8ce1d588594ee416e9ab629d0b8c07dd, type: 3} + m_Name: + m_EditorClassIdentifier: + spawnPoint: {x: 14.08, y: 14.08} + spawnPointIsInitialPosition: 1 + respawnTag: Platformer Hazard +--- !u!50 &174433048 +Rigidbody2D: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 174433046} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDamping: 0 + m_AngularDamping: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_Interpolate: 1 + m_SleepingMode: 1 + m_CollisionDetection: 1 + m_Constraints: 0 +--- !u!95 &174433049 +Animator: + serializedVersion: 7 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 174433046} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 8a738d31dc8884ffeb8292972ba3cff6, type: 2} + m_CullingMode: 0 + m_UpdateMode: 1 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_AnimatePhysics: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!4 &174433050 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 174433046} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 5.34, y: 14.08, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 750963455} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &292682714 GameObject: m_ObjectHideFlags: 0 @@ -437,6 +536,140 @@ BoxCollider2D: m_AutoTiling: 0 m_Size: {x: 0.0625, y: 0.5} m_EdgeRadius: 0 +--- !u!1 &335357590 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 335357591} + - component: {fileID: 335357593} + - component: {fileID: 335357592} + m_Layer: 0 + m_Name: Leg R L + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &335357591 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 335357590} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: -0.5, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 861836951} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &335357592 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 335357590} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: -0.25} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 1} + oldSize: {x: 0.0625, y: 0.5} + newSize: {x: 0.8125, y: 0.5625} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 0.0625, y: 0.5} + m_EdgeRadius: 0 +--- !u!212 &335357593 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 335357590} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 1406629073, guid: b5f1c8f6f05944d649e3fb9af5459160, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.8125, y: 0.5625} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &348042967 GameObject: m_ObjectHideFlags: 0 @@ -571,6 +804,279 @@ BoxCollider2D: m_AutoTiling: 0 m_Size: {x: 0.0625, y: 0.5} m_EdgeRadius: 0 +--- !u!1 &536029549 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 536029550} + - component: {fileID: 536029552} + - component: {fileID: 536029551} + m_Layer: 0 + m_Name: Arm R + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &536029550 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 536029549} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -1, w: 0} + m_LocalPosition: {x: 0, y: -0.5, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 750963455} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} +--- !u!61 &536029551 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 536029549} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: -0.25} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 1} + oldSize: {x: 0.0625, y: 0.5} + newSize: {x: 0.8125, y: 0.5625} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 0.0625, y: 0.5} + m_EdgeRadius: 0 +--- !u!212 &536029552 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 536029549} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 1406629073, guid: b5f1c8f6f05944d649e3fb9af5459160, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.8125, y: 0.5625} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &750963454 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 750963455} + - component: {fileID: 750963457} + - component: {fileID: 750963456} + m_Layer: 0 + m_Name: Torso + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &750963455 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 750963454} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 1, w: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1253214144} + - {fileID: 1491002916} + - {fileID: 536029550} + - {fileID: 1707109078} + - {fileID: 861836951} + m_Father: {fileID: 174433050} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} +--- !u!61 &750963456 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 750963454} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: -0.25} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 1} + oldSize: {x: 0.0625, y: 0.5} + newSize: {x: 0.8125, y: 0.5625} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 0.0625, y: 0.5} + m_EdgeRadius: 0 +--- !u!212 &750963457 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 750963454} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 1406629073, guid: b5f1c8f6f05944d649e3fb9af5459160, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.8125, y: 0.5625} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &804358384 GameObject: m_ObjectHideFlags: 0 @@ -662,6 +1168,275 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &861836950 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 861836951} + - component: {fileID: 861836953} + - component: {fileID: 861836952} + m_Layer: 0 + m_Name: Leg R U + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &861836951 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 861836950} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -1, w: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 335357591} + m_Father: {fileID: 750963455} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} +--- !u!61 &861836952 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 861836950} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: -0.25} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 1} + oldSize: {x: 0.0625, y: 0.5} + newSize: {x: 0.8125, y: 0.5625} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 0.0625, y: 0.5} + m_EdgeRadius: 0 +--- !u!212 &861836953 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 861836950} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 1406629073, guid: b5f1c8f6f05944d649e3fb9af5459160, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.8125, y: 0.5625} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &1117396099 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1117396100} + - component: {fileID: 1117396102} + - component: {fileID: 1117396101} + m_Layer: 0 + m_Name: Leg L L + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1117396100 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1117396099} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: -0.5, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1707109078} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &1117396101 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1117396099} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: -0.25} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 1} + oldSize: {x: 0.0625, y: 0.5} + newSize: {x: 0.8125, y: 0.5625} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 0.0625, y: 0.5} + m_EdgeRadius: 0 +--- !u!212 &1117396102 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1117396099} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 1406629073, guid: b5f1c8f6f05944d649e3fb9af5459160, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.8125, y: 0.5625} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &1178732237 GameObject: m_ObjectHideFlags: 0 @@ -12308,6 +13083,140 @@ TilemapCollider2D: m_MaximumTileChangeCount: 1000 m_ExtrusionFactor: 0 m_UseDelaunayMesh: 0 +--- !u!1 &1253214143 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1253214144} + - component: {fileID: 1253214146} + - component: {fileID: 1253214145} + m_Layer: 0 + m_Name: Head + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1253214144 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1253214143} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -1, w: 0} + m_LocalPosition: {x: 0, y: -0.75, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 750963455} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} +--- !u!61 &1253214145 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1253214143} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 0.5, y: 0.5} + newSize: {x: 0.8125, y: 0.5625} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 0.5, y: 0.5} + m_EdgeRadius: 0 +--- !u!212 &1253214146 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1253214143} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 7482667652216324306, guid: b5f1c8f6f05944d649e3fb9af5459160, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.8125, y: 0.5625} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &1355961158 GameObject: m_ObjectHideFlags: 0 @@ -12810,6 +13719,140 @@ BoxCollider2D: m_AutoTiling: 0 m_Size: {x: 0.0625, y: 0.5} m_EdgeRadius: 0 +--- !u!1 &1491002915 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1491002916} + - component: {fileID: 1491002918} + - component: {fileID: 1491002917} + m_Layer: 0 + m_Name: Arm L + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1491002916 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1491002915} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -1, w: 0} + m_LocalPosition: {x: 0, y: -0.5, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 750963455} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} +--- !u!61 &1491002917 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1491002915} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: -0.25} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 1} + oldSize: {x: 0.0625, y: 0.5} + newSize: {x: 0.8125, y: 0.5625} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 0.0625, y: 0.5} + m_EdgeRadius: 0 +--- !u!212 &1491002918 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1491002915} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 1406629073, guid: b5f1c8f6f05944d649e3fb9af5459160, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.8125, y: 0.5625} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &1674350449 GameObject: m_ObjectHideFlags: 0 @@ -12944,6 +13987,141 @@ BoxCollider2D: m_AutoTiling: 0 m_Size: {x: 0.5, y: 0.5} m_EdgeRadius: 0 +--- !u!1 &1707109077 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1707109078} + - component: {fileID: 1707109080} + - component: {fileID: 1707109079} + m_Layer: 0 + m_Name: Leg L U + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1707109078 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1707109077} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -1, w: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1117396100} + m_Father: {fileID: 750963455} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} +--- !u!61 &1707109079 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1707109077} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: -0.25} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 1} + oldSize: {x: 0.0625, y: 0.5} + newSize: {x: 0.8125, y: 0.5625} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 0.0625, y: 0.5} + m_EdgeRadius: 0 +--- !u!212 &1707109080 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1707109077} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 1406629073, guid: b5f1c8f6f05944d649e3fb9af5459160, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.8125, y: 0.5625} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &1758254987 GameObject: m_ObjectHideFlags: 0 @@ -13238,4 +14416,5 @@ SceneRoots: - {fileID: 322321} - {fileID: 1758254989} - {fileID: 1355961160} + - {fileID: 174433050} - {fileID: 804358387} From 4c2830769be66b7a65eb0547f96b40cee30ce041 Mon Sep 17 00:00:00 2001 From: RochesterX Date: Wed, 15 Jan 2025 16:04:20 -0500 Subject: [PATCH 15/25] Add new Bones animation --- Assets/AnimationPlayer.cs | 15 + Assets/AnimationPlayer.cs.meta | 2 + Assets/Animations/Root.controller | 29 + Assets/Animations/Wild.anim | 1781 +++++++++++++++++++++ Assets/Animations/Wild.anim.meta | 8 + Assets/Prefabs/Bones.prefab | 1194 ++++++++++++++ Assets/Prefabs/Bones.prefab.meta | 7 + Assets/Scenes/Platformer.unity | 2472 ++--------------------------- 8 files changed, 3153 insertions(+), 2355 deletions(-) create mode 100644 Assets/AnimationPlayer.cs create mode 100644 Assets/AnimationPlayer.cs.meta create mode 100644 Assets/Animations/Wild.anim create mode 100644 Assets/Animations/Wild.anim.meta create mode 100644 Assets/Prefabs/Bones.prefab create mode 100644 Assets/Prefabs/Bones.prefab.meta diff --git a/Assets/AnimationPlayer.cs b/Assets/AnimationPlayer.cs new file mode 100644 index 0000000..43149c5 --- /dev/null +++ b/Assets/AnimationPlayer.cs @@ -0,0 +1,15 @@ +using UnityEngine; + +[RequireComponent(typeof(Animator))] +public class AnimationPlayer : MonoBehaviour +{ + public AnimationClip clip; + + private Animator animator; + + private void Start() + { + animator = GetComponent(); + animator.Play(clip.name); + } +} diff --git a/Assets/AnimationPlayer.cs.meta b/Assets/AnimationPlayer.cs.meta new file mode 100644 index 0000000..f9d1145 --- /dev/null +++ b/Assets/AnimationPlayer.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 6e9d01bde449c4d0fa146e06804d6a03 \ No newline at end of file diff --git a/Assets/Animations/Root.controller b/Assets/Animations/Root.controller index dac72ff..2bc96a9 100644 --- a/Assets/Animations/Root.controller +++ b/Assets/Animations/Root.controller @@ -12,6 +12,9 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: 2600039493493020915} m_Position: {x: 200, y: 0, z: 0} + - serializedVersion: 1 + m_State: {fileID: -65348665591799820} + m_Position: {x: 235, y: 65, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -22,6 +25,32 @@ AnimatorStateMachine: m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: 2600039493493020915} +--- !u!1102 &-65348665591799820 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Wild + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 93a4e7ef703974b11a664b2860f28280, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 diff --git a/Assets/Animations/Wild.anim b/Assets/Animations/Wild.anim new file mode 100644 index 0000000..a97f875 --- /dev/null +++ b/Assets/Animations/Wild.anim @@ -0,0 +1,1781 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Wild + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, z: 180} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.5 + value: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: -360} + outSlope: {x: 0, y: 0, z: -360} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 1 + value: {x: 0, y: 0, z: -180} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: Torso/Arm L + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, z: 180} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.5 + value: {x: 0, y: 0, z: 360} + inSlope: {x: 0, y: 0, z: 360} + outSlope: {x: 0, y: 0, z: 360} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 1 + value: {x: 0, y: 0, z: 540} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: Torso/Arm R + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, z: 180} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.5 + value: {x: 0, y: 0, z: 100.533} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 1 + value: {x: 0, y: 0, z: 180} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: Torso/Leg R U + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, z: 180} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.5 + value: {x: 0, y: 0, z: 256.188} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 1 + value: {x: 0, y: 0, z: 180} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: Torso/Leg L U + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.5 + value: {x: 0, y: 0, z: -139.806} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 1 + value: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: Torso/Leg L U/Leg L L + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.5 + value: {x: 0, y: 0, z: -105.273} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 1 + value: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: Torso/Leg R U/Leg R L + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, z: 180} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.5 + value: {x: 0, y: 0, z: 169.057} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 1 + value: {x: 0, y: 0, z: 180} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: Torso + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, z: 180} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.5 + value: {x: 0, y: 0, z: 158.17} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 1 + value: {x: 0, y: 0, z: 180} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: Torso/Head + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: -0.75, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.5 + value: {x: -0.089, y: -0.714, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 1 + value: {x: 0, y: -0.75, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: Torso/Head + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 2146230158 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 4207337212 + attribute: 4 + script: {fileID: 0} + typeID: 4 + customType: 4 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 13231007 + attribute: 4 + script: {fileID: 0} + typeID: 4 + customType: 4 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 892534202 + attribute: 4 + script: {fileID: 0} + typeID: 4 + customType: 4 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 596276160 + attribute: 4 + script: {fileID: 0} + typeID: 4 + customType: 4 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 415537218 + attribute: 4 + script: {fileID: 0} + typeID: 4 + customType: 4 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 4076665333 + attribute: 4 + script: {fileID: 0} + typeID: 4 + customType: 4 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 3869152129 + attribute: 4 + script: {fileID: 0} + typeID: 4 + customType: 4 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 2146230158 + attribute: 4 + script: {fileID: 0} + typeID: 4 + customType: 4 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.x + path: Torso/Arm L + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.y + path: Torso/Arm L + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 180 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: -360 + outSlope: -360 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: -180 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.z + path: Torso/Arm L + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.x + path: Torso/Arm R + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.y + path: Torso/Arm R + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 180 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 360 + inSlope: 360 + outSlope: 360 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 540 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.z + path: Torso/Arm R + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.x + path: Torso/Leg R U + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.y + path: Torso/Leg R U + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 180 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 100.533 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 180 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.z + path: Torso/Leg R U + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.x + path: Torso/Leg L U + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.y + path: Torso/Leg L U + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 180 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 256.188 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 180 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.z + path: Torso/Leg L U + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.x + path: Torso/Leg L U/Leg L L + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.y + path: Torso/Leg L U/Leg L L + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: -139.806 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.z + path: Torso/Leg L U/Leg L L + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.x + path: Torso/Leg R U/Leg R L + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.y + path: Torso/Leg R U/Leg R L + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: -105.273 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.z + path: Torso/Leg R U/Leg R L + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.x + path: Torso + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.y + path: Torso + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 180 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 169.057 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 180 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.z + path: Torso + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.x + path: Torso/Head + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.y + path: Torso/Head + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 180 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 158.17 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 180 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.z + path: Torso/Head + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: -0.089 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: Torso/Head + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.75 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: -0.714 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: -0.75 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: Torso/Head + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: Torso/Head + classID: 4 + script: {fileID: 0} + flags: 0 + m_EulerEditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: Torso/Leg R U + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: Torso/Leg R U + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: Torso/Leg R U + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: Torso + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: Torso + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: Torso + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: Torso/Leg L U + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: Torso/Leg L U + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: Torso/Leg L U + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: Torso/Arm L + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: Torso/Arm L + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: Torso/Arm L + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: Torso/Leg R U/Leg R L + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: Torso/Leg R U/Leg R L + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: Torso/Leg R U/Leg R L + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: Torso/Leg L U/Leg L L + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: Torso/Leg L U/Leg L L + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: Torso/Leg L U/Leg L L + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: Torso/Head + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: Torso/Head + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: Torso/Head + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: Torso/Arm R + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: Torso/Arm R + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: Torso/Arm R + classID: 4 + script: {fileID: 0} + flags: 0 + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Animations/Wild.anim.meta b/Assets/Animations/Wild.anim.meta new file mode 100644 index 0000000..292095c --- /dev/null +++ b/Assets/Animations/Wild.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 93a4e7ef703974b11a664b2860f28280 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Bones.prefab b/Assets/Prefabs/Bones.prefab new file mode 100644 index 0000000..6acddcd --- /dev/null +++ b/Assets/Prefabs/Bones.prefab @@ -0,0 +1,1194 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1375850422501237868 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7009259675412950971} + - component: {fileID: 6392580824388157607} + - component: {fileID: 1169583671018505929} + - component: {fileID: 2344147968324054325} + - component: {fileID: 75167067980600170} + m_Layer: 0 + m_Name: Bones + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7009259675412950971 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1375850422501237868} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -2.16, y: 14.08, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 7290594200745798336} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6392580824388157607 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1375850422501237868} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6e9d01bde449c4d0fa146e06804d6a03, type: 3} + m_Name: + m_EditorClassIdentifier: + clip: {fileID: 7400000, guid: 590f229c565f34c8296a875497c76553, type: 2} +--- !u!95 &1169583671018505929 +Animator: + serializedVersion: 7 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1375850422501237868} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 8a738d31dc8884ffeb8292972ba3cff6, type: 2} + m_CullingMode: 0 + m_UpdateMode: 1 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_AnimatePhysics: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!50 &2344147968324054325 +Rigidbody2D: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1375850422501237868} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDamping: 0 + m_AngularDamping: 0.05 + m_GravityScale: 4 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_Interpolate: 1 + m_SleepingMode: 1 + m_CollisionDetection: 1 + m_Constraints: 0 +--- !u!114 &75167067980600170 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1375850422501237868} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8ce1d588594ee416e9ab629d0b8c07dd, type: 3} + m_Name: + m_EditorClassIdentifier: + spawnPoint: {x: 14.08, y: 14.08} + spawnPointIsInitialPosition: 1 + respawnTag: Platformer Hazard +--- !u!1 &1792259794085692571 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1718132792713490460} + - component: {fileID: 7028381425298949789} + - component: {fileID: 5741861126398270076} + m_Layer: 0 + m_Name: Leg R L + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1718132792713490460 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1792259794085692571} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: -0.5, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2573475224850089075} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &7028381425298949789 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1792259794085692571} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 1406629073, guid: b5f1c8f6f05944d649e3fb9af5459160, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.8125, y: 0.5625} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!61 &5741861126398270076 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1792259794085692571} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: -0.25} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 1} + oldSize: {x: 0.0625, y: 0.5} + newSize: {x: 0.8125, y: 0.5625} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 0.0625, y: 0.5} + m_EdgeRadius: 0 +--- !u!1 &3572452013539030063 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7290594200745798336} + - component: {fileID: 5653647541318480273} + - component: {fileID: 507076518380907171} + m_Layer: 0 + m_Name: Torso + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7290594200745798336 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3572452013539030063} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 1, w: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 7969993128652732868} + - {fileID: 4818486997278545909} + - {fileID: 3359136527054329610} + - {fileID: 6473071301151420235} + - {fileID: 2573475224850089075} + m_Father: {fileID: 7009259675412950971} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} +--- !u!212 &5653647541318480273 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3572452013539030063} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 1406629073, guid: b5f1c8f6f05944d649e3fb9af5459160, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.8125, y: 0.5625} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!61 &507076518380907171 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3572452013539030063} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: -0.25} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 1} + oldSize: {x: 0.0625, y: 0.5} + newSize: {x: 0.8125, y: 0.5625} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 0.0625, y: 0.5} + m_EdgeRadius: 0 +--- !u!1 &3999993024726141628 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6473071301151420235} + - component: {fileID: 6334212293757716143} + - component: {fileID: 1962952166224815875} + m_Layer: 0 + m_Name: Leg L U + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6473071301151420235 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3999993024726141628} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -1, w: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1315511404573068819} + m_Father: {fileID: 7290594200745798336} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} +--- !u!212 &6334212293757716143 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3999993024726141628} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 1406629073, guid: b5f1c8f6f05944d649e3fb9af5459160, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.8125, y: 0.5625} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!61 &1962952166224815875 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3999993024726141628} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: -0.25} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 1} + oldSize: {x: 0.0625, y: 0.5} + newSize: {x: 0.8125, y: 0.5625} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 0.0625, y: 0.5} + m_EdgeRadius: 0 +--- !u!1 &4053418163071482318 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1315511404573068819} + - component: {fileID: 3666712602053540788} + - component: {fileID: 2707422942191181157} + m_Layer: 0 + m_Name: Leg L L + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1315511404573068819 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4053418163071482318} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: -0.5, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6473071301151420235} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &3666712602053540788 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4053418163071482318} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 1406629073, guid: b5f1c8f6f05944d649e3fb9af5459160, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.8125, y: 0.5625} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!61 &2707422942191181157 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4053418163071482318} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: -0.25} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 1} + oldSize: {x: 0.0625, y: 0.5} + newSize: {x: 0.8125, y: 0.5625} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 0.0625, y: 0.5} + m_EdgeRadius: 0 +--- !u!1 &4559249486922240447 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4818486997278545909} + - component: {fileID: 1251171065512708809} + - component: {fileID: 3957321655599357379} + m_Layer: 0 + m_Name: Arm L + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4818486997278545909 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4559249486922240447} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -1, w: 0} + m_LocalPosition: {x: 0, y: -0.5, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7290594200745798336} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} +--- !u!212 &1251171065512708809 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4559249486922240447} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 1406629073, guid: b5f1c8f6f05944d649e3fb9af5459160, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.8125, y: 0.5625} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!61 &3957321655599357379 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4559249486922240447} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: -0.25} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 1} + oldSize: {x: 0.0625, y: 0.5} + newSize: {x: 0.8125, y: 0.5625} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 0.0625, y: 0.5} + m_EdgeRadius: 0 +--- !u!1 &5246451624517682053 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7969993128652732868} + - component: {fileID: 4523631935514373873} + - component: {fileID: 291340910524836895} + m_Layer: 0 + m_Name: Head + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7969993128652732868 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5246451624517682053} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -1, w: 0} + m_LocalPosition: {x: 0, y: -0.75, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7290594200745798336} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} +--- !u!212 &4523631935514373873 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5246451624517682053} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 7482667652216324306, guid: b5f1c8f6f05944d649e3fb9af5459160, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.8125, y: 0.5625} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!61 &291340910524836895 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5246451624517682053} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 0.5, y: 0.5} + newSize: {x: 0.8125, y: 0.5625} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 0.5, y: 0.5} + m_EdgeRadius: 0 +--- !u!1 &5636889232707595368 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3359136527054329610} + - component: {fileID: 3115818513466967182} + - component: {fileID: 2445128439726600428} + m_Layer: 0 + m_Name: Arm R + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3359136527054329610 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5636889232707595368} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -1, w: 0} + m_LocalPosition: {x: 0, y: -0.5, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7290594200745798336} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} +--- !u!212 &3115818513466967182 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5636889232707595368} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 1406629073, guid: b5f1c8f6f05944d649e3fb9af5459160, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.8125, y: 0.5625} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!61 &2445128439726600428 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5636889232707595368} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: -0.25} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 1} + oldSize: {x: 0.0625, y: 0.5} + newSize: {x: 0.8125, y: 0.5625} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 0.0625, y: 0.5} + m_EdgeRadius: 0 +--- !u!1 &7131227584641296005 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2573475224850089075} + - component: {fileID: 6698132186857891945} + - component: {fileID: 5617465441188228127} + m_Layer: 0 + m_Name: Leg R U + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2573475224850089075 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7131227584641296005} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -1, w: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1718132792713490460} + m_Father: {fileID: 7290594200745798336} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} +--- !u!212 &6698132186857891945 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7131227584641296005} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 1406629073, guid: b5f1c8f6f05944d649e3fb9af5459160, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.8125, y: 0.5625} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!61 &5617465441188228127 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7131227584641296005} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: -0.25} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 1} + oldSize: {x: 0.0625, y: 0.5} + newSize: {x: 0.8125, y: 0.5625} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 0.0625, y: 0.5} + m_EdgeRadius: 0 diff --git a/Assets/Prefabs/Bones.prefab.meta b/Assets/Prefabs/Bones.prefab.meta new file mode 100644 index 0000000..bea52ab --- /dev/null +++ b/Assets/Prefabs/Bones.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 1fd31b88e5609482ab7e8ab16a932947 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Platformer.unity b/Assets/Scenes/Platformer.unity index 105eaee..391db79 100644 --- a/Assets/Scenes/Platformer.unity +++ b/Assets/Scenes/Platformer.unity @@ -164,919 +164,6 @@ Transform: - {fileID: 1178732238} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &36018668 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 36018669} - - component: {fileID: 36018670} - - component: {fileID: 36018671} - m_Layer: 0 - m_Name: Arm L - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &36018669 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 36018668} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -1, w: 0} - m_LocalPosition: {x: 0, y: -0.5, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 292682715} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} ---- !u!212 &36018670 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 36018668} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 1406629073, guid: b5f1c8f6f05944d649e3fb9af5459160, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 0.8125, y: 0.5625} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!61 &36018671 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 36018668} - m_Enabled: 1 - serializedVersion: 3 - m_Density: 1 - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_ForceSendLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ForceReceiveLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ContactCaptureLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_CallbackLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_CompositeOperation: 0 - m_CompositeOrder: 0 - m_Offset: {x: 0, y: -0.25} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 1} - oldSize: {x: 0.0625, y: 0.5} - newSize: {x: 0.8125, y: 0.5625} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - m_Size: {x: 0.0625, y: 0.5} - m_EdgeRadius: 0 ---- !u!1 &174433046 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 174433050} - - component: {fileID: 174433049} - - component: {fileID: 174433048} - - component: {fileID: 174433047} - m_Layer: 0 - m_Name: Ligaments - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &174433047 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 174433046} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8ce1d588594ee416e9ab629d0b8c07dd, type: 3} - m_Name: - m_EditorClassIdentifier: - spawnPoint: {x: 14.08, y: 14.08} - spawnPointIsInitialPosition: 1 - respawnTag: Platformer Hazard ---- !u!50 &174433048 -Rigidbody2D: - serializedVersion: 5 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 174433046} - m_BodyType: 0 - m_Simulated: 1 - m_UseFullKinematicContacts: 0 - m_UseAutoMass: 0 - m_Mass: 1 - m_LinearDamping: 0 - m_AngularDamping: 0.05 - m_GravityScale: 1 - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_Interpolate: 1 - m_SleepingMode: 1 - m_CollisionDetection: 1 - m_Constraints: 0 ---- !u!95 &174433049 -Animator: - serializedVersion: 7 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 174433046} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 8a738d31dc8884ffeb8292972ba3cff6, type: 2} - m_CullingMode: 0 - m_UpdateMode: 1 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_StabilizeFeet: 0 - m_AnimatePhysics: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorStateOnDisable: 0 - m_WriteDefaultValuesOnDisable: 0 ---- !u!4 &174433050 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 174433046} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 5.34, y: 14.08, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 750963455} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &292682714 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 292682715} - - component: {fileID: 292682716} - - component: {fileID: 292682717} - m_Layer: 0 - m_Name: Torso - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &292682715 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 292682714} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 1, w: 0} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1674350450} - - {fileID: 36018669} - - {fileID: 1405104010} - - {fileID: 1446289254} - - {fileID: 1882468358} - m_Father: {fileID: 1355961160} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} ---- !u!212 &292682716 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 292682714} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 1406629073, guid: b5f1c8f6f05944d649e3fb9af5459160, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 0.8125, y: 0.5625} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!61 &292682717 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 292682714} - m_Enabled: 1 - serializedVersion: 3 - m_Density: 1 - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_ForceSendLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ForceReceiveLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ContactCaptureLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_CallbackLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_CompositeOperation: 0 - m_CompositeOrder: 0 - m_Offset: {x: 0, y: -0.25} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 1} - oldSize: {x: 0.0625, y: 0.5} - newSize: {x: 0.8125, y: 0.5625} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - m_Size: {x: 0.0625, y: 0.5} - m_EdgeRadius: 0 ---- !u!1 &335357590 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 335357591} - - component: {fileID: 335357593} - - component: {fileID: 335357592} - m_Layer: 0 - m_Name: Leg R L - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &335357591 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 335357590} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -0.5, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 861836951} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!61 &335357592 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 335357590} - m_Enabled: 1 - serializedVersion: 3 - m_Density: 1 - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_ForceSendLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ForceReceiveLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ContactCaptureLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_CallbackLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_CompositeOperation: 0 - m_CompositeOrder: 0 - m_Offset: {x: 0, y: -0.25} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 1} - oldSize: {x: 0.0625, y: 0.5} - newSize: {x: 0.8125, y: 0.5625} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - m_Size: {x: 0.0625, y: 0.5} - m_EdgeRadius: 0 ---- !u!212 &335357593 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 335357590} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 1406629073, guid: b5f1c8f6f05944d649e3fb9af5459160, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 0.8125, y: 0.5625} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!1 &348042967 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 348042968} - - component: {fileID: 348042969} - - component: {fileID: 348042970} - m_Layer: 0 - m_Name: Leg L L - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &348042968 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 348042967} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -0.5, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1446289254} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &348042969 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 348042967} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 1406629073, guid: b5f1c8f6f05944d649e3fb9af5459160, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 0.8125, y: 0.5625} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!61 &348042970 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 348042967} - m_Enabled: 1 - serializedVersion: 3 - m_Density: 1 - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_ForceSendLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ForceReceiveLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ContactCaptureLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_CallbackLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_CompositeOperation: 0 - m_CompositeOrder: 0 - m_Offset: {x: 0, y: -0.25} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 1} - oldSize: {x: 0.0625, y: 0.5} - newSize: {x: 0.8125, y: 0.5625} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - m_Size: {x: 0.0625, y: 0.5} - m_EdgeRadius: 0 ---- !u!1 &536029549 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 536029550} - - component: {fileID: 536029552} - - component: {fileID: 536029551} - m_Layer: 0 - m_Name: Arm R - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &536029550 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 536029549} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -1, w: 0} - m_LocalPosition: {x: 0, y: -0.5, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 750963455} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} ---- !u!61 &536029551 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 536029549} - m_Enabled: 1 - serializedVersion: 3 - m_Density: 1 - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_ForceSendLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ForceReceiveLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ContactCaptureLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_CallbackLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_CompositeOperation: 0 - m_CompositeOrder: 0 - m_Offset: {x: 0, y: -0.25} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 1} - oldSize: {x: 0.0625, y: 0.5} - newSize: {x: 0.8125, y: 0.5625} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - m_Size: {x: 0.0625, y: 0.5} - m_EdgeRadius: 0 ---- !u!212 &536029552 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 536029549} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 1406629073, guid: b5f1c8f6f05944d649e3fb9af5459160, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 0.8125, y: 0.5625} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!1 &750963454 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 750963455} - - component: {fileID: 750963457} - - component: {fileID: 750963456} - m_Layer: 0 - m_Name: Torso - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &750963455 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 750963454} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 1, w: 0} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1253214144} - - {fileID: 1491002916} - - {fileID: 536029550} - - {fileID: 1707109078} - - {fileID: 861836951} - m_Father: {fileID: 174433050} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} ---- !u!61 &750963456 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 750963454} - m_Enabled: 1 - serializedVersion: 3 - m_Density: 1 - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_ForceSendLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ForceReceiveLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ContactCaptureLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_CallbackLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_CompositeOperation: 0 - m_CompositeOrder: 0 - m_Offset: {x: 0, y: -0.25} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 1} - oldSize: {x: 0.0625, y: 0.5} - newSize: {x: 0.8125, y: 0.5625} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - m_Size: {x: 0.0625, y: 0.5} - m_EdgeRadius: 0 ---- !u!212 &750963457 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 750963454} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 1406629073, guid: b5f1c8f6f05944d649e3fb9af5459160, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 0.8125, y: 0.5625} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &804358384 GameObject: m_ObjectHideFlags: 0 @@ -1168,275 +255,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &861836950 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 861836951} - - component: {fileID: 861836953} - - component: {fileID: 861836952} - m_Layer: 0 - m_Name: Leg R U - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &861836951 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 861836950} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -1, w: 0} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 335357591} - m_Father: {fileID: 750963455} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} ---- !u!61 &861836952 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 861836950} - m_Enabled: 1 - serializedVersion: 3 - m_Density: 1 - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_ForceSendLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ForceReceiveLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ContactCaptureLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_CallbackLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_CompositeOperation: 0 - m_CompositeOrder: 0 - m_Offset: {x: 0, y: -0.25} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 1} - oldSize: {x: 0.0625, y: 0.5} - newSize: {x: 0.8125, y: 0.5625} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - m_Size: {x: 0.0625, y: 0.5} - m_EdgeRadius: 0 ---- !u!212 &861836953 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 861836950} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 1406629073, guid: b5f1c8f6f05944d649e3fb9af5459160, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 0.8125, y: 0.5625} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!1 &1117396099 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1117396100} - - component: {fileID: 1117396102} - - component: {fileID: 1117396101} - m_Layer: 0 - m_Name: Leg L L - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1117396100 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1117396099} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -0.5, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1707109078} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!61 &1117396101 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1117396099} - m_Enabled: 1 - serializedVersion: 3 - m_Density: 1 - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_ForceSendLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ForceReceiveLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ContactCaptureLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_CallbackLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_CompositeOperation: 0 - m_CompositeOrder: 0 - m_Offset: {x: 0, y: -0.25} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 1} - oldSize: {x: 0.0625, y: 0.5} - newSize: {x: 0.8125, y: 0.5625} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - m_Size: {x: 0.0625, y: 0.5} - m_EdgeRadius: 0 ---- !u!212 &1117396102 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1117396099} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 1406629073, guid: b5f1c8f6f05944d649e3fb9af5459160, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 0.8125, y: 0.5625} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &1178732237 GameObject: m_ObjectHideFlags: 0 @@ -13083,1045 +11901,6 @@ TilemapCollider2D: m_MaximumTileChangeCount: 1000 m_ExtrusionFactor: 0 m_UseDelaunayMesh: 0 ---- !u!1 &1253214143 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1253214144} - - component: {fileID: 1253214146} - - component: {fileID: 1253214145} - m_Layer: 0 - m_Name: Head - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1253214144 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1253214143} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -1, w: 0} - m_LocalPosition: {x: 0, y: -0.75, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 750963455} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} ---- !u!61 &1253214145 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1253214143} - m_Enabled: 1 - serializedVersion: 3 - m_Density: 1 - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_ForceSendLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ForceReceiveLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ContactCaptureLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_CallbackLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_CompositeOperation: 0 - m_CompositeOrder: 0 - m_Offset: {x: 0, y: 0} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 0.5} - oldSize: {x: 0.5, y: 0.5} - newSize: {x: 0.8125, y: 0.5625} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - m_Size: {x: 0.5, y: 0.5} - m_EdgeRadius: 0 ---- !u!212 &1253214146 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1253214143} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 7482667652216324306, guid: b5f1c8f6f05944d649e3fb9af5459160, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 0.8125, y: 0.5625} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!1 &1355961158 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1355961160} - - component: {fileID: 1355961159} - - component: {fileID: 1355961161} - - component: {fileID: 1355961162} - m_Layer: 0 - m_Name: Bones - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!95 &1355961159 -Animator: - serializedVersion: 7 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1355961158} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 8a738d31dc8884ffeb8292972ba3cff6, type: 2} - m_CullingMode: 0 - m_UpdateMode: 1 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_StabilizeFeet: 0 - m_AnimatePhysics: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorStateOnDisable: 0 - m_WriteDefaultValuesOnDisable: 0 ---- !u!4 &1355961160 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1355961158} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -2.16, y: 14.08, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 292682715} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!50 &1355961161 -Rigidbody2D: - serializedVersion: 5 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1355961158} - m_BodyType: 0 - m_Simulated: 1 - m_UseFullKinematicContacts: 0 - m_UseAutoMass: 0 - m_Mass: 1 - m_LinearDamping: 0 - m_AngularDamping: 0.05 - m_GravityScale: 1 - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_Interpolate: 1 - m_SleepingMode: 1 - m_CollisionDetection: 1 - m_Constraints: 0 ---- !u!114 &1355961162 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1355961158} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8ce1d588594ee416e9ab629d0b8c07dd, type: 3} - m_Name: - m_EditorClassIdentifier: - spawnPoint: {x: 14.08, y: 14.08} - spawnPointIsInitialPosition: 1 - respawnTag: Platformer Hazard ---- !u!1 &1399509873 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1399509874} - - component: {fileID: 1399509875} - - component: {fileID: 1399509876} - m_Layer: 0 - m_Name: Leg R L - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1399509874 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1399509873} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -0.5, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1882468358} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &1399509875 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1399509873} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 1406629073, guid: b5f1c8f6f05944d649e3fb9af5459160, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 0.8125, y: 0.5625} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!61 &1399509876 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1399509873} - m_Enabled: 1 - serializedVersion: 3 - m_Density: 1 - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_ForceSendLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ForceReceiveLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ContactCaptureLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_CallbackLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_CompositeOperation: 0 - m_CompositeOrder: 0 - m_Offset: {x: 0, y: -0.25} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 1} - oldSize: {x: 0.0625, y: 0.5} - newSize: {x: 0.8125, y: 0.5625} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - m_Size: {x: 0.0625, y: 0.5} - m_EdgeRadius: 0 ---- !u!1 &1405104009 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1405104010} - - component: {fileID: 1405104011} - - component: {fileID: 1405104012} - m_Layer: 0 - m_Name: Arm R - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1405104010 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1405104009} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -1, w: 0} - m_LocalPosition: {x: 0, y: -0.5, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 292682715} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} ---- !u!212 &1405104011 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1405104009} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 1406629073, guid: b5f1c8f6f05944d649e3fb9af5459160, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 0.8125, y: 0.5625} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!61 &1405104012 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1405104009} - m_Enabled: 1 - serializedVersion: 3 - m_Density: 1 - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_ForceSendLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ForceReceiveLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ContactCaptureLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_CallbackLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_CompositeOperation: 0 - m_CompositeOrder: 0 - m_Offset: {x: 0, y: -0.25} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 1} - oldSize: {x: 0.0625, y: 0.5} - newSize: {x: 0.8125, y: 0.5625} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - m_Size: {x: 0.0625, y: 0.5} - m_EdgeRadius: 0 ---- !u!1 &1446289253 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1446289254} - - component: {fileID: 1446289255} - - component: {fileID: 1446289256} - m_Layer: 0 - m_Name: Leg L U - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1446289254 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1446289253} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -1, w: 0} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 348042968} - m_Father: {fileID: 292682715} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} ---- !u!212 &1446289255 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1446289253} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 1406629073, guid: b5f1c8f6f05944d649e3fb9af5459160, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 0.8125, y: 0.5625} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!61 &1446289256 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1446289253} - m_Enabled: 1 - serializedVersion: 3 - m_Density: 1 - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_ForceSendLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ForceReceiveLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ContactCaptureLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_CallbackLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_CompositeOperation: 0 - m_CompositeOrder: 0 - m_Offset: {x: 0, y: -0.25} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 1} - oldSize: {x: 0.0625, y: 0.5} - newSize: {x: 0.8125, y: 0.5625} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - m_Size: {x: 0.0625, y: 0.5} - m_EdgeRadius: 0 ---- !u!1 &1491002915 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1491002916} - - component: {fileID: 1491002918} - - component: {fileID: 1491002917} - m_Layer: 0 - m_Name: Arm L - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1491002916 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1491002915} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -1, w: 0} - m_LocalPosition: {x: 0, y: -0.5, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 750963455} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} ---- !u!61 &1491002917 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1491002915} - m_Enabled: 1 - serializedVersion: 3 - m_Density: 1 - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_ForceSendLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ForceReceiveLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ContactCaptureLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_CallbackLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_CompositeOperation: 0 - m_CompositeOrder: 0 - m_Offset: {x: 0, y: -0.25} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 1} - oldSize: {x: 0.0625, y: 0.5} - newSize: {x: 0.8125, y: 0.5625} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - m_Size: {x: 0.0625, y: 0.5} - m_EdgeRadius: 0 ---- !u!212 &1491002918 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1491002915} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 1406629073, guid: b5f1c8f6f05944d649e3fb9af5459160, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 0.8125, y: 0.5625} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!1 &1674350449 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1674350450} - - component: {fileID: 1674350451} - - component: {fileID: 1674350452} - m_Layer: 0 - m_Name: Head - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1674350450 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1674350449} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -1, w: 0} - m_LocalPosition: {x: 0, y: -0.75, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 292682715} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} ---- !u!212 &1674350451 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1674350449} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 7482667652216324306, guid: b5f1c8f6f05944d649e3fb9af5459160, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 0.8125, y: 0.5625} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!61 &1674350452 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1674350449} - m_Enabled: 1 - serializedVersion: 3 - m_Density: 1 - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_ForceSendLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ForceReceiveLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ContactCaptureLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_CallbackLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_CompositeOperation: 0 - m_CompositeOrder: 0 - m_Offset: {x: 0, y: 0} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 0.5} - oldSize: {x: 0.5, y: 0.5} - newSize: {x: 0.8125, y: 0.5625} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - m_Size: {x: 0.5, y: 0.5} - m_EdgeRadius: 0 ---- !u!1 &1707109077 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1707109078} - - component: {fileID: 1707109080} - - component: {fileID: 1707109079} - m_Layer: 0 - m_Name: Leg L U - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1707109078 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1707109077} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -1, w: 0} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1117396100} - m_Father: {fileID: 750963455} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} ---- !u!61 &1707109079 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1707109077} - m_Enabled: 1 - serializedVersion: 3 - m_Density: 1 - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_ForceSendLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ForceReceiveLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ContactCaptureLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_CallbackLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_CompositeOperation: 0 - m_CompositeOrder: 0 - m_Offset: {x: 0, y: -0.25} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 1} - oldSize: {x: 0.0625, y: 0.5} - newSize: {x: 0.8125, y: 0.5625} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - m_Size: {x: 0.0625, y: 0.5} - m_EdgeRadius: 0 ---- !u!212 &1707109080 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1707109077} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 1406629073, guid: b5f1c8f6f05944d649e3fb9af5459160, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 0.8125, y: 0.5625} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &1758254987 GameObject: m_ObjectHideFlags: 0 @@ -14200,141 +11979,124 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1882468357 -GameObject: +--- !u!1001 &2084335225 +PrefabInstance: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1882468358} - - component: {fileID: 1882468359} - - component: {fileID: 1882468360} - m_Layer: 0 - m_Name: Leg R U - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1882468358 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1882468357} serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -1, w: 0} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1399509874} - m_Father: {fileID: 292682715} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} ---- !u!212 &1882468359 -SpriteRenderer: + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1375850422501237868, guid: 1fd31b88e5609482ab7e8ab16a932947, type: 3} + propertyPath: m_Name + value: Ligaments + objectReference: {fileID: 0} + - target: {fileID: 6392580824388157607, guid: 1fd31b88e5609482ab7e8ab16a932947, type: 3} + propertyPath: clip + value: + objectReference: {fileID: 7400000, guid: 93a4e7ef703974b11a664b2860f28280, type: 2} + - target: {fileID: 7009259675412950971, guid: 1fd31b88e5609482ab7e8ab16a932947, type: 3} + propertyPath: m_LocalPosition.x + value: 4.84 + objectReference: {fileID: 0} + - target: {fileID: 7009259675412950971, guid: 1fd31b88e5609482ab7e8ab16a932947, type: 3} + propertyPath: m_LocalPosition.y + value: 12.33 + objectReference: {fileID: 0} + - target: {fileID: 7009259675412950971, guid: 1fd31b88e5609482ab7e8ab16a932947, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7009259675412950971, guid: 1fd31b88e5609482ab7e8ab16a932947, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7009259675412950971, guid: 1fd31b88e5609482ab7e8ab16a932947, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7009259675412950971, guid: 1fd31b88e5609482ab7e8ab16a932947, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7009259675412950971, guid: 1fd31b88e5609482ab7e8ab16a932947, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7009259675412950971, guid: 1fd31b88e5609482ab7e8ab16a932947, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7009259675412950971, guid: 1fd31b88e5609482ab7e8ab16a932947, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7009259675412950971, guid: 1fd31b88e5609482ab7e8ab16a932947, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1fd31b88e5609482ab7e8ab16a932947, type: 3} +--- !u!1001 &2415656010711465375 +PrefabInstance: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1882468357} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 1406629073, guid: b5f1c8f6f05944d649e3fb9af5459160, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 0.8125, y: 0.5625} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!61 &1882468360 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1882468357} - m_Enabled: 1 - serializedVersion: 3 - m_Density: 1 - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_ForceSendLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ForceReceiveLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ContactCaptureLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_CallbackLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_CompositeOperation: 0 - m_CompositeOrder: 0 - m_Offset: {x: 0, y: -0.25} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 1} - oldSize: {x: 0.0625, y: 0.5} - newSize: {x: 0.8125, y: 0.5625} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - m_Size: {x: 0.0625, y: 0.5} - m_EdgeRadius: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1375850422501237868, guid: 1fd31b88e5609482ab7e8ab16a932947, type: 3} + propertyPath: m_Name + value: Bones + objectReference: {fileID: 0} + - target: {fileID: 7009259675412950971, guid: 1fd31b88e5609482ab7e8ab16a932947, type: 3} + propertyPath: m_LocalPosition.x + value: -2.16 + objectReference: {fileID: 0} + - target: {fileID: 7009259675412950971, guid: 1fd31b88e5609482ab7e8ab16a932947, type: 3} + propertyPath: m_LocalPosition.y + value: 14.08 + objectReference: {fileID: 0} + - target: {fileID: 7009259675412950971, guid: 1fd31b88e5609482ab7e8ab16a932947, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7009259675412950971, guid: 1fd31b88e5609482ab7e8ab16a932947, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7009259675412950971, guid: 1fd31b88e5609482ab7e8ab16a932947, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7009259675412950971, guid: 1fd31b88e5609482ab7e8ab16a932947, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7009259675412950971, guid: 1fd31b88e5609482ab7e8ab16a932947, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7009259675412950971, guid: 1fd31b88e5609482ab7e8ab16a932947, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7009259675412950971, guid: 1fd31b88e5609482ab7e8ab16a932947, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7009259675412950971, guid: 1fd31b88e5609482ab7e8ab16a932947, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1fd31b88e5609482ab7e8ab16a932947, type: 3} --- !u!1001 &8682934954266721942 PrefabInstance: m_ObjectHideFlags: 0 @@ -14415,6 +12177,6 @@ SceneRoots: - {fileID: 8682934954266721942} - {fileID: 322321} - {fileID: 1758254989} - - {fileID: 1355961160} - - {fileID: 174433050} + - {fileID: 2415656010711465375} + - {fileID: 2084335225} - {fileID: 804358387} From 1315bdb7dcb892a6f815a2e175366b6c715f7675 Mon Sep 17 00:00:00 2001 From: RochesterX Date: Wed, 15 Jan 2025 16:55:07 -0500 Subject: [PATCH 16/25] Animate Bones; make Bones default player --- Assets/AnimationPlayer.cs | 16 + Assets/Animations/Idle.anim | 1585 +++++++++++++++++ Assets/Animations/Idle.anim.meta | 8 + Assets/Animations/Root.controller | 125 +- Assets/Animations/Wild.anim | 742 +------- Assets/Prefabs/Bones.prefab | 164 +- Assets/Scenes/Platformer.unity | 122 +- ...merPlayerMovement.cs => PlayerMovement.cs} | 33 +- ...ovement.cs.meta => PlayerMovement.cs.meta} | 0 9 files changed, 1941 insertions(+), 854 deletions(-) create mode 100644 Assets/Animations/Idle.anim create mode 100644 Assets/Animations/Idle.anim.meta rename Assets/Scripts/{PlatformerPlayerMovement.cs => PlayerMovement.cs} (86%) rename Assets/Scripts/{PlatformerPlayerMovement.cs.meta => PlayerMovement.cs.meta} (100%) diff --git a/Assets/AnimationPlayer.cs b/Assets/AnimationPlayer.cs index 43149c5..99b29d8 100644 --- a/Assets/AnimationPlayer.cs +++ b/Assets/AnimationPlayer.cs @@ -3,6 +3,11 @@ using UnityEngine; [RequireComponent(typeof(Animator))] public class AnimationPlayer : MonoBehaviour { + public enum AnimationState { Idle, Run, Jump }; + public AnimationState state; + + public bool backwards; + public AnimationClip clip; private Animator animator; @@ -12,4 +17,15 @@ public class AnimationPlayer : MonoBehaviour animator = GetComponent(); animator.Play(clip.name); } + + private void LateUpdate() + { + animator.SetInteger("state", (int)state); + transform.localScale = new Vector3(Mathf.Sign(backwards ? -1 : 1) * Mathf.Abs(transform.localScale.x), transform.localScale.y, transform.localScale.z); + } + + public void SetState(AnimationState state) + { + this.state = state; + } } diff --git a/Assets/Animations/Idle.anim b/Assets/Animations/Idle.anim new file mode 100644 index 0000000..74bee49 --- /dev/null +++ b/Assets/Animations/Idle.anim @@ -0,0 +1,1585 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Idle + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, z: 180} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.5 + value: {x: 0, y: 0, z: 187.913} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 1 + value: {x: 0, y: 0, z: 180} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: Torso/Leg L U + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.5 + value: {x: 0, y: 0, z: -8.86} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 1 + value: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: Torso/Leg L U/Leg L L + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, z: 180} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.5 + value: {x: 0, y: 0, z: 180.762} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 1 + value: {x: 0, y: 0, z: 180} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: Torso/Leg R U + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.5 + value: {x: 0, y: 0, z: -6.442} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 1 + value: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: Torso/Leg R U/Leg R L + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, z: 180} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.5 + value: {x: 0, y: 0, z: 180.744} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 1 + value: {x: 0, y: 0, z: 180} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: Torso/Arm L + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, z: 180} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.5 + value: {x: 0, y: 0, z: 178.975} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 1 + value: {x: 0, y: 0, z: 180} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: Torso/Arm R + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, z: 180} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.5 + value: {x: 0, y: 0, z: 178.527} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 1 + value: {x: 0, y: 0, z: 180} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: Torso/Head + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.5 + value: {x: 0, y: -0.01, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 1 + value: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: Torso + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 3869152129 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 596276160 + attribute: 4 + script: {fileID: 0} + typeID: 4 + customType: 4 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 415537218 + attribute: 4 + script: {fileID: 0} + typeID: 4 + customType: 4 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 892534202 + attribute: 4 + script: {fileID: 0} + typeID: 4 + customType: 4 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 4076665333 + attribute: 4 + script: {fileID: 0} + typeID: 4 + customType: 4 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 4207337212 + attribute: 4 + script: {fileID: 0} + typeID: 4 + customType: 4 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 13231007 + attribute: 4 + script: {fileID: 0} + typeID: 4 + customType: 4 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 2146230158 + attribute: 4 + script: {fileID: 0} + typeID: 4 + customType: 4 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.x + path: Torso/Leg L U + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.y + path: Torso/Leg L U + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 180 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 187.913 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 180 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.z + path: Torso/Leg L U + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.x + path: Torso/Leg L U/Leg L L + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.y + path: Torso/Leg L U/Leg L L + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: -8.86 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.z + path: Torso/Leg L U/Leg L L + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.x + path: Torso/Leg R U + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.y + path: Torso/Leg R U + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 180 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 180.762 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 180 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.z + path: Torso/Leg R U + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.x + path: Torso/Leg R U/Leg R L + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.y + path: Torso/Leg R U/Leg R L + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: -6.442 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.z + path: Torso/Leg R U/Leg R L + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.x + path: Torso/Arm L + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.y + path: Torso/Arm L + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 180 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 180.744 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 180 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.z + path: Torso/Arm L + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.x + path: Torso/Arm R + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.y + path: Torso/Arm R + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 180 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 178.975 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 180 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.z + path: Torso/Arm R + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.x + path: Torso/Head + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.y + path: Torso/Head + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 180 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 178.527 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 180 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.z + path: Torso/Head + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: Torso + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: -0.01 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: Torso + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: Torso + classID: 4 + script: {fileID: 0} + flags: 0 + m_EulerEditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: Torso/Head + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: Torso/Head + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: Torso/Head + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: Torso/Leg L U + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: Torso/Leg L U + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: Torso/Leg L U + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: Torso/Leg L U/Leg L L + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: Torso/Leg L U/Leg L L + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: Torso/Leg L U/Leg L L + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: Torso/Arm R + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: Torso/Arm R + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: Torso/Arm R + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: Torso/Arm L + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: Torso/Arm L + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: Torso/Arm L + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: Torso/Leg R U + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: Torso/Leg R U + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: Torso/Leg R U + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: Torso/Leg R U/Leg R L + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: Torso/Leg R U/Leg R L + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: Torso/Leg R U/Leg R L + classID: 4 + script: {fileID: 0} + flags: 0 + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Animations/Idle.anim.meta b/Assets/Animations/Idle.anim.meta new file mode 100644 index 0000000..76d61e9 --- /dev/null +++ b/Assets/Animations/Idle.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2753c956d51d84998a3232a32023fb33 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/Root.controller b/Assets/Animations/Root.controller index 2bc96a9..7bea2c5 100644 --- a/Assets/Animations/Root.controller +++ b/Assets/Animations/Root.controller @@ -1,5 +1,55 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1101 &-7951230361386602773 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 6 + m_ConditionEvent: state + m_EventTreshold: 1 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 2600039493493020915} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.1 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 0 +--- !u!1101 &-7336001256458513922 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 6 + m_ConditionEvent: state + m_EventTreshold: 2 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -65348665591799820} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.2 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 0 --- !u!1107 &-1538096663108953913 AnimatorStateMachine: serializedVersion: 6 @@ -11,20 +61,51 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: 2600039493493020915} - m_Position: {x: 200, y: 0, z: 0} + m_Position: {x: 290, y: 0, z: 0} - serializedVersion: 1 m_State: {fileID: -65348665591799820} - m_Position: {x: 235, y: 65, z: 0} + m_Position: {x: 290, y: 50, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1699472617733096240} + m_Position: {x: 290, y: -50, z: 0} m_ChildStateMachines: [] - m_AnyStateTransitions: [] + m_AnyStateTransitions: + - {fileID: -7951230361386602773} + - {fileID: -325823806790880945} + - {fileID: -7336001256458513922} m_EntryTransitions: [] m_StateMachineTransitions: {} m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 50, y: 20, z: 0} - m_EntryPosition: {x: 50, y: 120, z: 0} + m_AnyStatePosition: {x: 80, y: 0, z: 0} + m_EntryPosition: {x: 540, y: 0, z: 0} m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: 2600039493493020915} +--- !u!1101 &-325823806790880945 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 6 + m_ConditionEvent: state + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1699472617733096240} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.1 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 0 --- !u!1102 &-65348665591799820 AnimatorState: serializedVersion: 6 @@ -59,7 +140,13 @@ AnimatorController: m_PrefabAsset: {fileID: 0} m_Name: Root serializedVersion: 5 - m_AnimatorParameters: [] + m_AnimatorParameters: + - m_Name: state + m_Type: 3 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -73,6 +160,32 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} +--- !u!1102 &1699472617733096240 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Idle + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 2753c956d51d84998a3232a32023fb33, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1102 &2600039493493020915 AnimatorState: serializedVersion: 6 diff --git a/Assets/Animations/Wild.anim b/Assets/Animations/Wild.anim index a97f875..30ef4bd 100644 --- a/Assets/Animations/Wild.anim +++ b/Assets/Animations/Wild.anim @@ -19,25 +19,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 0, z: 180} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.5 - value: {x: 0, y: 0, z: 0} - inSlope: {x: 0, y: 0, z: -360} - outSlope: {x: 0, y: 0, z: -360} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 1 - value: {x: 0, y: 0, z: -180} + value: {x: 0, y: 0, z: 55.596} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -53,25 +35,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 0, z: 180} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.5 - value: {x: 0, y: 0, z: 360} - inSlope: {x: 0, y: 0, z: 360} - outSlope: {x: 0, y: 0, z: 360} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 1 - value: {x: 0, y: 0, z: 540} + value: {x: 0, y: 0, z: 282.5} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -87,15 +51,6 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 0, z: 180} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.5 value: {x: 0, y: 0, z: 100.533} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -103,15 +58,6 @@ AnimationClip: weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 1 - value: {x: 0, y: 0, z: 180} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -121,15 +67,6 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 0, z: 180} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.5 value: {x: 0, y: 0, z: 256.188} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -137,15 +74,6 @@ AnimationClip: weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 1 - value: {x: 0, y: 0, z: 180} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -155,15 +83,6 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 0, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.5 value: {x: 0, y: 0, z: -139.806} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -171,15 +90,6 @@ AnimationClip: weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 1 - value: {x: 0, y: 0, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -189,15 +99,6 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 0, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.5 value: {x: 0, y: 0, z: -105.273} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -205,15 +106,6 @@ AnimationClip: weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 1 - value: {x: 0, y: 0, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -223,15 +115,6 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 0, z: 180} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.5 value: {x: 0, y: 0, z: 169.057} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -239,15 +122,6 @@ AnimationClip: weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 1 - value: {x: 0, y: 0, z: 180} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -257,15 +131,6 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 0, z: 180} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.5 value: {x: 0, y: 0, z: 158.17} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -273,15 +138,6 @@ AnimationClip: weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 1 - value: {x: 0, y: 0, z: 180} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -292,15 +148,6 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: -0.75, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.5 value: {x: -0.089, y: -0.714, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -308,15 +155,6 @@ AnimationClip: weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 1 - value: {x: 0, y: -0.75, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -418,7 +256,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1 + m_StopTime: 0 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -447,24 +285,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.5 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -486,24 +306,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.5 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -518,25 +320,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 180 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.5 - value: 0 - inSlope: -360 - outSlope: -360 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: -180 + value: 55.596 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -564,24 +348,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.5 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -603,24 +369,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.5 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -635,25 +383,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 180 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.5 - value: 360 - inSlope: 360 - outSlope: 360 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 540 + value: 282.5 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -681,24 +411,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.5 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -720,24 +432,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.5 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -752,15 +446,6 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 180 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.5 value: 100.533 inSlope: 0 outSlope: 0 @@ -768,15 +453,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 180 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -798,24 +474,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.5 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -837,24 +495,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.5 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -869,15 +509,6 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 180 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.5 value: 256.188 inSlope: 0 outSlope: 0 @@ -885,15 +516,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 180 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -915,24 +537,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.5 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -954,24 +558,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.5 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -986,15 +572,6 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.5 value: -139.806 inSlope: 0 outSlope: 0 @@ -1002,15 +579,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -1032,24 +600,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.5 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -1071,24 +621,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.5 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -1103,15 +635,6 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.5 value: -105.273 inSlope: 0 outSlope: 0 @@ -1119,15 +642,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -1149,24 +663,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.5 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -1188,24 +684,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.5 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -1220,15 +698,6 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 180 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.5 value: 169.057 inSlope: 0 outSlope: 0 @@ -1236,15 +705,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 180 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -1266,24 +726,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.5 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -1305,24 +747,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.5 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -1337,15 +761,6 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 180 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.5 value: 158.17 inSlope: 0 outSlope: 0 @@ -1353,15 +768,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 180 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -1376,15 +782,6 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.5 value: -0.089 inSlope: 0 outSlope: 0 @@ -1392,15 +789,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -1415,15 +803,6 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -0.75 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.5 value: -0.714 inSlope: 0 outSlope: 0 @@ -1431,15 +810,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: -0.75 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -1461,24 +831,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.5 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -1496,7 +848,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.z - path: Torso/Leg R U + path: Torso/Leg L U classID: 4 script: {fileID: 0} flags: 0 @@ -1508,7 +860,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.y - path: Torso/Leg R U + path: Torso/Leg L U classID: 4 script: {fileID: 0} flags: 0 @@ -1520,7 +872,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.x - path: Torso/Leg R U + path: Torso/Leg L U classID: 4 script: {fileID: 0} flags: 0 @@ -1560,42 +912,6 @@ AnimationClip: classID: 4 script: {fileID: 0} flags: 0 - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.z - path: Torso/Leg L U - classID: 4 - script: {fileID: 0} - flags: 0 - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.y - path: Torso/Leg L U - classID: 4 - script: {fileID: 0} - flags: 0 - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.x - path: Torso/Leg L U - classID: 4 - script: {fileID: 0} - flags: 0 - serializedVersion: 2 curve: serializedVersion: 2 @@ -1640,7 +956,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.z - path: Torso/Leg R U/Leg R L + path: Torso/Leg R U classID: 4 script: {fileID: 0} flags: 0 @@ -1652,7 +968,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.y - path: Torso/Leg R U/Leg R L + path: Torso/Leg R U classID: 4 script: {fileID: 0} flags: 0 @@ -1664,7 +980,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.x - path: Torso/Leg R U/Leg R L + path: Torso/Leg R U classID: 4 script: {fileID: 0} flags: 0 @@ -1740,6 +1056,42 @@ AnimationClip: classID: 4 script: {fileID: 0} flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: Torso/Leg R U/Leg R L + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: Torso/Leg R U/Leg R L + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: Torso/Leg R U/Leg R L + classID: 4 + script: {fileID: 0} + flags: 0 - serializedVersion: 2 curve: serializedVersion: 2 diff --git a/Assets/Prefabs/Bones.prefab b/Assets/Prefabs/Bones.prefab index 6acddcd..8ad2834 100644 --- a/Assets/Prefabs/Bones.prefab +++ b/Assets/Prefabs/Bones.prefab @@ -9,10 +9,13 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7009259675412950971} + - component: {fileID: 4642513082199340961} + - component: {fileID: 75167067980600170} - component: {fileID: 6392580824388157607} + - component: {fileID: 5200627265685207284} - component: {fileID: 1169583671018505929} - component: {fileID: 2344147968324054325} - - component: {fileID: 75167067980600170} + - component: {fileID: 8121950008105218343} m_Layer: 0 m_Name: Bones m_TagString: Untagged @@ -36,6 +39,51 @@ Transform: - {fileID: 7290594200745798336} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4642513082199340961 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1375850422501237868} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9b920f65db6650d4aa4858ad8a795d19, type: 3} + m_Name: + m_EditorClassIdentifier: + ground: + serializedVersion: 2 + m_Bits: 64 + walkSpeed: 5 + walkSpeedFactor: 30 + maxSpeed: 5 + virtualAxisX: 0 + virtualButtonJump: 0 + virtualButtonJumpLastFrame: 0 + turnaroundMultiplier: 2 + walkSmooth: 0.98 + secondsToFullSpeed: 0 + jumpSpeed: 17 + coyoteTime: 0.1 + jumpLenience: 0.1 + timeUnableToBeDeclaredNotJumping: 0.1 + groundCheckDistance: 0.1 + animate: 1 +--- !u!114 &75167067980600170 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1375850422501237868} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8ce1d588594ee416e9ab629d0b8c07dd, type: 3} + m_Name: + m_EditorClassIdentifier: + spawnPoint: {x: 14.08, y: 14.08} + spawnPointIsInitialPosition: 1 + respawnTag: Platformer Hazard --- !u!114 &6392580824388157607 MonoBehaviour: m_ObjectHideFlags: 0 @@ -48,7 +96,38 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6e9d01bde449c4d0fa146e06804d6a03, type: 3} m_Name: m_EditorClassIdentifier: + state: 0 clip: {fileID: 7400000, guid: 590f229c565f34c8296a875497c76553, type: 2} +--- !u!114 &5200627265685207284 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1375850422501237868} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Actions: {fileID: -944628639613478452, guid: 6cbaae0ad99590d468c8b501c0452c36, type: 3} + m_NotificationBehavior: 0 + m_UIInputModule: {fileID: 0} + m_DeviceLostEvent: + m_PersistentCalls: + m_Calls: [] + m_DeviceRegainedEvent: + m_PersistentCalls: + m_Calls: [] + m_ControlsChangedEvent: + m_PersistentCalls: + m_Calls: [] + m_ActionEvents: [] + m_NeverAutoSwitchControlSchemes: 0 + m_DefaultControlScheme: + m_DefaultActionMap: Player + m_SplitScreenIndex: -1 + m_Camera: {fileID: 0} --- !u!95 &1169583671018505929 Animator: serializedVersion: 7 @@ -97,22 +176,53 @@ Rigidbody2D: m_Interpolate: 1 m_SleepingMode: 1 m_CollisionDetection: 1 - m_Constraints: 0 ---- !u!114 &75167067980600170 -MonoBehaviour: + m_Constraints: 4 +--- !u!61 &8121950008105218343 +BoxCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1375850422501237868} m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8ce1d588594ee416e9ab629d0b8c07dd, type: 3} - m_Name: - m_EditorClassIdentifier: - spawnPoint: {x: 14.08, y: 14.08} - spawnPointIsInitialPosition: 1 - respawnTag: Platformer Hazard + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: 0.018883228} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 0.4505486, y: 1.9777327} + m_EdgeRadius: 0 --- !u!1 &1792259794085692571 GameObject: m_ObjectHideFlags: 0 @@ -139,13 +249,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1792259794085692571} serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0.053876325, w: 0.9985476} m_LocalPosition: {x: 0, y: -0.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2573475224850089075} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -6.177} --- !u!212 &7028381425298949789 SpriteRenderer: m_ObjectHideFlags: 0 @@ -208,7 +318,7 @@ BoxCollider2D: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1792259794085692571} - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 3 m_Density: 1 m_Material: {fileID: 0} @@ -347,7 +457,7 @@ BoxCollider2D: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3572452013539030063} - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 3 m_Density: 1 m_Material: {fileID: 0} @@ -412,14 +522,14 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3999993024726141628} serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -1, w: 0} + m_LocalRotation: {x: -0, y: -0, z: -0.9977668, w: 0.06679403} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1315511404573068819} m_Father: {fileID: 7290594200745798336} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 187.66} --- !u!212 &6334212293757716143 SpriteRenderer: m_ObjectHideFlags: 0 @@ -482,7 +592,7 @@ BoxCollider2D: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3999993024726141628} - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 3 m_Density: 1 m_Material: {fileID: 0} @@ -547,13 +657,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4053418163071482318} serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0.074488364, w: 0.9972219} m_LocalPosition: {x: 0, y: -0.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6473071301151420235} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -8.544} --- !u!212 &3666712602053540788 SpriteRenderer: m_ObjectHideFlags: 0 @@ -616,7 +726,7 @@ BoxCollider2D: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4053418163071482318} - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 3 m_Density: 1 m_Material: {fileID: 0} @@ -750,7 +860,7 @@ BoxCollider2D: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4559249486922240447} - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 3 m_Density: 1 m_Material: {fileID: 0} @@ -884,7 +994,7 @@ BoxCollider2D: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5246451624517682053} - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 3 m_Density: 1 m_Material: {fileID: 0} @@ -1018,7 +1128,7 @@ BoxCollider2D: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5636889232707595368} - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 3 m_Density: 1 m_Material: {fileID: 0} @@ -1083,14 +1193,14 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7131227584641296005} serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -1, w: 0} + m_LocalRotation: {x: -0, y: -0, z: -0.99996036, w: 0.008912119} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1718132792713490460} m_Father: {fileID: 7290594200745798336} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 181.021} --- !u!212 &6698132186857891945 SpriteRenderer: m_ObjectHideFlags: 0 @@ -1153,7 +1263,7 @@ BoxCollider2D: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7131227584641296005} - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 3 m_Density: 1 m_Material: {fileID: 0} diff --git a/Assets/Scenes/Platformer.unity b/Assets/Scenes/Platformer.unity index 391db79..4a0524a 100644 --- a/Assets/Scenes/Platformer.unity +++ b/Assets/Scenes/Platformer.unity @@ -230,7 +230,7 @@ MonoBehaviour: m_SingletonActionBindings: [] m_Flags: 0 m_Reference: {fileID: 0} - m_PlayerPrefab: {fileID: 6546762253351562952, guid: ebfcd0c20e648c041b2f37e0de297d69, type: 3} + m_PlayerPrefab: {fileID: 1375850422501237868, guid: 1fd31b88e5609482ab7e8ab16a932947, type: 3} m_SplitScreen: 0 m_MaintainAspectRatioInSplitScreen: 0 m_FixedNumberOfSplitScreens: -1 @@ -11979,124 +11979,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &2084335225 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 1375850422501237868, guid: 1fd31b88e5609482ab7e8ab16a932947, type: 3} - propertyPath: m_Name - value: Ligaments - objectReference: {fileID: 0} - - target: {fileID: 6392580824388157607, guid: 1fd31b88e5609482ab7e8ab16a932947, type: 3} - propertyPath: clip - value: - objectReference: {fileID: 7400000, guid: 93a4e7ef703974b11a664b2860f28280, type: 2} - - target: {fileID: 7009259675412950971, guid: 1fd31b88e5609482ab7e8ab16a932947, type: 3} - propertyPath: m_LocalPosition.x - value: 4.84 - objectReference: {fileID: 0} - - target: {fileID: 7009259675412950971, guid: 1fd31b88e5609482ab7e8ab16a932947, type: 3} - propertyPath: m_LocalPosition.y - value: 12.33 - objectReference: {fileID: 0} - - target: {fileID: 7009259675412950971, guid: 1fd31b88e5609482ab7e8ab16a932947, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7009259675412950971, guid: 1fd31b88e5609482ab7e8ab16a932947, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7009259675412950971, guid: 1fd31b88e5609482ab7e8ab16a932947, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7009259675412950971, guid: 1fd31b88e5609482ab7e8ab16a932947, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7009259675412950971, guid: 1fd31b88e5609482ab7e8ab16a932947, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7009259675412950971, guid: 1fd31b88e5609482ab7e8ab16a932947, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7009259675412950971, guid: 1fd31b88e5609482ab7e8ab16a932947, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7009259675412950971, guid: 1fd31b88e5609482ab7e8ab16a932947, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 1fd31b88e5609482ab7e8ab16a932947, type: 3} ---- !u!1001 &2415656010711465375 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 1375850422501237868, guid: 1fd31b88e5609482ab7e8ab16a932947, type: 3} - propertyPath: m_Name - value: Bones - objectReference: {fileID: 0} - - target: {fileID: 7009259675412950971, guid: 1fd31b88e5609482ab7e8ab16a932947, type: 3} - propertyPath: m_LocalPosition.x - value: -2.16 - objectReference: {fileID: 0} - - target: {fileID: 7009259675412950971, guid: 1fd31b88e5609482ab7e8ab16a932947, type: 3} - propertyPath: m_LocalPosition.y - value: 14.08 - objectReference: {fileID: 0} - - target: {fileID: 7009259675412950971, guid: 1fd31b88e5609482ab7e8ab16a932947, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7009259675412950971, guid: 1fd31b88e5609482ab7e8ab16a932947, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7009259675412950971, guid: 1fd31b88e5609482ab7e8ab16a932947, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7009259675412950971, guid: 1fd31b88e5609482ab7e8ab16a932947, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7009259675412950971, guid: 1fd31b88e5609482ab7e8ab16a932947, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7009259675412950971, guid: 1fd31b88e5609482ab7e8ab16a932947, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7009259675412950971, guid: 1fd31b88e5609482ab7e8ab16a932947, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7009259675412950971, guid: 1fd31b88e5609482ab7e8ab16a932947, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 1fd31b88e5609482ab7e8ab16a932947, type: 3} --- !u!1001 &8682934954266721942 PrefabInstance: m_ObjectHideFlags: 0 @@ -12177,6 +12059,4 @@ SceneRoots: - {fileID: 8682934954266721942} - {fileID: 322321} - {fileID: 1758254989} - - {fileID: 2415656010711465375} - - {fileID: 2084335225} - {fileID: 804358387} diff --git a/Assets/Scripts/PlatformerPlayerMovement.cs b/Assets/Scripts/PlayerMovement.cs similarity index 86% rename from Assets/Scripts/PlatformerPlayerMovement.cs rename to Assets/Scripts/PlayerMovement.cs index 252e00b..4332d84 100644 --- a/Assets/Scripts/PlatformerPlayerMovement.cs +++ b/Assets/Scripts/PlayerMovement.cs @@ -1,14 +1,10 @@ using System.Collections; -using System.Collections.Generic; -using UnityEditor; using UnityEngine; -using UnityEngine.Animations; using UnityEngine.InputSystem; +using UnityEngine.Tilemaps; public class PlayerMovement : MonoBehaviour { - public string player; - [Header("Ground Layers")] public LayerMask ground; @@ -42,6 +38,9 @@ public class PlayerMovement : MonoBehaviour private float lastTimeOnGround; + public bool animate; + private AnimationPlayer animationPlayer; + private Vector3 positionLastFrame; void Start() @@ -51,6 +50,7 @@ public class PlayerMovement : MonoBehaviour body = GetComponent(); collide = GetComponent(); input = GetComponent(); + if (animate) animationPlayer = GetComponent(); } private void Update() @@ -69,6 +69,29 @@ public class PlayerMovement : MonoBehaviour Land(); } + private void LateUpdate() + { + if (animate) Animate(); + } + + private void Animate() + { + if (!IsPhysicallyGrounded()) + animationPlayer.SetState(AnimationPlayer.AnimationState.Jump); + else + { + if (Mathf.Abs(body.linearVelocityX) >= 0.1f) + animationPlayer.SetState(AnimationPlayer.AnimationState.Run); + else + animationPlayer.SetState(AnimationPlayer.AnimationState.Idle); + } + + if (body.linearVelocityX < 0) + animationPlayer.backwards = true; + else if (body.linearVelocityX > 0) + animationPlayer.backwards = false; + } + private void Land() { if (body.linearVelocity.y >= 0f) return; diff --git a/Assets/Scripts/PlatformerPlayerMovement.cs.meta b/Assets/Scripts/PlayerMovement.cs.meta similarity index 100% rename from Assets/Scripts/PlatformerPlayerMovement.cs.meta rename to Assets/Scripts/PlayerMovement.cs.meta From 4623583ffdad7d0de564e1ce572dd2679484f3b1 Mon Sep 17 00:00:00 2001 From: RochesterX Date: Fri, 17 Jan 2025 09:40:48 -0500 Subject: [PATCH 17/25] Reimplement player joining --- .../Input System/Global Actions.inputactions | 622 ++++++++++++++++++ ....meta => Global Actions.inputactions.meta} | 0 ...tactions => Player 2 Actions.inputactions} | 156 +---- .../Player 2 Actions.inputactions.meta | 14 + Assets/Scenes/Platformer.unity | 4 +- Assets/Scripts/PlayerManager.cs | 26 + Assets/Scripts/PlayerMovement.cs | 4 +- 7 files changed, 681 insertions(+), 145 deletions(-) create mode 100644 Assets/Input System/Global Actions.inputactions rename Assets/Input System/{InputSystem_Actions.inputactions.meta => Global Actions.inputactions.meta} (100%) rename Assets/Input System/{InputSystem_Actions.inputactions => Player 2 Actions.inputactions} (82%) create mode 100644 Assets/Input System/Player 2 Actions.inputactions.meta diff --git a/Assets/Input System/Global Actions.inputactions b/Assets/Input System/Global Actions.inputactions new file mode 100644 index 0000000..e0c4e09 --- /dev/null +++ b/Assets/Input System/Global Actions.inputactions @@ -0,0 +1,622 @@ +{ + "name": "Global Actions", + "maps": [ + { + "name": "Player", + "id": "df70fa95-8a34-4494-b137-73ab6b9c7d37", + "actions": [ + { + "name": "Join Player", + "type": "Button", + "id": "ef1cc6a9-3786-49b2-a1e8-a0b7e80d307c", + "expectedControlType": "", + "processors": "", + "interactions": "", + "initialStateCheck": false + } + ], + "bindings": [ + { + "name": "", + "id": "126309a2-1150-49a1-8554-2ab7ac5e5bb7", + "path": "/enter", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Join Player", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "9e1b26cf-c0f1-48cb-bcb0-30b8da1cdaf2", + "path": "/start", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Join Player", + "isComposite": false, + "isPartOfComposite": false + } + ] + }, + { + "name": "UI", + "id": "272f6d14-89ba-496f-b7ff-215263d3219f", + "actions": [ + { + "name": "Navigate", + "type": "PassThrough", + "id": "c95b2375-e6d9-4b88-9c4c-c5e76515df4b", + "expectedControlType": "Vector2", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "Submit", + "type": "Button", + "id": "7607c7b6-cd76-4816-beef-bd0341cfe950", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "Cancel", + "type": "Button", + "id": "15cef263-9014-4fd5-94d9-4e4a6234a6ef", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "Point", + "type": "PassThrough", + "id": "32b35790-4ed0-4e9a-aa41-69ac6d629449", + "expectedControlType": "Vector2", + "processors": "", + "interactions": "", + "initialStateCheck": true + }, + { + "name": "Click", + "type": "PassThrough", + "id": "3c7022bf-7922-4f7c-a998-c437916075ad", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": true + }, + { + "name": "RightClick", + "type": "PassThrough", + "id": "44b200b1-1557-4083-816c-b22cbdf77ddf", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "MiddleClick", + "type": "PassThrough", + "id": "dad70c86-b58c-4b17-88ad-f5e53adf419e", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "ScrollWheel", + "type": "PassThrough", + "id": "0489e84a-4833-4c40-bfae-cea84b696689", + "expectedControlType": "Vector2", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "TrackedDevicePosition", + "type": "PassThrough", + "id": "24908448-c609-4bc3-a128-ea258674378a", + "expectedControlType": "Vector3", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "TrackedDeviceOrientation", + "type": "PassThrough", + "id": "9caa3d8a-6b2f-4e8e-8bad-6ede561bd9be", + "expectedControlType": "Quaternion", + "processors": "", + "interactions": "", + "initialStateCheck": false + } + ], + "bindings": [ + { + "name": "Gamepad", + "id": "809f371f-c5e2-4e7a-83a1-d867598f40dd", + "path": "2DVector", + "interactions": "", + "processors": "", + "groups": "", + "action": "Navigate", + "isComposite": true, + "isPartOfComposite": false + }, + { + "name": "up", + "id": "14a5d6e8-4aaf-4119-a9ef-34b8c2c548bf", + "path": "/leftStick/up", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "up", + "id": "9144cbe6-05e1-4687-a6d7-24f99d23dd81", + "path": "/rightStick/up", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "down", + "id": "2db08d65-c5fb-421b-983f-c71163608d67", + "path": "/leftStick/down", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "down", + "id": "58748904-2ea9-4a80-8579-b500e6a76df8", + "path": "/rightStick/down", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "left", + "id": "8ba04515-75aa-45de-966d-393d9bbd1c14", + "path": "/leftStick/left", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "left", + "id": "712e721c-bdfb-4b23-a86c-a0d9fcfea921", + "path": "/rightStick/left", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "right", + "id": "fcd248ae-a788-4676-a12e-f4d81205600b", + "path": "/leftStick/right", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "right", + "id": "1f04d9bc-c50b-41a1-bfcc-afb75475ec20", + "path": "/rightStick/right", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "", + "id": "fb8277d4-c5cd-4663-9dc7-ee3f0b506d90", + "path": "/dpad", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "Joystick", + "id": "e25d9774-381c-4a61-b47c-7b6b299ad9f9", + "path": "2DVector", + "interactions": "", + "processors": "", + "groups": "", + "action": "Navigate", + "isComposite": true, + "isPartOfComposite": false + }, + { + "name": "up", + "id": "3db53b26-6601-41be-9887-63ac74e79d19", + "path": "/stick/up", + "interactions": "", + "processors": "", + "groups": "Joystick", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "down", + "id": "0cb3e13e-3d90-4178-8ae6-d9c5501d653f", + "path": "/stick/down", + "interactions": "", + "processors": "", + "groups": "Joystick", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "left", + "id": "0392d399-f6dd-4c82-8062-c1e9c0d34835", + "path": "/stick/left", + "interactions": "", + "processors": "", + "groups": "Joystick", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "right", + "id": "942a66d9-d42f-43d6-8d70-ecb4ba5363bc", + "path": "/stick/right", + "interactions": "", + "processors": "", + "groups": "Joystick", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "Keyboard", + "id": "ff527021-f211-4c02-933e-5976594c46ed", + "path": "2DVector", + "interactions": "", + "processors": "", + "groups": "", + "action": "Navigate", + "isComposite": true, + "isPartOfComposite": false + }, + { + "name": "up", + "id": "563fbfdd-0f09-408d-aa75-8642c4f08ef0", + "path": "/w", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "up", + "id": "eb480147-c587-4a33-85ed-eb0ab9942c43", + "path": "/upArrow", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "down", + "id": "2bf42165-60bc-42ca-8072-8c13ab40239b", + "path": "/s", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "down", + "id": "85d264ad-e0a0-4565-b7ff-1a37edde51ac", + "path": "/downArrow", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "left", + "id": "74214943-c580-44e4-98eb-ad7eebe17902", + "path": "/a", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "left", + "id": "cea9b045-a000-445b-95b8-0c171af70a3b", + "path": "/leftArrow", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "right", + "id": "8607c725-d935-4808-84b1-8354e29bab63", + "path": "/d", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "right", + "id": "4cda81dc-9edd-4e03-9d7c-a71a14345d0b", + "path": "/rightArrow", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "", + "id": "9e92bb26-7e3b-4ec4-b06b-3c8f8e498ddc", + "path": "*/{Submit}", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse;Gamepad;Touch;Joystick;XR", + "action": "Submit", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "82627dcc-3b13-4ba9-841d-e4b746d6553e", + "path": "*/{Cancel}", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse;Gamepad;Touch;Joystick;XR", + "action": "Cancel", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "c52c8e0b-8179-41d3-b8a1-d149033bbe86", + "path": "/position", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Point", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "e1394cbc-336e-44ce-9ea8-6007ed6193f7", + "path": "/position", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Point", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "5693e57a-238a-46ed-b5ae-e64e6e574302", + "path": "/touch*/position", + "interactions": "", + "processors": "", + "groups": "Touch", + "action": "Point", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "4faf7dc9-b979-4210-aa8c-e808e1ef89f5", + "path": "/leftButton", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Click", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "8d66d5ba-88d7-48e6-b1cd-198bbfef7ace", + "path": "/tip", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Click", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "47c2a644-3ebc-4dae-a106-589b7ca75b59", + "path": "/touch*/press", + "interactions": "", + "processors": "", + "groups": "Touch", + "action": "Click", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "bb9e6b34-44bf-4381-ac63-5aa15d19f677", + "path": "/trigger", + "interactions": "", + "processors": "", + "groups": "XR", + "action": "Click", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "38c99815-14ea-4617-8627-164d27641299", + "path": "/scroll", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "ScrollWheel", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "4c191405-5738-4d4b-a523-c6a301dbf754", + "path": "/rightButton", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "RightClick", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "24066f69-da47-44f3-a07e-0015fb02eb2e", + "path": "/middleButton", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "MiddleClick", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "7236c0d9-6ca3-47cf-a6ee-a97f5b59ea77", + "path": "/devicePosition", + "interactions": "", + "processors": "", + "groups": "XR", + "action": "TrackedDevicePosition", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "23e01e3a-f935-4948-8d8b-9bcac77714fb", + "path": "/deviceRotation", + "interactions": "", + "processors": "", + "groups": "XR", + "action": "TrackedDeviceOrientation", + "isComposite": false, + "isPartOfComposite": false + } + ] + } + ], + "controlSchemes": [ + { + "name": "Keyboard&Mouse", + "bindingGroup": "Keyboard&Mouse", + "devices": [ + { + "devicePath": "", + "isOptional": false, + "isOR": false + }, + { + "devicePath": "", + "isOptional": false, + "isOR": false + } + ] + }, + { + "name": "Gamepad", + "bindingGroup": "Gamepad", + "devices": [ + { + "devicePath": "", + "isOptional": false, + "isOR": false + } + ] + }, + { + "name": "Touch", + "bindingGroup": "Touch", + "devices": [ + { + "devicePath": "", + "isOptional": false, + "isOR": false + } + ] + }, + { + "name": "Joystick", + "bindingGroup": "Joystick", + "devices": [ + { + "devicePath": "", + "isOptional": false, + "isOR": false + } + ] + }, + { + "name": "XR", + "bindingGroup": "XR", + "devices": [ + { + "devicePath": "", + "isOptional": false, + "isOR": false + } + ] + } + ] +} \ No newline at end of file diff --git a/Assets/Input System/InputSystem_Actions.inputactions.meta b/Assets/Input System/Global Actions.inputactions.meta similarity index 100% rename from Assets/Input System/InputSystem_Actions.inputactions.meta rename to Assets/Input System/Global Actions.inputactions.meta diff --git a/Assets/Input System/InputSystem_Actions.inputactions b/Assets/Input System/Player 2 Actions.inputactions similarity index 82% rename from Assets/Input System/InputSystem_Actions.inputactions rename to Assets/Input System/Player 2 Actions.inputactions index 1a41878..5e71a39 100644 --- a/Assets/Input System/InputSystem_Actions.inputactions +++ b/Assets/Input System/Player 2 Actions.inputactions @@ -1,12 +1,12 @@ { - "name": "InputSystem_Actions", + "name": "Player 2 Actions", "maps": [ { "name": "Player", "id": "df70fa95-8a34-4494-b137-73ab6b9c7d37", "actions": [ { - "name": "Player 1 Move", + "name": "Move", "type": "Value", "id": "351f2ccd-1f9f-44bf-9bec-d62ac5c5f408", "expectedControlType": "Vector2", @@ -15,207 +15,79 @@ "initialStateCheck": true }, { - "name": "Player 2 Move", - "type": "Value", - "id": "c76e95e7-c558-47cc-a7bd-93f9ad6eba7f", - "expectedControlType": "Vector2", - "processors": "", - "interactions": "", - "initialStateCheck": true - }, - { - "name": "Player 1 Action", + "name": "Action", "type": "Button", "id": "6c333d17-3450-4446-b7e0-a49595f68ba7", "expectedControlType": "", "processors": "", "interactions": "", "initialStateCheck": false - }, - { - "name": "Player 2 Action", - "type": "Button", - "id": "76071948-d107-4fd7-9e4a-196dda4c8871", - "expectedControlType": "", - "processors": "", - "interactions": "", - "initialStateCheck": false } ], "bindings": [ { - "name": "", - "id": "978bfe49-cc26-4a3d-ab7b-7d7a29327403", - "path": "/leftStick", - "interactions": "", - "processors": "", - "groups": ";Gamepad", - "action": "Player 1 Move", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "WASD", + "name": "D-Pad", "id": "00ca640b-d935-4593-8157-c05846ea39b3", "path": "Dpad", "interactions": "", "processors": "", "groups": "", - "action": "Player 1 Move", + "action": "Move", "isComposite": true, "isPartOfComposite": false }, { "name": "up", "id": "e2062cb9-1b15-46a2-838c-2f8d72a0bdd9", - "path": "/w", + "path": "/upArrow", "interactions": "", "processors": "", "groups": ";Keyboard&Mouse", - "action": "Player 1 Move", + "action": "Move", "isComposite": false, "isPartOfComposite": true }, { "name": "down", "id": "320bffee-a40b-4347-ac70-c210eb8bc73a", - "path": "/s", + "path": "/downArrow", "interactions": "", "processors": "", "groups": ";Keyboard&Mouse", - "action": "Player 1 Move", + "action": "Move", "isComposite": false, "isPartOfComposite": true }, { "name": "left", "id": "d2581a9b-1d11-4566-b27d-b92aff5fabbc", - "path": "/a", + "path": "/leftArrow", "interactions": "", "processors": "", "groups": ";Keyboard&Mouse", - "action": "Player 1 Move", + "action": "Move", "isComposite": false, "isPartOfComposite": true }, { "name": "right", "id": "fcfe95b8-67b9-4526-84b5-5d0bc98d6400", - "path": "/d", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "Player 1 Move", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "", - "id": "1635d3fe-58b6-4ba9-a4e2-f4b964f6b5c8", - "path": "/{Primary2DAxis}", - "interactions": "", - "processors": "", - "groups": "XR", - "action": "Player 1 Move", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "b8b0405a-1eaa-4be8-8a20-7358c20c2ec3", - "path": "/rightStick", - "interactions": "", - "processors": "", - "groups": ";Gamepad", - "action": "Player 2 Move", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "Arrow Keys", - "id": "e957ec01-13b2-4284-a59c-3b7a2d0a5923", - "path": "Dpad", - "interactions": "", - "processors": "", - "groups": "", - "action": "Player 2 Move", - "isComposite": true, - "isPartOfComposite": false - }, - { - "name": "up", - "id": "4af1d2bb-197b-49e3-a944-245927131501", - "path": "/upArrow", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "Player 2 Move", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "down", - "id": "169ba39e-4240-47ee-9c27-e11f3d7173db", - "path": "/downArrow", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "Player 2 Move", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "left", - "id": "be9ced23-2090-47a6-b377-e2f75339e846", - "path": "/leftArrow", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "Player 2 Move", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "right", - "id": "24e88854-20ad-469a-a3df-85306fff2b19", "path": "/rightArrow", "interactions": "", "processors": "", "groups": ";Keyboard&Mouse", - "action": "Player 2 Move", + "action": "Move", "isComposite": false, "isPartOfComposite": true }, - { - "name": "", - "id": "fb5572f1-5733-47da-bd9d-bd8e0073784c", - "path": "/{Primary2DAxis}", - "interactions": "", - "processors": "", - "groups": "XR", - "action": "Player 2 Move", - "isComposite": false, - "isPartOfComposite": false - }, { "name": "", "id": "6f8632d2-312f-4559-8fdd-d17a3c226436", - "path": "/e", - "interactions": "", - "processors": "", - "groups": "", - "action": "Player 1 Action", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "55c1ccb7-7241-49e2-8cda-4758f50156f1", "path": "/space", "interactions": "", "processors": "", - "groups": "", - "action": "Player 2 Action", + "groups": ";Keyboard&Mouse", + "action": "Action", "isComposite": false, "isPartOfComposite": false } diff --git a/Assets/Input System/Player 2 Actions.inputactions.meta b/Assets/Input System/Player 2 Actions.inputactions.meta new file mode 100644 index 0000000..0790ceb --- /dev/null +++ b/Assets/Input System/Player 2 Actions.inputactions.meta @@ -0,0 +1,14 @@ +fileFormatVersion: 2 +guid: 66bf446e230994f6cb8817e4943f9adf +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 8404be70184654265930450def6a9037, type: 3} + generateWrapperCode: 0 + wrapperCodePath: + wrapperClassName: + wrapperCodeNamespace: diff --git a/Assets/Scenes/Platformer.unity b/Assets/Scenes/Platformer.unity index 4a0524a..4346c94 100644 --- a/Assets/Scenes/Platformer.unity +++ b/Assets/Scenes/Platformer.unity @@ -196,6 +196,8 @@ MonoBehaviour: m_EditorClassIdentifier: players: [] spawnPosition: {x: -2, y: 15} + playerActions: {fileID: -944628639613478452, guid: 6cbaae0ad99590d468c8b501c0452c36, type: 3} + player2Actions: {fileID: -944628639613478452, guid: 66bf446e230994f6cb8817e4943f9adf, type: 3} --- !u!114 &804358386 MonoBehaviour: m_ObjectHideFlags: 0 @@ -211,7 +213,7 @@ MonoBehaviour: m_NotificationBehavior: 0 m_MaxPlayerCount: -1 m_AllowJoining: 1 - m_JoinBehavior: 0 + m_JoinBehavior: 2 m_PlayerJoinedEvent: m_PersistentCalls: m_Calls: [] diff --git a/Assets/Scripts/PlayerManager.cs b/Assets/Scripts/PlayerManager.cs index 07175ae..cc2cd5a 100644 --- a/Assets/Scripts/PlayerManager.cs +++ b/Assets/Scripts/PlayerManager.cs @@ -1,4 +1,5 @@ using System.Collections.Generic; +using NUnit.Framework.Constraints; using UnityEngine; using UnityEngine.InputSystem; @@ -8,6 +9,11 @@ public class PlayerManager : MonoBehaviour public List players; [SerializeField] private Vector2 spawnPosition; + [SerializeField] private InputActionAsset playerActions; + + + [Header("Debug")] + [SerializeField] private InputActionAsset player2Actions; private PlayerCameraMovement playerCamera; @@ -24,6 +30,19 @@ public class PlayerManager : MonoBehaviour playerCamera = FindFirstObjectByType(); } + private void Update() + { + if (InputSystem.actions.FindAction("Join Player").WasPressedThisFrame()) + { + JoinPlayer(playerActions); + } + + if (Keyboard.current.periodKey.wasPressedThisFrame) + { + JoinPlayer(player2Actions); + } + } + private void OnPlayerJoined(PlayerInput playerInput) { playerInput.transform.position = spawnPosition; @@ -49,4 +68,11 @@ public class PlayerManager : MonoBehaviour print("A PlayerManager already exists."); } } + + private void JoinPlayer(InputActionAsset actions) + { + PlayerInput player = GetComponent().JoinPlayer(-1, -1, null, Keyboard.current); + print(player == null); + player.actions = actions; + } } diff --git a/Assets/Scripts/PlayerMovement.cs b/Assets/Scripts/PlayerMovement.cs index 4332d84..9210873 100644 --- a/Assets/Scripts/PlayerMovement.cs +++ b/Assets/Scripts/PlayerMovement.cs @@ -86,9 +86,9 @@ public class PlayerMovement : MonoBehaviour animationPlayer.SetState(AnimationPlayer.AnimationState.Idle); } - if (body.linearVelocityX < 0) + if (body.linearVelocityX < -0.1f) animationPlayer.backwards = true; - else if (body.linearVelocityX > 0) + else if (body.linearVelocityX > 0.1f) animationPlayer.backwards = false; } From 79e3d3f3019de7eba92d5db11045f8979b8511e7 Mon Sep 17 00:00:00 2001 From: RochesterX Date: Fri, 17 Jan 2025 10:57:29 -0500 Subject: [PATCH 18/25] Update global input actions and rework player joining --- .../Input System/Global Actions.inputactions | 555 +------------- .../Player 2 Actions.inputactions | 675 ------------------ .../Player 2 Actions.inputactions.meta | 14 - .../Input System/Player Actions.inputactions | 31 + Assets/Scenes/Platformer.unity | 8 +- Assets/{ => Scripts}/AnimationPlayer.cs | 0 Assets/{ => Scripts}/AnimationPlayer.cs.meta | 0 Assets/Scripts/PlayerManager.cs | 20 - 8 files changed, 38 insertions(+), 1265 deletions(-) delete mode 100644 Assets/Input System/Player 2 Actions.inputactions delete mode 100644 Assets/Input System/Player 2 Actions.inputactions.meta rename Assets/{ => Scripts}/AnimationPlayer.cs (100%) rename Assets/{ => Scripts}/AnimationPlayer.cs.meta (100%) diff --git a/Assets/Input System/Global Actions.inputactions b/Assets/Input System/Global Actions.inputactions index e0c4e09..37fbe2e 100644 --- a/Assets/Input System/Global Actions.inputactions +++ b/Assets/Input System/Global Actions.inputactions @@ -2,559 +2,10 @@ "name": "Global Actions", "maps": [ { - "name": "Player", + "name": "Global", "id": "df70fa95-8a34-4494-b137-73ab6b9c7d37", - "actions": [ - { - "name": "Join Player", - "type": "Button", - "id": "ef1cc6a9-3786-49b2-a1e8-a0b7e80d307c", - "expectedControlType": "", - "processors": "", - "interactions": "", - "initialStateCheck": false - } - ], - "bindings": [ - { - "name": "", - "id": "126309a2-1150-49a1-8554-2ab7ac5e5bb7", - "path": "/enter", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "Join Player", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "9e1b26cf-c0f1-48cb-bcb0-30b8da1cdaf2", - "path": "/start", - "interactions": "", - "processors": "", - "groups": ";Gamepad", - "action": "Join Player", - "isComposite": false, - "isPartOfComposite": false - } - ] - }, - { - "name": "UI", - "id": "272f6d14-89ba-496f-b7ff-215263d3219f", - "actions": [ - { - "name": "Navigate", - "type": "PassThrough", - "id": "c95b2375-e6d9-4b88-9c4c-c5e76515df4b", - "expectedControlType": "Vector2", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, - { - "name": "Submit", - "type": "Button", - "id": "7607c7b6-cd76-4816-beef-bd0341cfe950", - "expectedControlType": "Button", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, - { - "name": "Cancel", - "type": "Button", - "id": "15cef263-9014-4fd5-94d9-4e4a6234a6ef", - "expectedControlType": "Button", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, - { - "name": "Point", - "type": "PassThrough", - "id": "32b35790-4ed0-4e9a-aa41-69ac6d629449", - "expectedControlType": "Vector2", - "processors": "", - "interactions": "", - "initialStateCheck": true - }, - { - "name": "Click", - "type": "PassThrough", - "id": "3c7022bf-7922-4f7c-a998-c437916075ad", - "expectedControlType": "Button", - "processors": "", - "interactions": "", - "initialStateCheck": true - }, - { - "name": "RightClick", - "type": "PassThrough", - "id": "44b200b1-1557-4083-816c-b22cbdf77ddf", - "expectedControlType": "Button", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, - { - "name": "MiddleClick", - "type": "PassThrough", - "id": "dad70c86-b58c-4b17-88ad-f5e53adf419e", - "expectedControlType": "Button", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, - { - "name": "ScrollWheel", - "type": "PassThrough", - "id": "0489e84a-4833-4c40-bfae-cea84b696689", - "expectedControlType": "Vector2", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, - { - "name": "TrackedDevicePosition", - "type": "PassThrough", - "id": "24908448-c609-4bc3-a128-ea258674378a", - "expectedControlType": "Vector3", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, - { - "name": "TrackedDeviceOrientation", - "type": "PassThrough", - "id": "9caa3d8a-6b2f-4e8e-8bad-6ede561bd9be", - "expectedControlType": "Quaternion", - "processors": "", - "interactions": "", - "initialStateCheck": false - } - ], - "bindings": [ - { - "name": "Gamepad", - "id": "809f371f-c5e2-4e7a-83a1-d867598f40dd", - "path": "2DVector", - "interactions": "", - "processors": "", - "groups": "", - "action": "Navigate", - "isComposite": true, - "isPartOfComposite": false - }, - { - "name": "up", - "id": "14a5d6e8-4aaf-4119-a9ef-34b8c2c548bf", - "path": "/leftStick/up", - "interactions": "", - "processors": "", - "groups": ";Gamepad", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "up", - "id": "9144cbe6-05e1-4687-a6d7-24f99d23dd81", - "path": "/rightStick/up", - "interactions": "", - "processors": "", - "groups": ";Gamepad", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "down", - "id": "2db08d65-c5fb-421b-983f-c71163608d67", - "path": "/leftStick/down", - "interactions": "", - "processors": "", - "groups": ";Gamepad", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "down", - "id": "58748904-2ea9-4a80-8579-b500e6a76df8", - "path": "/rightStick/down", - "interactions": "", - "processors": "", - "groups": ";Gamepad", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "left", - "id": "8ba04515-75aa-45de-966d-393d9bbd1c14", - "path": "/leftStick/left", - "interactions": "", - "processors": "", - "groups": ";Gamepad", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "left", - "id": "712e721c-bdfb-4b23-a86c-a0d9fcfea921", - "path": "/rightStick/left", - "interactions": "", - "processors": "", - "groups": ";Gamepad", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "right", - "id": "fcd248ae-a788-4676-a12e-f4d81205600b", - "path": "/leftStick/right", - "interactions": "", - "processors": "", - "groups": ";Gamepad", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "right", - "id": "1f04d9bc-c50b-41a1-bfcc-afb75475ec20", - "path": "/rightStick/right", - "interactions": "", - "processors": "", - "groups": ";Gamepad", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "", - "id": "fb8277d4-c5cd-4663-9dc7-ee3f0b506d90", - "path": "/dpad", - "interactions": "", - "processors": "", - "groups": ";Gamepad", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "Joystick", - "id": "e25d9774-381c-4a61-b47c-7b6b299ad9f9", - "path": "2DVector", - "interactions": "", - "processors": "", - "groups": "", - "action": "Navigate", - "isComposite": true, - "isPartOfComposite": false - }, - { - "name": "up", - "id": "3db53b26-6601-41be-9887-63ac74e79d19", - "path": "/stick/up", - "interactions": "", - "processors": "", - "groups": "Joystick", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "down", - "id": "0cb3e13e-3d90-4178-8ae6-d9c5501d653f", - "path": "/stick/down", - "interactions": "", - "processors": "", - "groups": "Joystick", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "left", - "id": "0392d399-f6dd-4c82-8062-c1e9c0d34835", - "path": "/stick/left", - "interactions": "", - "processors": "", - "groups": "Joystick", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "right", - "id": "942a66d9-d42f-43d6-8d70-ecb4ba5363bc", - "path": "/stick/right", - "interactions": "", - "processors": "", - "groups": "Joystick", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "Keyboard", - "id": "ff527021-f211-4c02-933e-5976594c46ed", - "path": "2DVector", - "interactions": "", - "processors": "", - "groups": "", - "action": "Navigate", - "isComposite": true, - "isPartOfComposite": false - }, - { - "name": "up", - "id": "563fbfdd-0f09-408d-aa75-8642c4f08ef0", - "path": "/w", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "up", - "id": "eb480147-c587-4a33-85ed-eb0ab9942c43", - "path": "/upArrow", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "down", - "id": "2bf42165-60bc-42ca-8072-8c13ab40239b", - "path": "/s", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "down", - "id": "85d264ad-e0a0-4565-b7ff-1a37edde51ac", - "path": "/downArrow", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "left", - "id": "74214943-c580-44e4-98eb-ad7eebe17902", - "path": "/a", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "left", - "id": "cea9b045-a000-445b-95b8-0c171af70a3b", - "path": "/leftArrow", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "right", - "id": "8607c725-d935-4808-84b1-8354e29bab63", - "path": "/d", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "right", - "id": "4cda81dc-9edd-4e03-9d7c-a71a14345d0b", - "path": "/rightArrow", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "", - "id": "9e92bb26-7e3b-4ec4-b06b-3c8f8e498ddc", - "path": "*/{Submit}", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse;Gamepad;Touch;Joystick;XR", - "action": "Submit", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "82627dcc-3b13-4ba9-841d-e4b746d6553e", - "path": "*/{Cancel}", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse;Gamepad;Touch;Joystick;XR", - "action": "Cancel", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "c52c8e0b-8179-41d3-b8a1-d149033bbe86", - "path": "/position", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Point", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "e1394cbc-336e-44ce-9ea8-6007ed6193f7", - "path": "/position", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Point", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "5693e57a-238a-46ed-b5ae-e64e6e574302", - "path": "/touch*/position", - "interactions": "", - "processors": "", - "groups": "Touch", - "action": "Point", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "4faf7dc9-b979-4210-aa8c-e808e1ef89f5", - "path": "/leftButton", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "Click", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "8d66d5ba-88d7-48e6-b1cd-198bbfef7ace", - "path": "/tip", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "Click", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "47c2a644-3ebc-4dae-a106-589b7ca75b59", - "path": "/touch*/press", - "interactions": "", - "processors": "", - "groups": "Touch", - "action": "Click", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "bb9e6b34-44bf-4381-ac63-5aa15d19f677", - "path": "/trigger", - "interactions": "", - "processors": "", - "groups": "XR", - "action": "Click", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "38c99815-14ea-4617-8627-164d27641299", - "path": "/scroll", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "ScrollWheel", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "4c191405-5738-4d4b-a523-c6a301dbf754", - "path": "/rightButton", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "RightClick", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "24066f69-da47-44f3-a07e-0015fb02eb2e", - "path": "/middleButton", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "MiddleClick", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "7236c0d9-6ca3-47cf-a6ee-a97f5b59ea77", - "path": "/devicePosition", - "interactions": "", - "processors": "", - "groups": "XR", - "action": "TrackedDevicePosition", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "23e01e3a-f935-4948-8d8b-9bcac77714fb", - "path": "/deviceRotation", - "interactions": "", - "processors": "", - "groups": "XR", - "action": "TrackedDeviceOrientation", - "isComposite": false, - "isPartOfComposite": false - } - ] + "actions": [], + "bindings": [] } ], "controlSchemes": [ diff --git a/Assets/Input System/Player 2 Actions.inputactions b/Assets/Input System/Player 2 Actions.inputactions deleted file mode 100644 index 5e71a39..0000000 --- a/Assets/Input System/Player 2 Actions.inputactions +++ /dev/null @@ -1,675 +0,0 @@ -{ - "name": "Player 2 Actions", - "maps": [ - { - "name": "Player", - "id": "df70fa95-8a34-4494-b137-73ab6b9c7d37", - "actions": [ - { - "name": "Move", - "type": "Value", - "id": "351f2ccd-1f9f-44bf-9bec-d62ac5c5f408", - "expectedControlType": "Vector2", - "processors": "", - "interactions": "", - "initialStateCheck": true - }, - { - "name": "Action", - "type": "Button", - "id": "6c333d17-3450-4446-b7e0-a49595f68ba7", - "expectedControlType": "", - "processors": "", - "interactions": "", - "initialStateCheck": false - } - ], - "bindings": [ - { - "name": "D-Pad", - "id": "00ca640b-d935-4593-8157-c05846ea39b3", - "path": "Dpad", - "interactions": "", - "processors": "", - "groups": "", - "action": "Move", - "isComposite": true, - "isPartOfComposite": false - }, - { - "name": "up", - "id": "e2062cb9-1b15-46a2-838c-2f8d72a0bdd9", - "path": "/upArrow", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "Move", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "down", - "id": "320bffee-a40b-4347-ac70-c210eb8bc73a", - "path": "/downArrow", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "Move", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "left", - "id": "d2581a9b-1d11-4566-b27d-b92aff5fabbc", - "path": "/leftArrow", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "Move", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "right", - "id": "fcfe95b8-67b9-4526-84b5-5d0bc98d6400", - "path": "/rightArrow", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "Move", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "", - "id": "6f8632d2-312f-4559-8fdd-d17a3c226436", - "path": "/space", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "Action", - "isComposite": false, - "isPartOfComposite": false - } - ] - }, - { - "name": "UI", - "id": "272f6d14-89ba-496f-b7ff-215263d3219f", - "actions": [ - { - "name": "Navigate", - "type": "PassThrough", - "id": "c95b2375-e6d9-4b88-9c4c-c5e76515df4b", - "expectedControlType": "Vector2", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, - { - "name": "Submit", - "type": "Button", - "id": "7607c7b6-cd76-4816-beef-bd0341cfe950", - "expectedControlType": "Button", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, - { - "name": "Cancel", - "type": "Button", - "id": "15cef263-9014-4fd5-94d9-4e4a6234a6ef", - "expectedControlType": "Button", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, - { - "name": "Point", - "type": "PassThrough", - "id": "32b35790-4ed0-4e9a-aa41-69ac6d629449", - "expectedControlType": "Vector2", - "processors": "", - "interactions": "", - "initialStateCheck": true - }, - { - "name": "Click", - "type": "PassThrough", - "id": "3c7022bf-7922-4f7c-a998-c437916075ad", - "expectedControlType": "Button", - "processors": "", - "interactions": "", - "initialStateCheck": true - }, - { - "name": "RightClick", - "type": "PassThrough", - "id": "44b200b1-1557-4083-816c-b22cbdf77ddf", - "expectedControlType": "Button", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, - { - "name": "MiddleClick", - "type": "PassThrough", - "id": "dad70c86-b58c-4b17-88ad-f5e53adf419e", - "expectedControlType": "Button", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, - { - "name": "ScrollWheel", - "type": "PassThrough", - "id": "0489e84a-4833-4c40-bfae-cea84b696689", - "expectedControlType": "Vector2", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, - { - "name": "TrackedDevicePosition", - "type": "PassThrough", - "id": "24908448-c609-4bc3-a128-ea258674378a", - "expectedControlType": "Vector3", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, - { - "name": "TrackedDeviceOrientation", - "type": "PassThrough", - "id": "9caa3d8a-6b2f-4e8e-8bad-6ede561bd9be", - "expectedControlType": "Quaternion", - "processors": "", - "interactions": "", - "initialStateCheck": false - } - ], - "bindings": [ - { - "name": "Gamepad", - "id": "809f371f-c5e2-4e7a-83a1-d867598f40dd", - "path": "2DVector", - "interactions": "", - "processors": "", - "groups": "", - "action": "Navigate", - "isComposite": true, - "isPartOfComposite": false - }, - { - "name": "up", - "id": "14a5d6e8-4aaf-4119-a9ef-34b8c2c548bf", - "path": "/leftStick/up", - "interactions": "", - "processors": "", - "groups": ";Gamepad", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "up", - "id": "9144cbe6-05e1-4687-a6d7-24f99d23dd81", - "path": "/rightStick/up", - "interactions": "", - "processors": "", - "groups": ";Gamepad", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "down", - "id": "2db08d65-c5fb-421b-983f-c71163608d67", - "path": "/leftStick/down", - "interactions": "", - "processors": "", - "groups": ";Gamepad", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "down", - "id": "58748904-2ea9-4a80-8579-b500e6a76df8", - "path": "/rightStick/down", - "interactions": "", - "processors": "", - "groups": ";Gamepad", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "left", - "id": "8ba04515-75aa-45de-966d-393d9bbd1c14", - "path": "/leftStick/left", - "interactions": "", - "processors": "", - "groups": ";Gamepad", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "left", - "id": "712e721c-bdfb-4b23-a86c-a0d9fcfea921", - "path": "/rightStick/left", - "interactions": "", - "processors": "", - "groups": ";Gamepad", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "right", - "id": "fcd248ae-a788-4676-a12e-f4d81205600b", - "path": "/leftStick/right", - "interactions": "", - "processors": "", - "groups": ";Gamepad", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "right", - "id": "1f04d9bc-c50b-41a1-bfcc-afb75475ec20", - "path": "/rightStick/right", - "interactions": "", - "processors": "", - "groups": ";Gamepad", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "", - "id": "fb8277d4-c5cd-4663-9dc7-ee3f0b506d90", - "path": "/dpad", - "interactions": "", - "processors": "", - "groups": ";Gamepad", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "Joystick", - "id": "e25d9774-381c-4a61-b47c-7b6b299ad9f9", - "path": "2DVector", - "interactions": "", - "processors": "", - "groups": "", - "action": "Navigate", - "isComposite": true, - "isPartOfComposite": false - }, - { - "name": "up", - "id": "3db53b26-6601-41be-9887-63ac74e79d19", - "path": "/stick/up", - "interactions": "", - "processors": "", - "groups": "Joystick", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "down", - "id": "0cb3e13e-3d90-4178-8ae6-d9c5501d653f", - "path": "/stick/down", - "interactions": "", - "processors": "", - "groups": "Joystick", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "left", - "id": "0392d399-f6dd-4c82-8062-c1e9c0d34835", - "path": "/stick/left", - "interactions": "", - "processors": "", - "groups": "Joystick", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "right", - "id": "942a66d9-d42f-43d6-8d70-ecb4ba5363bc", - "path": "/stick/right", - "interactions": "", - "processors": "", - "groups": "Joystick", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "Keyboard", - "id": "ff527021-f211-4c02-933e-5976594c46ed", - "path": "2DVector", - "interactions": "", - "processors": "", - "groups": "", - "action": "Navigate", - "isComposite": true, - "isPartOfComposite": false - }, - { - "name": "up", - "id": "563fbfdd-0f09-408d-aa75-8642c4f08ef0", - "path": "/w", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "up", - "id": "eb480147-c587-4a33-85ed-eb0ab9942c43", - "path": "/upArrow", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "down", - "id": "2bf42165-60bc-42ca-8072-8c13ab40239b", - "path": "/s", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "down", - "id": "85d264ad-e0a0-4565-b7ff-1a37edde51ac", - "path": "/downArrow", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "left", - "id": "74214943-c580-44e4-98eb-ad7eebe17902", - "path": "/a", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "left", - "id": "cea9b045-a000-445b-95b8-0c171af70a3b", - "path": "/leftArrow", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "right", - "id": "8607c725-d935-4808-84b1-8354e29bab63", - "path": "/d", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "right", - "id": "4cda81dc-9edd-4e03-9d7c-a71a14345d0b", - "path": "/rightArrow", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "", - "id": "9e92bb26-7e3b-4ec4-b06b-3c8f8e498ddc", - "path": "*/{Submit}", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse;Gamepad;Touch;Joystick;XR", - "action": "Submit", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "82627dcc-3b13-4ba9-841d-e4b746d6553e", - "path": "*/{Cancel}", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse;Gamepad;Touch;Joystick;XR", - "action": "Cancel", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "c52c8e0b-8179-41d3-b8a1-d149033bbe86", - "path": "/position", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Point", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "e1394cbc-336e-44ce-9ea8-6007ed6193f7", - "path": "/position", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Point", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "5693e57a-238a-46ed-b5ae-e64e6e574302", - "path": "/touch*/position", - "interactions": "", - "processors": "", - "groups": "Touch", - "action": "Point", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "4faf7dc9-b979-4210-aa8c-e808e1ef89f5", - "path": "/leftButton", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "Click", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "8d66d5ba-88d7-48e6-b1cd-198bbfef7ace", - "path": "/tip", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "Click", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "47c2a644-3ebc-4dae-a106-589b7ca75b59", - "path": "/touch*/press", - "interactions": "", - "processors": "", - "groups": "Touch", - "action": "Click", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "bb9e6b34-44bf-4381-ac63-5aa15d19f677", - "path": "/trigger", - "interactions": "", - "processors": "", - "groups": "XR", - "action": "Click", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "38c99815-14ea-4617-8627-164d27641299", - "path": "/scroll", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "ScrollWheel", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "4c191405-5738-4d4b-a523-c6a301dbf754", - "path": "/rightButton", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "RightClick", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "24066f69-da47-44f3-a07e-0015fb02eb2e", - "path": "/middleButton", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "MiddleClick", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "7236c0d9-6ca3-47cf-a6ee-a97f5b59ea77", - "path": "/devicePosition", - "interactions": "", - "processors": "", - "groups": "XR", - "action": "TrackedDevicePosition", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "23e01e3a-f935-4948-8d8b-9bcac77714fb", - "path": "/deviceRotation", - "interactions": "", - "processors": "", - "groups": "XR", - "action": "TrackedDeviceOrientation", - "isComposite": false, - "isPartOfComposite": false - } - ] - } - ], - "controlSchemes": [ - { - "name": "Keyboard&Mouse", - "bindingGroup": "Keyboard&Mouse", - "devices": [ - { - "devicePath": "", - "isOptional": false, - "isOR": false - }, - { - "devicePath": "", - "isOptional": false, - "isOR": false - } - ] - }, - { - "name": "Gamepad", - "bindingGroup": "Gamepad", - "devices": [ - { - "devicePath": "", - "isOptional": false, - "isOR": false - } - ] - }, - { - "name": "Touch", - "bindingGroup": "Touch", - "devices": [ - { - "devicePath": "", - "isOptional": false, - "isOR": false - } - ] - }, - { - "name": "Joystick", - "bindingGroup": "Joystick", - "devices": [ - { - "devicePath": "", - "isOptional": false, - "isOR": false - } - ] - }, - { - "name": "XR", - "bindingGroup": "XR", - "devices": [ - { - "devicePath": "", - "isOptional": false, - "isOR": false - } - ] - } - ] -} \ No newline at end of file diff --git a/Assets/Input System/Player 2 Actions.inputactions.meta b/Assets/Input System/Player 2 Actions.inputactions.meta deleted file mode 100644 index 0790ceb..0000000 --- a/Assets/Input System/Player 2 Actions.inputactions.meta +++ /dev/null @@ -1,14 +0,0 @@ -fileFormatVersion: 2 -guid: 66bf446e230994f6cb8817e4943f9adf -ScriptedImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 2 - userData: - assetBundleName: - assetBundleVariant: - script: {fileID: 11500000, guid: 8404be70184654265930450def6a9037, type: 3} - generateWrapperCode: 0 - wrapperCodePath: - wrapperClassName: - wrapperCodeNamespace: diff --git a/Assets/Input System/Player Actions.inputactions b/Assets/Input System/Player Actions.inputactions index 5d8da6a..ee883f7 100644 --- a/Assets/Input System/Player Actions.inputactions +++ b/Assets/Input System/Player Actions.inputactions @@ -22,6 +22,15 @@ "processors": "", "interactions": "", "initialStateCheck": false + }, + { + "name": "Join", + "type": "Button", + "id": "48dcd9f7-f01f-4601-9b1f-bae4ed9f5773", + "expectedControlType": "", + "processors": "", + "interactions": "", + "initialStateCheck": false } ], "bindings": [ @@ -134,6 +143,28 @@ "action": "Action", "isComposite": false, "isPartOfComposite": false + }, + { + "name": "", + "id": "2a504570-c560-4eaf-a3f0-49971e1b475a", + "path": "/enter", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Join", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "eaff7c47-095b-4be4-90d3-519d002ec558", + "path": "/start", + "interactions": "", + "processors": "", + "groups": "", + "action": "Join", + "isComposite": false, + "isPartOfComposite": false } ] }, diff --git a/Assets/Scenes/Platformer.unity b/Assets/Scenes/Platformer.unity index 4346c94..f4ef7df 100644 --- a/Assets/Scenes/Platformer.unity +++ b/Assets/Scenes/Platformer.unity @@ -213,7 +213,7 @@ MonoBehaviour: m_NotificationBehavior: 0 m_MaxPlayerCount: -1 m_AllowJoining: 1 - m_JoinBehavior: 2 + m_JoinBehavior: 1 m_PlayerJoinedEvent: m_PersistentCalls: m_Calls: [] @@ -221,9 +221,9 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_JoinAction: - m_UseReference: 0 + m_UseReference: 1 m_Action: - m_Name: + m_Name: Join m_Type: 0 m_ExpectedControlType: m_Id: 9b26d698-45b8-4b09-bfa5-81c3a8afe391 @@ -231,7 +231,7 @@ MonoBehaviour: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - m_Reference: {fileID: 0} + m_Reference: {fileID: -7962223595281827953, guid: 6cbaae0ad99590d468c8b501c0452c36, type: 3} m_PlayerPrefab: {fileID: 1375850422501237868, guid: 1fd31b88e5609482ab7e8ab16a932947, type: 3} m_SplitScreen: 0 m_MaintainAspectRatioInSplitScreen: 0 diff --git a/Assets/AnimationPlayer.cs b/Assets/Scripts/AnimationPlayer.cs similarity index 100% rename from Assets/AnimationPlayer.cs rename to Assets/Scripts/AnimationPlayer.cs diff --git a/Assets/AnimationPlayer.cs.meta b/Assets/Scripts/AnimationPlayer.cs.meta similarity index 100% rename from Assets/AnimationPlayer.cs.meta rename to Assets/Scripts/AnimationPlayer.cs.meta diff --git a/Assets/Scripts/PlayerManager.cs b/Assets/Scripts/PlayerManager.cs index cc2cd5a..effbb02 100644 --- a/Assets/Scripts/PlayerManager.cs +++ b/Assets/Scripts/PlayerManager.cs @@ -30,19 +30,6 @@ public class PlayerManager : MonoBehaviour playerCamera = FindFirstObjectByType(); } - private void Update() - { - if (InputSystem.actions.FindAction("Join Player").WasPressedThisFrame()) - { - JoinPlayer(playerActions); - } - - if (Keyboard.current.periodKey.wasPressedThisFrame) - { - JoinPlayer(player2Actions); - } - } - private void OnPlayerJoined(PlayerInput playerInput) { playerInput.transform.position = spawnPosition; @@ -68,11 +55,4 @@ public class PlayerManager : MonoBehaviour print("A PlayerManager already exists."); } } - - private void JoinPlayer(InputActionAsset actions) - { - PlayerInput player = GetComponent().JoinPlayer(-1, -1, null, Keyboard.current); - print(player == null); - player.actions = actions; - } } From 5facf8c6d360f6059e0296ded5fe249fbee1b0aa Mon Sep 17 00:00:00 2001 From: RochesterX Date: Fri, 17 Jan 2025 12:05:54 -0500 Subject: [PATCH 19/25] Restructure animations --- Assets/Animations/Bones.meta | 8 + .../Bones.controller} | 6 +- .../Bones.controller.meta} | 0 Assets/Animations/{ => Bones}/Idle.anim | 0 Assets/Animations/{ => Bones}/Idle.anim.meta | 0 .../Animations/{Wild.anim => Bones/Jump.anim} | 2 +- .../{Wild.anim.meta => Bones/Jump.anim.meta} | 0 .../{Bones.anim => Bones/Walk.anim} | 204 ++++---- .../{Bones.anim.meta => Bones/Walk.anim.meta} | 0 Assets/Old/Pong/Paddle.prefab | 1 + Assets/Old/Pong/Pong.unity | 4 + Assets/Old/Pong/PongPaddleBehavior.cs | 25 +- Assets/Scenes/Platformer.unity | 448 ++++++++++++++++-- Assets/Scripts/PlayerManager.cs | 12 +- 14 files changed, 557 insertions(+), 153 deletions(-) create mode 100644 Assets/Animations/Bones.meta rename Assets/Animations/{Root.controller => Bones/Bones.controller} (99%) rename Assets/Animations/{Root.controller.meta => Bones/Bones.controller.meta} (100%) rename Assets/Animations/{ => Bones}/Idle.anim (100%) rename Assets/Animations/{ => Bones}/Idle.anim.meta (100%) rename Assets/Animations/{Wild.anim => Bones/Jump.anim} (99%) rename Assets/Animations/{Wild.anim.meta => Bones/Jump.anim.meta} (100%) rename Assets/Animations/{Bones.anim => Bones/Walk.anim} (98%) rename Assets/Animations/{Bones.anim.meta => Bones/Walk.anim.meta} (100%) diff --git a/Assets/Animations/Bones.meta b/Assets/Animations/Bones.meta new file mode 100644 index 0000000..300a9f4 --- /dev/null +++ b/Assets/Animations/Bones.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e89fe007b5168b046a7dac7178d834c7 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/Root.controller b/Assets/Animations/Bones/Bones.controller similarity index 99% rename from Assets/Animations/Root.controller rename to Assets/Animations/Bones/Bones.controller index 7bea2c5..df05b49 100644 --- a/Assets/Animations/Root.controller +++ b/Assets/Animations/Bones/Bones.controller @@ -113,7 +113,7 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Wild + m_Name: Jump m_Speed: 1 m_CycleOffset: 0 m_Transitions: [] @@ -138,7 +138,7 @@ AnimatorController: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Root + m_Name: Bones serializedVersion: 5 m_AnimatorParameters: - m_Name: state @@ -193,7 +193,7 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Bones + m_Name: Walk m_Speed: 1 m_CycleOffset: 0 m_Transitions: [] diff --git a/Assets/Animations/Root.controller.meta b/Assets/Animations/Bones/Bones.controller.meta similarity index 100% rename from Assets/Animations/Root.controller.meta rename to Assets/Animations/Bones/Bones.controller.meta diff --git a/Assets/Animations/Idle.anim b/Assets/Animations/Bones/Idle.anim similarity index 100% rename from Assets/Animations/Idle.anim rename to Assets/Animations/Bones/Idle.anim diff --git a/Assets/Animations/Idle.anim.meta b/Assets/Animations/Bones/Idle.anim.meta similarity index 100% rename from Assets/Animations/Idle.anim.meta rename to Assets/Animations/Bones/Idle.anim.meta diff --git a/Assets/Animations/Wild.anim b/Assets/Animations/Bones/Jump.anim similarity index 99% rename from Assets/Animations/Wild.anim rename to Assets/Animations/Bones/Jump.anim index 30ef4bd..2c43034 100644 --- a/Assets/Animations/Wild.anim +++ b/Assets/Animations/Bones/Jump.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Wild + m_Name: Jump serializedVersion: 7 m_Legacy: 0 m_Compressed: 0 diff --git a/Assets/Animations/Wild.anim.meta b/Assets/Animations/Bones/Jump.anim.meta similarity index 100% rename from Assets/Animations/Wild.anim.meta rename to Assets/Animations/Bones/Jump.anim.meta diff --git a/Assets/Animations/Bones.anim b/Assets/Animations/Bones/Walk.anim similarity index 98% rename from Assets/Animations/Bones.anim rename to Assets/Animations/Bones/Walk.anim index c9daecf..2cb654b 100644 --- a/Assets/Animations/Bones.anim +++ b/Assets/Animations/Bones/Walk.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Bones + m_Name: Walk serializedVersion: 7 m_Legacy: 0 m_Compressed: 0 @@ -19,7 +19,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 0, z: 210.722} + value: {x: 0, y: 0, z: 226.804} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -37,7 +37,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.6666667 - value: {x: 0, y: 0, z: 210.722} + value: {x: 0, y: 0, z: 226.804} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -96,7 +96,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 0, z: 164.974} + value: {x: 0, y: 0, z: 146.038} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -114,7 +114,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.6666667 - value: {x: 0, y: 0, z: 164.974} + value: {x: 0, y: 0, z: 146.038} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -284,7 +284,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.33333334 - value: {x: 0, y: 0, z: 192.912} + value: {x: 0, y: 0, z: 191.046} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -310,7 +310,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 0, z: 0} + value: {x: 0, y: -0.062, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -328,8 +328,8 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.6666667 - value: {x: 0, y: 0, z: 0} - inSlope: {x: 0, y: 0, z: 0} + value: {x: 0, y: -0.062, z: 0} + inSlope: {x: 0, y: 0, z: -0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 weightedMode: 0 @@ -536,7 +536,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 210.722 + value: 226.804 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -554,7 +554,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.6666667 - value: 210.722 + value: 226.804 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -797,7 +797,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 164.974 + value: 146.038 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -815,7 +815,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.6666667 - value: 164.974 + value: 146.038 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -1370,7 +1370,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: -0.062 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -1388,7 +1388,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.6666667 - value: 0 + value: -0.062 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -1412,7 +1412,7 @@ AnimationClip: value: 0 inSlope: 0 outSlope: 0 - tangentMode: 136 + tangentMode: 69 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 @@ -1428,9 +1428,9 @@ AnimationClip: - serializedVersion: 3 time: 0.6666667 value: 0 - inSlope: 0 + inSlope: -0 outSlope: 0 - tangentMode: 136 + tangentMode: 69 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 @@ -1535,7 +1535,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.33333334 - value: 192.912 + value: 191.046 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -1568,7 +1568,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.z - path: Torso + path: Torso/Leg L U/Leg L L classID: 4 script: {fileID: 0} flags: 0 @@ -1580,7 +1580,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.y - path: Torso + path: Torso/Leg L U/Leg L L classID: 4 script: {fileID: 0} flags: 0 @@ -1592,7 +1592,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.x - path: Torso + path: Torso/Leg L U/Leg L L classID: 4 script: {fileID: 0} flags: 0 @@ -1604,7 +1604,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.z - path: Torso/Arm L + path: Torso classID: 4 script: {fileID: 0} flags: 0 @@ -1616,7 +1616,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.y - path: Torso/Arm L + path: Torso classID: 4 script: {fileID: 0} flags: 0 @@ -1628,43 +1628,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.x - path: Torso/Arm L - classID: 4 - script: {fileID: 0} - flags: 0 - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.z - path: Torso/Head - classID: 4 - script: {fileID: 0} - flags: 0 - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.y - path: Torso/Head - classID: 4 - script: {fileID: 0} - flags: 0 - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.x - path: Torso/Head + path: Torso classID: 4 script: {fileID: 0} flags: 0 @@ -1712,7 +1676,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.z - path: Torso/Leg L U/Leg L L + path: Torso/Arm L classID: 4 script: {fileID: 0} flags: 0 @@ -1724,7 +1688,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.y - path: Torso/Leg L U/Leg L L + path: Torso/Arm L classID: 4 script: {fileID: 0} flags: 0 @@ -1736,43 +1700,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.x - path: Torso/Leg L U/Leg L L - classID: 4 - script: {fileID: 0} - flags: 0 - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.z - path: Torso/Leg R U - classID: 4 - script: {fileID: 0} - flags: 0 - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.y - path: Torso/Leg R U - classID: 4 - script: {fileID: 0} - flags: 0 - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.x - path: Torso/Leg R U + path: Torso/Arm L classID: 4 script: {fileID: 0} flags: 0 @@ -1819,7 +1747,7 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: m_LocalEulerAngles.x + attribute: m_LocalEulerAngles.z path: Torso/Leg R U/Leg R L classID: 4 script: {fileID: 0} @@ -1843,11 +1771,83 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: m_LocalEulerAngles.z + attribute: m_LocalEulerAngles.x path: Torso/Leg R U/Leg R L classID: 4 script: {fileID: 0} flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: Torso/Leg R U + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: Torso/Leg R U + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: Torso/Leg R U + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: Torso/Head + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: Torso/Head + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: Torso/Head + classID: 4 + script: {fileID: 0} + flags: 0 m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 m_Events: [] diff --git a/Assets/Animations/Bones.anim.meta b/Assets/Animations/Bones/Walk.anim.meta similarity index 100% rename from Assets/Animations/Bones.anim.meta rename to Assets/Animations/Bones/Walk.anim.meta diff --git a/Assets/Old/Pong/Paddle.prefab b/Assets/Old/Pong/Paddle.prefab index c699a91..c79f7c3 100644 --- a/Assets/Old/Pong/Paddle.prefab +++ b/Assets/Old/Pong/Paddle.prefab @@ -104,6 +104,7 @@ MonoBehaviour: m_EditorClassIdentifier: speed: 400 isPlayer1: 1 + move: {fileID: -944628639613478452, guid: 6cbaae0ad99590d468c8b501c0452c36, type: 3} --- !u!60 &6715754573185558080 PolygonCollider2D: m_ObjectHideFlags: 0 diff --git a/Assets/Old/Pong/Pong.unity b/Assets/Old/Pong/Pong.unity index 96289c5..63a77cc 100644 --- a/Assets/Old/Pong/Pong.unity +++ b/Assets/Old/Pong/Pong.unity @@ -2126,6 +2126,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 946501248446145305, guid: 603e313b1bcbb4e7ab65d3ec701ce789, type: 3} + propertyPath: move.m_Name + value: Move + objectReference: {fileID: 0} - target: {fileID: 2899264478719472934, guid: 603e313b1bcbb4e7ab65d3ec701ce789, type: 3} propertyPath: m_LocalPosition.x value: -8 diff --git a/Assets/Old/Pong/PongPaddleBehavior.cs b/Assets/Old/Pong/PongPaddleBehavior.cs index 2fe074c..21fee36 100644 --- a/Assets/Old/Pong/PongPaddleBehavior.cs +++ b/Assets/Old/Pong/PongPaddleBehavior.cs @@ -6,18 +6,37 @@ public class PongPaddleBehavior : MonoBehaviour public float speed = 5f; public bool isPlayer1 = true; - private InputAction move; + [SerializeField] private InputActionAsset move; private Rigidbody2D rb; private void Start() { - move = isPlayer1 ? InputSystem.actions.FindAction("Player 1 Move") : InputSystem.actions.FindAction("Player 2 Move"); rb = GetComponent(); } private void FixedUpdate() { - float direction = move.ReadValue().y; + if (!isPlayer1) + { + Transform ball = FindFirstObjectByType().transform; + + RaycastHit2D[] hits = Physics2D.RaycastAll(ball.position, ball.GetComponent().linearVelocity, Mathf.Infinity, LayerMask.GetMask("Pong Goal")); + Debug.DrawRay(ball.position, ball.GetComponent().linearVelocity * 1000f, Color.red); + + foreach(RaycastHit2D hit in hits) + { + if (hit.collider.gameObject.CompareTag("Pong Goal")) + { + print("Hit"); + float dir = transform.position.y - hit.point.y > 0 ? 1 : -1; + + rb.linearVelocityY = dir * speed * Time.fixedDeltaTime; + } + } + + return; + } + float direction = move.FindAction("Move").ReadValue().y; if (transform.position.y >= 4 && direction > 0 || transform.position.y <= -4 && direction < 0) { direction = 0; diff --git a/Assets/Scenes/Platformer.unity b/Assets/Scenes/Platformer.unity index f4ef7df..f690bd9 100644 --- a/Assets/Scenes/Platformer.unity +++ b/Assets/Scenes/Platformer.unity @@ -195,9 +195,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: players: [] - spawnPosition: {x: -2, y: 15} playerActions: {fileID: -944628639613478452, guid: 6cbaae0ad99590d468c8b501c0452c36, type: 3} - player2Actions: {fileID: -944628639613478452, guid: 66bf446e230994f6cb8817e4943f9adf, type: 3} --- !u!114 &804358386 MonoBehaviour: m_ObjectHideFlags: 0 @@ -6145,6 +6143,26 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 + - first: {x: 15, y: 0, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 16, y: 0, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 - first: {x: 17, y: 0, z: 0} second: serializedVersion: 2 @@ -6435,6 +6453,26 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 + - first: {x: 15, y: 1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 16, y: 1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 - first: {x: 17, y: 1, z: 0} second: serializedVersion: 2 @@ -8315,6 +8353,166 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 + - first: {x: 15, y: 7, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 16, y: 7, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 17, y: 7, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 18, y: 7, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 19, y: 7, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 20, y: 7, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 21, y: 7, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 22, y: 7, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 23, y: 7, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 24, y: 7, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 25, y: 7, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 26, y: 7, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 27, y: 7, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 28, y: 7, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 29, y: 7, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 30, y: 7, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 - first: {x: -51, y: 8, z: 0} second: serializedVersion: 2 @@ -8605,6 +8803,166 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 + - first: {x: 15, y: 8, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 16, y: 8, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 17, y: 8, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 18, y: 8, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 19, y: 8, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 20, y: 8, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 21, y: 8, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 22, y: 8, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 23, y: 8, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 24, y: 8, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 25, y: 8, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 26, y: 8, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 27, y: 8, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 28, y: 8, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 29, y: 8, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 30, y: 8, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 - first: {x: -51, y: 9, z: 0} second: serializedVersion: 2 @@ -11397,13 +11755,13 @@ Tilemap: m_AllTileFlags: 1073741825 m_AnimatedTiles: {} m_TileAssetArray: - - m_RefCount: 1104 + - m_RefCount: 1140 m_Data: {fileID: 11400000, guid: 1cf44ad133c006f4e9b30384a5571258, type: 2} m_TileSpriteArray: - - m_RefCount: 1104 + - m_RefCount: 1140 m_Data: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} m_TileMatrixArray: - - m_RefCount: 1104 + - m_RefCount: 1140 m_Data: e00: 1 e01: 0 @@ -11422,13 +11780,13 @@ Tilemap: e32: 0 e33: 1 m_TileColorArray: - - m_RefCount: 1104 + - m_RefCount: 1140 m_Data: {r: 1, g: 1, b: 1, a: 1} m_TileObjectToInstantiateArray: [] m_AnimationFrameRate: 1 m_Color: {r: 1, g: 1, b: 1, a: 1} m_Origin: {x: -51, y: -15, z: 0} - m_Size: {x: 78, y: 35, z: 1} + m_Size: {x: 82, y: 35, z: 1} m_TileAnchor: {x: 0.5, y: 0.5, z: 0} m_TileOrientation: 0 m_TileOrientationMatrix: @@ -11524,6 +11882,14 @@ CompositeCollider2D: Y: 80000000 - X: 0 Y: 80000000 + - - X: 310000000 + Y: 90000000 + - X: 150000000 + Y: 90000000 + - X: 150000000 + Y: 70000000 + - X: 310000000 + Y: 70000000 - - X: 70000000 Y: 80000000 - X: 30000000 @@ -11564,6 +11930,18 @@ CompositeCollider2D: Y: 20000000 - X: 60000000 Y: 20000000 + - - X: 190000000 + Y: 20000000 + - X: 150000000 + Y: 20000000 + - X: 150000000 + Y: 0 + - X: 170000000 + Y: 0 + - X: 170000000 + Y: -30000000 + - X: 190000000 + Y: -30000000 - - X: 20000000 Y: 20000000 - X: 0 @@ -11572,14 +11950,6 @@ CompositeCollider2D: Y: -70000000 - X: 20000000 Y: -70000000 - - - X: 190000000 - Y: 20000000 - - X: 170000000 - Y: 20000000 - - X: 170000000 - Y: -30000000 - - X: 190000000 - Y: -30000000 - - X: 90000000 Y: 10000000 - X: 70000000 @@ -11612,14 +11982,6 @@ CompositeCollider2D: Y: -30000000 - X: -100000000 Y: -30000000 - - - X: 120000000 - Y: -20000000 - - X: 100000000 - Y: -20000000 - - X: 100000000 - Y: -40000000 - - X: 120000000 - Y: -40000000 - - X: -60000000 Y: -20000000 - X: -80000000 @@ -11628,6 +11990,26 @@ CompositeCollider2D: Y: -70000000 - X: -60000000 Y: -70000000 + - - X: 120000000 + Y: -20000000 + - X: 100000000 + Y: -20000000 + - X: 100000000 + Y: -40000000 + - X: 120000000 + Y: -40000000 + - - X: -160000000 + Y: -60000000 + - X: -170000000 + Y: -60000000 + - X: -170000000 + Y: -30000000 + - X: -190000000 + Y: -30000000 + - X: -190000000 + Y: -90000000 + - X: -160000000 + Y: -90000000 - - X: 260000000 Y: -90000000 - X: 270000000 @@ -11644,18 +12026,6 @@ CompositeCollider2D: Y: -150000000 - X: 260000000 Y: -150000000 - - - X: -160000000 - Y: -60000000 - - X: -170000000 - Y: -60000000 - - X: -170000000 - Y: -30000000 - - X: -190000000 - Y: -30000000 - - X: -190000000 - Y: -90000000 - - X: -160000000 - Y: -90000000 - - X: -210000000 Y: -50000000 - X: -250000000 @@ -11734,6 +12104,10 @@ CompositeCollider2D: - {x: -0.000029300001, y: 10} - {x: -4, y: 9.99997} - {x: -3.999971, y: 8} + - - {x: 30.999971, y: 7} + - {x: 30.999971, y: 9} + - {x: 15, y: 8.99997} + - {x: 15.000029, y: 7} - - {x: 6.9999704, y: 6} - {x: 6.9999704, y: 8} - {x: 3, y: 7.9999704} @@ -11756,7 +12130,9 @@ CompositeCollider2D: - {x: 4.000029, y: 2} - - {x: 18.999971, y: -3} - {x: 18.999971, y: 2} - - {x: 17, y: 1.9999708} + - {x: 15, y: 1.9999708} + - {x: 15.000029, y: 0} + - {x: 17, y: -0.0000294} - {x: 17.000029, y: -3} - - {x: 1.9999708, y: -7} - {x: 1.9999708, y: 2} diff --git a/Assets/Scripts/PlayerManager.cs b/Assets/Scripts/PlayerManager.cs index effbb02..c43fef7 100644 --- a/Assets/Scripts/PlayerManager.cs +++ b/Assets/Scripts/PlayerManager.cs @@ -8,14 +8,9 @@ public class PlayerManager : MonoBehaviour public static PlayerManager Instance; public List players; - [SerializeField] private Vector2 spawnPosition; [SerializeField] private InputActionAsset playerActions; - - [Header("Debug")] - [SerializeField] private InputActionAsset player2Actions; - - private PlayerCameraMovement playerCamera; + private Vector2 spawnPosition; private void Awake() { @@ -26,8 +21,6 @@ public class PlayerManager : MonoBehaviour { GetComponent().onPlayerJoined += OnPlayerJoined; GetComponent().onPlayerLeft += OnPlayerLeft; - - playerCamera = FindFirstObjectByType(); } private void OnPlayerJoined(PlayerInput playerInput) @@ -53,6 +46,9 @@ public class PlayerManager : MonoBehaviour else { print("A PlayerManager already exists."); + Destroy(this.gameObject); } + + spawnPosition = transform.position; } } From 7109149b83d6cfb4132028482088296bade04da5 Mon Sep 17 00:00:00 2001 From: RochesterX Date: Fri, 17 Jan 2025 12:31:36 -0500 Subject: [PATCH 20/25] Update Bones Model --- Assets/Animations/Bones/Bones.controller | 29 + Assets/Prefabs/Bones.prefab | 277 ++++++- Assets/Prefabs/TrevorPunch.anim | 981 +++++++++++++++++++++++ Assets/Prefabs/TrevorPunch.anim.meta | 8 + 4 files changed, 1292 insertions(+), 3 deletions(-) create mode 100644 Assets/Prefabs/TrevorPunch.anim create mode 100644 Assets/Prefabs/TrevorPunch.anim.meta diff --git a/Assets/Animations/Bones/Bones.controller b/Assets/Animations/Bones/Bones.controller index df05b49..120d700 100644 --- a/Assets/Animations/Bones/Bones.controller +++ b/Assets/Animations/Bones/Bones.controller @@ -68,6 +68,9 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: 1699472617733096240} m_Position: {x: 290, y: -50, z: 0} + - serializedVersion: 1 + m_State: {fileID: 4390441580030614539} + m_Position: {x: 325, y: 15, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: - {fileID: -7951230361386602773} @@ -212,3 +215,29 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1102 &4390441580030614539 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: TrevorPunch + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: d35a84e254439400a98448cb2348a2f8, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/Prefabs/Bones.prefab b/Assets/Prefabs/Bones.prefab index 8ad2834..8b370a8 100644 --- a/Assets/Prefabs/Bones.prefab +++ b/Assets/Prefabs/Bones.prefab @@ -97,6 +97,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: state: 0 + backwards: 0 clip: {fileID: 7400000, guid: 590f229c565f34c8296a875497c76553, type: 2} --- !u!114 &5200627265685207284 MonoBehaviour: @@ -223,6 +224,140 @@ BoxCollider2D: m_AutoTiling: 0 m_Size: {x: 0.4505486, y: 1.9777327} m_EdgeRadius: 0 +--- !u!1 &1648017802882051395 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1675952325475866362} + - component: {fileID: 5602021945915386438} + - component: {fileID: 7534722831291326672} + m_Layer: 0 + m_Name: Arm L L + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1675952325475866362 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1648017802882051395} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: -1} + m_LocalPosition: {x: 0, y: -0.5, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4818486997278545909} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} +--- !u!212 &5602021945915386438 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1648017802882051395} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 1406629073, guid: b5f1c8f6f05944d649e3fb9af5459160, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.8125, y: 0.5625} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!61 &7534722831291326672 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1648017802882051395} + m_Enabled: 0 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: -0.25} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 1} + oldSize: {x: 0.0625, y: 0.5} + newSize: {x: 0.8125, y: 0.5625} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 0.0625, y: 0.5} + m_EdgeRadius: 0 --- !u!1 &1792259794085692571 GameObject: m_ObjectHideFlags: 0 @@ -384,7 +519,7 @@ Transform: m_GameObject: {fileID: 3572452013539030063} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 1, w: 0} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0.048, y: 0.001, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -795,7 +930,8 @@ Transform: m_LocalPosition: {x: 0, y: -0.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 1675952325475866362} m_Father: {fileID: 7290594200745798336} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} --- !u!212 &1251171065512708809 @@ -1033,6 +1169,140 @@ BoxCollider2D: m_AutoTiling: 0 m_Size: {x: 0.5, y: 0.5} m_EdgeRadius: 0 +--- !u!1 &5600043765235685887 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6565447060195665550} + - component: {fileID: 1263635959652575642} + - component: {fileID: 7356053835466163623} + m_Layer: 0 + m_Name: Arm R L + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6565447060195665550 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5600043765235685887} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: -0.5, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3359136527054329610} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} +--- !u!212 &1263635959652575642 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5600043765235685887} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 1406629073, guid: b5f1c8f6f05944d649e3fb9af5459160, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.8125, y: 0.5625} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!61 &7356053835466163623 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5600043765235685887} + m_Enabled: 0 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: -0.25} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 1} + oldSize: {x: 0.0625, y: 0.5} + newSize: {x: 0.8125, y: 0.5625} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 0.0625, y: 0.5} + m_EdgeRadius: 0 --- !u!1 &5636889232707595368 GameObject: m_ObjectHideFlags: 0 @@ -1063,7 +1333,8 @@ Transform: m_LocalPosition: {x: 0, y: -0.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 6565447060195665550} m_Father: {fileID: 7290594200745798336} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} --- !u!212 &3115818513466967182 diff --git a/Assets/Prefabs/TrevorPunch.anim b/Assets/Prefabs/TrevorPunch.anim new file mode 100644 index 0000000..3499c08 --- /dev/null +++ b/Assets/Prefabs/TrevorPunch.anim @@ -0,0 +1,981 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: TrevorPunch + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, z: 180} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.16666667 + value: {x: 0, y: 0, z: 139.676} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.6666667 + value: {x: 0, y: 0, z: 271.124} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 1 + value: {x: 0, y: 0, z: 180} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: Torso/Arm L + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, z: 180} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.16666667 + value: {x: 0, y: 0, z: 190.902} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.6666667 + value: {x: 0, y: 0, z: 177.707} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 1 + value: {x: 0, y: 0, z: 180} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: Torso + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, z: 187.66} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.16666667 + value: {x: 0, y: 0, z: 173.794} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.6666667 + value: {x: 0, y: 0, z: 192.966} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 1 + value: {x: 0, y: 0, z: 187.66} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: Torso/Leg L U + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, z: 181.021} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.16666667 + value: {x: 0, y: 0, z: 167.154} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.6666667 + value: {x: 0, y: 0, z: 186.326} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 1 + value: {x: 0, y: 0, z: 181.021} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: Torso/Leg R U + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 4207337212 + attribute: 4 + script: {fileID: 0} + typeID: 4 + customType: 4 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 3869152129 + attribute: 4 + script: {fileID: 0} + typeID: 4 + customType: 4 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 596276160 + attribute: 4 + script: {fileID: 0} + typeID: 4 + customType: 4 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 892534202 + attribute: 4 + script: {fileID: 0} + typeID: 4 + customType: 4 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.x + path: Torso/Arm L + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.y + path: Torso/Arm L + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 180 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: 139.676 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 271.124 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 180 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.z + path: Torso/Arm L + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.x + path: Torso + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.y + path: Torso + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 180 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: 190.902 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 177.707 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 180 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.z + path: Torso + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.x + path: Torso/Leg L U + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.y + path: Torso/Leg L U + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 187.66 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: 173.794 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 192.966 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 187.66 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.z + path: Torso/Leg L U + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.x + path: Torso/Leg R U + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.y + path: Torso/Leg R U + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 181.021 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: 167.154 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 186.326 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 181.021 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.z + path: Torso/Leg R U + classID: 4 + script: {fileID: 0} + flags: 16 + m_EulerEditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: Torso/Leg L U + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: Torso/Leg L U + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: Torso/Leg L U + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: Torso/Arm L + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: Torso/Arm L + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: Torso/Arm L + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: Torso + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: Torso + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: Torso + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: Torso/Leg R U + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: Torso/Leg R U + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: Torso/Leg R U + classID: 4 + script: {fileID: 0} + flags: 0 + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Prefabs/TrevorPunch.anim.meta b/Assets/Prefabs/TrevorPunch.anim.meta new file mode 100644 index 0000000..5237654 --- /dev/null +++ b/Assets/Prefabs/TrevorPunch.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d35a84e254439400a98448cb2348a2f8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: From edce0c17022aae1bf8f86d39a5a84b0ddf3d92cc Mon Sep 17 00:00:00 2001 From: RochesterX Date: Fri, 17 Jan 2025 12:39:57 -0500 Subject: [PATCH 21/25] Animation --- .../Bones}/TrevorPunch.anim | 696 ++++++++++++++++-- .../Bones}/TrevorPunch.anim.meta | 0 Assets/Prefabs/Bones.prefab | 4 +- 3 files changed, 644 insertions(+), 56 deletions(-) rename Assets/{Prefabs => Animations/Bones}/TrevorPunch.anim (60%) rename Assets/{Prefabs => Animations/Bones}/TrevorPunch.anim.meta (100%) diff --git a/Assets/Prefabs/TrevorPunch.anim b/Assets/Animations/Bones/TrevorPunch.anim similarity index 60% rename from Assets/Prefabs/TrevorPunch.anim rename to Assets/Animations/Bones/TrevorPunch.anim index 3499c08..ccabeb7 100644 --- a/Assets/Prefabs/TrevorPunch.anim +++ b/Assets/Animations/Bones/TrevorPunch.anim @@ -27,7 +27,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.16666667 + time: 0.5 value: {x: 0, y: 0, z: 139.676} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -45,7 +45,16 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 1 + time: 0.9166667 + value: {x: 0, y: 0, z: 139.676} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 1.2333333 value: {x: 0, y: 0, z: 180} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -70,7 +79,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.16666667 + time: 0.5 value: {x: 0, y: 0, z: 190.902} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -88,7 +97,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 1 + time: 1.2333333 value: {x: 0, y: 0, z: 180} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -113,8 +122,8 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.16666667 - value: {x: 0, y: 0, z: 173.794} + time: 0.5 + value: {x: 0, y: 0, z: 175.441} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -123,15 +132,15 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.6666667 - value: {x: 0, y: 0, z: 192.966} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 187.54} + inSlope: {x: 0, y: 0, z: 0.65460175} + outSlope: {x: 0, y: 0, z: 0.65460175} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 1 + time: 1.2333333 value: {x: 0, y: 0, z: 187.66} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -156,8 +165,8 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.16666667 - value: {x: 0, y: 0, z: 167.154} + time: 0.5 + value: {x: 0, y: 0, z: 168.801} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -166,15 +175,15 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.6666667 - value: {x: 0, y: 0, z: 186.326} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 180.9} + inSlope: {x: 0, y: 0, z: 0.66001236} + outSlope: {x: 0, y: 0, z: 0.66001236} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 1 + time: 1.2333333 value: {x: 0, y: 0, z: 181.021} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -186,6 +195,99 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 path: Torso/Leg R U + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, z: 1.515} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.5 + value: {x: 0, y: 0, z: 111.883} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.6666667 + value: {x: 0, y: 0, z: 1.817} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.9166667 + value: {x: 0, y: 0, z: 111.883} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: Torso/Arm L/Arm L L + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, z: 180} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.6666667 + value: {x: 0, y: 0, z: 156.099} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: Torso/Arm R + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.6666667 + value: {x: 0, y: 0, z: 55.933} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: Torso/Arm R/Arm R L m_PositionCurves: [] m_ScaleCurves: [] m_FloatCurves: [] @@ -233,13 +335,40 @@ AnimationClip: isPPtrCurve: 0 isIntCurve: 0 isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 621932707 + attribute: 4 + script: {fileID: 0} + typeID: 4 + customType: 4 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 13231007 + attribute: 4 + script: {fileID: 0} + typeID: 4 + customType: 4 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 1470883642 + attribute: 4 + script: {fileID: 0} + typeID: 4 + customType: 4 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1 + m_StopTime: 1.2333333 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -269,7 +398,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.16666667 + time: 0.5 value: 0 inSlope: 0 outSlope: 0 @@ -287,7 +416,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1 + time: 0.9166667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.2333333 value: 0 inSlope: 0 outSlope: 0 @@ -317,7 +455,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.16666667 + time: 0.5 value: 0 inSlope: 0 outSlope: 0 @@ -335,7 +473,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1 + time: 0.9166667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.2333333 value: 0 inSlope: 0 outSlope: 0 @@ -365,7 +512,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.16666667 + time: 0.5 value: 139.676 inSlope: 0 outSlope: 0 @@ -383,7 +530,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1 + time: 0.9166667 + value: 139.676 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.2333333 value: 180 inSlope: 0 outSlope: 0 @@ -413,7 +569,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.16666667 + time: 0.5 value: 0 inSlope: 0 outSlope: 0 @@ -431,7 +587,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1 + time: 1.2333333 value: 0 inSlope: 0 outSlope: 0 @@ -461,7 +617,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.16666667 + time: 0.5 value: 0 inSlope: 0 outSlope: 0 @@ -479,7 +635,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1 + time: 1.2333333 value: 0 inSlope: 0 outSlope: 0 @@ -509,7 +665,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.16666667 + time: 0.5 value: 190.902 inSlope: 0 outSlope: 0 @@ -527,7 +683,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1 + time: 1.2333333 value: 180 inSlope: 0 outSlope: 0 @@ -557,7 +713,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.16666667 + time: 0.5 value: 0 inSlope: 0 outSlope: 0 @@ -575,7 +731,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1 + time: 1.2333333 value: 0 inSlope: 0 outSlope: 0 @@ -605,7 +761,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.16666667 + time: 0.5 value: 0 inSlope: 0 outSlope: 0 @@ -623,7 +779,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1 + time: 1.2333333 value: 0 inSlope: 0 outSlope: 0 @@ -653,8 +809,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.16666667 - value: 173.794 + time: 0.5 + value: 175.441 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -663,15 +819,15 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.6666667 - value: 192.966 - inSlope: 0 - outSlope: 0 + value: 187.54 + inSlope: 0.65460175 + outSlope: 0.65460175 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1 + time: 1.2333333 value: 187.66 inSlope: 0 outSlope: 0 @@ -701,7 +857,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.16666667 + time: 0.5 value: 0 inSlope: 0 outSlope: 0 @@ -719,7 +875,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1 + time: 1.2333333 value: 0 inSlope: 0 outSlope: 0 @@ -749,7 +905,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.16666667 + time: 0.5 value: 0 inSlope: 0 outSlope: 0 @@ -767,7 +923,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1 + time: 1.2333333 value: 0 inSlope: 0 outSlope: 0 @@ -797,8 +953,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.16666667 - value: 167.154 + time: 0.5 + value: 168.801 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -807,15 +963,15 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.6666667 - value: 186.326 - inSlope: 0 - outSlope: 0 + value: 180.9 + inSlope: 0.66001236 + outSlope: 0.66001236 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1 + time: 1.2333333 value: 181.021 inSlope: 0 outSlope: 0 @@ -831,7 +987,439 @@ AnimationClip: classID: 4 script: {fileID: 0} flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.9166667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.x + path: Torso/Arm L/Arm L L + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.9166667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.y + path: Torso/Arm L/Arm L L + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1.515 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 111.883 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 1.817 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.9166667 + value: 111.883 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.z + path: Torso/Arm L/Arm L L + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.x + path: Torso/Arm R + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.y + path: Torso/Arm R + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 180 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 156.099 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.z + path: Torso/Arm R + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.x + path: Torso/Arm R/Arm R L + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.y + path: Torso/Arm R/Arm R L + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 55.933 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.z + path: Torso/Arm R/Arm R L + classID: 4 + script: {fileID: 0} + flags: 16 m_EulerEditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: Torso + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: Torso + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: Torso + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: Torso/Arm L/Arm L L + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: Torso/Arm L/Arm L L + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: Torso/Arm L/Arm L L + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: Torso/Arm R/Arm R L + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: Torso/Arm R/Arm R L + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: Torso/Arm R/Arm R L + classID: 4 + script: {fileID: 0} + flags: 0 - serializedVersion: 2 curve: serializedVersion: 2 @@ -911,8 +1499,8 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: m_LocalEulerAngles.z - path: Torso + attribute: m_LocalEulerAngles.x + path: Torso/Arm R classID: 4 script: {fileID: 0} flags: 0 @@ -924,7 +1512,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.y - path: Torso + path: Torso/Arm R classID: 4 script: {fileID: 0} flags: 0 @@ -935,8 +1523,8 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: m_LocalEulerAngles.x - path: Torso + attribute: m_LocalEulerAngles.z + path: Torso/Arm R classID: 4 script: {fileID: 0} flags: 0 diff --git a/Assets/Prefabs/TrevorPunch.anim.meta b/Assets/Animations/Bones/TrevorPunch.anim.meta similarity index 100% rename from Assets/Prefabs/TrevorPunch.anim.meta rename to Assets/Animations/Bones/TrevorPunch.anim.meta diff --git a/Assets/Prefabs/Bones.prefab b/Assets/Prefabs/Bones.prefab index 8b370a8..391bb7f 100644 --- a/Assets/Prefabs/Bones.prefab +++ b/Assets/Prefabs/Bones.prefab @@ -250,13 +250,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1648017802882051395} serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: -1} + m_LocalRotation: {x: -0, y: -0, z: -0.013222396, w: -0.9999126} m_LocalPosition: {x: 0, y: -0.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4818486997278545909} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 1.515} --- !u!212 &5602021945915386438 SpriteRenderer: m_ObjectHideFlags: 0 From 0824f3c99a34e11ef7134a0dbff9998f420b651b Mon Sep 17 00:00:00 2001 From: RochesterX Date: Fri, 17 Jan 2025 12:57:43 -0500 Subject: [PATCH 22/25] Implement Punch --- Assets/Animations/Bones/Bones.controller | 171 +++++++- Assets/Animations/Bones/TrevorPunch.anim | 382 +++++++++--------- .../Input System/Player Actions.inputactions | 88 +++- Assets/Prefabs/Bones.prefab | 21 +- Assets/Punch.cs | 22 + Assets/Punch.cs.meta | 2 + Assets/Scripts/AnimationPlayer.cs | 5 + 7 files changed, 476 insertions(+), 215 deletions(-) create mode 100644 Assets/Punch.cs create mode 100644 Assets/Punch.cs.meta diff --git a/Assets/Animations/Bones/Bones.controller b/Assets/Animations/Bones/Bones.controller index 120d700..d8f971a 100644 --- a/Assets/Animations/Bones/Bones.controller +++ b/Assets/Animations/Bones/Bones.controller @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1101 &-7951230361386602773 +--- !u!1101 &-8088454279998633666 AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -24,8 +24,8 @@ AnimatorStateTransition: m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 - m_CanTransitionToSelf: 0 ---- !u!1101 &-7336001256458513922 + m_CanTransitionToSelf: 1 +--- !u!1101 &-3289816270970516984 AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -35,21 +35,46 @@ AnimatorStateTransition: m_Conditions: - m_ConditionMode: 6 m_ConditionEvent: state - m_EventTreshold: 2 + m_EventTreshold: 1 m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: -65348665591799820} + m_DstState: {fileID: 2600039493493020915} m_Solo: 0 m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.2 + m_TransitionDuration: 0.25 m_TransitionOffset: 0 m_ExitTime: 0.75 m_HasExitTime: 0 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 - m_CanTransitionToSelf: 0 + m_CanTransitionToSelf: 1 +--- !u!1101 &-3226116647278939360 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 6 + m_ConditionEvent: state + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1699472617733096240} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.1 + m_TransitionOffset: 0 + m_ExitTime: 0.625 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1107 &-1538096663108953913 AnimatorStateMachine: serializedVersion: 6 @@ -61,7 +86,7 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: 2600039493493020915} - m_Position: {x: 290, y: 0, z: 0} + m_Position: {x: 550, y: 0, z: 0} - serializedVersion: 1 m_State: {fileID: -65348665591799820} m_Position: {x: 290, y: 50, z: 0} @@ -70,21 +95,19 @@ AnimatorStateMachine: m_Position: {x: 290, y: -50, z: 0} - serializedVersion: 1 m_State: {fileID: 4390441580030614539} - m_Position: {x: 325, y: 15, z: 0} + m_Position: {x: 60, y: 80, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: - - {fileID: -7951230361386602773} - - {fileID: -325823806790880945} - - {fileID: -7336001256458513922} + - {fileID: 5263795009836994554} m_EntryTransitions: [] m_StateMachineTransitions: {} m_StateMachineBehaviours: [] m_AnyStatePosition: {x: 80, y: 0, z: 0} - m_EntryPosition: {x: 540, y: 0, z: 0} + m_EntryPosition: {x: 890, y: 0, z: 0} m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: 2600039493493020915} ---- !u!1101 &-325823806790880945 +--- !u!1101 &-1491732674038617540 AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -108,7 +131,32 @@ AnimatorStateTransition: m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 - m_CanTransitionToSelf: 0 + m_CanTransitionToSelf: 1 +--- !u!1101 &-1027424570895581804 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 6 + m_ConditionEvent: state + m_EventTreshold: 2 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -65348665591799820} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.2 + m_TransitionOffset: 0 + m_ExitTime: 0.625 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &-65348665591799820 AnimatorState: serializedVersion: 6 @@ -119,7 +167,9 @@ AnimatorState: m_Name: Jump m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: -1491732674038617540} + - {fileID: -3289816270970516984} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -150,6 +200,12 @@ AnimatorController: m_DefaultInt: 0 m_DefaultBool: 0 m_Controller: {fileID: 9100000} + - m_Name: punch + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 1 + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -163,6 +219,31 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} +--- !u!1101 &1187931533429329025 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 6 + m_ConditionEvent: state + m_EventTreshold: 2 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -65348665591799820} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.2 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &1699472617733096240 AnimatorState: serializedVersion: 6 @@ -173,7 +254,9 @@ AnimatorState: m_Name: Idle m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: -8088454279998633666} + - {fileID: 1187931533429329025} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -199,7 +282,9 @@ AnimatorState: m_Name: Walk m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: -3226116647278939360} + - {fileID: -1027424570895581804} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -225,7 +310,8 @@ AnimatorState: m_Name: TrevorPunch m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: 7801668757208663834} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -241,3 +327,50 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &5263795009836994554 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: punch + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 4390441580030614539} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.05 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &7801668757208663834 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1699472617733096240} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.1 + m_TransitionOffset: 0 + m_ExitTime: 0.7972973 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 diff --git a/Assets/Animations/Bones/TrevorPunch.anim b/Assets/Animations/Bones/TrevorPunch.anim index ccabeb7..763f062 100644 --- a/Assets/Animations/Bones/TrevorPunch.anim +++ b/Assets/Animations/Bones/TrevorPunch.anim @@ -27,7 +27,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.5 + time: 0.23333333 value: {x: 0, y: 0, z: 139.676} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -36,7 +36,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.6666667 + time: 0.4 value: {x: 0, y: 0, z: 271.124} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -45,7 +45,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.9166667 + time: 0.65 value: {x: 0, y: 0, z: 139.676} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -54,7 +54,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 1.2333333 + time: 0.96666664 value: {x: 0, y: 0, z: 180} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -79,7 +79,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.5 + time: 0.23333333 value: {x: 0, y: 0, z: 190.902} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -88,7 +88,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.6666667 + time: 0.4 value: {x: 0, y: 0, z: 177.707} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -97,7 +97,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 1.2333333 + time: 0.96666664 value: {x: 0, y: 0, z: 180} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -122,7 +122,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.5 + time: 0.23333333 value: {x: 0, y: 0, z: 175.441} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -131,16 +131,16 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.6666667 + time: 0.4 value: {x: 0, y: 0, z: 187.54} - inSlope: {x: 0, y: 0, z: 0.65460175} - outSlope: {x: 0, y: 0, z: 0.65460175} + inSlope: {x: 0, y: 0, z: 0.6546018} + outSlope: {x: 0, y: 0, z: 0.6546018} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 1.2333333 + time: 0.96666664 value: {x: 0, y: 0, z: 187.66} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -165,7 +165,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.5 + time: 0.23333333 value: {x: 0, y: 0, z: 168.801} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -174,16 +174,16 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.6666667 + time: 0.4 value: {x: 0, y: 0, z: 180.9} - inSlope: {x: 0, y: 0, z: 0.66001236} - outSlope: {x: 0, y: 0, z: 0.66001236} + inSlope: {x: 0, y: 0, z: 0.6600124} + outSlope: {x: 0, y: 0, z: 0.6600124} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 1.2333333 + time: 0.96666664 value: {x: 0, y: 0, z: 181.021} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -208,7 +208,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.5 + time: 0.23333333 value: {x: 0, y: 0, z: 111.883} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -217,7 +217,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.6666667 + time: 0.4 value: {x: 0, y: 0, z: 1.817} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -226,7 +226,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.9166667 + time: 0.65 value: {x: 0, y: 0, z: 111.883} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -251,7 +251,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.6666667 + time: 0.4 value: {x: 0, y: 0, z: 156.099} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -276,7 +276,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.6666667 + time: 0.4 value: {x: 0, y: 0, z: 55.933} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -368,7 +368,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1.2333333 + m_StopTime: 0.96666664 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -398,7 +398,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5 + time: 0.23333333 value: 0 inSlope: 0 outSlope: 0 @@ -407,7 +407,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.6666667 + time: 0.4 value: 0 inSlope: 0 outSlope: 0 @@ -416,7 +416,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.9166667 + time: 0.65 value: 0 inSlope: 0 outSlope: 0 @@ -425,7 +425,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.2333333 + time: 0.96666664 value: 0 inSlope: 0 outSlope: 0 @@ -455,7 +455,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5 + time: 0.23333333 value: 0 inSlope: 0 outSlope: 0 @@ -464,7 +464,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.6666667 + time: 0.4 value: 0 inSlope: 0 outSlope: 0 @@ -473,7 +473,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.9166667 + time: 0.65 value: 0 inSlope: 0 outSlope: 0 @@ -482,7 +482,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.2333333 + time: 0.96666664 value: 0 inSlope: 0 outSlope: 0 @@ -512,7 +512,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5 + time: 0.23333333 value: 139.676 inSlope: 0 outSlope: 0 @@ -521,7 +521,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.6666667 + time: 0.4 value: 271.124 inSlope: 0 outSlope: 0 @@ -530,7 +530,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.9166667 + time: 0.65 value: 139.676 inSlope: 0 outSlope: 0 @@ -539,7 +539,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.2333333 + time: 0.96666664 value: 180 inSlope: 0 outSlope: 0 @@ -569,7 +569,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5 + time: 0.23333333 value: 0 inSlope: 0 outSlope: 0 @@ -578,7 +578,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.6666667 + time: 0.4 value: 0 inSlope: 0 outSlope: 0 @@ -587,7 +587,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.2333333 + time: 0.96666664 value: 0 inSlope: 0 outSlope: 0 @@ -617,7 +617,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5 + time: 0.23333333 value: 0 inSlope: 0 outSlope: 0 @@ -626,7 +626,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.6666667 + time: 0.4 value: 0 inSlope: 0 outSlope: 0 @@ -635,7 +635,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.2333333 + time: 0.96666664 value: 0 inSlope: 0 outSlope: 0 @@ -665,7 +665,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5 + time: 0.23333333 value: 190.902 inSlope: 0 outSlope: 0 @@ -674,7 +674,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.6666667 + time: 0.4 value: 177.707 inSlope: 0 outSlope: 0 @@ -683,7 +683,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.2333333 + time: 0.96666664 value: 180 inSlope: 0 outSlope: 0 @@ -713,7 +713,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5 + time: 0.23333333 value: 0 inSlope: 0 outSlope: 0 @@ -722,7 +722,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.6666667 + time: 0.4 value: 0 inSlope: 0 outSlope: 0 @@ -731,7 +731,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.2333333 + time: 0.96666664 value: 0 inSlope: 0 outSlope: 0 @@ -761,7 +761,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5 + time: 0.23333333 value: 0 inSlope: 0 outSlope: 0 @@ -770,7 +770,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.6666667 + time: 0.4 value: 0 inSlope: 0 outSlope: 0 @@ -779,7 +779,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.2333333 + time: 0.96666664 value: 0 inSlope: 0 outSlope: 0 @@ -809,7 +809,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5 + time: 0.23333333 value: 175.441 inSlope: 0 outSlope: 0 @@ -818,16 +818,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.6666667 + time: 0.4 value: 187.54 - inSlope: 0.65460175 - outSlope: 0.65460175 + inSlope: 0.6546018 + outSlope: 0.6546018 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.2333333 + time: 0.96666664 value: 187.66 inSlope: 0 outSlope: 0 @@ -857,7 +857,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5 + time: 0.23333333 value: 0 inSlope: 0 outSlope: 0 @@ -866,7 +866,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.6666667 + time: 0.4 value: 0 inSlope: 0 outSlope: 0 @@ -875,7 +875,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.2333333 + time: 0.96666664 value: 0 inSlope: 0 outSlope: 0 @@ -905,7 +905,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5 + time: 0.23333333 value: 0 inSlope: 0 outSlope: 0 @@ -914,7 +914,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.6666667 + time: 0.4 value: 0 inSlope: 0 outSlope: 0 @@ -923,7 +923,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.2333333 + time: 0.96666664 value: 0 inSlope: 0 outSlope: 0 @@ -953,7 +953,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5 + time: 0.23333333 value: 168.801 inSlope: 0 outSlope: 0 @@ -962,16 +962,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.6666667 + time: 0.4 value: 180.9 - inSlope: 0.66001236 - outSlope: 0.66001236 + inSlope: 0.6600124 + outSlope: 0.6600124 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.2333333 + time: 0.96666664 value: 181.021 inSlope: 0 outSlope: 0 @@ -1001,7 +1001,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5 + time: 0.23333333 value: 0 inSlope: 0 outSlope: 0 @@ -1010,7 +1010,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.6666667 + time: 0.4 value: 0 inSlope: 0 outSlope: 0 @@ -1019,7 +1019,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.9166667 + time: 0.65 value: 0 inSlope: 0 outSlope: 0 @@ -1049,7 +1049,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5 + time: 0.23333333 value: 0 inSlope: 0 outSlope: 0 @@ -1058,7 +1058,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.6666667 + time: 0.4 value: 0 inSlope: 0 outSlope: 0 @@ -1067,7 +1067,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.9166667 + time: 0.65 value: 0 inSlope: 0 outSlope: 0 @@ -1097,7 +1097,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5 + time: 0.23333333 value: 111.883 inSlope: 0 outSlope: 0 @@ -1106,7 +1106,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.6666667 + time: 0.4 value: 1.817 inSlope: 0 outSlope: 0 @@ -1115,7 +1115,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.9166667 + time: 0.65 value: 111.883 inSlope: 0 outSlope: 0 @@ -1145,7 +1145,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.6666667 + time: 0.4 value: 0 inSlope: 0 outSlope: 0 @@ -1175,7 +1175,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.6666667 + time: 0.4 value: 0 inSlope: 0 outSlope: 0 @@ -1205,7 +1205,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.6666667 + time: 0.4 value: 156.099 inSlope: 0 outSlope: 0 @@ -1235,7 +1235,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.6666667 + time: 0.4 value: 0 inSlope: 0 outSlope: 0 @@ -1265,7 +1265,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.6666667 + time: 0.4 value: 0 inSlope: 0 outSlope: 0 @@ -1295,7 +1295,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.6666667 + time: 0.4 value: 55.933 inSlope: 0 outSlope: 0 @@ -1312,114 +1312,6 @@ AnimationClip: script: {fileID: 0} flags: 16 m_EulerEditorCurves: - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.z - path: Torso - classID: 4 - script: {fileID: 0} - flags: 0 - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.y - path: Torso - classID: 4 - script: {fileID: 0} - flags: 0 - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.x - path: Torso - classID: 4 - script: {fileID: 0} - flags: 0 - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.z - path: Torso/Arm L/Arm L L - classID: 4 - script: {fileID: 0} - flags: 0 - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.y - path: Torso/Arm L/Arm L L - classID: 4 - script: {fileID: 0} - flags: 0 - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.x - path: Torso/Arm L/Arm L L - classID: 4 - script: {fileID: 0} - flags: 0 - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.z - path: Torso/Arm R/Arm R L - classID: 4 - script: {fileID: 0} - flags: 0 - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.y - path: Torso/Arm R/Arm R L - classID: 4 - script: {fileID: 0} - flags: 0 - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.x - path: Torso/Arm R/Arm R L - classID: 4 - script: {fileID: 0} - flags: 0 - serializedVersion: 2 curve: serializedVersion: 2 @@ -1499,7 +1391,7 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: m_LocalEulerAngles.x + attribute: m_LocalEulerAngles.z path: Torso/Arm R classID: 4 script: {fileID: 0} @@ -1523,11 +1415,119 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: m_LocalEulerAngles.z + attribute: m_LocalEulerAngles.x path: Torso/Arm R classID: 4 script: {fileID: 0} flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: Torso/Arm R/Arm R L + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: Torso/Arm R/Arm R L + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: Torso/Arm R/Arm R L + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: Torso + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: Torso + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: Torso + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: Torso/Arm L/Arm L L + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: Torso/Arm L/Arm L L + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: Torso/Arm L/Arm L L + classID: 4 + script: {fileID: 0} + flags: 0 - serializedVersion: 2 curve: serializedVersion: 2 diff --git a/Assets/Input System/Player Actions.inputactions b/Assets/Input System/Player Actions.inputactions index ee883f7..6b22971 100644 --- a/Assets/Input System/Player Actions.inputactions +++ b/Assets/Input System/Player Actions.inputactions @@ -23,6 +23,15 @@ "interactions": "", "initialStateCheck": false }, + { + "name": "Punch", + "type": "Button", + "id": "6fc12f4a-f346-4caf-a5f8-9d0f344122c3", + "expectedControlType": "", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, { "name": "Join", "type": "Button", @@ -122,10 +131,65 @@ "isComposite": false, "isPartOfComposite": true }, + { + "name": "Arrow Keys", + "id": "9173ff2d-9797-4ef9-bc5b-cee95168ec6e", + "path": "Dpad", + "interactions": "", + "processors": "", + "groups": "", + "action": "Move", + "isComposite": true, + "isPartOfComposite": false + }, + { + "name": "up", + "id": "f3aa205f-a912-46ce-9018-4534b3d77ae9", + "path": "/upArrow", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Move", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "down", + "id": "7a97e1f5-1f55-46d9-9125-af294176511f", + "path": "/downArrow", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Move", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "left", + "id": "159cfd41-0d56-432e-b56c-34814abf49bb", + "path": "/leftArrow", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Move", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "right", + "id": "1a6aaa10-c994-4582-9e83-900289bd75da", + "path": "/rightArrow", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Move", + "isComposite": false, + "isPartOfComposite": true + }, { "name": "", "id": "6f8632d2-312f-4559-8fdd-d17a3c226436", - "path": "/e", + "path": "/space", "interactions": "", "processors": "", "groups": ";Keyboard&Mouse", @@ -165,6 +229,28 @@ "action": "Join", "isComposite": false, "isPartOfComposite": false + }, + { + "name": "", + "id": "579f259d-1883-4fa5-bb3f-e564431fd795", + "path": "/e", + "interactions": "", + "processors": "", + "groups": "", + "action": "Punch", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "b2af80b4-883d-4a96-982d-c1fa16fd900d", + "path": "/buttonWest", + "interactions": "", + "processors": "", + "groups": "", + "action": "Punch", + "isComposite": false, + "isPartOfComposite": false } ] }, diff --git a/Assets/Prefabs/Bones.prefab b/Assets/Prefabs/Bones.prefab index 391bb7f..d14abe2 100644 --- a/Assets/Prefabs/Bones.prefab +++ b/Assets/Prefabs/Bones.prefab @@ -16,6 +16,7 @@ GameObject: - component: {fileID: 1169583671018505929} - component: {fileID: 2344147968324054325} - component: {fileID: 8121950008105218343} + - component: {fileID: 5190430079571461372} m_Layer: 0 m_Name: Bones m_TagString: Untagged @@ -224,6 +225,18 @@ BoxCollider2D: m_AutoTiling: 0 m_Size: {x: 0.4505486, y: 1.9777327} m_EdgeRadius: 0 +--- !u!114 &5190430079571461372 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1375850422501237868} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9ae332d743f1a42ce8ee7a958853bcc1, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1648017802882051395 GameObject: m_ObjectHideFlags: 0 @@ -250,13 +263,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1648017802882051395} serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0.013222396, w: -0.9999126} + m_LocalRotation: {x: -0, y: -0, z: -0.33692652, w: -0.94153094} m_LocalPosition: {x: 0, y: -0.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4818486997278545909} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 1.515} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 39.379} --- !u!212 &5602021945915386438 SpriteRenderer: m_ObjectHideFlags: 0 @@ -1195,13 +1208,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5600043765235685887} serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: 0.31969908, w: 0.9475191} m_LocalPosition: {x: 0, y: -0.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3359136527054329610} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 37.289} --- !u!212 &1263635959652575642 SpriteRenderer: m_ObjectHideFlags: 0 diff --git a/Assets/Punch.cs b/Assets/Punch.cs new file mode 100644 index 0000000..ec1cc2c --- /dev/null +++ b/Assets/Punch.cs @@ -0,0 +1,22 @@ +using UnityEngine; +using UnityEngine.InputSystem; + +[RequireComponent(typeof(PlayerInput))] +[RequireComponent(typeof(AnimationPlayer))] +public class Punch : MonoBehaviour +{ + InputActionAsset actions; + + private void Start() + { + actions = GetComponent().actions; + } + + private void Update() + { + if (actions.FindAction("Punch").ReadValue() == 1f) + { + GetComponent().Punch(); + } + } +} diff --git a/Assets/Punch.cs.meta b/Assets/Punch.cs.meta new file mode 100644 index 0000000..d0e13ae --- /dev/null +++ b/Assets/Punch.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 9ae332d743f1a42ce8ee7a958853bcc1 \ No newline at end of file diff --git a/Assets/Scripts/AnimationPlayer.cs b/Assets/Scripts/AnimationPlayer.cs index 99b29d8..81e2610 100644 --- a/Assets/Scripts/AnimationPlayer.cs +++ b/Assets/Scripts/AnimationPlayer.cs @@ -28,4 +28,9 @@ public class AnimationPlayer : MonoBehaviour { this.state = state; } + + public void Punch() + { + animator.SetTrigger("punch"); + } } From 7a646ca1ea16d5e5348523f09042d0faabb03e22 Mon Sep 17 00:00:00 2001 From: RochesterX Date: Fri, 17 Jan 2025 19:46:17 -0500 Subject: [PATCH 23/25] Implement player punch and crude damage system --- Assets/Animations/Bones/TrevorPunch.anim | 1615 +++++++++++++++++++--- Assets/Prefabs/Bones.prefab | 124 +- Assets/Punch.cs | 22 - Assets/Scripts/Damageable.cs | 35 + Assets/Scripts/Damageable.cs.meta | 2 + Assets/Scripts/PlayerMovement.cs | 34 +- Assets/Scripts/Punch.cs | 49 + Assets/{ => Scripts}/Punch.cs.meta | 0 Assets/Scripts/RespawnOnTriggerEnter.cs | 4 + ProjectSettings/TagManager.asset | 1 + 10 files changed, 1646 insertions(+), 240 deletions(-) delete mode 100644 Assets/Punch.cs create mode 100644 Assets/Scripts/Damageable.cs create mode 100644 Assets/Scripts/Damageable.cs.meta create mode 100644 Assets/Scripts/Punch.cs rename Assets/{ => Scripts}/Punch.cs.meta (100%) diff --git a/Assets/Animations/Bones/TrevorPunch.anim b/Assets/Animations/Bones/TrevorPunch.anim index 763f062..fdb9c27 100644 --- a/Assets/Animations/Bones/TrevorPunch.anim +++ b/Assets/Animations/Bones/TrevorPunch.anim @@ -27,8 +27,8 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.23333333 - value: {x: 0, y: 0, z: 139.676} + time: 0.083333336 + value: {x: 0, y: 0, z: 129.31} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -36,8 +36,8 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.4 - value: {x: 0, y: 0, z: 271.124} + time: 0.25 + value: {x: 0, y: 0, z: 253.36499} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -45,16 +45,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.65 - value: {x: 0, y: 0, z: 139.676} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.96666664 + time: 0.5 value: {x: 0, y: 0, z: 180} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -79,8 +70,8 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.23333333 - value: {x: 0, y: 0, z: 190.902} + time: 0.083333336 + value: {x: 0, y: 0, z: 185.213} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -88,8 +79,8 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.4 - value: {x: 0, y: 0, z: 177.707} + time: 0.25 + value: {x: 0, y: 0, z: 176.435} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -97,7 +88,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.96666664 + time: 0.5 value: {x: 0, y: 0, z: 180} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -122,8 +113,8 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.23333333 - value: {x: 0, y: 0, z: 175.441} + time: 0.083333336 + value: {x: 0, y: 0, z: 188.47} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -131,16 +122,16 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.4 - value: {x: 0, y: 0, z: 187.54} - inSlope: {x: 0, y: 0, z: 0.6546018} - outSlope: {x: 0, y: 0, z: 0.6546018} + time: 0.25 + value: {x: 0, y: 0, z: 177.267} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.96666664 + time: 0.5 value: {x: 0, y: 0, z: 187.66} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -165,8 +156,17 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.23333333 - value: {x: 0, y: 0, z: 168.801} + time: 0.083333336 + value: {x: 0, y: 0, z: 162.868} + inSlope: {x: 0, y: 0, z: -138.86401} + outSlope: {x: 0, y: 0, z: -138.86401} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.25 + value: {x: 0, y: 0, z: 146.305} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -174,16 +174,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.4 - value: {x: 0, y: 0, z: 180.9} - inSlope: {x: 0, y: 0, z: 0.6600124} - outSlope: {x: 0, y: 0, z: 0.6600124} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.96666664 + time: 0.5 value: {x: 0, y: 0, z: 181.021} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -208,8 +199,8 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.23333333 - value: {x: 0, y: 0, z: 111.883} + time: 0.083333336 + value: {x: 0, y: 0, z: 127.369} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -217,17 +208,26 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.4 - value: {x: 0, y: 0, z: 1.817} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} + time: 0.16666667 + value: {x: 0, y: 0, z: 102.059} + inSlope: {x: 0, y: 0, z: -600.47406} + outSlope: {x: 0, y: 0, z: -600.47406} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.65 - value: {x: 0, y: 0, z: 111.883} + time: 0.25 + value: {x: 0, y: 0, z: 27.29} + inSlope: {x: 0, y: 0, z: -301.63202} + outSlope: {x: 0, y: 0, z: -301.63202} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.5 + value: {x: 0, y: 0, z: 1.515} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -251,8 +251,26 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.4 - value: {x: 0, y: 0, z: 156.099} + time: 0.083333336 + value: {x: 0, y: 0, z: 193.962} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.25 + value: {x: 0, y: 0, z: 123.085} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.5 + value: {x: 0, y: 0, z: 180} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -276,8 +294,26 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.4 - value: {x: 0, y: 0, z: 55.933} + time: 0.083333336 + value: {x: 0, y: 0, z: 141.292} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.25 + value: {x: 0, y: 0, z: 126.288} + inSlope: {x: 0, y: 0, z: -144.03845} + outSlope: {x: 0, y: 0, z: -144.03845} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.5 + value: {x: 0, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -288,7 +324,213 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 path: Torso/Arm R/Arm R L - m_PositionCurves: [] + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, z: -6.177} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.083333336 + value: {x: 0, y: 0, z: -16.969} + inSlope: {x: 0, y: 0, z: -132.232} + outSlope: {x: 0, y: 0, z: -132.232} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.25 + value: {x: 0, y: 0, z: -39.235} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.5 + value: {x: 0, y: 0, z: -6.177} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: Torso/Leg R U/Leg R L + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, z: -8.544} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.083333336 + value: {x: 0, y: 0, z: -21.221} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.25 + value: {x: 0, y: 0, z: -21.221} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.5 + value: {x: 0, y: 0, z: -8.544} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: Torso/Leg L U/Leg L L + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, z: 180} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.083333336 + value: {x: 0, y: 0, z: 182.069} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.25 + value: {x: 0, y: 0, z: 177.233} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.5 + value: {x: 0, y: 0, z: 180} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: Torso/Head + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0.048, y: 0.001, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.083333336 + value: {x: 0.048, y: -0.053, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.25 + value: {x: 0.381, y: -0.053, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.5 + value: {x: 0.048, y: 0.001, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: Torso + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: -0.75, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.25 + value: {x: -0.031, y: -0.746, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.5 + value: {x: 0, y: -0.75, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: Torso/Head m_ScaleCurves: [] m_FloatCurves: [] m_PPtrCurves: [] @@ -299,6 +541,24 @@ AnimationClip: m_Extent: {x: 0, y: 0, z: 0} m_ClipBindingConstant: genericBindings: + - serializedVersion: 2 + path: 3869152129 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 2146230158 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 - serializedVersion: 2 path: 4207337212 attribute: 4 @@ -362,13 +622,40 @@ AnimationClip: isPPtrCurve: 0 isIntCurve: 0 isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 4076665333 + attribute: 4 + script: {fileID: 0} + typeID: 4 + customType: 4 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 415537218 + attribute: 4 + script: {fileID: 0} + typeID: 4 + customType: 4 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 2146230158 + attribute: 4 + script: {fileID: 0} + typeID: 4 + customType: 4 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.96666664 + m_StopTime: 0.5 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -398,7 +685,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.23333333 + time: 0.083333336 value: 0 inSlope: 0 outSlope: 0 @@ -407,7 +694,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.4 + time: 0.25 value: 0 inSlope: 0 outSlope: 0 @@ -416,16 +703,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.65 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.96666664 + time: 0.5 value: 0 inSlope: 0 outSlope: 0 @@ -455,7 +733,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.23333333 + time: 0.083333336 value: 0 inSlope: 0 outSlope: 0 @@ -464,7 +742,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.4 + time: 0.25 value: 0 inSlope: 0 outSlope: 0 @@ -473,16 +751,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.65 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.96666664 + time: 0.5 value: 0 inSlope: 0 outSlope: 0 @@ -512,8 +781,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.23333333 - value: 139.676 + time: 0.083333336 + value: 129.31 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -521,8 +790,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.4 - value: 271.124 + time: 0.25 + value: 253.36499 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -530,16 +799,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.65 - value: 139.676 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.96666664 + time: 0.5 value: 180 inSlope: 0 outSlope: 0 @@ -569,7 +829,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.23333333 + time: 0.083333336 value: 0 inSlope: 0 outSlope: 0 @@ -578,7 +838,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.4 + time: 0.25 value: 0 inSlope: 0 outSlope: 0 @@ -587,7 +847,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.96666664 + time: 0.5 value: 0 inSlope: 0 outSlope: 0 @@ -617,7 +877,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.23333333 + time: 0.083333336 value: 0 inSlope: 0 outSlope: 0 @@ -626,7 +886,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.4 + time: 0.25 value: 0 inSlope: 0 outSlope: 0 @@ -635,7 +895,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.96666664 + time: 0.5 value: 0 inSlope: 0 outSlope: 0 @@ -665,8 +925,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.23333333 - value: 190.902 + time: 0.083333336 + value: 185.213 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -674,8 +934,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.4 - value: 177.707 + time: 0.25 + value: 176.435 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -683,7 +943,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.96666664 + time: 0.5 value: 180 inSlope: 0 outSlope: 0 @@ -713,7 +973,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.23333333 + time: 0.083333336 value: 0 inSlope: 0 outSlope: 0 @@ -722,7 +982,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.4 + time: 0.25 value: 0 inSlope: 0 outSlope: 0 @@ -731,7 +991,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.96666664 + time: 0.5 value: 0 inSlope: 0 outSlope: 0 @@ -761,7 +1021,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.23333333 + time: 0.083333336 value: 0 inSlope: 0 outSlope: 0 @@ -770,7 +1030,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.4 + time: 0.25 value: 0 inSlope: 0 outSlope: 0 @@ -779,7 +1039,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.96666664 + time: 0.5 value: 0 inSlope: 0 outSlope: 0 @@ -809,8 +1069,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.23333333 - value: 175.441 + time: 0.083333336 + value: 188.47 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -818,16 +1078,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.4 - value: 187.54 - inSlope: 0.6546018 - outSlope: 0.6546018 + time: 0.25 + value: 177.267 + inSlope: 0 + outSlope: 0 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.96666664 + time: 0.5 value: 187.66 inSlope: 0 outSlope: 0 @@ -857,7 +1117,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.23333333 + time: 0.083333336 value: 0 inSlope: 0 outSlope: 0 @@ -866,7 +1126,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.4 + time: 0.25 value: 0 inSlope: 0 outSlope: 0 @@ -875,7 +1135,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.96666664 + time: 0.5 value: 0 inSlope: 0 outSlope: 0 @@ -905,7 +1165,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.23333333 + time: 0.083333336 value: 0 inSlope: 0 outSlope: 0 @@ -914,7 +1174,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.4 + time: 0.25 value: 0 inSlope: 0 outSlope: 0 @@ -923,7 +1183,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.96666664 + time: 0.5 value: 0 inSlope: 0 outSlope: 0 @@ -953,8 +1213,17 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.23333333 - value: 168.801 + time: 0.083333336 + value: 162.868 + inSlope: -138.86401 + outSlope: -138.86401 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.25 + value: 146.305 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -962,16 +1231,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.4 - value: 180.9 - inSlope: 0.6600124 - outSlope: 0.6600124 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.96666664 + time: 0.5 value: 181.021 inSlope: 0 outSlope: 0 @@ -1001,7 +1261,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.23333333 + time: 0.083333336 value: 0 inSlope: 0 outSlope: 0 @@ -1010,7 +1270,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.4 + time: 0.16666667 value: 0 inSlope: 0 outSlope: 0 @@ -1019,7 +1279,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.65 + time: 0.25 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 value: 0 inSlope: 0 outSlope: 0 @@ -1049,7 +1318,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.23333333 + time: 0.083333336 value: 0 inSlope: 0 outSlope: 0 @@ -1058,7 +1327,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.4 + time: 0.16666667 value: 0 inSlope: 0 outSlope: 0 @@ -1067,7 +1336,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.65 + time: 0.25 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 value: 0 inSlope: 0 outSlope: 0 @@ -1097,8 +1375,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.23333333 - value: 111.883 + time: 0.083333336 + value: 127.369 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -1106,17 +1384,26 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.4 - value: 1.817 - inSlope: 0 - outSlope: 0 + time: 0.16666667 + value: 102.059 + inSlope: -600.47406 + outSlope: -600.47406 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.65 - value: 111.883 + time: 0.25 + value: 27.29 + inSlope: -301.63202 + outSlope: -301.63202 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 1.515 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -1145,7 +1432,25 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.4 + time: 0.083333336 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.25 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 value: 0 inSlope: 0 outSlope: 0 @@ -1175,7 +1480,25 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.4 + time: 0.083333336 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.25 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 value: 0 inSlope: 0 outSlope: 0 @@ -1205,8 +1528,26 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.4 - value: 156.099 + time: 0.083333336 + value: 193.962 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.25 + value: 123.085 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 180 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -1235,7 +1576,25 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.4 + time: 0.083333336 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.25 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 value: 0 inSlope: 0 outSlope: 0 @@ -1265,7 +1624,25 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.4 + time: 0.083333336 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.25 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 value: 0 inSlope: 0 outSlope: 0 @@ -1295,8 +1672,26 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.4 - value: 55.933 + time: 0.083333336 + value: 141.292 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.25 + value: 126.288 + inSlope: -144.03845 + outSlope: -144.03845 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -1311,6 +1706,699 @@ AnimationClip: classID: 4 script: {fileID: 0} flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.083333336 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.25 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.x + path: Torso/Leg R U/Leg R L + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.083333336 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.25 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.y + path: Torso/Leg R U/Leg R L + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -6.177 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.083333336 + value: -16.969 + inSlope: -132.232 + outSlope: -132.232 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.25 + value: -39.235 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: -6.177 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.z + path: Torso/Leg R U/Leg R L + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.083333336 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.25 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.x + path: Torso/Leg L U/Leg L L + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.083333336 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.25 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.y + path: Torso/Leg L U/Leg L L + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -8.544 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.083333336 + value: -21.221 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.25 + value: -21.221 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: -8.544 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.z + path: Torso/Leg L U/Leg L L + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.048 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.083333336 + value: 0.048 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.25 + value: 0.381 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 0.048 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: Torso + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.001 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.083333336 + value: -0.053 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.25 + value: -0.053 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 0.001 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: Torso + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.083333336 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.25 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: Torso + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.083333336 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.25 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.x + path: Torso/Head + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.083333336 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.25 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.y + path: Torso/Head + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 180 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.083333336 + value: 182.069 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.25 + value: 177.233 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 180 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.z + path: Torso/Head + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.25 + value: -0.031 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: Torso/Head + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.75 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.25 + value: -0.746 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: -0.75 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: Torso/Head + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.25 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: Torso/Head + classID: 4 + script: {fileID: 0} + flags: 0 m_EulerEditorCurves: - serializedVersion: 2 curve: @@ -1320,7 +2408,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.z - path: Torso/Leg L U + path: Torso/Arm R classID: 4 script: {fileID: 0} flags: 0 @@ -1332,7 +2420,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.y - path: Torso/Leg L U + path: Torso/Arm R classID: 4 script: {fileID: 0} flags: 0 @@ -1344,7 +2432,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.x - path: Torso/Leg L U + path: Torso/Arm R classID: 4 script: {fileID: 0} flags: 0 @@ -1356,7 +2444,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.z - path: Torso/Arm L + path: Torso/Arm L/Arm L L classID: 4 script: {fileID: 0} flags: 0 @@ -1368,7 +2456,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.y - path: Torso/Arm L + path: Torso/Arm L/Arm L L classID: 4 script: {fileID: 0} flags: 0 @@ -1380,7 +2468,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.x - path: Torso/Arm L + path: Torso/Arm L/Arm L L classID: 4 script: {fileID: 0} flags: 0 @@ -1392,7 +2480,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.z - path: Torso/Arm R + path: Torso/Head classID: 4 script: {fileID: 0} flags: 0 @@ -1404,7 +2492,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.y - path: Torso/Arm R + path: Torso/Head classID: 4 script: {fileID: 0} flags: 0 @@ -1416,7 +2504,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.x - path: Torso/Arm R + path: Torso/Head classID: 4 script: {fileID: 0} flags: 0 @@ -1456,6 +2544,42 @@ AnimationClip: classID: 4 script: {fileID: 0} flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: Torso/Leg R U + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: Torso/Leg R U + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: Torso/Leg R U + classID: 4 + script: {fileID: 0} + flags: 0 - serializedVersion: 2 curve: serializedVersion: 2 @@ -1500,7 +2624,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.z - path: Torso/Arm L/Arm L L + path: Torso/Leg L U classID: 4 script: {fileID: 0} flags: 0 @@ -1512,7 +2636,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.y - path: Torso/Arm L/Arm L L + path: Torso/Leg L U classID: 4 script: {fileID: 0} flags: 0 @@ -1524,31 +2648,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.x - path: Torso/Arm L/Arm L L - classID: 4 - script: {fileID: 0} - flags: 0 - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.x - path: Torso/Leg R U - classID: 4 - script: {fileID: 0} - flags: 0 - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.y - path: Torso/Leg R U + path: Torso/Leg L U classID: 4 script: {fileID: 0} flags: 0 @@ -1560,10 +2660,141 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.z - path: Torso/Leg R U + path: Torso/Leg L U/Leg L L + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: Torso/Leg L U/Leg L L + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: Torso/Leg L U/Leg L L + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: Torso/Arm L + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: Torso/Arm L + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: Torso/Arm L + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: Torso/Leg R U/Leg R L + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: Torso/Leg R U/Leg R L + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: Torso/Leg R U/Leg R L classID: 4 script: {fileID: 0} flags: 0 m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 - m_Events: [] + m_Events: + - time: 0 + functionName: DisableCancellation + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 + - time: 0 + functionName: StopVelocity + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 + - time: 0.16666667 + functionName: EnableHurtbox + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 + - time: 0.28333333 + functionName: DisableHurtbox + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 + - time: 0.33333334 + functionName: EnableCancellation + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/Assets/Prefabs/Bones.prefab b/Assets/Prefabs/Bones.prefab index d14abe2..97d7d96 100644 --- a/Assets/Prefabs/Bones.prefab +++ b/Assets/Prefabs/Bones.prefab @@ -12,11 +12,12 @@ GameObject: - component: {fileID: 4642513082199340961} - component: {fileID: 75167067980600170} - component: {fileID: 6392580824388157607} + - component: {fileID: 5190430079571461372} + - component: {fileID: 2787587001401147982} - component: {fileID: 5200627265685207284} - component: {fileID: 1169583671018505929} - component: {fileID: 2344147968324054325} - component: {fileID: 8121950008105218343} - - component: {fileID: 5190430079571461372} m_Layer: 0 m_Name: Bones m_TagString: Untagged @@ -37,6 +38,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 2063840941502744053} - {fileID: 7290594200745798336} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -58,6 +60,7 @@ MonoBehaviour: walkSpeed: 5 walkSpeedFactor: 30 maxSpeed: 5 + slowdownMultiplier: 40 virtualAxisX: 0 virtualButtonJump: 0 virtualButtonJumpLastFrame: 0 @@ -69,7 +72,6 @@ MonoBehaviour: jumpLenience: 0.1 timeUnableToBeDeclaredNotJumping: 0.1 groundCheckDistance: 0.1 - animate: 1 --- !u!114 &75167067980600170 MonoBehaviour: m_ObjectHideFlags: 0 @@ -100,6 +102,34 @@ MonoBehaviour: state: 0 backwards: 0 clip: {fileID: 7400000, guid: 590f229c565f34c8296a875497c76553, type: 2} +--- !u!114 &5190430079571461372 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1375850422501237868} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9ae332d743f1a42ce8ee7a958853bcc1, type: 3} + m_Name: + m_EditorClassIdentifier: + cancelable: 1 + hurtbox: {fileID: 2982388803569647282} +--- !u!114 &2787587001401147982 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1375850422501237868} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6bac5d744efb2eb40be2220da2d52b35, type: 3} + m_Name: + m_EditorClassIdentifier: + force: 200 + damage: 0 --- !u!114 &5200627265685207284 MonoBehaviour: m_ObjectHideFlags: 0 @@ -225,18 +255,6 @@ BoxCollider2D: m_AutoTiling: 0 m_Size: {x: 0.4505486, y: 1.9777327} m_EdgeRadius: 0 ---- !u!114 &5190430079571461372 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1375850422501237868} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9ae332d743f1a42ce8ee7a958853bcc1, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1648017802882051395 GameObject: m_ObjectHideFlags: 0 @@ -1586,3 +1604,81 @@ BoxCollider2D: m_AutoTiling: 0 m_Size: {x: 0.0625, y: 0.5} m_EdgeRadius: 0 +--- !u!1 &8302541871276031440 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2063840941502744053} + - component: {fileID: 2982388803569647282} + m_Layer: 0 + m_Name: Punch Hurtbox + m_TagString: Punch Hurtbox + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2063840941502744053 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8302541871276031440} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 1.4, y: 0.3, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7009259675412950971} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &2982388803569647282 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8302541871276031440} + m_Enabled: 0 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: -0.5045183, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 2.0090363, y: 0.57673347} + m_EdgeRadius: 0 diff --git a/Assets/Punch.cs b/Assets/Punch.cs deleted file mode 100644 index ec1cc2c..0000000 --- a/Assets/Punch.cs +++ /dev/null @@ -1,22 +0,0 @@ -using UnityEngine; -using UnityEngine.InputSystem; - -[RequireComponent(typeof(PlayerInput))] -[RequireComponent(typeof(AnimationPlayer))] -public class Punch : MonoBehaviour -{ - InputActionAsset actions; - - private void Start() - { - actions = GetComponent().actions; - } - - private void Update() - { - if (actions.FindAction("Punch").ReadValue() == 1f) - { - GetComponent().Punch(); - } - } -} diff --git a/Assets/Scripts/Damageable.cs b/Assets/Scripts/Damageable.cs new file mode 100644 index 0000000..5acaaa0 --- /dev/null +++ b/Assets/Scripts/Damageable.cs @@ -0,0 +1,35 @@ +using UnityEngine; + +[RequireComponent(typeof(Rigidbody2D))] +[RequireComponent(typeof(Collider2D))] +[RequireComponent(typeof(RespawnOnTriggerEnter))] +public class Damageable : MonoBehaviour +{ + public float force = 50f; + public float damage = 0f; + + private void OnTriggerEnter2D(Collider2D collision) + { + if (collision.gameObject.CompareTag("Punch Hurtbox")) + { + print($"{name}: Ouch"); + Damage(); + Recoil(collision.transform.parent.gameObject); + } + } + + private void Recoil(GameObject damageSource) + { + GetComponent().AddForce(((transform.position - damageSource.transform.position).normalized + Vector3.up) * damage, ForceMode2D.Force); + } + + private void Damage() + { + damage += force; + } + + public void ResetDamage() + { + damage = 0f; + } +} diff --git a/Assets/Scripts/Damageable.cs.meta b/Assets/Scripts/Damageable.cs.meta new file mode 100644 index 0000000..45c4f5e --- /dev/null +++ b/Assets/Scripts/Damageable.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 6bac5d744efb2eb40be2220da2d52b35 diff --git a/Assets/Scripts/PlayerMovement.cs b/Assets/Scripts/PlayerMovement.cs index 9210873..fdde188 100644 --- a/Assets/Scripts/PlayerMovement.cs +++ b/Assets/Scripts/PlayerMovement.cs @@ -3,6 +3,11 @@ using UnityEngine; using UnityEngine.InputSystem; using UnityEngine.Tilemaps; +[RequireComponent(typeof(Rigidbody2D))] +[RequireComponent(typeof(BoxCollider2D))] +[RequireComponent(typeof(PlayerInput))] +[RequireComponent(typeof(AnimationPlayer))] +[RequireComponent(typeof(Punch))] public class PlayerMovement : MonoBehaviour { [Header("Ground Layers")] @@ -12,6 +17,7 @@ public class PlayerMovement : MonoBehaviour public float walkSpeed; public float walkSpeedFactor = 1f; public float maxSpeed = 5f; + public float slowdownMultiplier = 10f; public float virtualAxisX; public float virtualButtonJump; public float virtualButtonJumpLastFrame; @@ -27,6 +33,9 @@ public class PlayerMovement : MonoBehaviour private Rigidbody2D body; private BoxCollider2D collide; private PlayerInput input; + private AnimationPlayer animationPlayer; + private Punch punch; + private bool jumpInputStillValid = false; private float lastTimeJumpPressed; @@ -38,9 +47,6 @@ public class PlayerMovement : MonoBehaviour private float lastTimeOnGround; - public bool animate; - private AnimationPlayer animationPlayer; - private Vector3 positionLastFrame; void Start() @@ -50,7 +56,8 @@ public class PlayerMovement : MonoBehaviour body = GetComponent(); collide = GetComponent(); input = GetComponent(); - if (animate) animationPlayer = GetComponent(); + animationPlayer = GetComponent(); + punch = GetComponent(); } private void Update() @@ -71,7 +78,7 @@ public class PlayerMovement : MonoBehaviour private void LateUpdate() { - if (animate) Animate(); + Animate(); } private void Animate() @@ -107,6 +114,8 @@ public class PlayerMovement : MonoBehaviour private void Jump() { + if (!punch.cancelable) return; + if (virtualButtonJumpLastFrame == 1f) { jumpInputStillValid = true; @@ -146,19 +155,15 @@ public class PlayerMovement : MonoBehaviour private void HorizontalMovement() { - //body.linearVelocity = new Vector2(virtualAxisX * walkSpeed, body.linearVelocity.y); + if (!punch.cancelable) return; + body.AddForce(new Vector2(virtualAxisX * walkSpeed * walkSpeedFactor, 0), ForceMode2D.Force); if (Mathf.Abs(body.linearVelocityX) >= maxSpeed) { - body.linearVelocity = new Vector2(Mathf.Sign(body.linearVelocityX) * maxSpeed, body.linearVelocity.y); + body.AddForce(new Vector2(-Mathf.Sign(body.linearVelocityX) * (Mathf.Abs(body.linearVelocityX) - maxSpeed) * slowdownMultiplier, 0)); } - //if (!IsPhysicallyGrounded()) - //{ - body.linearVelocityX *= walkSmooth; - //} - if (transform.position == positionLastFrame && (input.actions.FindAction("Move").ReadValue().x == 0)) { virtualAxisX = 0; @@ -213,4 +218,9 @@ public class PlayerMovement : MonoBehaviour boxCollider2D.bounds.center.y + (vertical * boxCollider2D.bounds.extents.y) ); } + + public void StopVelocity() + { + if (IsPhysicallyGrounded()) body.linearVelocity = Vector2.zero; + } } diff --git a/Assets/Scripts/Punch.cs b/Assets/Scripts/Punch.cs new file mode 100644 index 0000000..2506899 --- /dev/null +++ b/Assets/Scripts/Punch.cs @@ -0,0 +1,49 @@ +using UnityEngine; +using UnityEngine.InputSystem; + +[RequireComponent(typeof(PlayerMovement))] +[RequireComponent(typeof(PlayerInput))] +[RequireComponent(typeof(AnimationPlayer))] +public class Punch : MonoBehaviour +{ + public bool cancelable = true; + + [SerializeField] private BoxCollider2D hurtbox; + + InputActionAsset actions; + + private void Start() + { + actions = GetComponent().actions; + } + + private void Update() + { + if (actions.FindAction("Punch").ReadValue() == 1f) + { + if (!cancelable) return; + GetComponent().Punch(); + DisableCancellation(); + } + } + + public void EnableHurtbox() + { + hurtbox.enabled = true; + } + + public void DisableHurtbox() + { + hurtbox.enabled = false; + } + + public void DisableCancellation() + { + cancelable = false; + } + + public void EnableCancellation() + { + cancelable = true; + } +} diff --git a/Assets/Punch.cs.meta b/Assets/Scripts/Punch.cs.meta similarity index 100% rename from Assets/Punch.cs.meta rename to Assets/Scripts/Punch.cs.meta diff --git a/Assets/Scripts/RespawnOnTriggerEnter.cs b/Assets/Scripts/RespawnOnTriggerEnter.cs index ba6bde1..fd2fba5 100644 --- a/Assets/Scripts/RespawnOnTriggerEnter.cs +++ b/Assets/Scripts/RespawnOnTriggerEnter.cs @@ -23,6 +23,10 @@ public class RespawnOnTriggerEnter : MonoBehaviour { rb.linearVelocity = Vector2.zero; } + if (TryGetComponent(out var damageable)) + { + damageable.ResetDamage(); + } } } } diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 2378d98..f8fa7bc 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -7,6 +7,7 @@ TagManager: - Pong Goal - Pong Paddle - Platformer Hazard + - Punch Hurtbox layers: - Default - TransparentFX From 91c8c40ab520ca18a14ec6c699adb25bc592d2fd Mon Sep 17 00:00:00 2001 From: RochesterX Date: Fri, 17 Jan 2025 20:11:04 -0500 Subject: [PATCH 24/25] More Tweaks --- Assets/Prefabs/Bones.prefab | 280 ++++++++++++++++++++++++++++++- Assets/Scenes/Platformer.unity | 79 +++++++++ Assets/Scripts/Damageable.cs | 2 + Assets/Scripts/PlayerMovement.cs | 5 + 4 files changed, 364 insertions(+), 2 deletions(-) diff --git a/Assets/Prefabs/Bones.prefab b/Assets/Prefabs/Bones.prefab index 97d7d96..69142c0 100644 --- a/Assets/Prefabs/Bones.prefab +++ b/Assets/Prefabs/Bones.prefab @@ -38,6 +38,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 5586015051149451479} - {fileID: 2063840941502744053} - {fileID: 7290594200745798336} m_Father: {fileID: 0} @@ -57,6 +58,7 @@ MonoBehaviour: ground: serializedVersion: 2 m_Bits: 64 + playerText: {fileID: 7508327662230183655} walkSpeed: 5 walkSpeedFactor: 30 maxSpeed: 5 @@ -523,6 +525,108 @@ BoxCollider2D: m_AutoTiling: 0 m_Size: {x: 0.0625, y: 0.5} m_EdgeRadius: 0 +--- !u!1 &1936916972718023967 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5586015051149451479} + - component: {fileID: 4734305610112586858} + - component: {fileID: 1520805838389731254} + - component: {fileID: 7345005991490873819} + m_Layer: 5 + m_Name: Pentagon Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5586015051149451479 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1936916972718023967} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3619771033001887294} + m_Father: {fileID: 7009259675412950971} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!223 &4734305610112586858 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1936916972718023967} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 1 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!114 &1520805838389731254 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1936916972718023967} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 1 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 1920, y: 1080} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 1 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!114 &7345005991490873819 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1936916972718023967} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 --- !u!1 &3572452013539030063 GameObject: m_ObjectHideFlags: 0 @@ -1469,6 +1573,42 @@ BoxCollider2D: m_AutoTiling: 0 m_Size: {x: 0.0625, y: 0.5} m_EdgeRadius: 0 +--- !u!1 &7049027663970876467 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3619771033001887294} + m_Layer: 5 + m_Name: Pentagon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3619771033001887294 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7049027663970876467} + m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 45.5, y: 45.5, z: 45.5} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 8783822715394239814} + m_Father: {fileID: 5586015051149451479} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -29} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7131227584641296005 GameObject: m_ObjectHideFlags: 0 @@ -1604,6 +1744,142 @@ BoxCollider2D: m_AutoTiling: 0 m_Size: {x: 0.0625, y: 0.5} m_EdgeRadius: 0 +--- !u!1 &7570979957438438421 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8783822715394239814} + - component: {fileID: 8381578833477757921} + - component: {fileID: 7508327662230183655} + m_Layer: 5 + m_Name: Pong Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8783822715394239814 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7570979957438438421} + m_LocalRotation: {x: -0, y: -0, z: -0.7071068, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: -212.69974} + m_LocalScale: {x: 0.001, y: 0.001, z: 0.001} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 3619771033001887294} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -10.8496, y: 21.1539} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8381578833477757921 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7570979957438438421} + m_CullTransparentMesh: 1 +--- !u!114 &7508327662230183655 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7570979957438438421} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 1 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: f4b6d771d01664138b2f3db447b45695, type: 2} + m_sharedMaterial: {fileID: 560944918044722035, guid: f4b6d771d01664138b2f3db447b45695, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &8302541871276031440 GameObject: m_ObjectHideFlags: 0 @@ -1670,7 +1946,7 @@ BoxCollider2D: m_UsedByEffector: 0 m_CompositeOperation: 0 m_CompositeOrder: 0 - m_Offset: {x: -0.5045183, y: 0} + m_Offset: {x: 0.38033098, y: 0} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0, y: 0} @@ -1680,5 +1956,5 @@ BoxCollider2D: drawMode: 0 adaptiveTiling: 0 m_AutoTiling: 0 - m_Size: {x: 2.0090363, y: 0.57673347} + m_Size: {x: 2.750043, y: 1.2534463} m_EdgeRadius: 0 diff --git a/Assets/Scenes/Platformer.unity b/Assets/Scenes/Platformer.unity index f690bd9..99c0864 100644 --- a/Assets/Scenes/Platformer.unity +++ b/Assets/Scenes/Platformer.unity @@ -12279,6 +12279,84 @@ TilemapCollider2D: m_MaximumTileChangeCount: 1000 m_ExtrusionFactor: 0 m_UseDelaunayMesh: 0 +--- !u!1 &1335742585 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1335742587} + - component: {fileID: 1335742586} + m_Layer: 0 + m_Name: Void 2 + m_TagString: Platformer Hazard + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!61 &1335742586 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1335742585} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 401.18524, y: 11.169355} + m_EdgeRadius: 0 +--- !u!4 &1335742587 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1335742585} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 44, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1758254987 GameObject: m_ObjectHideFlags: 0 @@ -12437,4 +12515,5 @@ SceneRoots: - {fileID: 8682934954266721942} - {fileID: 322321} - {fileID: 1758254989} + - {fileID: 1335742587} - {fileID: 804358387} diff --git a/Assets/Scripts/Damageable.cs b/Assets/Scripts/Damageable.cs index 5acaaa0..0352241 100644 --- a/Assets/Scripts/Damageable.cs +++ b/Assets/Scripts/Damageable.cs @@ -21,6 +21,7 @@ public class Damageable : MonoBehaviour private void Recoil(GameObject damageSource) { GetComponent().AddForce(((transform.position - damageSource.transform.position).normalized + Vector3.up) * damage, ForceMode2D.Force); + //damageSource.transform.localScale *= 1.1f; } private void Damage() @@ -31,5 +32,6 @@ public class Damageable : MonoBehaviour public void ResetDamage() { damage = 0f; + //transform.localScale = Vector3.one; } } diff --git a/Assets/Scripts/PlayerMovement.cs b/Assets/Scripts/PlayerMovement.cs index fdde188..e6af880 100644 --- a/Assets/Scripts/PlayerMovement.cs +++ b/Assets/Scripts/PlayerMovement.cs @@ -1,4 +1,5 @@ using System.Collections; +using TMPro; using UnityEngine; using UnityEngine.InputSystem; using UnityEngine.Tilemaps; @@ -13,6 +14,8 @@ public class PlayerMovement : MonoBehaviour [Header("Ground Layers")] public LayerMask ground; + public TextMeshProUGUI playerText; + [Header("Movement")] public float walkSpeed; public float walkSpeedFactor = 1f; @@ -58,6 +61,8 @@ public class PlayerMovement : MonoBehaviour input = GetComponent(); animationPlayer = GetComponent(); punch = GetComponent(); + + playerText.text = input.playerIndex.ToString(); } private void Update() From 285a5fb538d442dabf34d350d44497df98265274 Mon Sep 17 00:00:00 2001 From: RochesterX Date: Mon, 20 Jan 2025 18:26:52 -0500 Subject: [PATCH 25/25] Messing with tilemaps --- Assets/Prefabs/Tile Palette.prefab | 10 ++--- Assets/Scenes/Platformer.unity | 56 ++++++++++++------------ Assets/Sprites/Tiles/Square_0.asset | 36 +++++++++++++++ Assets/Sprites/Tiles/Square_0.asset.meta | 8 ++++ Assets/Sprites/Tiles/Square_1.asset | 36 +++++++++++++++ Assets/Sprites/Tiles/Square_1.asset.meta | 8 ++++ 6 files changed, 121 insertions(+), 33 deletions(-) create mode 100644 Assets/Sprites/Tiles/Square_0.asset create mode 100644 Assets/Sprites/Tiles/Square_0.asset.meta create mode 100644 Assets/Sprites/Tiles/Square_1.asset create mode 100644 Assets/Sprites/Tiles/Square_1.asset.meta diff --git a/Assets/Prefabs/Tile Palette.prefab b/Assets/Prefabs/Tile Palette.prefab index 7fb5954..0a70c78 100644 --- a/Assets/Prefabs/Tile Palette.prefab +++ b/Assets/Prefabs/Tile Palette.prefab @@ -42,7 +42,7 @@ Tilemap: m_GameObject: {fileID: 1266732574638700412} m_Enabled: 1 m_Tiles: - - first: {x: -3, y: 0, z: 0} + - first: {x: -1, y: 0, z: 0} second: serializedVersion: 2 m_TileIndex: 0 @@ -84,8 +84,8 @@ Tilemap: m_TileObjectToInstantiateArray: [] m_AnimationFrameRate: 1 m_Color: {r: 1, g: 1, b: 1, a: 1} - m_Origin: {x: -3, y: 0, z: 0} - m_Size: {x: 3, y: 1, z: 1} + m_Origin: {x: -1, y: 0, z: 0} + m_Size: {x: 1, y: 1, z: 1} m_TileAnchor: {x: 0.5, y: 0.5, z: 0} m_TileOrientation: 0 m_TileOrientationMatrix: @@ -115,7 +115,7 @@ TilemapRenderer: m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 - m_DynamicOccludee: 1 + m_DynamicOccludee: 0 m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 @@ -202,7 +202,7 @@ Grid: m_CellGap: {x: 0, y: 0, z: 0} m_CellLayout: 0 m_CellSwizzle: 0 ---- !u!114 &8030602722995540191 +--- !u!114 &767334651253208596 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} diff --git a/Assets/Scenes/Platformer.unity b/Assets/Scenes/Platformer.unity index 99c0864..935d9e2 100644 --- a/Assets/Scenes/Platformer.unity +++ b/Assets/Scenes/Platformer.unity @@ -11982,14 +11982,6 @@ CompositeCollider2D: Y: -30000000 - X: -100000000 Y: -30000000 - - - X: -60000000 - Y: -20000000 - - X: -80000000 - Y: -20000000 - - X: -80000000 - Y: -70000000 - - X: -60000000 - Y: -70000000 - - X: 120000000 Y: -20000000 - X: 100000000 @@ -11998,18 +11990,14 @@ CompositeCollider2D: Y: -40000000 - X: 120000000 Y: -40000000 - - - X: -160000000 - Y: -60000000 - - X: -170000000 - Y: -60000000 - - X: -170000000 - Y: -30000000 - - X: -190000000 - Y: -30000000 - - X: -190000000 - Y: -90000000 - - X: -160000000 - Y: -90000000 + - - X: -60000000 + Y: -20000000 + - X: -80000000 + Y: -20000000 + - X: -80000000 + Y: -70000000 + - X: -60000000 + Y: -70000000 - - X: 260000000 Y: -90000000 - X: 270000000 @@ -12026,14 +12014,18 @@ CompositeCollider2D: Y: -150000000 - X: 260000000 Y: -150000000 - - - X: -210000000 - Y: -50000000 - - X: -250000000 - Y: -50000000 - - X: -250000000 - Y: -70000000 - - X: -210000000 - Y: -70000000 + - - X: -160000000 + Y: -60000000 + - X: -170000000 + Y: -60000000 + - X: -170000000 + Y: -30000000 + - X: -190000000 + Y: -30000000 + - X: -190000000 + Y: -90000000 + - X: -160000000 + Y: -90000000 - - X: 150000000 Y: -50000000 - X: 130000000 @@ -12042,6 +12034,14 @@ CompositeCollider2D: Y: -70000000 - X: 150000000 Y: -70000000 + - - X: -210000000 + Y: -50000000 + - X: -250000000 + Y: -50000000 + - X: -250000000 + Y: -70000000 + - X: -210000000 + Y: -70000000 - - X: 120000000 Y: -80000000 - X: 100000000 diff --git a/Assets/Sprites/Tiles/Square_0.asset b/Assets/Sprites/Tiles/Square_0.asset new file mode 100644 index 0000000..81dc80c --- /dev/null +++ b/Assets/Sprites/Tiles/Square_0.asset @@ -0,0 +1,36 @@ +%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: 13312, guid: 0000000000000000e000000000000000, type: 0} + m_Name: Square_0 + m_EditorClassIdentifier: + m_Sprite: {fileID: 7482667652216324306, guid: b5f1c8f6f05944d649e3fb9af5459160, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Transform: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_InstancedGameObject: {fileID: 0} + m_Flags: 1 + m_ColliderType: 1 diff --git a/Assets/Sprites/Tiles/Square_0.asset.meta b/Assets/Sprites/Tiles/Square_0.asset.meta new file mode 100644 index 0000000..debb02a --- /dev/null +++ b/Assets/Sprites/Tiles/Square_0.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a90c720ce19664bb08bfdc21f6f18c94 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Tiles/Square_1.asset b/Assets/Sprites/Tiles/Square_1.asset new file mode 100644 index 0000000..e96cac4 --- /dev/null +++ b/Assets/Sprites/Tiles/Square_1.asset @@ -0,0 +1,36 @@ +%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: 13312, guid: 0000000000000000e000000000000000, type: 0} + m_Name: Square_1 + m_EditorClassIdentifier: + m_Sprite: {fileID: 1406629073, guid: b5f1c8f6f05944d649e3fb9af5459160, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Transform: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_InstancedGameObject: {fileID: 0} + m_Flags: 1 + m_ColliderType: 1 diff --git a/Assets/Sprites/Tiles/Square_1.asset.meta b/Assets/Sprites/Tiles/Square_1.asset.meta new file mode 100644 index 0000000..30d19ae --- /dev/null +++ b/Assets/Sprites/Tiles/Square_1.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dd7ebd6ddea49432382bac53c04a142e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: