From 07e4d4a0d775fce9189095d9c5a9f7e25344292c Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <419983115@qq.com> Date: Thu, 23 May 2024 00:51:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=83=E7=95=8C=E8=AF=A6?= =?UTF-8?q?=E7=BB=86=E4=BF=A1=E6=81=AF=E9=A1=B5=E9=9D=A2=E5=AD=97=E4=BD=93?= =?UTF-8?q?=E9=A2=9C=E8=89=B2=E5=92=8C=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 30007cfbd8e12a87d9cdea59f7e2bcdef73506b5) --- .../UI/GeneralPanel/GeneralInfoPopup.prefab | 16 ++++++++-------- .../View2/GeneralInfoPopup_QiJieGoalAttri.lua | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab index a499189f3a..8acc0853cf 100644 --- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab @@ -2369,8 +2369,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 275, y: 0} - m_SizeDelta: {x: 550, y: 0} + m_AnchoredPosition: {x: 285, y: 0} + m_SizeDelta: {x: 570, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3770493636493369945 CanvasRenderer: @@ -2393,7 +2393,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 0 + m_Left: 20 m_Right: 0 m_Top: 110 m_Bottom: 20 @@ -4362,7 +4362,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.85490197, g: 0.5882353, b: 0.28627452, a: 1} + m_Color: {r: 0.8396226, g: 0.6074563, b: 0.34456214, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -5563,8 +5563,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 225, y: -40} - m_SizeDelta: {x: 550, y: 30} + m_AnchoredPosition: {x: 270.695, y: -16.5} + m_SizeDelta: {x: 541.39, y: 33} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6919817761686733272 CanvasRenderer: @@ -5587,7 +5587,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.1792453, g: 0.15979888, b: 0.15979888, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -7220,7 +7220,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5102170010853879747} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2/GeneralInfoPopup_QiJieGoalAttri.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2/GeneralInfoPopup_QiJieGoalAttri.lua index f8eb935920..3792a32f1e 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2/GeneralInfoPopup_QiJieGoalAttri.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2/GeneralInfoPopup_QiJieGoalAttri.lua @@ -50,7 +50,7 @@ function this:OnShow(_parent,...) this.addTextList[i]:SetActive(true) local str = QiJieStageBuff[attri].Describe this.addTextList[i]:GetComponent("Text").text = str - this.addTextList[i]:GetComponent("Text").text = string.format("·%s",str) + this.addTextList[i]:GetComponent("Text").text = string.format("·%s",str) end end