DESKTOP-5BUCSUT\LSR пре 1 година
родитељ
комит
7f2ec97ad0

+ 1 - 1
SFGgouhuo/Assets/Bundles/Model/player1.prefab

@@ -3870,7 +3870,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   playerInput: {fileID: 5686692494084832667}
   camera: {fileID: 0}
-  jumpHeight: 2.5
+  jumpHeight: 4
   gravity: -13.524
   state: 0
 --- !u!114 &3757407431860183618

+ 11 - 11
SFGgouhuo/Assets/GameResources/Player/PlayerArmature.prefab

@@ -152,7 +152,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8762427900362077118}
-  m_LocalRotation: {x: 0.5911772, y: 0.05349122, z: 0.008966968, w: 0.80471605}
+  m_LocalRotation: {x: 0.591825, y: 0.053454116, z: 0.008874136, w: 0.8042431}
   m_LocalPosition: {x: 0.000004911422, y: 0.3789641, z: 0.0000036811825}
   m_LocalScale: {x: 0.9999998, y: 1.0000001, z: 0.99999994}
   m_Children:
@@ -494,7 +494,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8762427900721381661}
-  m_LocalRotation: {x: -0.0018193681, y: 0.083570264, z: 0.99592113, w: 0.03396883}
+  m_LocalRotation: {x: -0.0017415455, y: 0.08463282, z: 0.9958254, w: 0.03414936}
   m_LocalPosition: {x: -0.068759926, y: -0.042314343, z: 0.022965973}
   m_LocalScale: {x: 0.99999994, y: 1, z: 1.0000001}
   m_Children:
@@ -526,7 +526,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8762427900724448093}
-  m_LocalRotation: {x: 0.0012745484, y: 0.08377686, z: 0.99590266, w: -0.034026124}
+  m_LocalRotation: {x: 0.001204601, y: 0.08483051, z: 0.99580747, w: -0.03420427}
   m_LocalPosition: {x: 0.06875991, y: -0.04231437, z: 0.02296596}
   m_LocalScale: {x: 1, y: 1.0000001, z: 1.0000001}
   m_Children:
@@ -1014,7 +1014,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8762427900818529073}
-  m_LocalRotation: {x: 0.59131896, y: -0.053918704, z: -0.00865077, w: 0.80458677}
+  m_LocalRotation: {x: 0.59196085, y: -0.053876113, z: -0.008563192, w: 0.80411834}
   m_LocalPosition: {x: -0.000004854202, y: 0.37896448, z: 0.0000036954875}
   m_LocalScale: {x: 0.99999976, y: 1, z: 0.9999999}
   m_Children:
@@ -1939,7 +1939,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8762427901331142559}
-  m_LocalRotation: {x: -0.039984066, y: -0.0011588705, z: 0.0066000763, w: 0.9991779}
+  m_LocalRotation: {x: -0.041847035, y: -0.0011587997, z: 0.006906401, w: 0.99909955}
   m_LocalPosition: {x: -0.000014133454, y: 0.28059646, z: -0.0000091815}
   m_LocalScale: {x: 0.99999994, y: 0.9999998, z: 1.0000001}
   m_Children:
@@ -3247,7 +3247,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8762427901671856371}
-  m_LocalRotation: {x: 0.005403241, y: -0.007986271, z: 0.005935235, w: 0.99993587}
+  m_LocalRotation: {x: 0.005403159, y: -0.007986352, z: 0.005935661, w: 0.99993587}
   m_LocalPosition: {x: -0.000016029475, y: 0.18602979, z: -0.000017094611}
   m_LocalScale: {x: 1.0000001, y: 1.0000001, z: 1.0000002}
   m_Children:
@@ -3705,7 +3705,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8762427901885600985}
-  m_LocalRotation: {x: 0.0054251673, y: 0.007986611, z: -0.005960636, w: 0.9999357}
+  m_LocalRotation: {x: 0.005425286, y: 0.00798654, z: -0.005959795, w: 0.9999356}
   m_LocalPosition: {x: 0.000016171934, y: 0.18602999, z: -0.000017125609}
   m_LocalScale: {x: 1.0000001, y: 0.99999994, z: 1.0000001}
   m_Children:
@@ -3976,7 +3976,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8762427901997230135}
-  m_LocalRotation: {x: 0.06413617, y: 0.011689292, z: 0.11816072, w: 0.9908521}
+  m_LocalRotation: {x: 0.06413607, y: 0.011689397, z: 0.11816033, w: 0.99085224}
   m_LocalPosition: {x: -0.000009190291, y: 0.08570074, z: -0.0000023993198}
   m_LocalScale: {x: 0.99999994, y: 0.9999998, z: 1}
   m_Children:
@@ -4069,7 +4069,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8762427902022659837}
-  m_LocalRotation: {x: 0.06434821, y: -0.009913528, z: -0.11802485, w: 0.99087393}
+  m_LocalRotation: {x: 0.06434822, y: -0.009913477, z: -0.11802545, w: 0.99087393}
   m_LocalPosition: {x: 0.000009430572, y: 0.08570073, z: -0.0000024165495}
   m_LocalScale: {x: 1.0000002, y: 1.0000001, z: 1.0000002}
   m_Children:
@@ -4320,7 +4320,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8762427902218368406}
   m_LocalRotation: {x: 0.69834155, y: -0.000000022462789, z: -0.00000003685403, w: 0.7157648}
-  m_LocalPosition: {x: 0, y: 0.0000038146973, z: -34.026356}
+  m_LocalPosition: {x: 0, y: 0.0000038146973, z: -35.69311}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 8762427901970835926}
@@ -4412,7 +4412,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8762427902295418926}
-  m_LocalRotation: {x: -0.040369473, y: 0.0011569217, z: -0.006663802, w: 0.9991619}
+  m_LocalRotation: {x: -0.042216443, y: 0.0011567954, z: -0.0069675026, w: 0.9990835}
   m_LocalPosition: {x: 0.000014123917, y: 0.28059638, z: -0.000009194316}
   m_LocalScale: {x: 1, y: 0.9999998, z: 1.0000001}
   m_Children:

Разлика између датотеке није приказан због своје велике величине
+ 2 - 1
SFGgouhuo/Assets/Plugins/Bakery/ftGlobalStorage.asset


+ 1 - 1
SFGgouhuo/Assets/Resources/ShoesShow.json

@@ -1 +1 @@
-[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]
+[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]

+ 13 - 0
SFGgouhuo/Assets/Scenes/init.unity

@@ -937,3 +937,16 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &2037684958 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 7921484955300337581, guid: 8db55ecdb2585a74795925eb6a59df81, type: 3}
+  m_PrefabInstance: {fileID: 389565618}
+  m_PrefabAsset: {fileID: 0}
+--- !u!81 &2037684959
+AudioListener:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2037684958}
+  m_Enabled: 1

+ 16 - 7
SFGgouhuo/Assets/Scripts/MoveController.cs

@@ -63,8 +63,15 @@ public class MoveController : MonoBehaviour
         }
         // 检测是否在地面上
         isGrounded = IsGrounded();
+
+
+        if (isGrounded && state == PlayerState.JumpDown)
+        {
+            state = PlayerState.Ground;
+            hasLand = true;
+        }
         //Debug.Log(isGrounded);
-        if (isGrounded)
+        if (state == PlayerState.Ground)
         {
             // 按下空格键触发跳跃
             if (playerInput.JumpInput)
@@ -93,17 +100,17 @@ public class MoveController : MonoBehaviour
                 state = PlayerState.JumpDown;
             }
         }
-        if (isGrounded && state == PlayerState.JumpDown)
-        {
-            state = PlayerState.Ground;
-            hasLand = true;
-        }
+ 
         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)
@@ -117,6 +124,7 @@ public class MoveController : MonoBehaviour
     {
         // 计算跳跃速度以达到指定的跳跃高度
         verticalVelocity = Mathf.Sqrt(-2.0f * gravity * jumpHeight);
+        //Debug.Log(verticalVelocity);
     }
 
     void ApplyGravity()
@@ -126,9 +134,9 @@ public class MoveController : MonoBehaviour
         // 根据垂直速度移动物体
         if (verticalVelocity < 0.1f && verticalVelocity > -0.1f && state == PlayerState.JumpUp)
         {
+            //Debug.Log("*************");
             state = PlayerState.JumpDown;
         }
-
         gravityMove = new Vector3(0, verticalVelocity * Time.deltaTime, 0);
     }
 
@@ -183,6 +191,7 @@ public class MoveController : MonoBehaviour
         //Vector3 move2 = camera.transform.TransformDirection(move);
         controller.speed = move.magnitude * 300;
 
+        //Debug.Log(move.magnitude + "***********" + gravityMove.magnitude);
         character.Move(rot * move + gravityMove);
 
         camera.position= character.transform.position+new Vector3(0,1.148f,0);

+ 7 - 1
SFGgouhuo/Assets/Scripts/UI/FaceBuild/CharacterRender.cs

@@ -138,7 +138,13 @@ public class CharacterRender : MonoBehaviour
             int type = item.Value.good.id / 10000;
             if (type == 17)
             {
-                isShowPaints = false;
+                for (int i = 0; i < shoesShow.Count; i++)
+                {
+                    if (item.Value.good.id == shoesShow[i])
+                    {
+                        isShowPaints = false;
+                    }
+                }
             }
             if (type == 11)
             {

Неке датотеке нису приказане због велике количине промена