diff --git a/Assets/ManagedResources/~Lua/Logic/GameEvent.lua b/Assets/ManagedResources/~Lua/Logic/GameEvent.lua index 3663d9c98a..0162f1a45d 100644 --- a/Assets/ManagedResources/~Lua/Logic/GameEvent.lua +++ b/Assets/ManagedResources/~Lua/Logic/GameEvent.lua @@ -499,5 +499,6 @@ GameEvent = { QiJieShiLian = { BuySingleTreasure = "QiJieShiLian.BuySingleTreasure", CloseBuyTreasure = "QiJieShiLian.CloseBuyTreasure", + RefreshPanel = "QiJieShiLian.RefreshPanel", }, } \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua index 5ef5e10ae3..0c0ec9e919 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua @@ -142,6 +142,8 @@ function this.RegisterMessage(network) socket:RegistNetMessage(MessageTypeProto_pb.USER_TITLE_ADD_INDICATION, this.UserTitleAddIndicaiton) --是否跨服推送 socket:RegistNetMessage(MessageTypeProto_pb.IsCrossIndication, this.IsCrossIndication) + --七界试炼推送 + socket:RegistNetMessage(MessageTypeProto_pb.SevenWorldInfoIndication, this.SevenWorldInfoIndication) end --后端推送激活的称号 @@ -1012,7 +1014,9 @@ function this.SevenWorldInfoIndication(buffer) local data = buffer:DataByte() local msg = PlayerInfoProto_pb.SevenWorldInfoIndication() msg:ParseFromString(data) - QiJieShiLianManager.GetServerData(msg) + QiJieShiLianManager.GetServerData(msg,function () + Game.GlobalEvent:DispatchEvent(GameEvent.QiJieShiLian.RefreshPanel) + end) end return this \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Player/PrivilegeManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/PrivilegeManager.lua index 7b3d309478..4744fbcc81 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/PrivilegeManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/PrivilegeManager.lua @@ -12,6 +12,7 @@ function PrivilegeManager.InitPrivilegeData(data) for i = 1, #data do --[[data:从后端接受到的数据 data是个列表 列表元素的结构id与priviledge的id对应 usedTimes使用次数 endTime 有效时间]] this._PrivilegeInfoList[data[i].id] = { id = data[i].id, usedTimes = data[i].usedTimes, endTime = data[i].effectTime } + -- LogGreen(string.format("特权ID = %s, 使用了的次数 = %s, 结束时间 = %s", data[i].id, data[i].usedTimes, data[i].effectTime)) end this._PrivilegeTypeList = {} @@ -25,17 +26,17 @@ function PrivilegeManager.InitPrivilegeData(data) Game.GlobalEvent:DispatchEvent(GameEvent.Privilege.OnPrivilegeZeroUpdate) end ---刷新从后端接收的到的特权表 +--刷新从后端接收的到的特权表--零点推送用 function PrivilegeManager.FiveAMRefreshLocalData(privilegeList) this.InitPrivilegeData(privilegeList) end ---刷新从后端接收的到的特权表 +--刷新从后端接收的到的特权表--购买时用 function PrivilegeManager.OnPrivilegeUpdate(data) --LogGreen("后端特权推送:") for i = 1, #data do this._PrivilegeInfoList[data[i].id] = { id = data[i].id, usedTimes = data[i].usedTimes, endTime = data[i].effectTime } - --LogGreen(string.format("特权ID = %s, 剩余时间 = %s, 结束时间 = %s", data[i].id, data[i].usedTimes, data[i].effectTime)) + -- LogGreen(string.format("特权ID = %s, 使用了的次数 = %s, 结束时间 = %s", data[i].id, data[i].usedTimes, data[i].effectTime)) -- 发送特权解锁事件 Game.GlobalEvent:DispatchEvent(GameEvent.Privilege.OnPrivilegeUpdate, data[i].id) end diff --git a/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianManager.lua b/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianManager.lua index d020f31658..55057a42a9 100644 --- a/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianManager.lua @@ -69,13 +69,16 @@ function this.GetQiJieData() end --获取服务器信息 -function this.GetServerData(msg) +function this.GetServerData(msg,func) this.curLevelId = msg.id this.curRank = msg.ranking this.curScore = msg.integral this.curProgress = msg.totalTier this.curMaxStage = this.curMaxStage >= msg.id and this.curMaxStage or msg.id -- LogRed("id:"..tostring(msg.id).." ranking:"..tostring(msg.ranking).." integral:"..tostring(msg.integral).." totalTier:"..tostring(msg.totalTier)) + if func then + func() + end end --获取下方滑动条数据 diff --git a/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianPanel.lua b/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianPanel.lua index 9c37f57002..22d837171b 100644 --- a/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianPanel.lua @@ -141,10 +141,14 @@ end --添加事件监听(用于子类重写) function QiJieShiLianPanel:AddListener() + Game.GlobalEvent:AddEvent(GameEvent.QiJieShiLian.RefreshPanel, self.Refresh,self) + Game.GlobalEvent:AddEvent(GameEvent.Privilege.OnPrivilegeZeroUpdate, self.SetBuyTime,self) end --移除事件监听(用于子类重写) function QiJieShiLianPanel:RemoveListener() + Game.GlobalEvent:RemoveEvent(GameEvent.QiJieShiLian.RefreshPanel, self.Refresh,self) + Game.GlobalEvent:RemoveEvent(GameEvent.Privilege.OnPrivilegeZeroUpdate, self.SetBuyTime,self) end --跨服 @@ -218,7 +222,7 @@ end --设置上方信息 function QiJieShiLianPanel:SetTopBar() local text = self.qijieData.curRank > 0 and self.qijieData.curRank or "未上榜" - local text2 = self.qijieData.curScore >= 0 and self.qijieData.curRank or "0" + local text2 = self.qijieData.curScore >= 0 and self.qijieData.curScore or "0" self.info.text = string.format( "本周排名:%s 本周积分:%s",text,text2) self.name.text = string.format( "%s·%s层",self.configData.Chapter,self.configData.Stage) end