From 5f02db7c628367582ad93594527d23ca1b734c0b Mon Sep 17 00:00:00 2001 From: wangzhenxing <1545929779@qq.com> Date: Wed, 10 Jan 2024 15:54:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BC=9A=E6=8C=91=E6=88=98=E5=89=AF?= =?UTF-8?q?=E6=9C=AC=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../GuildTranscriptMainPopup.prefab | 20 +++++++++---------- .../ManagedResources/~Lua/Common/Language.lua | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Guild/Transcript/GuildTranscriptMainPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Guild/Transcript/GuildTranscriptMainPopup.prefab index 2cc27ac54a..aa834beacc 100644 --- a/Assets/ManagedResources/Prefabs/UI/Guild/Transcript/GuildTranscriptMainPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Guild/Transcript/GuildTranscriptMainPopup.prefab @@ -109,7 +109,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: 2.2142978, y: -41.4} + m_AnchoredPosition: {x: 2.2142978, y: -50} m_SizeDelta: {x: 215.3, y: 72.9} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &358519245 @@ -432,7 +432,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.5, y: -43.4} + m_AnchoredPosition: {x: 0.5, y: -50} m_SizeDelta: {x: 215.3, y: 72.9} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1233106425 @@ -2321,7 +2321,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.93725497, g: 0.9333334, b: 0.9333334, a: 1} + m_Color: {r: 0.9811321, g: 0.97409505, b: 0.96724814, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -2701,7 +2701,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: 19} + m_AnchoredPosition: {x: 0, y: 9} m_SizeDelta: {x: 45, y: 45} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4504879607366141963 @@ -4408,7 +4408,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: -127} + m_AnchoredPosition: {x: 0, y: -135.8} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &206433144954208112 @@ -4440,7 +4440,7 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 28 m_FontStyle: 0 m_BestFit: 0 @@ -4465,7 +4465,7 @@ MonoBehaviour: m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectColor: {r: 0, g: 0, b: 0, a: 1} m_EffectDistance: {x: 1, y: -1} m_UseGraphicAlpha: 1 --- !u!1 &6525568544873650794 @@ -4960,7 +4960,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: -3.83, y: -126.5} + m_AnchoredPosition: {x: -4.9, y: -107.7} m_SizeDelta: {x: 93.29, y: 8.48} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7578765807345141446 @@ -5173,7 +5173,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: 224.16, y: -158.49} + m_AnchoredPosition: {x: 224.16, y: -164} m_SizeDelta: {x: 269.22, y: 75.48} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &6826388305548266158 @@ -5934,7 +5934,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: 55.2, y: 4.8} + m_AnchoredPosition: {x: 55, y: 12} m_SizeDelta: {x: 638.4, y: 38.4} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8772249490571615140 diff --git a/Assets/ManagedResources/~Lua/Common/Language.lua b/Assets/ManagedResources/~Lua/Common/Language.lua index 61f2fa1248..19126ad876 100644 --- a/Assets/ManagedResources/~Lua/Common/Language.lua +++ b/Assets/ManagedResources/~Lua/Common/Language.lua @@ -1083,7 +1083,7 @@ Language = { [11082] = GetLanguageStrById("已通关"), [11083] = GetLanguageStrById("剩余次数:"), [11084] = GetLanguageStrById("剩余购买次数:"), - [11085] = GetLanguageStrById("全公会成员攻击力+0%(未激活) "), + [11085] = GetLanguageStrById("全公会成员攻击力+0%(未激活) "), [11086] = GetLanguageStrById("全公会成员攻击力+ %s "), [11087] = GetLanguageStrById("(%s后失效)"), [11088] = GetLanguageStrById("已击败【%s】!"),