From 46ffc9e8132df18b6d0ba895c44faf512398781b Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <419983115@qq.com> Date: Thu, 22 Jan 2026 18:39:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Arena/ArenaTypePanel.prefab | 14 +- .../GuildTranscriptMainPopup.prefab | 144 +++++++++--------- .../RationNumber/RatioNumberLevelPanel.prefab | 2 +- .../TrainingItemListPanel.prefab | 49 +++--- .../~Lua/Common/GlobalDefine.lua | 12 +- .../ManagedResources/~Lua/Common/Language.lua | 8 +- .../~Lua/Modules/Arena/ArenaTypePanel.lua | 2 +- .../Transcript/GuildTranscriptMainPopup.lua | 2 +- 8 files changed, 115 insertions(+), 118 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Arena/ArenaTypePanel.prefab b/Assets/ManagedResources/Prefabs/UI/Arena/ArenaTypePanel.prefab index 4d38183fe0..e41997fa8e 100644 --- a/Assets/ManagedResources/Prefabs/UI/Arena/ArenaTypePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Arena/ArenaTypePanel.prefab @@ -521,7 +521,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u5929\u4E0B\u7B2C\u4E00\u6B66\u9053\u4F1A" + m_Text: "\u7F57\u9A6C\u7ADE\u6280\u573A" LanguageIndex: 0 --- !u!114 &347354261 MonoBehaviour: @@ -3899,7 +3899,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u5A1C\u7F8E\u514B\u661F\u63A2\u9669" + m_Text: "\u62DC\u5360\u5EAD\u5BFB\u5B9D" LanguageIndex: 0 --- !u!114 &7269437471498165745 MonoBehaviour: @@ -4291,7 +4291,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u5B87\u5B99\u6B66\u9053\u4F1A" + m_Text: "\u8BF8\u795E\u9EC4\u660F" LanguageIndex: 0 --- !u!114 &8646041428142714528 MonoBehaviour: @@ -4589,7 +4589,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u5B87\u5B99\u6218\u529B\u5CF0\u4F1A" + m_Text: "\u5E03\u533F\u6218\u4E89" LanguageIndex: 0 --- !u!114 &2963157202783940401 MonoBehaviour: @@ -9579,7 +9579,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u754C\u738B\u661F\u4FEE\u7F57\u573A" + m_Text: "\u7279\u6D1B\u4F0A\u6218\u573A" LanguageIndex: 0 --- !u!114 &9071774342918337428 MonoBehaviour: @@ -9956,7 +9956,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u9F99\u73E0\u4E89\u593A\u6218" + m_Text: "\u9A6C\u62C9\u677E\u6218\u5F79" LanguageIndex: 0 --- !u!114 &1107556201781350219 MonoBehaviour: @@ -12264,7 +12264,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u7834\u574F\u8BD5\u70BC\u573A" + m_Text: "\u5DE8\u4EBA\u4E4B\u6218" LanguageIndex: 0 --- !u!114 &648861865431412970 MonoBehaviour: diff --git a/Assets/ManagedResources/Prefabs/UI/Guild/Transcript/GuildTranscriptMainPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Guild/Transcript/GuildTranscriptMainPopup.prefab index 2d1895745d..0ff9bf3cd3 100644 --- a/Assets/ManagedResources/Prefabs/UI/Guild/Transcript/GuildTranscriptMainPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Guild/Transcript/GuildTranscriptMainPopup.prefab @@ -778,7 +778,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: 383, y: 601.8} + m_AnchoredPosition: {x: 384.1, y: 606.8} m_SizeDelta: {x: 94, y: 94} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7756362071562167571 @@ -913,8 +913,8 @@ 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: -213.7} - m_SizeDelta: {x: 1080, y: 589} + m_AnchoredPosition: {x: 0, y: -225.9} + m_SizeDelta: {x: 1080, y: 619.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &767815585694021647 CanvasRenderer: @@ -937,14 +937,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.254717, g: 0.254717, b: 0.254717, a: 0.53333336} + m_Color: {r: 0.5377358, g: 0.5377358, b: 0.5377358, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 41e46a2ce86620d42b07291ebe7bbf4d, type: 3} + m_Sprite: {fileID: 21300000, guid: c2262098f68982947b6d91fafc69b703, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1059,7 +1059,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, y: 13.6} + m_AnchoredPosition: {x: 0, y: 16.4} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1663657875254891685 @@ -1175,7 +1175,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: 178, y: -101} + m_AnchoredPosition: {x: 7, y: 22} m_SizeDelta: {x: 253.5, y: 64.4} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4504094561734338284 @@ -1199,7 +1199,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -1256,7 +1256,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 200, y: 200} + m_SizeDelta: {x: 149.46, y: 147.58} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6964677891981582303 CanvasRenderer: @@ -1286,8 +1286,8 @@ 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: 235f511e5ae0aec4f905c2f4df405d91, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 6dc1e4bc7532d2448aa352ab30e6005a, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1580,8 +1580,8 @@ 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, y: 0.4} - m_SizeDelta: {x: 96, y: 98} + m_AnchoredPosition: {x: -3, y: 3.215} + m_SizeDelta: {x: 96, y: 91.57} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2239288168348324970 CanvasRenderer: @@ -1611,7 +1611,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: 3c01a305eb51c04478b39d3060aceefe, type: 3} + m_Sprite: {fileID: 21300000, guid: e0c957b932199124c8fcaf7f11352aa6, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1908,8 +1908,8 @@ 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.00047874, y: -7.3399963} - m_SizeDelta: {x: 824.5, y: 394.5} + m_AnchoredPosition: {x: 0.00047874, y: 0.000017166} + m_SizeDelta: {x: 824.5, y: 404.16} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3052616311165397785 GameObject: @@ -1976,7 +1976,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: 157e394dc0ac8c142b13d5bb396503dc, type: 3} + m_Sprite: {fileID: 21300000, guid: 70b07daf6f74d4045b073458c3094b0a, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2189,8 +2189,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.025024414, y: 0} - m_SizeDelta: {x: 0.050049, y: 0} + m_AnchoredPosition: {x: 0.8299866, y: -3.807499} + m_SizeDelta: {x: 6.52, y: 14.74} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8227878445074661199 CanvasRenderer: @@ -2220,8 +2220,8 @@ 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: 934f215d095d3ee45913a1a02fabe1e1, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 275ba9cc47d3afc4b9c4a06614cde5d4, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -2410,7 +2410,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 167, y: 3.4} + m_AnchoredPosition: {x: 167, y: 4.9} m_SizeDelta: {x: 300.6, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4165925176293382033 @@ -2579,7 +2579,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 438, y: 19.6} + m_AnchoredPosition: {x: 434.3, y: 19.6} m_SizeDelta: {x: 300.6, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9878489046489610 @@ -2603,7 +2603,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9490197, g: 0.9490197, b: 0.9490197, a: 1} + m_Color: {r: 0.3301887, g: 0.21633044, b: 0, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -2659,8 +2659,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, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: -0.14001465, y: -0.040000916} + m_SizeDelta: {x: 21.77, y: 22.28} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1787947419158544914 CanvasRenderer: @@ -2690,7 +2690,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: 7a37c8663d7814543baf6de1e8b993be, type: 3} + m_Sprite: {fileID: 21300000, guid: 86550fd0746489b4a94bdf048f2b2443, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3104,7 +3104,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.38, y: 14.600008} + m_AnchoredPosition: {x: 0.5, y: 18.16} m_SizeDelta: {x: 75, y: 75} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4504879608626357010 @@ -3328,7 +3328,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: 60, y: -28.8} + m_AnchoredPosition: {x: 60, y: -35.8} m_SizeDelta: {x: 357.3, y: 13.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3972129667369844101 @@ -3402,8 +3402,8 @@ 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: -1220, y: 10.89999} - m_SizeDelta: {x: 140, y: 140} + m_AnchoredPosition: {x: -1973.4, y: 399.4} + m_SizeDelta: {x: 110, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6237165371381179852 CanvasRenderer: @@ -3469,7 +3469,7 @@ RectTransform: m_GameObject: {fileID: 4864250674772076596} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.7, y: 0.7, z: 1} + m_LocalScale: {x: 0.6, y: 0.6, z: 1} m_Children: - {fileID: 8623671869353108748} m_Father: {fileID: 8772249491636870108} @@ -3477,8 +3477,8 @@ 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: 51.04248, y: 15} - m_SizeDelta: {x: 354, y: 470} + m_AnchoredPosition: {x: 74, y: -37} + m_SizeDelta: {x: 532, y: 433} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2985714276882432385 CanvasRenderer: @@ -3495,7 +3495,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4864250674772076596} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -3508,7 +3508,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: e1eb5a78b93294840889587d72740102, type: 3} + m_Sprite: {fileID: 21300000, guid: 2df2051012458ac4483650ef3edb3a81, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3617,14 +3617,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.8113208, g: 0.46019083, b: 0.16456035, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: c3dd9610bb7d50b47bc158a0e12c6839, type: 3} + m_Sprite: {fileID: 21300000, guid: 26f3a8a9235582f44822f264f88e00e4, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3698,7 +3698,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: 0e991e88b403b29409e591653827134c, type: 3} + m_Sprite: {fileID: 21300000, guid: 0704381b7c95b134283eeef484fd81f8, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3773,8 +3773,8 @@ 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: c73ac4f44d9a7194488674d4fa335c10, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 043a0a4b1b8e6c548ae464b1ea4e7a47, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -3816,8 +3816,8 @@ 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.3} - m_SizeDelta: {x: 242.11, y: 39.5} + m_AnchoredPosition: {x: -0.96, y: -0.8} + m_SizeDelta: {x: 77.35, y: 39.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4507610833281338258 CanvasRenderer: @@ -3840,7 +3840,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.70980394, g: 0.6156863, b: 0.46666667, a: 1} + m_Color: {r: 1, g: 0.8813147, b: 0.6933962, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -3848,19 +3848,19 @@ 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: 50 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 0 + m_BestFit: 1 + m_MinSize: 20 m_MaxSize: 50 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 5 + m_Text: 5555 --- !u!1 &5956783656011709218 GameObject: m_ObjectHideFlags: 0 @@ -4109,7 +4109,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: -239.59998, y: 90.5} + m_AnchoredPosition: {x: -287, y: 230} m_SizeDelta: {x: 402, y: 234} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1825595707374210385 @@ -4127,7 +4127,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6199753487855799930} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -4140,7 +4140,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: 88785b6606f773e43bfb8d365c2689ab, type: 3} + m_Sprite: {fileID: 21300000, guid: 6f9a2d5a1d9e8a64abe8a4e1c5d9c8e5, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4184,7 +4184,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: 1.0024, y: 0} + m_AnchoredPosition: {x: 1.0024, y: 2.2} m_SizeDelta: {x: 132.4, y: 132.4} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6585264102098006735 @@ -4365,7 +4365,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.6, y: 14.8} + m_AnchoredPosition: {x: 0.6, y: 18} m_SizeDelta: {x: 75, y: 75} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7134847616134968168 @@ -4760,7 +4760,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.000014663001, y: 0.0000038147} + m_AnchoredPosition: {x: 0.000014663001, y: -0.3} m_SizeDelta: {x: 131.69, y: 47.77} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3453197424612897017 @@ -4792,8 +4792,8 @@ 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_FontSize: 34 + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} + m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -4839,8 +4839,8 @@ 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: -12.2, y: 7.0643} - m_SizeDelta: {x: 814.4, y: 132.33} + m_AnchoredPosition: {x: -11.72, y: 9.543} + m_SizeDelta: {x: 818.24, y: 137.28} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5696170808739751746 CanvasRenderer: @@ -5343,7 +5343,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: f5ba695b044676047802f7b7fa302002, type: 3} + m_Sprite: {fileID: 21300000, guid: 62132f633da13eb4b89a80ba234c6dda, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -5389,7 +5389,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: -311.3, y: 0} + m_AnchoredPosition: {x: -327.2, y: 0} m_SizeDelta: {x: 96, y: 97.99999} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5668597989391452131 @@ -5717,7 +5717,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.799998, y: -45.9} + m_AnchoredPosition: {x: 2.799998, y: -47.5} m_SizeDelta: {x: 136, y: 44} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8772249490155962332 @@ -5796,7 +5796,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: -345.1, y: 381} + m_AnchoredPosition: {x: -950, y: 381} m_SizeDelta: {x: 134.41, y: 134.41} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &8772249490299499663 @@ -5833,7 +5833,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: 18.95} m_SizeDelta: {x: 40, y: 54} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8772249490299499660 @@ -6632,7 +6632,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &8772249491377495798 RectTransform: m_ObjectHideFlags: 0 @@ -6649,8 +6649,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: -0.03, y: -414.62} - m_SizeDelta: {x: 820.84, y: 630.86} + m_AnchoredPosition: {x: -0.03, y: -397.41} + m_SizeDelta: {x: 820.84, y: 596.44} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8772249491377495796 CanvasRenderer: @@ -6961,7 +6961,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: -12.2, y: 7.0647} + m_AnchoredPosition: {x: -12.2, y: 8.7} m_SizeDelta: {x: 814.4, y: 132.33} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &8772249491636870109 @@ -6999,8 +6999,8 @@ 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: -9.2, y: -235.2} - m_SizeDelta: {x: 824.5, y: 372.6} + m_AnchoredPosition: {x: -9.2, y: -250.98} + m_SizeDelta: {x: 824.5, y: 404.16} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &8772249491847288057 GameObject: @@ -7114,7 +7114,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 203, y: 5.9} + m_AnchoredPosition: {x: 196.6, y: -2.1} m_SizeDelta: {x: 110, y: 109.99999} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7627547516324886560 diff --git a/Assets/ManagedResources/Prefabs/UI/RationNumber/RatioNumberLevelPanel.prefab b/Assets/ManagedResources/Prefabs/UI/RationNumber/RatioNumberLevelPanel.prefab index b9e86b9af3..2da01bf81b 100644 --- a/Assets/ManagedResources/Prefabs/UI/RationNumber/RatioNumberLevelPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RationNumber/RatioNumberLevelPanel.prefab @@ -73896,7 +73896,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &6461519175274609242 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/SpecailTraining/TrainingItemListPanel.prefab b/Assets/ManagedResources/Prefabs/UI/SpecailTraining/TrainingItemListPanel.prefab index 33cc24f4a1..5b15f03be2 100644 --- a/Assets/ManagedResources/Prefabs/UI/SpecailTraining/TrainingItemListPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/SpecailTraining/TrainingItemListPanel.prefab @@ -226,7 +226,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -1, y: -611} - m_SizeDelta: {x: 260, y: 74} + m_SizeDelta: {x: 260, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3479209885896132788 CanvasRenderer: @@ -256,8 +256,8 @@ 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: f615ecdbbffd77f4b89afe678ee4d8d5, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 6116d9ee6286a6246b3b7613b8a8d323, type: 3} + m_Type: 1 m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 @@ -558,10 +558,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: ' - - -' + m_Text: LanguageIndex: 10146 --- !u!1 &3191449937460997444 GameObject: @@ -598,7 +595,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: -310, y: 127} + m_AnchoredPosition: {x: -224, y: 216} m_SizeDelta: {x: 318.2, y: 174} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5954861885990124200 @@ -673,8 +670,8 @@ 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: 104.99994, y: 91} - m_SizeDelta: {x: 306, y: 414} + m_AnchoredPosition: {x: 115, y: 91} + m_SizeDelta: {x: 532, y: 433} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7808546774691958039 CanvasRenderer: @@ -1175,7 +1172,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: -1.44, y: -1.72} + m_AnchoredPosition: {x: -1.44, y: 5.1} m_SizeDelta: {x: 157.13, y: 65.07} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5366644628095322089 @@ -1199,7 +1196,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 1} + m_Color: {r: 0.3584906, g: 0.17349045, b: 0.15726237, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1555,8 +1552,8 @@ 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: 188, y: -616.7} - m_SizeDelta: {x: 260, y: 74} + m_AnchoredPosition: {x: 188, y: -601} + m_SizeDelta: {x: 260, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6052243787239536521 CanvasRenderer: @@ -1586,8 +1583,8 @@ 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: 6ff20609e8c68014394e6b730e1c7948, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 6116d9ee6286a6246b3b7613b8a8d323, type: 3} + m_Type: 1 m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 @@ -2004,8 +2001,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: 365, y: -52} - m_SizeDelta: {x: 750, y: 71} + m_AnchoredPosition: {x: 437.9, y: -41.440002} + m_SizeDelta: {x: 934.47, y: 92.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6052538081964190809 CanvasRenderer: @@ -2036,7 +2033,7 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 895edaf5020aff14bb6181683b0ba980, type: 3} - m_Type: 0 + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -2080,7 +2077,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -67.97, y: -63.400024} + m_AnchoredPosition: {x: -67.97, y: -61.2} m_SizeDelta: {x: 119.130005, y: 119.869995} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6052479451082637443 @@ -2214,7 +2211,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -2452,7 +2449,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: -71, y: -44} + m_AnchoredPosition: {x: 0, y: -44} m_SizeDelta: {x: 251.7, y: 64.4} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6051886151823865113 @@ -2803,7 +2800,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &6050159240385304083 RectTransform: m_ObjectHideFlags: 0 @@ -3317,7 +3314,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: -1.44, y: -1.72} + m_AnchoredPosition: {x: -1.44, y: 4.1} m_SizeDelta: {x: 157.13, y: 65.07} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8717053103729480190 @@ -3341,7 +3338,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 1} + m_Color: {r: 0.35686275, g: 0.17254902, b: 0.15686275, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -3349,7 +3346,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: 45 m_FontStyle: 0 m_BestFit: 0 diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 6f5a981d03..e977122035 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -3099,7 +3099,7 @@ rankKingList = { [1] = { bgImage = "UI_hz_ls_47", name = "星数排行", rankType = RANK_TYPE.FIGHTLEVEL_STAR, activiteId = 0, isRankingMainPanelShow = 1, RankingListMainSortId = 1, showBg = "UI_hz_ls_54" }, [2] = { bgImage = "UI_hz_ls_49", name = "战力排行", rankType = RANK_TYPE.FORCE_CURR_RANK, activiteId = 0, isRankingMainPanelShow = 1, RankingListMainSortId = 2, showBg = "UI_hz_ls_53" }, [3] = { bgImage = "UI_hz_ls_48", name = "公会排行", rankType = RANK_TYPE.GUILD_FORCE_RANK, activiteId = 0, isRankingMainPanelShow = 1, RankingListMainSortId = 3, showBg = "UI_hz_ls_52" }, - [4] = { bgImage = "UI_hz_ls_50", name = "蛇道排行", rankType = RANK_TYPE.MONSTER_RANK, activiteId = 0, isRankingMainPanelShow = 1, RankingListMainSortId = 4, showBg = "UI_hz_ls_51" }, + [4] = { bgImage = "UI_hz_ls_50", name = "法兰克排行", rankType = RANK_TYPE.MONSTER_RANK, activiteId = 0, isRankingMainPanelShow = 1, RankingListMainSortId = 4, showBg = "UI_hz_ls_51" }, --达人部分 [5] = { bgImage = "", name = Language[12100], rankType = RANK_TYPE.GOLD_EXPER, activiteId = ActivityTypeDef.GoldExper, isRankingMainPanelShow = 0, RankingListMainSortId = 9 }, [6] = { bgImage = "", name = Language[12101], rankType = RANK_TYPE.ARENA_RANK, activiteId = 0, isRankingMainPanelShow = 0, RankingListMainSortId = 10 }, @@ -3131,10 +3131,10 @@ rankKingList = { [24] = { bgImage = "", name = "", rankType = RANK_TYPE.GUILD_DEATHPOS_GUILD, activiteId = 0, isRankingMainPanelShow = 4, RankingListMainSortId = 24 }, [25] = { bgImage = "", name = "", rankType = RANK_TYPE.GUILD_DEATHPOS_ALLPERSON, activiteId = 0, isRankingMainPanelShow = 4, RankingListMainSortId = 25 }, [26] = { bgImage = "", name = "", rankType = RANK_TYPE.GUILD_DEATHPOS_ALLGUILD, activiteId = 0, isRankingMainPanelShow = 4, RankingListMainSortId = 26 }, - [27] = { bgImage = "r_zjm_paihangbang_banner01", name = "灼烧蛇道排行", rankType = RANK_TYPE.PERSON_CHALLENGE, activiteId = 1, isRankingMainPanelShow = false }, - [28] = { bgImage = "r_zjm_paihangbang_banner01", name = "爆伤蛇道排行", rankType = RANK_TYPE.PERSON_CHALLENGE, activiteId = 2, isRankingMainPanelShow = false }, - [29] = { bgImage = "r_zjm_paihangbang_banner01", name = "永动蛇道排行", rankType = RANK_TYPE.PERSON_CHALLENGE, activiteId = 3, isRankingMainPanelShow = false }, - [30] = { bgImage = "r_zjm_paihangbang_banner01", name = "控怒蛇道排行", rankType = RANK_TYPE.PERSON_CHALLENGE, activiteId = 4, isRankingMainPanelShow = false }, + [27] = { bgImage = "r_zjm_paihangbang_banner01", name = "灼烧挑战排行", rankType = RANK_TYPE.PERSON_CHALLENGE, activiteId = 1, isRankingMainPanelShow = false }, + [28] = { bgImage = "r_zjm_paihangbang_banner01", name = "爆伤挑战排行", rankType = RANK_TYPE.PERSON_CHALLENGE, activiteId = 2, isRankingMainPanelShow = false }, + [29] = { bgImage = "r_zjm_paihangbang_banner01", name = "永动挑战排行", rankType = RANK_TYPE.PERSON_CHALLENGE, activiteId = 3, isRankingMainPanelShow = false }, + [30] = { bgImage = "r_zjm_paihangbang_banner01", name = "控怒挑战排行", rankType = RANK_TYPE.PERSON_CHALLENGE, activiteId = 4, isRankingMainPanelShow = false }, [31] = { bgImage = "", name = Language[12101], rankType = RANK_TYPE.WORLDARENA, activiteId = 0, isRankingMainPanelShow = 3, RankingListMainSortId = 10 }, --车迟斗法 [35] = { bgImage = "", name = "", rankType = RANK_TYPE.GUILD_CAR_DELEAY_SINGLE, activiteId = 0, isRankingMainPanelShow = 4, RankingListMainSortId = 0 }, @@ -3208,7 +3208,7 @@ Pokemon_Formation_RefreshType = { DownZhen = 2, --下阵 Replace = 3, --替换 } -FourElementName = { "灼烧蛇道", "爆伤蛇道", "永动蛇道", "控怒蛇道" } +FourElementName = { "灼烧挑战", "爆伤挑战", "永动挑战", "控怒挑战" } FourElementNameImage = { "s_silingshilian_renjiezi_zh", "s_silingshilian_fochanzi_zh", "s_silingshilian_yaolingzi_zh", "s_silingshilian_daoxuanzi_zh" } NumConvertWeek = { diff --git a/Assets/ManagedResources/~Lua/Common/Language.lua b/Assets/ManagedResources/~Lua/Common/Language.lua index c9b5f03164..5623c54f9c 100644 --- a/Assets/ManagedResources/~Lua/Common/Language.lua +++ b/Assets/ManagedResources/~Lua/Common/Language.lua @@ -1939,7 +1939,7 @@ Language = { [11938] = GetLanguageStrById("级,我们为您准备了超值礼包,准您提升战力!!!"), [11939] = GetLanguageStrById("恭喜您通关"), [11940] = GetLanguageStrById(",我们为您准备了超值礼包,帮助您快速通关"), - [11941] = GetLanguageStrById("恭喜您通过蛇道挑战"), + [11941] = GetLanguageStrById("恭喜您通过法兰克挑战"), [11942] = GetLanguageStrById("层,我们为您准备了超值礼包,帮助您快速通关"), [11943] = GetLanguageStrById("当前特权等级的任务已经完成"), [11944] = GetLanguageStrById("特权"), @@ -2097,7 +2097,7 @@ Language = { [12096] = GetLanguageStrById("关卡进度"), [12097] = GetLanguageStrById("战力排名"), [12098] = GetLanguageStrById("公会排名"), - [12099] = GetLanguageStrById("蛇道挑战"), + [12099] = GetLanguageStrById("法兰克国王挑战"), [12100] = GetLanguageStrById("点金排名"), [12101] = GetLanguageStrById("竞技排名"), [12102] = GetLanguageStrById("极速排名"), @@ -2164,7 +2164,7 @@ Language = { [12163] = GetLanguageStrById("解锁"), [12164] = GetLanguageStrById("已将任务解锁!"), [12165] = GetLanguageStrById("已锁定任务!"), - [12166] = GetLanguageStrById("通过蛇道挑战第%s波"), + [12166] = GetLanguageStrById("通过法兰克挑战第%s波"), [12167] = GetLanguageStrById("无可领取附件!"), [12168] = GetLanguageStrById("【金色】"), [12169] = GetLanguageStrById("已经拥有该皮肤"), @@ -2304,7 +2304,7 @@ Language = { [12303] = GetLanguageStrById("剩余:%s次"), [12304] = GetLanguageStrById("已兑换"), [12305] = GetLanguageStrById("兑换"), - [12306] = GetLanguageStrById("蛇道挑战阵容:"), + [12306] = GetLanguageStrById("法兰克王国挑战阵容:"), [12307] = GetLanguageStrById("当前已激活该称号,是否要重复使用?"), [12308] = GetLanguageStrById("成功激活称号!"), [12309] = GetLanguageStrById("%s、单场战斗伤害到达%s"), diff --git a/Assets/ManagedResources/~Lua/Modules/Arena/ArenaTypePanel.lua b/Assets/ManagedResources/~Lua/Modules/Arena/ArenaTypePanel.lua index b9a6d658ab..2e8344428c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Arena/ArenaTypePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Arena/ArenaTypePanel.lua @@ -263,7 +263,7 @@ end -- 刷新竞技场显示 function this.RefreshArenaShow() - this.Arena_Name.text = ArenaManager.GetArenaName() + --this.Arena_Name.text = ArenaManager.GetArenaName() local baseData = ArenaManager.GetArenaBaseData() this.Arena_Score.text = GetLanguageStrById("我的积分:") .. baseData.score local _, myRankInfo = ArenaManager.GetRankInfo() diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptMainPopup.lua b/Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptMainPopup.lua index db4f2d502c..59346e4d45 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptMainPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptMainPopup.lua @@ -49,7 +49,7 @@ function GuildTranscriptMainPopup:InitComponent() this.SelectImage = Util.GetGameObject(this.m_go, "upChapterGo/SelectImage") local v2 = Util.GetGameObject(this.m_go, "upChapterGo/upChapter"):GetComponent("RectTransform").rect this.titleScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, Util.GetGameObject(this.m_go, "upChapterGo/upChapter").transform, - Util.GetGameObject(this.m_go, "upChapterGo/singleChapterPre"), nil, Vector2.New(-v2.x*2, -v2.y*2), 2, 1, Vector2.New(10,10)) + Util.GetGameObject(this.m_go, "upChapterGo/singleChapterPre"), nil, Vector2.New(-v2.x*2, -v2.y*2), 2, 1, Vector2.New(10,20)) this.titleScrollView.moveTween.MomentumAmount = 1 this.titleScrollView.moveTween.Strength = 1 this.reward1 = Util.GetGameObject(self.gameObject, "middleGo/rewardGo/reward1")