From 3dd7f21c4ba7df2b71b69528dc05962a8bab9704 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Fri, 9 Dec 2022 13:58:43 +0800 Subject: [PATCH] =?UTF-8?q?=E7=81=B5=E5=85=BD=E6=8A=BD=E5=8D=A1=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/Pokemon/PokemonSummonPanel.prefab | 20 +++++++++---------- .../Modules/Pokemon/PokemonSummonPanel.lua | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonSummonPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonSummonPanel.prefab index 7dd0e30b09..62bdec441b 100644 --- a/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonSummonPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonSummonPanel.prefab @@ -342,7 +342,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &6817404965073036329 RectTransform: m_ObjectHideFlags: 0 @@ -359,7 +359,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 114.399994, y: -147.70001} + m_AnchoredPosition: {x: 114.3999, y: -147.7002} m_SizeDelta: {x: 134, y: 174} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2750388044918329148 @@ -746,7 +746,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &916867286822061252 RectTransform: m_ObjectHideFlags: 0 @@ -1095,7 +1095,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -112.399994, y: -334} + m_AnchoredPosition: {x: -112.3999, y: -334} m_SizeDelta: {x: 130, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2243763591230124297 @@ -6262,7 +6262,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -113.399994, y: -170.69995} + m_AnchoredPosition: {x: -113.3999, y: -170.7002} m_SizeDelta: {x: 128, y: 128} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4172082457894881044 @@ -6771,7 +6771,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &5402362866070119408 RectTransform: m_ObjectHideFlags: 0 @@ -6850,7 +6850,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &7357582473762033002 RectTransform: m_ObjectHideFlags: 0 @@ -6924,7 +6924,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &266579675049678632 RectTransform: m_ObjectHideFlags: 0 @@ -6942,7 +6942,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 109.399994, y: -269} + m_AnchoredPosition: {x: 109.3999, y: -269} m_SizeDelta: {x: 144, y: 48} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1718120499035244742 @@ -7248,7 +7248,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0.000061035156, y: 96.99988} + m_AnchoredPosition: {x: 0, y: 97} m_SizeDelta: {x: 140, y: 121} m_Pivot: {x: 0, y: 0.5} --- !u!222 &5022890421189793496 diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonPanel.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonPanel.lua index 731d622e89..affa98290c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonPanel.lua @@ -91,7 +91,7 @@ function PokemonSummonPanel:OnShow() else Util.SetGray(self.buffImg.gameObject,true) self.leftTimeObj.gameObject:SetActive(false) - self.btn_activate.gameObject:SetActive(true) + self.btn_activate.gameObject:SetActive(false) end self:refreshBtnShow()--刷新按钮显示 self:timeCountDown()--时间