From 614ae4698488eff947dc926f3c99eea96d649092 Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <419983115@qq.com> Date: Wed, 27 Nov 2024 15:24:54 +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 --- .../UI/Carbon/NewCarbon/CarbonsPanel.prefab | 36 +- .../Prefabs/UI/Gem/GemPanel.prefab | 18 +- .../UI/GodsWay/GodsWayTowerPanel.prefab | 346 +++++++++--------- .../Prefabs/UI/Guild/GuildFetePopup.prefab | 32 +- .../UI/Ranking/RankingListMainPanel.prefab | 8 +- .../ManagedResources/~Lua/Common/Language.lua | 2 +- .../~Lua/Modules/RoleInfo/RoleGiftPanel.lua | 4 +- 7 files changed, 223 insertions(+), 223 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Carbon/NewCarbon/CarbonsPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Carbon/NewCarbon/CarbonsPanel.prefab index 018a134799..1e1f3a6570 100644 --- a/Assets/ManagedResources/Prefabs/UI/Carbon/NewCarbon/CarbonsPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Carbon/NewCarbon/CarbonsPanel.prefab @@ -1402,8 +1402,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: 135.5, y: -18.5} - m_SizeDelta: {x: 271, y: 37} + m_AnchoredPosition: {x: 145, y: -18.5} + m_SizeDelta: {x: 290, y: 37} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6495588927036638659 CanvasRenderer: @@ -1476,7 +1476,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: -127, y: 1} + m_AnchoredPosition: {x: -154.6001, y: 1} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4701192788520570845 @@ -2092,7 +2092,7 @@ MonoBehaviour: m_ChildAlignment: 0 m_StartCorner: 0 m_StartAxis: 0 - m_CellSize: {x: 271, y: 37} + m_CellSize: {x: 290, y: 37} m_Spacing: {x: 0, y: 0} m_Constraint: 1 m_ConstraintCount: 1 @@ -2241,8 +2241,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: 1.3, y: 3} - m_SizeDelta: {x: 184, y: 39} + m_AnchoredPosition: {x: 13.39, y: 3} + m_SizeDelta: {x: 254.67, y: 39} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6500783828367067171 CanvasRenderer: @@ -2279,7 +2279,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 2 m_MaxSize: 40 - m_Alignment: 4 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 @@ -2730,7 +2730,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: 100, y: 20} + m_AnchoredPosition: {x: 137.6, y: 31.1} m_SizeDelta: {x: 30, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6697413273450810149 @@ -2952,7 +2952,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: -127.2, y: 2.4} + m_AnchoredPosition: {x: -154.8, y: 2.4} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7157460571225524541 @@ -3219,8 +3219,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: -1108, y: 173} - m_SizeDelta: {x: 325, y: 87} + m_AnchoredPosition: {x: -1080.01, y: 173} + m_SizeDelta: {x: 380.99, y: 87} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1102756234027167001 CanvasRenderer: @@ -3251,7 +3251,7 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 4821f897b6fb6dc42b69932fb799ad06, type: 3} - m_Type: 0 + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -3822,8 +3822,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: 135.5, y: -55.5} - m_SizeDelta: {x: 271, y: 37} + m_AnchoredPosition: {x: 145, y: -55.5} + m_SizeDelta: {x: 290, y: 37} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5074906141544346636 CanvasRenderer: @@ -4157,8 +4157,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: 135.5, y: -92.5} - m_SizeDelta: {x: 271, y: 37} + m_AnchoredPosition: {x: 145, y: -92.5} + m_SizeDelta: {x: 290, y: 37} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3282577278308170168 CanvasRenderer: @@ -4838,8 +4838,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: 135.5, y: -129.5} - m_SizeDelta: {x: 271, y: 37} + m_AnchoredPosition: {x: 145, y: -129.5} + m_SizeDelta: {x: 290, y: 37} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3619866950882426101 CanvasRenderer: diff --git a/Assets/ManagedResources/Prefabs/UI/Gem/GemPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Gem/GemPanel.prefab index 6dd9d1c914..f9afae631e 100644 --- a/Assets/ManagedResources/Prefabs/UI/Gem/GemPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Gem/GemPanel.prefab @@ -69,7 +69,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} - m_FontSize: 35 + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 @@ -263,7 +263,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} - m_FontSize: 35 + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 @@ -374,7 +374,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} - m_FontSize: 35 + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 @@ -485,7 +485,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} - m_FontSize: 35 + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 @@ -596,7 +596,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} - m_FontSize: 35 + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 @@ -681,7 +681,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: -250} + m_AnchoredPosition: {x: 10, y: -223} m_SizeDelta: {x: 800, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1576026678 @@ -799,7 +799,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} - m_FontSize: 35 + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 @@ -910,7 +910,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} - m_FontSize: 35 + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 @@ -1021,7 +1021,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} - m_FontSize: 35 + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 diff --git a/Assets/ManagedResources/Prefabs/UI/GodsWay/GodsWayTowerPanel.prefab b/Assets/ManagedResources/Prefabs/UI/GodsWay/GodsWayTowerPanel.prefab index d9e5938c9a..245fc76ce2 100644 --- a/Assets/ManagedResources/Prefabs/UI/GodsWay/GodsWayTowerPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GodsWay/GodsWayTowerPanel.prefab @@ -25861,7 +25861,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: 28.3, y: 0.0000069141} + m_AnchoredPosition: {x: 99, y: -5.2} m_SizeDelta: {x: 121.51, y: 40.58} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4731455805283454071 @@ -68146,8 +68146,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: 94.600006, y: -19.190002} - m_SizeDelta: {x: 213, y: 58} + m_AnchoredPosition: {x: 47.6, y: -19.190002} + m_SizeDelta: {x: 98, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1798275871522754023 CanvasRenderer: @@ -68177,7 +68177,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: 54b159ca46c66ab4b88b0c543c385682, type: 3} + m_Sprite: {fileID: 21300000, guid: 0fdb11ebf0af8694cb08b9c264d3fa2a, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -73777,61 +73777,6 @@ PrefabInstance: propertyPath: m_LocalScale.y value: 0.75 objectReference: {fileID: 0} - - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[0] - value: - objectReference: {fileID: 4239138255771575618} - - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[1] - value: - objectReference: {fileID: 1478786657260596419} - - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[2] - value: - objectReference: {fileID: 8145092030358069884} - - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[3] - value: - objectReference: {fileID: 8834863461068896970} - - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[4] - value: - objectReference: {fileID: 3934879465561439888} - - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[5] - value: - objectReference: {fileID: 1298431382559632061} - - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[6] - value: - objectReference: {fileID: 8215435202396873296} - - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[7] - value: - objectReference: {fileID: 8345161809758301208} - - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[8] - value: - objectReference: {fileID: 4109518020871527147} - - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[9] - value: - objectReference: {fileID: 8630497023421281403} - - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_RootBone - value: - objectReference: {fileID: 4239138255771575618} - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_Bones.Array.data[0] @@ -73887,6 +73832,61 @@ PrefabInstance: propertyPath: m_RootBone value: objectReference: {fileID: 6789526059838717039} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[0] + value: + objectReference: {fileID: 4239138255771575618} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[1] + value: + objectReference: {fileID: 1478786657260596419} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[2] + value: + objectReference: {fileID: 8145092030358069884} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[3] + value: + objectReference: {fileID: 8834863461068896970} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[4] + value: + objectReference: {fileID: 3934879465561439888} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[5] + value: + objectReference: {fileID: 1298431382559632061} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[6] + value: + objectReference: {fileID: 8215435202396873296} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[7] + value: + objectReference: {fileID: 8345161809758301208} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[8] + value: + objectReference: {fileID: 4109518020871527147} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[9] + value: + objectReference: {fileID: 8630497023421281403} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_RootBone + value: + objectReference: {fileID: 4239138255771575618} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} --- !u!4 &6642769763838568755 stripped @@ -74124,61 +74124,6 @@ PrefabInstance: propertyPath: m_LocalScale.y value: 0.75 objectReference: {fileID: 0} - - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[0] - value: - objectReference: {fileID: 662747332772281235} - - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[1] - value: - objectReference: {fileID: 2838191739614327314} - - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[2] - value: - objectReference: {fileID: 4823305674520378541} - - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[3] - value: - objectReference: {fileID: 5295460731459003419} - - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[4] - value: - objectReference: {fileID: 1085587704857244898} - - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[5] - value: - objectReference: {fileID: 2441523354941633644} - - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[6] - value: - objectReference: {fileID: 4748458885330304129} - - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[7] - value: - objectReference: {fileID: 4623231488584757961} - - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[8] - value: - objectReference: {fileID: 3704848856444800584} - - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[9] - value: - objectReference: {fileID: 5642701455126167049} - - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_RootBone - value: - objectReference: {fileID: 662747332772281235} - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_Bones.Array.data[0] @@ -74234,6 +74179,61 @@ PrefabInstance: propertyPath: m_RootBone value: objectReference: {fileID: 7917258885034123966} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[0] + value: + objectReference: {fileID: 662747332772281235} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[1] + value: + objectReference: {fileID: 2838191739614327314} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[2] + value: + objectReference: {fileID: 4823305674520378541} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[3] + value: + objectReference: {fileID: 5295460731459003419} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[4] + value: + objectReference: {fileID: 1085587704857244898} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[5] + value: + objectReference: {fileID: 2441523354941633644} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[6] + value: + objectReference: {fileID: 4748458885330304129} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[7] + value: + objectReference: {fileID: 4623231488584757961} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[8] + value: + objectReference: {fileID: 3704848856444800584} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[9] + value: + objectReference: {fileID: 5642701455126167049} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_RootBone + value: + objectReference: {fileID: 662747332772281235} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} --- !u!4 &1875746557491206881 stripped @@ -74465,11 +74465,6 @@ PrefabInstance: propertyPath: m_LocalScale.y value: 0.75 objectReference: {fileID: 0} - - target: {fileID: 5731619939437485109, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - target: {fileID: 2320031819405606816, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_IsActive @@ -74480,61 +74475,11 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 5731619939437485109, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_Bones.Array.data[0] - value: - objectReference: {fileID: 242976170226757424} - - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[1] - value: - objectReference: {fileID: 3246810435530417841} - - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[2] - value: - objectReference: {fileID: 5224851005951387662} - - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[3] - value: - objectReference: {fileID: 4832632607405404344} - - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[4] - value: - objectReference: {fileID: 1085587704857244898} - - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[5] - value: - objectReference: {fileID: 3138934397645299919} - - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[6] - value: - objectReference: {fileID: 5442704090709780514} - - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[7] - value: - objectReference: {fileID: 5351595982620730986} - - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[8] - value: - objectReference: {fileID: 4109518020871527147} - - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[9] - value: - objectReference: {fileID: 5642701455126167049} - - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_RootBone - value: - objectReference: {fileID: 242976170226757424} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_Bones.Array.data[0] @@ -74590,6 +74535,61 @@ PrefabInstance: propertyPath: m_RootBone value: objectReference: {fileID: 7472164165561955869} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[0] + value: + objectReference: {fileID: 242976170226757424} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[1] + value: + objectReference: {fileID: 3246810435530417841} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[2] + value: + objectReference: {fileID: 5224851005951387662} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[3] + value: + objectReference: {fileID: 4832632607405404344} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[4] + value: + objectReference: {fileID: 1085587704857244898} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[5] + value: + objectReference: {fileID: 3138934397645299919} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[6] + value: + objectReference: {fileID: 5442704090709780514} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[7] + value: + objectReference: {fileID: 5351595982620730986} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[8] + value: + objectReference: {fileID: 4109518020871527147} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[9] + value: + objectReference: {fileID: 5642701455126167049} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_RootBone + value: + objectReference: {fileID: 242976170226757424} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} --- !u!4 &4378795258779545256 stripped diff --git a/Assets/ManagedResources/Prefabs/UI/Guild/GuildFetePopup.prefab b/Assets/ManagedResources/Prefabs/UI/Guild/GuildFetePopup.prefab index 456dd0cf9c..8d1be1b31c 100644 --- a/Assets/ManagedResources/Prefabs/UI/Guild/GuildFetePopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Guild/GuildFetePopup.prefab @@ -9701,7 +9701,7 @@ MonoBehaviour: m_PressedTrigger: Pressed m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 0} + m_TargetGraphic: {fileID: 6007162569723480479} m_OnClick: m_PersistentCalls: m_Calls: [] @@ -30676,7 +30676,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: -328.1} + m_AnchoredPosition: {x: 0, y: -353} m_SizeDelta: {x: 212.66, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1302051257419407867 @@ -41330,7 +41330,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: -328.1} + m_AnchoredPosition: {x: 0, y: -353} m_SizeDelta: {x: 212.66, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4450733372872219073 @@ -52022,7 +52022,7 @@ 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.80000305, y: 0} + m_AnchoredPosition: {x: 0.80000305, y: 6} m_SizeDelta: {x: -54.51, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5716217659202862554 @@ -52055,15 +52055,15 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} - m_FontSize: 40 + m_FontSize: 35 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 4 + m_MinSize: 3 m_MaxSize: 45 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u796D \u7940" @@ -52661,7 +52661,7 @@ 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.80000305, y: 0} + m_AnchoredPosition: {x: 0.80000305, y: 6} m_SizeDelta: {x: -54.51, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8346433259537092315 @@ -52694,15 +52694,15 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} - m_FontSize: 40 + m_FontSize: 35 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 4 + m_MinSize: 3 m_MaxSize: 45 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u796D \u7940" @@ -63692,7 +63692,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: -328.1} + m_AnchoredPosition: {x: 0, y: -353} m_SizeDelta: {x: 212.66, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4219218564692603740 @@ -64085,7 +64085,7 @@ 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.80000305, y: 0} + m_AnchoredPosition: {x: 0.80000305, y: 6} m_SizeDelta: {x: -54.51, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2992859326272719800 @@ -64118,15 +64118,15 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} - m_FontSize: 40 + m_FontSize: 35 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 4 + m_MinSize: 3 m_MaxSize: 45 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u796D \u7940" diff --git a/Assets/ManagedResources/Prefabs/UI/Ranking/RankingListMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Ranking/RankingListMainPanel.prefab index 04888b7641..0cf34f1255 100644 --- a/Assets/ManagedResources/Prefabs/UI/Ranking/RankingListMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Ranking/RankingListMainPanel.prefab @@ -1052,7 +1052,7 @@ 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.0007324219, y: 0.000061035156} + m_AnchoredPosition: {x: -0.0007324219, y: 5.4} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1368082059756365163 @@ -2166,7 +2166,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: 94.6, y: 19} + m_AnchoredPosition: {x: 124.1, y: 28.4} m_SizeDelta: {x: 30, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7597702777668687824 @@ -2990,8 +2990,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: 268.5, y: -99.5} - m_SizeDelta: {x: 266, y: 80} + m_AnchoredPosition: {x: 268.5, y: -103.9} + m_SizeDelta: {x: 320, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8440013227534213861 CanvasRenderer: diff --git a/Assets/ManagedResources/~Lua/Common/Language.lua b/Assets/ManagedResources/~Lua/Common/Language.lua index 95dee11b16..f988841bb8 100644 --- a/Assets/ManagedResources/~Lua/Common/Language.lua +++ b/Assets/ManagedResources/~Lua/Common/Language.lua @@ -2181,7 +2181,7 @@ [12180] = GetLanguageStrById("不朽天赋"), [12181] = GetLanguageStrById("全体神将"), [12182] = GetLanguageStrById(" 主角礼物加成+%s (%s%%)"), - [12183] = GetLanguageStrById(" 修炼加成+%s (%s%%)"), + [12183] = GetLanguageStrById(" 修炼加成+ (%s%%)"), [12184] = GetLanguageStrById(" 潜能 +%s(%s%%)"), [12185] = GetLanguageStrById("全体神将潜能等级+"), [12186] = GetLanguageStrById("神将潜能等级+"), diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleGiftPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleGiftPanel.lua index 28c623eb20..44fb6c22dd 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleGiftPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleGiftPanel.lua @@ -293,9 +293,9 @@ function this.RefreshWindowData() this.proGrid.transform:GetChild(i - 1).gameObject:SetActive(true) LogError("originalList[i]======================" .. originalList[i]) this.proGrid.transform:GetChild(i - 1):GetComponent("Text").text = proList[i] .. - string.format(Language[12733], math.floor(originalList[i] * GiftManager.GetPlayerGiftAdd() / 100), + string.format(GetLanguageStrById(Language[12733]), math.floor(originalList[i] * GiftManager.GetPlayerGiftAdd() / 100), GiftManager.GetPlayerGiftAdd()) - .. string.format(Language[12183], math.floor(originalList[i] * HeroManager.ReturnGiftAtt()), + .. string.format(GetLanguageStrById(Language[12183]), math.floor(originalList[i] * HeroManager.ReturnGiftAtt()), HeroManager.ReturnGiftAtt()) elseif i == #proList then this.proGrid.transform:GetChild(i - 1).gameObject:SetActive(true)