From 86c63eb29c0fbed32982247fa466d9418a425720 Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <419983115@qq.com> Date: Fri, 15 Nov 2024 19:25:10 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BB=E7=95=8C?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index d22e8abd31..e27623a4f2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -1426,7 +1426,7 @@ function this:OnShow() this.btn_weapon:SetActive(CheckFunctionOpen(FUNCTION_OPEN_TYPE.GodWeapon)) this.btnHongMeng:SetActive(CheckFunctionOpen(FUNCTION_OPEN_TYPE.HongMengZhen)) this.btnZhuZhen:SetActive(CheckFunctionOpen(FUNCTION_OPEN_TYPE.HelpFight)) - this.btnGMFuLi:SetActive(CheckFunctionOpen(40)) + --this.btnGMFuLi:SetActive(CheckFunctionOpen(40)) --this.btnTianShuMiJuan:SetActive(CheckFunctionOpen(FUNCTION_OPEN_TYPE.tianshumijuan)) this.btnHomeLand:SetActive(CheckFunctionOpen(FUNCTION_OPEN_TYPE.TrainBuild)) --检测灵兽红点 From b8338bfe601feb4574b571209a2a6816cd1481f7 Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <419983115@qq.com> Date: Fri, 15 Nov 2024 19:28:50 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E7=AD=89=E7=BA=A7=E6=A1=86=E6=89=A9?= =?UTF-8?q?=E5=A4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Battle/BattlePanel.prefab | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab b/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab index 81107da767..87a2773999 100644 --- a/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab @@ -80061,7 +80061,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -86.19996, y: 265.7803} - m_SizeDelta: {x: 44, y: 30} + m_SizeDelta: {x: 44, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7683721027093544007 CanvasRenderer: @@ -80732,8 +80732,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: 6.1} - m_SizeDelta: {x: 60, y: 210} + m_AnchoredPosition: {x: 0, y: -5.69} + m_SizeDelta: {x: 82, y: 210} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1820962070302041831 CanvasRenderer: @@ -81146,7 +81146,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: 94.49, y: 32.32} + m_SizeDelta: {x: 94.49, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2874419574127282486 CanvasRenderer: @@ -81226,7 +81226,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -89, y: -178.2} - m_SizeDelta: {x: 44, y: 30} + m_SizeDelta: {x: 44, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2874419574134861354 CanvasRenderer: @@ -81411,7 +81411,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -86, y: 172} - m_SizeDelta: {x: 60, y: 210} + m_SizeDelta: {x: 82, y: 210} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2874419574504976919 CanvasRenderer: @@ -82856,7 +82856,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -0.0000038146973, y: -8.6} - m_SizeDelta: {x: 34, y: 119.76} + m_SizeDelta: {x: 49.8, y: 119.76} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2874419575647607590 CanvasRenderer: @@ -82888,7 +82888,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} - m_FontSize: 26 + m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -128532,7 +128532,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: -73, y: 448.99994} + m_AnchoredPosition: {x: -43, y: 448.99994} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4305825200119022707 @@ -152823,7 +152823,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -77.3, y: -135.1198} - m_SizeDelta: {x: 44, y: 30} + m_SizeDelta: {x: 44, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &640224801791229068 CanvasRenderer: @@ -157670,7 +157670,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0.8, y: -1.6} - m_SizeDelta: {x: 160, y: 30} + m_SizeDelta: {x: 160, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2239206459264392728 CanvasRenderer: @@ -158615,7 +158615,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -1.07, y: 6.66} - m_SizeDelta: {x: 38.8, y: 119.39} + m_SizeDelta: {x: 49.2, y: 119.39} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5731999021588630059 CanvasRenderer: @@ -158647,7 +158647,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} - m_FontSize: 26 + m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -181291,7 +181291,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: -373, y: 448.99994} + m_AnchoredPosition: {x: -343, y: 448.99994} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &6825431846208163273 @@ -181516,7 +181516,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -0.14, y: 1} - m_SizeDelta: {x: 40.4, y: 132.91} + m_SizeDelta: {x: 49.2, y: 132.91} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &369946269844609365 CanvasRenderer: @@ -181548,7 +181548,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} - m_FontSize: 26 + m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -187192,8 +187192,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} - m_SizeDelta: {x: 60, y: 210} + m_AnchoredPosition: {x: 0, y: -5.69} + m_SizeDelta: {x: 82, y: 210} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7785090322639281448 CanvasRenderer: @@ -222334,7 +222334,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0.8, y: -1.6} - m_SizeDelta: {x: 160, y: 30} + m_SizeDelta: {x: 160, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1789265275343516348 CanvasRenderer: @@ -222486,7 +222486,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: 227, y: 448.99994} + m_AnchoredPosition: {x: 257, y: 448.99994} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &8370865409953643750 From ed33a3829c69e2c449cdbad0741c701db64313d1 Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <419983115@qq.com> Date: Fri, 15 Nov 2024 19:32:36 +0800 Subject: [PATCH 03/10] 1 --- .../UI/Formation/FormationPanelV2.prefab | 120 +++++++++--------- 1 file changed, 60 insertions(+), 60 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab b/Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab index be31d326e6..59d7986e44 100644 --- a/Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab @@ -71381,21 +71381,21 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 35 objectReference: {fileID: 0} - - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2319247476101566275, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_SizeDelta.y - value: 35 - objectReference: {fileID: 0} - target: {fileID: 3285305655078153422, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_LocalPosition.y value: 43 objectReference: {fileID: 0} + - target: {fileID: 2319247476101566275, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_SizeDelta.y + value: 38 + objectReference: {fileID: 0} + - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5551263874080747337, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_IsActive @@ -71646,21 +71646,21 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 35 objectReference: {fileID: 0} - - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2319247476101566275, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_SizeDelta.y - value: 35 - objectReference: {fileID: 0} - target: {fileID: 3285305655078153422, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_LocalPosition.y value: 43 objectReference: {fileID: 0} + - target: {fileID: 2319247476101566275, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_SizeDelta.y + value: 38 + objectReference: {fileID: 0} + - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5551263874080747337, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_IsActive @@ -71911,21 +71911,21 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 35 objectReference: {fileID: 0} - - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2319247476101566275, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_SizeDelta.y - value: 35 - objectReference: {fileID: 0} - target: {fileID: 3285305655078153422, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_LocalPosition.y value: 43 objectReference: {fileID: 0} + - target: {fileID: 2319247476101566275, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_SizeDelta.y + value: 38 + objectReference: {fileID: 0} + - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5551263874080747337, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_IsActive @@ -72176,21 +72176,21 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 35 objectReference: {fileID: 0} - - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2319247476101566275, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_SizeDelta.y - value: 35 - objectReference: {fileID: 0} - target: {fileID: 3285305655078153422, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_LocalPosition.y value: 43 objectReference: {fileID: 0} + - target: {fileID: 2319247476101566275, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_SizeDelta.y + value: 38 + objectReference: {fileID: 0} + - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5551263874080747337, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_IsActive @@ -72441,21 +72441,21 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 35 objectReference: {fileID: 0} - - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2319247476101566275, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_SizeDelta.y - value: 35 - objectReference: {fileID: 0} - target: {fileID: 3285305655078153422, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_LocalPosition.y value: 43 objectReference: {fileID: 0} + - target: {fileID: 2319247476101566275, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_SizeDelta.y + value: 38 + objectReference: {fileID: 0} + - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5551263874080747337, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_IsActive @@ -72706,21 +72706,21 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 35 objectReference: {fileID: 0} - - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2319247476101566275, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_SizeDelta.y - value: 35 - objectReference: {fileID: 0} - target: {fileID: 3285305655078153422, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_LocalPosition.y value: 43 objectReference: {fileID: 0} + - target: {fileID: 2319247476101566275, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_SizeDelta.y + value: 38 + objectReference: {fileID: 0} + - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5551263874080747337, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_IsActive From 38399fff24420da958ecb0ab8c72e0d16a711b14 Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <419983115@qq.com> Date: Mon, 25 Nov 2024 19:42:31 +0800 Subject: [PATCH 04/10] =?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/TailsmanSoulView/TailsManSouPanel.prefab | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/TailsmanSoulView/TailsManSouPanel.prefab b/Assets/ManagedResources/Prefabs/UI/TailsmanSoulView/TailsManSouPanel.prefab index 26fc2dce31..a9e7fdadbc 100644 --- a/Assets/ManagedResources/Prefabs/UI/TailsmanSoulView/TailsManSouPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/TailsmanSoulView/TailsManSouPanel.prefab @@ -53604,7 +53604,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: -20.299988, y: 0} + m_AnchoredPosition: {x: -52, y: 0} m_SizeDelta: {x: 41, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7437740841483316552 @@ -68041,7 +68041,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: -20.299988, y: 0} + m_AnchoredPosition: {x: -52, y: 0} m_SizeDelta: {x: 41, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5556797119365484093 @@ -82493,7 +82493,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: -35, y: 0} + m_AnchoredPosition: {x: -52, y: 0} m_SizeDelta: {x: 41, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7589231199091921422 @@ -118246,7 +118246,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: -20.299988, y: 0} + m_AnchoredPosition: {x: -52, y: 0} m_SizeDelta: {x: 41, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2040492490998362794 @@ -123314,7 +123314,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: -20.299988, y: 0} + m_AnchoredPosition: {x: -52, y: 0} m_SizeDelta: {x: 41, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2746729079263569602 From 4827e9b2056a5c0ab6b5b589ccca534aabbc1a9c Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <419983115@qq.com> Date: Mon, 25 Nov 2024 19:48:57 +0800 Subject: [PATCH 05/10] =?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 --- .../~Lua/Modules/TailsManSoul/TailsmanSoulMainPanel.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsmanSoulMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsmanSoulMainPanel.lua index 50e6e4991a..2b4d3acd3f 100644 --- a/Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsmanSoulMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsmanSoulMainPanel.lua @@ -206,7 +206,7 @@ function TailsmanSoulMainPanel:GetProData() for i = 1, #curData do --LogError("addlv======================"..addLv.." pro========="..pro) local value = math.floor(curData[i][2] * (1 + addLv * pro) + 0.5) - str = string.format("%s:%s", propertyConfig[curData[i][1]].Info, + str = string.format("%s:%s", GetLanguageStrById(propertyConfig[curData[i][1]].Info), GetPropertyFormatStrOne(propertyConfig[curData[i][1]].Style, value)) if nextProData[curData[i][1]] then str = str .. From 916a55caa8c0d4a1e294a9d617c5cb350854ae02 Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <419983115@qq.com> Date: Mon, 25 Nov 2024 20:01:53 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BE=E7=89=87sprit?= =?UTF-8?q?e?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Atlas/CarbonNewAtlas/f_fuben_fubenmingdi.png.meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/Atlas/CarbonNewAtlas/f_fuben_fubenmingdi.png.meta b/Assets/ManagedResources/Atlas/CarbonNewAtlas/f_fuben_fubenmingdi.png.meta index ca377679cc..7aa895038d 100644 --- a/Assets/ManagedResources/Atlas/CarbonNewAtlas/f_fuben_fubenmingdi.png.meta +++ b/Assets/ManagedResources/Atlas/CarbonNewAtlas/f_fuben_fubenmingdi.png.meta @@ -46,7 +46,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 141, y: 0, z: 164, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 From b1721d4b1416b25213a60b14e7b1dfa9df406b4f Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <419983115@qq.com> Date: Mon, 25 Nov 2024 20:09:31 +0800 Subject: [PATCH 07/10] 1 --- .../~Lua/Modules/Gem/SmallSoldierLvInfoPanel.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Gem/SmallSoldierLvInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/Gem/SmallSoldierLvInfoPanel.lua index 36705eea93..cdba12a9b4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Gem/SmallSoldierLvInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Gem/SmallSoldierLvInfoPanel.lua @@ -255,10 +255,10 @@ function SmallSoldierLvInfoPanel:SingleDataShow(go, data) if data.leftData then leftTxt.text = data.leftData.quaStr leftObj:GetComponent("Image").color = quaColor[data.leftData.qua] - leftValue.text = data.leftData.pro + leftValue.text = data.leftData.pro.."%" end if data.rightData then - rightTxt.text = data.rightData.pro + rightTxt.text = data.rightData.pro.."%" rightObj:GetComponent("Image").color = quaColor[data.rightData.qua] end end From 9dabb660f0f2fad020aef4db538738eb3d4f7ba5 Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <419983115@qq.com> Date: Mon, 25 Nov 2024 20:30:17 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/GeneralPanel/GeneralBigPopup.prefab | 70 +++++++++---------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab index e40bdf0cbb..ba4d938355 100644 --- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab @@ -114,10 +114,10 @@ RectTransform: m_Father: {fileID: 6511771316027140810} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 150} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 595, y: -45} + m_SizeDelta: {x: 150, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &103057047 CanvasRenderer: @@ -4744,10 +4744,10 @@ RectTransform: m_Father: {fileID: 6511771316027140810} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 150} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 75, y: -45} + m_SizeDelta: {x: 150, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4333355844115441707 CanvasRenderer: @@ -7080,7 +7080,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -410} - m_SizeDelta: {x: 0, y: 90} + m_SizeDelta: {x: 800, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5992374240210674179 CanvasRenderer: @@ -16508,10 +16508,10 @@ RectTransform: m_Father: {fileID: 6511771316027140810} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 150} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 465, y: -45} + m_SizeDelta: {x: 150, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1573551743946025575 CanvasRenderer: @@ -19559,7 +19559,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: -1181, y: -205} - m_SizeDelta: {x: 870, y: 176} + m_SizeDelta: {x: 870, y: 144} m_Pivot: {x: 0.5, y: 1} --- !u!222 &1728086137514947813 CanvasRenderer: @@ -20056,10 +20056,10 @@ RectTransform: m_Father: {fileID: 6511771316027140810} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 150} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 335, y: -45} + m_SizeDelta: {x: 150, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4934918169303577311 CanvasRenderer: @@ -22199,10 +22199,10 @@ RectTransform: m_Father: {fileID: 6511771316027140810} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 150} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 205, y: -45} + m_SizeDelta: {x: 150, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5684472203954849967 CanvasRenderer: @@ -23924,10 +23924,10 @@ RectTransform: m_Father: {fileID: 6511771316027140810} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 150} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 725, y: -45} + m_SizeDelta: {x: 150, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6724403881698098274 CanvasRenderer: @@ -25659,8 +25659,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: 175, y: -17.5} - m_SizeDelta: {x: 350, y: 35} + m_AnchoredPosition: {x: 175, y: -19} + m_SizeDelta: {x: 350, y: 38} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2410937454114771322 CanvasRenderer: @@ -25692,7 +25692,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} - m_FontSize: 28 + m_FontSize: 25 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 @@ -31431,7 +31431,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3828362588263756447 RectTransform: m_ObjectHideFlags: 0 @@ -31597,8 +31597,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: 340, y: -138.5} - m_SizeDelta: {x: 600, y: 35} + m_AnchoredPosition: {x: 340, y: -122.5} + m_SizeDelta: {x: 600, y: 38} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &6647022923002570540 MonoBehaviour: @@ -31620,7 +31620,7 @@ MonoBehaviour: m_ChildAlignment: 0 m_StartCorner: 0 m_StartAxis: 0 - m_CellSize: {x: 350, y: 35} + m_CellSize: {x: 350, y: 38} m_Spacing: {x: 100, y: 0} m_Constraint: 1 m_ConstraintCount: 2 @@ -39928,7 +39928,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &5455853077341739355 RectTransform: m_ObjectHideFlags: 0 @@ -49518,7 +49518,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} - m_FontSize: 28 + m_FontSize: 25 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 From 15c547f78f699d9a755c42f299684d6b1d41ed0c Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <419983115@qq.com> Date: Mon, 25 Nov 2024 20:50:43 +0800 Subject: [PATCH 09/10] =?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/RoleInfo/FaXiangStrongPopup.prefab | 4 +- .../UI/RoleInfo/HelpFightListPanel.prefab | 76 +++++++++---------- 2 files changed, 40 insertions(+), 40 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/FaXiangStrongPopup.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/FaXiangStrongPopup.prefab index 53f8962083..ac0101cd10 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/FaXiangStrongPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/FaXiangStrongPopup.prefab @@ -2451,8 +2451,8 @@ MonoBehaviour: m_Alignment: 1 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u7CBE\u536B" LanguageIndex: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/HelpFightListPanel.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/HelpFightListPanel.prefab index 6b531a98ee..88de7005cc 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/HelpFightListPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/HelpFightListPanel.prefab @@ -785,8 +785,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: -1002, y: 166} - m_SizeDelta: {x: 467, y: 161.9} + m_AnchoredPosition: {x: -1635, y: 131} + m_SizeDelta: {x: 940, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222865794791962386 CanvasRenderer: @@ -902,7 +902,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: 135.00003, y: 51} + m_AnchoredPosition: {x: 138.6, y: 55.4} m_SizeDelta: {x: 62, y: 61} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222795079043811118 @@ -1515,8 +1515,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.9, y: 252} - m_SizeDelta: {x: 950.6, y: 888.3} + m_AnchoredPosition: {x: -1.9, y: 239} + m_SizeDelta: {x: 950.6, y: 875.3} m_Pivot: {x: 0.5, y: 1} --- !u!222 &222846710238382770 CanvasRenderer: @@ -1602,7 +1602,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0.0099487305} - m_SizeDelta: {x: 467, y: 161.9} + m_SizeDelta: {x: 940, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5238527474231444209 CanvasRenderer: @@ -1794,8 +1794,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: 170, y: -27.4} - m_SizeDelta: {x: 100, y: 70} + m_AnchoredPosition: {x: 355, y: -25} + m_SizeDelta: {x: 200, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3270184861045034609 CanvasRenderer: @@ -1912,7 +1912,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: 0, y: -387} + m_AnchoredPosition: {x: 0, y: -406.3} m_SizeDelta: {x: 384.31, y: 64.410034} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9129770041020553829 @@ -2147,8 +2147,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} - m_SizeDelta: {x: 57.37, y: 35.96} + m_AnchoredPosition: {x: 0, y: -0.73} + m_SizeDelta: {x: 57.37, y: 45.19} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1914763939598390696 CanvasRenderer: @@ -2343,8 +2343,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: 25, y: -23} - m_SizeDelta: {x: 190, y: 115} + m_AnchoredPosition: {x: -27, y: -22.64} + m_SizeDelta: {x: 554.1, y: 133.56} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4811937311889734649 MonoBehaviour: @@ -2789,7 +2789,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: 245, y: 58} + m_AnchoredPosition: {x: 245, y: 68.6} m_SizeDelta: {x: 150, y: 42.949997} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1932176477050273238 @@ -2941,10 +2941,10 @@ RectTransform: m_Father: {fileID: 137115678867053973} m_RootOrder: 0 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, y: -68} - m_SizeDelta: {x: 190, y: 135} + 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_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4610690047335113192 CanvasRenderer: @@ -3023,8 +3023,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: 25, y: -23} - m_SizeDelta: {x: 190, y: 115} + m_AnchoredPosition: {x: -59.125, y: -20.19} + m_SizeDelta: {x: 482.55, y: 132.14} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &6954505201722866285 MonoBehaviour: @@ -3426,8 +3426,8 @@ 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: 245, y: 58} - m_SizeDelta: {x: 150, y: 42.949997} + m_AnchoredPosition: {x: 258.5, y: 69} + m_SizeDelta: {x: 194.9, y: 42.9} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5103503315900522486 CanvasRenderer: @@ -3578,10 +3578,10 @@ RectTransform: m_Father: {fileID: 2892372902615738170} m_RootOrder: 0 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, y: -68} - m_SizeDelta: {x: 190, y: 135} + 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_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3261663237236934510 CanvasRenderer: @@ -3970,8 +3970,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: 170, y: -21} - m_SizeDelta: {x: 100, y: 70} + m_AnchoredPosition: {x: 352, y: -21} + m_SizeDelta: {x: 200, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &980430309912384432 CanvasRenderer: @@ -4086,7 +4086,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: 70, y: 36} + m_AnchoredPosition: {x: -162, y: 49.9} m_SizeDelta: {x: 300, y: 5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5658328716964821449 @@ -4160,8 +4160,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} - m_SizeDelta: {x: 57.37, y: 35.96} + m_AnchoredPosition: {x: -1.36, y: 0.98} + m_SizeDelta: {x: 69.83, y: 52.48} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8121072150671338370 CanvasRenderer: @@ -4241,8 +4241,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: 170, y: -25.7} - m_SizeDelta: {x: 100, y: 70} + m_AnchoredPosition: {x: 355, y: -25} + m_SizeDelta: {x: 200, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4193585976779785755 CanvasRenderer: @@ -4511,8 +4511,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: -238, y: 410.99005} - m_SizeDelta: {x: 467, y: 161.88} + m_AnchoredPosition: {x: 0, y: 398.7} + m_SizeDelta: {x: 940, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6824140670269876882 CanvasRenderer: @@ -4706,8 +4706,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: 170, y: -21} - m_SizeDelta: {x: 100, y: 70} + m_AnchoredPosition: {x: 352, y: -21} + m_SizeDelta: {x: 200, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8064407377356048198 CanvasRenderer: @@ -4822,7 +4822,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: 70, y: 36} + m_AnchoredPosition: {x: -160.9, y: 50.1} m_SizeDelta: {x: 300, y: 5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &214603310519987121 From edfd5c059c43fda04471b059434389a2eab52a5c Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <419983115@qq.com> Date: Mon, 25 Nov 2024 20:51:03 +0800 Subject: [PATCH 10/10] =?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 --- .../~Lua/Modules/HelpFight/HelpFightListPanel.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/HelpFight/HelpFightListPanel.lua b/Assets/ManagedResources/~Lua/Modules/HelpFight/HelpFightListPanel.lua index 4ab195a7e3..3528821d75 100644 --- a/Assets/ManagedResources/~Lua/Modules/HelpFight/HelpFightListPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/HelpFight/HelpFightListPanel.lua @@ -20,7 +20,7 @@ function HelpFightListPanel:InitComponent() this.Scrollbar = Util.GetGameObject(self.gameObject, "Scrollbar"):GetComponent("Scrollbar") this.ScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, Util.GetGameObject(self.gameObject, "scroll").transform, - this.cardPre, this.Scrollbar, Vector2.New(v.width, v.height), 1, 2, Vector2.New(10, 20)) + this.cardPre, this.Scrollbar, Vector2.New(v.width, v.height), 1, 1, Vector2.New(10, 20)) this.ScrollView.moveTween.MomentumAmount = 1 this.ScrollView.moveTween.Strength = 1 this.NoneImage = Util.GetGameObject(self.gameObject, "NoneImage")