4 files changed, 14 insertions, 22 deletions

diff --git a/ActiveRagdoll/Assets/TABG/Prefabs/human_rigging.prefab b/ActiveRagdoll/Assets/TABG/Prefabs/human_rigging.prefab
index 21e0c52..e5c2334 100644
--- a/ActiveRagdoll/Assets/TABG/Prefabs/human_rigging.prefab
+++ b/ActiveRagdoll/Assets/TABG/Prefabs/human_rigging.prefab
@@ -1514,7 +1514,7 @@ MonoBehaviour:
     - minTime: 0
       maxTime: 0
       minAngle: 0
-    - minTime: 0.25
+    - minTime: 0.3
       maxTime: 1
       minAngle: 40
   isLeft: 1
@@ -3739,7 +3739,7 @@ MonoBehaviour:
       forwardForce: {x: 0, y: 0, z: 0}
       backwardsForce: {x: 0, y: 0, z: 0}
       forceSpace: 0
-    - forwardTorque: {x: -3000, y: 0, z: 0}
+    - forwardTorque: {x: -5000, y: 0, z: 0}
       backwardsTorque: {x: 5000, y: 0, z: 0}
       torqueSpace: 0
       forwardForce: {x: 0, y: 0, z: 0}
@@ -4286,7 +4286,7 @@ MonoBehaviour:
       forwardForce: {x: 0, y: 0, z: 0}
       backwardsForce: {x: 0, y: 0, z: 0}
       forceSpace: 0
-    - forwardTorque: {x: -3000, y: 0, z: 0}
+    - forwardTorque: {x: -5000, y: 0, z: 0}
       backwardsTorque: {x: 5000, y: 0, z: 0}
       torqueSpace: 0
       forwardForce: {x: 0, y: 0, z: 0}
@@ -4562,7 +4562,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: 
@@ -4575,8 +4575,8 @@ MonoBehaviour:
       forwardForce: {x: 0, y: 0, z: 0}
       backwardsForce: {x: 0, y: 0, z: 0}
       forceSpace: 0
-    - forwardTorque: {x: 0, y: -5000, z: 0}
-      backwardsTorque: {x: 0, y: 5000, z: 0}
+    - forwardTorque: {x: 0, y: 5000, z: 0}
+      backwardsTorque: {x: 0, y: -5000, z: 0}
       torqueSpace: 0
       forwardForce: {x: 0, y: 0, z: 0}
       backwardsForce: {x: 0, y: 0, z: 0}
@@ -4818,7 +4818,7 @@ MonoBehaviour:
       forwardForce: {x: 0, y: 0, z: 0}
       backwardsForce: {x: 0, y: 0, z: 0}
       forceSpace: 0
-    - forwardTorque: {x: -2500, y: 0, z: 0}
+    - forwardTorque: {x: -2700, y: 0, z: 0}
       backwardsTorque: {x: 4000, y: 0, z: 0}
       torqueSpace: 0
       forwardForce: {x: 0, y: 0, z: 0}
@@ -5061,7 +5061,7 @@ MonoBehaviour:
       forwardForce: {x: 0, y: 0, z: 0}
       backwardsForce: {x: 0, y: 0, z: 0}
       forceSpace: 0
-    - forwardTorque: {x: -2500, y: 0, z: 0}
+    - forwardTorque: {x: -2700, y: 0, z: 0}
       backwardsTorque: {x: 4000, y: 0, z: 0}
       torqueSpace: 0
       forwardForce: {x: 0, y: 0, z: 0}
@@ -5323,7 +5323,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: 
diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Data/StepHandler.cs b/ActiveRagdoll/Assets/TABG/Scripts/Data/StepHandler.cs
index 600757a..556f411 100644
--- a/ActiveRagdoll/Assets/TABG/Scripts/Data/StepHandler.cs
+++ b/ActiveRagdoll/Assets/TABG/Scripts/Data/StepHandler.cs
@@ -46,8 +46,9 @@ namespace Rigging.Data
                 }
             }
             else if ( counter > steps.current.minTime
+            && player.status.animation.animationState > 0 // ·Çstanding
             && (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
+            && isLeft == hip.InverseTransformPoint(leftLeg.position + leftLeg.forward).z > hip.InverseTransformPoint(rightLeg.position + rightLeg.forward).z//
             )
             {
                 Switch();
@@ -56,6 +57,7 @@ namespace Rigging.Data
 
         private void Switch()
         {
+            //Debug.Log(counter);
             isLeft = !isLeft;
             counter = 0f;
         }
@@ -67,4 +69,4 @@ namespace Rigging.Data
 
     }
      
-} 
\ 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 89dc97e..85d3570 100644
--- a/ActiveRagdoll/Assets/TABG/Test.unity
+++ b/ActiveRagdoll/Assets/TABG/Test.unity
@@ -139,7 +139,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!114 &23701355
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1036,16 +1036,6 @@ PrefabInstance:
       propertyPath: m_Name
       value: human_rigging
       objectReference: {fileID: 0}
-    - target: {fileID: 3526346404085441778, guid: fce18bbf37be1384eb1a089a94aac81d,
-        type: 3}
-      propertyPath: animations.values.Array.data[1].forwardTorque.y
-      value: 5000
-      objectReference: {fileID: 0}
-    - target: {fileID: 3526346404085441778, guid: fce18bbf37be1384eb1a089a94aac81d,
-        type: 3}
-      propertyPath: animations.values.Array.data[1].backwardsTorque.y
-      value: -5000
-      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: fce18bbf37be1384eb1a089a94aac81d, type: 3}
 --- !u!4 &8128778564773403801 stripped
diff --git a/Docs/资料.xlsx b/Docs/资料.xlsx
index 44f0168..d3a47f9 100644
--- a/Docs/资料.xlsx
+++ b/Docs/资料.xlsx