From 6899e700de3f593de788d0e1682f698a55b4b525 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 11 Mar 2021 15:33:18 +0800 Subject: [PATCH] =?UTF-8?q?=E7=99=BD=E7=89=87=E4=BF=AE=E6=94=B9=E3=80=82?= =?UTF-8?q?=E7=A5=9E=E5=BA=94=E8=A7=A3=E9=94=81=E7=95=8C=E9=9D=A2=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 --- .../Prefabs/UI/Popup/RewardItemPopup.prefab | 18 +++++++++--------- .../~Lua/Modules/Arena/ArenaResultPopup.lua | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab index a814c31690..03d54c8051 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab @@ -913,7 +913,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 3.2999773, y: 18} - m_SizeDelta: {x: 346, y: 123} + m_SizeDelta: {x: 477, y: 106} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6190835940073535650 CanvasRenderer: @@ -943,7 +943,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 8f9362bef86acb146925242736e5f414, type: 3} + m_Sprite: {fileID: 21300000, guid: 3032704d6fdf8ee458ea3d56f7e30f1f, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3922,8 +3922,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 1.1, y: -212.2} - m_SizeDelta: {x: 1075.6, y: 66} + m_AnchoredPosition: {x: 1.1, y: -267.5} + m_SizeDelta: {x: 1075.6, y: 110.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &797082731835704268 CanvasRenderer: @@ -3966,7 +3966,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: + m_Text: sadfasdfsdaffffffff --- !u!1 &2449184198827426303 GameObject: m_ObjectHideFlags: 0 @@ -4001,7 +4001,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 350.3, y: 5} + m_AnchoredPosition: {x: 423.1, y: 5} m_SizeDelta: {x: 391, y: 83} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7489574292809244955 @@ -4552,8 +4552,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0.8000488, y: -9.6} - m_SizeDelta: {x: 221.7, y: 245.2} + m_AnchoredPosition: {x: 0.8000488, y: -57.1} + m_SizeDelta: {x: 221.7, y: 340.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9213105932245059169 CanvasRenderer: @@ -7190,7 +7190,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -341.20004, y: 9} + m_AnchoredPosition: {x: -418.67, y: 9} m_SizeDelta: {x: 391, y: 83} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8068741244574255743 diff --git a/Assets/ManagedResources/~Lua/Modules/Arena/ArenaResultPopup.lua b/Assets/ManagedResources/~Lua/Modules/Arena/ArenaResultPopup.lua index 67ae87bd5f..19c26e7257 100644 --- a/Assets/ManagedResources/~Lua/Modules/Arena/ArenaResultPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Arena/ArenaResultPopup.lua @@ -16,7 +16,7 @@ function ArenaResultPopup:InitComponent() this.loseEffect = Util.GetGameObject(self.transform, "lose/Effect (1)") this.btnResult = Util.GetGameObject(self.transform, "btnResult") this.btnBattleBack = Util.GetGameObject(self.transform, "btnBattleBack") - -- this.btnBattleBack:SetActive(false) + this.btnBattleBack:GetComponent("Image").sprite = Util.LoadSprite("s_silingshilian_huifanganniu_zh") screenAdapte(this.winEffect) screenAdapte(this.loseEffect) end