From 2740e23e9ba02c9068e1c53175c14efb9adc60a9 Mon Sep 17 00:00:00 2001 From: puxuan <413323644@qq.com> Date: Wed, 15 Oct 2025 17:46:07 +0800 Subject: [PATCH] fix bug --- lua/app/config/attr.lua | 18 ++++++- lua/app/config/strings/cn/attr.lua | 28 ++++++++++- lua/app/config/strings/de/attr.lua | 24 +++++++++- lua/app/config/strings/en/attr.lua | 24 +++++++++- lua/app/config/strings/es/attr.lua | 24 +++++++++- lua/app/config/strings/fr/attr.lua | 24 +++++++++- lua/app/config/strings/id/attr.lua | 24 +++++++++- lua/app/config/strings/ja/attr.lua | 24 +++++++++- lua/app/config/strings/ko/attr.lua | 24 +++++++++- lua/app/config/strings/pt/attr.lua | 24 +++++++++- lua/app/config/strings/ru/attr.lua | 24 +++++++++- lua/app/config/strings/th/attr.lua | 24 +++++++++- lua/app/config/strings/vi/attr.lua | 24 +++++++++- lua/app/config/strings/zh/attr.lua | 24 +++++++++- lua/app/module/summon/summon_manager.lua | 47 +++++++++++++++++-- .../cell/side_bar_seven_day_cell.lua | 2 +- .../cell/side_bar_seven_day_cell_2.lua | 2 +- lua/app/ui/summon/cell/summon_shop_cell.lua | 2 +- lua/app/ui/summon/summon_main_ui.lua | 22 +++++---- lua/app/ui/summon/summon_shop_box_ui.lua | 12 +++-- lua/app/ui/summon/summon_shop_ui.lua | 20 +++----- lua/app/ui/talent/talent_main_ui.lua | 1 + lua/app/userdata/sign/sign_week_data.lua | 2 +- lua/app/userdata/talent/talent_data.lua | 17 ++++--- 24 files changed, 389 insertions(+), 72 deletions(-) diff --git a/lua/app/config/attr.lua b/lua/app/config/attr.lua index 9564491d..b6c8825e 100644 --- a/lua/app/config/attr.lua +++ b/lua/app/config/attr.lua @@ -461,6 +461,18 @@ local attr = { ["name"]="attr_boss_dmg", ["power"]=50, ["is_percent"]=1 + }, + [83]={ + ["id"]=83, + ["name"]="attr_normal_hurtp", + ["power"]=50, + ["is_percent"]=1 + }, + [84]={ + ["id"]=84, + ["name"]="attr_skill_hurtp", + ["power"]=50, + ["is_percent"]=1 } } local keys = { @@ -546,12 +558,14 @@ local keys = { ["dmgdec"]=attr[79], ["attr_hpp_all"]=attr[80], ["attr_monster_dmg"]=attr[81], - ["attr_boss_dmg"]=attr[82] + ["attr_boss_dmg"]=attr[82], + ["attr_normal_hurtp"]=attr[83], + ["attr_skill_hurtp"]=attr[84] } } local config = { data=attr, keys=keys, -count=82 +count=84 } return config \ No newline at end of file diff --git a/lua/app/config/strings/cn/attr.lua b/lua/app/config/strings/cn/attr.lua index 36aeb4a2..be1610de 100644 --- a/lua/app/config/strings/cn/attr.lua +++ b/lua/app/config/strings/cn/attr.lua @@ -398,6 +398,26 @@ local attr = { ["id"]=80, ["desc"]="全体生命+{0}%", ["name"]="attr_hpp_all" + }, + [81]={ + ["id"]=81, + ["desc"]="对普通怪物伤害+{0}%", + ["name"]="attr_monster_dmg" + }, + [82]={ + ["id"]=82, + ["desc"]="对首领怪物伤害+{0}%", + ["name"]="attr_boss_dmg" + }, + [83]={ + ["id"]=83, + ["desc"]="普攻伤害+{0}%", + ["name"]="attr_normal_hurtp" + }, + [84]={ + ["id"]=84, + ["desc"]="技能伤害+{0}%", + ["name"]="attr_skill_hurtp" } } local keys = { @@ -481,12 +501,16 @@ local keys = { ["attr_normal_hurt"]=attr[77], ["attr_skill_hurt"]=attr[78], ["dmgdec"]=attr[79], - ["attr_hpp_all"]=attr[80] + ["attr_hpp_all"]=attr[80], + ["attr_monster_dmg"]=attr[81], + ["attr_boss_dmg"]=attr[82], + ["attr_normal_hurtp"]=attr[83], + ["attr_skill_hurtp"]=attr[84] } } local config = { data=attr, keys=keys, -count=80 +count=84 } return config \ No newline at end of file diff --git a/lua/app/config/strings/de/attr.lua b/lua/app/config/strings/de/attr.lua index 3c62a709..ad10acc2 100644 --- a/lua/app/config/strings/de/attr.lua +++ b/lua/app/config/strings/de/attr.lua @@ -318,6 +318,22 @@ local attr = { [80]={ ["id"]=80, ["name"]="attr_hpp_all" + }, + [81]={ + ["id"]=81, + ["name"]="attr_monster_dmg" + }, + [82]={ + ["id"]=82, + ["name"]="attr_boss_dmg" + }, + [83]={ + ["id"]=83, + ["name"]="attr_normal_hurtp" + }, + [84]={ + ["id"]=84, + ["name"]="attr_skill_hurtp" } } local keys = { @@ -401,12 +417,16 @@ local keys = { ["attr_normal_hurt"]=attr[77], ["attr_skill_hurt"]=attr[78], ["dmgdec"]=attr[79], - ["attr_hpp_all"]=attr[80] + ["attr_hpp_all"]=attr[80], + ["attr_monster_dmg"]=attr[81], + ["attr_boss_dmg"]=attr[82], + ["attr_normal_hurtp"]=attr[83], + ["attr_skill_hurtp"]=attr[84] } } local config = { data=attr, keys=keys, -count=80 +count=84 } return config \ No newline at end of file diff --git a/lua/app/config/strings/en/attr.lua b/lua/app/config/strings/en/attr.lua index e7487bc5..3c764a01 100644 --- a/lua/app/config/strings/en/attr.lua +++ b/lua/app/config/strings/en/attr.lua @@ -374,6 +374,22 @@ local attr = { [80]={ ["id"]=80, ["name"]="attr_hpp_all" + }, + [81]={ + ["id"]=81, + ["name"]="attr_monster_dmg" + }, + [82]={ + ["id"]=82, + ["name"]="attr_boss_dmg" + }, + [83]={ + ["id"]=83, + ["name"]="attr_normal_hurtp" + }, + [84]={ + ["id"]=84, + ["name"]="attr_skill_hurtp" } } local keys = { @@ -457,12 +473,16 @@ local keys = { ["attr_normal_hurt"]=attr[77], ["attr_skill_hurt"]=attr[78], ["dmgdec"]=attr[79], - ["attr_hpp_all"]=attr[80] + ["attr_hpp_all"]=attr[80], + ["attr_monster_dmg"]=attr[81], + ["attr_boss_dmg"]=attr[82], + ["attr_normal_hurtp"]=attr[83], + ["attr_skill_hurtp"]=attr[84] } } local config = { data=attr, keys=keys, -count=80 +count=84 } return config \ No newline at end of file diff --git a/lua/app/config/strings/es/attr.lua b/lua/app/config/strings/es/attr.lua index e4ca3b68..a21e8192 100644 --- a/lua/app/config/strings/es/attr.lua +++ b/lua/app/config/strings/es/attr.lua @@ -374,6 +374,22 @@ local attr = { [80]={ ["id"]=80, ["name"]="attr_hpp_all" + }, + [81]={ + ["id"]=81, + ["name"]="attr_monster_dmg" + }, + [82]={ + ["id"]=82, + ["name"]="attr_boss_dmg" + }, + [83]={ + ["id"]=83, + ["name"]="attr_normal_hurtp" + }, + [84]={ + ["id"]=84, + ["name"]="attr_skill_hurtp" } } local keys = { @@ -457,12 +473,16 @@ local keys = { ["attr_normal_hurt"]=attr[77], ["attr_skill_hurt"]=attr[78], ["dmgdec"]=attr[79], - ["attr_hpp_all"]=attr[80] + ["attr_hpp_all"]=attr[80], + ["attr_monster_dmg"]=attr[81], + ["attr_boss_dmg"]=attr[82], + ["attr_normal_hurtp"]=attr[83], + ["attr_skill_hurtp"]=attr[84] } } local config = { data=attr, keys=keys, -count=80 +count=84 } return config \ No newline at end of file diff --git a/lua/app/config/strings/fr/attr.lua b/lua/app/config/strings/fr/attr.lua index 3c62a709..ad10acc2 100644 --- a/lua/app/config/strings/fr/attr.lua +++ b/lua/app/config/strings/fr/attr.lua @@ -318,6 +318,22 @@ local attr = { [80]={ ["id"]=80, ["name"]="attr_hpp_all" + }, + [81]={ + ["id"]=81, + ["name"]="attr_monster_dmg" + }, + [82]={ + ["id"]=82, + ["name"]="attr_boss_dmg" + }, + [83]={ + ["id"]=83, + ["name"]="attr_normal_hurtp" + }, + [84]={ + ["id"]=84, + ["name"]="attr_skill_hurtp" } } local keys = { @@ -401,12 +417,16 @@ local keys = { ["attr_normal_hurt"]=attr[77], ["attr_skill_hurt"]=attr[78], ["dmgdec"]=attr[79], - ["attr_hpp_all"]=attr[80] + ["attr_hpp_all"]=attr[80], + ["attr_monster_dmg"]=attr[81], + ["attr_boss_dmg"]=attr[82], + ["attr_normal_hurtp"]=attr[83], + ["attr_skill_hurtp"]=attr[84] } } local config = { data=attr, keys=keys, -count=80 +count=84 } return config \ No newline at end of file diff --git a/lua/app/config/strings/id/attr.lua b/lua/app/config/strings/id/attr.lua index adac87ad..95708ed0 100644 --- a/lua/app/config/strings/id/attr.lua +++ b/lua/app/config/strings/id/attr.lua @@ -374,6 +374,22 @@ local attr = { [80]={ ["id"]=80, ["name"]="attr_hpp_all" + }, + [81]={ + ["id"]=81, + ["name"]="attr_monster_dmg" + }, + [82]={ + ["id"]=82, + ["name"]="attr_boss_dmg" + }, + [83]={ + ["id"]=83, + ["name"]="attr_normal_hurtp" + }, + [84]={ + ["id"]=84, + ["name"]="attr_skill_hurtp" } } local keys = { @@ -457,12 +473,16 @@ local keys = { ["attr_normal_hurt"]=attr[77], ["attr_skill_hurt"]=attr[78], ["dmgdec"]=attr[79], - ["attr_hpp_all"]=attr[80] + ["attr_hpp_all"]=attr[80], + ["attr_monster_dmg"]=attr[81], + ["attr_boss_dmg"]=attr[82], + ["attr_normal_hurtp"]=attr[83], + ["attr_skill_hurtp"]=attr[84] } } local config = { data=attr, keys=keys, -count=80 +count=84 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ja/attr.lua b/lua/app/config/strings/ja/attr.lua index b573c5fc..b4f5a063 100644 --- a/lua/app/config/strings/ja/attr.lua +++ b/lua/app/config/strings/ja/attr.lua @@ -374,6 +374,22 @@ local attr = { [80]={ ["id"]=80, ["name"]="attr_hpp_all" + }, + [81]={ + ["id"]=81, + ["name"]="attr_monster_dmg" + }, + [82]={ + ["id"]=82, + ["name"]="attr_boss_dmg" + }, + [83]={ + ["id"]=83, + ["name"]="attr_normal_hurtp" + }, + [84]={ + ["id"]=84, + ["name"]="attr_skill_hurtp" } } local keys = { @@ -457,12 +473,16 @@ local keys = { ["attr_normal_hurt"]=attr[77], ["attr_skill_hurt"]=attr[78], ["dmgdec"]=attr[79], - ["attr_hpp_all"]=attr[80] + ["attr_hpp_all"]=attr[80], + ["attr_monster_dmg"]=attr[81], + ["attr_boss_dmg"]=attr[82], + ["attr_normal_hurtp"]=attr[83], + ["attr_skill_hurtp"]=attr[84] } } local config = { data=attr, keys=keys, -count=80 +count=84 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ko/attr.lua b/lua/app/config/strings/ko/attr.lua index c7735622..7cc425c4 100644 --- a/lua/app/config/strings/ko/attr.lua +++ b/lua/app/config/strings/ko/attr.lua @@ -374,6 +374,22 @@ local attr = { [80]={ ["id"]=80, ["name"]="attr_hpp_all" + }, + [81]={ + ["id"]=81, + ["name"]="attr_monster_dmg" + }, + [82]={ + ["id"]=82, + ["name"]="attr_boss_dmg" + }, + [83]={ + ["id"]=83, + ["name"]="attr_normal_hurtp" + }, + [84]={ + ["id"]=84, + ["name"]="attr_skill_hurtp" } } local keys = { @@ -457,12 +473,16 @@ local keys = { ["attr_normal_hurt"]=attr[77], ["attr_skill_hurt"]=attr[78], ["dmgdec"]=attr[79], - ["attr_hpp_all"]=attr[80] + ["attr_hpp_all"]=attr[80], + ["attr_monster_dmg"]=attr[81], + ["attr_boss_dmg"]=attr[82], + ["attr_normal_hurtp"]=attr[83], + ["attr_skill_hurtp"]=attr[84] } } local config = { data=attr, keys=keys, -count=80 +count=84 } return config \ No newline at end of file diff --git a/lua/app/config/strings/pt/attr.lua b/lua/app/config/strings/pt/attr.lua index 1c40a6da..bf430456 100644 --- a/lua/app/config/strings/pt/attr.lua +++ b/lua/app/config/strings/pt/attr.lua @@ -374,6 +374,22 @@ local attr = { [80]={ ["id"]=80, ["name"]="attr_hpp_all" + }, + [81]={ + ["id"]=81, + ["name"]="attr_monster_dmg" + }, + [82]={ + ["id"]=82, + ["name"]="attr_boss_dmg" + }, + [83]={ + ["id"]=83, + ["name"]="attr_normal_hurtp" + }, + [84]={ + ["id"]=84, + ["name"]="attr_skill_hurtp" } } local keys = { @@ -457,12 +473,16 @@ local keys = { ["attr_normal_hurt"]=attr[77], ["attr_skill_hurt"]=attr[78], ["dmgdec"]=attr[79], - ["attr_hpp_all"]=attr[80] + ["attr_hpp_all"]=attr[80], + ["attr_monster_dmg"]=attr[81], + ["attr_boss_dmg"]=attr[82], + ["attr_normal_hurtp"]=attr[83], + ["attr_skill_hurtp"]=attr[84] } } local config = { data=attr, keys=keys, -count=80 +count=84 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ru/attr.lua b/lua/app/config/strings/ru/attr.lua index 3c62a709..ad10acc2 100644 --- a/lua/app/config/strings/ru/attr.lua +++ b/lua/app/config/strings/ru/attr.lua @@ -318,6 +318,22 @@ local attr = { [80]={ ["id"]=80, ["name"]="attr_hpp_all" + }, + [81]={ + ["id"]=81, + ["name"]="attr_monster_dmg" + }, + [82]={ + ["id"]=82, + ["name"]="attr_boss_dmg" + }, + [83]={ + ["id"]=83, + ["name"]="attr_normal_hurtp" + }, + [84]={ + ["id"]=84, + ["name"]="attr_skill_hurtp" } } local keys = { @@ -401,12 +417,16 @@ local keys = { ["attr_normal_hurt"]=attr[77], ["attr_skill_hurt"]=attr[78], ["dmgdec"]=attr[79], - ["attr_hpp_all"]=attr[80] + ["attr_hpp_all"]=attr[80], + ["attr_monster_dmg"]=attr[81], + ["attr_boss_dmg"]=attr[82], + ["attr_normal_hurtp"]=attr[83], + ["attr_skill_hurtp"]=attr[84] } } local config = { data=attr, keys=keys, -count=80 +count=84 } return config \ No newline at end of file diff --git a/lua/app/config/strings/th/attr.lua b/lua/app/config/strings/th/attr.lua index 74b48fb6..b8c4362e 100644 --- a/lua/app/config/strings/th/attr.lua +++ b/lua/app/config/strings/th/attr.lua @@ -374,6 +374,22 @@ local attr = { [80]={ ["id"]=80, ["name"]="attr_hpp_all" + }, + [81]={ + ["id"]=81, + ["name"]="attr_monster_dmg" + }, + [82]={ + ["id"]=82, + ["name"]="attr_boss_dmg" + }, + [83]={ + ["id"]=83, + ["name"]="attr_normal_hurtp" + }, + [84]={ + ["id"]=84, + ["name"]="attr_skill_hurtp" } } local keys = { @@ -457,12 +473,16 @@ local keys = { ["attr_normal_hurt"]=attr[77], ["attr_skill_hurt"]=attr[78], ["dmgdec"]=attr[79], - ["attr_hpp_all"]=attr[80] + ["attr_hpp_all"]=attr[80], + ["attr_monster_dmg"]=attr[81], + ["attr_boss_dmg"]=attr[82], + ["attr_normal_hurtp"]=attr[83], + ["attr_skill_hurtp"]=attr[84] } } local config = { data=attr, keys=keys, -count=80 +count=84 } return config \ No newline at end of file diff --git a/lua/app/config/strings/vi/attr.lua b/lua/app/config/strings/vi/attr.lua index ff0df9e7..bd241d76 100644 --- a/lua/app/config/strings/vi/attr.lua +++ b/lua/app/config/strings/vi/attr.lua @@ -374,6 +374,22 @@ local attr = { [80]={ ["id"]=80, ["name"]="attr_hpp_all" + }, + [81]={ + ["id"]=81, + ["name"]="attr_monster_dmg" + }, + [82]={ + ["id"]=82, + ["name"]="attr_boss_dmg" + }, + [83]={ + ["id"]=83, + ["name"]="attr_normal_hurtp" + }, + [84]={ + ["id"]=84, + ["name"]="attr_skill_hurtp" } } local keys = { @@ -457,12 +473,16 @@ local keys = { ["attr_normal_hurt"]=attr[77], ["attr_skill_hurt"]=attr[78], ["dmgdec"]=attr[79], - ["attr_hpp_all"]=attr[80] + ["attr_hpp_all"]=attr[80], + ["attr_monster_dmg"]=attr[81], + ["attr_boss_dmg"]=attr[82], + ["attr_normal_hurtp"]=attr[83], + ["attr_skill_hurtp"]=attr[84] } } local config = { data=attr, keys=keys, -count=80 +count=84 } return config \ No newline at end of file diff --git a/lua/app/config/strings/zh/attr.lua b/lua/app/config/strings/zh/attr.lua index 67f99432..e7abb3df 100644 --- a/lua/app/config/strings/zh/attr.lua +++ b/lua/app/config/strings/zh/attr.lua @@ -374,6 +374,22 @@ local attr = { [80]={ ["id"]=80, ["name"]="attr_hpp_all" + }, + [81]={ + ["id"]=81, + ["name"]="attr_monster_dmg" + }, + [82]={ + ["id"]=82, + ["name"]="attr_boss_dmg" + }, + [83]={ + ["id"]=83, + ["name"]="attr_normal_hurtp" + }, + [84]={ + ["id"]=84, + ["name"]="attr_skill_hurtp" } } local keys = { @@ -457,12 +473,16 @@ local keys = { ["attr_normal_hurt"]=attr[77], ["attr_skill_hurt"]=attr[78], ["dmgdec"]=attr[79], - ["attr_hpp_all"]=attr[80] + ["attr_hpp_all"]=attr[80], + ["attr_monster_dmg"]=attr[81], + ["attr_boss_dmg"]=attr[82], + ["attr_normal_hurtp"]=attr[83], + ["attr_skill_hurtp"]=attr[84] } } local config = { data=attr, keys=keys, -count=80 +count=84 } return config \ No newline at end of file diff --git a/lua/app/module/summon/summon_manager.lua b/lua/app/module/summon/summon_manager.lua index 9523a096..5ba2e199 100644 --- a/lua/app/module/summon/summon_manager.lua +++ b/lua/app/module/summon/summon_manager.lua @@ -1,8 +1,4 @@ local SummonManager = class("SummonManager", BaseModule) -BIReport.EVENT_NAME_ACT_SUMMON_LOGIN = "client_act_summon_login" -BIReport.EVENT_NAME_ACT_SUMMON_UPGRADE = "client_act_summon_upgrade" -BIReport.EVENT_NAME_ACT_SUMMON_GEM = "client_act_summon_gem" -BIReport.EVENT_NAME_ACT_SUMMON_RECHARGE = "client_act_summon_recharge" -- function SummonManager:showPopUI(params) -- UIManager:showUI("app/ui/summon/summon_act_pop", params) @@ -69,7 +65,7 @@ function SummonManager:onForceSummonRsp(result) end end EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.FORCE_SUMMON, result, newHero) - -- BIReport:postForceSummon(result.reqData.free, result.reqData.times, result.rewards, result.costs) + BIReport:postForceSummon(result.reqData.free, result.reqData.times, result.rewards, result.costs) -- local params = { -- times = result.reqData.times, @@ -258,5 +254,46 @@ function BIReport:postActTask(actId, taskId, rewards) self:report(BIReport.EVENT_NAME_ACT_TASK, args) end +--@endregion + +--@region 上报 +BIReport.EVENT_NAME_ACT_SUMMON_LOGIN = "client_act_summon_login" +BIReport.EVENT_NAME_ACT_SUMMON_UPGRADE = "client_act_summon_upgrade" +BIReport.EVENT_NAME_ACT_SUMMON_GEM = "client_act_summon_gem" +BIReport.EVENT_NAME_ACT_SUMMON_RECHARGE = "client_act_summon_recharge" +BIReport.EVENT_NAME_ACT_SUMMON = "client_act_summon" -- 念力觉醒 +BIReport.EVENT_NAME_FORCE = "client_hero_opt" -- 士兵 +BIReport.ITEM_GET_TYPE.FORCE_SUMMON_SHOP_EXCHANGE = "force_summon_shop_exchange" + +BIReport.SUMMON_OP_TYPE = { + REWARD_ROUND = "RewardRound", + REWARD_ROUND_TASK = "RewardRoundTask", + REWARD_RECHARGE_TASK = "RewardRechargeTask", + SUMMON_SHOP = "SummonShop", +} + +-- 士兵召唤 +function BIReport:postForceSummon(isfree, count, rewards, costs, summonId) + local args = { + opt_type = BIReport.FORCE_OPT_TYPE.SUMMON, + free_summon = isfree, + count = count, + summon_id = summonId, + reward_str = rewards and GFunc.getRewardsStr(rewards) or nil, + cost_str = costs and GFunc.getRewardsStr(costs) or nil, + } + self:report(BIReport.EVENT_NAME_FORCE, args) +end + +function BIReport:postSummonShopExchange(optType, id, num, rewards) + local args = { + optType = optType, + shop_id = id, + exchange_num = num, + reward_str = rewards and GFunc.getRewardsStr(rewards) or nil, + } + self:report(BIReport.EVENT_NAME_ACT_SUMMON, args) +end + --@endregion return SummonManager diff --git a/lua/app/ui/main_city/cell/side_bar_seven_day_cell.lua b/lua/app/ui/main_city/cell/side_bar_seven_day_cell.lua index 861bb2e7..a278e85a 100755 --- a/lua/app/ui/main_city/cell/side_bar_seven_day_cell.lua +++ b/lua/app/ui/main_city/cell/side_bar_seven_day_cell.lua @@ -13,7 +13,7 @@ function SideBarSevenDayCell:getIsOpen() end function SideBarSevenDayCell:getSpineName() - return "ui_main_btn_shop" + return "ui_main_btn_act_sevenday" end function SideBarSevenDayCell:onClick() diff --git a/lua/app/ui/main_city/cell/side_bar_seven_day_cell_2.lua b/lua/app/ui/main_city/cell/side_bar_seven_day_cell_2.lua index c520f375..70a5c60f 100755 --- a/lua/app/ui/main_city/cell/side_bar_seven_day_cell_2.lua +++ b/lua/app/ui/main_city/cell/side_bar_seven_day_cell_2.lua @@ -13,7 +13,7 @@ function SideBarSevenDayCell2:getIsOpen() end function SideBarSevenDayCell2:getSpineName() - return "ui_main_btn_shop" + return "ui_main_btn_act_sevenday" end function SideBarSevenDayCell2:onClick() diff --git a/lua/app/ui/summon/cell/summon_shop_cell.lua b/lua/app/ui/summon/cell/summon_shop_cell.lua index 3070e76e..764909fe 100644 --- a/lua/app/ui/summon/cell/summon_shop_cell.lua +++ b/lua/app/ui/summon/cell/summon_shop_cell.lua @@ -101,7 +101,7 @@ function SummonShopCell:setCost() if haveItemNum >= costCount then self.costTx:setText(costCount) else - self.costTx:setText(""..costCount.."") + self.costTx:setText(""..costCount.."") end self.costIcon:setSprite(GFunc.getIconRes(costId)) GFunc.centerImgAndTx(self.costIcon, self.costTx, -5) diff --git a/lua/app/ui/summon/summon_main_ui.lua b/lua/app/ui/summon/summon_main_ui.lua index 793d1908..72a0ecde 100755 --- a/lua/app/ui/summon/summon_main_ui.lua +++ b/lua/app/ui/summon/summon_main_ui.lua @@ -405,6 +405,17 @@ function SummonMainUI:onSummonRsp(result, newHero) self.uiNode:setActive(true) return end + local rewards = {} + local qlt = 3 + for _, v in ipairs(result.rewards) do + local itemType = ModuleManager.ItemManager:getItemType(v.item.id) + if itemType == GConst.ItemConst.ITEM_TYPE.HERO_FRAGMENT then + local id = v.item.id + local q = DataManager.HeroData:getHeroQlt(id) + qlt = math.max(qlt, q) + table.insert(rewards, v) + end + end if self.aniSeq then self.aniSeq:Kill() self.aniSeq = nil @@ -415,19 +426,14 @@ function SummonMainUI:onSummonRsp(result, newHero) self.vfx01s[i]:setActive(false) self.vfx02s[i]:setActive(false) end - local qlt = 3 - for i, v in ipairs(result.rewards) do - local id = v.item.id - local q = DataManager.HeroData:getHeroQlt(id) - qlt = math.max(qlt, q) - end + qlt = qlt - 2 - self.summonResult = result.rewards + self.summonResult = rewards self.aniSeq = self.root:createBindTweenSequence() if self.vfxs[qlt] then self.vfxs[qlt]:setActive(true) end - self.aniSeq:AppendInterval(2) + self.aniSeq:AppendInterval(1.5) self.aniSeq:AppendCallback(function() self:showHero(1, newHero) end) diff --git a/lua/app/ui/summon/summon_shop_box_ui.lua b/lua/app/ui/summon/summon_shop_box_ui.lua index c89af19c..67d52c9c 100644 --- a/lua/app/ui/summon/summon_shop_box_ui.lua +++ b/lua/app/ui/summon/summon_shop_box_ui.lua @@ -82,7 +82,7 @@ function SummonShopBoxUI:onLoadRootComplete() self.btnClose = uiMap["summon_shop_box_ui.content.btn_close"] self.txTitle = uiMap["summon_shop_box_ui.content.tx_title"] self.infoNode = uiMap["summon_shop_box_ui.content.info_node"] - self.rewardCell = uiMap["summon_shop_box_ui.content.info_node.summon_shop_cell"]:addLuaComponent("app/ui/summon/cell/summon_shop_cell") + self.rewardCell = uiMap["summon_shop_box_ui.content.info_node.reward_cell"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.REWARD_CELL) self.txName = uiMap["summon_shop_box_ui.content.info_node.data_node.tx_name"] self.txCount = uiMap["summon_shop_box_ui.content.info_node.data_node.tx_count"] self.dataLayout = uiMap["summon_shop_box_ui.content.info_node.data_node"]:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_HORIZONTAL_OR_VERTICAL_LAYOUT) @@ -154,7 +154,7 @@ function SummonShopBoxUI:onLoadRootComplete() end function SummonShopBoxUI:onRefresh() - self.rewardCell:refresh(self.cfg, true) + self.rewardCell:refreshByConfig(self.cfg.hero) self.txCount:setText(I18N:getGlobalText(I18N.GlobalConst.ITEM_DESC_1, self.ownCount)) if self.remainingDiscount > 0 and self.discountLimit ~= nil then self.txCount:setText(I18N:getGlobalText(I18N.GlobalConst.SUMMON_DESCR_7, self.remainingDiscount, self.discountLimit)) @@ -165,8 +165,6 @@ function SummonShopBoxUI:onRefresh() end self.rewardId = GFunc.getRewardId(self.cfg.hero) self.itemType = ModuleManager.ItemManager:getItemType(self.rewardId) - - local cfg = ConfigManager:getConfig("item")[self.rewardId] self.rewards = nil -- if self.itemType == GConst.ItemConst.ITEM_TYPE.BOX_RANDOM then -- -- 随机宝箱 @@ -190,7 +188,11 @@ function SummonShopBoxUI:onRefresh() -- end if self.itemType == GConst.ItemConst.ITEM_TYPE.HERO_FRAGMENT then local heroCfg = ConfigManager:getConfig("hero")[self.rewardId] - local str = string.format("%s", GConst.QUALITY_TYPE[heroCfg.qlt], ModuleManager.ItemManager:getItemName(self.rewardId)) + local str = GFunc.colorText(GConst.QUALITY_TYPE[heroCfg.qlt], ModuleManager.ItemManager:getItemName(self.rewardId)) + self.txName:setText(str) + else + local itemCfg = ConfigManager:getConfig("item")[self.rewardId] + local str = GFunc.colorText(GConst.QUALITY_TYPE[itemCfg.qlt], ModuleManager.ItemManager:getItemName(self.rewardId)) self.txName:setText(str) end if self.rewards ~= nil then diff --git a/lua/app/ui/summon/summon_shop_ui.lua b/lua/app/ui/summon/summon_shop_ui.lua index 1ced0cf7..516ccd99 100644 --- a/lua/app/ui/summon/summon_shop_ui.lua +++ b/lua/app/ui/summon/summon_shop_ui.lua @@ -8,7 +8,7 @@ function SummonShopUI:getCurrencyParams() local params = {} params.showType = GConst.CURRENCY_TYPE.HORIZONTAL params.itemIds = { - GConst.ItemConst.ITEM_ID_GOLD, + self.shopItemId, } return params end @@ -49,15 +49,6 @@ function SummonShopUI:ctor(param) ModuleManager.SummonManager:reqSummonShopMarkUnlockTip(self.shopType) end -function SummonShopUI:currencyParams() - local params = {} - params.showType = GConst.CURRENCY_TYPE.HORIZONTAL - params.itemIds = { - self.shopItemId, - } - return params, true -end - function SummonShopUI:onLoadRootComplete() local uiMap = self.root:genAllChildren() self.btnMaskClose = uiMap["summon_shop_ui.btn_mask_close"] @@ -172,9 +163,12 @@ function SummonShopUI:_refreshScrollrect() cell:setShowType(GConst.HeroConst.PAGE_TYPE.SHOP, function() local cfg = self.shopList[index] local id = GFunc.getRewardId(cfg.hero) - if not DataManager.HeroData:getHeroIsUnlock(cfg.force_id) then - GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.SUMMON_DESCR_5)) - return + local type = ModuleManager.ItemManager:getItemType(id) + if type == GConst.ItemConst.ITEM_TYPE.HERO_FRAGMENT then + if not DataManager.HeroData:getHeroIsUnlock(cfg.force_id) then + GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.SUMMON_DESCR_5)) + return + end end ModuleManager.SummonManager:showSummonShopBoxUI(self.shopType, self.shopList[index]) end) diff --git a/lua/app/ui/talent/talent_main_ui.lua b/lua/app/ui/talent/talent_main_ui.lua index d96b0ff4..4c06206d 100644 --- a/lua/app/ui/talent/talent_main_ui.lua +++ b/lua/app/ui/talent/talent_main_ui.lua @@ -98,6 +98,7 @@ function TalentMainUI:onRefresh() else self.descTx:setActive(false) end + self.getBtn:setActive(not DataManager.TalentData:isAllMax()) end function TalentMainUI:onUpgrade() diff --git a/lua/app/userdata/sign/sign_week_data.lua b/lua/app/userdata/sign/sign_week_data.lua index d9390159..41d62805 100755 --- a/lua/app/userdata/sign/sign_week_data.lua +++ b/lua/app/userdata/sign/sign_week_data.lua @@ -263,7 +263,7 @@ function SignWeekData:getSeason() end function SignWeekData:getReSignCost() - return GFunc.getConstCost("act_bounty_buy_cost", true) + return GFunc.getConstCost("act_bounty_buy_cost") end -- 解锁高级奖励 diff --git a/lua/app/userdata/talent/talent_data.lua b/lua/app/userdata/talent/talent_data.lua index bb59f99e..1fb3f05c 100644 --- a/lua/app/userdata/talent/talent_data.lua +++ b/lua/app/userdata/talent/talent_data.lua @@ -80,15 +80,14 @@ function TalentData:getUpData() end function TalentData:isAllMax() - for id = 1, #TalentCfg do - local cfg = TalentCfg[id] - local lv = self:getLevels(id) - if lv and lv > 0 and cfg.attr then - for _, v in ipairs(cfg.attr) do - self.allAttr[v.type] = (self.allAttr[v.type] or 0) + v.num * lv - end - end - end + -- for id = 1, #TalentCfg do + -- local cfg = TalentCfg[id] + -- local lv = self:getLevels(id) + -- if not lv or lv < cfg.max_level then + -- return false + -- end + -- end + return true end --@region 属性