Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master

chenxin

2020-10-22 85f0d13945f3aef5aef1b3c1b47c77cea0514c17

 Assets/Scripts/TowerDefense/Towers/TowerLevel.cs

@@ -46,6 +46,11 @@
      Affector[] m_Affectors;

      /// <summary>
      /// TEST CODE: 是否已经缩放.
      /// </summary>
      protected bool bScaleForCombat = false;

      /// <summary>
      /// Gets the list of effects attached to the tower
      /// </summary>
      protected Affector[] Affectors
@@ -123,7 +128,7 @@
         foreach (Affector effect in Affectors)
         {
            effect.Initialize(alignment, mask);
			    
            effect.towerPtr = tower;
         }
         m_ParentTower = tower;
      }
@@ -142,11 +147,16 @@
            {
               t.GetComponent<MeshRenderer>().material = mat;
               Vector3 scale = t.localScale;
               scale.z *= 1.267f;
               t.localScale = scale;
               Vector3 pos = t.localPosition;
               pos.z -= 0.2f;
               t.localPosition = pos;
					
               if( !this.bScaleForCombat)
                    {
                  scale.z *= 1.267f;
                  t.localScale = scale;
                  Vector3 pos = t.localPosition;
                  pos.z -= 0.2f;
                  t.localPosition = pos;
                  bScaleForCombat = true;
               }
            }
         }
      }