Merge branch 'master' of gitlab.dy-space.com:czy/stockrunning

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

@@ -66,10 +66,6 @@ public class AIMove : MonoBehaviour
             {
                 this.SpeedLevel--;
             }
-        }else if (other.tag == "Prop" && DoRanking._instance.rankingList[2] != gameObject)
-        {
-            print("出现怪。目标：" + DoRanking._instance.rankingList[2].name);
-            Destroy(other.gameObject);
         }
     }
     private void OnCollisionExit(Collision other)
@@ -363,12 +359,12 @@ public class AIMove : MonoBehaviour
     //}
     public void Vertigo(float time)
     {
-        if (time > timerVertigo)
-        {
-            timerVertigo = time;   //不累加时长，单会更新时长。
-        }
+        //if (time > timerVertigo)
+        //{
+        //    timerVertigo = time;   //不累加时长，单会更新时长。
+        //}
 
-        //timerVertigo += time; //累加眩晕时长
+        timerVertigo += time; //累加眩晕时长
     }
 
     private void OnControllerColliderHit(ControllerColliderHit hit)//需要写到enemy中。

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

@@ -78,11 +78,11 @@ public class PlayerMove : MonoBehaviour
                 this.SpeedLevel--;
             }
         }
-        else if (other.tag == "Prop" && DoRanking._instance.rankingList[2]!=gameObject) //自己不是最前面的人。
-        {
-            print("出现怪。目标："+DoRanking._instance.rankingList[2].name);
-            Destroy(other.gameObject);
-        }
+        //else if (other.tag == "Prop" && DoRanking._instance.rankingList[2]!=gameObject) //自己不是最前面的人。
+        //{
+        //    print("出现怪。目标："+DoRanking._instance.rankingList[2].name);
+        //    Destroy(other.gameObject);
+        //}
 
 
     }

StockRunning/Assets/Resources/Enemy_Vertigo.prefab.meta → StockRunning/Assets/My/Scripts/Prop.meta

 fileFormatVersion: 2
-guid: ed5d1b779680c74429ccd8efa73d6bca
-PrefabImporter:
+guid: f6eb4154a00d3a342a58544cb786d48c
+folderAsset: yes
+DefaultImporter:
   externalObjects: {}
   userData: 
   assetBundleName: 

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

@@ -15,12 +15,13 @@ public class Enemy_Vertigo : MonoBehaviour
     void Start()
     {
         characterController = this.GetComponent<CharacterController>();
+        targetPos = DoRanking._instance.rankingList[2].transform;
     }
 
     // Update is called once per frame
     void Update()
     {
-        targetPos = DoRanking._instance.rankingList[2].transform;
+        
         Vector3 direction = (targetPos.position - transform.position);
         direction.y = 0;
         direction = direction.normalized;

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

+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class Prop : MonoBehaviour
+{
+    public GameObject enemy3AI;
+    
+    
+    void Start()
+    {
+        
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+
+    private void OnTriggerEnter(Collider other)
+    {
+        if ((other.tag == "Competitor" || other.tag == "Player") && DoRanking._instance.rankingList[2] != other.gameObject)
+        {
+            //print(DoRanking._instance.rankingList[2].name + "---" + other.gameObject.name+" "+ (DoRanking._instance.rankingList[2]== other.gameObject).ToString());
+            enemy3AI.transform.position = DoRanking._instance.rankingList[2].transform.position+new Vector3(0,0,100);
+            enemy3AI.SetActive(true);
+            Destroy(gameObject);
+        }
+        //else if (other.tag == "Player" && DoRanking._instance.rankingList[2] != other.gameObject)
+        //{
+        //    transform.position = other.gameObject.transform.position + new Vector3(0, 0, 100);
+        //    enemy3AI.SetActive(true);
+        //    Destroy(gameObject);
+        //}
+    }
+}

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

+fileFormatVersion: 2
+guid: 50a9bfefc266bf648be274dc28466693
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: