Merge branch 'master' of http://192.168.123.2:3000/ck/XiuXianGame

Assets/Art/VFX/Materials/UIMat/ui fb kuang glow3 mask uv.mat

@@ -139,7 +139,7 @@ Material:
     - _MainSpeedU: 0
     - _MainSpeedV: 0
     - _MainTexOffsetU: 0
-    - _MainTexOffsetV: -0.3
+    - _MainTexOffsetV: 0.29740077
     - _MainTilingU: 1
     - _MainTilingV: 0.78
     - _MaskSpeedU: 0.5

Assets/Scripts/GameUI/UI/TowerPanel/TowerPanel.cs

@@ -198,6 +198,7 @@ namespace Fort23.Mono
             _towerData = null;
             ulockId = 0;
             currentLevelWidget = null;
+            CombatController.currActiveCombat.ChangeState(CombatController.update);
             await base.Close();
         }
     }