Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev

lua/app/module/battle/battle_const.lua

@@ -276,8 +276,8 @@ BattleConst.GRID_TYPE = {
 }
 
 BattleConst.GRID_TYPE_ICON = {
-    [BattleConst.GRID_TYPE.SNOW_BOX] = "stone_1",
-    [BattleConst.GRID_TYPE.SOLID_SNOW] = "stone_2",
+    [BattleConst.GRID_TYPE.SNOW_BOX] = "stone_2",
+    [BattleConst.GRID_TYPE.SOLID_SNOW] = "stone_1",
     [BattleConst.GRID_TYPE.VINES] = "vine",
     [BattleConst.GRID_TYPE.ICE] = "ice",
 }

lua/app/module/battle/controller/battle_controller.lua

@@ -1866,10 +1866,17 @@ function BattleController:_tick(dt)
 end
 
 function BattleController:battleEnd()
-    if self.battleUI then
-        self.battleUI:enableUITouch()
+    if self.battleEndSid then
+        ModuleManager.BattleManager:unscheduleGlobal(self.battleEndSid)
+        self.battleEndSid = nil
     end
-    self:controllBattleEnd()
+    self.battleUI:disableUITouch()
+    self.battleEndSid = ModuleManager.BattleManager:performWithDelayGlobal(function()
+        if self.battleUI then
+            self.battleUI:enableUITouch()
+        end
+        self:controllBattleEnd()
+    end, 1)
 end
 
 function BattleController:clear()

lua/app/userdata/battle/battle_data.lua

@@ -314,6 +314,7 @@ function BattleData:setGridInfo(posId, gridInfo)
     end
 
     entity:setSkilId() -- 清除skillId
+    entity:determineIdleStatus()
 end
 
 function BattleData:getSkillEntities()

lua/app/userdata/battle/battle_grid_entity.lua

@@ -11,9 +11,7 @@ function BattleGridEntity:ctor(data)
     self.linkSkillCount = data.linkSkillCount or 0 -- 任意链接技能激活次数
     self.isIdle = false
     self.data.isDirty = false
-    if self.gridType == BattleConst.GRID_TYPE.EMPTY and self.elementType == BattleConst.ELEMENT_TYPE.NONE then
-        self.isIdle = true
-    end
+    self:determineIdleStatus()
 end
 
 function BattleGridEntity:clear()
@@ -228,4 +226,10 @@ function BattleGridEntity:getLinkSkillCount()
     return self.linkSkillCount
 end
 
+function BattleGridEntity:determineIdleStatus()
+    if not self.isIdle and self.gridType == BattleConst.GRID_TYPE.EMPTY and self.elementType == BattleConst.ELEMENT_TYPE.NONE then
+        self.isIdle = true
+    end
+end
+
 return BattleGridEntity