dev_chengFeng
ZhangBiao 2020-07-28 22:05:24 +08:00
parent 8639065f06
commit 97b7118e11
2 changed files with 40 additions and 29 deletions

View File

@ -605,9 +605,9 @@ RectTransform:
m_Father: {fileID: 2004788874447248508}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 117.8, y: -38.17}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 75, y: 75}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2897918795683101123
@ -4495,9 +4495,9 @@ RectTransform:
m_Father: {fileID: 2024422538319681204}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 75, y: -83.9}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 126, y: 126}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6847444274270442713
@ -4945,7 +4945,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: 144.4, y: -1}
m_AnchoredPosition: {x: 149, y: -1}
m_SizeDelta: {x: 100, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2161802867350899703
@ -12118,9 +12118,9 @@ RectTransform:
m_Father: {fileID: 9126896743726548570}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 122, y: -38.17}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 75, y: 75}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6335965418662102153
@ -13807,7 +13807,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &4364234898477055512
RectTransform:
m_ObjectHideFlags: 0
@ -15027,9 +15027,9 @@ RectTransform:
m_Father: {fileID: 9126896743726548570}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 207.33334, y: -38.17}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 75, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7070961789110733058
@ -21235,9 +21235,9 @@ RectTransform:
m_Father: {fileID: 2024422538319681204}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 75, y: -250.20001}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 123, y: 123}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3361903088346078392
@ -26136,9 +26136,9 @@ RectTransform:
m_Father: {fileID: 2004788874447248508}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 193.55, y: -38.17}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 76.5, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &300157243682672950
@ -26529,9 +26529,9 @@ RectTransform:
m_Father: {fileID: 9126896743726548570}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 39.666668, y: -38.17}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 69, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4102564784388293894
@ -29898,9 +29898,9 @@ RectTransform:
m_Father: {fileID: 2004788874447248508}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 40.15, y: -38.17}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 80.3, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8199679755870771298

View File

@ -226,16 +226,27 @@ function QianKunBox:timeCountDown()
self.btnTime.text = TimeToHMS(timeDown)
-- self.shopData = ShopManager.GetShopDataByType(SHOP_TYPE.QIANKUNBOX_SHOP)--获取活动信息
self.shopData =ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.QianKunBox)
LogGreen(self.shopData.endTime)
self.leftUpTime.text = TimeToDH(self.shopData.endTime - PlayerManager.serverTime)--活动结束的倒计时
self.leftUpTime.text = self:TimeToDHMS(self.shopData.endTime - PlayerManager.serverTime)--活动结束的倒计时
self.timer = Timer.New(function()
self.leftUpTime.text = TimeToDH(self.shopData.endTime - PlayerManager.serverTime)
self.leftUpTime.text = self:TimeToDHMS(self.shopData.endTime - PlayerManager.serverTime)
self.btnTime.text = TimeToHMS(timeDown)
timeDown = timeDown -1
end, 1, -1, true)
self.timer:Start()
end
--- 将一段时间转换为天时分秒
function QianKunBox:TimeToDHMS(second)
local day = math.floor(second / (24 * 3600))
local minute = math.floor(second / 60) % 60
local sec = second % 60
local hour = math.floor(math.floor(second - day * 24 * 3600 - sec - minute * 60) / 3600)
if day <= 0 and hour <= 0 then
return string.format(Language[12231],minute, sec)
else
return string.format(Language[12232],day, hour)
end
end
function QianKunBox:refreshMagicNum()
local actData = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.QianKunBox)