diff --git a/Assets/ManagedResources/Prefabs/UI/Battle/DamageResult.prefab b/Assets/ManagedResources/Prefabs/UI/Battle/DamageResult.prefab index c203db8152..9ad4266b86 100644 --- a/Assets/ManagedResources/Prefabs/UI/Battle/DamageResult.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Battle/DamageResult.prefab @@ -257,7 +257,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: -36.6, y: 507} + m_AnchoredPosition: {x: -61, y: 505} m_SizeDelta: {x: 314.2, y: 86} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9171929062687719813 @@ -445,6 +445,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &1387402071962057375 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3670331428749178203} + - component: {fileID: 6991661939303380288} + - component: {fileID: 5079038690235796094} + m_Layer: 5 + m_Name: line + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3670331428749178203 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1387402071962057375} + 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: 8608652293910191374} + m_RootOrder: 4 + 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: -64.173004} + m_SizeDelta: {x: 440, y: 2} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6991661939303380288 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1387402071962057375} + m_CullTransparentMesh: 0 +--- !u!114 &5079038690235796094 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1387402071962057375} + 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.2264151, g: 0.20825917, b: 0.20825917, 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: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &2085494238748654727 GameObject: m_ObjectHideFlags: 0 @@ -511,7 +585,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: c73ac4f44d9a7194488674d4fa335c10, type: 3} + m_Sprite: {fileID: 21300000, guid: f0125b4d5d25c964686714a9242ec5da, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -554,7 +628,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: -169, y: 500.30005} + m_AnchoredPosition: {x: -160.4, y: 495} m_SizeDelta: {x: 512, y: 512} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5452735541800285613 @@ -824,10 +898,10 @@ RectTransform: m_Father: {fileID: 1399895736432093817} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -50} - m_SizeDelta: {x: 0, y: -100} + 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_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3141451647582073682 CanvasRenderer: @@ -1018,7 +1092,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: 36.7, y: 504.1} + m_AnchoredPosition: {x: 57, y: 505} m_SizeDelta: {x: 326.5, y: 86} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &982918930573210986 @@ -1092,8 +1166,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -13.1} - m_SizeDelta: {x: 1037.8, y: 5} + m_AnchoredPosition: {x: 0, y: 44.23} + m_SizeDelta: {x: 1152.46, y: 5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5701470165813846419 CanvasRenderer: @@ -1123,7 +1197,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: fedc490283f00ca4bb5996194308f6ac, type: 3} + m_Sprite: {fileID: 0} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1588,7 +1662,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} + m_AnchoredPosition: {x: 0, y: -0.000030516232} m_SizeDelta: {x: 0, y: 120} m_Pivot: {x: 0, y: 1} --- !u!222 &3723123758606190715 @@ -1701,7 +1775,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.7, y: 505.00006} + m_AnchoredPosition: {x: 61, y: 505} m_SizeDelta: {x: 160, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1230793493522679058 @@ -1739,7 +1813,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 4 m_MaxSize: 40 - m_Alignment: 3 + m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 @@ -1822,6 +1896,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &4061980558449221237 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5352087293421971333} + - component: {fileID: 3151691197035853382} + - component: {fileID: 8704102699441000346} + m_Layer: 5 + m_Name: line + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5352087293421971333 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4061980558449221237} + 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: 3433503071718014541} + m_RootOrder: 4 + 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.5, y: -64.17297} + m_SizeDelta: {x: 440, y: 2} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3151691197035853382 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4061980558449221237} + m_CullTransparentMesh: 0 +--- !u!114 &8704102699441000346 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4061980558449221237} + 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.2264151, g: 0.20825917, b: 0.20825917, 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: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &4119339452648082104 GameObject: m_ObjectHideFlags: 0 @@ -1856,7 +2004,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: -62.19999, y: 59.79998} + m_AnchoredPosition: {x: -50, y: 59.79998} m_SizeDelta: {x: 36, y: 36} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5241511822098761246 @@ -1904,8 +2052,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: 229, y: 59.000008} - m_SizeDelta: {x: 458, y: 1110} + m_AnchoredPosition: {x: 225, y: 60} + m_SizeDelta: {x: 450, y: 1120} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4557738244597390512 GameObject: @@ -1977,7 +2125,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.5, y: 505} + m_AnchoredPosition: {x: -56, y: 505} m_SizeDelta: {x: 160, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5544174398057538207 @@ -2015,7 +2163,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 4 m_MaxSize: 40 - m_Alignment: 5 + m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 @@ -2325,7 +2473,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: -62.19999, y: 59.79998} + m_AnchoredPosition: {x: -50, y: 59.79998} m_SizeDelta: {x: 36, y: 36} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8246900582951980827 @@ -2515,7 +2663,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: c73ac4f44d9a7194488674d4fa335c10, type: 3} + m_Sprite: {fileID: 21300000, guid: f0125b4d5d25c964686714a9242ec5da, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2589,7 +2737,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: 0f7579036915c65459a15fae41f1c712, type: 3} + m_Sprite: {fileID: 21300000, guid: 39c938ebd659a774f842cd232a29cd81, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2628,6 +2776,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 6322925390463848198} + - {fileID: 4892832921430783665} m_Father: {fileID: 8749065447924007770} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2786,7 +2935,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: 164.3, y: 496.80005} + m_AnchoredPosition: {x: 160.4, y: 495} m_SizeDelta: {x: 512, y: 512} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3115934127672661740 @@ -2958,7 +3107,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.89411765, g: 0.7176471, b: 0.48235294, a: 1} + m_Color: {r: 0.18039216, g: 0.13333334, b: 0.07058824, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -3084,13 +3233,14 @@ RectTransform: - {fileID: 6081925077769500517} - {fileID: 7978426066657123571} - {fileID: 6981108234765412309} + - {fileID: 3670331428749178203} m_Father: {fileID: 1399895736432093817} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 230, y: -170} - m_SizeDelta: {x: 450, y: 130} + m_AnchoredPosition: {x: 225, y: -223} + m_SizeDelta: {x: 440, y: 130} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &6607573998118748388 GameObject: @@ -3391,8 +3541,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: -229, y: 59} - m_SizeDelta: {x: 458, y: 1110} + m_AnchoredPosition: {x: -225, y: 60} + m_SizeDelta: {x: 450, y: 1120} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7240214968521158513 GameObject: @@ -3468,6 +3618,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &7292567890861989221 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4892832921430783665} + - component: {fileID: 2736868831765478108} + - component: {fileID: 5154162105881573151} + m_Layer: 5 + m_Name: Image (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4892832921430783665 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7292567890861989221} + 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: 7197634369180273472} + 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: 0, y: 55.9} + m_SizeDelta: {x: 900, y: 1128.5} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2736868831765478108 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7292567890861989221} + m_CullTransparentMesh: 0 +--- !u!114 &5154162105881573151 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7292567890861989221} + 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: 1, g: 1, b: 1, 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_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &7381184559301326831 GameObject: m_ObjectHideFlags: 0 @@ -3894,10 +4118,10 @@ RectTransform: m_Father: {fileID: 982672466233666759} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -50} - m_SizeDelta: {x: 0, y: -100} + 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_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4875746903694999264 CanvasRenderer: @@ -4112,7 +4336,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.89411765, g: 0.7176471, b: 0.48235294, a: 1} + m_Color: {r: 0.1792453, g: 0.13250141, b: 0.07017622, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -4272,7 +4496,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: 0f7579036915c65459a15fae41f1c712, type: 3} + m_Sprite: {fileID: 21300000, guid: 39c938ebd659a774f842cd232a29cd81, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4755,11 +4979,12 @@ RectTransform: - {fileID: 3235803949572806899} - {fileID: 7800370493179815279} - {fileID: 6806448625374896461} + - {fileID: 5352087293421971333} m_Father: {fileID: 982672466233666759} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 228, y: -170} + m_AnchoredPosition: {x: 225, y: -223} m_SizeDelta: {x: 450, y: 130} m_Pivot: {x: 0.5, y: 0.5}