diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShowTeHui.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShowTeHui.lua index 41b7a9fc26..a137216876 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShowTeHui.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShowTeHui.lua @@ -151,8 +151,8 @@ function LingShowTeHui:SetTime() self.timer:Stop() self.timer = nil end - -- local endTime = ActivityGiftManager.GetTaskEndTime(ActivityTypeDef.LingShowTeHui) - local endTime = math.ceil((GetTimeStamp() - PlayerManager.ServerOpenTime)/604800)*604800 + PlayerManager.ServerOpenTime + local startTime = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.LingShowTeHui).startTime + local endTime = math.ceil((GetTimeStamp() - startTime)/604800)*604800 + startTime local timeDown = endTime - GetTimeStamp() self.time.text = Language[10470]..TimeToDHMS(timeDown) self.timer = Timer.New(function() diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua index f9afa549e0..9f7cb8664e 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua @@ -572,6 +572,8 @@ function this.InitSingleTypeData(actType) return singleTypeData end +--=====================================检测逻辑============================ + --红点检测(云游商人) function this.CheckSingleRed(data) local NeedCost = ConfigManager.GetConfigData(ConfigName.ComposeBook,data.otherData.needItems[1]).NeedCost diff --git a/Assets/ManagedResources/~Lua/Modules/TreasureStore/TreasureStoreSeason2.lua b/Assets/ManagedResources/~Lua/Modules/TreasureStore/TreasureStoreSeason2.lua index ac4dbb2edc..2626e4e888 100644 --- a/Assets/ManagedResources/~Lua/Modules/TreasureStore/TreasureStoreSeason2.lua +++ b/Assets/ManagedResources/~Lua/Modules/TreasureStore/TreasureStoreSeason2.lua @@ -45,10 +45,12 @@ end --添加事件监听(用于子类重写) function TreasureStoreSeason2:AddListener() + Game.GlobalEvent:AddEvent(GameEvent.FiveAMRefresh.ServerNotifyRefresh, self.OnShow,self) end --移除事件监听(用于子类重写) function TreasureStoreSeason2:RemoveListener() + Game.GlobalEvent:RemoveEvent(GameEvent.FiveAMRefresh.ServerNotifyRefresh, self.OnShow,self) end function TreasureStoreSeason2:OnSortingOrderChange() @@ -114,6 +116,7 @@ function TreasureStoreSeason2:ShowSingleData(_go,_data,_index) local redPoint = Util.GetGameObject(buyBtn,"redPoint") local times = Util.GetGameObject(_go,"buyInfo"):GetComponent("Text") + -- LogPink("Id:"..tostring(_data.Id).." PackId:"..tostring(_data.PackId).." progress:"..tostring(_data.progress)) title.text = _data.Name Util.SetGray(buyBtn,_data.progress == 8) Util.SetGray(redPoint,false)