From 36cdeeee1139264ea167f1f246dfdf4fd47874e0 Mon Sep 17 00:00:00 2001 From: puxuan <413323644@qq.com> Date: Tue, 19 Aug 2025 15:11:25 +0800 Subject: [PATCH] fix bug --- lua/app/common/module_manager.lua | 4 ++ .../localization_global_const.lua | 8 ++-- lua/app/config/strings/cn/global.lua | 2 + lua/app/config/strings/de/global.lua | 2 +- lua/app/config/strings/en/global.lua | 6 +-- lua/app/config/strings/es/global.lua | 6 +-- lua/app/config/strings/fr/global.lua | 2 +- lua/app/config/strings/id/global.lua | 6 +-- lua/app/config/strings/ja/global.lua | 6 +-- lua/app/config/strings/ko/global.lua | 6 +-- lua/app/config/strings/pt/global.lua | 6 +-- lua/app/config/strings/th/global.lua | 6 +-- lua/app/config/strings/vi/global.lua | 6 +-- lua/app/config/strings/zh/global.lua | 6 +-- lua/app/config/task_achievement.lua | 30 ++++++------- lua/app/module/task/task_manager.lua | 1 + lua/app/ui/main_city/component/main_comp.lua | 9 ++-- lua/app/ui/main_city/main_city_ui.lua | 8 ++-- lua/app/ui/task/task_main_ui.lua | 44 +++++++++---------- lua/app/userdata/task/daily_task_data.lua | 31 ++++++------- 20 files changed, 103 insertions(+), 92 deletions(-) diff --git a/lua/app/common/module_manager.lua b/lua/app/common/module_manager.lua index d439c850..1e614934 100644 --- a/lua/app/common/module_manager.lua +++ b/lua/app/common/module_manager.lua @@ -121,6 +121,10 @@ ModuleManager.MODULE_KEY = { EQUIP_ARMOR = "equip_armor_open", -- 防具 SKIN = "skin_open", -- 皮肤 RUNES_OPEN = "runes_open", -- 符文 + COMPANY_OPEN = "company_open", -- 公司页签开启条件 + TALENT_OPEN = "talent_open", -- 天赋功能开启条件 + DUNGEON_OPEN = "dungeon_open", -- 玩法入口页签开启条件 + SUMMON_OPEN = "summon_open", -- 英雄抽卡功能开启条件（包括普通和高级抽） } local _moduleMgrs = {} diff --git a/lua/app/config/localization/localization_global_const.lua b/lua/app/config/localization/localization_global_const.lua index 91153daf..18f2e2c9 100644 --- a/lua/app/config/localization/localization_global_const.lua +++ b/lua/app/config/localization/localization_global_const.lua @@ -1,6 +1,5 @@ local LocalizationGlobalConst = { - MAIN_BTN_1 = "MAIN_BTN_1", QLT_DESC_1 = "QLT_DESC_1", QLT_DESC_2 = "QLT_DESC_2", QLT_DESC_3 = "QLT_DESC_3", @@ -40,7 +39,6 @@ local LocalizationGlobalConst = HERO_DESC_9 = "HERO_DESC_9", HERO_DESC_10 = "HERO_DESC_10", BATTLE_DESC_8 = "BATTLE_DESC_8", - MAIN_BTN_2 = "MAIN_BTN_2", MAIN_DESC_1 = "MAIN_DESC_1", TIME_STR_DHM = "TIME_STR_DHM", TIME_STR_M = "TIME_STR_M", @@ -142,7 +140,6 @@ local LocalizationGlobalConst = DAY_X_UNLOCK = "DAY_X_UNLOCK", SEVEN_DAY_DESC_2 = "SEVEN_DAY_DESC_2", FUNC_UNLOCK = "FUNC_UNLOCK", - MAIN_BTN_3 = "MAIN_BTN_3", SHOP_DESC_1 = "SHOP_DESC_1", SHOP_DESC_2 = "SHOP_DESC_2", SHOP_DESC_3 = "SHOP_DESC_3", @@ -653,6 +650,9 @@ local LocalizationGlobalConst = CHAPTER_WAVE_REAWRD_1 = "CHAPTER_WAVE_REAWRD_1", CHAPTER_WAVE_REAWRD_2 = "CHAPTER_WAVE_REAWRD_2", CHAPTER_WAVE_REAWRD_3 = "CHAPTER_WAVE_REAWRD_3", + MAIN_BTN_1 = "MAIN_BTN_1", + MAIN_BTN_2 = "MAIN_BTN_2", + MAIN_BTN_3 = "MAIN_BTN_3", MAIN_BTN_4 = "MAIN_BTN_4", MAIN_BTN_5 = "MAIN_BTN_5", CHAPTER_BOX_DESC_1 = "CHAPTER_BOX_DESC_1", @@ -663,6 +663,8 @@ local LocalizationGlobalConst = TALENT_DESC_2 = "TALENT_DESC_2", TALENT_DESC_3 = "TALENT_DESC_3", TASK_DESC_2 = "TASK_DESC_2", + IDLE_DESC_1 = "IDLE_DESC_1", + SUMMON_DESC_2 = "SUMMON_DESC_2", } 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 c26ff6f2..e7142c50 100644 --- a/lua/app/config/strings/cn/global.lua +++ b/lua/app/config/strings/cn/global.lua @@ -663,6 +663,8 @@ local localization_global = ["TALENT_DESC_2"] = "研发", ["TALENT_DESC_3"] = "等级达到{0}可研发", ["TASK_DESC_2"] = "成就", + ["IDLE_DESC_1"] = "挂机", + ["SUMMON_DESC_2"] = "限时祈愿", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/de/global.lua b/lua/app/config/strings/de/global.lua index 6d428074..d3cdb0cb 100644 --- a/lua/app/config/strings/de/global.lua +++ b/lua/app/config/strings/de/global.lua @@ -1,6 +1,5 @@ local localization_global = { - ["MAIN_BTN_1"] = "Kampf", ["QLT_DESC_1"] = "Normal", ["QLT_DESC_2"] = "Elite", ["QLT_DESC_3"] = "Selten", @@ -32,6 +31,7 @@ local localization_global = ["TWITTER_DESC"] = "Twitter", ["NAVER_SETTING_DESC"] = "Naver", ["ACT_DESC_12"] = "LV", + ["MAIN_BTN_3"] = "Kampf", } 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 fbbebb21..6389b9c9 100644 --- a/lua/app/config/strings/en/global.lua +++ b/lua/app/config/strings/en/global.lua @@ -1,6 +1,5 @@ local localization_global = { - ["MAIN_BTN_1"] = "Fight", ["QLT_DESC_1"] = "Normal", ["QLT_DESC_2"] = "Excellent", ["QLT_DESC_3"] = "Rare", @@ -40,7 +39,6 @@ local localization_global = ["HERO_DESC_9"] = "Info", ["HERO_DESC_10"] = "Unlock after chapter {0}", ["BATTLE_DESC_8"] = "Additional heroes available for deploying", - ["MAIN_BTN_2"] = "Hero", ["MAIN_DESC_1"] = "Chapter {0}", ["TIME_STR_DHM"] = "{0} d {1} h {2} m", ["TIME_STR_M"] = "{0} min", @@ -142,7 +140,6 @@ local localization_global = ["DAY_X_UNLOCK"] = "Unlock on Day {0}", ["SEVEN_DAY_DESC_2"] = "Completed Quests: {0}/{1}", ["FUNC_UNLOCK"] = "Unlock new features", - ["MAIN_BTN_3"] = "Shop", ["SHOP_DESC_1"] = "Common Chest", ["SHOP_DESC_2"] = "Exquisite Chest", ["SHOP_DESC_3"] = "Precious Chest", @@ -635,6 +632,9 @@ local localization_global = ["ACT_TOURN_ARENEA_HELP_2"] = "{0}: Win - {1} points, Lose - {2} points;", ["ACT_TOURN_WAVE_DESC_4"] = "Gift Pack", ["EVENT_COUNTDOWN"] = "Event countdown:", + ["MAIN_BTN_1"] = "Shop", + ["MAIN_BTN_2"] = "Hero", + ["MAIN_BTN_3"] = "Fight", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/es/global.lua b/lua/app/config/strings/es/global.lua index 0aad1864..3462a420 100644 --- a/lua/app/config/strings/es/global.lua +++ b/lua/app/config/strings/es/global.lua @@ -1,6 +1,5 @@ local localization_global = { - ["MAIN_BTN_1"] = "Combate", ["QLT_DESC_1"] = "Común", ["QLT_DESC_2"] = "Poco común", ["QLT_DESC_3"] = "Raro", @@ -40,7 +39,6 @@ local localization_global = ["HERO_DESC_9"] = "Información", ["HERO_DESC_10"] = "Completar el capítulo {0} para desbloquear", ["BATTLE_DESC_8"] = "Hay héroes disponibles", - ["MAIN_BTN_2"] = "Héroes", ["MAIN_DESC_1"] = "Capítulo {0}", ["TIME_STR_DHM"] = "{0} d {1} h {2} m", ["TIME_STR_M"] = "{0} min", @@ -142,7 +140,6 @@ local localization_global = ["DAY_X_UNLOCK"] = "Día {0} desbloqueado", ["SEVEN_DAY_DESC_2"] = "Misiones completadas: {0}/{1}", ["FUNC_UNLOCK"] = "Nueva función desbloqueada", - ["MAIN_BTN_3"] = "Tienda", ["SHOP_DESC_1"] = "Cofre Común", ["SHOP_DESC_2"] = "Cofre Refinado", ["SHOP_DESC_3"] = "Cofre Precioso", @@ -635,6 +632,9 @@ local localization_global = ["ACT_TOURN_ARENEA_HELP_2"] = "{0}: Victoria {1}puntos, Derrota {2}puntos;", ["ACT_TOURN_WAVE_DESC_4"] = "Paquete", ["EVENT_COUNTDOWN"] = "Cuenta regresiva del evento:", + ["MAIN_BTN_1"] = "Tienda", + ["MAIN_BTN_2"] = "Héroes", + ["MAIN_BTN_3"] = "Combate", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/fr/global.lua b/lua/app/config/strings/fr/global.lua index 50df3d16..5cf50d27 100644 --- a/lua/app/config/strings/fr/global.lua +++ b/lua/app/config/strings/fr/global.lua @@ -1,6 +1,5 @@ local localization_global = { - ["MAIN_BTN_1"] = "Combat", ["QLT_DESC_1"] = "N", ["QLT_DESC_2"] = "G", ["QLT_DESC_3"] = "R", @@ -33,6 +32,7 @@ local localization_global = ["TWITTER_DESC"] = "Twitter", ["NAVER_SETTING_DESC"] = "Naver", ["ACT_DESC_12"] = "LV", + ["MAIN_BTN_3"] = "Combat", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/id/global.lua b/lua/app/config/strings/id/global.lua index 1f8e9b08..564c45df 100644 --- a/lua/app/config/strings/id/global.lua +++ b/lua/app/config/strings/id/global.lua @@ -1,6 +1,5 @@ local localization_global = { - ["MAIN_BTN_1"] = "Bertempur", ["QLT_DESC_1"] = "Normal", ["QLT_DESC_2"] = "Good", ["QLT_DESC_3"] = "Rare", @@ -40,7 +39,6 @@ local localization_global = ["HERO_DESC_9"] = "Info", ["HERO_DESC_10"] = "Lolos Bab {0} untuk membuka", ["BATTLE_DESC_8"] = "Lebih banyak Hero dapat digunakan", - ["MAIN_BTN_2"] = "Hero", ["MAIN_DESC_1"] = "Bab ke-{0}", ["TIME_STR_DHM"] = "{0} d {1} h {2} m", ["TIME_STR_M"] = "{0} min", @@ -142,7 +140,6 @@ local localization_global = ["DAY_X_UNLOCK"] = "Dibuka pada hari ke-{0}", ["SEVEN_DAY_DESC_2"] = "Misi yang diselesaikan: {0}/{1}", ["FUNC_UNLOCK"] = "Membuka fitur baru", - ["MAIN_BTN_3"] = "Mall", ["SHOP_DESC_1"] = "Peti Umum", ["SHOP_DESC_2"] = "Peti Indah", ["SHOP_DESC_3"] = "Peti Premium", @@ -635,6 +632,9 @@ local localization_global = ["ACT_TOURN_ARENEA_HELP_2"] = "{0}: Menang {1} poin, kalah {2} poin;", ["ACT_TOURN_WAVE_DESC_4"] = "Paket Hadiah", ["EVENT_COUNTDOWN"] = "Hitung mundur acara:", + ["MAIN_BTN_1"] = "Mall", + ["MAIN_BTN_2"] = "Hero", + ["MAIN_BTN_3"] = "Bertempur", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/ja/global.lua b/lua/app/config/strings/ja/global.lua index 7dd3a614..073d56ca 100644 --- a/lua/app/config/strings/ja/global.lua +++ b/lua/app/config/strings/ja/global.lua @@ -1,6 +1,5 @@ local localization_global = { - ["MAIN_BTN_1"] = "戦闘", ["QLT_DESC_1"] = "普通", ["QLT_DESC_2"] = "優秀", ["QLT_DESC_3"] = "レア", @@ -40,7 +39,6 @@ local localization_global = ["HERO_DESC_9"] = "情報", ["HERO_DESC_10"] = "メインクエスト{0}章クリア後に解放", ["BATTLE_DESC_8"] = "戦闘可能なヒーローがいる", - ["MAIN_BTN_2"] = "ヒーロー", ["MAIN_DESC_1"] = "メインクエスト{0}", ["TIME_STR_DHM"] = "{0}日{1}時間{2}分", ["TIME_STR_M"] = "{0}分", @@ -142,7 +140,6 @@ local localization_global = ["DAY_X_UNLOCK"] = "{0}日目に解放", ["SEVEN_DAY_DESC_2"] = "達成済ミッション:{0}/{1}", ["FUNC_UNLOCK"] = "新機能解放", - ["MAIN_BTN_3"] = "ショップ", ["SHOP_DESC_1"] = "普通の宝箱", ["SHOP_DESC_2"] = "精巧の宝箱", ["SHOP_DESC_3"] = "貴重の宝箱", @@ -635,6 +632,9 @@ local localization_global = ["ACT_TOURN_ARENEA_HELP_2"] = "{0}：勝{1}ポイント、敗{2}ポイント", ["ACT_TOURN_WAVE_DESC_4"] = "パック", ["EVENT_COUNTDOWN"] = "イベントカウントダウン:", + ["MAIN_BTN_1"] = "ショップ", + ["MAIN_BTN_2"] = "ヒーロー", + ["MAIN_BTN_3"] = "戦闘", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/ko/global.lua b/lua/app/config/strings/ko/global.lua index 2303267c..b6fef4c6 100644 --- a/lua/app/config/strings/ko/global.lua +++ b/lua/app/config/strings/ko/global.lua @@ -1,6 +1,5 @@ local localization_global = { - ["MAIN_BTN_1"] = "전투", ["QLT_DESC_1"] = "일반", ["QLT_DESC_2"] = "우수", ["QLT_DESC_3"] = "희귀", @@ -40,7 +39,6 @@ local localization_global = ["HERO_DESC_9"] = "정보", ["HERO_DESC_10"] = "챕터 {0} 클리어 시 잠금 해제", ["BATTLE_DESC_8"] = "전투에 참여할 수 있는 영웅이 남아있습니다.", - ["MAIN_BTN_2"] = "영웅", ["MAIN_DESC_1"] = "챕터 {0}", ["TIME_STR_DHM"] = "{0}일 {1}시 {2}분", ["TIME_STR_M"] = "{0}분", @@ -142,7 +140,6 @@ local localization_global = ["DAY_X_UNLOCK"] = "제{0}일에 잠금 해제", ["SEVEN_DAY_DESC_2"] = "이미 완성한 미션 수:{0}/{1}", ["FUNC_UNLOCK"] = "새로운 기능 잠금 해제", - ["MAIN_BTN_3"] = "상점", ["SHOP_DESC_1"] = "일반 보물 상자", ["SHOP_DESC_2"] = "정교한 보물상자", ["SHOP_DESC_3"] = "귀중한 보물 상자", @@ -635,6 +632,9 @@ local localization_global = ["ACT_TOURN_ARENEA_HELP_2"] = "{0}: 승리 시 {1}점, 실패 시 {2}점;", ["ACT_TOURN_WAVE_DESC_4"] = "패키지", ["EVENT_COUNTDOWN"] = "이벤트 카운트다운:", + ["MAIN_BTN_1"] = "상점", + ["MAIN_BTN_2"] = "영웅", + ["MAIN_BTN_3"] = "전투", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/pt/global.lua b/lua/app/config/strings/pt/global.lua index b16cd242..16cd77dc 100644 --- a/lua/app/config/strings/pt/global.lua +++ b/lua/app/config/strings/pt/global.lua @@ -1,6 +1,5 @@ local localization_global = { - ["MAIN_BTN_1"] = "Combate", ["QLT_DESC_1"] = "Comum", ["QLT_DESC_2"] = "Incomum", ["QLT_DESC_3"] = "Raro", @@ -40,7 +39,6 @@ local localization_global = ["HERO_DESC_9"] = "Informações", ["HERO_DESC_10"] = "Desbloqueado após completar o Capítulo {0}.", ["BATTLE_DESC_8"] = "Ainda há heróis disponíveis.", - ["MAIN_BTN_2"] = "Heróis", ["MAIN_DESC_1"] = "Capítulo {0}", ["TIME_STR_DHM"] = "{0} d {1} h {2} m", ["TIME_STR_M"] = "{0} min", @@ -142,7 +140,6 @@ local localization_global = ["DAY_X_UNLOCK"] = "Desbloqueio no dia {0}", ["SEVEN_DAY_DESC_2"] = "Número de missões concluídas: {0}/{1}", ["FUNC_UNLOCK"] = "Desbloquear nova função", - ["MAIN_BTN_3"] = "Loja", ["SHOP_DESC_1"] = "Baú Comum", ["SHOP_DESC_2"] = "Baú Sofisticado", ["SHOP_DESC_3"] = "Baú Precioso", @@ -635,6 +632,9 @@ local localization_global = ["ACT_TOURN_ARENEA_HELP_2"] = "{0}— Vitória: {1} pts., Derrota: {2} pts.;", ["ACT_TOURN_WAVE_DESC_4"] = "Pacote", ["EVENT_COUNTDOWN"] = "Contagem regressiva do evento:", + ["MAIN_BTN_1"] = "Loja", + ["MAIN_BTN_2"] = "Heróis", + ["MAIN_BTN_3"] = "Combate", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/th/global.lua b/lua/app/config/strings/th/global.lua index 216e4c92..3d511f42 100644 --- a/lua/app/config/strings/th/global.lua +++ b/lua/app/config/strings/th/global.lua @@ -1,6 +1,5 @@ local localization_global = { - ["MAIN_BTN_1"] = "รณ", ["QLT_DESC_1"] = "โดยทั่วไป", ["QLT_DESC_2"] = "โดดเด่น", ["QLT_DESC_3"] = "ซึ่งหายาก", @@ -40,7 +39,6 @@ local localization_global = ["HERO_DESC_9"] = "ข้อมูล", ["HERO_DESC_10"] = "ผ่านด่านบทที่{0}จะ\nปลดล็อค ", ["BATTLE_DESC_8"] = "ยังมีฮีโร่ที่ออกรบได้", - ["MAIN_BTN_2"] = "ฮีโร่", ["MAIN_DESC_1"] = "บท {0}", ["TIME_STR_DHM"] = "{0} d {1} h {2} m", ["TIME_STR_M"] = "{0} min", @@ -142,7 +140,6 @@ local localization_global = ["DAY_X_UNLOCK"] = "ปลดล็อกในวันที่{0}", ["SEVEN_DAY_DESC_2"] = "จำนวนภารกิจที่บรรลุ: {0}/{1}", ["FUNC_UNLOCK"] = "ปลดล็อกฟังก์ชั่นใหม่", - ["MAIN_BTN_3"] = "ห้าง", ["SHOP_DESC_1"] = "หีบสมบัติทั่วไป", ["SHOP_DESC_2"] = "หีบสมบัติสวยงาม", ["SHOP_DESC_3"] = "หีบสมบัติล้ำค่า", @@ -635,6 +632,9 @@ local localization_global = ["ACT_TOURN_ARENEA_HELP_2"] = "{0}: ชนะได้รับ{1} แต้ม พ่ายแพ้ได้รับ {2} แต้ม", ["ACT_TOURN_WAVE_DESC_4"] = "แพ็คของขวัญ", ["EVENT_COUNTDOWN"] = "นับถอยหลังเหตุการณ์:", + ["MAIN_BTN_1"] = "ห้าง", + ["MAIN_BTN_2"] = "ฮีโร่", + ["MAIN_BTN_3"] = "รณ", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/vi/global.lua b/lua/app/config/strings/vi/global.lua index 7f57a335..06fcc943 100644 --- a/lua/app/config/strings/vi/global.lua +++ b/lua/app/config/strings/vi/global.lua @@ -1,6 +1,5 @@ local localization_global = { - ["MAIN_BTN_1"] = "Chiến đấu", ["QLT_DESC_1"] = "Thường", ["QLT_DESC_2"] = "Ưu Tú", ["QLT_DESC_3"] = "Hiếm", @@ -40,7 +39,6 @@ local localization_global = ["HERO_DESC_9"] = "Thông Tin", ["HERO_DESC_10"] = "Vượt chương {0} mở khóa", ["BATTLE_DESC_8"] = "Có Anh Hùng có thể ra trận", - ["MAIN_BTN_2"] = "Anh Hùng", ["MAIN_DESC_1"] = "Chương {0}", ["TIME_STR_DHM"] = "{0} d {1} h {2} m", ["TIME_STR_M"] = "{0} min", @@ -142,7 +140,6 @@ local localization_global = ["DAY_X_UNLOCK"] = "Ngày {0} mở khóa", ["SEVEN_DAY_DESC_2"] = "Số nhiệm vụ đã hoàn thành: {0}/{1}", ["FUNC_UNLOCK"] = "Mở khóa tính năng mới", - ["MAIN_BTN_3"] = "SHOP", ["SHOP_DESC_1"] = "Rương Thường", ["SHOP_DESC_2"] = "Rương Tinh Xảo", ["SHOP_DESC_3"] = "Rương Quý", @@ -635,6 +632,9 @@ local localization_global = ["ACT_TOURN_ARENEA_HELP_2"] = "{0}: Thắng {1} điểm, thua {2} điểm;", ["ACT_TOURN_WAVE_DESC_4"] = "Quà Tặng", ["EVENT_COUNTDOWN"] = "Sự kiện đếm ngược:", + ["MAIN_BTN_1"] = "SHOP", + ["MAIN_BTN_2"] = "Anh Hùng", + ["MAIN_BTN_3"] = "Chiến đấu", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/zh/global.lua b/lua/app/config/strings/zh/global.lua index b03c6715..74b40341 100644 --- a/lua/app/config/strings/zh/global.lua +++ b/lua/app/config/strings/zh/global.lua @@ -1,6 +1,5 @@ local localization_global = { - ["MAIN_BTN_1"] = "戰鬥", ["QLT_DESC_1"] = "普通", ["QLT_DESC_2"] = "優秀", ["QLT_DESC_3"] = "稀有", @@ -40,7 +39,6 @@ local localization_global = ["HERO_DESC_9"] = "資訊", ["HERO_DESC_10"] = "過關章節{0}解鎖", ["BATTLE_DESC_8"] = "還有可上場英雄", - ["MAIN_BTN_2"] = "英雄", ["MAIN_DESC_1"] = "第{0}章", ["TIME_STR_DHM"] = "{0}天{1}時{2}分", ["TIME_STR_M"] = "{0}分", @@ -142,7 +140,6 @@ local localization_global = ["DAY_X_UNLOCK"] = "第{0}天解鎖", ["SEVEN_DAY_DESC_2"] = "已完成任務數:{0}/{1}", ["FUNC_UNLOCK"] = "解鎖新功能", - ["MAIN_BTN_3"] = "商城", ["SHOP_DESC_1"] = "普通寶箱", ["SHOP_DESC_2"] = "精緻寶箱", ["SHOP_DESC_3"] = "珍貴寶箱", @@ -635,6 +632,9 @@ local localization_global = ["ACT_TOURN_ARENEA_HELP_2"] = "{0}：勝利{1}分，失敗{2}分；", ["ACT_TOURN_WAVE_DESC_4"] = "禮包", ["EVENT_COUNTDOWN"] = "活動倒數：", + ["MAIN_BTN_1"] = "商城", + ["MAIN_BTN_2"] = "英雄", + ["MAIN_BTN_3"] = "戰鬥", } return localization_global \ No newline at end of file diff --git a/lua/app/config/task_achievement.lua b/lua/app/config/task_achievement.lua index 76a36641..7ba5413e 100644 --- a/lua/app/config/task_achievement.lua +++ b/lua/app/config/task_achievement.lua @@ -3423,7 +3423,7 @@ local task_achievement = { } } }, - [18]={ + [17]={ ["type"]=22, ["number"]={ 1, @@ -3646,7 +3646,7 @@ local task_achievement = { } } }, - [19]={ + [18]={ ["type"]=23, ["number"]={ 2, @@ -3788,7 +3788,7 @@ local task_achievement = { } } }, - [20]={ + [19]={ ["type"]=24, ["number"]={ 2, @@ -3930,7 +3930,7 @@ local task_achievement = { } } }, - [21]={ + [20]={ ["type"]=25, ["number"]={ 2, @@ -4072,7 +4072,7 @@ local task_achievement = { } } }, - [22]={ + [21]={ ["type"]=26, ["number"]={ 2, @@ -4214,7 +4214,7 @@ local task_achievement = { } } }, - [23]={ + [22]={ ["type"]=27, ["number"]={ 2, @@ -4356,7 +4356,7 @@ local task_achievement = { } } }, - [24]={ + [23]={ ["type"]=43, ["number"]={ 2, @@ -4498,7 +4498,7 @@ local task_achievement = { } } }, - [25]={ + [24]={ ["type"]=44, ["number"]={ 2, @@ -4640,7 +4640,7 @@ local task_achievement = { } } }, - [26]={ + [25]={ ["type"]=45, ["number"]={ 2, @@ -4782,7 +4782,7 @@ local task_achievement = { } } }, - [27]={ + [26]={ ["type"]=46, ["number"]={ 2, @@ -4924,7 +4924,7 @@ local task_achievement = { } } }, - [28]={ + [27]={ ["type"]=30, ["number"]={ 2, @@ -5066,7 +5066,7 @@ local task_achievement = { } } }, - [29]={ + [28]={ ["type"]=31, ["number"]={ 2, @@ -5208,7 +5208,7 @@ local task_achievement = { } } }, - [30]={ + [29]={ ["type"]=36, ["number"]={ 2, @@ -5350,7 +5350,7 @@ local task_achievement = { } } }, - [31]={ + [30]={ ["type"]=37, ["number"]={ 2, @@ -5492,7 +5492,7 @@ local task_achievement = { } } }, - [32]={ + [31]={ ["type"]=40, ["number"]={ 2, diff --git a/lua/app/module/task/task_manager.lua b/lua/app/module/task/task_manager.lua index dd931e60..01a262b4 100644 --- a/lua/app/module/task/task_manager.lua +++ b/lua/app/module/task/task_manager.lua @@ -42,6 +42,7 @@ function TaskManager:onDailyTaskClaim(result) if result.err_code == GConst.ERROR_STR.SUCCESS then if result.task_daily then DataManager.DailyTaskData:initDaily(result.task_daily) + DataManager.DailyTaskData:setDirty() end if result.rewards then GFunc.showRewardBox(result.rewards) diff --git a/lua/app/ui/main_city/component/main_comp.lua b/lua/app/ui/main_city/component/main_comp.lua index edee3348..1d4c7c39 100644 --- a/lua/app/ui/main_city/component/main_comp.lua +++ b/lua/app/ui/main_city/component/main_comp.lua @@ -51,10 +51,8 @@ function MainComp:init() uiMap["main_comp.arena_btn.text"]:setText(I18N:getGlobalText(I18N.GlobalConst.ARENA_DESC_1)) uiMap["main_comp.daily_challenge_btn.text"]:setText(I18N:getGlobalText(I18N.GlobalConst.DAILY_CHALLENGE)) - -- uiMap["main_comp.left_btn.text"]:setText(I18N:getGlobalText(I18N.GlobalConst.DAILY_CHALLENGE)) - -- uiMap["main_comp.right_btn.text"]:setText(I18N:getGlobalText(I18N.GlobalConst.DAILY_CHALLENGE)) - uiMap["main_comp.left_btn.text"]:setText("游历") - uiMap["main_comp.right_btn.text"]:setText("限时祈愿") + uiMap["main_comp.left_btn.text"]:setText(I18N:getGlobalText(I18N.GlobalConst.IDLE_DESC_1)) + uiMap["main_comp.right_btn.text"]:setText(I18N:getGlobalText(I18N.GlobalConst.SUMMON_DESC_2)) self.backGroundNode = uiMap["main_comp.back_ground"] self.chapterBg = uiMap["main_comp.bg"] @@ -180,6 +178,9 @@ function MainComp:refreshChapter(force) -- self:doChapterMove() -- self:doMonsterAction() self:refreshChapterBtn() + + self.leftBtn:setActive(ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.IDLE_DROP, false)) + self.rightBtn:setActive(ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.SUMMON_OPEN, false)) end function MainComp:refreshChapterBg() diff --git a/lua/app/ui/main_city/main_city_ui.lua b/lua/app/ui/main_city/main_city_ui.lua index bd601fa0..1602273f 100644 --- a/lua/app/ui/main_city/main_city_ui.lua +++ b/lua/app/ui/main_city/main_city_ui.lua @@ -293,12 +293,12 @@ function MainCityUI:initBottomUI() if not ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.MALL, false) then return end - elseif i == 4 then -- 商城有开启条件 - if not ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.MALL, false) then + elseif i == 4 then -- 公司有开启条件 + if not ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.COMPANY_OPEN, false) then return end - elseif i == 5 then -- 商城有开启条件 - if not ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.MALL, false) then + elseif i == 5 then -- 玩法有开启条件 + if not ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.DUNGEON_OPEN, false) then return end end diff --git a/lua/app/ui/task/task_main_ui.lua b/lua/app/ui/task/task_main_ui.lua index 3dd1fe57..6980fa2b 100644 --- a/lua/app/ui/task/task_main_ui.lua +++ b/lua/app/ui/task/task_main_ui.lua @@ -182,23 +182,23 @@ function TaskMainUI:refreshDaily() self.dailyTaskList = DataManager.DailyTaskData:getTaskIdsSort() self.dailyTaskScrollRect:refillCells(#self.dailyTaskList) - if DataManager.DailyTaskData:showDailyRedPoint() then - self.menuOneRedPoint:setActive(true) - if self.menuOneRedPointTween == nil then - self.menuOneRedPointTween = self:getShakeTween(self.menuOneRedPoint) + if DataManager.DailyTaskData:showAchievementRedPoint() then + self.menuTwoRedPoint:setActive(true) + if self.menuTwoRedPointTween == nil then + self.menuTwoRedPointTween = self:getShakeTween(self.menuTwoRedPoint) else - self.menuOneRedPointTween:Restart() + self.menuTwoRedPointTween:Restart() end else - if self.menuOneRedPointTween then - self.menuOneRedPointTween:Pause() + if self.menuTwoRedPointTween then + self.menuTwoRedPointTween:Pause() end - self.menuOneRedPoint:setActive(false) + self.menuTwoRedPoint:setActive(false) end - if self.menuTwoRedPointTween then - self.menuTwoRedPointTween:Pause() + if self.menuOneRedPointTween then + self.menuOneRedPointTween:Pause() end - self.menuTwoRedPoint:setActive(false) + self.menuOneRedPoint:setActive(false) end function TaskMainUI:onClickBox() @@ -228,23 +228,23 @@ function TaskMainUI:refreshChallenge() self.titleTx:setText(I18N:getGlobalText(I18N.GlobalConst.TASK_DESC_2)) self.achievementTaskList = DataManager.DailyTaskData:getAchievementIdsSort() self.challengeTaskScrollRect:refillCells(#self.achievementTaskList) - if DataManager.DailyTaskData:showAchievementRedPoint() then - self.menuTwoRedPoint:setActive(true) - if self.menuTwoRedPointTween == nil then - self.menuTwoRedPointTween = self:getShakeTween(self.menuTwoRedPoint) + if DataManager.DailyTaskData:showDailyRedPoint() then + self.menuOneRedPoint:setActive(true) + if self.menuOneRedPointTween == nil then + self.menuOneRedPointTween = self:getShakeTween(self.menuOneRedPoint) else - self.menuTwoRedPointTween:Restart() + self.menuOneRedPointTween:Restart() end else - if self.menuTwoRedPointTween then - self.menuTwoRedPointTween:Pause() + if self.menuOneRedPointTween then + self.menuOneRedPointTween:Pause() end - self.menuTwoRedPoint:setActive(false) + self.menuOneRedPoint:setActive(false) end - if self.menuOneRedPointTween then - self.menuOneRedPointTween:Pause() + if self.menuTwoRedPointTween then + self.menuTwoRedPointTween:Pause() end - self.menuOneRedPoint:setActive(false) + self.menuTwoRedPoint:setActive(false) end function TaskMainUI:getShakeTween(obj) diff --git a/lua/app/userdata/task/daily_task_data.lua b/lua/app/userdata/task/daily_task_data.lua index 8f9edd27..f9989b27 100644 --- a/lua/app/userdata/task/daily_task_data.lua +++ b/lua/app/userdata/task/daily_task_data.lua @@ -23,6 +23,22 @@ function DailyTaskData:init(daily, achievement) self:initDaily(daily) self:initAchievement(achievement) + + -- 监听任务 + for id, info in pairs(TaskDailyCfg) do + ModuleManager.TaskManager:registerTask("DailyTaskData", info.task_type, function(count) + self.dailyRedState = nil + self:addTaskProgress(info.task_type, count) + end) + end + + for id, info in pairs(TaskAchievementCfg) do + ModuleManager.TaskManager:registerTask("DailyTaskData", info.type, function(count) + self.achievementRedState = nil + self:addTaskProgress(info.type, count) + end) + end + -- 跨天 DataManager:registerCrossDayFunc("DailyTaskData", function() -- 重置任务数据 @@ -65,14 +81,6 @@ function DailyTaskData:initDaily(daily) table.insert(self.dailyStageIds, id) end table.sort(self.dailyStageIds) - - -- 监听任务 - for id, info in pairs(TaskDailyCfg) do - ModuleManager.TaskManager:registerTask("DailyTaskData", info.task_type, function(count) - self.dailyRedState = nil - self:addTaskProgress(info.task_type, count) - end) - end end function DailyTaskData:initAchievement(achievement) @@ -81,13 +89,6 @@ function DailyTaskData:initAchievement(achievement) -- 成就任务 self.achievementData = achievement.tasks or {} self.achievementRewardData = achievement.task_claimed_stages or {} - - for id, info in pairs(TaskAchievementCfg) do - ModuleManager.TaskManager:registerTask("DailyTaskData", info.type, function(count) - self.achievementRedState = nil - self:addTaskProgress(info.type, count) - end) - end end function DailyTaskData:getIsOpen(showToast)