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

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

Browse Source
This commit is contained in:
xiekaidong 2023-07-10 18:43:43 +08:00
commit dba2cf5b42
3 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lua/app/ui/arena/arena_formation_ui.lua
View File

@ -32,7 +32,8 @@ function ArenaFormationUI:getCurrencyParams()
end end
function ArenaFormationUI:ctor(params) function ArenaFormationUI:ctor(params)
self.formationType = params self.formationType = params.type
self.fromMatch = params.fromMatch
end end
function ArenaFormationUI:onCover() function ArenaFormationUI:onCover()
@ -50,11 +51,23 @@ function ArenaFormationUI:onLoadRootComplete()
uiMap["arena_formation_ui.banner.btn_ok.tx_ok"]:setText(I18N:getGlobalText(I18N.GlobalConst.ARENA_DESC_24)) uiMap["arena_formation_ui.banner.btn_ok.tx_ok"]:setText(I18N:getGlobalText(I18N.GlobalConst.ARENA_DESC_24))
uiMap["arena_formation_ui.banner.btn_ok"]:addClickListener(function() uiMap["arena_formation_ui.banner.btn_ok"]:addClickListener(function()
ModuleManager.FormationManager:reqArenaFormation() ModuleManager.FormationManager:reqArenaFormation()
if self.isMatch then if self.fromMatch then
UIManager:showUI("app/ui/arena/arena_match_ui") UIManager:showUI("app/ui/arena/arena_match_ui")
end end
self:closeUI() self:closeUI()
end) end)
self.selectAttack = uiMap["arena_formation_ui.banner.btn_attack.img_select"]
uiMap["arena_formation_ui.banner.btn_attack.tx_desc"]:setText(I18N:getGlobalText(I18N.GlobalConst.ARENA_DESC_10))
uiMap["arena_formation_ui.banner.btn_attack"]:addClickListener(function()
self.formationType = GConst.BattleConst.FORMATION_TYPE.ARENA_ATTACK
self:onRefresh()
end)
self.selectDefend = uiMap["arena_formation_ui.banner.btn_defend.img_select"]
uiMap["arena_formation_ui.banner.btn_defend.tx_desc"]:setText(I18N:getGlobalText(I18N.GlobalConst.ARENA_DESC_9))
uiMap["arena_formation_ui.banner.btn_defend"]:addClickListener(function()
self.formationType = GConst.BattleConst.FORMATION_TYPE.ARENA_DEFEND
self:onRefresh()
end)
local heroUI = uiMap["arena_formation_ui.hero_ui"] local heroUI = uiMap["arena_formation_ui.hero_ui"]
heroUI:initPrefabHelper() heroUI:initPrefabHelper()
@ -66,7 +79,6 @@ function ArenaFormationUI:onLoadRootComplete()
self:bind(DataManager.HeroData, "isDirty", function() self:bind(DataManager.HeroData, "isDirty", function()
self:onRefresh() self:onRefresh()
end) end)
self:bind(DataManager.BagData.ItemData, "dirty", function() self:bind(DataManager.BagData.ItemData, "dirty", function()
self:onRefresh() self:onRefresh()
end) end)
@ -76,10 +88,8 @@ function ArenaFormationUI:onLoadRootComplete()
end end
function ArenaFormationUI:onRefresh() function ArenaFormationUI:onRefresh()
if self.formationType == GConst.BattleConst.FORMATION_TYPE.ARENA_ATTACK then self.selectAttack:setActive(self.formationType == GConst.BattleConst.FORMATION_TYPE.ARENA_ATTACK)
-- 从匹配界面进来的 self.selectDefend:setActive(self.formationType == GConst.BattleConst.FORMATION_TYPE.ARENA_DEFEND)
self.isMatch = true
end
self.heroComp:refresh(self.formationType) self.heroComp:refresh(self.formationType)
end end

2
lua/app/ui/arena/arena_match_ui.lua
View File

@ -107,7 +107,7 @@ function ArenaMatchUI:onLoadRootComplete()
self:onClickRematch() self:onClickRematch()
end) end)
self.btnFormation:addClickListener(function() self.btnFormation:addClickListener(function()
UIManager:showUI("app/ui/arena/arena_formation_ui", GConst.BattleConst.FORMATION_TYPE.ARENA_ATTACK) UIManager:showUI("app/ui/arena/arena_formation_ui", {type = GConst.BattleConst.FORMATION_TYPE.ARENA_ATTACK, fromMatch = true})
self:closeUI() self:closeUI()
end) end)
self:addEventListener(EventManager.CUSTOM_EVENT.ARENA_SEASON_SETTLEMENT, function() self:addEventListener(EventManager.CUSTOM_EVENT.ARENA_SEASON_SETTLEMENT, function()

2
lua/app/ui/main_city/component/arena_comp.lua
View File

@ -76,7 +76,7 @@ function ArenaComp:init()
UIManager:showUI("app/ui/arena/arena_recent_battle_ui") UIManager:showUI("app/ui/arena/arena_recent_battle_ui")
end) end)
self.btnFormation:addClickListener(function() self.btnFormation:addClickListener(function()
UIManager:showUI("app/ui/arena/arena_formation_ui", GConst.BattleConst.FORMATION_TYPE.ARENA_DEFEND) UIManager:showUI("app/ui/arena/arena_formation_ui", {type = GConst.BattleConst.FORMATION_TYPE.ARENA_DEFEND})
end) end)
self.btnReward:addClickListener(function() self.btnReward:addClickListener(function()
UIManager:showUI("app/ui/arena/arena_season_reward_ui") UIManager:showUI("app/ui/arena/arena_season_reward_ui")