From 034d727a6f5a6a8a691e26b3ad2466033afd7098 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Mon, 18 Oct 2021 11:32:06 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=BE=A1=E5=89=91=E8=A1=8C=E3=80=91?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/YuJianXing/YuJianXingManager.lua | 8 +++----- .../~Lua/Modules/YuJianXing/YuJianXingPanel.lua | 12 ++++++++++-- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingManager.lua b/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingManager.lua index 2cc2e5ff54..0937daef05 100644 --- a/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingManager.lua @@ -57,13 +57,9 @@ function this.UpdataServerPanelData(msg,func) Log("界面剧本Id:"..tostring(msg.rankId).." 当前state:"..tostring(msg.state).." 下一阶段倒计时:"..TimeToMS(this.nextTimeCount- GetTimeStamp() ).." 模板玩家数:"..tostring(#msg.modelInfo)) this.modelList = {} this.modelList = msg.modelInfo--玩家模板信息 - -- for i = 1, #this.modelList do - -- Log("玩家姓名:"..tostring(this.modelList[i].name).." 性别:"..tostring(this.modelList[i].sex)) - -- end this.activityTimeCount = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.YuJianXing).endTime this.curResultId = {} this.curResultId = msg.rankId - -- Log("界面剧本Id:"..tostring(msg.rankId)) Game.GlobalEvent:DispatchEvent(GameEvent.YuJianXing.UpdateRank) if func then func() @@ -161,7 +157,9 @@ function this.MakeRequest() local id = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.YuJianXing) if id then NetManager.RidingSwardActivityRequest(id) - NetManager.RidingSwardInfoRequest() + NetManager.RidingSwardInfoRequest(function () + CheckRedPointStatus(RedPointType.YuJianXingMian) + end) end end diff --git a/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingPanel.lua b/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingPanel.lua index 05177f81bd..bcf3cd1622 100644 --- a/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingPanel.lua @@ -169,7 +169,11 @@ function YuJianXingPanel:SetTime() end local activityEnd = YuJianXingManager.activityTimeCount - GetTimeStamp() local roundEnd = YuJianXingManager.nextTimeCount - GetTimeStamp() - self.curActTime.text = string.format("本期活动倒计时:%s",TimeToDHM(activityEnd)) + if activityEnd > 86400 then + self.curActTime.text = string.format("本期活动倒计时:%s",TimeToDHM(activityEnd)) + else + self.curActTime.text = string.format("本期活动倒计时:%s",TimeToHMS(activityEnd)) + end if YuJianXingManager.curState == 1 then self.nextRoundTime.text = string.format("下一轮倒计时:%s",TimeToMS(roundEnd)) elseif YuJianXingManager.curState == 2 then @@ -208,7 +212,11 @@ function YuJianXingPanel:SetTime() end --活动倒计时 activityEnd = activityEnd - 1 - self.curActTime.text = string.format("本期活动倒计时:%s",TimeToDHM(activityEnd)) + if activityEnd > 86400 then + self.curActTime.text = string.format("本期活动倒计时:%s",TimeToDHM(activityEnd)) + else + self.curActTime.text = string.format("本期活动倒计时:%s",TimeToHMS(activityEnd)) + end self.canBetTime.text = string.format( "今日可竞猜次数:%s次",configData.JoinCount - YuJianXingManager.joinCount) if activityEnd <= 0 then self:ClosePanel()