diff --git a/lua/app/config/localization/localization_global_const.lua b/lua/app/config/localization/localization_global_const.lua index d5d5e587..4e2251d1 100644 --- a/lua/app/config/localization/localization_global_const.lua +++ b/lua/app/config/localization/localization_global_const.lua @@ -206,8 +206,6 @@ local LocalizationGlobalConst = BIND_ACCOUNT_FAILED = "BIND_ACCOUNT_FAILED", CHANGE_ACCOUNT_FAILED = "CHANGE_ACCOUNT_FAILED", SUMMON_SKIP = "SUMMON_SKIP", - CHANGE_ACCOUNT_FAILED_2 = "CHANGE_ACCOUNT_FAILED_2", - MAIL_COUNTDOWN = "MAIL_COUNTDOWN", } return LocalizationGlobalConst \ No newline at end of file diff --git a/lua/app/config/strings/cn/global.lua b/lua/app/config/strings/cn/global.lua index ee2a44bc..e3fc9f23 100644 --- a/lua/app/config/strings/cn/global.lua +++ b/lua/app/config/strings/cn/global.lua @@ -206,8 +206,6 @@ local localization_global = ["BIND_ACCOUNT_FAILED"] = "账号绑定失败，请重试", ["CHANGE_ACCOUNT_FAILED"] = "账号切换失败，请重试", ["SUMMON_SKIP"] = "跳过", - ["CHANGE_ACCOUNT_FAILED_2"] = "当前账号已是目标账号，无需切换", - ["MAIL_COUNTDOWN"] = "{0}小时到期", } return localization_global \ No newline at end of file diff --git a/lua/app/module/shop/shop_const.lua b/lua/app/module/shop/shop_const.lua index 823b41d4..2defa184 100644 --- a/lua/app/module/shop/shop_const.lua +++ b/lua/app/module/shop/shop_const.lua @@ -29,25 +29,25 @@ ShopConst.MAIN_PAGE_TYPE = { ShopConst.GEM_ICON_NAME = { [1] = "shop_diamond_1", - [2] = "shop_diamond_1", - [3] = "shop_diamond_2", - [4] = "shop_diamond_3", - [5] = "shop_diamond_4", - [6] = "shop_diamond_5", - [7] = "shop_diamond_6", - [8] = "shop_diamond_7", - [9] = "shop_diamond_8", - [10] = "shop_diamond_8", - [11] = "shop_diamond_8", - [12] = "shop_diamond_8", - [13] = "shop_diamond_8", - [14] = "shop_diamond_8", - [15] = "shop_diamond_8", - [16] = "shop_diamond_8", - [17] = "shop_diamond_8", - [18] = "shop_diamond_8", - [19] = "shop_diamond_8", - [20] = "shop_diamond_8", + [2] = "shop_diamond_2", + [3] = "shop_diamond_3", + [4] = "shop_diamond_4", + [5] = "shop_diamond_5", + [6] = "shop_diamond_6", + [7] = "shop_diamond_7", + [8] = "shop_diamond_8", + [9] = "shop_diamond_9", + [10] = "shop_diamond_9", + [11] = "shop_diamond_9", + [12] = "shop_diamond_9", + [13] = "shop_diamond_9", + [14] = "shop_diamond_9", + [15] = "shop_diamond_9", + [16] = "shop_diamond_9", + [17] = "shop_diamond_9", + [18] = "shop_diamond_9", + [19] = "shop_diamond_9", + [20] = "shop_diamond_9", } ShopConst.COIN_ICON_NAME = { [1] = "shop_species_1", diff --git a/lua/app/ui/main_city/component/daily_challenge_comp.lua b/lua/app/ui/main_city/component/daily_challenge_comp.lua index ff4610f4..4c59f52d 100644 --- a/lua/app/ui/main_city/component/daily_challenge_comp.lua +++ b/lua/app/ui/main_city/component/daily_challenge_comp.lua @@ -105,6 +105,9 @@ end function DailyChallengeComp:refreshBoss() local curBossInfo = DataManager.DailyChallengeData:getFinalBossInfo() + if not curBossInfo then + return + end if self.curModelId == curBossInfo.model_id then return end diff --git a/lua/app/ui/shop/box_reward_ui.lua b/lua/app/ui/shop/box_reward_ui.lua index f1a14520..88b3010b 100644 --- a/lua/app/ui/shop/box_reward_ui.lua +++ b/lua/app/ui/shop/box_reward_ui.lua @@ -18,6 +18,7 @@ local REWARD_CELL_WIDTH = 160 local REWARD_CELL_HEIGHT = 250 local BASE_CONTENT_HEIGHT = 600 +local JUMP_TIME_SCALE = 1000 local POSITION_X_DATA = { [1] = {0}, @@ -49,6 +50,10 @@ function BoxRewardUI:ctor(params) for id, count in pairs(fragmentMap) do table.insert(self.fragmentRewards, {id = id, count = count}) end + + for i = 1, 10 do + table.insert(self.fragmentRewards, {id = 12001, count = 100}) + end end function BoxRewardUI:isFullScreen() @@ -77,13 +82,13 @@ function BoxRewardUI:onLoadRootComplete() end self.closeTx = self.uiMap["box_reward_ui.close_tx"] - self.closeTx:setText(I18N:getGlobalText(I18N.GlobalConst.CLICK_CLOSE_DESC)) self:refreshCloseText() self.mask = self.uiMap["box_reward_ui.mask"] self.mask:addClickListener(function() -- 动画期间不可关闭 if self.isPlayAni then + self:jump() return end self:closeUI() @@ -174,6 +179,9 @@ function BoxRewardUI:onLoadRootComplete() self.maxIdx = math.ceil(rewardCount / CELL_NUM) end -- 播放表现 + if not self.cellSeqs then + self.cellSeqs = {} + end for idx = 1, rewardCount do local cell = self.rewardCells[idx] self:playCellAction(cell, idx) @@ -197,6 +205,7 @@ function BoxRewardUI:playCellAction(cell, idx) canvasGroup.alpha = 0 local seq = cell.baseObject:createBindTweenSequence() + table.insert(self.cellSeqs, seq) local tween = canvasGroup:DOFade(1, FADE_TIME) seq:AppendInterval(delayTime) tween:SetEase(CS.DG.Tweening.Ease.InOutSine) @@ -218,6 +227,9 @@ end function BoxRewardUI:turnToNext(idx) if self:isClosed() then return + end + if not self.isPlayAni then + return end if not self.showAction or idx ~= self.turnIdx * CELL_NUM then return @@ -259,8 +271,41 @@ function BoxRewardUI:getCellDelayTime(idx) return self.cellDelayTime[idx] end +function BoxRewardUI:jump() + self.isPlayAni = false + + if self.cellSeqs then + for _, cellSeq in ipairs(self.cellSeqs) do + cellSeq.timeScale = JUMP_TIME_SCALE + end + self.cellSeqs = nil + end + if self.contentSeq then + self.contentSeq.timeScale = JUMP_TIME_SCALE + end + + -- 强制刷新一次表现 + local rewardCount = #self.fragmentRewards + for idx = 1, rewardCount do + local cell = self.rewardCells[idx] + local canvasGroup = cell.baseObject:getComponent(GConst.TYPEOF_UNITY_CLASS.CANVAS_GROUP) + if not canvasGroup then + canvasGroup = cell.baseObject:addComponent(GConst.TYPEOF_UNITY_CLASS.CANVAS_GROUP) + end + canvasGroup.alpha = 1 + end + self.scrollRectContent:setAnchoredPositionY(self.maxScrollContentHeight - BASE_CONTENT_HEIGHT) + self.turnIdx = self.maxIdx + self.showAction = false + self:refreshCloseText() +end + function BoxRewardUI:refreshCloseText() - self.closeTx:setVisible(not self.isPlayAni) + if self.isPlayAni then + self.closeTx:setText(I18N:getGlobalText(I18N.GlobalConst.SUMMON_SKIP)) + else + self.closeTx:setText(I18N:getGlobalText(I18N.GlobalConst.CLICK_CLOSE_DESC)) + end end return BoxRewardUI \ No newline at end of file diff --git a/lua/app/userdata/daily_challenge/daily_challenge_data.lua b/lua/app/userdata/daily_challenge/daily_challenge_data.lua index f64038be..cf1e8d6c 100644 --- a/lua/app/userdata/daily_challenge/daily_challenge_data.lua +++ b/lua/app/userdata/daily_challenge/daily_challenge_data.lua @@ -128,6 +128,9 @@ function DailyChallengeData:getFinalBossInfo() return end local mapCfg = self:getMapConfig() + if not mapCfg then + return + end return ConfigManager:getConfig("monster")[mapCfg.monster[#mapCfg.monster]] end