From 724e4ae132a6874f529503bbd5270ec5bf42ee66 Mon Sep 17 00:00:00 2001 From: "DESKTOP-MMO982B\\User" <752966621@qq.com> Date: Tue, 5 Aug 2025 04:11:14 +0700 Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CumulativeSignInPage.prefab | 22 +-- .../DynamicActicity/ActivityMainPanel.prefab | 8 +- .../UI/Fight/FightPointPassMainPanel.prefab | 12 +- .../HandBookHeroAndEquipListPanel.prefab | 125 ++++++++++++++++++ .../UI/Mission/MissionDailyPanel.prefab | 32 ++--- .../UI/OnlineReward/OnlineRewardPanel.prefab | 4 +- .../UI/TianShuMiJuan/IncarnationPanel.prefab | 118 ++++++++--------- .../Expedition/View/MonsterFormationInfo.lua | 2 +- 8 files changed, 224 insertions(+), 99 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/CumulativeSignInPage/CumulativeSignInPage.prefab b/Assets/ManagedResources/Prefabs/UI/CumulativeSignInPage/CumulativeSignInPage.prefab index 3d5b4a89e7..bd14233b7b 100644 --- a/Assets/ManagedResources/Prefabs/UI/CumulativeSignInPage/CumulativeSignInPage.prefab +++ b/Assets/ManagedResources/Prefabs/UI/CumulativeSignInPage/CumulativeSignInPage.prefab @@ -14934,8 +14934,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: -4.5, y: -56.3} - m_SizeDelta: {x: 38, y: 33} + m_AnchoredPosition: {x: -3.37, y: -59.94} + m_SizeDelta: {x: 50, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5812313759967168748 CanvasRenderer: @@ -20082,7 +20082,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.6, y: -61.100006} + m_AnchoredPosition: {x: -3.6, y: -67.4} m_SizeDelta: {x: 67.12, y: 51.06} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6896606289026741597 @@ -20106,7 +20106,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.56078434, g: 0.4901961, b: 0.41960788, a: 1} + m_Color: {r: 1, g: 0.1658437, b: 0, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -26092,7 +26092,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 1497, y: 161.00003} + m_AnchoredPosition: {x: 1847, y: 161.00003} m_SizeDelta: {x: 135, y: 164} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8195621685162958145 @@ -31204,8 +31204,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.3, y: -54.799995} - m_SizeDelta: {x: 38, y: 33} + m_AnchoredPosition: {x: -3.3, y: -59.94} + m_SizeDelta: {x: 50, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1576883263553812437 CanvasRenderer: @@ -75553,7 +75553,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -0.5, y: -60.9} + m_AnchoredPosition: {x: -0.5, y: -68.2} m_SizeDelta: {x: 67.12, y: 51.06} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3991833437100285605 @@ -75577,7 +75577,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.41176474, g: 0.34509805, b: 0.2627451, a: 1} + m_Color: {r: 1, g: 0.1389124, b: 0.033018887, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -75633,8 +75633,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: 52, y: 62} - m_SizeDelta: {x: 26, y: 26} + m_AnchoredPosition: {x: 52, y: 34.1} + m_SizeDelta: {x: 54, y: 54} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6437805209302411068 CanvasRenderer: diff --git a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/ActivityMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/ActivityMainPanel.prefab index 1a4fdbf931..183e612c45 100644 --- a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/ActivityMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/ActivityMainPanel.prefab @@ -335,7 +335,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: 13} + m_AnchoredPosition: {x: 0.000030517578, y: 13} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0.5} --- !u!114 &455843809901100221 @@ -474,8 +474,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: 74, y: 69} - m_SizeDelta: {x: 26, y: 26} + m_AnchoredPosition: {x: 70, y: 60} + m_SizeDelta: {x: 54, y: 54} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2326290885151624836 CanvasRenderer: @@ -1127,7 +1127,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 47.6, y: 93} + m_AnchoredPosition: {x: 47.600098, y: 93} m_SizeDelta: {x: 99, y: 179} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4851780475586518862 diff --git a/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab index 0aa1ad2a14..8940c9c03d 100644 --- a/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab @@ -189084,9 +189084,9 @@ RectTransform: m_Father: {fileID: 7718967529276036518} m_RootOrder: 1 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: 142.5, y: 276.6} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -397.5, y: 464.6} m_SizeDelta: {x: 265, y: 101} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2489202773500772192 @@ -206764,9 +206764,9 @@ RectTransform: m_Father: {fileID: 7718967529276036518} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 410.1, y: 72} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -640, y: 460} m_SizeDelta: {x: 251, y: 79} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8209034874334135417 diff --git a/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroAndEquipListPanel.prefab b/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroAndEquipListPanel.prefab index 3568593cb5..9d28cd660d 100644 --- a/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroAndEquipListPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroAndEquipListPanel.prefab @@ -16561,6 +16561,11 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 209.32 objectReference: {fileID: 0} + - target: {fileID: 3461041183831773760, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3461425765958726042, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} propertyPath: m_AnchoredPosition.x @@ -16671,6 +16676,26 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 30 objectReference: {fileID: 0} + - target: {fileID: 3395823834833100134, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3395823834833100134, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3395823834833100134, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3395823834833100134, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 309311516, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} propertyPath: m_FontData.m_FontSize value: 20 @@ -17193,6 +17218,11 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 209.32 objectReference: {fileID: 0} + - target: {fileID: 3461041183831773760, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3461425765958726042, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} propertyPath: m_AnchoredPosition.x @@ -17303,6 +17333,26 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 30 objectReference: {fileID: 0} + - target: {fileID: 3395823834833100134, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3395823834833100134, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3395823834833100134, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3395823834833100134, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 309311516, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} propertyPath: m_FontData.m_FontSize value: 20 @@ -17825,6 +17875,11 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 209.32 objectReference: {fileID: 0} + - target: {fileID: 3461041183831773760, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3461425765958726042, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} propertyPath: m_AnchoredPosition.x @@ -17935,6 +17990,26 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 30 objectReference: {fileID: 0} + - target: {fileID: 3395823834833100134, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3395823834833100134, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3395823834833100134, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3395823834833100134, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 309311516, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} propertyPath: m_FontData.m_FontSize value: 20 @@ -18457,6 +18532,11 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 209.32 objectReference: {fileID: 0} + - target: {fileID: 3461041183831773760, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3461425765958726042, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} propertyPath: m_AnchoredPosition.x @@ -18567,6 +18647,26 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 30 objectReference: {fileID: 0} + - target: {fileID: 3395823834833100134, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3395823834833100134, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3395823834833100134, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3395823834833100134, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 309311516, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} propertyPath: m_FontData.m_FontSize value: 20 @@ -19089,6 +19189,11 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 209.32 objectReference: {fileID: 0} + - target: {fileID: 3461041183831773760, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3461425765958726042, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} propertyPath: m_AnchoredPosition.x @@ -19199,6 +19304,26 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 30 objectReference: {fileID: 0} + - target: {fileID: 3395823834833100134, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3395823834833100134, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3395823834833100134, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3395823834833100134, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 309311516, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} propertyPath: m_FontData.m_FontSize value: 20 diff --git a/Assets/ManagedResources/Prefabs/UI/Mission/MissionDailyPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Mission/MissionDailyPanel.prefab index 2901f708d4..14443b935e 100644 --- a/Assets/ManagedResources/Prefabs/UI/Mission/MissionDailyPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Mission/MissionDailyPanel.prefab @@ -12006,7 +12006,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2262702332955478732 RectTransform: m_ObjectHideFlags: 0 @@ -12016,15 +12016,15 @@ RectTransform: m_GameObject: {fileID: 544887254045487054} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 0.6, y: 0.6, z: 1} m_Children: [] m_Father: {fileID: 5303428851635937635} m_RootOrder: 3 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: 92.1, y: 19.5} - m_SizeDelta: {x: 26, y: 26} + m_AnchoredPosition: {x: 105.5, y: 29.6} + m_SizeDelta: {x: 54, y: 54} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7895992200681348081 CanvasRenderer: @@ -48751,15 +48751,15 @@ RectTransform: m_GameObject: {fileID: 2667810818457753032} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 0.6, y: 0.6, z: 1} m_Children: [] m_Father: {fileID: 224623299494557198} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 55.100014, y: 40.19993} - m_SizeDelta: {x: 40, y: 40} + m_AnchoredPosition: {x: 59.5, y: 46.5} + m_SizeDelta: {x: 54, y: 54} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2816609383545142580 CanvasRenderer: @@ -84784,15 +84784,15 @@ RectTransform: m_GameObject: {fileID: 4490442959950520408} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 0.6, y: 0.6, z: 1} m_Children: [] m_Father: {fileID: 224289953797446988} m_RootOrder: 1 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: 54.1, y: 41.3} - m_SizeDelta: {x: 40, y: 40} + m_AnchoredPosition: {x: 59.49999, y: 46.500004} + m_SizeDelta: {x: 54, y: 54} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2665533675670884514 CanvasRenderer: @@ -169720,15 +169720,15 @@ RectTransform: m_GameObject: {fileID: 7726308767590587497} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 0.6, y: 0.6, z: 1} m_Children: [] m_Father: {fileID: 224561372281646096} m_RootOrder: 1 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: 53.200012, y: 38.69993} - m_SizeDelta: {x: 40, y: 40} + m_AnchoredPosition: {x: 59.49999, y: 46.500004} + m_SizeDelta: {x: 54, y: 54} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1305931485961136588 CanvasRenderer: @@ -222900,8 +222900,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.000012159, y: 0.61001} - m_SizeDelta: {x: 109.24, y: 55.8} + m_AnchoredPosition: {x: -0.000012159, y: 4.6} + m_SizeDelta: {x: 62, y: 54} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1041101737202598686 CanvasRenderer: @@ -222931,7 +222931,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: 7481f1ebd61b03a49ba7fa41d24d8db1, type: 3} + m_Sprite: {fileID: 21300000, guid: 5c16b7c9bbf6baa44b676d2aea07af8f, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/ManagedResources/Prefabs/UI/OnlineReward/OnlineRewardPanel.prefab b/Assets/ManagedResources/Prefabs/UI/OnlineReward/OnlineRewardPanel.prefab index 58f3164cb7..9255b7e6bf 100644 --- a/Assets/ManagedResources/Prefabs/UI/OnlineReward/OnlineRewardPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/OnlineReward/OnlineRewardPanel.prefab @@ -1188,8 +1188,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: -550} - m_SizeDelta: {x: 328, y: 138} + m_AnchoredPosition: {x: -26, y: -550} + m_SizeDelta: {x: 328, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4916908169215410511 CanvasRenderer: diff --git a/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/IncarnationPanel.prefab b/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/IncarnationPanel.prefab index 029c165c1e..e8ea2697e5 100644 --- a/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/IncarnationPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/IncarnationPanel.prefab @@ -9069,7 +9069,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: -31, y: -86} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584.9, y: 877.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &772603018842333398 @@ -19073,7 +19073,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &8463856118875763708 RectTransform: m_ObjectHideFlags: 0 @@ -28634,7 +28634,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 50.3, y: 106.1001} + m_AnchoredPosition: {x: 50.30005, y: 106.1001} m_SizeDelta: {x: 99, y: 179} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4851780475586518862 @@ -34630,7 +34630,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -0.000076293945} + m_AnchoredPosition: {x: 0, y: -0.000015258789} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &1537562228229781123 @@ -40652,61 +40652,6 @@ PrefabInstance: value: objectReference: {fileID: 21300000, guid: 914783a550a50444099c0977255adae1, type: 3} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[0] - value: - objectReference: {fileID: 674796108277879238} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[1] - value: - objectReference: {fileID: 7062020611193656940} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[2] - value: - objectReference: {fileID: 8690739934298013086} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[3] - value: - objectReference: {fileID: 9116807302699510169} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[4] - value: - objectReference: {fileID: 813952383691523226} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[5] - value: - objectReference: {fileID: 5921026051235449203} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[6] - value: - objectReference: {fileID: 5149543074701112194} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[7] - value: - objectReference: {fileID: 8106910601453108957} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[8] - value: - objectReference: {fileID: 3447045466679366823} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[9] - value: - objectReference: {fileID: 3657686346232358223} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_RootBone - value: - objectReference: {fileID: 674796108277879238} - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_Bones.Array.data[0] @@ -40762,6 +40707,61 @@ PrefabInstance: propertyPath: m_RootBone value: objectReference: {fileID: 7903842969898256619} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[0] + value: + objectReference: {fileID: 674796108277879238} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[1] + value: + objectReference: {fileID: 7062020611193656940} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[2] + value: + objectReference: {fileID: 8690739934298013086} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[3] + value: + objectReference: {fileID: 9116807302699510169} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[4] + value: + objectReference: {fileID: 813952383691523226} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[5] + value: + objectReference: {fileID: 5921026051235449203} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[6] + value: + objectReference: {fileID: 5149543074701112194} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[7] + value: + objectReference: {fileID: 8106910601453108957} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[8] + value: + objectReference: {fileID: 3447045466679366823} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[9] + value: + objectReference: {fileID: 3657686346232358223} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_RootBone + value: + objectReference: {fileID: 674796108277879238} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} --- !u!4 &2768949106265165781 stripped diff --git a/Assets/ManagedResources/~Lua/Modules/Expedition/View/MonsterFormationInfo.lua b/Assets/ManagedResources/~Lua/Modules/Expedition/View/MonsterFormationInfo.lua index c1a30d81f5..5c15d97195 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expedition/View/MonsterFormationInfo.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expedition/View/MonsterFormationInfo.lua @@ -123,7 +123,7 @@ function this:SetIcon() Util.SetGray(this.fightBtn,false) this.fightBtnIcon.gameObject:SetActive(false) this.fightBtnNum.gameObject:SetActive(false) - this.sureBtn:GetComponent("Image").sprite = this.spLoader:LoadSprite("Btn_hz_cheng_01") + this.sureBtn:GetComponent("Image").sprite = this.spLoader:LoadSprite("X1_zhanling_pata_bt_03") if waveId == data.monsterWave then this.tip.text = "扫荡奖励" if freeTime > 0 then