diff --git a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua index d0fc5c61f7..bfad31755b 100644 --- a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua @@ -1177,8 +1177,10 @@ function this.CheckYunYouManRedPoint() if id and id > 0 then local str = PlayerPrefs.GetInt(PlayerManager.uid.."CommonActPage"..ActivityTypeDef.YunYouShangRen) if str == 1 then + Log("云游商人红点返回:false") return false else + Log("云游商人红点返回:true") return true end end diff --git a/Assets/ManagedResources/~Lua/Modules/Arena/ArenaMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Arena/ArenaMainPanel.lua index 62634df104..c3a40d57b3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Arena/ArenaMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Arena/ArenaMainPanel.lua @@ -172,7 +172,7 @@ function this.OpenView(index) end if logic.OnOpen then - logic:OnOpen(this.sortingOrder) + logic:OnOpen(this.sortingOrder,self) end logic.gameObject:SetActive(true) diff --git a/Assets/ManagedResources/~Lua/Modules/Arena/View/ArenaView.lua b/Assets/ManagedResources/~Lua/Modules/Arena/View/ArenaView.lua index aacccbc613..5adab41ea8 100644 --- a/Assets/ManagedResources/~Lua/Modules/Arena/View/ArenaView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Arena/View/ArenaView.lua @@ -164,9 +164,10 @@ function ArenaView:RemoveListener() end --界面打开时调用(用于子类重写) -function ArenaView:OnOpen( sortingOrder ) +function ArenaView:OnOpen( sortingOrder,_parent) this.sortingOrder = sortingOrder or 0 + this.parent = _parent this.RefreshBaseData() @@ -287,6 +288,9 @@ function this.StartCountTime() hourText.text = hour second = second -1 + if second <= 0 then + this.parent:ClosePanel() + end end _TimeUpdate() this.TimeCounter = Timer.New(_TimeUpdate, 1, -1, true)