From b29d7b43fe7d5f9936a0fb8fda32c4b5296cf766 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Thu, 9 Sep 2021 16:40:29 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=8E=89=E8=99=9A=E3=80=91=E6=AF=8F?= =?UTF-8?q?=E6=97=A5=E6=8C=91=E6=88=98=E5=A5=96=E5=8A=B1=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/WorldArena/WorldArenaMainPanel.prefab | 16 ++++++++-------- .../Modules/WorldArena/WorldArenaMainPanel.lua | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/WorldArena/WorldArenaMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/WorldArena/WorldArenaMainPanel.prefab index 764b9a19be..836ad1b4ef 100644 --- a/Assets/ManagedResources/Prefabs/UI/WorldArena/WorldArenaMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/WorldArena/WorldArenaMainPanel.prefab @@ -34,7 +34,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: -0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 66, y: 66} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &59355654 @@ -182,7 +182,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: -0, y: -15} + m_AnchoredPosition: {x: 0, y: -15} m_SizeDelta: {x: 66, y: 66} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &610332086 @@ -919,7 +919,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: 137.7, y: -2.8} + m_AnchoredPosition: {x: 97.7, y: -2.8} m_SizeDelta: {x: 99.99997, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &373698968866696419 @@ -1287,7 +1287,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: -413, y: 7.3} + m_AnchoredPosition: {x: -396.6, y: 7.3} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8548789355670338140 @@ -1325,7 +1325,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 2 m_MaxSize: 40 - m_Alignment: 4 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 @@ -1540,7 +1540,7 @@ MonoBehaviour: m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 0 - m_FillAmount: 0.66 + m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 @@ -5554,7 +5554,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: 483, y: 0} + m_AnchoredPosition: {x: 476.5, y: 0} m_SizeDelta: {x: 99.99997, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3620476927782998780 @@ -9087,7 +9087,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: -197.6, y: -4.5} + m_AnchoredPosition: {x: -284.2, y: -4.5} m_SizeDelta: {x: 99.99997, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7554134436819503971 diff --git a/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaMainPanel.lua index 53361df7a2..4d39cc0261 100644 --- a/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaMainPanel.lua @@ -233,7 +233,7 @@ function this.ShowRewardBoxProgressData() Util.GetGameObject(rewardBoxBtn[i], "getFinish"):SetActive(state == 3) Util.AddOnceClick(rewardBoxBtn[i], function() if state == 1 then - UIManager.OpenPanel(UIName.BoxRewardShowPopup,rewards[i][2].."#"..rewards[i][3],rewardBoxBtn[i].transform.localPosition.x,-400,rewards[i][1] .. Language[10100]) + UIManager.OpenPanel(UIName.BoxRewardShowPopup,{{rewards[i][2], rewards[i][3]}},rewardBoxBtn[i].transform.localPosition.x,-400,rewards[i][1] .. Language[10100]) return elseif state == 3 then PopupTipPanel.ShowTip(Language[10101])