From 1215e46af8f9a2fdaa22d8b5b273ba8d7f95660f Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Fri, 22 Oct 2021 11:21:42 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=BE=A1=E5=89=91=E8=A1=8C=E3=80=91?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E5=95=86=E5=BA=97=E8=BF=94=E5=9B=9E=E5=90=8E?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AF=B7=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Popup/GeneralPopup.prefab | 49 +++++++++++++++++-- .../~Lua/Modules/Popup/GeneralPopup.lua | 4 ++ .../Modules/YuJianXing/YuJianXingPanel.lua | 26 ++++++---- 3 files changed, 66 insertions(+), 13 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab index 9f82cf087a..7713d049d5 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab @@ -24061,10 +24061,10 @@ RectTransform: m_Father: {fileID: 4982919456788885506} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 900, y: 700} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6232789332412041360 CanvasRenderer: @@ -36610,6 +36610,7 @@ GameObject: - component: {fileID: 6057694991830095399} - component: {fileID: 5371694410511502372} - component: {fileID: 6772549543214168581} + - component: {fileID: 7356467663172722418} m_Layer: 5 m_Name: Mask m_TagString: Untagged @@ -36673,6 +36674,48 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!114 &7356467663172722418 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7211960488100845142} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 0 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 6772549543214168581} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!1 &7230858770583146748 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua index 47e8823051..cba3bb9bb9 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua @@ -118,6 +118,10 @@ function GeneralPopup:BindEvent() Game.GlobalEvent:DispatchEvent(GameEvent.Bag.OnTempBagChanged) self:ClosePanel() end) + Util.AddClick(this.Mask,function() + Game.GlobalEvent:DispatchEvent(GameEvent.Bag.OnTempBagChanged) + self:ClosePanel() + end) end function GeneralPopup:AddListener() diff --git a/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingPanel.lua b/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingPanel.lua index 76c1e705bf..83d87407a3 100644 --- a/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingPanel.lua @@ -104,21 +104,26 @@ end -- 打开,重新打开时回调 function YuJianXingPanel:OnShow() - self:MakeRequest() self.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.YuJianXing }) - if YuJianXingManager.curState == 2 then - YuJianXingManager.InWaiting = true - end - --开启地图 - YuJianXingManager.OpenMap() - self:Refresh() + self:MakeRequest(function () + if YuJianXingManager.curState == 2 then + YuJianXingManager.InWaiting = true + end + --开启地图 + YuJianXingManager.OpenMap() + self:Refresh() + end) end -function YuJianXingPanel:MakeRequest() +function YuJianXingPanel:MakeRequest(func) local id = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.YuJianXing) if id then - NetManager.RidingSwardActivityRequest(id) - NetManager.RidingSwardInfoRequest() + NetManager.RidingSwardActivityRequest(id,function () + if func then + func() + end + NetManager.RidingSwardInfoRequest() + end) end end @@ -186,6 +191,7 @@ function YuJianXingPanel:SetTime() self.canBetTime.text = string.format( "今日可竞猜次数:%s次",configData.JoinCount - YuJianXingManager.joinCount) self.redPoint:SetActive(YuJianXingManager.CheckRecordList()) self.redPointBet:SetActive((configData.JoinCount - YuJianXingManager.joinCount > 0) and (#YuJianXingManager.curBetList < 2)) + self.waitTime.text = string.format("倒计时:%s",TimeToMS(roundEnd)) self.timer = Timer.New(function () self.redPoint:SetActive(YuJianXingManager.CheckRecordList()) self.redPointBet:SetActive((configData.JoinCount - YuJianXingManager.joinCount > 0) and (#YuJianXingManager.curBetList < 2))