From 1e3b3c9f27b99d2c8f90defb67bf4b260ceca3ff Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Wed, 20 Oct 2021 18:31:59 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=BE=A1=E5=89=91=E8=A1=8C=E3=80=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Message/ActivityProto_pb.lua | 22 +++++++++---------- .../~Lua/Message/CommonProto_pb.lua | 13 ++++++++++- .../View/GeneralBigPopup_YuJianLastResult.lua | 2 +- .../~Lua/Modules/Main/MainPanel.lua | 2 +- .../~Lua/Modules/Net/NetManager.lua | 4 ++-- .../View/GeneralPopup_YuJianXingRecord.lua | 2 +- .../Modules/YuJianXing/YuJianXingManager.lua | 4 ++-- .../Modules/YuJianXing/YuJianXingPanel.lua | 14 +++++++----- 8 files changed, 39 insertions(+), 24 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Message/ActivityProto_pb.lua b/Assets/ManagedResources/~Lua/Message/ActivityProto_pb.lua index 6417d339d9..3f1ebecdc1 100644 --- a/Assets/ManagedResources/~Lua/Message/ActivityProto_pb.lua +++ b/Assets/ManagedResources/~Lua/Message/ActivityProto_pb.lua @@ -71,7 +71,7 @@ RIDINGSWARDACTIVITYRESPONSE_RANKID_FIELD = protobuf.FieldDescriptor(); RIDINGSWARDACTIVITYRESPONSE_BETCOUNT_FIELD = protobuf.FieldDescriptor(); RIDINGSWARDINFOREQUEST = protobuf.Descriptor(); RIDINGSWARDREWARDREQUEST = protobuf.Descriptor(); -RIDINGSWARDREWARDREQUEST_TIME_FIELD = protobuf.FieldDescriptor(); +RIDINGSWARDREWARDREQUEST_ROUND_FIELD = protobuf.FieldDescriptor(); RIDINGSWARDREWARDREQUEST_SWARDID_FIELD = protobuf.FieldDescriptor(); RIDINGSWARDREWARDRESPONSE = protobuf.Descriptor(); RIDINGSWARDREWARDRESPONSE_DROP_FIELD = protobuf.FieldDescriptor(); @@ -673,15 +673,15 @@ RIDINGSWARDINFOREQUEST.enum_types = {} RIDINGSWARDINFOREQUEST.fields = {} RIDINGSWARDINFOREQUEST.is_extendable = false RIDINGSWARDINFOREQUEST.extensions = {} -RIDINGSWARDREWARDREQUEST_TIME_FIELD.name = "time" -RIDINGSWARDREWARDREQUEST_TIME_FIELD.full_name = ".rpc.protocols.RidingSwardRewardRequest.time" -RIDINGSWARDREWARDREQUEST_TIME_FIELD.number = 1 -RIDINGSWARDREWARDREQUEST_TIME_FIELD.index = 0 -RIDINGSWARDREWARDREQUEST_TIME_FIELD.label = 1 -RIDINGSWARDREWARDREQUEST_TIME_FIELD.has_default_value = false -RIDINGSWARDREWARDREQUEST_TIME_FIELD.default_value = 0 -RIDINGSWARDREWARDREQUEST_TIME_FIELD.type = 3 -RIDINGSWARDREWARDREQUEST_TIME_FIELD.cpp_type = 2 +RIDINGSWARDREWARDREQUEST_ROUND_FIELD.name = "round" +RIDINGSWARDREWARDREQUEST_ROUND_FIELD.full_name = ".rpc.protocols.RidingSwardRewardRequest.round" +RIDINGSWARDREWARDREQUEST_ROUND_FIELD.number = 1 +RIDINGSWARDREWARDREQUEST_ROUND_FIELD.index = 0 +RIDINGSWARDREWARDREQUEST_ROUND_FIELD.label = 1 +RIDINGSWARDREWARDREQUEST_ROUND_FIELD.has_default_value = false +RIDINGSWARDREWARDREQUEST_ROUND_FIELD.default_value = 0 +RIDINGSWARDREWARDREQUEST_ROUND_FIELD.type = 5 +RIDINGSWARDREWARDREQUEST_ROUND_FIELD.cpp_type = 1 RIDINGSWARDREWARDREQUEST_SWARDID_FIELD.name = "swardId" RIDINGSWARDREWARDREQUEST_SWARDID_FIELD.full_name = ".rpc.protocols.RidingSwardRewardRequest.swardId" @@ -697,7 +697,7 @@ RIDINGSWARDREWARDREQUEST.name = "RidingSwardRewardRequest" RIDINGSWARDREWARDREQUEST.full_name = ".rpc.protocols.RidingSwardRewardRequest" RIDINGSWARDREWARDREQUEST.nested_types = {} RIDINGSWARDREWARDREQUEST.enum_types = {} -RIDINGSWARDREWARDREQUEST.fields = {RIDINGSWARDREWARDREQUEST_TIME_FIELD, RIDINGSWARDREWARDREQUEST_SWARDID_FIELD} +RIDINGSWARDREWARDREQUEST.fields = {RIDINGSWARDREWARDREQUEST_ROUND_FIELD, RIDINGSWARDREWARDREQUEST_SWARDID_FIELD} RIDINGSWARDREWARDREQUEST.is_extendable = false RIDINGSWARDREWARDREQUEST.extensions = {} RIDINGSWARDREWARDRESPONSE_DROP_FIELD.name = "drop" diff --git a/Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua b/Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua index d714c5617a..13a933fe33 100644 --- a/Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua +++ b/Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua @@ -783,6 +783,7 @@ RIDINGSWARDRECORD_COSTNUM_FIELD = protobuf.FieldDescriptor(); RIDINGSWARDRECORD_GETNUM_FIELD = protobuf.FieldDescriptor(); RIDINGSWARDRECORD_STATE_FIELD = protobuf.FieldDescriptor(); RIDINGSWARDRECORD_BETSWARDID_FIELD = protobuf.FieldDescriptor(); +RIDINGSWARDRECORD_ROUND_FIELD = protobuf.FieldDescriptor(); RIDINGSWARDBET = protobuf.Descriptor(); RIDINGSWARDBET_SWARDID_FIELD = protobuf.FieldDescriptor(); RIDINGSWARDBET_COSTNUM_FIELD = protobuf.FieldDescriptor(); @@ -8235,11 +8236,21 @@ RIDINGSWARDRECORD_BETSWARDID_FIELD.default_value = 0 RIDINGSWARDRECORD_BETSWARDID_FIELD.type = 5 RIDINGSWARDRECORD_BETSWARDID_FIELD.cpp_type = 1 +RIDINGSWARDRECORD_ROUND_FIELD.name = "round" +RIDINGSWARDRECORD_ROUND_FIELD.full_name = ".rpc.protocols.RidingSwardRecord.round" +RIDINGSWARDRECORD_ROUND_FIELD.number = 8 +RIDINGSWARDRECORD_ROUND_FIELD.index = 7 +RIDINGSWARDRECORD_ROUND_FIELD.label = 1 +RIDINGSWARDRECORD_ROUND_FIELD.has_default_value = false +RIDINGSWARDRECORD_ROUND_FIELD.default_value = 0 +RIDINGSWARDRECORD_ROUND_FIELD.type = 5 +RIDINGSWARDRECORD_ROUND_FIELD.cpp_type = 1 + RIDINGSWARDRECORD.name = "RidingSwardRecord" RIDINGSWARDRECORD.full_name = ".rpc.protocols.RidingSwardRecord" RIDINGSWARDRECORD.nested_types = {} RIDINGSWARDRECORD.enum_types = {} -RIDINGSWARDRECORD.fields = {RIDINGSWARDRECORD_TIME_FIELD, RIDINGSWARDRECORD_RESULT_FIELD, RIDINGSWARDRECORD_WINNERID_FIELD, RIDINGSWARDRECORD_COSTNUM_FIELD, RIDINGSWARDRECORD_GETNUM_FIELD, RIDINGSWARDRECORD_STATE_FIELD, RIDINGSWARDRECORD_BETSWARDID_FIELD} +RIDINGSWARDRECORD.fields = {RIDINGSWARDRECORD_TIME_FIELD, RIDINGSWARDRECORD_RESULT_FIELD, RIDINGSWARDRECORD_WINNERID_FIELD, RIDINGSWARDRECORD_COSTNUM_FIELD, RIDINGSWARDRECORD_GETNUM_FIELD, RIDINGSWARDRECORD_STATE_FIELD, RIDINGSWARDRECORD_BETSWARDID_FIELD, RIDINGSWARDRECORD_ROUND_FIELD} RIDINGSWARDRECORD.is_extendable = false RIDINGSWARDRECORD.extensions = {} RIDINGSWARDBET_SWARDID_FIELD.name = "swardId" diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YuJianLastResult.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YuJianLastResult.lua index 3d66a03ae8..58daaeac0d 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YuJianLastResult.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YuJianLastResult.lua @@ -56,7 +56,7 @@ function this:Refresh() end end end - self.roundTime.text = string.format("比赛场次: %s",TimeStampToDateStr4((YuJianXingManager.lastResult.rankTime)/1000)) + self.roundTime.text = string.format("比赛场次: %s",TimeStampToDateStr4((YuJianXingManager.lastResult.rankTime))) end) end diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index 9206521a91..3cb04f0e62 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -1055,7 +1055,7 @@ function this:TabBtnAction(id,actType,data) --检查当前活动是否开启 local id = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.YuJianXing) NetManager.RidingSwardActivityRequest(id.activityId,function() - if YuJianXingManager.curState == 1 or YuJianXingManager.curState == 2 then + if YuJianXingManager.curState ~= 0 then SwitchPanel.OpenPanel(UIName.YuJianXingPanel,nil,id) end end) diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua index fc18909282..f05a7ad026 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua @@ -5945,9 +5945,9 @@ function this.RidingSwardActivityRequest(_activityId,func) end --御剑行请求领奖 -function this.RidingSwardRewardRequest(_time,_swardId,func) +function this.RidingSwardRewardRequest(_round,_swardId,func) local data = ActivityProto_pb.RidingSwardRewardRequest() - data.time = _time + data.round = _round data.swardId = _swardId local msg = data:SerializeToString() Network:SendMessageWithCallBack(MessageTypeProto_pb.RidingSwardRewardRequest , MessageTypeProto_pb.RidingSwardRewardResponse , msg, function(buffer) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_YuJianXingRecord.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_YuJianXingRecord.lua index 731971e287..854997ed1b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_YuJianXingRecord.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_YuJianXingRecord.lua @@ -85,7 +85,7 @@ function this:SingleDataShow(go,data) -- LogPink("时间:"..tostring(TimeStampToDateStr4(data.time/1000)).." 结果:"..tostring(data.result).." 状态:"..tostring(data.state)) Util.AddOnceClick(btnGet,function () - NetManager.RidingSwardRewardRequest(data.time,data.betSwardId,function (msg) + NetManager.RidingSwardRewardRequest(data.round,data.betSwardId,function (msg) UIManager.OpenPanel(UIName.RewardItemPopup, msg.drop, 1,function () self:Refresh(false,false) CheckRedPointStatus(RedPointType.YuJianXingMian) diff --git a/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingManager.lua b/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingManager.lua index 0937daef05..7291f25052 100644 --- a/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingManager.lua @@ -50,10 +50,10 @@ end function this.UpdataServerPanelData(msg,func) this.joinCount = msg.betCount--参与投注的轮数 this.curState = msg.state--当前状态 - if msg.state == 1 then + if msg.state ~= 2 then this.InWaiting = false end - this.nextTimeCount = msg.time/1000--下一场倒计时 + this.nextTimeCount = msg.time--下一场倒计时 Log("界面剧本Id:"..tostring(msg.rankId).." 当前state:"..tostring(msg.state).." 下一阶段倒计时:"..TimeToMS(this.nextTimeCount- GetTimeStamp() ).." 模板玩家数:"..tostring(#msg.modelInfo)) this.modelList = {} this.modelList = msg.modelInfo--玩家模板信息 diff --git a/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingPanel.lua b/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingPanel.lua index bcf3cd1622..80601d6005 100644 --- a/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingPanel.lua @@ -178,6 +178,8 @@ function YuJianXingPanel:SetTime() self.nextRoundTime.text = string.format("下一轮倒计时:%s",TimeToMS(roundEnd)) elseif YuJianXingManager.curState == 2 then self.nextRoundTime.text = string.format("比赛进行中···") + elseif YuJianXingManager.curState == 3 then + self.nextRoundTime.text = string.format("活动结算中···") end self.canBetTime.text = string.format( "今日可竞猜次数:%s次",configData.JoinCount - YuJianXingManager.joinCount) self.redPoint:SetActive(YuJianXingManager.CheckRecordList()) @@ -195,8 +197,10 @@ function YuJianXingPanel:SetTime() if roundEnd <= 0 then YuJianXingManager.ReGetInfo(function () roundEnd = YuJianXingManager.nextTimeCount - GetTimeStamp() - YuJianXingManager.ReloadPlayersData(YuJianXingManager.curResultId) - self:StartAnimation() + if YuJianXingManager.curState == 2 then--一定要确认请求回来的是2才能开始不然一直请求 + YuJianXingManager.ReloadPlayersData(YuJianXingManager.curResultId) + self:StartAnimation() + end end) end elseif YuJianXingManager.curState == 2 then @@ -204,11 +208,11 @@ function YuJianXingPanel:SetTime() self.waitTime.text = string.format("倒计时:%s",TimeToMS(roundEnd)) if roundEnd <= 0 then YuJianXingManager.ReGetInfo(function () - if YuJianXingManager.curState == 1 then - self:Refresh() - end + self:Refresh() end) end + elseif YuJianXingManager.curState == 3 then + self.nextRoundTime.text = string.format("活动已结束,赛季结算中") end --活动倒计时 activityEnd = activityEnd - 1