From 05358f15f5270d9ef8f3aa980efc117e2be1866c Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Fri, 16 Jul 2021 17:52:33 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8E=B2=E7=8F=91=E5=AE=9D=E9=95=9C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/linglong/LingLongBaoJingPanel.prefab | 18 +++++++++--------- .../linglongbaojing/LingLongBaoJingPanel.lua | 10 +++++++--- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/linglong/LingLongBaoJingPanel.prefab b/Assets/ManagedResources/Prefabs/UI/linglong/LingLongBaoJingPanel.prefab index c5fbbf210b..438bda38dc 100644 --- a/Assets/ManagedResources/Prefabs/UI/linglong/LingLongBaoJingPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/linglong/LingLongBaoJingPanel.prefab @@ -834,7 +834,6 @@ RectTransform: - {fileID: 5235865711419272672} - {fileID: 2353202169348388731} - {fileID: 3410466484382140854} - - {fileID: 6099078440574250546} - {fileID: 5419786872734962102} m_Father: {fileID: 1409519540428586610} m_RootOrder: 0 @@ -9301,7 +9300,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: 436.8, y: 512.5} + m_AnchoredPosition: {x: 394.5, y: 512.5} m_SizeDelta: {x: 68, y: 68} m_Pivot: {x: 0.49999988, y: 0.4999997} --- !u!222 &944776569104769742 @@ -9438,7 +9437,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: 436.8, y: 645.4} + m_AnchoredPosition: {x: 393.65, y: 645.4} m_SizeDelta: {x: 130, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4752420770489122408 @@ -13022,6 +13021,7 @@ RectTransform: - {fileID: 2904853375599239976} - {fileID: 7062317481524812952} - {fileID: 7523844360500022796} + - {fileID: 6099078440574250546} m_Father: {fileID: 7035216596183516586} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -13447,7 +13447,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 7035216596183516586} - m_RootOrder: 8 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -16910,16 +16910,16 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7143453891379809281} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 100} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 7035216596183516586} - m_RootOrder: 7 + m_Father: {fileID: 227647648330951685} + m_RootOrder: 3 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_AnchoredPosition: {x: 0, y: -122.5} + m_SizeDelta: {x: 244.5, y: 1090} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6618055529508387513 CanvasRenderer: diff --git a/Assets/ManagedResources/~Lua/Modules/linglongbaojing/LingLongBaoJingPanel.lua b/Assets/ManagedResources/~Lua/Modules/linglongbaojing/LingLongBaoJingPanel.lua index 5c4b8e458b..415f72bfc5 100644 --- a/Assets/ManagedResources/~Lua/Modules/linglongbaojing/LingLongBaoJingPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/linglongbaojing/LingLongBaoJingPanel.lua @@ -21,7 +21,7 @@ local configs function LingLongBaoJingPanel:InitComponent(gameObject) self.spLoader = SpriteLoader.New() self.luckyTurnPanel = Util.GetGameObject(self.gameObject,"Panel") - self.mask = Util.GetGameObject(self.luckyTurnPanel,"Mask") + self.mask = Util.GetGameObject(self.luckyTurnPanel,"TurnTable/Mask") self.time = Util.GetGameObject(self.luckyTurnPanel,"time"):GetComponent("Text") self.firstLayer = Util.GetGameObject(self.luckyTurnPanel,"firstLayer"):GetComponent("Canvas") self.secondLayer = Util.GetGameObject(self.luckyTurnPanel,"turnpanelWai"):GetComponent("Canvas") @@ -129,6 +129,7 @@ function LingLongBaoJingPanel:BindEvent() PopupTipPanel.ShowTip("转盘奖励出错了") return end + self:DelayMaskWithBool(true) self.fx_linglongbaojing_kaiqi.gameObject:SetActive(true) -- local drop = {} -- drop.itemlist = {} @@ -160,6 +161,7 @@ function LingLongBaoJingPanel:BindEvent() for i = 1,#self.itemList[1] do self.itemList[1][i].effect.gameObject:SetActive(false) end + self:DelayMaskWithBool(false) end) end curTurnPos = 1 @@ -383,7 +385,7 @@ function LingLongBaoJingPanel:SetTableTurnEffect(turnType,treasureType,pos,func) self:TurnEffectReset(0.5,treasureType) self.turnEffect:Start() elseif turnType==TableTurnType.Expedite then --抽奖旋转 至指定位置 - self:DelayMaskWithBool(true) + self.thread = coroutine.start(function() self:TurnEffectReset(0.05,treasureType) coroutine.wait(2)--2 @@ -391,7 +393,6 @@ function LingLongBaoJingPanel:SetTableTurnEffect(turnType,treasureType,pos,func) coroutine.wait(0.8)--0.8 self:TurnEffectReset(0.4,treasureType,true,pos,function()--当效果播放完毕后 从管理器取得数据 local timer=Timer.New(function() - self:DelayMaskWithBool(false) if func then func() end @@ -485,14 +486,17 @@ end ---延时遮罩 1按时间 function LingLongBaoJingPanel:DelayMaskWithTime(delayTime) self.mask.gameObject:SetActive(true) + self.parent.mask.gameObject:SetActive(true) local closeMask=Timer.New(function() self.mask.gameObject:SetActive(false) + self.parent.mask.gameObject:SetActive(false) end,delayTime,1,true) closeMask:Start() end ---延时遮罩 1按bool function LingLongBaoJingPanel:DelayMaskWithBool(b) self.mask.gameObject:SetActive(b) + self.parent.mask.gameObject:SetActive(b) end return LingLongBaoJingPanel \ No newline at end of file