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

chenxin

2020-12-25 6baa5a654138a2e0a9871adaef311a74e132dd6e

 Assets/Scripts/TowerDefense/UI/HUD/PlacementTile.cs

@@ -56,6 +56,7 @@
        /// 可以放置的
        /// </summary>
        public Material canPlaceMat;
        public Material canNotPlaceMat;

        /// <summary>
        /// 放置在当前位置
@@ -186,15 +187,20 @@

            if (isOn && towerName != "")
            {
                SetTowerVirtualshadow(towerName);
                //SetTowerVirtualshadow(towerName);
                EndlessWaveLineManager.instance.SetWaveLineShow(GridPosition.x, true);
            }
            else if (!isOn && towerVSRenderer.enabled)
            else if (!isOn)
            {
                towerVSRenderer.enabled = false;
                EndlessWaveLineManager.instance.SetWaveLineShow(GridPosition.x, false);
            }

        }

        public void SetWarning(bool isOn)
        {
            canPlaceRenderer.material = isOn ? canNotPlaceMat : canPlaceMat;
        }

        /// <summary>
@@ -288,6 +294,9 @@
                        if (tileRenderer != null && openMat != null)
                            tileRenderer.sharedMaterial = openMat;
                    }

                    SetWarning(false);

                    break;
                case PlacementGridType.EGridDestroyed:
                    if (tileRenderer != null && destroyedMat != null)