【战力冲刺】提交

dev_chengFeng
张彪 2022-02-18 17:02:27 +08:00
parent 05b9c3afa5
commit b51c7b7780
4 changed files with 35 additions and 5 deletions

View File

@ -3656,7 +3656,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 405, y: 27}
m_AnchoredPosition: {x: 369, y: 37}
m_SizeDelta: {x: 186, y: 86}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5006147964805573017

View File

@ -139,6 +139,9 @@ function this.InitActivityServerData(msg, isUpdate)
this.CheckMoneyProgress(v)
this.mission[v.activityId] = v
LogYellow("刷新活动数据activityId" .. v.activityId .. " value" .. v.value)
if v.endTime and v.endTime > 0 then
LogYellow(" 结束日期:"..TimeStampToDateStr4(v.endTime))
end
for n, m in ipairs(v.mission) do
-- LogGreen(" 刷新活动数据missionId" .. m.missionId .. " state" .. m.state .. " progress" .. m.progress)
if (v.activityId == ActivityTypeDef.OnlineGift) then

View File

@ -12,6 +12,7 @@ local GlobalActConfig = ConfigManager.GetConfig(ConfigName.GlobalActivity)
local ActGroupsConfig = ConfigManager.GetConfig(ConfigName.ActivityGroups)
local shopItemConfig = ConfigManager.GetConfig(ConfigName.StoreConfig)
local GlobalSysConfig = ConfigManager.GetConfig(ConfigName.GlobalSystemConfig)
local GlobalActConfig = ConfigManager.GetConfig(ConfigName.GlobalActivity)
--示意图轮回放
local imageList = {}
-- 主界面需要隐藏的功能
@ -1433,6 +1434,25 @@ function this.TimeFormat()
else
showTab = false
end
elseif v.ActId == 9701 then
local ActData = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.PowerRice)
if ActData then
local GapTime = GlobalActConfig[ActData.activityId].GapTime*86400
local leftTime = ActData.endTime - GetTimeStamp()
activityTabs[k].timeText.transform.parent.gameObject:SetActive(leftTime > GapTime)
if ActData.endTime - GetTimeStamp() > 0 then
showTab = true
if leftTime > GapTime then
leftTime = leftTime - GapTime
end
activityTabs[k].timeText.text = TimeToFelaxible(leftTime)
else
showTab = false
end
else
showTab = false
end
elseif v.ShowTime == 1 and activityTabs[k].go.gameObject.activeSelf then
if v.ActiveType > 0 then
local QingLong = ActivityGiftManager.IsActivityTypeOpen(v.ActiveType)

View File

@ -1,5 +1,6 @@
require("Base/BasePanel")
local PowerRice = Inherit(BasePanel)
local globalActConfig = ConfigManager.GetConfig(ConfigName.GlobalActivity)
local this = PowerRice
local STATE = {
[0] = {Img = "s_slbz_1anniuhuangse",text = Language[11948]},
@ -132,10 +133,9 @@ function PowerRice:Refresh(_curIndex,isTop,isAni)
RankingManager.InitData(RANK_TYPE.POWER_RICE,function ()
local allRankData,myRankData = RankingManager.GetRankingInfo()
LogPink("myRankData.rank:"..tostring(myRankData.rank))
self.myRank = myRankData.rank
PowerRice:SetRewards2(isTop,isAni)
end,self.actData.activityId)
end,0)
end
PowerRice:SetTime()
@ -259,10 +259,17 @@ function PowerRice:SetTime()
self.timer = nil
end
local time =self.actData.endTime - GetTimeStamp()
self.leftTime.text = string.format(Language[10512].."%s",TimeToFelaxible(time))
local gapTime = globalActConfig[self.actData.activityId].GapTime*86400
local text = Language[10512]
if time > gapTime then
time = time - gapTime
else
text = "活动关闭时间:"
end
self.leftTime.text = string.format("%s%s",text,TimeToFelaxible(time))
self.timer = Timer.New(function ()
time = time - 1
self.leftTime.text = string.format(Language[10512].."%s",TimeToFelaxible(time))
self.leftTime.text = string.format("%s%s",text,TimeToFelaxible(time))
if time <= 0 then
self:ClosePanel()
end