diff --git a/Assets/ManagedResources/Prefabs/UI/linglong/LingLongBaoJingPanel.prefab b/Assets/ManagedResources/Prefabs/UI/linglong/LingLongBaoJingPanel.prefab index ed7a794b9e..0fa4fa2797 100644 --- a/Assets/ManagedResources/Prefabs/UI/linglong/LingLongBaoJingPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/linglong/LingLongBaoJingPanel.prefab @@ -527,6 +527,7 @@ RectTransform: - {fileID: 2353202169348388731} - {fileID: 3410466484382140854} - {fileID: 6099078440574250546} + - {fileID: 5419786872734962102} m_Father: {fileID: 1409519540428586610} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -10459,6 +10460,85 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!1 &5505553655326093138 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5419786872734962102} + - component: {fileID: 8833994900682472880} + - component: {fileID: 4475359737430827372} + m_Layer: 5 + m_Name: time + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5419786872734962102 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5505553655326093138} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 7035216596183516586} + m_RootOrder: 5 + 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: 0, y: -466} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8833994900682472880 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5505553655326093138} + m_CullTransparentMesh: 0 +--- !u!114 &4475359737430827372 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5505553655326093138} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9716981, g: 0.9671146, b: 0.9671146, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 36 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 43 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u6D3B\u52A8\u5012\u8BA1\u65F6\uFF1A3\u592914\u5C0F\u65F6" --- !u!1 &5511033470585110241 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/linglongbaojing/LingLongBaoJingPanel.lua b/Assets/ManagedResources/~Lua/Modules/linglongbaojing/LingLongBaoJingPanel.lua index 0861132b19..de66ba4a45 100644 --- a/Assets/ManagedResources/~Lua/Modules/linglongbaojing/LingLongBaoJingPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/linglongbaojing/LingLongBaoJingPanel.lua @@ -22,7 +22,7 @@ function LingLongBaoJingPanel:InitComponent(gameObject) self.spLoader = SpriteLoader.New() self.luckyTurnPanel = Util.GetGameObject(self.gameObject,"Panel") self.mask = Util.GetGameObject(self.luckyTurnPanel,"Mask") - + self.time = Util.GetGameObject(self.luckyTurnPanel,"time"):GetComponent("Text") ---跑马灯位置(物品位置) self.itemList = {} for i = 1,2 do @@ -195,6 +195,24 @@ function LingLongBaoJingPanel:OnShow(_sortingOrder) self:DelayMaskWithTime(1.5) self:SetPropShow() --self:CreatBox() + self:SetTime() +end + +function LingLongBaoJingPanel:SetTime() + if self.timer then + self.timer:Stop() + self.timer = nil + end + local time = ActivityGiftManager.GetTaskEndTime(ActivityTypeDef.lingLongBaoJing) + local remainTime = time - GetTimeStamp() + self.time.text = TimeToDHMS(remainTime) + self.timer = Time.New(function() + remainTime = remainTime - 1 + self.time.text = TimeToDHMS(remainTime) + if remainTime <= 0 then + self:ClosePanel() + end + end,1,-1,false) end --赋值 function LingLongBaoJingPanel:RefreshTreasureType() @@ -255,6 +273,10 @@ function LingLongBaoJingPanel:OnClose() self.turnEffect:Stop() self.turnEffect = nil end + if self.timer then + self.timer:Stop() + self.timer = nil + end end ---界面销毁时调用(用于子类重写)