【御剑行】修改提交

dev_chengFeng
ZhangBiao 2021-10-20 18:31:59 +08:00
parent e420c89429
commit 1e3b3c9f27
8 changed files with 39 additions and 24 deletions

View File

@ -71,7 +71,7 @@ RIDINGSWARDACTIVITYRESPONSE_RANKID_FIELD = protobuf.FieldDescriptor();
RIDINGSWARDACTIVITYRESPONSE_BETCOUNT_FIELD = protobuf.FieldDescriptor(); RIDINGSWARDACTIVITYRESPONSE_BETCOUNT_FIELD = protobuf.FieldDescriptor();
RIDINGSWARDINFOREQUEST = protobuf.Descriptor(); RIDINGSWARDINFOREQUEST = protobuf.Descriptor();
RIDINGSWARDREWARDREQUEST = protobuf.Descriptor(); RIDINGSWARDREWARDREQUEST = protobuf.Descriptor();
RIDINGSWARDREWARDREQUEST_TIME_FIELD = protobuf.FieldDescriptor(); RIDINGSWARDREWARDREQUEST_ROUND_FIELD = protobuf.FieldDescriptor();
RIDINGSWARDREWARDREQUEST_SWARDID_FIELD = protobuf.FieldDescriptor(); RIDINGSWARDREWARDREQUEST_SWARDID_FIELD = protobuf.FieldDescriptor();
RIDINGSWARDREWARDRESPONSE = protobuf.Descriptor(); RIDINGSWARDREWARDRESPONSE = protobuf.Descriptor();
RIDINGSWARDREWARDRESPONSE_DROP_FIELD = protobuf.FieldDescriptor(); RIDINGSWARDREWARDRESPONSE_DROP_FIELD = protobuf.FieldDescriptor();
@ -673,15 +673,15 @@ RIDINGSWARDINFOREQUEST.enum_types = {}
RIDINGSWARDINFOREQUEST.fields = {} RIDINGSWARDINFOREQUEST.fields = {}
RIDINGSWARDINFOREQUEST.is_extendable = false RIDINGSWARDINFOREQUEST.is_extendable = false
RIDINGSWARDINFOREQUEST.extensions = {} RIDINGSWARDINFOREQUEST.extensions = {}
RIDINGSWARDREWARDREQUEST_TIME_FIELD.name = "time" RIDINGSWARDREWARDREQUEST_ROUND_FIELD.name = "round"
RIDINGSWARDREWARDREQUEST_TIME_FIELD.full_name = ".rpc.protocols.RidingSwardRewardRequest.time" RIDINGSWARDREWARDREQUEST_ROUND_FIELD.full_name = ".rpc.protocols.RidingSwardRewardRequest.round"
RIDINGSWARDREWARDREQUEST_TIME_FIELD.number = 1 RIDINGSWARDREWARDREQUEST_ROUND_FIELD.number = 1
RIDINGSWARDREWARDREQUEST_TIME_FIELD.index = 0 RIDINGSWARDREWARDREQUEST_ROUND_FIELD.index = 0
RIDINGSWARDREWARDREQUEST_TIME_FIELD.label = 1 RIDINGSWARDREWARDREQUEST_ROUND_FIELD.label = 1
RIDINGSWARDREWARDREQUEST_TIME_FIELD.has_default_value = false RIDINGSWARDREWARDREQUEST_ROUND_FIELD.has_default_value = false
RIDINGSWARDREWARDREQUEST_TIME_FIELD.default_value = 0 RIDINGSWARDREWARDREQUEST_ROUND_FIELD.default_value = 0
RIDINGSWARDREWARDREQUEST_TIME_FIELD.type = 3 RIDINGSWARDREWARDREQUEST_ROUND_FIELD.type = 5
RIDINGSWARDREWARDREQUEST_TIME_FIELD.cpp_type = 2 RIDINGSWARDREWARDREQUEST_ROUND_FIELD.cpp_type = 1
RIDINGSWARDREWARDREQUEST_SWARDID_FIELD.name = "swardId" RIDINGSWARDREWARDREQUEST_SWARDID_FIELD.name = "swardId"
RIDINGSWARDREWARDREQUEST_SWARDID_FIELD.full_name = ".rpc.protocols.RidingSwardRewardRequest.swardId" RIDINGSWARDREWARDREQUEST_SWARDID_FIELD.full_name = ".rpc.protocols.RidingSwardRewardRequest.swardId"
@ -697,7 +697,7 @@ RIDINGSWARDREWARDREQUEST.name = "RidingSwardRewardRequest"
RIDINGSWARDREWARDREQUEST.full_name = ".rpc.protocols.RidingSwardRewardRequest" RIDINGSWARDREWARDREQUEST.full_name = ".rpc.protocols.RidingSwardRewardRequest"
RIDINGSWARDREWARDREQUEST.nested_types = {} RIDINGSWARDREWARDREQUEST.nested_types = {}
RIDINGSWARDREWARDREQUEST.enum_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.is_extendable = false
RIDINGSWARDREWARDREQUEST.extensions = {} RIDINGSWARDREWARDREQUEST.extensions = {}
RIDINGSWARDREWARDRESPONSE_DROP_FIELD.name = "drop" RIDINGSWARDREWARDRESPONSE_DROP_FIELD.name = "drop"

View File

@ -783,6 +783,7 @@ RIDINGSWARDRECORD_COSTNUM_FIELD = protobuf.FieldDescriptor();
RIDINGSWARDRECORD_GETNUM_FIELD = protobuf.FieldDescriptor(); RIDINGSWARDRECORD_GETNUM_FIELD = protobuf.FieldDescriptor();
RIDINGSWARDRECORD_STATE_FIELD = protobuf.FieldDescriptor(); RIDINGSWARDRECORD_STATE_FIELD = protobuf.FieldDescriptor();
RIDINGSWARDRECORD_BETSWARDID_FIELD = protobuf.FieldDescriptor(); RIDINGSWARDRECORD_BETSWARDID_FIELD = protobuf.FieldDescriptor();
RIDINGSWARDRECORD_ROUND_FIELD = protobuf.FieldDescriptor();
RIDINGSWARDBET = protobuf.Descriptor(); RIDINGSWARDBET = protobuf.Descriptor();
RIDINGSWARDBET_SWARDID_FIELD = protobuf.FieldDescriptor(); RIDINGSWARDBET_SWARDID_FIELD = protobuf.FieldDescriptor();
RIDINGSWARDBET_COSTNUM_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.type = 5
RIDINGSWARDRECORD_BETSWARDID_FIELD.cpp_type = 1 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.name = "RidingSwardRecord"
RIDINGSWARDRECORD.full_name = ".rpc.protocols.RidingSwardRecord" RIDINGSWARDRECORD.full_name = ".rpc.protocols.RidingSwardRecord"
RIDINGSWARDRECORD.nested_types = {} RIDINGSWARDRECORD.nested_types = {}
RIDINGSWARDRECORD.enum_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.is_extendable = false
RIDINGSWARDRECORD.extensions = {} RIDINGSWARDRECORD.extensions = {}
RIDINGSWARDBET_SWARDID_FIELD.name = "swardId" RIDINGSWARDBET_SWARDID_FIELD.name = "swardId"

View File

@ -56,7 +56,7 @@ function this:Refresh()
end end
end 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)
end end

View File

@ -1055,7 +1055,7 @@ function this:TabBtnAction(id,actType,data)
--检查当前活动是否开启 --检查当前活动是否开启
local id = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.YuJianXing) local id = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.YuJianXing)
NetManager.RidingSwardActivityRequest(id.activityId,function() 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) SwitchPanel.OpenPanel(UIName.YuJianXingPanel,nil,id)
end end
end) end)

View File

@ -5945,9 +5945,9 @@ function this.RidingSwardActivityRequest(_activityId,func)
end end
--御剑行请求领奖 --御剑行请求领奖
function this.RidingSwardRewardRequest(_time,_swardId,func) function this.RidingSwardRewardRequest(_round,_swardId,func)
local data = ActivityProto_pb.RidingSwardRewardRequest() local data = ActivityProto_pb.RidingSwardRewardRequest()
data.time = _time data.round = _round
data.swardId = _swardId data.swardId = _swardId
local msg = data:SerializeToString() local msg = data:SerializeToString()
Network:SendMessageWithCallBack(MessageTypeProto_pb.RidingSwardRewardRequest , MessageTypeProto_pb.RidingSwardRewardResponse , msg, function(buffer) Network:SendMessageWithCallBack(MessageTypeProto_pb.RidingSwardRewardRequest , MessageTypeProto_pb.RidingSwardRewardResponse , msg, function(buffer)

View File

@ -85,7 +85,7 @@ function this:SingleDataShow(go,data)
-- LogPink("时间:"..tostring(TimeStampToDateStr4(data.time/1000)).." 结果:"..tostring(data.result).." 状态:"..tostring(data.state)) -- LogPink("时间:"..tostring(TimeStampToDateStr4(data.time/1000)).." 结果:"..tostring(data.result).." 状态:"..tostring(data.state))
Util.AddOnceClick(btnGet,function () 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 () UIManager.OpenPanel(UIName.RewardItemPopup, msg.drop, 1,function ()
self:Refresh(false,false) self:Refresh(false,false)
CheckRedPointStatus(RedPointType.YuJianXingMian) CheckRedPointStatus(RedPointType.YuJianXingMian)

View File

@ -50,10 +50,10 @@ end
function this.UpdataServerPanelData(msg,func) function this.UpdataServerPanelData(msg,func)
this.joinCount = msg.betCount--参与投注的轮数 this.joinCount = msg.betCount--参与投注的轮数
this.curState = msg.state--当前状态 this.curState = msg.state--当前状态
if msg.state == 1 then if msg.state ~= 2 then
this.InWaiting = false this.InWaiting = false
end 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)) Log("界面剧本Id:"..tostring(msg.rankId).." 当前state:"..tostring(msg.state).." 下一阶段倒计时:"..TimeToMS(this.nextTimeCount- GetTimeStamp() ).." 模板玩家数:"..tostring(#msg.modelInfo))
this.modelList = {} this.modelList = {}
this.modelList = msg.modelInfo--玩家模板信息 this.modelList = msg.modelInfo--玩家模板信息

View File

@ -178,6 +178,8 @@ function YuJianXingPanel:SetTime()
self.nextRoundTime.text = string.format("下一轮倒计时:%s",TimeToMS(roundEnd)) self.nextRoundTime.text = string.format("下一轮倒计时:%s",TimeToMS(roundEnd))
elseif YuJianXingManager.curState == 2 then elseif YuJianXingManager.curState == 2 then
self.nextRoundTime.text = string.format("比赛进行中···") self.nextRoundTime.text = string.format("比赛进行中···")
elseif YuJianXingManager.curState == 3 then
self.nextRoundTime.text = string.format("活动结算中···")
end end
self.canBetTime.text = string.format( "今日可竞猜次数:%s次",configData.JoinCount - YuJianXingManager.joinCount) self.canBetTime.text = string.format( "今日可竞猜次数:%s次",configData.JoinCount - YuJianXingManager.joinCount)
self.redPoint:SetActive(YuJianXingManager.CheckRecordList()) self.redPoint:SetActive(YuJianXingManager.CheckRecordList())
@ -195,8 +197,10 @@ function YuJianXingPanel:SetTime()
if roundEnd <= 0 then if roundEnd <= 0 then
YuJianXingManager.ReGetInfo(function () YuJianXingManager.ReGetInfo(function ()
roundEnd = YuJianXingManager.nextTimeCount - GetTimeStamp() roundEnd = YuJianXingManager.nextTimeCount - GetTimeStamp()
YuJianXingManager.ReloadPlayersData(YuJianXingManager.curResultId) if YuJianXingManager.curState == 2 then--一定要确认请求回来的是2才能开始不然一直请求
self:StartAnimation() YuJianXingManager.ReloadPlayersData(YuJianXingManager.curResultId)
self:StartAnimation()
end
end) end)
end end
elseif YuJianXingManager.curState == 2 then elseif YuJianXingManager.curState == 2 then
@ -204,11 +208,11 @@ function YuJianXingPanel:SetTime()
self.waitTime.text = string.format("倒计时:%s",TimeToMS(roundEnd)) self.waitTime.text = string.format("倒计时:%s",TimeToMS(roundEnd))
if roundEnd <= 0 then if roundEnd <= 0 then
YuJianXingManager.ReGetInfo(function () YuJianXingManager.ReGetInfo(function ()
if YuJianXingManager.curState == 1 then self:Refresh()
self:Refresh()
end
end) end)
end end
elseif YuJianXingManager.curState == 3 then
self.nextRoundTime.text = string.format("活动已结束,赛季结算中")
end end
--活动倒计时 --活动倒计时
activityEnd = activityEnd - 1 activityEnd = activityEnd - 1