From 067e658fee1527342b33e2b1e83f797a1fb1d58f Mon Sep 17 00:00:00 2001 From: yujia <411150613@qq.com> Date: Thu, 28 May 2026 14:49:27 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=906145=E3=80=91=E3=80=90=E6=88=98?= =?UTF-8?q?=E6=96=97=E3=80=91=E8=A1=80=E6=9D=A1=E9=A2=84=E5=88=B6=E4=BD=93?= =?UTF-8?q?=E7=9A=84BUFF=E5=9B=BE=E6=A0=87=E5=B0=BA=E5=AF=B8=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E8=B0=83=E6=95=B4=E3=80=90=E9=A2=84=E5=88=B6=E4=BD=93?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=8C=E6=88=90=EF=BC=8C=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI_Pic_Level/BG_Battle/UI_BarBg.png | 4 +- .../Prefab/LevelSceneUI/UIFightClock.prefab | 18 +- .../Prefab/LevelSceneUI/UIFightScene.prefab | 6 + .../Prefab/LevelSceneUI/UIFightTarget.prefab | 2 +- .../LevelSceneUI/UI_EnemyState_Bar_New.prefab | 690 ++++++------------ .../UI_VehicleState_Bar_New.prefab | 568 +++++--------- .../UI_Pic_Level/NewFight/UI_IconBg.png | 4 +- .../UI_EnemyStateBar_Morale.png | 4 +- 8 files changed, 423 insertions(+), 873 deletions(-) diff --git a/ProjectNLD/Assets/Art/UI/Texture/UI_Pic_Level/BG_Battle/UI_BarBg.png b/ProjectNLD/Assets/Art/UI/Texture/UI_Pic_Level/BG_Battle/UI_BarBg.png index 8809a7c41ae..7424a0ef644 100644 --- a/ProjectNLD/Assets/Art/UI/Texture/UI_Pic_Level/BG_Battle/UI_BarBg.png +++ b/ProjectNLD/Assets/Art/UI/Texture/UI_Pic_Level/BG_Battle/UI_BarBg.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:092a45f50231bbffb9d6fdb8cd802f7170d76bbbbb83d9d130dd7bbad9a07118 -size 3878 +oid sha256:8a3338b39fc02ea2be9f614bf3b737ee2d599a68e539a2eddb09fd647eadf33f +size 4476 diff --git a/ProjectNLD/Assets/Art_Out/UI/Prefab/LevelSceneUI/UIFightClock.prefab b/ProjectNLD/Assets/Art_Out/UI/Prefab/LevelSceneUI/UIFightClock.prefab index 6a328793615..24eb6302af4 100644 --- a/ProjectNLD/Assets/Art_Out/UI/Prefab/LevelSceneUI/UIFightClock.prefab +++ b/ProjectNLD/Assets/Art_Out/UI/Prefab/LevelSceneUI/UIFightClock.prefab @@ -34,7 +34,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 180, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -236.07391, y: 58.24517} + m_AnchoredPosition: {x: -235.77289, y: 58.24517} m_SizeDelta: {x: 295.8568, y: 138.8721} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9178678766392155714 @@ -868,7 +868,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 2.1833, y: 60.3409} + m_AnchoredPosition: {x: 2.8833733, y: 60.3409} m_SizeDelta: {x: 777.9297, y: 131.422} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6178831520409238312 @@ -943,7 +943,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: -202.49811, y: 0} + m_AnchoredPosition: {x: -202.19708, y: 0} m_SizeDelta: {x: 142.86, y: 103} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3043138574216734055 @@ -2520,7 +2520,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: -75.4, y: 7.6} + m_AnchoredPosition: {x: -74.7, y: 7.6} m_SizeDelta: {x: 271, y: 102} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3357688790041826663 @@ -2653,7 +2653,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.51, y: 65.100914} + m_AnchoredPosition: {x: -60.809887, y: 65.100914} m_SizeDelta: {x: 92.6479, y: 26.8028} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3120602460182820870 @@ -2788,7 +2788,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 180, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -126.22847, y: 60.3409} + m_AnchoredPosition: {x: -125.5284, y: 60.3409} m_SizeDelta: {x: 806.1463, y: 131.422} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1465432043192886164 @@ -4184,7 +4184,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -155.77078, y: 58.24517} + m_AnchoredPosition: {x: -155.46976, y: 58.24517} m_SizeDelta: {x: 281.8639, y: 138.8721} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8885680059406710490 @@ -4540,7 +4540,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: -195.2, y: 63.8} + m_AnchoredPosition: {x: -194.89897, y: 63.8} m_SizeDelta: {x: 92.6479, y: 28.2859} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3464079466325418366 @@ -4885,7 +4885,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: -196.901, y: 11.543213} + m_AnchoredPosition: {x: -196.6, y: 11.543213} m_SizeDelta: {x: 35, y: 39} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8466170709258728348 diff --git a/ProjectNLD/Assets/Art_Out/UI/Prefab/LevelSceneUI/UIFightScene.prefab b/ProjectNLD/Assets/Art_Out/UI/Prefab/LevelSceneUI/UIFightScene.prefab index ffd75075520..2e812697c4c 100644 --- a/ProjectNLD/Assets/Art_Out/UI/Prefab/LevelSceneUI/UIFightScene.prefab +++ b/ProjectNLD/Assets/Art_Out/UI/Prefab/LevelSceneUI/UIFightScene.prefab @@ -606,6 +606,7 @@ MonoBehaviour: isSort: 0 isAutoSetDrag: 0 isShowArrow: 0 + trailingPadding: 0 lines: 1 squareSpacing: 5 cell: {fileID: 0} @@ -5796,6 +5797,11 @@ PrefabInstance: propertyPath: m_Name value: UIVehicleHealthBarRectangle objectReference: {fileID: 0} + - target: {fileID: 1243370903264572417, guid: 69ea5679849092d43a4bb11420bf6671, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1728396916085492225, guid: 69ea5679849092d43a4bb11420bf6671, type: 3} propertyPath: m_AnchorMax.y diff --git a/ProjectNLD/Assets/Art_Out/UI/Prefab/LevelSceneUI/UIFightTarget.prefab b/ProjectNLD/Assets/Art_Out/UI/Prefab/LevelSceneUI/UIFightTarget.prefab index b44ae5b0b14..e2d44e493a2 100644 --- a/ProjectNLD/Assets/Art_Out/UI/Prefab/LevelSceneUI/UIFightTarget.prefab +++ b/ProjectNLD/Assets/Art_Out/UI/Prefab/LevelSceneUI/UIFightTarget.prefab @@ -2175,7 +2175,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: 0, y: 26} + m_AnchoredPosition: {x: 0.4000244, y: 25.49} m_SizeDelta: {x: 51, y: 51} m_Pivot: {x: 1, y: 1} --- !u!222 &2447341005653290654 diff --git a/ProjectNLD/Assets/Art_Out/UI/Prefab/LevelSceneUI/UI_EnemyState_Bar_New.prefab b/ProjectNLD/Assets/Art_Out/UI/Prefab/LevelSceneUI/UI_EnemyState_Bar_New.prefab index a7f3ccc1bf4..c17fa55f2ac 100644 --- a/ProjectNLD/Assets/Art_Out/UI/Prefab/LevelSceneUI/UI_EnemyState_Bar_New.prefab +++ b/ProjectNLD/Assets/Art_Out/UI/Prefab/LevelSceneUI/UI_EnemyState_Bar_New.prefab @@ -1,80 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &173235926820381125 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5584928092141269278} - - component: {fileID: 5573702094236314657} - - component: {fileID: 7078369215242567892} - m_Layer: 5 - m_Name: ImageBuff (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5584928092141269278 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 173235926820381125} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 3452078564658441765} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 87, y: -22.5} - m_SizeDelta: {x: 40, y: 40} - m_Pivot: {x: 1, y: 0.5} ---- !u!222 &5573702094236314657 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 173235926820381125} - m_CullTransparentMesh: 1 ---- !u!114 &7078369215242567892 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 173235926820381125} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4bc7294c47bea8541ba80610bf939787, type: 3} - m_Type: 0 - m_PreserveAspect: 1 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 --- !u!1 &289749665360164366 GameObject: m_ObjectHideFlags: 0 @@ -105,12 +30,9 @@ RectTransform: m_ConstrainProportionsScale: 1 m_Children: - {fileID: 5541302858626266198} - - {fileID: 5584928092141269278} - - {fileID: 918785348932796804} - - {fileID: 5587354998398450884} - - {fileID: 5454317981115255281} - - {fileID: 1729250542865264305} - - {fileID: 2350145390565640023} + - {fileID: 8059650165222673873} + - {fileID: 1464243288316621258} + - {fileID: 6538031163397007293} m_Father: {fileID: 2612128959536932173} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -330,81 +252,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &726954975725392117 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5454317981115255281} - - component: {fileID: 216996274987500379} - - component: {fileID: 2795580615887079915} - m_Layer: 5 - m_Name: ImageBuff (4) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5454317981115255281 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 726954975725392117} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 3452078564658441765} - 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: -22.5} - m_SizeDelta: {x: 40, y: 40} - m_Pivot: {x: 1, y: 0.5} ---- !u!222 &216996274987500379 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 726954975725392117} - m_CullTransparentMesh: 1 ---- !u!114 &2795580615887079915 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 726954975725392117} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4bc7294c47bea8541ba80610bf939787, type: 3} - m_Type: 0 - m_PreserveAspect: 1 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 --- !u!1 &808572233992331483 GameObject: m_ObjectHideFlags: 0 @@ -480,6 +327,156 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &1011923657696983579 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8059650165222673873} + - component: {fileID: 5674605173380891639} + - component: {fileID: 6739025857045016747} + m_Layer: 5 + m_Name: ImageBuff (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8059650165222673873 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1011923657696983579} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3452078564658441765} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 160, y: -20.5} + m_SizeDelta: {x: 106.5, y: 45} + m_Pivot: {x: 1, y: 0.5} +--- !u!222 &5674605173380891639 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1011923657696983579} + m_CullTransparentMesh: 1 +--- !u!114 &6739025857045016747 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1011923657696983579} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 0ead8dbdb6071fc488d5629d4ea0eae4, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &1021256504648494636 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6538031163397007293} + - component: {fileID: 8011521077855776830} + - component: {fileID: 3467534691062987359} + m_Layer: 5 + m_Name: ImageBuff (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6538031163397007293 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1021256504648494636} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3452078564658441765} + 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: -20.5} + m_SizeDelta: {x: 106.5, y: 45} + m_Pivot: {x: 1, y: 0.5} +--- !u!222 &8011521077855776830 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1021256504648494636} + m_CullTransparentMesh: 1 +--- !u!114 &3467534691062987359 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1021256504648494636} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 0ead8dbdb6071fc488d5629d4ea0eae4, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &1198776024014731365 GameObject: m_ObjectHideFlags: 0 @@ -961,8 +958,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: 40, y: -22.5} - m_SizeDelta: {x: 40, y: 40} + m_AnchoredPosition: {x: 70, y: -20.5} + m_SizeDelta: {x: 106.5, y: 45} m_Pivot: {x: 1, y: 0.5} --- !u!222 &2197694648386896154 CanvasRenderer: @@ -992,7 +989,82 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4bc7294c47bea8541ba80610bf939787, type: 3} + m_Sprite: {fileID: 21300000, guid: 0ead8dbdb6071fc488d5629d4ea0eae4, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &3072187050540568192 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1464243288316621258} + - component: {fileID: 8542920918537568143} + - component: {fileID: 2392947042135233445} + m_Layer: 5 + m_Name: ImageBuff (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1464243288316621258 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3072187050540568192} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3452078564658441765} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 250, y: -20.5} + m_SizeDelta: {x: 106.5, y: 45} + m_Pivot: {x: 1, y: 0.5} +--- !u!222 &8542920918537568143 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3072187050540568192} + m_CullTransparentMesh: 1 +--- !u!114 &2392947042135233445 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3072187050540568192} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 0ead8dbdb6071fc488d5629d4ea0eae4, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1153,156 +1225,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &3939370313995588149 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5587354998398450884} - - component: {fileID: 8390201178662089606} - - component: {fileID: 5696042121835762136} - m_Layer: 5 - m_Name: ImageBuff (3) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5587354998398450884 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3939370313995588149} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 3452078564658441765} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 181, y: -22.5} - m_SizeDelta: {x: 40, y: 40} - m_Pivot: {x: 1, y: 0.5} ---- !u!222 &8390201178662089606 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3939370313995588149} - m_CullTransparentMesh: 1 ---- !u!114 &5696042121835762136 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3939370313995588149} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4bc7294c47bea8541ba80610bf939787, type: 3} - m_Type: 0 - m_PreserveAspect: 1 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!1 &4223239129953174991 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1729250542865264305} - - component: {fileID: 788290313034604720} - - component: {fileID: 1412627961034033729} - m_Layer: 5 - m_Name: ImageBuff (5) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1729250542865264305 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4223239129953174991} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 3452078564658441765} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 275, y: -22.5} - m_SizeDelta: {x: 40, y: 40} - m_Pivot: {x: 1, y: 0.5} ---- !u!222 &788290313034604720 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4223239129953174991} - m_CullTransparentMesh: 1 ---- !u!114 &1412627961034033729 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4223239129953174991} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4bc7294c47bea8541ba80610bf939787, type: 3} - m_Type: 0 - m_PreserveAspect: 1 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 --- !u!1 &4895715750630190767 GameObject: m_ObjectHideFlags: 0 @@ -1791,156 +1713,6 @@ RectTransform: m_AnchoredPosition: {x: -95, y: -68} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &7270645249445741196 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 918785348932796804} - - component: {fileID: 8891765392475604033} - - component: {fileID: 117103300741356613} - m_Layer: 5 - m_Name: ImageBuff (2) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &918785348932796804 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7270645249445741196} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 3452078564658441765} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 134, y: -22.5} - m_SizeDelta: {x: 40, y: 40} - m_Pivot: {x: 1, y: 0.5} ---- !u!222 &8891765392475604033 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7270645249445741196} - m_CullTransparentMesh: 1 ---- !u!114 &117103300741356613 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7270645249445741196} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4bc7294c47bea8541ba80610bf939787, type: 3} - m_Type: 0 - m_PreserveAspect: 1 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!1 &7478166477893025314 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2350145390565640023} - - component: {fileID: 3348356916975572514} - - component: {fileID: 7133126251579015935} - m_Layer: 5 - m_Name: ImageBuff (6) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2350145390565640023 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7478166477893025314} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 3452078564658441765} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 322, y: -22.5} - m_SizeDelta: {x: 40, y: 40} - m_Pivot: {x: 1, y: 0.5} ---- !u!222 &3348356916975572514 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7478166477893025314} - m_CullTransparentMesh: 1 ---- !u!114 &7133126251579015935 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7478166477893025314} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4bc7294c47bea8541ba80610bf939787, type: 3} - m_Type: 0 - m_PreserveAspect: 1 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 --- !u!1 &7664660956137059162 GameObject: m_ObjectHideFlags: 0 diff --git a/ProjectNLD/Assets/Art_Out/UI/Prefab/LevelSceneUI/UI_VehicleState_Bar_New.prefab b/ProjectNLD/Assets/Art_Out/UI/Prefab/LevelSceneUI/UI_VehicleState_Bar_New.prefab index 0f5997b04c3..1cd5cbb7a45 100644 --- a/ProjectNLD/Assets/Art_Out/UI/Prefab/LevelSceneUI/UI_VehicleState_Bar_New.prefab +++ b/ProjectNLD/Assets/Art_Out/UI/Prefab/LevelSceneUI/UI_VehicleState_Bar_New.prefab @@ -142,6 +142,81 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 +--- !u!1 &1042635192053624735 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4273943396450617162} + - component: {fileID: 2368476453264742106} + - component: {fileID: 3176623311544556109} + m_Layer: 5 + m_Name: ImageBuff (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4273943396450617162 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1042635192053624735} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8985659629781415706} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 295.29993, y: -25.799988} + m_SizeDelta: {x: 160.5, y: 45} + m_Pivot: {x: 1, y: 0.5} +--- !u!222 &2368476453264742106 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1042635192053624735} + m_CullTransparentMesh: 1 +--- !u!114 &3176623311544556109 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1042635192053624735} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 0ead8dbdb6071fc488d5629d4ea0eae4, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &1160391550386506996 GameObject: m_ObjectHideFlags: 0 @@ -328,7 +403,7 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 116.467896, y: 28.990814} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &1482472913222623196 +--- !u!1 &1259502607347854337 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -336,23 +411,23 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1176576870284027184} - - component: {fileID: 450993454269486083} - - component: {fileID: 1005761424332676036} + - component: {fileID: 4693176553319988654} + - component: {fileID: 8384876157030727518} + - component: {fileID: 6052978012950516045} m_Layer: 5 - m_Name: ImageBuff (5) + m_Name: ImageBuff (3) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1176576870284027184 +--- !u!224 &4693176553319988654 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1482472913222623196} + m_GameObject: {fileID: 1259502607347854337} 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} @@ -362,24 +437,24 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 275, y: -22.5} - m_SizeDelta: {x: 40, y: 40} + m_AnchoredPosition: {x: 385.29993, y: -25.799988} + m_SizeDelta: {x: 160.5, y: 45} m_Pivot: {x: 1, y: 0.5} ---- !u!222 &450993454269486083 +--- !u!222 &8384876157030727518 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1482472913222623196} + m_GameObject: {fileID: 1259502607347854337} m_CullTransparentMesh: 1 ---- !u!114 &1005761424332676036 +--- !u!114 &6052978012950516045 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1482472913222623196} + m_GameObject: {fileID: 1259502607347854337} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -393,7 +468,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4bc7294c47bea8541ba80610bf939787, type: 3} + m_Sprite: {fileID: 21300000, guid: 0ead8dbdb6071fc488d5629d4ea0eae4, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -433,12 +508,9 @@ RectTransform: m_ConstrainProportionsScale: 1 m_Children: - {fileID: 2224126067536887857} - - {fileID: 909135187924032883} - - {fileID: 4543017181765099981} - - {fileID: 2279243783066600046} - - {fileID: 6693765184233715124} - - {fileID: 1176576870284027184} - - {fileID: 6169224464894812283} + - {fileID: 477125418939347340} + - {fileID: 4273943396450617162} + - {fileID: 4693176553319988654} m_Father: {fileID: 6300491376559534977} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -472,6 +544,81 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 +--- !u!1 &1927969922978493138 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 477125418939347340} + - component: {fileID: 8310401021141751464} + - component: {fileID: 4101633723478394019} + m_Layer: 5 + m_Name: ImageBuff (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &477125418939347340 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1927969922978493138} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8985659629781415706} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 205.29993, y: -25.799988} + m_SizeDelta: {x: 160.5, y: 45} + m_Pivot: {x: 1, y: 0.5} +--- !u!222 &8310401021141751464 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1927969922978493138} + m_CullTransparentMesh: 1 +--- !u!114 &4101633723478394019 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1927969922978493138} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 0ead8dbdb6071fc488d5629d4ea0eae4, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &2718736889483907009 GameObject: m_ObjectHideFlags: 0 @@ -506,8 +653,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: 40, y: -22.5} - m_SizeDelta: {x: 40, y: 40} + m_AnchoredPosition: {x: 115.3, y: -25.8} + m_SizeDelta: {x: 160.5, y: 45} m_Pivot: {x: 1, y: 0.5} --- !u!222 &3267145618568279949 CanvasRenderer: @@ -537,7 +684,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4bc7294c47bea8541ba80610bf939787, type: 3} + m_Sprite: {fileID: 21300000, guid: 0ead8dbdb6071fc488d5629d4ea0eae4, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -776,81 +923,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &4059301055668555861 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 909135187924032883} - - component: {fileID: 7891135020811532323} - - component: {fileID: 7876510662240865000} - m_Layer: 5 - m_Name: ImageBuff (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &909135187924032883 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4059301055668555861} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8985659629781415706} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 87, y: -22.5} - m_SizeDelta: {x: 40, y: 40} - m_Pivot: {x: 1, y: 0.5} ---- !u!222 &7891135020811532323 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4059301055668555861} - m_CullTransparentMesh: 1 ---- !u!114 &7876510662240865000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4059301055668555861} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4bc7294c47bea8541ba80610bf939787, type: 3} - m_Type: 0 - m_PreserveAspect: 1 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 --- !u!1 &4226393346954958933 GameObject: m_ObjectHideFlags: 0 @@ -1152,81 +1224,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &5044740877801353562 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4543017181765099981} - - component: {fileID: 6765136074321631917} - - component: {fileID: 5196078899151252093} - m_Layer: 5 - m_Name: ImageBuff (2) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4543017181765099981 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5044740877801353562} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8985659629781415706} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 134, y: -22.5} - m_SizeDelta: {x: 40, y: 40} - m_Pivot: {x: 1, y: 0.5} ---- !u!222 &6765136074321631917 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5044740877801353562} - m_CullTransparentMesh: 1 ---- !u!114 &5196078899151252093 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5044740877801353562} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4bc7294c47bea8541ba80610bf939787, type: 3} - m_Type: 0 - m_PreserveAspect: 1 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 --- !u!1 &5229600158885813927 GameObject: m_ObjectHideFlags: 0 @@ -1460,231 +1457,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &6329140422158147075 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6693765184233715124} - - component: {fileID: 3167007941691741898} - - component: {fileID: 8164633981637496273} - m_Layer: 5 - m_Name: ImageBuff (4) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6693765184233715124 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6329140422158147075} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8985659629781415706} - 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: -22.5} - m_SizeDelta: {x: 40, y: 40} - m_Pivot: {x: 1, y: 0.5} ---- !u!222 &3167007941691741898 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6329140422158147075} - m_CullTransparentMesh: 1 ---- !u!114 &8164633981637496273 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6329140422158147075} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4bc7294c47bea8541ba80610bf939787, type: 3} - m_Type: 0 - m_PreserveAspect: 1 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!1 &6431323655319655741 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2279243783066600046} - - component: {fileID: 5915833889742125079} - - component: {fileID: 6915551091304718384} - m_Layer: 5 - m_Name: ImageBuff (3) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2279243783066600046 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6431323655319655741} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8985659629781415706} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 181, y: -22.5} - m_SizeDelta: {x: 40, y: 40} - m_Pivot: {x: 1, y: 0.5} ---- !u!222 &5915833889742125079 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6431323655319655741} - m_CullTransparentMesh: 1 ---- !u!114 &6915551091304718384 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6431323655319655741} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4bc7294c47bea8541ba80610bf939787, type: 3} - m_Type: 0 - m_PreserveAspect: 1 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!1 &6842236294345106489 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6169224464894812283} - - component: {fileID: 8914690900246115079} - - component: {fileID: 8779492350230660415} - m_Layer: 5 - m_Name: ImageBuff (6) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6169224464894812283 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6842236294345106489} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8985659629781415706} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 322, y: -22.5} - m_SizeDelta: {x: 40, y: 40} - m_Pivot: {x: 1, y: 0.5} ---- !u!222 &8914690900246115079 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6842236294345106489} - m_CullTransparentMesh: 1 ---- !u!114 &8779492350230660415 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6842236294345106489} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4bc7294c47bea8541ba80610bf939787, type: 3} - m_Type: 0 - m_PreserveAspect: 1 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 --- !u!1 &7138038831445019716 GameObject: m_ObjectHideFlags: 0 diff --git a/ProjectNLD/Assets/Art_Out/UI/Texture/UI_Pic_Level/NewFight/UI_IconBg.png b/ProjectNLD/Assets/Art_Out/UI/Texture/UI_Pic_Level/NewFight/UI_IconBg.png index 86cde9a73d3..4eb4315184f 100644 --- a/ProjectNLD/Assets/Art_Out/UI/Texture/UI_Pic_Level/NewFight/UI_IconBg.png +++ b/ProjectNLD/Assets/Art_Out/UI/Texture/UI_Pic_Level/NewFight/UI_IconBg.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5592527dd47f1ba46e0ab30956ba11de98d4db99b0abeee85132f03fe08f3885 -size 3737 +oid sha256:41db6ec5bd1c190d881868359222f1203595430166aaa5c8690f267149423bbb +size 4299 diff --git a/ProjectNLD/Assets/Art_Out/UI/Texture/UI_Pic_Level/UI_Pic_EnemyState/UI_EnemyStateBar_Morale.png b/ProjectNLD/Assets/Art_Out/UI/Texture/UI_Pic_Level/UI_Pic_EnemyState/UI_EnemyStateBar_Morale.png index 678e316d200..1d8b5d28456 100644 --- a/ProjectNLD/Assets/Art_Out/UI/Texture/UI_Pic_Level/UI_Pic_EnemyState/UI_EnemyStateBar_Morale.png +++ b/ProjectNLD/Assets/Art_Out/UI/Texture/UI_Pic_Level/UI_Pic_EnemyState/UI_EnemyStateBar_Morale.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8a3a49e25dc73f031c10120655997b2dbe967982a23b17905bc8b95dcd212102 -size 113 +oid sha256:4b41c23df6fa8c430ec63aa272228d9322877ae059598a4a8487d393e9a081af +size 1423