diff --git a/lua/app/config/func_open.lua b/lua/app/config/func_open.lua index 0828ff0a..9c28f96f 100644 --- a/lua/app/config/func_open.lua +++ b/lua/app/config/func_open.lua @@ -108,10 +108,27 @@ local func_open = { ["pop_ups"]=1 }, ["hero_equip"]={ - ["stage"]=4 + ["stage"]=4, + ["icon"]="module_unlock_arena" + }, + ["company_open"]={ + ["stage"]=2, + ["pop_ups"]=1 + }, + ["talent_open"]={ + ["stage"]=2, + ["icon"]="module_unlock_arena" + }, + ["dungeon_open"]={ + ["stage"]=6, + ["pop_ups"]=1 + }, + ["summon_open"]={ + ["stage"]=1, + ["icon"]="module_unlock_arena" } } local config = { -data=func_open,count=28 +data=func_open,count=32 } return config \ No newline at end of file diff --git a/lua/app/config/localization/localization_global_const.lua b/lua/app/config/localization/localization_global_const.lua index 6b3f0e80..91153daf 100644 --- a/lua/app/config/localization/localization_global_const.lua +++ b/lua/app/config/localization/localization_global_const.lua @@ -659,6 +659,10 @@ local LocalizationGlobalConst = LV_UNLOCK = "LV_UNLOCK", HERO_DESC_13 = "HERO_DESC_13", HERO_DESC_14 = "HERO_DESC_14", + TALENT_DESC_1 = "TALENT_DESC_1", + TALENT_DESC_2 = "TALENT_DESC_2", + TALENT_DESC_3 = "TALENT_DESC_3", + TASK_DESC_2 = "TASK_DESC_2", } return LocalizationGlobalConst \ No newline at end of file diff --git a/lua/app/config/monster_daily_challenge.lua b/lua/app/config/monster_daily_challenge.lua index c8134306..08e1c445 100644 --- a/lua/app/config/monster_daily_challenge.lua +++ b/lua/app/config/monster_daily_challenge.lua @@ -1160,7 +1160,7 @@ local monster_daily_challenge = { ["monster_exp"]=22000 }, [61502]={ - ["monster_base"]=30003, + ["monster_base"]=30007, ["is_boss"]=1, ["hp"]=1800000, ["atk"]=72000000, diff --git a/lua/app/config/strings/cn/global.lua b/lua/app/config/strings/cn/global.lua index c7aa4495..c26ff6f2 100644 --- a/lua/app/config/strings/cn/global.lua +++ b/lua/app/config/strings/cn/global.lua @@ -659,6 +659,10 @@ local localization_global = ["LV_UNLOCK"] = "{0}级解锁", ["HERO_DESC_13"] = "相关英雄：", ["HERO_DESC_14"] = "英雄等级达到{0}", + ["TALENT_DESC_1"] = "研发中心", + ["TALENT_DESC_2"] = "研发", + ["TALENT_DESC_3"] = "等级达到{0}可研发", + ["TASK_DESC_2"] = "成就", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/cn/talent.lua b/lua/app/config/strings/cn/talent.lua new file mode 100644 index 00000000..c6b1ae42 --- /dev/null +++ b/lua/app/config/strings/cn/talent.lua @@ -0,0 +1,70 @@ +local talent = { + [1]={ + ["name"]="基因锐化", + ["desc"]="全队攻击+" + }, + [2]={ + ["name"]="基因扩容", + ["desc"]="全队生命+" + }, + [3]={ + ["name"]="缓冲力场", + ["desc"]="减伤+" + }, + [4]={ + ["name"]="深度锐化", + ["desc"]="全队攻击+" + }, + [5]={ + ["name"]="深度扩容", + ["desc"]="全队生命+" + }, + [6]={ + ["name"]="强力缓冲", + ["desc"]="减伤+" + }, + [7]={ + ["name"]="能量爆发", + ["desc"]="暴击率+" + }, + [8]={ + ["name"]="爆发增幅", + ["desc"]="暴击伤害+" + }, + [9]={ + ["name"]="充能装置", + ["desc"]="技能刷新次数+" + }, + [10]={ + ["name"]="补给胶囊", + ["desc"]="波次结束回复生命+" + }, + [11]={ + ["name"]="基因解码", + ["desc"]="战斗开始时可选1次技能" + }, + [12]={ + ["name"]="交易技巧", + ["desc"]="主线结算金币+" + }, + [13]={ + ["name"]="力量插件", + ["desc"]="普通攻击伤害+" + }, + [14]={ + ["name"]="超能编码", + ["desc"]="技能伤害+" + }, + [15]={ + ["name"]="生机复苏", + ["desc"]="生命值+" + }, + [16]={ + ["name"]="经验虹吸", + ["desc"]="战斗中经验获取+" + } +} +local config = { +data=talent,count=16 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/cn/talent.lua.meta b/lua/app/config/strings/cn/talent.lua.meta new file mode 100644 index 00000000..ee7bfd88 --- /dev/null +++ b/lua/app/config/strings/cn/talent.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 720c7844b4c57410da136f535ea47ac1 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/de/talent.lua b/lua/app/config/strings/de/talent.lua new file mode 100644 index 00000000..7bed11ab --- /dev/null +++ b/lua/app/config/strings/de/talent.lua @@ -0,0 +1,54 @@ +local talent = { + [1]={ + + }, + [2]={ + + }, + [3]={ + + }, + [4]={ + + }, + [5]={ + + }, + [6]={ + + }, + [7]={ + + }, + [8]={ + + }, + [9]={ + + }, + [10]={ + + }, + [11]={ + + }, + [12]={ + + }, + [13]={ + + }, + [14]={ + + }, + [15]={ + + }, + [16]={ + + } +} +local config = { +data=talent,count=16 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/de/talent.lua.meta b/lua/app/config/strings/de/talent.lua.meta new file mode 100644 index 00000000..d98cb7d8 --- /dev/null +++ b/lua/app/config/strings/de/talent.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 5b1dbd64fc5ff47409223bdd3aa1fe5a +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/en/talent.lua b/lua/app/config/strings/en/talent.lua new file mode 100644 index 00000000..7bed11ab --- /dev/null +++ b/lua/app/config/strings/en/talent.lua @@ -0,0 +1,54 @@ +local talent = { + [1]={ + + }, + [2]={ + + }, + [3]={ + + }, + [4]={ + + }, + [5]={ + + }, + [6]={ + + }, + [7]={ + + }, + [8]={ + + }, + [9]={ + + }, + [10]={ + + }, + [11]={ + + }, + [12]={ + + }, + [13]={ + + }, + [14]={ + + }, + [15]={ + + }, + [16]={ + + } +} +local config = { +data=talent,count=16 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/en/talent.lua.meta b/lua/app/config/strings/en/talent.lua.meta new file mode 100644 index 00000000..b176639c --- /dev/null +++ b/lua/app/config/strings/en/talent.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: a3e79e7c4b8de45fe96879115320b700 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/es/talent.lua b/lua/app/config/strings/es/talent.lua new file mode 100644 index 00000000..7bed11ab --- /dev/null +++ b/lua/app/config/strings/es/talent.lua @@ -0,0 +1,54 @@ +local talent = { + [1]={ + + }, + [2]={ + + }, + [3]={ + + }, + [4]={ + + }, + [5]={ + + }, + [6]={ + + }, + [7]={ + + }, + [8]={ + + }, + [9]={ + + }, + [10]={ + + }, + [11]={ + + }, + [12]={ + + }, + [13]={ + + }, + [14]={ + + }, + [15]={ + + }, + [16]={ + + } +} +local config = { +data=talent,count=16 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/es/talent.lua.meta b/lua/app/config/strings/es/talent.lua.meta new file mode 100644 index 00000000..6f9f0ae2 --- /dev/null +++ b/lua/app/config/strings/es/talent.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: d346ae9517f844a1d8fd6ec490c0b2b9 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/fr/talent.lua b/lua/app/config/strings/fr/talent.lua new file mode 100644 index 00000000..7bed11ab --- /dev/null +++ b/lua/app/config/strings/fr/talent.lua @@ -0,0 +1,54 @@ +local talent = { + [1]={ + + }, + [2]={ + + }, + [3]={ + + }, + [4]={ + + }, + [5]={ + + }, + [6]={ + + }, + [7]={ + + }, + [8]={ + + }, + [9]={ + + }, + [10]={ + + }, + [11]={ + + }, + [12]={ + + }, + [13]={ + + }, + [14]={ + + }, + [15]={ + + }, + [16]={ + + } +} +local config = { +data=talent,count=16 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/fr/talent.lua.meta b/lua/app/config/strings/fr/talent.lua.meta new file mode 100644 index 00000000..b6f3cb7c --- /dev/null +++ b/lua/app/config/strings/fr/talent.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 2272e7defd7d74b789ac9ad5e4f76804 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/id/talent.lua b/lua/app/config/strings/id/talent.lua new file mode 100644 index 00000000..7bed11ab --- /dev/null +++ b/lua/app/config/strings/id/talent.lua @@ -0,0 +1,54 @@ +local talent = { + [1]={ + + }, + [2]={ + + }, + [3]={ + + }, + [4]={ + + }, + [5]={ + + }, + [6]={ + + }, + [7]={ + + }, + [8]={ + + }, + [9]={ + + }, + [10]={ + + }, + [11]={ + + }, + [12]={ + + }, + [13]={ + + }, + [14]={ + + }, + [15]={ + + }, + [16]={ + + } +} +local config = { +data=talent,count=16 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/id/talent.lua.meta b/lua/app/config/strings/id/talent.lua.meta new file mode 100644 index 00000000..6630ead4 --- /dev/null +++ b/lua/app/config/strings/id/talent.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: d871da39d1aef45edb3ed23d0fc34b6f +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/ja/talent.lua b/lua/app/config/strings/ja/talent.lua new file mode 100644 index 00000000..7bed11ab --- /dev/null +++ b/lua/app/config/strings/ja/talent.lua @@ -0,0 +1,54 @@ +local talent = { + [1]={ + + }, + [2]={ + + }, + [3]={ + + }, + [4]={ + + }, + [5]={ + + }, + [6]={ + + }, + [7]={ + + }, + [8]={ + + }, + [9]={ + + }, + [10]={ + + }, + [11]={ + + }, + [12]={ + + }, + [13]={ + + }, + [14]={ + + }, + [15]={ + + }, + [16]={ + + } +} +local config = { +data=talent,count=16 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/ja/talent.lua.meta b/lua/app/config/strings/ja/talent.lua.meta new file mode 100644 index 00000000..527b4420 --- /dev/null +++ b/lua/app/config/strings/ja/talent.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 43d1e79a6ff23452fac19a3c7d7f8771 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/ko/talent.lua b/lua/app/config/strings/ko/talent.lua new file mode 100644 index 00000000..7bed11ab --- /dev/null +++ b/lua/app/config/strings/ko/talent.lua @@ -0,0 +1,54 @@ +local talent = { + [1]={ + + }, + [2]={ + + }, + [3]={ + + }, + [4]={ + + }, + [5]={ + + }, + [6]={ + + }, + [7]={ + + }, + [8]={ + + }, + [9]={ + + }, + [10]={ + + }, + [11]={ + + }, + [12]={ + + }, + [13]={ + + }, + [14]={ + + }, + [15]={ + + }, + [16]={ + + } +} +local config = { +data=talent,count=16 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/ko/talent.lua.meta b/lua/app/config/strings/ko/talent.lua.meta new file mode 100644 index 00000000..940cf4e4 --- /dev/null +++ b/lua/app/config/strings/ko/talent.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 0b67968e899114d6aa41f5846f69b6c1 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/pt/talent.lua b/lua/app/config/strings/pt/talent.lua new file mode 100644 index 00000000..7bed11ab --- /dev/null +++ b/lua/app/config/strings/pt/talent.lua @@ -0,0 +1,54 @@ +local talent = { + [1]={ + + }, + [2]={ + + }, + [3]={ + + }, + [4]={ + + }, + [5]={ + + }, + [6]={ + + }, + [7]={ + + }, + [8]={ + + }, + [9]={ + + }, + [10]={ + + }, + [11]={ + + }, + [12]={ + + }, + [13]={ + + }, + [14]={ + + }, + [15]={ + + }, + [16]={ + + } +} +local config = { +data=talent,count=16 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/pt/talent.lua.meta b/lua/app/config/strings/pt/talent.lua.meta new file mode 100644 index 00000000..683e2663 --- /dev/null +++ b/lua/app/config/strings/pt/talent.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 421e59937c92d465481dbee53ecf98b0 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/th/talent.lua b/lua/app/config/strings/th/talent.lua new file mode 100644 index 00000000..7bed11ab --- /dev/null +++ b/lua/app/config/strings/th/talent.lua @@ -0,0 +1,54 @@ +local talent = { + [1]={ + + }, + [2]={ + + }, + [3]={ + + }, + [4]={ + + }, + [5]={ + + }, + [6]={ + + }, + [7]={ + + }, + [8]={ + + }, + [9]={ + + }, + [10]={ + + }, + [11]={ + + }, + [12]={ + + }, + [13]={ + + }, + [14]={ + + }, + [15]={ + + }, + [16]={ + + } +} +local config = { +data=talent,count=16 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/th/talent.lua.meta b/lua/app/config/strings/th/talent.lua.meta new file mode 100644 index 00000000..07aec0b6 --- /dev/null +++ b/lua/app/config/strings/th/talent.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: ee22d1cc2eab24178bed37b6b69f8304 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/vi/talent.lua b/lua/app/config/strings/vi/talent.lua new file mode 100644 index 00000000..7bed11ab --- /dev/null +++ b/lua/app/config/strings/vi/talent.lua @@ -0,0 +1,54 @@ +local talent = { + [1]={ + + }, + [2]={ + + }, + [3]={ + + }, + [4]={ + + }, + [5]={ + + }, + [6]={ + + }, + [7]={ + + }, + [8]={ + + }, + [9]={ + + }, + [10]={ + + }, + [11]={ + + }, + [12]={ + + }, + [13]={ + + }, + [14]={ + + }, + [15]={ + + }, + [16]={ + + } +} +local config = { +data=talent,count=16 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/vi/talent.lua.meta b/lua/app/config/strings/vi/talent.lua.meta new file mode 100644 index 00000000..57bab519 --- /dev/null +++ b/lua/app/config/strings/vi/talent.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 5a954934350ec48e3b15b80d2f904a53 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/zh/talent.lua b/lua/app/config/strings/zh/talent.lua new file mode 100644 index 00000000..7bed11ab --- /dev/null +++ b/lua/app/config/strings/zh/talent.lua @@ -0,0 +1,54 @@ +local talent = { + [1]={ + + }, + [2]={ + + }, + [3]={ + + }, + [4]={ + + }, + [5]={ + + }, + [6]={ + + }, + [7]={ + + }, + [8]={ + + }, + [9]={ + + }, + [10]={ + + }, + [11]={ + + }, + [12]={ + + }, + [13]={ + + }, + [14]={ + + }, + [15]={ + + }, + [16]={ + + } +} +local config = { +data=talent,count=16 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/zh/talent.lua.meta b/lua/app/config/strings/zh/talent.lua.meta new file mode 100644 index 00000000..488c2a17 --- /dev/null +++ b/lua/app/config/strings/zh/talent.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 1383b83ac674f4d72b192a73f1ecab4e +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/global/global_const.lua b/lua/app/global/global_const.lua index a889dc5f..b1632fb1 100644 --- a/lua/app/global/global_const.lua +++ b/lua/app/global/global_const.lua @@ -223,6 +223,7 @@ GConst.ATLAS_PATH = { ICON_SKILL_ROGUE = "assets/arts/atlas/icon/skill_rogue.asset", ICON_BUFF = "assets/arts/atlas/icon/buff.asset", ICON_EQUIP = "assets/arts/atlas/icon/equip.asset", + ICON_TALENT = "assets/arts/atlas/icon/talent.asset", BOUNTY = "assets/arts/atlas/ui/bounty.asset", UI_SETTING = "assets/arts/atlas/ui/setting.asset", ICON_TASK = "assets/arts/atlas/icon/task.asset", diff --git a/lua/app/module/task/task_manager.lua b/lua/app/module/task/task_manager.lua index 09617c0f..927b7abc 100644 --- a/lua/app/module/task/task_manager.lua +++ b/lua/app/module/task/task_manager.lua @@ -16,19 +16,17 @@ function TaskManager:showTaskMainUI() UIManager:showUI("app/ui/task/task_main_ui") end -function TaskManager:refreshDailyTask(dailyTaskId) - SDKManager:showFullScreenAds(BIReport.ADS_CLICK_TYPE.TASK_DAILY_REFRESH, function() - local parmas = { - id = dailyTaskId, - } - self:sendMessage(ProtoMsgType.FromMsgEnum.TaskDailyRefreshReq, parmas, {}, self.onDailyTaskRefresh, BIReport.ITEM_GET_TYPE.TASK_DAILY_REFRESH) - end) +function TaskManager:onTaskDailyStageRewardReq(dailyTaskId) + local parmas = {} + parmas.id = 0 + parmas.type = 1 + self:sendMessage(ProtoMsgType.FromMsgEnum.TaskDailyStageRewardReq, parmas, {}, self.onTaskDailyStageRewardRsp, BIReport.ITEM_GET_TYPE.TASK_DAILY_REFRESH) end -function TaskManager:onDailyTaskRefresh(result) +function TaskManager:onTaskDailyStageRewardRsp(result) if result.err_code == GConst.ERROR_STR.SUCCESS then - if result.task then - DataManager.DailyTaskData:refreshDailyTask(result.task) + if result.task_daily then + DataManager.DailyTaskData:initDaily(result.task_daily) end end end @@ -42,8 +40,8 @@ end function TaskManager:onDailyTaskClaim(result) if result.err_code == GConst.ERROR_STR.SUCCESS then - if result.task then - DataManager.DailyTaskData:refreshDailyTask(result.task) + if result.task_daily then + DataManager.DailyTaskData:initDaily(result.task_daily) end if result.rewards then GFunc.showRewardBox(result.rewards) diff --git a/lua/app/ui/hero/hero_info_comp.lua b/lua/app/ui/hero/hero_info_comp.lua index 7ae0f5a2..b2b9d57e 100644 --- a/lua/app/ui/hero/hero_info_comp.lua +++ b/lua/app/ui/hero/hero_info_comp.lua @@ -130,7 +130,7 @@ function HeroInfoComp:refresh(checkLevel) if skillUnlcokLv > lv then -- skillLv:setText(I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_1, skillLvs[i] or 0)) skillLv:setText(I18N:getGlobalText(I18N.GlobalConst.LV_UNLOCK, skillUnlcokLv)) - skillBg:setSprite(GConst.ATLAS_PATH.ICON_SKILL_ROGUE, "frame_0") + skillBg:setSprite(GConst.ATLAS_PATH.ICON_SKILL_ROGUE, "frame_1") else if nextLvUp then skillLv:setText(nextLvUp .. "提升") diff --git a/lua/app/ui/hero/hero_skill_info_ui.lua b/lua/app/ui/hero/hero_skill_info_ui.lua index 3935f595..44cc4610 100644 --- a/lua/app/ui/hero/hero_skill_info_ui.lua +++ b/lua/app/ui/hero/hero_skill_info_ui.lua @@ -77,8 +77,7 @@ function HeroSkillInfoUI:refreshSkillIcon() self.icon:setSprite(GConst.ATLAS_PATH.ICON_SKILL_ROGUE, ModuleManager.HeroManager:getSkillRogueIcon(skillId)) if skillUnlcokLv > lv then - -- self.skillIcon:setSprite(GConst.ATLAS_PATH.ICON_SKILL_ROGUE, "frame_0") - self.skillIcon:setSprite(GConst.ATLAS_PATH.ICON_SKILL_ROGUE, "frame_0") + self.skillIcon:setSprite(GConst.ATLAS_PATH.ICON_SKILL_ROGUE, "frame_1") self.unlockTx:setText(I18N:getGlobalText(I18N.GlobalConst.LV_UNLOCK, skillUnlcokLv)) local meshProComp = self.unlockTx:getComponent(GConst.TYPEOF_UNITY_CLASS.UI_TEXT_MESH_PRO) diff --git a/lua/app/ui/talent/cell/talent_cell.lua b/lua/app/ui/talent/cell/talent_cell.lua index b29a90e8..45dde0d6 100644 --- a/lua/app/ui/talent/cell/talent_cell.lua +++ b/lua/app/ui/talent/cell/talent_cell.lua @@ -6,15 +6,14 @@ function TalentCell:init() self.bg = uiMap["talent_cell.bg"] self.descTx1 = uiMap["talent_cell.desc_tx_1"] self.descTx2 = uiMap["talent_cell.desc_tx_2"] - uiMap["talent_cell.desc_tx_1"]:setText("11111") - uiMap["talent_cell.desc_tx_2"]:setText("2222") end function TalentCell:refresh(idx, cfg) self.bg:setSprite(GConst.ATLAS_PATH.UI_TALENT, "talent_" .. idx) - self.descTx1:setText("攻击提升" .. idx) + self.descTx1:setText(I18N:getText("talent", idx, "name")) local lv = DataManager.TalentData:getLevels(idx) self.descTx2:setText("Lv." .. lv) + self.bg:setSprite(GConst.ATLAS_PATH.ICON_TALENT, "talent_" .. idx) end function TalentCell:setActive(active) diff --git a/lua/app/ui/talent/talent_main_ui.lua b/lua/app/ui/talent/talent_main_ui.lua index 30bfd9c6..2546352a 100644 --- a/lua/app/ui/talent/talent_main_ui.lua +++ b/lua/app/ui/talent/talent_main_ui.lua @@ -36,11 +36,11 @@ function TalentMainUI:onLoadRootComplete() self.descTx = uiMap["talent_ui.desc_tx"] self.upNode = uiMap["talent_ui.up_node"] self.upTalentCell = uiMap["talent_ui.up_node.talent_cell"]:addLuaComponent(TALENT_CELL) + self.upDescTx = uiMap["talent_ui.up_node.desc_tx"] self.upNode:setActive(false) - -- uiMap["talent_ui.title_tx"]:setText(I18N:getGlobalText(I18N.GlobalConst.TALENT)) - uiMap["talent_ui.title_tx"]:setText("研发中心") - uiMap["talent_ui.get_btn.text"]:setText("研发") + uiMap["talent_ui.title_tx"]:setText(I18N:getGlobalText(I18N.GlobalConst.TALENT_DESC_1)) + uiMap["talent_ui.get_btn.text"]:setText(I18N:getGlobalText(I18N.GlobalConst.TALENT_DESC_2)) self.scrollRect = uiMap["talent_ui.bottom_bg.scrollrect"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.SCROLL_RECT_BASE) self.scrollRect:addInitCallback(function() return TALENT_CELL @@ -56,7 +56,7 @@ function TalentMainUI:onLoadRootComplete() end local can, stage = DataManager.TalentData:checkStage() if not can then - GFunc.showToast("等级达到" .. stage .. "可研发") + GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.TALENT_DESC_3, stage)) return end ModuleManager.TalentManager:talentUpgrade() @@ -87,7 +87,7 @@ function TalentMainUI:onRefresh() if not DataManager.TalentData:checkStage() then self.descTx:setActive(true) - self.descTx:setText("等级达到" .. stage .. "可研发") + self.descTx:setText(I18N:getGlobalText(I18N.GlobalConst.TALENT_DESC_3, stage)) else self.descTx:setActive(false) end @@ -100,6 +100,7 @@ function TalentMainUI:onUpgrade() end self.upNode:setActive(true) self.upTalentCell:refresh(upData.id, self.list[upData.id]) + self.upDescTx:setText(I18N:getText("talent", upData.id, "desc")) end return TalentMainUI \ No newline at end of file diff --git a/lua/app/ui/task/cell/daily_task_cell.lua b/lua/app/ui/task/cell/daily_task_cell.lua index 7298aef7..6e90e306 100644 --- a/lua/app/ui/task/cell/daily_task_cell.lua +++ b/lua/app/ui/task/cell/daily_task_cell.lua @@ -14,7 +14,7 @@ function DailyTaskCell:init() if DataManager.DailyTaskData:canClaimTask(self.taskId) then ModuleManager.TaskManager:claimDailyTask(self.taskId) else - -- ModuleManager.TaskManager:goToTask(self.taskType) + ModuleManager.TaskManager:taskGoto(self.taskType) end end) end diff --git a/lua/app/ui/task/task_main_ui.lua b/lua/app/ui/task/task_main_ui.lua index 586585ea..3dd1fe57 100644 --- a/lua/app/ui/task/task_main_ui.lua +++ b/lua/app/ui/task/task_main_ui.lua @@ -166,21 +166,6 @@ function TaskMainUI:refreshDaily() local stageId = stageIds[i] if stageId then item:setActive(true) - -- item:initPrefabHelper() - -- local map = item:genAllChildren() - -- local spineBox = map["box.spine_box"] - -- local txNum = map["box.tx_num"] - - -- txNum:setText(DataManager.DailyTaskData:getStageCondition(stageId)) - - -- if DataManager.DailyTaskData:canClaimStage(stageId) then - -- spineBox:playAnim("ready", true, false, false) - -- elseif DataManager.DailyTaskData:isStageReceived(stageId) then - -- spineBox:playAnim("idle02", true, false, false) - -- else - -- spineBox:playAnim("idle01", true, false, false) - -- end - if DataManager.DailyTaskData:canClaimStage(stageId) then item:addClickListener(function() self:onClickBox() @@ -217,6 +202,7 @@ function TaskMainUI:refreshDaily() end function TaskMainUI:onClickBox() + ModuleManager.TaskManager:onTaskDailyStageRewardReq() -- local isFirst = true -- local stageIds = DataManager.DailyTaskData:getStageIds() -- for i, item in ipairs(self.boxItems) do @@ -239,8 +225,7 @@ function TaskMainUI:onClickBox() end function TaskMainUI:refreshChallenge() - -- self.titleTx:setText(I18N:getGlobalText(I18N.GlobalConst.TASK_NAME)) - self.titleTx:setText("成就") + 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 diff --git a/lua/app/userdata/task/daily_task_data.lua b/lua/app/userdata/task/daily_task_data.lua index bc5d669f..8f9edd27 100644 --- a/lua/app/userdata/task/daily_task_data.lua +++ b/lua/app/userdata/task/daily_task_data.lua @@ -21,6 +21,31 @@ function DailyTaskData:init(daily, achievement) daily = daily or {} achievement = achievement or {} + self:initDaily(daily) + self:initAchievement(achievement) + -- 跨天 + DataManager:registerCrossDayFunc("DailyTaskData", function() + -- 重置任务数据 + for id, data in pairs(self.dailyTaskData) do + data.claimed = 0 + data.progress = 0 + end + -- 重置进度奖励数据 + for id, claimed in pairs(self.progRewardData) do + self.progRewardData[id] = false + end + + self.dayPoint = 0 + self:setDirty() + end) + self.dailyRedState = nil + self.achievementRedState = nil + self:showRedPoint() +end + +function DailyTaskData:initDaily(daily) + daily = daily or {} + --任务领取状态&进度 self.dailyTaskData = daily.tasks or {} -- 活跃度 @@ -28,10 +53,6 @@ function DailyTaskData:init(daily, achievement) -- 活跃度领奖 self.progRewardData = daily.stage_reward_claimed or {} - -- 成就任务 - self.achievementData = achievement.tasks or {} - self.achievementRewardData = achievement.task_claimed_stages or {} - -- 任务配置 self.dailyTaskIds = {} for id, info in pairs(TaskDailyCfg) do @@ -52,30 +73,21 @@ function DailyTaskData:init(daily, achievement) self:addTaskProgress(info.task_type, count) end) end +end + +function DailyTaskData:initAchievement(achievement) + achievement = achievement or {} + + -- 成就任务 + 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 - -- 跨天 - DataManager:registerCrossDayFunc("DailyTaskData", function() - -- 重置任务数据 - for id, data in pairs(self.dailyTaskData) do - data.claimed = 0 - data.progress = 0 - end - -- 重置进度奖励数据 - for id, claimed in pairs(self.progRewardData) do - self.progRewardData[id] = false - end - - self.dayPoint = 0 - self:setDirty() - end) - self.dailyRedState = nil - self.achievementRedState = nil - self:showRedPoint() end function DailyTaskData:getIsOpen(showToast)