1

Assets/ManagedResources/~Lua/Modules/Gem/GiftManager.lua

@@ -53,10 +53,10 @@ end
 
 --获取收取等级和最大数量
 function this.GetHeroGiftBoxNum(dynamicId)
-    local list = GiftManager.GetHeroGifts(dynamicId)
+    LogError("ffffffffffffffff"..tostring(#HeroManager.GetAllHeroDatasByStar(13)))
-    local maxNum = #list
+    local maxNum = 0
     for k, v in ConfigPairs(giftConfig) do
-        if v.Harmony <= PowerCenterManager.allData.level and v.Box > maxNum then
+        if v.Harmony <= #HeroManager.GetAllHeroDatasByStar(13) and v.Box > maxNum then
             maxNum = v.Box
         end
     end

Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua

@@ -78,14 +78,14 @@ function RewardEquipSingleShowPopup2:BindEvent()
             heroId = self.curHeroData.dynamicId
             local list = GiftManager.GetHeroGifts(heroId)
             if #list >= 12 then
-                PopupTipPanel.ShowTip("礼物数量已达上限！")
+                PopupTipPanel.ShowTip(GetLanguageStrById(16010123))
                 return
             end
         else
             heroId = "0"
             local list = GiftManager.GetPlayerGifts()
             if #list >= 12 then
-                PopupTipPanel.ShowTip("礼物数量已达上限！")
+                PopupTipPanel.ShowTip(GetLanguageStrById(16010123))
                 return
             end
         end

Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleGiftPanel.lua

@@ -122,7 +122,7 @@ function RoleGiftPanel:BindEvent()
     --礼物获取
     Util.AddClick(this.gainChipBtn, function()
         --UIManager.OpenPanel(UIName.ReconnaissancePanel)
-        UIManager.OpenPanel(UIName.DailyCarbonPanel,6)
+        UIManager.OpenPanel(UIName.DailyCarbonPanel, 6)
     end)
     Util.AddClick(this.collectImg.gameObject, function()
         -- local data = {}
@@ -259,12 +259,15 @@ function this.RefreshWindowData()
     this.force.text = ""
     --显示上面赠送的
     local list = GiftManager.GetHeroGifts(curHeroData.dynamicId)
-    maxNum = GiftManager.GetHeroGiftBoxNum(curHeroData.dynamicId)
+    curNum = GiftManager.GetHeroGiftBoxNum(curHeroData.dynamicId)
     --if #list>=50 then
     --curNum=#list+6
     --maxNum=#list+6
     --else
-    curNum = maxNum
+    maxNum = curNum + 1
+    if maxNum > 12 then
+        maxNum = 12
+    end
     --maxNum = 12
     --end
     --this.lvTxt.text = "收集度" .. lv .. "级"
@@ -467,7 +470,7 @@ function this.SingleUpItemShow(_go, data, _index)
             add:SetActive(false)
             red:SetActive(false)
             lockText.gameObject:SetActive(true)
-            lockText.text = "收集度" .. lv + 1 .. "级解锁"
+            lockText.text = GetLanguageStrById(16010122)
         else
             lockObj:SetActive(false)
             lockText.gameObject:SetActive(false)
@@ -646,15 +649,15 @@ if not itemConfig[_itemData.id] then
             if curHeroData then
                 heroId = curHeroData.dynamicId
                 local list = GiftManager.GetHeroGifts(heroId)
-                if #list >= 12 then
+                if #list >= curNum then
-                    PopupTipPanel.ShowTip("礼物数量已达上限！")
+                    PopupTipPanel.ShowTip(GetLanguageStrById(16010123))
                     return
                 end
             else
                 heroId = "0"
                 local list = GiftManager.GetPlayerGifts()
                 if #list >= 12 then
-                    PopupTipPanel.ShowTip("礼物数量已达上限！")
+                    PopupTipPanel.ShowTip(GetLanguageStrById(16010123))
                     return
                 end
             end

Assets/ManagedResources/~Lua/Modules/TreasureStore/TreasureStorePopup.lua

@@ -76,6 +76,7 @@ function TreasureStorePopup:RefreshPanel()
     if not curActId then
         return
     end
+    LogError("sssssssssssssssssssssssssssssssss"..tostring(curActId))
     Util.GetGameObject(this.gameObject, "Panel/Bg/Image/Text"):GetComponent("Text").text = GetLanguageStrById(GlobalActivity[curActId].ExpertDec)
     local data = GlobalActivity[curActId].CanBuyRechargeId
     for i = 1, #data do