diff --git a/Assets/ManagedResources/~Lua/Modules/Gem/GemPanel.lua b/Assets/ManagedResources/~Lua/Modules/Gem/GemPanel.lua index b8c59bb08b..7837ab565e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Gem/GemPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Gem/GemPanel.lua @@ -31,6 +31,7 @@ local activityId=0 local progresss=0 local wishLv=0 local oldWarPower=0 +local redList={} function Gem:InitComponent() self.spLoader = SpriteLoader.New() if not self.playerInfoView then @@ -77,7 +78,12 @@ function Gem:InitComponent() Util.GetGameObject(tab,"Image"):GetComponent("Image").sprite = self.spLoader:LoadSprite(_TabData[index][status]) tabLab:GetComponent("Text").text = _TabData[index].name local red=Util.GetGameObject(tab,"Redpot") - red:SetActive(ActivityGiftManager.GetActivityInfo(ActivityTypeDef.shuaChongTeQuan,_TabData[index].id).state==1) + if index==2 then + red:SetActive(GemNewManager.CheckGemRed()) + elseif index==3 then + red:SetActive(GemNewManager.CheckSuperGemRed()) + end + redList[index]=red end --切换视图 SwitchView=function(_index) @@ -259,7 +265,13 @@ function Gem:UpdatePanelData(_type) self.gemPosList[i].icon.gameObject:SetActive(false) end end + + if _type==1 then + redList[_type+1]:SetActive(GemNewManager.CheckGemRed()) + elseif _type==2 then + redList[_type+1]:SetActive(GemNewManager.CheckSuperGemRed()) + end --按钮赋值 for n, m in ipairs(self.btns) do --存在免费次数 并且 免费>=1 并且是1按钮 @@ -550,6 +562,7 @@ function Gem:OnDestroy() SubUIManager.Close(self.playerInfoView) self.playerInfoView = nil end + redList={} self.itemList = {} self.propertyList = {} self.lightList = {} diff --git a/Assets/ManagedResources/~Lua/Modules/Gem/GemRewardInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/Gem/GemRewardInfoPanel.lua index 821e28e671..6b580a4095 100644 --- a/Assets/ManagedResources/~Lua/Modules/Gem/GemRewardInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Gem/GemRewardInfoPanel.lua @@ -51,8 +51,8 @@ function GemRewardInfoPanel:BindEvent() Util.AddClick(self.btn_go,function() if isCan then - LogError("actId===="..activityId.." data.missionId=="..rewardConfig.Level) - ActivityGiftManager.GetActivityRewardRequest(activityId,rewardConfig.Level,function() + LogError("actId===="..activityId.." data.missionId=="..rewardConfig.Id) + ActivityGiftManager.GetActivityRewardRequest(activityId,rewardConfig.Id,function() Game.GlobalEvent:DispatchEvent(GameEvent.Gem.RefreshPanel) self:CheckReward() end) @@ -63,11 +63,11 @@ function GemRewardInfoPanel:BindEvent() end function GemRewardInfoPanel:AddListener() - Game.GlobalEvent:AddEvent(GameEvent.Gem.RefreshPanel, self.Refresh,self) + --Game.GlobalEvent:AddEvent(GameEvent.Gem.RefreshPanel, self.Refresh,self) end function GemRewardInfoPanel:RemoveListener() - Game.GlobalEvent:RemoveEvent(GameEvent.Gem.RefreshPanel, self.Refresh,self) + --Game.GlobalEvent:RemoveEvent(GameEvent.Gem.RefreshPanel, self.Refresh,self) end diff --git a/Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua b/Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua index 0a50aa20af..a859f893c0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua @@ -91,6 +91,7 @@ function Practice:InitComponent() end --页签 self.tab = Util.GetGameObject(self.gameObject, "Tab") + self.tab:SetActive(false) self.btnGem = Util.GetGameObject(self.tab, "tab2") self.practice_tab = Util.GetGameObject(self.tab, "tab1/Redpot") self.gem_tab = Util.GetGameObject(self.tab, "tab2/Redpot") @@ -371,7 +372,7 @@ function Practice:RefreshTabs() num = num + 1 end end - self.tab:SetActive(num > 1) + self.tab:SetActive(false) end function Practice:RefreshMid()