diff --git a/Assets/ManagedResources/~Lua/Modules/Gem/GiftManager.lua b/Assets/ManagedResources/~Lua/Modules/Gem/GiftManager.lua index e4bb09bdf9..6d49cab1e1 100644 --- a/Assets/ManagedResources/~Lua/Modules/Gem/GiftManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Gem/GiftManager.lua @@ -39,7 +39,7 @@ function this.GetCollectLvAndNum() collect=collect+HeroManager.ReturnGiftCount() end for k, v in ConfigPairs(giftConfig) do - if collect>=v.Gift then + if if collect>=v.Gift and HarmonyManager.GetSingleAdditionsData(HarmonyAddType.AddLv).value >= v.Harmony then lv=v.Id curNum=v.Box else diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleGiftPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleGiftPanel.lua index 1e69be4e99..bb1dd51bf5 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleGiftPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleGiftPanel.lua @@ -235,7 +235,9 @@ function this.RefreshWindowData() curNum=12 maxNum=12 --end - this.lvTxt.text="收集度"..lv.."级" + --this.lvTxt.text="收集度"..lv.."级" + local giftConfig = ConfigManager.GetConfig(ConfigName.GiftConfig) + this.lvTxt.text = "伙伴共鸣" .. giftConfig[lv].Harmony .. "级" LogError("lv========="..lv.." curnum=="..curNum.." maxNum=="..maxNum) --maxNum=0 local giftDatas={} @@ -357,7 +359,9 @@ function this.SingleUpItemShow(_go,data,_index) add:SetActive(false) red:SetActive(false) lockText.gameObject:SetActive(true) - lockText.text="收集度"..lv+1 .."级解锁" + --lockText.text="收集度"..lv+1 .."级解锁" + local giftConfig = ConfigManager.GetConfig(ConfigName.GiftConfig) + lockText.text = "伙伴共鸣" .. giftConfig[lv + 1].Harmony .."级解锁" else lockObj:SetActive(false) lockText.gameObject:SetActive(false)