Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop

dev_chengFeng
jiaoyangna 2020-08-22 20:26:35 +08:00
commit 4b6fb01f41
1 changed files with 2 additions and 4 deletions

View File

@ -387,7 +387,6 @@ function this:InitComponent()
this.animRoot = Util.GetGameObject(self.gameObject, "scene")
this.btnSupreme = Util.GetGameObject(self.gameObject, "RightUp/supreme")
this.btnSupreme:SetActive(false)
this.supremeRedPoint = Util.GetGameObject(this.btnSupreme, "redPoint")
this.supremeTime = Util.GetGameObject(this.btnSupreme, "time"):GetComponent("Text")
@ -1276,8 +1275,7 @@ function this.TimeFormat()
if endTime - PlayerManager.serverTime > 0 then
-- 第一次解锁
if supremHadSet then
--this.btnSupreme:SetActive(true)
this.btnSupreme:SetActive(false)
this.btnSupreme:SetActive(true)
end
this.supremeTime.text = TimeToHMS((endTime - PlayerManager.serverTime))
supremHadSet = false
@ -1472,7 +1470,7 @@ function this.RefreshActivityBtn(context)
-- end
elseif context.type == ActivityTypeDef.SupremeHero then
if ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.SupremeHero) then
this.btnSupreme:SetActive(false)--ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.SupremeHero) > 0 and ActivityGiftManager.GetRewardState(42)~=3)
this.btnSupreme:SetActive(ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.SupremeHero) > 0 and ActivityGiftManager.GetRewardState(42)~=3)
end
elseif context.type==ActivityTypeDef.FindFairy then
this.findFairyBtn:SetActive(false)--not not ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.FindFairy))