From c07a54b828404171672ab59f25a003d50a065a9d Mon Sep 17 00:00:00 2001 From: Fang Date: Wed, 5 Jul 2023 10:51:07 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=AB=9E=E6=8A=80=E5=9C=BAfix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/ui/arena/arena_match_ui.lua | 8 ++++++-- lua/app/ui/battle/battle_result_ui.lua | 13 ++++++++++--- lua/app/ui/main_city/component/arena_comp.lua | 9 +++++++-- lua/app/ui/main_city/component/main_comp.lua | 3 +++ lua/app/userdata/arena/arena_data.lua | 6 +++++- 5 files changed, 31 insertions(+), 8 deletions(-) diff --git a/lua/app/ui/arena/arena_match_ui.lua b/lua/app/ui/arena/arena_match_ui.lua index a6f4ef82..139b6e21 100644 --- a/lua/app/ui/arena/arena_match_ui.lua +++ b/lua/app/ui/arena/arena_match_ui.lua @@ -247,12 +247,16 @@ function ArenaMatchUI:onClickRematch() end) else -- 钻石 + local cost = DataManager.ArenaData:getRematchConstGem() local params ={ - content = I18N:getGlobalText(I18N.GlobalConst.ARENA_DESC_25, DataManager.ArenaData:getRematchConstGem()), + content = I18N:getGlobalText(I18N.GlobalConst.ARENA_DESC_25, cost), boxType = GConst.MESSAGE_BOX_TYPE.MB_OK_CANCEL, costId = GConst.ItemConst.ITEM_ID_GEM, - costNum = DataManager.ArenaData:getRematchConstGem(), + costNum = cost, okFunc = function() + if not GFunc.checkCost(GConst.ItemConst.ITEM_ID_GEM, cost, true) then + return + end ModuleManager.ArenaManager:reqOverCD(false) self:showMatchLoading() end, diff --git a/lua/app/ui/battle/battle_result_ui.lua b/lua/app/ui/battle/battle_result_ui.lua index a5032e39..d6984ada 100644 --- a/lua/app/ui/battle/battle_result_ui.lua +++ b/lua/app/ui/battle/battle_result_ui.lua @@ -251,14 +251,21 @@ function BattleResultUI:refreshArenaNode() function(value) local maxScore = DataManager.ArenaData:getGradingScoreTotal(value) local curScore = DataManager.ArenaData:getGradingScore(value) - self.arenaImgProp.value = curScore/maxScore - self.arenaTxProg:setText(math.floor(curScore).."/"..maxScore) + if maxScore then + self.arenaImgProp.value = curScore/maxScore + self.arenaTxProg:setText(math.floor(curScore).."/"..maxScore) + else + self.arenaImgProp.value = 1 + self.arenaTxProg:setText(math.floor(curScore)) + end end, totalScore, 1.5) self.arenaSequence:Append(tween) self.arenaSequence:AppendCallback(function() self.arenaTxGrading:setText(DataManager.ArenaData:getGradingName(curId)) - self:refreshArenaGradingSpine(curId) + if lastId ~= curId then + self:refreshArenaGradingSpine(curId) + end self.arenaSequence = nil end) diff --git a/lua/app/ui/main_city/component/arena_comp.lua b/lua/app/ui/main_city/component/arena_comp.lua index ce5f5852..4ff53233 100644 --- a/lua/app/ui/main_city/component/arena_comp.lua +++ b/lua/app/ui/main_city/component/arena_comp.lua @@ -147,8 +147,13 @@ function ArenaComp:refreshShow() local gradingNumName = DataManager.ArenaData:getGradingNumName(gradingId) self.txSeason:setText(I18N:getGlobalText(I18N.GlobalConst.ARENA_DESC_3, DataManager.ArenaData:getSeason())) self.txGarding:setText(DataManager.ArenaData:getGradingName(gradingId)) - self.txProg:setText(curScore.."/"..maxScore) - self.imgProg:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_SLIDER).value = curScore/maxScore + if maxScore then + self.txProg:setText(curScore.."/"..maxScore) + self.imgProg:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_SLIDER).value = curScore/maxScore + else + self.txProg:setText(curScore) + self.imgProg:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_SLIDER).value = 1 + end if self.spineGrading then self.spineGrading:destroy() diff --git a/lua/app/ui/main_city/component/main_comp.lua b/lua/app/ui/main_city/component/main_comp.lua index 470c4e42..3aa679ef 100644 --- a/lua/app/ui/main_city/component/main_comp.lua +++ b/lua/app/ui/main_city/component/main_comp.lua @@ -75,6 +75,9 @@ function MainComp:refreshModule(selectModule) end elseif self.curModuleType == GConst.MainCityConst.MAIN_MODULE.DUNGEON then -- 切换到活动副本 + elseif self.curModuleType == GConst.MainCityConst.MAIN_MODULE.ARENA then + -- 切换到竞技场 + ModuleManager.ArenaManager:reqArenaInfo() end self:refreshHeroFormationVisible() EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.CHANGE_MAIN_COMP_MODULE, self.curModuleType) diff --git a/lua/app/userdata/arena/arena_data.lua b/lua/app/userdata/arena/arena_data.lua index 7baa8e23..fa3ccd94 100644 --- a/lua/app/userdata/arena/arena_data.lua +++ b/lua/app/userdata/arena/arena_data.lua @@ -221,7 +221,11 @@ end function ArenaData:getGradingScoreTotal(score) local max = self:getGradingMaxScore(score) local min = self:getGradingMinScore(score) - return max - min + if max and min then + return max - min + else + return nil + end end -- 获取段位图标名（大段位区分） From bb12bdd100cea6d0e910543c9dbb10e3ae300a99 Mon Sep 17 00:00:00 2001 From: Fang Date: Wed, 5 Jul 2023 11:14:37 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=AE=B5=E4=BD=8D?= =?UTF-8?q?=E5=8F=98=E5=8C=96=E7=89=B9=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/ui/battle/battle_result_ui.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lua/app/ui/battle/battle_result_ui.lua b/lua/app/ui/battle/battle_result_ui.lua index d6984ada..fa4cd839 100644 --- a/lua/app/ui/battle/battle_result_ui.lua +++ b/lua/app/ui/battle/battle_result_ui.lua @@ -325,6 +325,9 @@ function BattleResultUI:refreshArenaGradingSpine(gradingId) self.arenaSpine:playAnim("idle", true, false) end) end) + EffectManager:loadUIEffectAsync("assets/prefabs/effects/ui/vfx_ui_".. DataManager.ArenaData:getGradingIconName(gradingId) ..".prefab", self, self.arenaSpineRoot, GConst.UI_EFFECT_ORDER.LEVEL5, function(obj) + obj:play() + end) end end