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

liuzhiwei

2020-11-12 18f96c9313bf24d2296e615f44fc0ca005f2e872

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

@@ -209,7 +209,7 @@
        {
            // shaderPropertyName = ShaderUtil.GetPropertyName(towerVSMat.shader, 0);
            shaderPropertyName = "_MainTex";
            Debug.Log("获取到了Shader的名字" + shaderPropertyName);
            //Debug.Log("获取到了Shader的名字" + shaderPropertyName);
            towerVSRenderer.enabled = false;
        }