From 60353d6dbd883d55ba31cb2fb92105614602aa19 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Wed, 31 Mar 2021 17:40:51 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=BD=92=E5=85=83=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E3=80=91bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Resolve/ResolvePanel.prefab | 50 +++++++++---------- .../~Lua/Modules/Pokemon/PokemonMainPanel.lua | 2 +- .../~Lua/Modules/Resolve/ResolvePanel.lua | 2 +- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab b/Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab index f97ffbed62..800280fc46 100644 --- a/Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab @@ -1758,8 +1758,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -540, y: 50} - m_SizeDelta: {x: 1080, y: 100} + m_AnchoredPosition: {x: -540, y: 52.700195} + m_SizeDelta: {x: 1080, y: 105.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &894267777490811510 GameObject: @@ -11130,15 +11130,15 @@ RectTransform: m_GameObject: {fileID: 6698392907551047934} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.9, y: 0.9, z: 1} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6859356168919729670} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 76, y: 50} - m_SizeDelta: {x: 1031.1, y: 100} + m_AnchoredPosition: {x: -0.0024872, y: 50.4} + m_SizeDelta: {x: 1200, y: 105.56} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &3622489286463543318 MonoBehaviour: @@ -11950,10 +11950,10 @@ RectTransform: m_Father: {fileID: 7797228341887005295} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 608, y: -50} + m_SizeDelta: {x: 88, y: 88} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7583128553425786306 CanvasRenderer: @@ -12205,10 +12205,10 @@ RectTransform: m_Father: {fileID: 7797228341887005295} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 104, y: -50} + m_SizeDelta: {x: 88, y: 88} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7583128553461871492 CanvasRenderer: @@ -12952,10 +12952,10 @@ RectTransform: m_Father: {fileID: 7797228341887005295} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 440, y: -50} + m_SizeDelta: {x: 88, y: 88} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7583128555069003081 CanvasRenderer: @@ -13108,10 +13108,10 @@ RectTransform: m_Father: {fileID: 7797228341887005295} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 776, y: -50} + m_SizeDelta: {x: 88, y: 88} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7583128555296664243 CanvasRenderer: @@ -13226,10 +13226,10 @@ RectTransform: m_Father: {fileID: 7797228341887005295} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 272, y: -50} + m_SizeDelta: {x: 88, y: 88} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7583128555409597101 CanvasRenderer: diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonMainPanel.lua index 29b2abdd05..5204139f4e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonMainPanel.lua @@ -85,7 +85,7 @@ function PokemonMainPanel:BindEvent() UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.PokemonUpZhenAddPro,{}) end) Util.AddClick(this.btnOut, function() - UIManager.OpenPanel(UIName.ResolvePanel,5) + UIManager.OpenPanel(UIName.ResolvePanel,3) end) Util.AddClick(this.btnFetter, function() UIManager.OpenPanel(UIName.TianShuMiJuan,3) diff --git a/Assets/ManagedResources/~Lua/Modules/Resolve/ResolvePanel.lua b/Assets/ManagedResources/~Lua/Modules/Resolve/ResolvePanel.lua index cc3fbddad7..55e98269c8 100644 --- a/Assets/ManagedResources/~Lua/Modules/Resolve/ResolvePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Resolve/ResolvePanel.lua @@ -56,7 +56,7 @@ function ResolvePanel:InitComponent() this.selectHeroBtn = Util.GetGameObject(this.panel, "endTabs/selectBtn") - for i = 1, 3 do + for i = 1, 5 do heroEndBtns[i]=Util.GetGameObject(this.panel, "endTabs/btnHeroGrid/btnHeroGrid/Btn"..i-1) Util.GetGameObject(heroEndBtns[i],"Image"):GetComponent("Image").sprite = Util.LoadSprite(PropertyIcon[i-1]) end