From 3cf21f5e85aefb6ae3bc91848760e6e9b0606b65 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Tue, 18 May 2021 21:14:22 +0800 Subject: [PATCH] =?UTF-8?q?30=E3=80=8168=E5=85=83=E6=A1=A3=E4=BD=8D?= =?UTF-8?q?=E5=A5=96=E5=8A=B1=E5=9B=BE=E6=A0=87=E5=8F=8A=E7=89=B9=E6=95=88?= =?UTF-8?q?=E6=A1=86=E9=9C=80=E5=90=8C=E6=97=B6=E5=87=BA=E7=8E=B0=EF=BC=8C?= =?UTF-8?q?=E6=95=88=E6=9E=9C=E5=90=8C=E9=A6=96=E6=AC=A1=E7=82=B9=E5=87=BB?= =?UTF-8?q?18=E5=85=83=E6=A1=A3=E4=BD=8D=E5=B1=95=E7=A4=BA=E6=95=88?= =?UTF-8?q?=E6=9E=9C=E5=8D=B3=E5=8F=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DailyRecharge/DailyRechargePanel.prefab | 28 +++++++++---------- .../DailyRecharge/DailyRechargePanel.lua | 20 +++++++++++-- 2 files changed, 31 insertions(+), 17 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/DailyRecharge/DailyRechargePanel.prefab b/Assets/ManagedResources/Prefabs/UI/DailyRecharge/DailyRechargePanel.prefab index 41eeac62f1..41103b3751 100644 --- a/Assets/ManagedResources/Prefabs/UI/DailyRecharge/DailyRechargePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DailyRecharge/DailyRechargePanel.prefab @@ -39389,7 +39389,7 @@ ParticleSystem: startDelay: serializedVersion: 2 minMaxState: 0 - scalar: 0.45 + scalar: 0 minScalar: 0 maxCurve: serializedVersion: 2 @@ -53882,8 +53882,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: -1.2, y: -62.4} - m_SizeDelta: {x: 635.2, y: 84} + m_AnchoredPosition: {x: 1.4, y: -62.4} + m_SizeDelta: {x: 760.2, y: 84} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5638498405040071937 CanvasRenderer: @@ -53917,14 +53917,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 65 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 0 - m_MaxSize: 74 + m_BestFit: 1 + m_MinSize: 20 + m_MaxSize: 65 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u5373\u53EF\u9886\u53D6\u8D85\u7EA7\u8C6A\u793C" --- !u!114 &4690614078576488616 @@ -53944,7 +53944,7 @@ MonoBehaviour: m_Curve: - serializedVersion: 3 time: 0 - value: -49.328674 + value: -50.945557 inSlope: 0.27903298 outSlope: 0.27903298 tangentMode: 0 @@ -53952,8 +53952,8 @@ MonoBehaviour: inWeight: 0 outWeight: 0.1356021 - serializedVersion: 3 - time: 635.2 - value: -49.60141 + time: 760.2 + value: -51.218292 inSlope: -0.32014272 outSlope: -0.32014272 tangentMode: 0 @@ -63597,7 +63597,7 @@ ParticleSystem: startDelay: serializedVersion: 2 minMaxState: 0 - scalar: 0.25 + scalar: 0 minScalar: 0 maxCurve: serializedVersion: 2 @@ -68301,7 +68301,7 @@ ParticleSystem: startDelay: serializedVersion: 2 minMaxState: 0 - scalar: 0.55 + scalar: 0 minScalar: 0 maxCurve: serializedVersion: 2 @@ -83076,7 +83076,7 @@ ParticleSystem: startDelay: serializedVersion: 2 minMaxState: 0 - scalar: 0.35 + scalar: 0 minScalar: 0 maxCurve: serializedVersion: 2 diff --git a/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua b/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua index cc293c96ed..d13f29171b 100644 --- a/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua @@ -198,14 +198,28 @@ function DailyRechargePanel:RefreshPanel() self.moneyNum:SetNumShow(1,actRewardConfig1.Values[1][1]) end self.extraIcon:SetNativeSize() + table.walk(self.rewardList, function(rewardPosItem) + LogGreen("11111111111111111111111111111") + rewardPosItem.gameObject:SetActive(false) + end) table.walk(self.rewardContent, function(rewardPosItem) - rewardPosItem:SetActive(false) + LogGreen("2222222222222222222222222222222") + rewardPosItem.gameObject:SetActive(false) end) for i, rewardInfo in ipairs(actRewardConfig1.Reward) do self.rewardList[i]:OnOpen(false, rewardInfo, 1.1) - self.rewardContent[i]:SetActive(true) + self.rewardList[i].gameObject:SetActive(true) + self.rewardContent[i].gameObject:SetActive(true) end - + -- self.thread = coroutine.start(function() + -- coroutine.wait(0.25) + -- for i, rewardInfo in ipairs(actRewardConfig1.Reward) do + -- self.rewardList[i]:OnOpen(false, rewardInfo, 1.1) + -- self.rewardList[i].gameObject:SetActive(true) + -- self.rewardContent[i].gameObject:SetActive(true) + -- coroutine.wait(0.1) + -- end + -- end) self.titleText.text = Language[12109] SetTextVerTial(self.titleText,Vector3.New(102.07,18.2,0))