From d938acc27380eaccd0e16a5ca2a18ebac49d403c Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Mon, 23 Nov 2020 09:58:22 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=AB=9E=E6=8A=80=E5=9C=BA=E3=80=91?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BE=93=E8=B5=A2=E5=A5=96=E5=8A=B1=E6=8E=89?= =?UTF-8?q?=E8=90=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Arena/ArenaResultPopup.prefab | 8 ++++---- .../~Lua/Modules/Arena/ArenaResultPopup.lua | 6 +----- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Arena/ArenaResultPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Arena/ArenaResultPopup.prefab index 0546ebe23f..b169f2db0c 100644 --- a/Assets/ManagedResources/Prefabs/UI/Arena/ArenaResultPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Arena/ArenaResultPopup.prefab @@ -99401,8 +99401,8 @@ MonoBehaviour: m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: +100 --- !u!1 &1267498100800410910 @@ -99572,8 +99572,8 @@ MonoBehaviour: m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: +100 --- !u!1 &5064591301707905079 diff --git a/Assets/ManagedResources/~Lua/Modules/Arena/ArenaResultPopup.lua b/Assets/ManagedResources/~Lua/Modules/Arena/ArenaResultPopup.lua index 50512e871a..94c8351b0d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Arena/ArenaResultPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Arena/ArenaResultPopup.lua @@ -105,13 +105,9 @@ function ArenaResultPopup:OnOpen(_args,_fun) redHeadIcon:GetComponent("Image").sprite = GetPlayerHeadSprite(redInfo.head) redHeadBg:GetComponent("Image").sprite = GetPlayerHeadFrameSprite(redInfo.frame) - LogYellow("sdsds:"..args.reward.itemlist[1].itemId) - LogYellow("sdsds:"..args.reward.itemlist[1].itemNum) + LogYellow("奖励Id:"..args.reward.itemlist[1].itemId.." 奖励数量:"..args.reward.itemlist[1].itemNum) if args.reward then reward:SetActive(true) - LogBlue("rewardData.id:"..rewardData.id) - LogBlue("itemConfig[rewardData.id].ResourceID"..itemConfig[rewardData.id].ResourceID) - LogBlue("Name"..tostring(artConfig[itemConfig[rewardData.id].ResourceID].Name)) rewardIcon.sprite = Util.LoadSprite(artConfig[itemConfig[rewardData.id].ResourceID].Name) rewardNum.text = "+"..rewardData.num end