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

竞技场挑战前判断阵容、超框

Browse Source
This commit is contained in:
Fang 2023-07-07 11:53:40 +08:00
parent b6171cef38
commit b16f75f42e
4 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lua/app/module/arena/arena_manager.lua
View File

@ -59,6 +59,12 @@ function ArenaManager:reqChallenge()
return return
end end
-- 判断阵容
if not DataManager.FormationData:formationIsFull(GConst.BattleConst.FORMATION_TYPE.ARENA_ATTACK) then
GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.BATTLE_DESC_8))
return
end
local reqData = { local reqData = {
defInfo = DataManager.ArenaData:getMatchInfo() defInfo = DataManager.ArenaData:getMatchInfo()
} }

2
lua/app/module/chapter/chapter_manager.lua
View File

@ -23,7 +23,7 @@ function ChapterManager:openBoxFinish(result)
end end
function ChapterManager:startFight() function ChapterManager:startFight()
if not DataManager.FormationData:formationIsFull(GConst.BattleConst.BATTLE_TYPE.STAGE) then if not DataManager.FormationData:formationIsFull(GConst.BattleConst.FORMATION_TYPE.STAGE) then
GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.BATTLE_DESC_8)) GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.BATTLE_DESC_8))
return return
end end

2
lua/app/module/daily_challenge/daily_challenge_manager.lua
View File

@ -54,7 +54,7 @@ function DailyChallengeManager:startChallenge()
end end
-- 检查阵容 -- 检查阵容
if not DataManager.FormationData:formationIsFull(GConst.BattleConst.BATTLE_TYPE.STAGE) then if not DataManager.FormationData:formationIsFull(GConst.BattleConst.FORMATION_TYPE.STAGE) then
GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.BATTLE_DESC_8)) GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.BATTLE_DESC_8))
return return
end end

14
lua/app/ui/tips/battle_board_skill_tips.lua
View File

@ -33,7 +33,6 @@ function BattleBoardSkillTips:onLoadRootComplete()
self.atkDesc = uiMap["battle_skill_tips.bg_1.atk_desc"] self.atkDesc = uiMap["battle_skill_tips.bg_1.atk_desc"]
self.skillDesc = uiMap["battle_skill_tips.bg_1.skill_desc"] self.skillDesc = uiMap["battle_skill_tips.bg_1.skill_desc"]
self.validEffectDesc = uiMap["battle_skill_tips.bg_1.valid_effect_desc"] self.validEffectDesc = uiMap["battle_skill_tips.bg_1.valid_effect_desc"]
self.gridLayout = uiMap["battle_skill_tips.bg_1.grid_layout"]
if not self.selectSkillCells then if not self.selectSkillCells then
self.selectSkillCells = {} self.selectSkillCells = {}
for i = 1, 7 do for i = 1, 7 do
@ -87,19 +86,6 @@ function BattleBoardSkillTips:onRefresh()
end end
end end
self.gridLayout:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_GRID_LAYOUT):RefreshLayout()
if count > 5 then
addY = addY + MAX_HEIGHT
elseif count >= 1 then
addY = addY + MIN_HEIGHT
else
addY = addY + NO_SKILL_HRIGHT
self.validEffectDesc:setText(GConst.EMPTY_STRING)
end
self.bg:setSizeDeltaY(addY)
if self.tarCornerScreenPos then if self.tarCornerScreenPos then
self:locate(self.location, self.originSizeDelta, self.bg, self.tarCornerScreenPos) self:locate(self.location, self.originSizeDelta, self.bg, self.tarCornerScreenPos)
end end