From c67d731374a111a31cbaf87f81d870e2b9ddc559 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Tue, 8 Sep 2020 10:32:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A9=E5=AE=AB=E7=A7=98=E5=AE=9D=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E8=B4=AD=E4=B9=B0=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Message/Expedition_pb.lua | 26 +++++++++++++++++-- .../~Lua/Modules/Net/IndicationManager.lua | 3 +-- .../TreasureOfHeavenManager.lua | 8 ++---- 3 files changed, 27 insertions(+), 10 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Message/Expedition_pb.lua b/Assets/ManagedResources/~Lua/Message/Expedition_pb.lua index bdaf8d4322..e72aa3f850 100644 --- a/Assets/ManagedResources/~Lua/Message/Expedition_pb.lua +++ b/Assets/ManagedResources/~Lua/Message/Expedition_pb.lua @@ -64,10 +64,12 @@ TREASURESTATEINDICAION = protobuf.Descriptor(); TREASURESTATEINDICAION_SCORE_FIELD = protobuf.FieldDescriptor(); TREASURESTATEINDICAION_TREASUREREWARDSTATE_FIELD = protobuf.FieldDescriptor(); TREASURESTATEINDICAION_RESETTIME_FIELD = protobuf.FieldDescriptor(); +TREASURESTATEINDICAION_ISBUY_FIELD = protobuf.FieldDescriptor(); EXPEDITIONTREASUREINFORESPONSE = protobuf.Descriptor(); EXPEDITIONTREASUREINFORESPONSE_SCORE_FIELD = protobuf.FieldDescriptor(); EXPEDITIONTREASUREINFORESPONSE_TREASUREREWARDSTATE_FIELD = protobuf.FieldDescriptor(); EXPEDITIONTREASUREINFORESPONSE_RESETTIME_FIELD = protobuf.FieldDescriptor(); +EXPEDITIONTREASUREINFORESPONSE_ISBUY_FIELD = protobuf.FieldDescriptor(); STORENODEREQUEST = protobuf.Descriptor(); STORENODEREQUEST_NODEID_FIELD = protobuf.FieldDescriptor(); STORENODERESPONSE = protobuf.Descriptor(); @@ -630,11 +632,21 @@ TREASURESTATEINDICAION_RESETTIME_FIELD.default_value = 0 TREASURESTATEINDICAION_RESETTIME_FIELD.type = 5 TREASURESTATEINDICAION_RESETTIME_FIELD.cpp_type = 1 +TREASURESTATEINDICAION_ISBUY_FIELD.name = "isBuy" +TREASURESTATEINDICAION_ISBUY_FIELD.full_name = ".com.ljsd.jieling.protocols.TreasureStateIndicaion.isBuy" +TREASURESTATEINDICAION_ISBUY_FIELD.number = 4 +TREASURESTATEINDICAION_ISBUY_FIELD.index = 3 +TREASURESTATEINDICAION_ISBUY_FIELD.label = 1 +TREASURESTATEINDICAION_ISBUY_FIELD.has_default_value = false +TREASURESTATEINDICAION_ISBUY_FIELD.default_value = 0 +TREASURESTATEINDICAION_ISBUY_FIELD.type = 5 +TREASURESTATEINDICAION_ISBUY_FIELD.cpp_type = 1 + TREASURESTATEINDICAION.name = "TreasureStateIndicaion" TREASURESTATEINDICAION.full_name = ".com.ljsd.jieling.protocols.TreasureStateIndicaion" TREASURESTATEINDICAION.nested_types = {} TREASURESTATEINDICAION.enum_types = {} -TREASURESTATEINDICAION.fields = {TREASURESTATEINDICAION_SCORE_FIELD, TREASURESTATEINDICAION_TREASUREREWARDSTATE_FIELD, TREASURESTATEINDICAION_RESETTIME_FIELD} +TREASURESTATEINDICAION.fields = {TREASURESTATEINDICAION_SCORE_FIELD, TREASURESTATEINDICAION_TREASUREREWARDSTATE_FIELD, TREASURESTATEINDICAION_RESETTIME_FIELD, TREASURESTATEINDICAION_ISBUY_FIELD} TREASURESTATEINDICAION.is_extendable = false TREASURESTATEINDICAION.extensions = {} EXPEDITIONTREASUREINFORESPONSE_SCORE_FIELD.name = "score" @@ -668,11 +680,21 @@ EXPEDITIONTREASUREINFORESPONSE_RESETTIME_FIELD.default_value = 0 EXPEDITIONTREASUREINFORESPONSE_RESETTIME_FIELD.type = 5 EXPEDITIONTREASUREINFORESPONSE_RESETTIME_FIELD.cpp_type = 1 +EXPEDITIONTREASUREINFORESPONSE_ISBUY_FIELD.name = "isBuy" +EXPEDITIONTREASUREINFORESPONSE_ISBUY_FIELD.full_name = ".com.ljsd.jieling.protocols.ExpeditionTreasureInfoResponse.isBuy" +EXPEDITIONTREASUREINFORESPONSE_ISBUY_FIELD.number = 4 +EXPEDITIONTREASUREINFORESPONSE_ISBUY_FIELD.index = 3 +EXPEDITIONTREASUREINFORESPONSE_ISBUY_FIELD.label = 1 +EXPEDITIONTREASUREINFORESPONSE_ISBUY_FIELD.has_default_value = false +EXPEDITIONTREASUREINFORESPONSE_ISBUY_FIELD.default_value = 0 +EXPEDITIONTREASUREINFORESPONSE_ISBUY_FIELD.type = 5 +EXPEDITIONTREASUREINFORESPONSE_ISBUY_FIELD.cpp_type = 1 + EXPEDITIONTREASUREINFORESPONSE.name = "ExpeditionTreasureInfoResponse" EXPEDITIONTREASUREINFORESPONSE.full_name = ".com.ljsd.jieling.protocols.ExpeditionTreasureInfoResponse" EXPEDITIONTREASUREINFORESPONSE.nested_types = {} EXPEDITIONTREASUREINFORESPONSE.enum_types = {} -EXPEDITIONTREASUREINFORESPONSE.fields = {EXPEDITIONTREASUREINFORESPONSE_SCORE_FIELD, EXPEDITIONTREASUREINFORESPONSE_TREASUREREWARDSTATE_FIELD, EXPEDITIONTREASUREINFORESPONSE_RESETTIME_FIELD} +EXPEDITIONTREASUREINFORESPONSE.fields = {EXPEDITIONTREASUREINFORESPONSE_SCORE_FIELD, EXPEDITIONTREASUREINFORESPONSE_TREASUREREWARDSTATE_FIELD, EXPEDITIONTREASUREINFORESPONSE_RESETTIME_FIELD, EXPEDITIONTREASUREINFORESPONSE_ISBUY_FIELD} EXPEDITIONTREASUREINFORESPONSE.is_extendable = false EXPEDITIONTREASUREINFORESPONSE.extensions = {} STORENODEREQUEST_NODEID_FIELD.name = "nodeId" diff --git a/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua index 08c0affdb6..e2aa3f126c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua @@ -764,9 +764,8 @@ function this.TreasureStateIndicaion(buffer) local data = buffer:DataByte() local msg = Expedition_pb.TreasureStateIndicaion()--ExpeditionResetIndication() msg:ParseFromString(data) - -- LogGreen("msg.score :"..msg.score.." msg.resetTime:"..msg.resetTime) + -- LogGreen("msg.score :"..msg.score.." msg.resetTime:"..msg.resetTime.." msg.isBuy:"..msg.isBuy) TreasureOfHeavenManger.UpdateData(msg) - LogPink("推回来的数据长度"..#msg.treasureRewardState) end function this.GuildTranscriptIndication(buffer) diff --git a/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/TreasureOfHeavenManager.lua b/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/TreasureOfHeavenManager.lua index bc471c7762..0e78220e99 100644 --- a/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/TreasureOfHeavenManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/TreasureOfHeavenManager.lua @@ -5,14 +5,10 @@ local ConfigData = ConfigManager.GetConfig(ConfigName.WorldBossTreasureConfig) this.curScore = 0--当前分数 this.resetTime = 0--倒计时 this.rewardStateData = {}--各个任务状态数据 --- local rewardData = {}--表内活动任务数据 this.TreasrueState = nil--礼包购买状态 function this.UpdateData(msg) - -- rewardData = {} - -- for i, v in ConfigPairs(ConfigData) do - -- table.insert(rewardData, v) - -- end + if msg.score then this.curScore = msg.score end @@ -30,7 +26,7 @@ function this.UpdateData(msg) this.rewardStateData = msg.treasureRewardState end end - this.TreasrueState = OperatingManager.GetGoodsBuyTime(GoodsTypeDef.TreasureOfHeaven,106) + this.TreasrueState = OperatingManager.GetGoodsBuyTime(GoodsTypeDef.TreasureOfHeaven,106) or msg.isBuy end function this.SetTreasureState()