Merge commit '8380b3c000a04bd9bf6dfc11fd8337c1563ad265' into master

chenxin

2020-10-28 56f231f1f6523d7920cf32f033f9bb6f0015550f

 Assets/Scripts/TowerDefense/Agents/Agent.cs

@@ -193,6 +193,12 @@
        protected bool bInDeathAct = false;

        /// <summary>
        /// 原地罚站
        /// </summary>
        /// <param name="can"></param>
        public bool CanMove { get; set; } = true;

        /// <summary>
        /// Gets the attached nav mesh agent velocity
        /// </summary>
        public override Vector3 velocity
@@ -314,6 +320,7 @@
            poisonTimes = 0;
            timeToPoisonHurt = 0;
            bShieldBreak = false;
            CanMove = true;

            /*// 如果对应的粒子不为空，则播放
         if( spawnParticle)
@@ -395,31 +402,12 @@
        {
            MoveStopTime = binfo.last / 1000;

            if (WaveLineSelMgr.instanceExists)
            if (!isFrost)
            {
                // 播放特效：
                if (WaveLineSelMgr.instance.bufStopMovePrefab == null) return;
                isFrost = true;

                // 正在播放的话，直接返回.
                if (MoveStopEffect)
                    return;

                MoveStopEffect = Instantiate(WaveLineSelMgr.instance.bufStopMovePrefab);
                MoveStopEffect.transform.position = this.position;
                MoveStopEffect.Play();
            }
            else if (EndlessWaveLineManager.instanceExists)
            {
                // 播放特效：
                if (EndlessWaveLineManager.instance.bufStopMovePrefab == null) return;

                // 正在播放的话，直接返回.
                if (MoveStopEffect)
                    return;

                MoveStopEffect = Instantiate(EndlessWaveLineManager.instance.bufStopMovePrefab);
                MoveStopEffect.transform.position = this.position;
                MoveStopEffect.Play();
                if (FrostParticle != null)
                    FrostParticle.Play();
            }
        }

@@ -477,26 +465,30 @@
            timeToPoisonHurt = 0;
            bShieldBreak = false;
            bInDeathAct = false;

            StopFrostParticle();
            //this.SetTargetableMatColor(Color.white);

            // 删除当前停止特效和状态.
            if (MoveStopTime > 0)
            {
                if (MoveStopEffect)
                {
                    MoveStopEffect.Stop();
                    Destroy(MoveStopEffect);
                    MoveStopEffect = null;
                }

                MoveStopTime = 0.0f;
            }


            // 停止DoTween动画.
            this.transform.DOKill();

            Poolable.TryPool(gameObject);
        }

        private void StopFrostParticle()
        {
            if (isFrost)
            {
                isFrost = false;

                if (FrostParticle != null)
                    FrostParticle.Stop();
            }
        }

        /// <summary>   
@@ -719,12 +711,7 @@
                MoveStopTime -= Time.deltaTime;
                if (MoveStopTime <= 0)
                {
                    if (MoveStopEffect)
                    {
                        MoveStopEffect.Stop();
                        Destroy(MoveStopEffect);
                        MoveStopEffect = null;
                    }
                    StopFrostParticle();
                    MoveStopTime = 0;
                }
                else
@@ -738,6 +725,24 @@
            }

            float finalSpeed = fMoveSpeed * (1 - speedSlowRate);

            if (speedSlowRate > 0 && !isSlowDown)
            {
                isSlowDown = true;

                if (SlowDownParticle != null)
                    SlowDownParticle.Play();
            }
            else if (speedSlowRate == 0 && isSlowDown)
            {
                isSlowDown = false;

                if (SlowDownParticle != null)
                {
                    SlowDownParticle.Stop();
                    SlowDownParticle.Clear();
                }
            }

            Vector3 curPos = m_NavMeshAgent.transform.position;
            bool swithNode = false;
@@ -848,7 +853,7 @@
            this.UpdateAction();

            // 处理死亡状态了，不必再移动:
            if (bInDeathAct) return;
            if (bInDeathAct || !CanMove) return;

            m_Destination = initNode.GetNextNode();
            updateAgentPos(Time.deltaTime);
@@ -998,11 +1003,23 @@
                    if (PoisonParticle != null)
                    {
                        PoisonParticle.Stop();
                        PoisonParticle.Clear();
                        if (PoisonEndParticle != null)
                            PoisonEndParticle.Play();
                    }
                }

                if (isSlowDown)
                {
                    isSlowDown = false;

                    if (SlowDownParticle != null)
                    {
                        SlowDownParticle.Stop();
                        SlowDownParticle.Clear();
                    }
                }

                mAnim.SetBool("Die", true);
                // 统一管理器内删除当前的Agent:
                AgentInsManager.instance.removeAgent(this);