diff --git a/Assets/ManagedResources/Prefabs/UI/Battle/DamageResult.prefab b/Assets/ManagedResources/Prefabs/UI/Battle/DamageResult.prefab index a9286651b9..3a6366bcba 100644 --- a/Assets/ManagedResources/Prefabs/UI/Battle/DamageResult.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Battle/DamageResult.prefab @@ -34,6 +34,7 @@ RectTransform: - {fileID: 2868892032443624287} - {fileID: 4991714227874290440} - {fileID: 5354298273738654884} + - {fileID: 5921482228929657683} - {fileID: 4800855968807069691} - {fileID: 1399895736432093817} - {fileID: 982672466233666759} @@ -212,8 +213,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 451.17, y: 40.4} - m_SizeDelta: {x: 923.15, y: 164} + m_AnchoredPosition: {x: 459.50998, y: 107.51} + m_SizeDelta: {x: 919.02, y: 215.43} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5307586757618453587 CanvasRenderer: @@ -250,15 +251,15 @@ RectTransform: m_GameObject: {fileID: 859890044841408504} 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: 1.2, y: 1.2, z: 1} m_Children: [] m_Father: {fileID: 982672466233666759} m_RootOrder: 0 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: -61, y: 505} - m_SizeDelta: {x: 314.2, y: 86} + m_AnchoredPosition: {x: -69.1, y: 555} + m_SizeDelta: {x: 253, y: 86} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9171929062687719813 CanvasRenderer: @@ -297,6 +298,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &1096361166202876881 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5921482228929657683} + - component: {fileID: 636908008080075269} + - component: {fileID: 4613525850889849697} + m_Layer: 5 + m_Name: line (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5921482228929657683 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1096361166202876881} + 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_Children: [] + m_Father: {fileID: 8749065447924007770} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 224, y: -25.7} + m_SizeDelta: {x: 440, y: 1277.5} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &636908008080075269 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1096361166202876881} + m_CullTransparentMesh: 0 +--- !u!114 &4613525850889849697 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1096361166202876881} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.96470594, g: 0.9333334, b: 0.854902, a: 1} + m_RaycastTarget: 1 + 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: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &1160609717648031749 GameObject: m_ObjectHideFlags: 0 @@ -628,7 +703,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: -160.4, y: 495} + m_AnchoredPosition: {x: -152.1, y: 553.5} m_SizeDelta: {x: 512, y: 512} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5452735541800285613 @@ -900,8 +975,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: -54} - m_SizeDelta: {x: 450, y: 970} + m_AnchoredPosition: {x: 0, y: -78.6} + m_SizeDelta: {x: 432, y: 1097.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3141451647582073682 CanvasRenderer: @@ -1085,15 +1160,15 @@ RectTransform: m_GameObject: {fileID: 2658533052818541386} 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: 1.2, y: 1.2, z: 1} m_Children: [] m_Father: {fileID: 1399895736432093817} m_RootOrder: 0 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: 57, y: 505} - m_SizeDelta: {x: 326.5, y: 86} + m_AnchoredPosition: {x: 62.1, y: 555} + m_SizeDelta: {x: 253, y: 86} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &982918930573210986 CanvasRenderer: @@ -1157,17 +1232,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2752057385680498728} - m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068} + 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_Children: [] m_Father: {fileID: 8749065447924007770} m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} + 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: 44.23} - m_SizeDelta: {x: 1152.46, y: 5} + m_AnchoredPosition: {x: -224, y: -25.7} + m_SizeDelta: {x: 440, y: 1277.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5701470165813846419 CanvasRenderer: @@ -1190,7 +1265,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.96470594, g: 0.9333334, b: 0.854902, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1791,7 +1866,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: 61, y: 505} + m_AnchoredPosition: {x: 64.4, y: 555.1} m_SizeDelta: {x: 160, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1230793493522679058 @@ -2064,12 +2139,12 @@ RectTransform: - {fileID: 7679809175275777088} - {fileID: 3433503071718014541} m_Father: {fileID: 8749065447924007770} - m_RootOrder: 7 + m_RootOrder: 8 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: 225, y: 60} - m_SizeDelta: {x: 450, y: 1120} + m_AnchoredPosition: {x: 224, y: -19.8} + m_SizeDelta: {x: 440, y: 1265.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4557738244597390512 GameObject: @@ -2141,7 +2216,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: -56, y: 505} + m_AnchoredPosition: {x: -62.3, y: 555.1} m_SizeDelta: {x: 160, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5544174398057538207 @@ -2533,12 +2608,12 @@ RectTransform: - {fileID: 949658641144870073} - {fileID: 7879493523135700311} m_Father: {fileID: 8749065447924007770} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0.68, y: 373} - m_SizeDelta: {x: 922.63, y: 216.1} + m_AnchoredPosition: {x: 0.39, y: -581.56006} + m_SizeDelta: {x: 919.02, y: 215.23} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2648808176120217375 CanvasRenderer: @@ -2951,7 +3026,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: 160.4, y: 495} + m_AnchoredPosition: {x: 154.4, y: 553.5} m_SizeDelta: {x: 512, y: 512} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3115934127672661740 @@ -3553,12 +3628,12 @@ RectTransform: - {fileID: 5759458907260581076} - {fileID: 8608652293910191374} m_Father: {fileID: 8749065447924007770} - m_RootOrder: 6 + m_RootOrder: 7 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: -225, y: 60} - m_SizeDelta: {x: 450, y: 1120} + m_AnchoredPosition: {x: -224, y: -19.8} + m_SizeDelta: {x: 440, y: 1265.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7240214968521158513 GameObject: @@ -3668,8 +3743,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: 55.9} - m_SizeDelta: {x: 900, y: 1128.5} + m_AnchoredPosition: {x: 0, y: -26.9} + m_SizeDelta: {x: 900, y: 1294.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2736868831765478108 CanvasRenderer: @@ -3692,14 +3767,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.69803923, g: 0.69411767, b: 0.69411767, a: 1} m_RaycastTarget: 1 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: be7ae6fdd9a4dce4d96dc48da0958290, type: 3} + m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4136,8 +4211,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: -54} - m_SizeDelta: {x: 450, y: 970} + m_AnchoredPosition: {x: 0, y: -78.6} + m_SizeDelta: {x: 432, y: 1097.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4875746903694999264 CanvasRenderer: diff --git a/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab index 1761326197..4c657fb9a9 100644 --- a/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab @@ -10784,7 +10784,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: 133.5, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 68.95} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1240811747 @@ -11109,7 +11109,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: 293.5, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 68.95} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1596169479 @@ -42318,8 +42318,8 @@ RectTransform: m_Children: - {fileID: 7791392159515502658} - {fileID: 7315696869711782995} - - {fileID: 1322404926923880864} - {fileID: 414752713198513141} + - {fileID: 1322404926923880864} m_Father: {fileID: 1012972711} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -53571,7 +53571,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &414752713198513141 RectTransform: m_ObjectHideFlags: 0 @@ -53584,11 +53584,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6691372472164639446} - m_RootOrder: 3 + m_RootOrder: 2 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.9, y: -61.7} + m_AnchoredPosition: {x: 44, y: -45.5} m_SizeDelta: {x: 146, y: 31} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1467723388192968753 @@ -53619,7 +53619,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: 38b276d9f3804ed448fbb95355df1aeb, type: 3} + m_Sprite: {fileID: 21300000, guid: c439afb020a1e7e45a6f23ef05faa08f, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -53658,11 +53658,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6691372472164639446} - m_RootOrder: 2 + 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: 50, y: -51} + m_AnchoredPosition: {x: 44, y: -45.299988} m_SizeDelta: {x: 97.6, y: 52.025} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2714578184293178092 @@ -139577,7 +139577,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: 355, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 69.49} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7203306409298755909