云梦豪礼修改提交

dev_chengFeng
yuanshuai 2022-07-20 13:32:37 +08:00
parent f3f9f7423f
commit b072429de6
2 changed files with 41 additions and 27 deletions

View File

@ -815,8 +815,8 @@ 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: 9, y: 10}
m_SizeDelta: {x: 160, y: 30}
m_AnchoredPosition: {x: 8.7, y: 4.4}
m_SizeDelta: {x: 52.39, y: 236.29}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4231328480545008571
CanvasRenderer:
@ -848,18 +848,18 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 35
m_FontSize: 33
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
m_MinSize: 0
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u6BCF\n\u65E5\n\u9650\n\u8D2D\n1\n\u6B21"
m_LineSpacing: 0.8
m_Text: "\u6BCF\u6863\u9650\u98861\u6B21"
LanguageIndex: 0
--- !u!1 &768580951169177395
GameObject:
@ -5784,7 +5784,7 @@ ParticleSystem:
--- !u!199 &2354433741197601756
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -10648,7 +10648,7 @@ ParticleSystem:
--- !u!199 &5956073811931346453
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -15494,7 +15494,7 @@ ParticleSystem:
--- !u!199 &3084721924200596586
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -20158,7 +20158,7 @@ ParticleSystem:
--- !u!199 &7219835548946671208
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -24888,7 +24888,7 @@ ParticleSystem:
--- !u!199 &4483407068625840474
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -29705,7 +29705,7 @@ ParticleSystem:
--- !u!199 &5281604567971093730
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -34371,7 +34371,7 @@ ParticleSystem:
--- !u!199 &960990334070116420
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -39041,7 +39041,7 @@ ParticleSystem:
--- !u!199 &2908334587361720478
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -44430,7 +44430,7 @@ ParticleSystem:
--- !u!199 &5267689660684975518
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -49368,7 +49368,7 @@ ParticleSystem:
--- !u!199 &502326602796470647
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -54172,7 +54172,7 @@ ParticleSystem:
--- !u!199 &7096311306230442960
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -59172,7 +59172,7 @@ ParticleSystem:
--- !u!199 &6385063830131163877
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -63940,7 +63940,7 @@ ParticleSystem:
--- !u!199 &2064444826016825663
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -68644,7 +68644,7 @@ ParticleSystem:
--- !u!199 &7345999168660669427
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -73348,7 +73348,7 @@ ParticleSystem:
--- !u!199 &6490173722387353867
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -78428,7 +78428,7 @@ ParticleSystem:
--- !u!199 &2835172599494294876
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -83389,7 +83389,7 @@ ParticleSystem:
--- !u!199 &6724645511641999293
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -88130,7 +88130,7 @@ ParticleSystem:
--- !u!199 &7612499050146219184
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}

View File

@ -139,12 +139,26 @@ function DailyRechargePanel:OnSortingOrderChange()
cursortingOrder = self.sortingOrder
end
function DailyRechargePanel:OnShow()
self.actInfo = ActivityGiftManager.GetActivityTypeInfo(self.actType)
self.title.sprite = self.spLoader:LoadSprite(self.data.title)
self.title:SetNativeSize()
self.titleText.text = self.data.tip
self.dealTipText.text = self.data.tip2
local freshTime = self.actInfo.endTime - GetTimeStamp()
local update = function()
self.dealTipText.text = Language[10023]..TimeToFelaxible(freshTime)
end
update()
self.localTimer = Timer.New(function ()
freshTime = freshTime - 1
update()
if freshTime <= 0 then
self.parent:ClosePanel()
end
end, 1, -1, true)
self.localTimer:Start()
-- self.dealTipText.text = self.data.tip2
self.actInfo = ActivityGiftManager.GetActivityTypeInfo(self.actType)
if not self.actInfo then
self:ClosePanel()
return