From 1f85dc468113b8657f0586871ec99c71bfff0ce6 Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Tue, 5 Sep 2023 23:42:01 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/ui/main_city/main_city_ui.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/app/ui/main_city/main_city_ui.lua b/lua/app/ui/main_city/main_city_ui.lua index 45961d48..96ab9a30 100644 --- a/lua/app/ui/main_city/main_city_ui.lua +++ b/lua/app/ui/main_city/main_city_ui.lua @@ -688,7 +688,7 @@ function MainCityUI:refreshRightBtns() self.rightSideBar:setSizeDeltaY(-minY) self.rightArrowImg:setLocalScale(1, isClose and -1 or 1, 1) self.rightArrowBtn:setVisible(true) - self.rightArrowBtn:setAnchoredPositionY(self.rightSideBar:fastGetAnchoredPositionY() + y + arrowHeight/2 + SIDE_BAR_BORDER_OFFSET) + self.rightArrowBtn:setAnchoredPositionY(self.rightSideBar:fastGetAnchoredPositionY() + minY + arrowHeight/2 + SIDE_BAR_BORDER_OFFSET) if otherColumn then self.rightArrowBtn:setAnchoredPositionX(-133) else From afd1cdbcf6e07e3f239e6c892fa6a26e57b8752b Mon Sep 17 00:00:00 2001 From: Fang Date: Wed, 6 Sep 2023 10:16:04 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E5=85=91=E6=8D=A2=E7=BA=A2=E7=82=B9?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../activity/fourteen_day/fourteen_day_data.lua | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/lua/app/userdata/activity/fourteen_day/fourteen_day_data.lua b/lua/app/userdata/activity/fourteen_day/fourteen_day_data.lua index b90e118c..654e9b01 100644 --- a/lua/app/userdata/activity/fourteen_day/fourteen_day_data.lua +++ b/lua/app/userdata/activity/fourteen_day/fourteen_day_data.lua @@ -460,22 +460,7 @@ end -- 是否有兑换红点 function FourteenDayData:hasExchangeRedPoint() - local isFullUnlock = true - for index, data in ipairs(self:getExchangeShowIdsSort()) do - if not self:isExchangeUnlock(data.id) then - isFullUnlock = false - break - end - end - if not isFullUnlock then - return not self:getTodayExchangeCheck() - else - for index, data in ipairs(self:getExchangeShowIdsSort()) do - if self:canExchange(data.id) then - return true - end - end - end + return not self:getTodayExchangeCheck() end function FourteenDayData:getTodayExchangeCheck() From a554ab91a5d339f65d200538a107dc5c73de0689 Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Wed, 6 Sep 2023 16:49:44 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/config/strings/de/global.lua | 1 - lua/app/config/strings/en/global.lua | 2 +- lua/app/config/strings/es/global.lua | 2 +- lua/app/config/strings/id/global.lua | 2 +- lua/app/config/strings/ja/global.lua | 2 +- lua/app/config/strings/ko/global.lua | 2 +- lua/app/config/strings/pt/global.lua | 2 +- lua/app/config/strings/th/global.lua | 2 +- lua/app/config/strings/vi/global.lua | 2 +- lua/app/config/strings/zh/global.lua | 2 +- 10 files changed, 9 insertions(+), 10 deletions(-) diff --git a/lua/app/config/strings/de/global.lua b/lua/app/config/strings/de/global.lua index a31a1d1b..6d428074 100644 --- a/lua/app/config/strings/de/global.lua +++ b/lua/app/config/strings/de/global.lua @@ -32,7 +32,6 @@ local localization_global = ["TWITTER_DESC"] = "Twitter", ["NAVER_SETTING_DESC"] = "Naver", ["ACT_DESC_12"] = "LV", - ["ACT_BOSS_RUSH_DESC_6"] = "Chances de hoy:{0}", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/en/global.lua b/lua/app/config/strings/en/global.lua index 03bfe394..8baa97e4 100644 --- a/lua/app/config/strings/en/global.lua +++ b/lua/app/config/strings/en/global.lua @@ -482,7 +482,7 @@ local localization_global = ["ACT_BOSS_RUSH_DESC_3"] = "Master Today", ["ACT_BOSS_RUSH_DESC_4"] = "My highest today:", ["ACT_BOSS_RUSH_DESC_5"] = "My challenges today: {0} times", - ["ACT_BOSS_RUSH_DESC_6"] = "今日次数：{0}", + ["ACT_BOSS_RUSH_DESC_6"] = "Attempts Today:{0}", ["ACT_BOSS_RUSH_DESC_7"] = "Cost:", ["ACT_BOSS_RUSH_DESC_8"] = "Vacant", ["ACT_BOSS_RUSH_DESC_9"] = "Line-up", diff --git a/lua/app/config/strings/es/global.lua b/lua/app/config/strings/es/global.lua index 557ed094..4b4be0a1 100644 --- a/lua/app/config/strings/es/global.lua +++ b/lua/app/config/strings/es/global.lua @@ -482,7 +482,7 @@ local localization_global = ["ACT_BOSS_RUSH_DESC_3"] = "El maestro de hoy", ["ACT_BOSS_RUSH_DESC_4"] = "Mi récord de hoy:", ["ACT_BOSS_RUSH_DESC_5"] = "Mis desafíos de hoy: {0}", - ["ACT_BOSS_RUSH_DESC_6"] = "จำนวนวันนี้:{0}", + ["ACT_BOSS_RUSH_DESC_6"] = "Chances de hoy:{0}", ["ACT_BOSS_RUSH_DESC_7"] = "Consumo:", ["ACT_BOSS_RUSH_DESC_8"] = "Vacante", ["ACT_BOSS_RUSH_DESC_9"] = "Alineación", diff --git a/lua/app/config/strings/id/global.lua b/lua/app/config/strings/id/global.lua index e9827831..bb211131 100644 --- a/lua/app/config/strings/id/global.lua +++ b/lua/app/config/strings/id/global.lua @@ -482,7 +482,7 @@ local localization_global = ["ACT_BOSS_RUSH_DESC_3"] = "Master hari ini", ["ACT_BOSS_RUSH_DESC_4"] = "Tertinggi hari ini:", ["ACT_BOSS_RUSH_DESC_5"] = "Tantangan hari ini: {0} kali", - ["ACT_BOSS_RUSH_DESC_6"] = "今日次數：{0}", + ["ACT_BOSS_RUSH_DESC_6"] = "Jumlah hari ini:{0}", ["ACT_BOSS_RUSH_DESC_7"] = "Biaya:", ["ACT_BOSS_RUSH_DESC_8"] = "Kosong", ["ACT_BOSS_RUSH_DESC_9"] = "Line-up", diff --git a/lua/app/config/strings/ja/global.lua b/lua/app/config/strings/ja/global.lua index 4c47313c..8923914e 100644 --- a/lua/app/config/strings/ja/global.lua +++ b/lua/app/config/strings/ja/global.lua @@ -482,7 +482,7 @@ local localization_global = ["ACT_BOSS_RUSH_DESC_3"] = "今日のマスター", ["ACT_BOSS_RUSH_DESC_4"] = "自分の本日最高：", ["ACT_BOSS_RUSH_DESC_5"] = "今日の挑戦回数：{0}回", - ["ACT_BOSS_RUSH_DESC_6"] = "Attempts Today:{0}", + ["ACT_BOSS_RUSH_DESC_6"] = "今日の回数：{0}", ["ACT_BOSS_RUSH_DESC_7"] = "消費：", ["ACT_BOSS_RUSH_DESC_8"] = "データありません", ["ACT_BOSS_RUSH_DESC_9"] = "ラインナップ", diff --git a/lua/app/config/strings/ko/global.lua b/lua/app/config/strings/ko/global.lua index 659d1489..2b91aaeb 100644 --- a/lua/app/config/strings/ko/global.lua +++ b/lua/app/config/strings/ko/global.lua @@ -482,7 +482,7 @@ local localization_global = ["ACT_BOSS_RUSH_DESC_3"] = "오늘의 마스터", ["ACT_BOSS_RUSH_DESC_4"] = "오늘 나의 최고 기록:", ["ACT_BOSS_RUSH_DESC_5"] = "오늘 도전한 횟수: {0}회", - ["ACT_BOSS_RUSH_DESC_6"] = "今日の回数：{0}", + ["ACT_BOSS_RUSH_DESC_6"] = "오늘 횟수:{0}", ["ACT_BOSS_RUSH_DESC_7"] = "소비:", ["ACT_BOSS_RUSH_DESC_8"] = "비어있음", ["ACT_BOSS_RUSH_DESC_9"] = "라인업", diff --git a/lua/app/config/strings/pt/global.lua b/lua/app/config/strings/pt/global.lua index 9d4853ce..199b975b 100644 --- a/lua/app/config/strings/pt/global.lua +++ b/lua/app/config/strings/pt/global.lua @@ -482,7 +482,7 @@ local localization_global = ["ACT_BOSS_RUSH_DESC_3"] = "Mestre de Hoje", ["ACT_BOSS_RUSH_DESC_4"] = "Meu recorde de hoje:", ["ACT_BOSS_RUSH_DESC_5"] = "Meus desafios de hoje: {0}", - ["ACT_BOSS_RUSH_DESC_6"] = "Jumlah hari ini:{0}", + ["ACT_BOSS_RUSH_DESC_6"] = "Chances de hoje:{0}", ["ACT_BOSS_RUSH_DESC_7"] = "Consumo:", ["ACT_BOSS_RUSH_DESC_8"] = "Vacante", ["ACT_BOSS_RUSH_DESC_9"] = "Formação", diff --git a/lua/app/config/strings/th/global.lua b/lua/app/config/strings/th/global.lua index 34eed110..95fe44f0 100644 --- a/lua/app/config/strings/th/global.lua +++ b/lua/app/config/strings/th/global.lua @@ -482,7 +482,7 @@ local localization_global = ["ACT_BOSS_RUSH_DESC_3"] = "ปรมาจารย์วันนี้", ["ACT_BOSS_RUSH_DESC_4"] = "วันนี้ฉันเป็นผู้สูงสุด:", ["ACT_BOSS_RUSH_DESC_5"] = "วันนี้ฉันท้าทาย: {0} ครั้ง", - ["ACT_BOSS_RUSH_DESC_6"] = "Chances de hoje:{0}", + ["ACT_BOSS_RUSH_DESC_6"] = "จำนวนวันนี้:{0}", ["ACT_BOSS_RUSH_DESC_7"] = "ใช้:", ["ACT_BOSS_RUSH_DESC_8"] = "รอคอย", ["ACT_BOSS_RUSH_DESC_9"] = "ขบวนรบที่เข้าร่วมการแข่งขัน", diff --git a/lua/app/config/strings/vi/global.lua b/lua/app/config/strings/vi/global.lua index cae1a18c..1bc3e1cc 100644 --- a/lua/app/config/strings/vi/global.lua +++ b/lua/app/config/strings/vi/global.lua @@ -482,7 +482,7 @@ local localization_global = ["ACT_BOSS_RUSH_DESC_3"] = "Cao thủ hôm nay", ["ACT_BOSS_RUSH_DESC_4"] = "Tối đa hôm nay:", ["ACT_BOSS_RUSH_DESC_5"] = "Khiêu chiến hôm nay: {0} lần", - ["ACT_BOSS_RUSH_DESC_6"] = "오늘 횟수:{0}", + ["ACT_BOSS_RUSH_DESC_6"] = "Lượt hôm nay:{0}", ["ACT_BOSS_RUSH_DESC_7"] = "Tốn:", ["ACT_BOSS_RUSH_DESC_8"] = "Trống", ["ACT_BOSS_RUSH_DESC_9"] = "Đội hình tham chiến", diff --git a/lua/app/config/strings/zh/global.lua b/lua/app/config/strings/zh/global.lua index ef476b88..c5a009b3 100644 --- a/lua/app/config/strings/zh/global.lua +++ b/lua/app/config/strings/zh/global.lua @@ -482,7 +482,7 @@ local localization_global = ["ACT_BOSS_RUSH_DESC_3"] = "今日高手", ["ACT_BOSS_RUSH_DESC_4"] = "我今日最高：", ["ACT_BOSS_RUSH_DESC_5"] = "我今日挑戰：{0}次", - ["ACT_BOSS_RUSH_DESC_6"] = "Lượt hôm nay:{0}", + ["ACT_BOSS_RUSH_DESC_6"] = "今日次數：{0}", ["ACT_BOSS_RUSH_DESC_7"] = "使用：", ["ACT_BOSS_RUSH_DESC_8"] = "虛位以待", ["ACT_BOSS_RUSH_DESC_9"] = "參賽陣容", From 1b610b9e720fb454f55024d84cfe50b37506f225 Mon Sep 17 00:00:00 2001 From: Fang Date: Wed, 6 Sep 2023 16:53:58 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E7=A4=BC=E5=8C=85=E7=BA=A2=E7=82=B9?= =?UTF-8?q?=E5=88=B7=E6=96=B0fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/ui/activity/fourteen_day/fourteen_day_entrance_ui.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lua/app/ui/activity/fourteen_day/fourteen_day_entrance_ui.lua b/lua/app/ui/activity/fourteen_day/fourteen_day_entrance_ui.lua index 4e7004f3..f2d5e1d7 100644 --- a/lua/app/ui/activity/fourteen_day/fourteen_day_entrance_ui.lua +++ b/lua/app/ui/activity/fourteen_day/fourteen_day_entrance_ui.lua @@ -92,6 +92,9 @@ function FourteenDayEntranceUI:onLoadRootComplete() self:bind(DataManager.FourteenDayData, "isDirty", function() self:onRefresh() end) + self:bind(DataManager.ShopData, "isDirty", function() + self:refreshRedPoint() + end) end function FourteenDayEntranceUI:onRefresh() From c9f1f356bf885d0e704b16e476d4dc7185fa6287 Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Tue, 12 Sep 2023 11:21:52 +0800 Subject: [PATCH 5/8] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/module/activity/act_boss_rush/act_boss_rush_manager.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/app/module/activity/act_boss_rush/act_boss_rush_manager.lua b/lua/app/module/activity/act_boss_rush/act_boss_rush_manager.lua index 1349e3c6..1356c54a 100644 --- a/lua/app/module/activity/act_boss_rush/act_boss_rush_manager.lua +++ b/lua/app/module/activity/act_boss_rush/act_boss_rush_manager.lua @@ -90,12 +90,12 @@ function ActBossRushManager:rspEndBattle(result) if result.err_code == GConst.ERROR_STR.SUCCESS then local wave = result.max_wave or 0 local round = result.min_round or 0 - DataManager.ActBossRushData:addWaveCount(wave) DataManager.ActBossRushData:updateWaveAndRound(wave, round) ModuleManager.BattleManager:showBossRushBattleResultUI(GConst.BattleConst.BATTLE_TYPE.ACT_BOSS_RUSH, result.reqData and result.reqData.combatReport, result.reqData and result.reqData.task_stat) if result.reqData then ModuleManager.TaskManager:addFightTaskProgress(result.reqData.task_stat) + DataManager.ActBossRushData:addWaveCount(result.reqData.task_stat[GConst.BattleConst.BATTLE_TASK_FIELD.PASS_WAVE] or 0) end end end From 04b3908c0c8ae252aa584da83aa1344d4195ef2f Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Tue, 12 Sep 2023 11:23:15 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/config/arena_rank.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lua/app/config/arena_rank.lua b/lua/app/config/arena_rank.lua index aaaf7bdf..7ed06955 100644 --- a/lua/app/config/arena_rank.lua +++ b/lua/app/config/arena_rank.lua @@ -3303,8 +3303,8 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=46000, - ["num_for_nothing"]="Ug5cA2U=" + ["num"]=25000, + ["num_for_nothing"]="VA1cA2U=" }, { ["type"]=1, @@ -5383,8 +5383,8 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=54000, - ["num_for_nothing"]="UwxcA2U=" + ["num"]=25000, + ["num_for_nothing"]="VA1cA2U=" }, { ["type"]=1, From a92ceb5650b71ff7593e67e8bf597fb55cc86cc3 Mon Sep 17 00:00:00 2001 From: Fang Date: Fri, 8 Sep 2023 10:01:36 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AE=B9=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/ui/battle/battle_result_ui.lua | 8 +++++--- .../userdata/activity/fourteen_day/fourteen_day_data.lua | 4 ++-- lua/app/userdata/arena/arena_data.lua | 8 +++++--- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/lua/app/ui/battle/battle_result_ui.lua b/lua/app/ui/battle/battle_result_ui.lua index 35080232..c5453b93 100644 --- a/lua/app/ui/battle/battle_result_ui.lua +++ b/lua/app/ui/battle/battle_result_ui.lua @@ -331,9 +331,11 @@ function BattleResultUI:refreshArenaGradingSpine(gradingId, isUp) if self.arenaSpine then self.arenaSpine:playAnimComplete("vanish", false, false, function() - self.arenaSpine:destroy() - self.arenaSpine = nil - self:refreshArenaGradingSpine(gradingId, isUp) + if self.arenaSpine then + self.arenaSpine:destroy() + self.arenaSpine = nil + self:refreshArenaGradingSpine(gradingId, isUp) + end end) else SpineManager:loadUISpineWidgetAsync(DataManager.ArenaData:getGradingIconName(gradingId).."_spine", self.arenaSpineRoot, function(spineObject) diff --git a/lua/app/userdata/activity/fourteen_day/fourteen_day_data.lua b/lua/app/userdata/activity/fourteen_day/fourteen_day_data.lua index 654e9b01..bfe290a9 100644 --- a/lua/app/userdata/activity/fourteen_day/fourteen_day_data.lua +++ b/lua/app/userdata/activity/fourteen_day/fourteen_day_data.lua @@ -317,13 +317,13 @@ end -- 获取阶段子任务id列表 function FourteenDayData:getStageSubTaskIdsSort(stage) local taskMap = self:getTaskMap() + local result = {} if taskMap[stage] == nil or taskMap[stage].task == nil then - return nil + return result end local canGet = {} local unfinish = {} - local result = {} for index, id in ipairs(taskMap[stage].task) do if self:isTaskFinish(id) then -- 已完成 diff --git a/lua/app/userdata/arena/arena_data.lua b/lua/app/userdata/arena/arena_data.lua index 4acb7ca1..45f5a7cc 100644 --- a/lua/app/userdata/arena/arena_data.lua +++ b/lua/app/userdata/arena/arena_data.lua @@ -190,9 +190,11 @@ end -- 获取当前赛季最低段位积分 function ArenaData:getSeasonGradingMinScore() local result = 0 - for id, data in pairs(self.cfgRank) do - if result == 0 or result > data.score then - result = data.score + if self.cfgRank then + for id, data in pairs(self.cfgRank) do + if result == 0 or result > data.score then + result = data.score + end end end return result From 4cf830d91786e91c3c78121b7a6965d771e9b432 Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Tue, 12 Sep 2023 11:40:20 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../activity/act_boss_rush/act_boss_rush_manager.lua | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lua/app/module/activity/act_boss_rush/act_boss_rush_manager.lua b/lua/app/module/activity/act_boss_rush/act_boss_rush_manager.lua index 1356c54a..ba57101d 100644 --- a/lua/app/module/activity/act_boss_rush/act_boss_rush_manager.lua +++ b/lua/app/module/activity/act_boss_rush/act_boss_rush_manager.lua @@ -88,15 +88,15 @@ end function ActBossRushManager:rspEndBattle(result) if result.err_code == GConst.ERROR_STR.SUCCESS then - local wave = result.max_wave or 0 - local round = result.min_round or 0 - DataManager.ActBossRushData:updateWaveAndRound(wave, round) - ModuleManager.BattleManager:showBossRushBattleResultUI(GConst.BattleConst.BATTLE_TYPE.ACT_BOSS_RUSH, result.reqData and result.reqData.combatReport, result.reqData and result.reqData.task_stat) - if result.reqData then ModuleManager.TaskManager:addFightTaskProgress(result.reqData.task_stat) DataManager.ActBossRushData:addWaveCount(result.reqData.task_stat[GConst.BattleConst.BATTLE_TASK_FIELD.PASS_WAVE] or 0) end + + local wave = result.max_wave or 0 + local round = result.min_round or 0 + DataManager.ActBossRushData:updateWaveAndRound(wave, round) + ModuleManager.BattleManager:showBossRushBattleResultUI(GConst.BattleConst.BATTLE_TYPE.ACT_BOSS_RUSH, result.reqData and result.reqData.combatReport, result.reqData and result.reqData.task_stat) end end