From f6b7f954c2bda6e015372a92b7c5b719bc0361d0 Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Sat, 22 Apr 2023 00:58:27 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=BB=B6=E8=BF=9F=E7=BB=93=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/battle/controller/battle_controller.lua | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/lua/app/module/battle/controller/battle_controller.lua b/lua/app/module/battle/controller/battle_controller.lua index 99ad059e..cb0da357 100644 --- a/lua/app/module/battle/controller/battle_controller.lua +++ b/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() From c2bfaf937fae78a307a05457114b3a7526eb246b Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Sun, 23 Apr 2023 09:55:01 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AE=B9=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/userdata/battle/battle_data.lua | 1 + lua/app/userdata/battle/battle_grid_entity.lua | 10 +++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/lua/app/userdata/battle/battle_data.lua b/lua/app/userdata/battle/battle_data.lua index e32e2c03..2c06eaef 100644 --- a/lua/app/userdata/battle/battle_data.lua +++ b/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() diff --git a/lua/app/userdata/battle/battle_grid_entity.lua b/lua/app/userdata/battle/battle_grid_entity.lua index b7755e72..97731214 100644 --- a/lua/app/userdata/battle/battle_grid_entity.lua +++ b/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 \ No newline at end of file From 1a8007c8e6daa6abd943ff85e2e65e2dc1e0c2fd Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Sun, 23 Apr 2023 09:56:05 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=B5=84=E6=BA=90=E6=9B=BF=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/module/battle/battle_const.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lua/app/module/battle/battle_const.lua b/lua/app/module/battle/battle_const.lua index 4b40ab64..81eea66d 100644 --- a/lua/app/module/battle/battle_const.lua +++ b/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", }