优化并修复眩晕时长bug

StockRunning/Assets/#A1_Scenes/DemoScenes.unity

@@ -516,6 +516,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 5229443796114076655}
+  - {fileID: 1358820923}
   m_Father: {fileID: 707446924}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -533,6 +534,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   levelPrefs:
   - {fileID: 3580928607794605871, guid: e808ab909854dca4dba20c69399d6a13, type: 3}
+  - {fileID: 1358820924}
 --- !u!1 &208829002
 GameObject:
   m_ObjectHideFlags: 0
@@ -2342,6 +2344,24 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!4 &1358820923 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 3837569216805053198, guid: 6cc70e2d845becb45a2f0b3462de70dd,
+    type: 3}
+  m_PrefabInstance: {fileID: 6185819660585071757}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &1358820924 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 3580928607794605871, guid: 6cc70e2d845becb45a2f0b3462de70dd,
+    type: 3}
+  m_PrefabInstance: {fileID: 6185819660585071757}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ceb21212bec2e9541b2306de7f6baba0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &1370655875
 GameObject:
   m_ObjectHideFlags: 0
@@ -3200,8 +3220,9 @@ MonoBehaviour:
   VSpeedEnemy_V: 10
   SpeedLevelEnemy_V: 1
   AddSpeedEnemy_V: 10
-  VertigoTimeEnemy_V: 3
+  VertigoTimeEnemy_V: 1.5
   disZ: 50
+  VertigoTimeGianRock: 2
 --- !u!4 &1960597218
 Transform:
   m_ObjectHideFlags: 0
@@ -3609,6 +3630,80 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: c26c7a0dcd8138d4194e0a4435a4740c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!1001 &6185819660585071757
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 186647395}
+    m_Modifications:
+    - target: {fileID: 3837569216805053198, guid: 6cc70e2d845becb45a2f0b3462de70dd,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3837569216805053198, guid: 6cc70e2d845becb45a2f0b3462de70dd,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3837569216805053198, guid: 6cc70e2d845becb45a2f0b3462de70dd,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3837569216805053198, guid: 6cc70e2d845becb45a2f0b3462de70dd,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3837569216805053198, guid: 6cc70e2d845becb45a2f0b3462de70dd,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3837569216805053198, guid: 6cc70e2d845becb45a2f0b3462de70dd,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3837569216805053198, guid: 6cc70e2d845becb45a2f0b3462de70dd,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3837569216805053198, guid: 6cc70e2d845becb45a2f0b3462de70dd,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3837569216805053198, guid: 6cc70e2d845becb45a2f0b3462de70dd,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3837569216805053198, guid: 6cc70e2d845becb45a2f0b3462de70dd,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3837569216805053198, guid: 6cc70e2d845becb45a2f0b3462de70dd,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3837569216805053199, guid: 6cc70e2d845becb45a2f0b3462de70dd,
+        type: 3}
+      propertyPath: m_Name
+      value: Level1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3837569216805053199, guid: 6cc70e2d845becb45a2f0b3462de70dd,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 6cc70e2d845becb45a2f0b3462de70dd, type: 3}
 --- !u!1001 &9066730885102719201
 PrefabInstance:
   m_ObjectHideFlags: 0

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

@@ -656,6 +656,28 @@ public class AIMove : MonoBehaviour
                 break;
         }
     }
+    //改变速度等级
+    public void ChangeSpeedLevel(int number)
+    {
+        if (number > 0)
+        {
+            if (SpeedLevel < 3)
+            {
+                SpeedLevel += number;
+                if (SpeedLevel > 3) SpeedLevel = 3;
+                ChangeModel();
+            }
+        }
+        else
+        {
+            if (this.SpeedLevel > 1)
+            {
+                this.SpeedLevel += number;
+                if (SpeedLevel <= 0) SpeedLevel = 1;
+                ChangeModel();
+            }
+        }
+    }
     private void OnDestroy()
     {
         m_targetTrans = null;

StockRunning/Assets/My/Scripts/ConfigurationFile.cs

@@ -27,6 +27,7 @@ public class ConfigurationFile : MonoBehaviour
     public float backDis = 5.51f;
     [Tooltip("相对主角 向上的距离")]
     public float upDis = 8.77f;
+
     [Header("打手")]
     [Tooltip("基础速度")]
     public float VSpeedEnemy_V = 20.0f;
@@ -39,6 +40,9 @@ public class ConfigurationFile : MonoBehaviour
     [Tooltip("小人出现的位置在目标的前方的距离")]
     public float disZ = 50;
 
+    [Header("巨石")]
+    [Tooltip("眩晕时长")]
+    public float VertigoTimeGianRock = 3;
 
 
 

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

@@ -368,7 +368,9 @@ public class PlayerMove : MonoBehaviour
         {
             //transform.position += transform.right * GameServices.inputService.joyStick.axisX.axisValue * HSpeed * Time.deltaTime;
             Gesture currentGesture = EasyTouch.current;
-            if (currentGesture != null && (currentGesture.type == EasyTouch.EvtType.On_Drag)) //if (currentGesture != null && (currentGesture.type==EasyTouch.EvtType.On_Swipe|| currentGesture.type == EasyTouch.EvtType.On_Drag))
+            if (currentGesture != null ) //if (currentGesture != null && (currentGesture.type==EasyTouch.EvtType.On_Swipe|| currentGesture.type == EasyTouch.EvtType.On_Drag))
+            {
+                if (currentGesture.type == EasyTouch.EvtType.On_Drag)
                 {
                     //transform.position += transform.right * currentGesture.deltaPosition.x / Screen.width * HSpeed;   //马路宽14 （HSpeed=14）
                     xDelta = currentGesture.deltaPosition.x / Screen.width * HSpeed;
@@ -378,6 +380,13 @@ public class PlayerMove : MonoBehaviour
                     //addXTemp += (transform.right * currentGesture.deltaPosition.x / Screen.width * HSpeed).x;
                     //targetX += addXTemp;
                 }
+                else if (currentGesture.type == EasyTouch.EvtType.On_TouchUp)
+                {
+                    xDelta = 0;
+                }
+
+
+             }
             //else if (currentGesture != null && (currentGesture.type == EasyTouch.EvtType.On_DragEnd))
             //{
             //    addXTemp = 0;
@@ -499,12 +508,13 @@ public class PlayerMove : MonoBehaviour
 
     public void Vertigo(float time)
     {
-        if(time> timerVertigo)
-        {
-            timerVertigo = time;   //不累加时长，单会更新时长。
-        }
 
-        //timerVertigo += time; //累加眩晕时长
+        //if(time> timerVertigo)
+        //{
+        //    timerVertigo = time;   //不累加时长，单会更新时长。
+        //}
+        //print("player眩晕时长：" + timerVertigo+"+"+ time);
+        timerVertigo += time; //累加眩晕时长
     }
 
     public void ChangeModel()
@@ -529,6 +539,29 @@ public class PlayerMove : MonoBehaviour
         }
     }
 
+    //改变速度等级
+    public void ChangeSpeedLevel(int number) 
+    {
+        if(number > 0)
+        {
+            if (SpeedLevel < 3 )
+            {
+                SpeedLevel += number;
+                if (SpeedLevel > 3) SpeedLevel = 3;
+                ChangeModel();
+            }
+        }
+        else 
+        {
+            if (this.SpeedLevel > 1)
+            {
+                this.SpeedLevel += number;
+                if (SpeedLevel <= 0) SpeedLevel = 1;
+                ChangeModel();
+            }
+        }
+    }
+
     private void OnDestroy()
     {
         m_targetTrans = null;

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

@@ -60,11 +60,14 @@ public class Enemy_Vertigo : MonoBehaviour
         if (hit.collider.tag == "Competitor")
         {
             hit.gameObject.GetComponent<AIMove>().Vertigo(VertigoTime);//眩晕1秒
+            hit.gameObject.GetComponent<AIMove>().ChangeSpeedLevel(-1); //等级降低一级
             Destroy(gameObject);
         }
         if (hit.collider.tag == "Player")
         {
             hit.gameObject.GetComponent<PlayerMove>().Vertigo(VertigoTime);//眩晕1秒
+            hit.gameObject.GetComponent<PlayerMove>().ChangeSpeedLevel(-1); //等级降低一级
+            print("------------"+transform.name);
             Destroy(gameObject);
         }
     }

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

@@ -4,7 +4,9 @@ using UnityEngine;
 
 public class GiantRock : MonoBehaviour
 {
+    
     public Transform ballModel;
+    [Tooltip("眩晕时长")]
     public float VertigoTime=3;
     private Vector3 moveDirection;
     private CharacterController characterController;
@@ -16,6 +18,9 @@ public class GiantRock : MonoBehaviour
     // Update is called once per frame
     void Update()
     {
+        //配置文件读取数据
+        VertigoTime = ConfigurationFile.instance.VertigoTimeGianRock;
+
 
         //moveDirection = transform.TransformDirection(-Vector3.forward) * 10f * Time.deltaTime;
         moveDirection.z = -10 * Time.deltaTime;
@@ -30,11 +35,13 @@ public class GiantRock : MonoBehaviour
         if (hit.collider.tag == "Competitor")
         {
             hit.gameObject.GetComponent<AIMove>().Vertigo(VertigoTime);//眩晕1秒
+            hit.gameObject.GetComponent<AIMove>().ChangeSpeedLevel(-1); //等级降低一级
             Destroy(gameObject);
         }
         if (hit.collider.tag == "Player")
         {
             hit.gameObject.GetComponent<PlayerMove>().Vertigo(VertigoTime);//眩晕1秒
+            hit.gameObject.GetComponent<PlayerMove>().ChangeSpeedLevel(-1); //等级降低一级
             Destroy(gameObject);
         }
     }

StockRunning/Assets/Prefabs/Level1.prefab

@@ -242,6 +242,9 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   enemy3AI: {fileID: 2689322666598067864}
   disZ: 50
+  Enemy_VertigoMat: {fileID: 0}
+  rockList: []
+  GiantRockMat: {fileID: 0}
 --- !u!1 &1106502358
 GameObject:
   m_ObjectHideFlags: 0
@@ -1989,6 +1992,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   backDis: 6.390015
   upDis: 6.64
+  target: {fileID: 0}
 --- !u!1 &3837569216639476273
 GameObject:
   m_ObjectHideFlags: 0
@@ -2135,7 +2139,7 @@ MonoBehaviour:
   m_camera: {fileID: 3837569216442705614}
   m_bombView: {fileID: 0}
   m_carView: {fileID: 0}
-  curLevelIndex: 0
+  curLevelIndex: 1
 --- !u!1 &3837569217343095456
 GameObject:
   m_ObjectHideFlags: 0
@@ -2675,6 +2679,12 @@ MonoBehaviour:
   moveType: 3
   ray1Pos: {fileID: 4479779271513069919}
   ray2Pos: {fileID: 2484290207797131001}
+  raySeeWayPos: {fileID: 0}
+  aIStrategy: 0
+  ModelParent: {fileID: 0}
+  Model1: {fileID: 0}
+  Model2: {fileID: 0}
+  Model3: {fileID: 0}
   MoveSpeed: 0
 --- !u!1 &5420479993494631220
 GameObject:
@@ -2877,6 +2887,9 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   enemy3AI: {fileID: 2689322666598067864}
   disZ: 50
+  Enemy_VertigoMat: {fileID: 0}
+  rockList: []
+  GiantRockMat: {fileID: 0}
 --- !u!1 &7057249677119442975
 GameObject:
   m_ObjectHideFlags: 0
@@ -2979,6 +2992,12 @@ MonoBehaviour:
   moveType: 3
   ray1Pos: {fileID: 3062559332138847753}
   ray2Pos: {fileID: 1731277379349557077}
+  raySeeWayPos: {fileID: 0}
+  aIStrategy: 0
+  ModelParent: {fileID: 0}
+  Model1: {fileID: 0}
+  Model2: {fileID: 0}
+  Model3: {fileID: 0}
   MoveSpeed: 0
 --- !u!1 &8023204979392085863
 GameObject:
@@ -3364,6 +3383,10 @@ MonoBehaviour:
   moveType: 3
   ray1Pos: {fileID: 1273825214}
   ray2Pos: {fileID: 95854533}
+  ModelParent: {fileID: 0}
+  Model1: {fileID: 0}
+  Model2: {fileID: 0}
+  Model3: {fileID: 0}
   MoveSpeed: 0
 --- !u!1 &9091774512823431381
 GameObject:

StockRunning/Assets/Prefabs/Level2My.prefab

@@ -2489,7 +2489,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   ballModel: {fileID: 1130073829965066656}
-  VertigoTime: 3
+  VertigoTime: 2
 --- !u!1 &4825482254551959764
 GameObject:
   m_ObjectHideFlags: 0
@@ -2973,7 +2973,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   ballModel: {fileID: 7014665570390631413}
-  VertigoTime: 3
+  VertigoTime: 2
 --- !u!1 &6526020602528927974
 GameObject:
   m_ObjectHideFlags: 0
@@ -5186,6 +5186,11 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 8198971087353062533}
     m_Modifications:
+    - target: {fileID: 3996154059610153115, guid: 793fbca05fcc2ee408b8656d62a36dbf,
+        type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 4004674577979274084, guid: 793fbca05fcc2ee408b8656d62a36dbf,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -6397,6 +6402,26 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 8804515343983888336}
     m_Modifications:
+    - target: {fileID: 7591606122630040990, guid: 3eb512a2db543e1478b1bb425cd18145,
+        type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7592038852114164710, guid: 3eb512a2db543e1478b1bb425cd18145,
+        type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7592042763986535236, guid: 3eb512a2db543e1478b1bb425cd18145,
+        type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7592455485297688144, guid: 3eb512a2db543e1478b1bb425cd18145,
+        type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 7613604716433547940, guid: 3eb512a2db543e1478b1bb425cd18145,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -7053,6 +7078,11 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 3472949136629615191}
     m_Modifications:
+    - target: {fileID: 6873488442313140511, guid: 8cdb81d97da4dac4fb32ba52cc783ea6,
+        type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 6882290144796092793, guid: 8cdb81d97da4dac4fb32ba52cc783ea6,
         type: 3}
       propertyPath: m_Layer
@@ -8262,6 +8292,11 @@ PrefabInstance:
       propertyPath: m_Layer
       value: 2
       objectReference: {fileID: 0}
+    - target: {fileID: 1046032177157292684, guid: b6c98f5bc16220b42872d1a7498bdd81,
+        type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: b6c98f5bc16220b42872d1a7498bdd81, type: 3}
 --- !u!1 &7130241826481433521 stripped
@@ -8643,6 +8678,31 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 3472949136629615191}
     m_Modifications:
+    - target: {fileID: 7591592432652842092, guid: 3eb512a2db543e1478b1bb425cd18145,
+        type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7591606122630040990, guid: 3eb512a2db543e1478b1bb425cd18145,
+        type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7592038852114164710, guid: 3eb512a2db543e1478b1bb425cd18145,
+        type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7592042763986535236, guid: 3eb512a2db543e1478b1bb425cd18145,
+        type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7592455485297688144, guid: 3eb512a2db543e1478b1bb425cd18145,
+        type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 7613604716433547940, guid: 3eb512a2db543e1478b1bb425cd18145,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -9107,6 +9167,31 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 8198971087353062533}
     m_Modifications:
+    - target: {fileID: 7591592432652842092, guid: 3eb512a2db543e1478b1bb425cd18145,
+        type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7591606122630040990, guid: 3eb512a2db543e1478b1bb425cd18145,
+        type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7592038852114164710, guid: 3eb512a2db543e1478b1bb425cd18145,
+        type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7592042763986535236, guid: 3eb512a2db543e1478b1bb425cd18145,
+        type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7592455485297688144, guid: 3eb512a2db543e1478b1bb425cd18145,
+        type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 7613604716433547940, guid: 3eb512a2db543e1478b1bb425cd18145,
         type: 3}
       propertyPath: m_LocalPosition.x