diff options
7 files changed, 213 insertions, 355 deletions
diff --git a/ActiveRagdoll/Assets/TABG/Prefabs/human_rigging.prefab b/ActiveRagdoll/Assets/TABG/Prefabs/human_rigging.prefab index 039007a..56f37d8 100644 --- a/ActiveRagdoll/Assets/TABG/Prefabs/human_rigging.prefab +++ b/ActiveRagdoll/Assets/TABG/Prefabs/human_rigging.prefab @@ -1059,9 +1059,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: transforms: - - {fileID: 1415741251372879280} - - {fileID: 3412188744700893615} - offset: {x: 0, y: 0.6, z: 0.3} + - {fileID: 4068544631671626976} + - {fileID: 4068544631671626976} + offset: {x: 0, y: 0, z: 0.2} --- !u!1 &1639162264 GameObject: m_ObjectHideFlags: 0 @@ -1514,10 +1514,14 @@ MonoBehaviour: - minTime: 0 maxTime: 0 minAngle: 0 - - minTime: 0 - maxTime: 0 - minAngle: 0 + - minTime: 0.25 + maxTime: 1 + minAngle: 40 isLeft: 1 + counter: 0 + leftLeg: {fileID: 0} + rightLeg: {fileID: 0} + hip: {fileID: 0} --- !u!114 &9141217467644992819 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2033,10 +2037,22 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: animations: - values: [] - smoothing: 0 + values: + - forwardTorque: {x: 0, y: 0, z: 0} + backwardsTorque: {x: 0, y: 0, z: 0} + torqueSpace: 0 + forwardForce: {x: 0, y: 0, z: 0} + backwardsForce: {x: 0, y: 0, z: 0} + forceSpace: 0 + - forwardTorque: {x: 0, y: 0, z: 0} + backwardsTorque: {x: 0, y: 0, z: 0} + torqueSpace: 0 + forwardForce: {x: 0, y: 55, z: 0} + backwardsForce: {x: 0, y: -55, z: 0} + forceSpace: 0 + smoothing: 1 multiplier: 1 - isLeft: 0 + isLeft: 1 switchToForwardEvent: m_PersistentCalls: m_Calls: [] @@ -2340,8 +2356,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: animations: - values: [] - smoothing: 0 + values: + - forwardTorque: {x: 0, y: 0, z: 0} + backwardsTorque: {x: 0, y: 0, z: 0} + torqueSpace: 0 + forwardForce: {x: 0, y: 0, z: 0} + backwardsForce: {x: 0, y: 0, z: 0} + forceSpace: 0 + - forwardTorque: {x: 0, y: 0, z: 0} + backwardsTorque: {x: 0, y: 0, z: 0} + torqueSpace: 0 + forwardForce: {x: 0, y: 55, z: 0} + backwardsForce: {x: 0, y: -55, z: 0} + forceSpace: 0 + smoothing: 1 multiplier: 1 isLeft: 0 switchToForwardEvent: @@ -2594,6 +2622,7 @@ GameObject: m_Component: - component: {fileID: 861688529590854405} - component: {fileID: 6902122112011267104} + - component: {fileID: 195317784} m_Layer: 6 m_Name: Rigidbody m_TagString: Untagged @@ -2642,6 +2671,32 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: size: 0.1 +--- !u!114 &195317784 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1254990767818926415} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ffdcfebb31e298f45909264bd508a0ea, type: 3} + m_Name: + m_EditorClassIdentifier: + renderers: + - {fileID: 1116313584} + - {fileID: 1130278584} + - {fileID: 679016043} + - {fileID: 1325114492} + - {fileID: 1711133862} + - {fileID: 1234205112} + - {fileID: 984858214} + - {fileID: 1639162268} + - {fileID: 2047997616} + - {fileID: 781237318} + - {fileID: 312893420} + - {fileID: 1642247843} + draw: 1 --- !u!1 &1515111015024255430 GameObject: m_ObjectHideFlags: 0 @@ -3603,8 +3658,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: animations: - values: [] - smoothing: 0 + values: + - forwardTorque: {x: 0, y: 0, z: 0} + backwardsTorque: {x: 0, y: 0, z: 0} + torqueSpace: 0 + forwardForce: {x: 0, y: 0, z: 0} + backwardsForce: {x: 0, y: 0, z: 0} + forceSpace: 0 + - forwardTorque: {x: 500, y: 0, z: 0} + backwardsTorque: {x: -500, y: 0, z: 0} + torqueSpace: 0 + forwardForce: {x: 0, y: 0, z: 0} + backwardsForce: {x: 0, y: 0, z: 0} + forceSpace: 0 + smoothing: 2 multiplier: 1 isLeft: 0 switchToForwardEvent: @@ -4138,10 +4205,22 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: animations: - values: [] - smoothing: 0 + values: + - forwardTorque: {x: 0, y: 0, z: 0} + backwardsTorque: {x: 0, y: 0, z: 0} + torqueSpace: 0 + forwardForce: {x: 0, y: 0, z: 0} + backwardsForce: {x: 0, y: 0, z: 0} + forceSpace: 0 + - forwardTorque: {x: 500, y: 0, z: 0} + backwardsTorque: {x: -500, y: 0, z: 0} + torqueSpace: 0 + forwardForce: {x: 0, y: 0, z: 0} + backwardsForce: {x: 0, y: 0, z: 0} + forceSpace: 0 + smoothing: 2 multiplier: 1 - isLeft: 0 + isLeft: 1 switchToForwardEvent: m_PersistentCalls: m_Calls: [] @@ -4409,7 +4488,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5658401667225277159} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 1f7b7bd465add9742bc770683eb2f98f, type: 3} m_Name: @@ -4632,6 +4711,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5e168c0b2976ea8459edfe49fecabfb9, type: 3} m_Name: m_EditorClassIdentifier: + rigidbody: {fileID: 0} --- !u!114 &7057859769783231887 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4645,8 +4725,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: animations: - values: [] - smoothing: 0 + values: + - forwardTorque: {x: 0, y: 0, z: 0} + backwardsTorque: {x: 0, y: 0, z: 0} + torqueSpace: 0 + forwardForce: {x: 0, y: 0, z: 0} + backwardsForce: {x: 0, y: 0, z: 0} + forceSpace: 0 + - forwardTorque: {x: -800, y: 0, z: 0} + backwardsTorque: {x: 800, y: 0, z: 0} + torqueSpace: 0 + forwardForce: {x: 0, y: 0, z: 0} + backwardsForce: {x: 0, y: 0, z: 0} + forceSpace: 0 + smoothing: 1.2 multiplier: 1 isLeft: 0 switchToForwardEvent: @@ -4876,10 +4968,22 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: animations: - values: [] - smoothing: 0 + values: + - forwardTorque: {x: 0, y: 0, z: 0} + backwardsTorque: {x: 0, y: 0, z: 0} + torqueSpace: 0 + forwardForce: {x: 0, y: 0, z: 0} + backwardsForce: {x: 0, y: 0, z: 0} + forceSpace: 0 + - forwardTorque: {x: -800, y: 0, z: 0} + backwardsTorque: {x: 800, y: 0, z: 0} + torqueSpace: 0 + forwardForce: {x: 0, y: 0, z: 0} + backwardsForce: {x: 0, y: 0, z: 0} + forceSpace: 0 + smoothing: 1.2 multiplier: 1 - isLeft: 0 + isLeft: 1 switchToForwardEvent: m_PersistentCalls: m_Calls: [] @@ -5132,7 +5236,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7307037826757058977} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 1f7b7bd465add9742bc770683eb2f98f, type: 3} m_Name: @@ -5141,7 +5245,7 @@ MonoBehaviour: values: [] smoothing: 0 multiplier: 1 - isLeft: 0 + isLeft: 1 switchToForwardEvent: m_PersistentCalls: m_Calls: [] @@ -5620,12 +5724,56 @@ MonoBehaviour: - 7 jumpCurve: serializedVersion: 2 - m_Curve: [] + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1.5 + inSlope: -2.2776694 + outSlope: -2.2776694 + tangentMode: 34 + weightedMode: 0 + inWeight: 0 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.103 + value: 1.2654 + inSlope: -4.9176817 + outSlope: -4.9176817 + tangentMode: 34 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.1758 + value: 0.7152 + inSlope: -5.07047 + outSlope: -5.07047 + tangentMode: 34 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.3668 + value: 0.2218 + inSlope: -1.6244562 + outSlope: -1.6244562 + tangentMode: 34 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.7 + value: 0 + inSlope: -0.6656663 + outSlope: -0.6656663 + tangentMode: 34 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - jumpForce: 0 - multiplier: 1 + jumpForce: 5000 --- !u!114 &3422831897407596435 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Action/Movement.cs b/ActiveRagdoll/Assets/TABG/Scripts/Action/Movement.cs index 8cc245d..67e9a05 100644 --- a/ActiveRagdoll/Assets/TABG/Scripts/Action/Movement.cs +++ b/ActiveRagdoll/Assets/TABG/Scripts/Action/Movement.cs @@ -1,5 +1,6 @@ using Rigging.Data; using Rigging.Inputs; +using System; using System.Collections; using System.Collections.Generic; using UnityEngine; @@ -18,8 +19,6 @@ namespace Rigging.Action public AnimationParam<float> animationForceAmounts; - private AnimationHandler animationHandler; - private RigidbodyHolder allRigs; public AnimationCurve jumpCurve; @@ -30,21 +29,14 @@ namespace Rigging.Action private MovementDataHandler data; - //private PlayerDeath death; - - [HideInInspector] + [HideInInspector, NonSerialized] public float multiplier = 1f; - //private WobbleShake wobbleShake; - protected override void OnStart() { animationForceAmounts.SetPlayer(player); - //wobbleShake = GetComponentInChildren<WobbleShake>(); - //death = GetComponent<PlayerDeath>(); standingData = player.status.standingData; inputHandler = player.input; - animationHandler = player.status.animation; allRigs = player.status.body; data = player.status.movementData; } @@ -64,7 +56,6 @@ namespace Rigging.Action { data.sinceJump = 0f; StartCoroutine(AddJumpForce()); - //wobbleShake.AddShake(Vector3.up * 2f, 0.8f); } } diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Animation/AnimationObject.cs b/ActiveRagdoll/Assets/TABG/Scripts/Animation/AnimationObject.cs index b7ef84a..a194cf1 100644 --- a/ActiveRagdoll/Assets/TABG/Scripts/Animation/AnimationObject.cs +++ b/ActiveRagdoll/Assets/TABG/Scripts/Animation/AnimationObject.cs @@ -33,22 +33,13 @@ namespace Rigging.Animations public bool dontAnimateIfHoldingSomething; - //private Holding holding; - - private AnimationHandler animationHandler; - - //private PlayerDeath death; - private float muscleMultiplier = 1f; private void Start() { - animationHandler = base.transform.root.GetComponentInChildren<AnimationHandler>(); rig = GetComponent<Rigidbody>(); stepHandler = base.transform.root.GetComponentInChildren<StepHandler>(); - //holding = base.transform.root.GetComponent<Holding>(); - //death = base.transform.root.GetComponent<PlayerDeath>(); - Hip componentInChildren = base.transform.root.GetComponentInChildren<Hip>(); + Rigging.BodyPart.Hip componentInChildren = base.transform.root.GetComponentInChildren<Rigging.BodyPart.Hip>(); if ((bool)componentInChildren) { hip = componentInChildren.transform; @@ -59,22 +50,6 @@ namespace Rigging.Animations private void FixedUpdate() { - - return; - //if ((bool)death) - //{ - // if (death.muscleFunction < 0f) - // { - // return; - // } - // muscleMultiplier = death.muscleFunction; - //} - //if ((!holding || !dontAnimateIfHoldingSomething || !holding.heldObject) && animationHandler.animationState < animations.Length) - //{ - // SetMultiplier(); - // AddTorque(); - // AddForce(); - //} SetMultiplier(); AddTorque(); AddForce(); diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Body/LegRight.cs b/ActiveRagdoll/Assets/TABG/Scripts/Body/LegRight.cs index 77281a1..f690825 100644 --- a/ActiveRagdoll/Assets/TABG/Scripts/Body/LegRight.cs +++ b/ActiveRagdoll/Assets/TABG/Scripts/Body/LegRight.cs @@ -3,7 +3,7 @@ using UnityEngine; namespace Rigging.BodyPart { - public class LegRight : MonoBehaviour + public class LegRight : BodyPartBase { private void Start() { diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Data/SetAnimationByInput.cs b/ActiveRagdoll/Assets/TABG/Scripts/Data/SetAnimationByInput.cs index 98444e3..c2a206b 100644 --- a/ActiveRagdoll/Assets/TABG/Scripts/Data/SetAnimationByInput.cs +++ b/ActiveRagdoll/Assets/TABG/Scripts/Data/SetAnimationByInput.cs @@ -25,7 +25,7 @@ namespace Rigging.Data { if ((double)standingData.sinceGrounded > 0.2) { - anim.animationState = 3; // jump + //anim.animationState = 3; // jump } else if (input.inputMovementDirection.magnitude > 0.1f) { diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Data/StepHandler.cs b/ActiveRagdoll/Assets/TABG/Scripts/Data/StepHandler.cs index 3caa488..4e6ebed 100644 --- a/ActiveRagdoll/Assets/TABG/Scripts/Data/StepHandler.cs +++ b/ActiveRagdoll/Assets/TABG/Scripts/Data/StepHandler.cs @@ -1,4 +1,5 @@ using Rigging.BodyPart; +using System; using System.Collections; using System.Collections.Generic; using UnityEngine; @@ -15,15 +16,13 @@ namespace Rigging.Data public bool isLeft;//左脚还是右脚在前面 - private float counter; + public float counter; - private Transform leftLeg; + public Transform leftLeg; - private Transform rightLeg; + public Transform rightLeg; - private AnimationHandler animationHandler; - - private Transform hip; + public Transform hip; protected override void OnStart() { @@ -31,7 +30,6 @@ namespace Rigging.Data { leftLeg = player.body.legLeft.transform; rightLeg = player.body.legRight.transform; - animationHandler = player.status.animation; hip = player.body.hip.transform; } steps.SetPlayer(player); @@ -47,9 +45,11 @@ namespace Rigging.Data Switch(); } } - else if (counter > steps.current.minTime - && (steps.current.minAngle == 0f || steps.current.minAngle < Vector3.Angle(leftLeg.forward, rightLeg.forward)) - && isLeft == hip.InverseTransformPoint(leftLeg.position + leftLeg.forward).z > hip.InverseTransformPoint(rightLeg.position + rightLeg.forward).z) + else if ( counter > steps.current.minTime + //&& (steps.current.minAngle == 0f || steps.current.minAngle < Vector3.Angle(leftLeg.forward, rightLeg.forward)) + //&& (steps.current.minAngle == 0f || steps.current.minAngle < Vector3.Angle(leftLeg.forward, rightLeg.forward)) + //&& isLeft == hip.InverseTransformPoint(leftLeg.position + leftLeg.forward).z > hip.InverseTransformPoint(rightLeg.position + rightLeg.forward).z + ) { Switch(); } @@ -61,6 +61,11 @@ namespace Rigging.Data counter = 0f; } + public void OnGUI() + { + GUILayout.Label(isLeft.ToString()); + } + } -}
\ No newline at end of file +}
\ No newline at end of file diff --git a/ActiveRagdoll/Assets/TABG/Test.unity b/ActiveRagdoll/Assets/TABG/Test.unity index 5b4eac3..3aa3326 100644 --- a/ActiveRagdoll/Assets/TABG/Test.unity +++ b/ActiveRagdoll/Assets/TABG/Test.unity @@ -123,56 +123,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!23 &140926811 stripped -MeshRenderer: - m_CorrespondingSourceObject: {fileID: 1639162268, guid: fce18bbf37be1384eb1a089a94aac81d, - type: 3} - m_PrefabInstance: {fileID: 8128778564773403800} - m_PrefabAsset: {fileID: 0} ---- !u!1 &195317781 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1254990767818926415, guid: fce18bbf37be1384eb1a089a94aac81d, - type: 3} - m_PrefabInstance: {fileID: 8128778564773403800} - m_PrefabAsset: {fileID: 0} ---- !u!114 &195317784 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 195317781} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ffdcfebb31e298f45909264bd508a0ea, type: 3} - m_Name: - m_EditorClassIdentifier: - renderers: - - {fileID: 1531560651} - - {fileID: 2043134278} - - {fileID: 1206691846} - - {fileID: 2014113957} - - {fileID: 1310655067} - - {fileID: 328631363} - - {fileID: 1309829337} - - {fileID: 140926811} - - {fileID: 1418871838} - - {fileID: 1157038868} - - {fileID: 692976759} - - {fileID: 390256165} - draw: 0 ---- !u!23 &328631363 stripped -MeshRenderer: - m_CorrespondingSourceObject: {fileID: 1234205112, guid: fce18bbf37be1384eb1a089a94aac81d, - type: 3} - m_PrefabInstance: {fileID: 8128778564773403800} - m_PrefabAsset: {fileID: 0} ---- !u!23 &390256165 stripped -MeshRenderer: - m_CorrespondingSourceObject: {fileID: 1642247843, guid: fce18bbf37be1384eb1a089a94aac81d, - type: 3} - m_PrefabInstance: {fileID: 8128778564773403800} - m_PrefabAsset: {fileID: 0} --- !u!850595691 &403353010 LightingSettings: m_ObjectHideFlags: 0 @@ -235,12 +185,6 @@ LightingSettings: m_PVRFilteringAtrousPositionSigmaIndirect: 2 m_PVRFilteringAtrousPositionSigmaAO: 1 m_PVRTiledBaking: 0 ---- !u!23 &692976759 stripped -MeshRenderer: - m_CorrespondingSourceObject: {fileID: 312893420, guid: fce18bbf37be1384eb1a089a94aac81d, - type: 3} - m_PrefabInstance: {fileID: 8128778564773403800} - m_PrefabAsset: {fileID: 0} --- !u!1 &705426289 GameObject: m_ObjectHideFlags: 0 @@ -526,7 +470,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 814323549} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 1.727, y: 0.5, z: 0.49133635} + m_LocalPosition: {x: 1.727, y: 0.295, z: 0.49133635} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -648,42 +592,6 @@ MonoBehaviour: m_ShadowLayerMask: 1 m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} ---- !u!23 &1157038868 stripped -MeshRenderer: - m_CorrespondingSourceObject: {fileID: 781237318, guid: fce18bbf37be1384eb1a089a94aac81d, - type: 3} - m_PrefabInstance: {fileID: 8128778564773403800} - m_PrefabAsset: {fileID: 0} ---- !u!23 &1206691846 stripped -MeshRenderer: - m_CorrespondingSourceObject: {fileID: 679016043, guid: fce18bbf37be1384eb1a089a94aac81d, - type: 3} - m_PrefabInstance: {fileID: 8128778564773403800} - m_PrefabAsset: {fileID: 0} ---- !u!23 &1309829337 stripped -MeshRenderer: - m_CorrespondingSourceObject: {fileID: 984858214, guid: fce18bbf37be1384eb1a089a94aac81d, - type: 3} - m_PrefabInstance: {fileID: 8128778564773403800} - m_PrefabAsset: {fileID: 0} ---- !u!23 &1310655067 stripped -MeshRenderer: - m_CorrespondingSourceObject: {fileID: 1711133862, guid: fce18bbf37be1384eb1a089a94aac81d, - type: 3} - m_PrefabInstance: {fileID: 8128778564773403800} - m_PrefabAsset: {fileID: 0} ---- !u!23 &1418871838 stripped -MeshRenderer: - m_CorrespondingSourceObject: {fileID: 2047997616, guid: fce18bbf37be1384eb1a089a94aac81d, - type: 3} - m_PrefabInstance: {fileID: 8128778564773403800} - m_PrefabAsset: {fileID: 0} ---- !u!23 &1531560651 stripped -MeshRenderer: - m_CorrespondingSourceObject: {fileID: 1116313584, guid: fce18bbf37be1384eb1a089a94aac81d, - type: 3} - m_PrefabInstance: {fileID: 8128778564773403800} - m_PrefabAsset: {fileID: 0} --- !u!1 &1871198445 GameObject: m_ObjectHideFlags: 0 @@ -781,18 +689,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!23 &2014113957 stripped -MeshRenderer: - m_CorrespondingSourceObject: {fileID: 1325114492, guid: fce18bbf37be1384eb1a089a94aac81d, - type: 3} - m_PrefabInstance: {fileID: 8128778564773403800} - m_PrefabAsset: {fileID: 0} ---- !u!23 &2043134278 stripped -MeshRenderer: - m_CorrespondingSourceObject: {fileID: 1130278584, guid: fce18bbf37be1384eb1a089a94aac81d, - type: 3} - m_PrefabInstance: {fileID: 8128778564773403800} - m_PrefabAsset: {fileID: 0} --- !u!4 &543450652995596035 Transform: m_ObjectHideFlags: 0 @@ -999,6 +895,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 195317784, guid: fce18bbf37be1384eb1a089a94aac81d, type: 3} + propertyPath: draw + value: 0 + objectReference: {fileID: 0} - target: {fileID: 312893420, guid: fce18bbf37be1384eb1a089a94aac81d, type: 3} propertyPath: m_Enabled value: 0 @@ -1031,22 +931,6 @@ PrefabInstance: propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} - - target: {fileID: 1414611730, guid: fce18bbf37be1384eb1a089a94aac81d, type: 3} - propertyPath: offset.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1414611730, guid: fce18bbf37be1384eb1a089a94aac81d, type: 3} - propertyPath: offset.z - value: 0.2 - objectReference: {fileID: 0} - - target: {fileID: 1414611730, guid: fce18bbf37be1384eb1a089a94aac81d, type: 3} - propertyPath: transforms.Array.data[0] - value: - objectReference: {fileID: 5240332616388624504} - - target: {fileID: 1414611730, guid: fce18bbf37be1384eb1a089a94aac81d, type: 3} - propertyPath: transforms.Array.data[1] - value: - objectReference: {fileID: 5240332616388624504} - target: {fileID: 1639162268, guid: fce18bbf37be1384eb1a089a94aac81d, type: 3} propertyPath: m_Enabled value: 0 @@ -1123,170 +1007,25 @@ PrefabInstance: propertyPath: m_Name value: human_rigging objectReference: {fileID: 0} - - target: {fileID: 3805300644640191623, guid: fce18bbf37be1384eb1a089a94aac81d, - type: 3} - propertyPath: jumpCurve.m_Curve.Array.size - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 3805300644640191623, guid: fce18bbf37be1384eb1a089a94aac81d, - type: 3} - propertyPath: jumpCurve.m_Curve.Array.data[1].time - value: 0.103 - objectReference: {fileID: 0} - - target: {fileID: 3805300644640191623, guid: fce18bbf37be1384eb1a089a94aac81d, - type: 3} - propertyPath: jumpCurve.m_Curve.Array.data[2].time - value: 0.1758 - objectReference: {fileID: 0} - - target: {fileID: 3805300644640191623, guid: fce18bbf37be1384eb1a089a94aac81d, - type: 3} - propertyPath: jumpCurve.m_Curve.Array.data[3].time - value: 0.3668 - objectReference: {fileID: 0} - - target: {fileID: 3805300644640191623, guid: fce18bbf37be1384eb1a089a94aac81d, - type: 3} - propertyPath: jumpCurve.m_Curve.Array.data[4].time - value: 0.7 - objectReference: {fileID: 0} - - target: {fileID: 3805300644640191623, guid: fce18bbf37be1384eb1a089a94aac81d, - type: 3} - propertyPath: jumpCurve.m_Curve.Array.data[0].value - value: 1.5 - objectReference: {fileID: 0} - - target: {fileID: 3805300644640191623, guid: fce18bbf37be1384eb1a089a94aac81d, - type: 3} - propertyPath: jumpCurve.m_Curve.Array.data[1].value - value: 1.2654 - objectReference: {fileID: 0} - - target: {fileID: 3805300644640191623, guid: fce18bbf37be1384eb1a089a94aac81d, - type: 3} - propertyPath: jumpCurve.m_Curve.Array.data[2].value - value: 0.7152 - objectReference: {fileID: 0} - - target: {fileID: 3805300644640191623, guid: fce18bbf37be1384eb1a089a94aac81d, - type: 3} - propertyPath: jumpCurve.m_Curve.Array.data[3].value - value: 0.2218 - objectReference: {fileID: 0} - - target: {fileID: 3805300644640191623, guid: fce18bbf37be1384eb1a089a94aac81d, - type: 3} - propertyPath: jumpCurve.m_Curve.Array.data[4].value - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3805300644640191623, guid: fce18bbf37be1384eb1a089a94aac81d, - type: 3} - propertyPath: jumpCurve.m_Curve.Array.data[0].inSlope - value: -2.2776694 - objectReference: {fileID: 0} - - target: {fileID: 3805300644640191623, guid: fce18bbf37be1384eb1a089a94aac81d, - type: 3} - propertyPath: jumpCurve.m_Curve.Array.data[1].inSlope - value: -4.9176817 - objectReference: {fileID: 0} - - target: {fileID: 3805300644640191623, guid: fce18bbf37be1384eb1a089a94aac81d, - type: 3} - propertyPath: jumpCurve.m_Curve.Array.data[2].inSlope - value: -5.07047 - objectReference: {fileID: 0} - - target: {fileID: 3805300644640191623, guid: fce18bbf37be1384eb1a089a94aac81d, - type: 3} - propertyPath: jumpCurve.m_Curve.Array.data[3].inSlope - value: -1.6244562 - objectReference: {fileID: 0} - - target: {fileID: 3805300644640191623, guid: fce18bbf37be1384eb1a089a94aac81d, - type: 3} - propertyPath: jumpCurve.m_Curve.Array.data[4].inSlope - value: -0.6656663 - objectReference: {fileID: 0} - - target: {fileID: 3805300644640191623, guid: fce18bbf37be1384eb1a089a94aac81d, - type: 3} - propertyPath: jumpCurve.m_Curve.Array.data[0].outSlope - value: -2.2776694 - objectReference: {fileID: 0} - - target: {fileID: 3805300644640191623, guid: fce18bbf37be1384eb1a089a94aac81d, - type: 3} - propertyPath: jumpCurve.m_Curve.Array.data[1].inWeight - value: 0.33333334 - objectReference: {fileID: 0} - - target: {fileID: 3805300644640191623, guid: fce18bbf37be1384eb1a089a94aac81d, - type: 3} - propertyPath: jumpCurve.m_Curve.Array.data[1].outSlope - value: -4.9176817 - objectReference: {fileID: 0} - - target: {fileID: 3805300644640191623, guid: fce18bbf37be1384eb1a089a94aac81d, - type: 3} - propertyPath: jumpCurve.m_Curve.Array.data[2].inWeight - value: 0.33333334 - objectReference: {fileID: 0} - - target: {fileID: 3805300644640191623, guid: fce18bbf37be1384eb1a089a94aac81d, - type: 3} - propertyPath: jumpCurve.m_Curve.Array.data[2].outSlope - value: -5.07047 - objectReference: {fileID: 0} - - target: {fileID: 3805300644640191623, guid: fce18bbf37be1384eb1a089a94aac81d, - type: 3} - propertyPath: jumpCurve.m_Curve.Array.data[3].inWeight - value: 0.33333334 - objectReference: {fileID: 0} - - target: {fileID: 3805300644640191623, guid: fce18bbf37be1384eb1a089a94aac81d, - type: 3} - propertyPath: jumpCurve.m_Curve.Array.data[3].outSlope - value: -1.6244562 - objectReference: {fileID: 0} - - target: {fileID: 3805300644640191623, guid: fce18bbf37be1384eb1a089a94aac81d, - type: 3} - propertyPath: jumpCurve.m_Curve.Array.data[4].inWeight - value: 0.33333334 - objectReference: {fileID: 0} - - target: {fileID: 3805300644640191623, guid: fce18bbf37be1384eb1a089a94aac81d, - type: 3} - propertyPath: jumpCurve.m_Curve.Array.data[4].outSlope - value: -0.6656663 - objectReference: {fileID: 0} - - target: {fileID: 3805300644640191623, guid: fce18bbf37be1384eb1a089a94aac81d, - type: 3} - propertyPath: jumpCurve.m_Curve.Array.data[0].outWeight - value: 0.33333334 - objectReference: {fileID: 0} - - target: {fileID: 3805300644640191623, guid: fce18bbf37be1384eb1a089a94aac81d, - type: 3} - propertyPath: jumpCurve.m_Curve.Array.data[1].outWeight - value: 0.33333334 - objectReference: {fileID: 0} - - target: {fileID: 3805300644640191623, guid: fce18bbf37be1384eb1a089a94aac81d, - type: 3} - propertyPath: jumpCurve.m_Curve.Array.data[2].outWeight - value: 0.33333334 - objectReference: {fileID: 0} - - target: {fileID: 3805300644640191623, guid: fce18bbf37be1384eb1a089a94aac81d, - type: 3} - propertyPath: jumpCurve.m_Curve.Array.data[3].outWeight - value: 0.33333334 - objectReference: {fileID: 0} - - target: {fileID: 3805300644640191623, guid: fce18bbf37be1384eb1a089a94aac81d, - type: 3} - propertyPath: jumpCurve.m_Curve.Array.data[0].tangentMode - value: 34 - objectReference: {fileID: 0} - - target: {fileID: 3805300644640191623, guid: fce18bbf37be1384eb1a089a94aac81d, + - target: {fileID: 7057859769783231887, guid: fce18bbf37be1384eb1a089a94aac81d, type: 3} - propertyPath: jumpCurve.m_Curve.Array.data[1].tangentMode - value: 34 + propertyPath: animations.values.Array.data[1].forwardTorque.x + value: -4000 objectReference: {fileID: 0} - - target: {fileID: 3805300644640191623, guid: fce18bbf37be1384eb1a089a94aac81d, + - target: {fileID: 7057859769783231887, guid: fce18bbf37be1384eb1a089a94aac81d, type: 3} - propertyPath: jumpCurve.m_Curve.Array.data[2].tangentMode - value: 34 + propertyPath: animations.values.Array.data[1].backwardsTorque.x + value: 4000 objectReference: {fileID: 0} - - target: {fileID: 3805300644640191623, guid: fce18bbf37be1384eb1a089a94aac81d, + - target: {fileID: 8659986707249222525, guid: fce18bbf37be1384eb1a089a94aac81d, type: 3} - propertyPath: jumpCurve.m_Curve.Array.data[3].tangentMode - value: 34 + propertyPath: animations.values.Array.data[1].forwardTorque.x + value: -4000 objectReference: {fileID: 0} - - target: {fileID: 3805300644640191623, guid: fce18bbf37be1384eb1a089a94aac81d, + - target: {fileID: 8659986707249222525, guid: fce18bbf37be1384eb1a089a94aac81d, type: 3} - propertyPath: jumpCurve.m_Curve.Array.data[4].tangentMode - value: 34 + propertyPath: animations.values.Array.data[1].backwardsTorque.x + value: 4000 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fce18bbf37be1384eb1a089a94aac81d, type: 3} |