障碍物降低速度等级为上一级最大速度

StockRunning/Assets/#A1_Scenes/DemoScenes.unity

@@ -1296,6 +1296,12 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!4 &568785427 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 4347060696067375054, guid: 9df92b8d1ef7a40498478afecbaf3a8f,
+    type: 3}
+  m_PrefabInstance: {fileID: 2002657563}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &588271173
 GameObject:
   m_ObjectHideFlags: 0
@@ -1674,6 +1680,36 @@ MonoBehaviour:
   GoldName: Egg
   IsScoreSettlementStatus: 0
   IsWin: 0
+--- !u!1 &895813958
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 895813959}
+  m_Layer: 0
+  m_Name: GameObject
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &895813959
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 895813958}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 5.77, y: -1.5635264, z: -42.11304}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 1147898531}
+  m_RootOrder: 9
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &921224632
 GameObject:
   m_ObjectHideFlags: 0
@@ -2244,6 +2280,9 @@ Transform:
   - {fileID: 690225410}
   - {fileID: 1360783063}
   - {fileID: 1632726166}
+  - {fileID: 895813959}
+  - {fileID: 1787074998}
+  - {fileID: 568785427}
   m_Father: {fileID: 0}
   m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -3124,6 +3163,12 @@ SkinnedMeshRenderer:
     m_Center: {x: 0.00000014901161, y: -0.028687015, z: 1.0085826}
     m_Extent: {x: 0.53575397, y: 0.16181368, z: 0.39801863}
   m_DirtyAABB: 0
+--- !u!4 &1787074998 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 417988, guid: 5fcafcc84e4baa34fad1dfafcad179c5,
+    type: 3}
+  m_PrefabInstance: {fileID: 1849674434}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1818299307
 GameObject:
   m_ObjectHideFlags: 0
@@ -3160,7 +3205,7 @@ PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
-    m_TransformParent: {fileID: 0}
+    m_TransformParent: {fileID: 1147898531}
     m_Modifications:
     - target: {fileID: 127988, guid: 5fcafcc84e4baa34fad1dfafcad179c5, type: 3}
       propertyPath: m_Name
@@ -3172,15 +3217,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 417988, guid: 5fcafcc84e4baa34fad1dfafcad179c5, type: 3}
       propertyPath: m_LocalPosition.x
-      value: 0
+      value: 1.61
       objectReference: {fileID: 0}
     - target: {fileID: 417988, guid: 5fcafcc84e4baa34fad1dfafcad179c5, type: 3}
       propertyPath: m_LocalPosition.y
-      value: 0
+      value: -3.0256503
       objectReference: {fileID: 0}
     - target: {fileID: 417988, guid: 5fcafcc84e4baa34fad1dfafcad179c5, type: 3}
       propertyPath: m_LocalPosition.z
-      value: 0
+      value: 0.00594759
       objectReference: {fileID: 0}
     - target: {fileID: 417988, guid: 5fcafcc84e4baa34fad1dfafcad179c5, type: 3}
       propertyPath: m_LocalRotation.x
@@ -3188,11 +3233,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 417988, guid: 5fcafcc84e4baa34fad1dfafcad179c5, type: 3}
       propertyPath: m_LocalRotation.y
-      value: 0
+      value: -0
       objectReference: {fileID: 0}
     - target: {fileID: 417988, guid: 5fcafcc84e4baa34fad1dfafcad179c5, type: 3}
       propertyPath: m_LocalRotation.z
-      value: 0
+      value: -0
       objectReference: {fileID: 0}
     - target: {fileID: 417988, guid: 5fcafcc84e4baa34fad1dfafcad179c5, type: 3}
       propertyPath: m_LocalRotation.w
@@ -3200,7 +3245,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 417988, guid: 5fcafcc84e4baa34fad1dfafcad179c5, type: 3}
       propertyPath: m_RootOrder
-      value: 6
+      value: 10
       objectReference: {fileID: 0}
     - target: {fileID: 417988, guid: 5fcafcc84e4baa34fad1dfafcad179c5, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -3475,7 +3520,7 @@ MonoBehaviour:
   VSpeed: 10
   SpeedLevel: 1
   AddSpeed: 2.5
-  HSpeed: 10
+  HSpeed: 8.5
   VSpeedAI: 9
   SpeedLevelAI: 1
   AddSpeedAI: 2.5
@@ -3593,22 +3638,22 @@ PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
-    m_TransformParent: {fileID: 0}
+    m_TransformParent: {fileID: 1147898531}
     m_Modifications:
     - target: {fileID: 4347060696067375054, guid: 9df92b8d1ef7a40498478afecbaf3a8f,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: 3.94
+      value: 5.55
       objectReference: {fileID: 0}
     - target: {fileID: 4347060696067375054, guid: 9df92b8d1ef7a40498478afecbaf3a8f,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: -2.5102768
+      value: -5.535927
       objectReference: {fileID: 0}
     - target: {fileID: 4347060696067375054, guid: 9df92b8d1ef7a40498478afecbaf3a8f,
         type: 3}
       propertyPath: m_LocalPosition.z
-      value: 4.5799174
+      value: 4.585865
       objectReference: {fileID: 0}
     - target: {fileID: 4347060696067375054, guid: 9df92b8d1ef7a40498478afecbaf3a8f,
         type: 3}
@@ -3618,12 +3663,12 @@ PrefabInstance:
     - target: {fileID: 4347060696067375054, guid: 9df92b8d1ef7a40498478afecbaf3a8f,
         type: 3}
       propertyPath: m_LocalRotation.y
-      value: 0
+      value: -0
       objectReference: {fileID: 0}
     - target: {fileID: 4347060696067375054, guid: 9df92b8d1ef7a40498478afecbaf3a8f,
         type: 3}
       propertyPath: m_LocalRotation.z
-      value: 0
+      value: -0
       objectReference: {fileID: 0}
     - target: {fileID: 4347060696067375054, guid: 9df92b8d1ef7a40498478afecbaf3a8f,
         type: 3}
@@ -3633,7 +3678,7 @@ PrefabInstance:
     - target: {fileID: 4347060696067375054, guid: 9df92b8d1ef7a40498478afecbaf3a8f,
         type: 3}
       propertyPath: m_RootOrder
-      value: 7
+      value: 11
       objectReference: {fileID: 0}
     - target: {fileID: 4347060696067375054, guid: 9df92b8d1ef7a40498478afecbaf3a8f,
         type: 3}
@@ -3650,6 +3695,16 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 4347060696067375054, guid: 9df92b8d1ef7a40498478afecbaf3a8f,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 1.4999999
+      objectReference: {fileID: 0}
+    - target: {fileID: 4347060696067375054, guid: 9df92b8d1ef7a40498478afecbaf3a8f,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 1.4999999
+      objectReference: {fileID: 0}
     - target: {fileID: 4347060696067861758, guid: 9df92b8d1ef7a40498478afecbaf3a8f,
         type: 3}
       propertyPath: m_Name
@@ -4704,11 +4759,6 @@ PrefabInstance:
       propertyPath: m_Mesh
       value: 
       objectReference: {fileID: 0}
-    - target: {fileID: 8161822684297487994, guid: e808ab909854dca4dba20c69399d6a13,
-        type: 3}
-      propertyPath: m_IsActive
-      value: 1
-      objectReference: {fileID: 0}
     - target: {fileID: 8639644498048831415, guid: e808ab909854dca4dba20c69399d6a13,
         type: 3}
       propertyPath: m_Mesh

StockRunning/Assets/My/Materials/Care_Competitor2.mat

@@ -40,7 +40,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 2800000, guid: df7c0e6cf8f64a44ea359c778e386616, type: 3}
+        m_Texture: {fileID: 2800000, guid: e6bcefb2a2fea3442809925e5d4fe224, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MetallicGlossMap:

StockRunning/Assets/My/Scripts/AI/AIMove.cs

@@ -99,6 +99,8 @@ public class AIMove : MonoBehaviour
     public float MoveSpeed = 0.0f;
     private bool Grounded = false;
     private GameObject targetObj;
+    //最大速度等级
+    private int MaxSpeedLevel=15;
 
 
     // Start is called before the first frame update
@@ -126,7 +128,7 @@ public class AIMove : MonoBehaviour
     {
         if (other.tag == "Gold" )
         {
-            if(SpeedLevel < 15)
+            if(SpeedLevel < MaxSpeedLevel)
             {
 
 
@@ -141,11 +143,8 @@ public class AIMove : MonoBehaviour
         }
         else if (other.tag == "Prickle")
         {
-            if (this.SpeedLevel > 1)
-            {
-                this.SpeedLevel--;
-                ChangeModel();
-            }
+            //触发地刺
+            ChangeSpeedLevelToPrevMaxLevelAndChangeModel();
         }
     }
     private void OnCollisionExit(Collision other)
@@ -691,7 +690,7 @@ public class AIMove : MonoBehaviour
                 Model2.SetActive(false);
                 Model3.SetActive(false);
                 //视觉效果变化
-                Bag1.SetActive(true);
+                Bag1.SetActive(false);
                 Bag2.SetActive(false);
                 Bag3.SetActive(false);
                 Bag4.SetActive(false);
@@ -935,23 +934,51 @@ public class AIMove : MonoBehaviour
                 break;
         }
     }
+    //速度等级变化为上一级最大的速度等级并改变模型。
+    public void ChangeSpeedLevelToPrevMaxLevelAndChangeModel()
+    {
+        if (SpeedLevel <= 1)
+        {
+            SpeedLevel = 1;
+            return;
+        }
+        switch ((SpeedLevel - 1) / (MaxSpeedLevel / 3))
+        {
+            case 0:
+                SpeedLevel = 1;
+                break;
+            case 1:
+                SpeedLevel = MaxSpeedLevel / 3;
+                break;
+            case 2:
+                SpeedLevel = 2 * MaxSpeedLevel / 3;
+                break;
+            default:
+                Debug.LogError("没有这个等级：" + SpeedLevel);
+                break;
+
+        }
+        ChangeModel();
+    }
+
+
     //改变速度等级
     public void ChangeSpeedLevel(int number)
     {
         if (number > 0)
         {
-            if (SpeedLevel < 3)
+            if (SpeedLevel < MaxSpeedLevel)
             {
                 SpeedLevel += number;
-                if (SpeedLevel > 3) SpeedLevel = 3;
+                if (SpeedLevel > MaxSpeedLevel) SpeedLevel = MaxSpeedLevel;
                 ChangeModel();
             }
         }
         else
         {
-            if (this.SpeedLevel > 1)
+            if (SpeedLevel > 1)
             {
-                this.SpeedLevel += number;
+                SpeedLevel += number;
                 if (SpeedLevel <= 0) SpeedLevel = 1;
                 ChangeModel();
             }

StockRunning/Assets/My/Scripts/Player/PlayerMove.cs

@@ -94,6 +94,8 @@ public class PlayerMove : MonoBehaviour
     [HideInInspector]
     public float MoveSpeed=0.0f;
     private bool Grounded = false;
+    //最大速度等级
+    private int MaxSpeedLevel = 15;//1-15 分为 1-5 6-10 11-15
 
 
 
@@ -134,7 +136,7 @@ public class PlayerMove : MonoBehaviour
         {
             other.gameObject.GetComponentInChildren<Gold>().PlayParticle();//吃金币特效
             Destroy(other.gameObject);
-            if (SpeedLevel < 15)
+            if (SpeedLevel < MaxSpeedLevel)
             {
                 SpeedLevel += 1;
                 BattleCtrl.instance.Score++;
@@ -144,11 +146,7 @@ public class PlayerMove : MonoBehaviour
         }
         else if (other.tag== "Prickle")
         {
-            if (this.SpeedLevel > 1)
-            {
-                this.SpeedLevel--;
-                ChangeModel();
-            }
+            ChangeSpeedLevelToPrevMaxLevelAndChangeModel();
         }
         //else if (other.tag == "Prop" && DoRanking._instance.rankingList[2]!=gameObject) //自己不是最前面的人。
         //{
@@ -578,6 +576,7 @@ public class PlayerMove : MonoBehaviour
     //em.rateOverTime = mmc;
     public void ChangeModel()
     {
+        //print("当前等级："+SpeedLevel);
         switch (SpeedLevel)
         {
             case 1:
@@ -588,7 +587,7 @@ public class PlayerMove : MonoBehaviour
                 Model2.SetActive(false);
                 Model3.SetActive(false);
                 //视觉效果变化
-                Bag1.SetActive(true);
+                Bag1.SetActive(false);
                 Bag2.SetActive(false);
                 Bag3.SetActive(false);
                 Bag4.SetActive(false);
@@ -833,23 +832,51 @@ public class PlayerMove : MonoBehaviour
         }
     }
 
+    //速度等级变化为上一级最大的速度等级并改变模型。
+    public void ChangeSpeedLevelToPrevMaxLevelAndChangeModel()
+    {
+        if (SpeedLevel <= 1)
+        {
+            SpeedLevel = 1;
+            return;
+        }
+        switch ((SpeedLevel - 1) / (MaxSpeedLevel / 3))
+        {
+            case 0:
+                SpeedLevel = 1;
+                break;
+            case 1:
+                SpeedLevel = MaxSpeedLevel / 3;
+                break;
+            case 2:
+                SpeedLevel = 2 * MaxSpeedLevel / 3;
+                break;
+            default:
+                Debug.LogError("没有这个等级：" + SpeedLevel);
+                break;
+
+        }
+        ChangeModel();
+    }
+
+
     //改变速度等级
     public void ChangeSpeedLevel(int number) 
     {
         if(number > 0)
         {
-            if (SpeedLevel < 3 )
+            if (SpeedLevel < MaxSpeedLevel )
             {
                 SpeedLevel += number;
-                if (SpeedLevel > 3) SpeedLevel = 3;
+                if (SpeedLevel > MaxSpeedLevel) SpeedLevel = MaxSpeedLevel;
                 ChangeModel();
             }
         }
         else 
         {
-            if (this.SpeedLevel > 1)
+            if (SpeedLevel > 1)
             {
-                this.SpeedLevel += number;
+                SpeedLevel += number;
                 if (SpeedLevel <= 0) SpeedLevel = 1;
                 ChangeModel();
             }

StockRunning/Assets/My/Scripts/Prop/Enemy_Vertigo.cs

@@ -16,6 +16,7 @@ public class Enemy_Vertigo : MonoBehaviour
     //状态
     private float MoveSpeed = 0.0f;
     private bool Grounded = false;
+    private int life = 1;
 
 
     void Start()
@@ -56,18 +57,26 @@ public class Enemy_Vertigo : MonoBehaviour
 
     private void OnControllerColliderHit(ControllerColliderHit hit)
     {
-        
+        if (life <= 0)
+        {
+            return;
+        }
         if (hit.collider.tag == "Competitor")
         {
+            life--;
             hit.gameObject.GetComponent<AIMove>().Vertigo(VertigoTime);//眩晕1秒
-            hit.gameObject.GetComponent<AIMove>().ChangeSpeedLevel(-1); //等级降低一级
+            //hit.gameObject.GetComponent<AIMove>().ChangeSpeedLevel(-1); //等级降低一级
+            hit.gameObject.GetComponent<AIMove>().ChangeSpeedLevelToPrevMaxLevelAndChangeModel(); //等级降低到上一级
             Destroy(gameObject);
         }
         if (hit.collider.tag == "Player")
         {
+            life--;
             hit.gameObject.GetComponent<PlayerMove>().Vertigo(VertigoTime);//眩晕1秒
-            hit.gameObject.GetComponent<PlayerMove>().ChangeSpeedLevel(-1); //等级降低一级
-            //print("------------"+transform.name);
+            //hit.gameObject.GetComponent<PlayerMove>().ChangeSpeedLevel(-1); //等级降低一级
+            //print("减速前："+ hit.gameObject.GetComponent<PlayerMove>().SpeedLevel);
+            hit.gameObject.GetComponent<PlayerMove>().ChangeSpeedLevelToPrevMaxLevelAndChangeModel(); //等级降低到上一级
+            //print("减速后：" + hit.gameObject.GetComponent<PlayerMove>().SpeedLevel);
             Destroy(gameObject);
         }
     }

StockRunning/Assets/My/Scripts/Prop/GiantRock.cs

@@ -10,6 +10,7 @@ public class GiantRock : MonoBehaviour
     public float VertigoTime=3;
     private Vector3 moveDirection;
     private CharacterController characterController;
+    private int life = 1;
     void Start()
     {
         characterController = GetComponent<CharacterController>();
@@ -31,17 +32,27 @@ public class GiantRock : MonoBehaviour
     }
     private void OnControllerColliderHit(ControllerColliderHit hit)
     {
+        if (life <= 0)
+        {
+            return;
+        }
 
         if (hit.collider.tag == "Competitor")
         {
+            life--;
             hit.gameObject.GetComponent<AIMove>().Vertigo(VertigoTime);//眩晕1秒
-            hit.gameObject.GetComponent<AIMove>().ChangeSpeedLevel(-1); //等级降低一级
+            //hit.gameObject.GetComponent<AIMove>().ChangeSpeedLevel(-1); //等级降低一级
+            hit.gameObject.GetComponent<AIMove>().ChangeSpeedLevelToPrevMaxLevelAndChangeModel(); //等级降低到上一级
             Destroy(gameObject);
         }
         if (hit.collider.tag == "Player")
         {
+            life--;
             hit.gameObject.GetComponent<PlayerMove>().Vertigo(VertigoTime);//眩晕1秒
-            hit.gameObject.GetComponent<PlayerMove>().ChangeSpeedLevel(-1); //等级降低一级
+            //hit.gameObject.GetComponent<PlayerMove>().ChangeSpeedLevel(-1); //等级降低一级
+            //print("减速前："+ hit.gameObject.GetComponent<PlayerMove>().SpeedLevel);
+            hit.gameObject.GetComponent<PlayerMove>().ChangeSpeedLevelToPrevMaxLevelAndChangeModel(); //等级降低到上一级
+            //print("减速后：" + hit.gameObject.GetComponent<PlayerMove>().SpeedLevel);
             Destroy(gameObject);
         }
     }

StockRunning/Assets/Prefabs/Level1.prefab

@@ -833,7 +833,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &1301929387574185764
 Transform:
   m_ObjectHideFlags: 0
@@ -1211,6 +1211,7 @@ MonoBehaviour:
   SpeedLevel: 1
   AddSpeed: 10
   moveType: 3
+  deceleration: 15
   ray1Pos: {fileID: 7541388073803127926}
   ray2Pos: {fileID: 5032744175484786249}
   raySeeWayPos: {fileID: 5223923107678720187}
@@ -3964,6 +3965,7 @@ MonoBehaviour:
   SpeedLevel: 1
   AddSpeed: 10
   moveType: 3
+  deceleration: 15
   ray1Pos: {fileID: 3523556755543769068}
   ray2Pos: {fileID: 7389707554565006012}
   raySeeWayPos: {fileID: 6652092100814694513}
@@ -4008,7 +4010,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &8432598096120910063
 Transform:
   m_ObjectHideFlags: 0
@@ -4198,6 +4200,7 @@ MonoBehaviour:
   AddSpeed: 10
   HSpeed: 10
   moveType: 3
+  deceleration: 15
   ray1Pos: {fileID: 129145631161865350}
   ray2Pos: {fileID: 8250916796881197486}
   ModelParent: {fileID: 1676130991665221238}

StockRunning/Assets/Prefabs/Level2My.prefab

@@ -3065,7 +3065,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &6558040878248959445
 Transform:
   m_ObjectHideFlags: 0
@@ -4135,7 +4135,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &8432598096120910063
 Transform:
   m_ObjectHideFlags: 0
@@ -4465,6 +4465,7 @@ MonoBehaviour:
   SpeedLevel: 1
   AddSpeed: 10
   moveType: 3
+  deceleration: 15
   ray1Pos: {fileID: 4479779271513069919}
   ray2Pos: {fileID: 2484290207797131001}
   raySeeWayPos: {fileID: 1411490667}
@@ -5144,6 +5145,7 @@ MonoBehaviour:
   SpeedLevel: 1
   AddSpeed: 10
   moveType: 3
+  deceleration: 15
   ray1Pos: {fileID: 3062559332138847753}
   ray2Pos: {fileID: 1731277379349557077}
   raySeeWayPos: {fileID: 989977828}
@@ -6357,6 +6359,7 @@ MonoBehaviour:
   AddSpeed: 10
   HSpeed: 10
   moveType: 3
+  deceleration: 15
   ray1Pos: {fileID: 1273825214}
   ray2Pos: {fileID: 95854533}
   ModelParent: {fileID: 8198971087353062533}