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

weixudong

2020-11-19 69e0fea6c92fd4e153d45e5f26ef89baecf0405a

 Assets/Scripts/TowerDefense/Towers/TowerLevel.cs

@@ -23,7 +23,7 @@
        /// <summary>
        /// Build effect gameObject to instantiate on start
        /// </summary>
        public GameObject buildEffectPrefab;
        //public GameObject buildEffectPrefab;

        /// <summary>
        /// 升级特效
@@ -54,6 +54,66 @@
        /// TEST CODE: 是否已经缩放.
        /// </summary>
        protected bool bScaleForCombat = false;

        /// <summary>
        /// 未上阵的形象
        /// </summary>
        public GameObject Body;

        /// <summary>
        /// 上阵形象
        /// </summary>
        public GameObject AttackBody;

        /// <summary>
        /// 精灵塔动作状态
        /// </summary>
        public TowerActionState ActionState { get; protected set; }

        private string paramName = "ActionState";

        /// <summary>
        /// 动作动画器
        /// </summary>
        public Animator ActionAnimator;

        /// <summary>
        /// 发射子弹速率
        /// </summary>
        protected float fireRate;

        /// <summary>
        /// 初始攻击速率
        /// </summary>
        private float attackSpeed = 1f;

        /// <summary>
        /// 多倍速攻击速度，基准速度的 N 倍速
        /// </summary>
        private float fireSpeed = 1f;

        /// <summary>
        /// 发射倍速，如果设置多倍速攻击，直接修改此属性，恢复之前的攻速直接设置为 1
        /// </summary>
        /// <value></value>
        public float FireSpeed
        {
            get { return fireSpeed; }
            set
            {
                if (value < 0) value = 0;

                fireSpeed = value;

                if (ActionState == TowerActionState.Attack)
                    ActionAnimator.speed = attackSpeed * fireSpeed;
            }
        }

        /// <summary>
        /// 各个动作的基准播放时长（播放一遍用的时间）
        /// </summary>
        protected float[] actionTimeArr;

        /// <summary>
        /// Gets the list of effects attached to the tower
@@ -135,8 +195,18 @@
            {
                effect.Initialize(alignment, mask);
                effect.towerPtr = tower;
                AttackAffector attackAffector = effect.GetComponent<AttackAffector>();

                // if (attackAffector.projectile != null)
                // {
                //     Damager damager = attackAffector.projectile.gameObject.GetComponent<Damager>();
                //     damager.TowerAttributeId = tower.attributeId;
                // }
            }
            m_ParentTower = tower;
            Transform starTs = transform.Find("Star");
            starTs.localPosition = new Vector3(0, 0.2f, 0.6f);
            starTs.localRotation = Quaternion.Euler(60, 180, 0);
        }

        private Transform mat;
@@ -149,6 +219,63 @@
            mat = transform.Find("Cube");
            myRender = mat.GetComponent<MeshRenderer>();
            normalScale = new Vector3(1.5f, 1.5f, 1.5f);
        }

        private void Start()
        {
            if (ActionAnimator != null)
            {
                AnimationClip[] clips = ActionAnimator.runtimeAnimatorController.animationClips;
                actionTimeArr = new float[clips.Length];

                for (int i = 0; i < clips.Length; ++i)
                {
                    if (clips[i].name == "Standing")
                        actionTimeArr[0] = clips[i].length;
                    else if (clips[i].name == "Attack")
                        actionTimeArr[1] = clips[i].length;
                }

                GameObject affectorObj = transform.Find("Affector").gameObject;
                AttackAffector attackAffector = affectorObj.GetComponent<AttackAffector>();
                fireRate = attackAffector.FireRate;

                if (actionTimeArr[1] > 1 / fireRate)
                {
                    // 动画时间比攻击长
                    attackSpeed = actionTimeArr[1] * fireRate;
                }
                SetAttackState(false);
            }
        }

        public void LateUpdate()
        {
            if (ActionAnimator == null || !ActionAnimator.isActiveAndEnabled) return;

            AnimatorStateInfo stateInfo = ActionAnimator.GetCurrentAnimatorStateInfo(0);

            if (ActionState == TowerActionState.Attack && stateInfo.normalizedTime >= 1f)
                ChangeState(TowerActionState.Standing);
        }

        public void ChangeState(TowerActionState state)
        {
            if (ActionAnimator == null || !ActionAnimator.isActiveAndEnabled) return;

            ActionState = state;

            if (ActionState == TowerActionState.Attack && state == TowerActionState.Attack)
            {
                ActionAnimator.Update(0);
                ActionAnimator.Play("Attack", 0, 0);
            }
            ActionAnimator.SetInteger(paramName, (int)state);

            if (state == TowerActionState.Attack)
                ActionAnimator.speed = attackSpeed * FireSpeed;
            else if (state == TowerActionState.Standing)
                ActionAnimator.speed = 1f;
        }

        /// <summary>
@@ -317,7 +444,7 @@
                var attack = affector as AttackAffector;
                if (attack != null && attack.damagerProjectile != null)
                {
                    dps += attack.GetProjectileDamage() * attack.fireRate;
                    dps += attack.GetProjectileDamage() * attack.FireRate;
                }
            }
            return dps;
@@ -346,11 +473,21 @@
        }

        /// <summary>
        /// Insntiate the build particle effect object
        /// 设置上阵和非上阵状态下，塔的自身形象
        /// </summary>
        void Start()
        /// <param name="isAttackMode"></param>
        public void SetAttackState(bool isAttackMode)
        {

            if (isAttackMode)
            {
                AttackBody.SetActive(isAttackMode);
                Body.SetActive(!isAttackMode);
                ChangeState(TowerActionState.Attack);
            }
            else
            {
                ChangeState(TowerActionState.Standing);
            }
        }

        /// <summary>