From 39dbd3f640a726bbf8747b86929c092b97c39d7f Mon Sep 17 00:00:00 2001
From: jiaoyangna <3046463818@qq.com>
Date: Thu, 29 Oct 2020 14:12:51 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=8D=E9=81=A5=E6=B8=B8=E5=B9=B8=E8=BF=90?=
 =?UTF-8?q?=E8=BD=AC=E7=9B=98=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../XiaoYao/XiaoYaoLuckyTurnTablePopup.prefab | 75 +++++++++++++++++++
 .../XiaoYao/XiaoYaoLuckyTurnTablePopup.lua    |  4 +
 2 files changed, 79 insertions(+)

diff --git a/Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoYaoLuckyTurnTablePopup.prefab b/Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoYaoLuckyTurnTablePopup.prefab
index 8c685d28c4..350a001a59 100644
--- a/Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoYaoLuckyTurnTablePopup.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoYaoLuckyTurnTablePopup.prefab
@@ -1698,6 +1698,7 @@ RectTransform:
   m_Children:
   - {fileID: 1605244553304635213}
   - {fileID: 7105179177489773337}
+  - {fileID: 8006021775005312328}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -3121,6 +3122,80 @@ MonoBehaviour:
   m_FillClockwise: 1
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
+--- !u!1 &7178634522479208337
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8006021775005312328}
+  - component: {fileID: 7289734732610662918}
+  - component: {fileID: 7740047203533558380}
+  m_Layer: 5
+  m_Name: btnMsk
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8006021775005312328
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7178634522479208337}
+  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: 559604980634051669}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7289734732610662918
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7178634522479208337}
+  m_CullTransparentMesh: 0
+--- !u!114 &7740047203533558380
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7178634522479208337}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 0}
+  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_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
 --- !u!1 &7217988487555737252
 GameObject:
   m_ObjectHideFlags: 0
diff --git a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoLuckyTurnTablePopup.lua b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoLuckyTurnTablePopup.lua
index 19f501dff7..97e2d4583d 100644
--- a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoLuckyTurnTablePopup.lua
+++ b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoLuckyTurnTablePopup.lua
@@ -23,6 +23,7 @@ function XiaoYaoLuckyTurnTablePopup:InitComponent()
     for i = 1, this.itemsLayout.transform.childCount do
         _itemsList[i] = Util.GetGameObject(self.transform, "Panel/items/GameObject"..i)
     end
+    this.mask = Util.GetGameObject(self.transform, "btnMsk")
 end
 
 function XiaoYaoLuckyTurnTablePopup:BindEvent()
@@ -31,6 +32,7 @@ function XiaoYaoLuckyTurnTablePopup:BindEvent()
     end)
     Util.AddOnceClick(this.btn,function()
         this.btn:GetComponent("Button").interactable = false
+        this.mask:SetActive(true)
         XiaoYaoManager.GameOperate(function(msg)
             --转起来
             LogGreen("msg.location:"..msg.location.. "  msg.drop.itemlist[1].itemId: "..msg.drop.itemlist[1].itemId.."  msg.drop.itemlist[1].itemNum: "..msg.drop.itemlist[1].itemNum )
@@ -56,6 +58,7 @@ function XiaoYaoLuckyTurnTablePopup:OnOpen(...)
     this.titleText.text = "幸运转盘"
 end
 function XiaoYaoLuckyTurnTablePopup:OnShow()
+    this.mask:SetActive(false)
     this.remainTimes.text = "剩余次数："..XiaoYaoManager.luckyluckyTurnTableTimes
     if XiaoYaoManager.luckyluckyTurnTableTimes < 1 or XiaoYaoManager.luckyluckyTurnTableRemainTime - PlayerManager.serverTime < 1 then
         this:ClosePanel()
@@ -136,6 +139,7 @@ function  XiaoYaoLuckyTurnTablePopup:tableTurnEffect(speed,itemId)
                 local data = TrialMiniGameManager.IdToNameIconNum(id,num)
                 this.btn:GetComponent("Button").interactable = true
                 PopupTipPanel.ShowColorTip(data[1],data[2],data[3]) 
+                this.mask:SetActive(false)
                 this:OnShow()
             end, 1,1,true):Start()
         end