puxuan/c1_lua
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
chenxi 2023-04-23 10:17:48 +08:00
commit 95a07316d8
4 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lua/app/module/battle/battle_const.lua
View File

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

7
lua/app/module/battle/controller/battle_controller.lua
View File

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

1
lua/app/userdata/battle/battle_data.lua
View File

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

10
lua/app/userdata/battle/battle_grid_entity.lua
View File

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