命石修改提交

dev_one_discount
wangzhenxing 2023-09-02 12:28:14 +08:00
parent c39a4e1fcc
commit 241fda7f84
3 changed files with 20 additions and 6 deletions

View File

@ -31,6 +31,7 @@ local activityId=0
local progresss=0 local progresss=0
local wishLv=0 local wishLv=0
local oldWarPower=0 local oldWarPower=0
local redList={}
function Gem:InitComponent() function Gem:InitComponent()
self.spLoader = SpriteLoader.New() self.spLoader = SpriteLoader.New()
if not self.playerInfoView then 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]) Util.GetGameObject(tab,"Image"):GetComponent("Image").sprite = self.spLoader:LoadSprite(_TabData[index][status])
tabLab:GetComponent("Text").text = _TabData[index].name tabLab:GetComponent("Text").text = _TabData[index].name
local red=Util.GetGameObject(tab,"Redpot") 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 end
--切换视图 --切换视图
SwitchView=function(_index) SwitchView=function(_index)
@ -259,7 +265,13 @@ function Gem:UpdatePanelData(_type)
self.gemPosList[i].icon.gameObject:SetActive(false) self.gemPosList[i].icon.gameObject:SetActive(false)
end end
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 for n, m in ipairs(self.btns) do
--存在免费次数 并且 免费>=1 并且是1按钮 --存在免费次数 并且 免费>=1 并且是1按钮
@ -550,6 +562,7 @@ function Gem:OnDestroy()
SubUIManager.Close(self.playerInfoView) SubUIManager.Close(self.playerInfoView)
self.playerInfoView = nil self.playerInfoView = nil
end end
redList={}
self.itemList = {} self.itemList = {}
self.propertyList = {} self.propertyList = {}
self.lightList = {} self.lightList = {}

View File

@ -51,8 +51,8 @@ function GemRewardInfoPanel:BindEvent()
Util.AddClick(self.btn_go,function() Util.AddClick(self.btn_go,function()
if isCan then if isCan then
LogError("actId===="..activityId.." data.missionId=="..rewardConfig.Level) LogError("actId===="..activityId.." data.missionId=="..rewardConfig.Id)
ActivityGiftManager.GetActivityRewardRequest(activityId,rewardConfig.Level,function() ActivityGiftManager.GetActivityRewardRequest(activityId,rewardConfig.Id,function()
Game.GlobalEvent:DispatchEvent(GameEvent.Gem.RefreshPanel) Game.GlobalEvent:DispatchEvent(GameEvent.Gem.RefreshPanel)
self:CheckReward() self:CheckReward()
end) end)
@ -63,11 +63,11 @@ function GemRewardInfoPanel:BindEvent()
end end
function GemRewardInfoPanel:AddListener() function GemRewardInfoPanel:AddListener()
Game.GlobalEvent:AddEvent(GameEvent.Gem.RefreshPanel, self.Refresh,self) --Game.GlobalEvent:AddEvent(GameEvent.Gem.RefreshPanel, self.Refresh,self)
end end
function GemRewardInfoPanel:RemoveListener() function GemRewardInfoPanel:RemoveListener()
Game.GlobalEvent:RemoveEvent(GameEvent.Gem.RefreshPanel, self.Refresh,self) --Game.GlobalEvent:RemoveEvent(GameEvent.Gem.RefreshPanel, self.Refresh,self)
end end

View File

@ -91,6 +91,7 @@ function Practice:InitComponent()
end end
--页签 --页签
self.tab = Util.GetGameObject(self.gameObject, "Tab") self.tab = Util.GetGameObject(self.gameObject, "Tab")
self.tab:SetActive(false)
self.btnGem = Util.GetGameObject(self.tab, "tab2") self.btnGem = Util.GetGameObject(self.tab, "tab2")
self.practice_tab = Util.GetGameObject(self.tab, "tab1/Redpot") self.practice_tab = Util.GetGameObject(self.tab, "tab1/Redpot")
self.gem_tab = Util.GetGameObject(self.tab, "tab2/Redpot") self.gem_tab = Util.GetGameObject(self.tab, "tab2/Redpot")
@ -371,7 +372,7 @@ function Practice:RefreshTabs()
num = num + 1 num = num + 1
end end
end end
self.tab:SetActive(num > 1) self.tab:SetActive(false)
end end
function Practice:RefreshMid() function Practice:RefreshMid()