Merge branch 'master' of ssh://172.16.1.52:8091/GemBattle

wangguan

2020-10-27 bac1e673b54b1e5f773c4bd098e1b4fe8981c62e

 Assets/Scripts/TowerDefense/Agents/Agent.cs

@@ -320,6 +320,7 @@
            poisonTimes = 0;
            timeToPoisonHurt = 0;
            bShieldBreak = false;
            CanMove = true;

            /*// 如果对应的粒子不为空，则播放
         if( spawnParticle)
@@ -410,7 +411,11 @@
                if (MoveStopEffect)
                    return;

                MoveStopEffect = Instantiate(WaveLineSelMgr.instance.bufStopMovePrefab);
                GameObject obj = Instantiate(WaveLineSelMgr.instance.bufStopMovePrefab);
                MoveStopEffect = obj.GetComponent<ParticleSystem>();

                if (MoveStopEffect == null)
                    MoveStopEffect = obj.transform.GetChild(0).GetComponent<ParticleSystem>();
                MoveStopEffect.transform.position = this.position;
                MoveStopEffect.Play();
            }
@@ -423,7 +428,11 @@
                if (MoveStopEffect)
                    return;

                MoveStopEffect = Instantiate(EndlessWaveLineManager.instance.bufStopMovePrefab);
                GameObject obj = Instantiate(EndlessWaveLineManager.instance.bufStopMovePrefab);
                MoveStopEffect = obj.GetComponent<ParticleSystem>();

                if (MoveStopEffect == null)
                    MoveStopEffect = obj.transform.GetChild(0).GetComponent<ParticleSystem>();
                MoveStopEffect.transform.position = this.position;
                MoveStopEffect.Play();
            }