Merge branch 'main' of http://139.155.244.27:822/LSR/gouhuo

# Conflicts:
#	SFGgouhuo/Assets/GameResources/Player/PlayerArmature.prefab
#	SFGgouhuo/Assets/Scripts/MoveController.cs

SFGgouhuo/Assets/Bundles/Model/player1.prefab

@@ -201,7 +201,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 4807364823709728893}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_UpperJaw
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -420,7 +420,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 8386729936377326942}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_L_Ring2
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -451,7 +451,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 2114941318982988952}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_R_Calf
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -484,7 +484,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 1202615634163963906}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_R_RingToe1
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -544,7 +544,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 3845062020327267732}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_L_ElbowShareBone
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -606,7 +606,7 @@ GameObject:
   m_Component:
   - component: {fileID: 1913160466850301798}
   - component: {fileID: 6585577930257922336}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: body
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -793,7 +793,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 4447331189194687123}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_L_KneeShareBone
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -823,7 +823,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 8288173252108437808}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_L_Thigh
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -855,7 +855,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 5000492423683577183}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_L_Mid2
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -947,7 +947,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 5982375683611129346}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_L_ToeBaseShareBone
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1042,7 +1042,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 2004947304701841301}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_R_Eye
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1072,7 +1072,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 3713516202283742093}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_Teeth01
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1102,7 +1102,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 8933504073551336633}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_L_ThighTwist01
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1133,7 +1133,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 964973444646166318}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_L_Foot
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1195,7 +1195,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 9044712762595075929}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_R_ThighTwist01
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1226,7 +1226,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 6747682794413397130}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_Spine02
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1291,7 +1291,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 5189264543274399331}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_L_UpperarmTwist01
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1484,7 +1484,7 @@ GameObject:
   m_Component:
   - component: {fileID: 5659088437938368284}
   - component: {fileID: 7720241226307127968}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: tooth_up
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1972,7 +1972,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 3760819475541663958}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: RL_BoneRoot
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -2003,7 +2003,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 9132162729617861352}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_Spine01
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -2034,7 +2034,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 8182045186208037198}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_L_CalfTwist02
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -2094,7 +2094,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 401730319662080577}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_R_IndexToe1
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -2124,7 +2124,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 2072081002671479397}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_R_Ring2
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -2156,7 +2156,7 @@ GameObject:
   m_Component:
   - component: {fileID: 40640394720340256}
   - component: {fileID: 5331589646703334072}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: tongue
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -2338,7 +2338,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 3488113604318434007}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_Head
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -2369,7 +2369,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 2848955070741804360}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_L_Thumb1
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -2559,7 +2559,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 7073443802714062891}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_R_Clavicle
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -2590,7 +2590,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 3548451583590904687}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_L_ForearmTwist02
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -2653,7 +2653,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 2791311285707841388}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_L_CalfTwist01
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -2744,7 +2744,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 8667751858260207380}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_L_Clavicle
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -2988,7 +2988,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 4697893792856452320}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_Hip
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -3020,7 +3020,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 2107083572354172462}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_R_Index1
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -3081,7 +3081,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 6781437581990240262}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_L_Breast
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -3111,7 +3111,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 1436449728716475851}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_R_BigToe1
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -3141,7 +3141,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 3901651062055895193}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_R_UpperarmTwist01
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -3203,7 +3203,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 2121603361864181334}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_L_Thumb3
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -3233,7 +3233,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 5317390408557619882}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_Pelvis
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -3325,7 +3325,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 3129163042719100444}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_R_Mid2
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -3356,7 +3356,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 4848520261627166274}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_R_Thumb1
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -3387,7 +3387,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 4655217460530532017}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_R_ForearmTwist01
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -3514,7 +3514,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 7118057133262022031}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_R_ToeBaseShareBone
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -3544,7 +3544,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 8380695398373326183}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_L_Mid1
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -3575,7 +3575,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 8048047348441440122}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_L_Ring1
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -3606,7 +3606,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 1666997427920759398}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_NeckTwist01
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -3637,7 +3637,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 1879420799157139802}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_R_CalfTwist01
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -3731,7 +3731,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 2894780602078482235}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_R_Pinky2
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -3762,7 +3762,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 4923710527987875515}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_R_ThighTwist02
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -3802,7 +3802,7 @@ GameObject:
   - component: {fileID: 6376777697154161564}
   - component: {fileID: 320817544416934477}
   - component: {fileID: 8256020308027915855}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: player
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -3864,7 +3864,7 @@ CharacterController:
   m_Enabled: 0
   serializedVersion: 2
   m_Height: 1.6
-  m_Radius: 0.5
+  m_Radius: 0.2
   m_SlopeLimit: 45
   m_StepOffset: 0.3
   m_SkinWidth: 0.25
@@ -3885,7 +3885,7 @@ MonoBehaviour:
   playerInput: {fileID: 5686692494084832667}
   camRoot: {fileID: 0}
   jumpHeight: 4
-  gravity: -13.524
+  gravity: -9.8
   state: 0
 --- !u!114 &3757407431860183618
 MonoBehaviour:
@@ -4805,7 +4805,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 755580588370865424}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_R_Thigh
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -4927,7 +4927,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 615969083467827872}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_R_Mid3
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -4989,7 +4989,7 @@ GameObject:
   m_Component:
   - component: {fileID: 9099335019652860767}
   - component: {fileID: 4860777197473956098}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: eyes002
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -5197,7 +5197,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 7344241256327863880}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_R_Mid1
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -5228,7 +5228,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 7507042076262738658}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_R_Foot
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -5352,7 +5352,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 3050963629042281956}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_R_ToeBase
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -5418,7 +5418,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 6350250478928934874}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_R_PinkyToe1
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -5448,7 +5448,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 5082273964779501699}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_L_Index1
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -5479,7 +5479,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 2224918571895904846}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_R_Index3
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -5601,7 +5601,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 5170763751475727634}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_R_Ring3
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -5663,7 +5663,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 5538079892672001496}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_NeckTwist02
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -5809,7 +5809,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 5969615289648124277}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_Tongue03
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -5839,7 +5839,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 7361844014115593712}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_R_ElbowShareBone
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -5869,7 +5869,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 2721895459261901414}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_L_PinkyToe1
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -5932,7 +5932,7 @@ GameObject:
   m_Component:
   - component: {fileID: 903333639656751329}
   - component: {fileID: 8596012810242193955}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: eyes001
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -6016,7 +6016,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 4943686290078441667}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_L_Upperarm
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -6973,7 +6973,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 9183445494427568061}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_L_ThighTwist02
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -7003,7 +7003,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 2621849852754240489}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_L_IndexToe1
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -7033,7 +7033,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 8914065666593258103}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_L_Index3
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -7094,7 +7094,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 1870308624528025056}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_Teeth02
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -7185,7 +7185,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 8492996874551061922}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_R_Forearm
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -7249,7 +7249,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 771872469819041101}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_R_Ring1
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -7280,7 +7280,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 5242031688533402216}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_L_Pinky2
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -7311,7 +7311,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 4656238568568479982}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_R_Index2
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -7342,7 +7342,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 4933372858633661365}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_Tongue02
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -7464,7 +7464,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 2729272465687943923}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_R_UpperarmTwist02
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -7557,7 +7557,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 7133027351249002858}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_R_Thumb3
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -7587,7 +7587,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 4237355908864372649}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_L_Mid3
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -7617,7 +7617,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 7558108914519083796}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_L_Index2
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -7648,7 +7648,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 3122445183302522943}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_R_RibsTwist
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -7679,7 +7679,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 6194184554040977450}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_L_Thumb2
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -7710,7 +7710,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 8549902718842106719}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_L_Eye
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -7740,7 +7740,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 7328415466443913008}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_L_Forearm
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -7956,7 +7956,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 5300857743527413898}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_L_ToeBase
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -7991,7 +7991,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 7482771687543571523}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_L_Ring3
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -8052,7 +8052,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 575606198350103311}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_Waist
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -8083,7 +8083,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 5530727625027662349}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_R_Upperarm
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -8181,7 +8181,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 1024052741553996521}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_L_UpperarmTwist02
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -8243,7 +8243,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 2786693556312951928}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_R_ForearmTwist02
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -8273,7 +8273,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 4004229249779609108}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_L_Pinky1
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -8304,7 +8304,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 4587745762950854173}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_R_Hand
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -8645,7 +8645,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 5364629262909589309}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_R_CalfTwist02
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -8767,7 +8767,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 2452640486632702805}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_L_RingToe1
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -8797,7 +8797,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 4973020585178802491}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_L_RibsTwist
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -8828,7 +8828,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 406928925014074615}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_JawRoot
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -8861,7 +8861,7 @@ GameObject:
   m_Component:
   - component: {fileID: 491227778657906922}
   - component: {fileID: 5675482289434287024}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: tooth_down
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -9073,7 +9073,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 50878314758509049}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_L_MidToe1
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -9167,7 +9167,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 6925520358067521650}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_L_BigToe1
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -9227,7 +9227,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 6097965669963886033}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_L_Calf
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -9260,7 +9260,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 5351163466280147474}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_FacialBone
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -9294,7 +9294,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 5614449774795787451}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_Tongue01
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -9325,7 +9325,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 3476080256414396423}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_R_KneeShareBone
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -9355,7 +9355,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 8298751874729150006}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_L_Pinky3
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -9416,7 +9416,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 981216411117982267}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_R_Thumb2
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -9447,7 +9447,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 5260427698800421229}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_R_Pinky3
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -9692,7 +9692,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 4161386136021951833}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_R_Breast
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -9722,7 +9722,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 4464340924743496266}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_L_Hand
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -9757,7 +9757,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 6512434176313673672}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_L_ForearmTwist01
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -9788,7 +9788,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 7043138882098465957}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_R_MidToe1
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -10025,7 +10025,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 2176477396084488377}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: CC_Base_R_Pinky1
   m_TagString: Untagged
   m_Icon: {fileID: 0}

SFGgouhuo/Assets/Bundles/Scenes/MainScene.unity

@@ -1669,8 +1669,8 @@ GameObject:
   m_CorrespondingSourceObject: {fileID: 970238696011076066, guid: 77de5b4dd34b3ea4e93f57b0a28c0ba6, type: 3}
   m_PrefabInstance: {fileID: 52807557}
   m_PrefabAsset: {fileID: 0}
---- !u!65 &52807559
-BoxCollider:
+--- !u!64 &52807559
+MeshCollider:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -1679,9 +1679,10 @@ BoxCollider:
   m_Material: {fileID: 0}
   m_IsTrigger: 0
   m_Enabled: 1
-  serializedVersion: 2
-  m_Size: {x: 3.6110983, y: 3.232181, z: 0.45305002}
-  m_Center: {x: 0, y: 1.0587912e-22, z: 0.000000007450582}
+  serializedVersion: 4
+  m_Convex: 0
+  m_CookingOptions: 30
+  m_Mesh: {fileID: 7655359292216217100, guid: 56b922df449d2764eb04edb98d29e067, type: 3}
 --- !u!4 &52807560 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 9162243154170889395, guid: 77de5b4dd34b3ea4e93f57b0a28c0ba6, type: 3}
@@ -2504,8 +2505,8 @@ GameObject:
   m_CorrespondingSourceObject: {fileID: 6809007366758586997, guid: e00619deccb8bf6409638465d4477da5, type: 3}
   m_PrefabInstance: {fileID: 80969449}
   m_PrefabAsset: {fileID: 0}
---- !u!65 &80969451
-BoxCollider:
+--- !u!64 &80969451
+MeshCollider:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -2514,9 +2515,10 @@ BoxCollider:
   m_Material: {fileID: 0}
   m_IsTrigger: 0
   m_Enabled: 1
-  serializedVersion: 2
-  m_Size: {x: 3.6110983, y: 3.232181, z: 0.45305002}
-  m_Center: {x: 0, y: 1.0587912e-22, z: 0.000000007450582}
+  serializedVersion: 4
+  m_Convex: 0
+  m_CookingOptions: 30
+  m_Mesh: {fileID: 1856515499306248652, guid: 56b922df449d2764eb04edb98d29e067, type: 3}
 --- !u!4 &80969452 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 2287171841826070249, guid: e00619deccb8bf6409638465d4477da5, type: 3}
@@ -10370,8 +10372,8 @@ GameObject:
   m_CorrespondingSourceObject: {fileID: 6809007366758586997, guid: e00619deccb8bf6409638465d4477da5, type: 3}
   m_PrefabInstance: {fileID: 174360563}
   m_PrefabAsset: {fileID: 0}
---- !u!65 &239886309
-BoxCollider:
+--- !u!64 &239886306
+MeshCollider:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -10380,9 +10382,10 @@ BoxCollider:
   m_Material: {fileID: 0}
   m_IsTrigger: 0
   m_Enabled: 1
-  serializedVersion: 2
-  m_Size: {x: 3.6110988, y: 3.2321808, z: 0.4530499}
-  m_Center: {x: 0, y: 0, z: 0.000000007450581}
+  serializedVersion: 4
+  m_Convex: 0
+  m_CookingOptions: 30
+  m_Mesh: {fileID: 1856515499306248652, guid: 56b922df449d2764eb04edb98d29e067, type: 3}
 --- !u!1001 &239940071
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -30573,8 +30576,8 @@ GameObject:
   m_CorrespondingSourceObject: {fileID: 970238696011076066, guid: 77de5b4dd34b3ea4e93f57b0a28c0ba6, type: 3}
   m_PrefabInstance: {fileID: 715160797}
   m_PrefabAsset: {fileID: 0}
---- !u!65 &715160799
-BoxCollider:
+--- !u!64 &715160799
+MeshCollider:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -30583,9 +30586,10 @@ BoxCollider:
   m_Material: {fileID: 0}
   m_IsTrigger: 0
   m_Enabled: 1
-  serializedVersion: 2
-  m_Size: {x: 3.6110983, y: 3.232181, z: 0.45305002}
-  m_Center: {x: 0, y: 1.0587912e-22, z: 0.000000007450582}
+  serializedVersion: 4
+  m_Convex: 0
+  m_CookingOptions: 30
+  m_Mesh: {fileID: 7655359292216217100, guid: 56b922df449d2764eb04edb98d29e067, type: 3}
 --- !u!4 &715160800 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 9162243154170889395, guid: 77de5b4dd34b3ea4e93f57b0a28c0ba6, type: 3}
@@ -37807,8 +37811,8 @@ GameObject:
   m_CorrespondingSourceObject: {fileID: 970238696011076066, guid: 77de5b4dd34b3ea4e93f57b0a28c0ba6, type: 3}
   m_PrefabInstance: {fileID: 890992801}
   m_PrefabAsset: {fileID: 0}
---- !u!65 &890992803
-BoxCollider:
+--- !u!64 &890992803
+MeshCollider:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -37817,9 +37821,10 @@ BoxCollider:
   m_Material: {fileID: 0}
   m_IsTrigger: 0
   m_Enabled: 1
-  serializedVersion: 2
-  m_Size: {x: 3.6110983, y: 3.232181, z: 0.45305002}
-  m_Center: {x: 0, y: 1.0587912e-22, z: 0.000000007450582}
+  serializedVersion: 4
+  m_Convex: 0
+  m_CookingOptions: 30
+  m_Mesh: {fileID: 7655359292216217100, guid: 56b922df449d2764eb04edb98d29e067, type: 3}
 --- !u!4 &890992804 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 9162243154170889395, guid: 77de5b4dd34b3ea4e93f57b0a28c0ba6, type: 3}
@@ -45109,8 +45114,7 @@ GameObject:
   - component: {fileID: 1098157560}
   - component: {fileID: 1098157563}
   - component: {fileID: 1098157562}
-  - component: {fileID: 1098157565}
-  - component: {fileID: 1098157564}
+  - component: {fileID: 1098157561}
   m_Layer: 18
   m_Name: grass1 (15)
   m_TagString: Untagged
@@ -45132,6 +45136,20 @@ Transform:
   m_Father: {fileID: 543450653546438415}
   m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0}
+--- !u!64 &1098157561
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1098157559}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 4
+  m_Convex: 0
+  m_CookingOptions: 30
+  m_Mesh: {fileID: 139995289}
 --- !u!23 &1098157562
 MeshRenderer:
   m_ObjectHideFlags: 0
@@ -45181,32 +45199,6 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1098157559}
   m_Mesh: {fileID: 139995289}
---- !u!65 &1098157564
-BoxCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1098157559}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 2
-  m_Size: {x: 4.213397, y: 1.0214014, z: 3.691203}
-  m_Center: {x: -3.901708, y: 0.5115331, z: -0.0000023675561}
---- !u!65 &1098157565
-BoxCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1098157559}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 2
-  m_Size: {x: 9.162602, y: 1.0214014, z: 2.8230062}
-  m_Center: {x: -1.4271036, y: 0.5115331, z: 0.43409693}
 --- !u!1 &1098793967
 GameObject:
   m_ObjectHideFlags: 19
@@ -79087,8 +79079,8 @@ GameObject:
   m_CorrespondingSourceObject: {fileID: 6809007366758586997, guid: e00619deccb8bf6409638465d4477da5, type: 3}
   m_PrefabInstance: {fileID: 1782080158}
   m_PrefabAsset: {fileID: 0}
---- !u!65 &1782080160
-BoxCollider:
+--- !u!64 &1782080160
+MeshCollider:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -79097,9 +79089,10 @@ BoxCollider:
   m_Material: {fileID: 0}
   m_IsTrigger: 0
   m_Enabled: 1
-  serializedVersion: 2
-  m_Size: {x: 3.6110983, y: 3.232181, z: 0.45305002}
-  m_Center: {x: 0, y: 1.0587912e-22, z: 0.000000007450582}
+  serializedVersion: 4
+  m_Convex: 0
+  m_CookingOptions: 30
+  m_Mesh: {fileID: 1856515499306248652, guid: 56b922df449d2764eb04edb98d29e067, type: 3}
 --- !u!4 &1782080161 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 2287171841826070249, guid: e00619deccb8bf6409638465d4477da5, type: 3}
@@ -81906,8 +81899,8 @@ GameObject:
   m_CorrespondingSourceObject: {fileID: 6809007366758586997, guid: e00619deccb8bf6409638465d4477da5, type: 3}
   m_PrefabInstance: {fileID: 1871497354}
   m_PrefabAsset: {fileID: 0}
---- !u!65 &1871497356
-BoxCollider:
+--- !u!64 &1871497356
+MeshCollider:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -81916,9 +81909,10 @@ BoxCollider:
   m_Material: {fileID: 0}
   m_IsTrigger: 0
   m_Enabled: 1
-  serializedVersion: 2
-  m_Size: {x: 3.6110983, y: 3.232181, z: 0.45305002}
-  m_Center: {x: 0, y: 1.0587912e-22, z: 0.000000007450582}
+  serializedVersion: 4
+  m_Convex: 0
+  m_CookingOptions: 30
+  m_Mesh: {fileID: 1856515499306248652, guid: 56b922df449d2764eb04edb98d29e067, type: 3}
 --- !u!4 &1871497357 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 2287171841826070249, guid: e00619deccb8bf6409638465d4477da5, type: 3}

SFGgouhuo/Assets/GameResources/Player/AnimatorController.cs

@@ -1,24 +1,21 @@
-using System.Collections;
-using System.Collections.Generic;
 using UnityEngine;
-using UnityEngine.Serialization;
-using Quaternion = System.Numerics.Quaternion;
 
 public class AnimatorController : MonoBehaviour
 {
     [Header("Input")]
     public float speed;
     public bool jump;
-    
+
     [Header("Player")]
     public float walkSpeed = 2.0f;
     public float runSpeed = 6.0f;
-    [Range(0f,1f)]
+
+    [Range(0f, 1f)]
     public float freeLookRange;
     public Transform head;
     public Transform lookAtTarget;
     public Camera playerCamera;
-    
+
     [Space(10)]
     [Header("Jump")]
     //滞空后开始下落动画时间
@@ -30,22 +27,26 @@ public class AnimatorController : MonoBehaviour
     public float groundedOffset = -0.14f;
     public float groundedRadius = 0.28f;
     public bool grounded = true;
-    
+
     //脚步声
     public AudioClip landingAudioClip;
     public AudioClip[] footstepAudioClips;
-    [Range(0, 1)] public float footstepAudioVolume = 0.5f;
-    
+
+    [Range(0, 1)]
+    public float footstepAudioVolume = 0.5f;
+
     private Animator _animator;
     private bool _hasAnimator;
+
     // animation IDs
     private int _animIDSpeed;
     private int _animIDGrounded;
     private int _animIDJump;
     private int _animIDFreeFall;
+
     // 滞空时间
     private float _fallTimeoutTimer;
-    
+
     void Start()
     {
         _animIDSpeed = Animator.StringToHash("Speed");
@@ -53,7 +54,8 @@ public class AnimatorController : MonoBehaviour
         _animIDJump = Animator.StringToHash("Jump");
         _animIDFreeFall = Animator.StringToHash("FreeFall");
         _hasAnimator = TryGetComponent(out _animator);
-        if(playerCamera==null) playerCamera=Camera.main;
+        if (playerCamera == null)
+            playerCamera = Camera.main;
     }
 
     // Update is called once per frame
@@ -64,8 +66,8 @@ public class AnimatorController : MonoBehaviour
         Move();
         LookAtTarget();
     }
-    
-     private void JumpAndGravity()
+
+    private void JumpAndGravity()
     {
         if (grounded)
         {
@@ -73,7 +75,7 @@ public class AnimatorController : MonoBehaviour
             _fallTimeoutTimer = FallTimeout;
 
             // 动画设为非空中状态
-            if (_hasAnimator )
+            if (_hasAnimator)
             {
                 _animator.SetBool(_animIDJump, false);
                 _animator.SetBool(_animIDFreeFall, false);
@@ -87,36 +89,58 @@ public class AnimatorController : MonoBehaviour
                 {
                     _animator.SetBool(_animIDJump, true);
                 }
-                
             }
             jump = false;
         }
         else
         {
             // 计算滞空时间
-            if (_fallTimeoutTimer >= 0.0f)
+            if (_fallTimeoutTimer >= 0f)
             {
                 _fallTimeoutTimer -= Time.deltaTime;
+                //Debug.Log(_fallTimeoutTimer);
             }
             else
             {
                 // 滞空结束，开始播放下落动画
                 if (_hasAnimator)
                 {
-                   _animator.SetBool(_animIDFreeFall, true);
+                    //if (GroundedHeight() > 0.3f)
+                    _animator.SetBool(_animIDFreeFall, true);
                 }
             }
             jump = false;
         }
     }
-     
+
+    float GroundedHeight()
+    {
+        RaycastHit hit;
+        if (Physics.Raycast(transform.position, -transform.up, out hit, 100, groundLayers))
+        {
+            return hit.distance;
+        }
+        else
+        {
+            return 0;
+        }
+    }
+
     // 检查指定位置的球体与地面接触，判断是否接地
     private void GroundedCheck()
     {
-        
-        Vector3 spherePosition = new Vector3(transform.position.x, transform.position.y - groundedOffset, transform.position.z);
-        grounded = Physics.CheckSphere(spherePosition, groundedRadius, groundLayers, QueryTriggerInteraction.Ignore);
-        
+        Vector3 spherePosition = new Vector3(
+            transform.position.x,
+            transform.position.y - groundedOffset,
+            transform.position.z
+        );
+        grounded = Physics.CheckSphere(
+            spherePosition,
+            groundedRadius,
+            groundLayers,
+            QueryTriggerInteraction.Ignore
+        );
+
         if (_hasAnimator)
         {
             _animator.SetBool(_animIDGrounded, grounded);
@@ -125,14 +149,14 @@ public class AnimatorController : MonoBehaviour
 
     private void Move()
     {
-        float animSpeed=0f;
+        float animSpeed = 0f;
         if (_hasAnimator)
         {
             if (speed >= 0 && speed <= walkSpeed)
             {
                 animSpeed = RemapNum(speed, 0f, walkSpeed, 0f, 2f);
             }
-            if (speed >walkSpeed)
+            if (speed > walkSpeed)
             {
                 speed = Mathf.Clamp(speed, 0f, 6.0f);
                 animSpeed = RemapNum(speed, walkSpeed, runSpeed, 2f, 6f);
@@ -146,14 +170,22 @@ public class AnimatorController : MonoBehaviour
         Vector3 cameraForward = playerCamera.transform.forward;
         if (Vector3.Dot(cameraForward, head.forward) < freeLookRange)
         {
-            lookAtTarget.position = Vector3.Lerp(lookAtTarget.position ,head.position + head.forward,0.1f);
+            lookAtTarget.position = Vector3.Lerp(
+                lookAtTarget.position,
+                head.position + head.forward,
+                0.1f
+            );
         }
         else
         {
-            lookAtTarget.position =Vector3.Lerp(lookAtTarget.position ,head.position + cameraForward,0.1f); 
+            lookAtTarget.position = Vector3.Lerp(
+                lookAtTarget.position,
+                head.position + cameraForward,
+                0.1f
+            );
         }
     }
-    
+
     private float RemapNum(float input, float oldMin, float oldMax, float newMin, float newMax)
     {
         float result = (newMax - newMin) / (oldMax - oldMin) * (input - oldMin) + newMin;
@@ -166,13 +198,22 @@ public class AnimatorController : MonoBehaviour
         Color transparentGreen = new Color(0.0f, 1.0f, 0.0f, 0.35f);
         Color transparentRed = new Color(1.0f, 0.0f, 0.0f, 0.35f);
 
-        if (grounded) Gizmos.color = transparentGreen;
-        else Gizmos.color = transparentRed;
+        if (grounded)
+            Gizmos.color = transparentGreen;
+        else
+            Gizmos.color = transparentRed;
 
         // when selected, draw a gizmo in the position of, and matching radius of, the grounded collider
-        Gizmos.DrawSphere(new Vector3(transform.position.x, transform.position.y - groundedOffset, transform.position.z), groundedRadius);
+        Gizmos.DrawSphere(
+            new Vector3(
+                transform.position.x,
+                transform.position.y - groundedOffset,
+                transform.position.z
+            ),
+            groundedRadius
+        );
     }
-    
+
     private void OnFootstep(AnimationEvent animationEvent)
     {
         if (animationEvent.animatorClipInfo.weight > 0.5f)
@@ -180,7 +221,11 @@ public class AnimatorController : MonoBehaviour
             if (footstepAudioClips.Length > 0)
             {
                 var index = Random.Range(0, footstepAudioClips.Length);
-                AudioSource.PlayClipAtPoint(footstepAudioClips[index], transform.transform.position, footstepAudioVolume);
+                AudioSource.PlayClipAtPoint(
+                    footstepAudioClips[index],
+                    transform.transform.position,
+                    footstepAudioVolume
+                );
             }
         }
     }

SFGgouhuo/Assets/Resources/ShoesShow.json

@@ -1 +1,36 @@
-[120903,120902,120901,120704,120703,120702,120701,120403,120402,12040,111303,111302,111301,111204,111203,111202,111201,111004,111003,111002,111001,110804,110803,110802,110801,110504,110503,110502,110501,110403,110402,110401,171301,170202,170201]
+[
+    120903,
+    120902,
+    120901,
+    120704,
+    120703,
+    120702,
+    120701,
+    120403,
+    120402,
+    12040,
+    111303,
+    111302,
+    111301,
+    111204,
+    111203,
+    111202,
+    111201,
+    111004,
+    111003,
+    111002,
+    111001,
+    110804,
+    110803,
+    110802,
+    110801,
+    110504,
+    110503,
+    110502,
+    110501,
+    110403,
+    110402,
+    110401,
+    170202,
+    170201
+]

SFGgouhuo/Assets/Scripts/MoveController.cs

@@ -1,5 +1,3 @@
-
-using System.Security.Cryptography;
 using UnityEngine;
 using UnityEngine.EventSystems;
 using static UnityEditor.ShaderGraph.Internal.KeywordDependentCollection;
@@ -30,6 +28,7 @@ public class MoveController : MonoBehaviour
     private Vector3 lastMove;
     private Vector3 camInitPos;
     private RaycastHit hit;
+    private Vector3 colliderDir;
 
     public enum PlayerState
     {
@@ -58,11 +57,13 @@ public class MoveController : MonoBehaviour
     // Update is called once per frame
     void Update()
     {
-        if (StepManager.isFaceBuidling) playerInput.InputReset();
+        if (StepManager.isFaceBuidling)
+            playerInput.InputReset();
         CharacterMovement();
     }
+
     /// <summary>
-    /// 角色移动旋转总逻辑
+    /// 锟斤拷色锟狡讹拷锟斤拷转锟斤拷锟竭硷拷
     /// </summary>
     void CharacterMovement()
     {
@@ -70,19 +71,19 @@ public class MoveController : MonoBehaviour
         {
             jumpTime += Time.deltaTime;
         }
-        // 检测是否在地面上
+        // 锟斤拷锟斤拷欠锟斤拷诘锟斤拷锟斤拷锟�
+        //isGrounded = IsGrounded();
         isGrounded = IsGrounded();
-
-
         if (isGrounded && state == PlayerState.JumpDown)
         {
+            verticalVelocity = 0;
             state = PlayerState.Ground;
             hasLand = true;
         }
         //Debug.Log(isGrounded);
         if (state == PlayerState.Ground)
         {
-            // 按下空格键触发跳跃
+            // 锟斤拷锟铰空革拷锟斤拷锟斤拷锟斤拷锟皆�
             if (playerInput.JumpInput)
             {
                 //state = PlayerState.JumpUp;
@@ -100,53 +101,51 @@ public class MoveController : MonoBehaviour
                     hasLand = false;
                 }
             }
-
         }
-        else
+        if (!isGrounded && state != PlayerState.JumpUp)
         {
-            if (state != PlayerState.JumpUp)
-            {
-                state = PlayerState.JumpDown;
-            }
+            state = PlayerState.JumpDown;
         }
- 
+
         move = Vector3.zero;
         if (state != PlayerState.Ground)
         {
-            // 应用重力
+            // 应锟斤拷锟斤拷锟斤拷
             ApplyGravity();
         }
         else
         {
             gravityMove = new Vector3(0, 0, 0);
         }
-        //Debug.Log(playerInput.MoveInput);
         move +=
             new Vector3(playerInput.MoveInput.x, 0, playerInput.MoveInput.y)
             * Time.deltaTime
             * speed;
-        // 移动物体
+
+        // 锟狡讹拷锟斤拷锟斤拷
         Move();
         CameraLimitation();
         UpdateControlRotation();
     }
+
     void Jump()
     {
-        // 计算跳跃速度以达到指定的跳跃高度
+        // 锟斤拷锟斤拷锟斤拷跃锟劫讹拷锟皆达到指锟斤拷锟斤拷锟斤拷跃锟竭讹拷
         verticalVelocity = Mathf.Sqrt(-2.0f * gravity * jumpHeight);
-        //Debug.Log(verticalVelocity);
     }
 
     void ApplyGravity()
     {
-        // 应用重力以模拟物体的垂直运动
+        // 应锟斤拷锟斤拷锟斤拷锟斤拷模锟斤拷锟斤拷锟斤拷拇锟街憋拷硕锟�
         verticalVelocity += gravity * Time.deltaTime;
-        // 根据垂直速度移动物体
+        // 锟斤拷锟捷达拷直锟劫讹拷锟狡讹拷锟斤拷锟斤拷
         if (verticalVelocity < 0.1f && verticalVelocity > -0.1f && state == PlayerState.JumpUp)
         {
-            //Debug.Log("*************");
+            Debug.Log("*************");
             state = PlayerState.JumpDown;
         }
+
+        //Debug.Log(verticalVelocity * 100);
         gravityMove = new Vector3(0, verticalVelocity * Time.deltaTime, 0);
     }
 
@@ -155,7 +154,7 @@ public class MoveController : MonoBehaviour
         if (playerInput.MoveInput != Vector2.zero)
         {
             Vector3 dir = Vector3.zero;
-         
+
             //Debug.Log(playerInput.MoveInput);
             if (playerInput.MoveInput.x > 0)
             {
@@ -181,7 +180,11 @@ public class MoveController : MonoBehaviour
                 10,
                 0f
             );
-            transform.rotation = Quaternion.Slerp(transform.rotation, Quaternion.LookRotation(targetDir),Time.deltaTime * 15f);
+            transform.rotation = Quaternion.Slerp(
+                transform.rotation,
+                Quaternion.LookRotation(targetDir),
+                Time.deltaTime * 15f
+            );
             //var a = Vector3.Angle(transform.forward.normalized, playerInput.MoveInput.normalized);
             //Quaternion r = Quaternion.Euler(0, a, 0);
             //transform.eulerAngles = r * transform.eulerAngles;
@@ -195,15 +198,27 @@ public class MoveController : MonoBehaviour
         );
         Quaternion rot = Quaternion.Euler(0, angle, 0);
         //Vector3 move2 = camera.transform.TransformDirection(move);
-     
+
 
         //Debug.Log(move.magnitude + "***********" + gravityMove.magnitude);
 
-        var m = move * 0.1f + lastMove * 0.9f;
+        //var m = move * 0.1f + lastMove * 0.9f;
+        var rm = rot * move;
+        if (gravityMove != Vector3.zero)
+        {
+            rm *= 2.5f;
+        }
+
+        rm = rm * 0.1f + lastMove * 0.9f;
 
-        character.Move(rot * m + gravityMove);
-        lastMove = m;
-        controller.speed = m.magnitude * 300;
+        //if (state == PlayerState.JumpDown)
+        //{
+        //    character.Move(-colliderDir * Time.deltaTime);
+        //}
+
+        character.Move(rm + gravityMove);
+        lastMove = rm;
+        controller.speed = rm.magnitude * 300;
         camRoot.position = character.transform.position + new Vector3(0, 1.148f, 0);
     }
 
@@ -217,15 +232,15 @@ public class MoveController : MonoBehaviour
     private Vector3 pointTop;
     private float radius = 0.5f;
     private Collider[] colliders;
-    private float LerpValue = 0.05f;
 
     bool IsGrounded()
     {
-        // 在这里你可以添加检测物体是否在地面上的逻辑
-        // 例如射线检测、碰撞器检测等
+        // 锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟接硷拷锟斤拷锟斤拷锟斤拷欠锟斤拷诘锟斤拷锟斤拷系锟斤拷呒锟�
+        // 锟斤拷锟斤拷锟斤拷锟竭硷拷狻�拷锟阶诧拷锟斤拷锟斤拷锟�
+        var pos = transform.position;
         radius = character.radius * 0.9f;
-        pointBottom = transform.position + transform.up * radius - transform.up * 0.1f;
-        pointTop = transform.position + transform.up * character.height - transform.up * radius;
+        pointBottom = pos + transform.up * radius - transform.up * 0.1f;
+        pointTop = pos + transform.up * character.height - transform.up * radius;
 
         colliders = Physics.OverlapCapsule(pointBottom, pointTop, radius, groundLayer);
         Debug.DrawLine(pointBottom, pointTop, Color.red);
@@ -241,37 +256,44 @@ public class MoveController : MonoBehaviour
 
     private void UpdateControlRotation()
     {
-        if (playerInput.touch0Input != Vector2.zero && playerInput.MoveInput == Vector2.zero && !EventSystem.current.IsPointerOverGameObject())
+        if (
+            playerInput.touch0Input != Vector2.zero
+            && playerInput.MoveInput == Vector2.zero
+            && !EventSystem.current.IsPointerOverGameObject()
+        )
         {
             //camera.eulerAngles += (new Vector3(playerInput.touch0Input.y, playerInput.touch0Input.x, 0)) * 0.1f;
             angleX += playerInput.touch0Input.x * 10 * Time.fixedDeltaTime;
             angleY -= playerInput.touch0Input.y * 10 * Time.fixedDeltaTime;
-            angleY = angleClamp(angleY, -45, 60);//相机旋转角度限制
+            angleY = angleClamp(angleY, -45, 60);//锟斤拷锟斤拷锟阶�拷嵌锟斤拷锟斤拷锟�
 
-            //使用插值平滑旋转
+            //使锟矫诧拷值平锟斤拷锟斤拷转
             camRoot.rotation = Quaternion.Lerp(camRoot.rotation, Quaternion.Euler(angleY, angleX, 0), Time.fixedDeltaTime * 100);
 
         }
-        if (playerInput.touch1Input != Vector2.zero && !EventSystem.current.IsPointerOverGameObject())
+        if (
+            playerInput.touch1Input != Vector2.zero
+            && !EventSystem.current.IsPointerOverGameObject()
+        )
         {
             angleX += playerInput.touch1Input.x * 10 * Time.fixedDeltaTime;
             angleY -= playerInput.touch1Input.y * 10 * Time.fixedDeltaTime;
-            angleY = angleClamp(angleY, -45, 60);//相机旋转角度限制
+            angleY = angleClamp(angleY, -45, 60);//锟斤拷锟斤拷锟阶�拷嵌锟斤拷锟斤拷锟�
 
-            //使用插值平滑旋转
+            //使锟矫诧拷值平锟斤拷锟斤拷转
             camRoot.rotation = Quaternion.Lerp(camRoot.rotation, Quaternion.Euler(angleY, angleX, 0), Time.fixedDeltaTime * 100);
         }
 
         angleX += playerInput.CameraInput.x * 10 * Time.fixedDeltaTime;
         angleY -= playerInput.CameraInput.y * 10 * Time.fixedDeltaTime;
-        angleY = angleClamp(angleY, -45, 60);//相机旋转角度限制
+        angleY = angleClamp(angleY, -45, 60);//锟斤拷锟斤拷锟阶�拷嵌锟斤拷锟斤拷锟�
 
-        //使用插值平滑旋转
+        //使锟矫诧拷值平锟斤拷锟斤拷转
         camRoot.rotation = Quaternion.Lerp(camRoot.rotation, Quaternion.Euler(angleY, angleX, 0), Time.fixedDeltaTime * 10);
     }
 
     private static float angleClamp(float angle, float min, float max)
-    {//一个限制角度最大最小值的方法
+    { //一锟斤拷锟斤拷锟狡角讹拷锟斤拷锟斤拷锟叫≈碉拷姆锟斤拷锟�
         if (angle < -360)
             angle += 360;
         if (angle > 360)
@@ -280,7 +302,7 @@ public class MoveController : MonoBehaviour
     }
 
     /// <summary>
-    /// 第三人称镜头避障移动
+    /// 锟斤拷锟斤拷锟剿称撅拷头锟斤拷锟斤拷锟狡讹拷
     /// </summary>
     private void CameraLimitation()
     {
@@ -293,29 +315,29 @@ public class MoveController : MonoBehaviour
         float z, obsDistance=0,camDistance=0;
         //Debug.Log(finalAngle);
 
-        //射线检测避障
-        Ray ray = new Ray(head.position, m_camera.position - head.position);
-        RaycastHit temphit;
-        if (Physics.Raycast(ray, out temphit, 10f))
-        {
-            if (temphit.collider.name != "Main Camera")
-            {
-                isBlock = true;
-                hit = temphit;
-                m_camera.position = Vector3.Lerp(m_camera.position, hit.point, 0.1f);
-            }
-            else
-            {
-                m_camera.localPosition = Vector3.Lerp(m_camera.localPosition, camInitPos, 0.5f);
-            }
-               
-            Debug.Log(temphit.collider.name);
+        //锟斤拷锟竭硷拷锟斤拷锟斤拷
+        //Ray ray = new Ray(head.position, m_camera.position - head.position);
+        //RaycastHit temphit;
+        //if (Physics.Raycast(ray, out temphit, 10f))
+        //{
+        //    if (temphit.collider.name != "Main Camera")
+        //    {
+        //        isBlock = true;
+        //        hit = temphit;
+        //        m_camera.position = Vector3.Lerp(m_camera.position, hit.point, 0.1f);
+        //    }
+        //    else
+        //    {
+        //        m_camera.localPosition = Vector3.Lerp(m_camera.localPosition, camInitPos, 0.5f);
+        //    }
 
-        }
+        //    Debug.Log(temphit.collider.name);
+
+        //}
 
         //if (isBlock)
         //{
-        //    ////向下旋转镜头拉近
+        //    ////锟斤拷锟斤拷锟斤拷转锟斤拷头锟斤拷锟斤拷
         //    //if (finalAngle > 1)
         //    //{
         //    //    z = finalAngle * 0.1f;
@@ -340,16 +362,16 @@ public class MoveController : MonoBehaviour
         //}
         //else
         //{
-        //    ////向下旋转镜头拉近
-        //    //if (finalAngle > 1)
-        //    //{
-        //    //    z = finalAngle * 0.1f;
-        //    //    m_camera.localPosition = camInitPos + new Vector3(0, 0, z);
-        //    //}
-        //    //else
-        //    {
-        //        m_camera.localPosition = Vector3.Lerp(m_camera.localPosition, camInitPos, 0.5f);
-        //    }
+        //锟斤拷锟斤拷锟斤拷转锟斤拷头锟斤拷锟斤拷
+        if (finalAngle > 1)
+        {
+            z = finalAngle * 0.1f;
+            m_camera.localPosition = camInitPos + new Vector3(0, 0, z);
+        }
+        else
+        {
+            m_camera.localPosition = Vector3.Lerp(m_camera.localPosition, camInitPos, 0.5f);
+        }
         //}
     }