From 9d6e11a367185d9b3cf60989253787daf4e0e4dc Mon Sep 17 00:00:00 2001 From: "aube.lee" Date: Wed, 19 Feb 2025 11:31:08 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20=EC=BA=90=EB=A6=AD=ED=84=B0=20=EC=9D=B8?= =?UTF-8?q?=EA=B2=8C=EC=9E=84=20UI=20=EB=A1=9C=EC=A7=81=20=EC=A0=81?= =?UTF-8?q?=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Resources/UI/Prefabs/UI.InGameUI.prefab | 631 ++++++++++++++++-- .../Resources/UI/Prefabs/UI.OptionUI.prefab | 2 +- .../Scripts/Character/CharacterController.cs | 7 + .../Assets/Gameton/Scripts/UI/IngameUI.cs | 63 +- 4 files changed, 640 insertions(+), 63 deletions(-) diff --git a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.InGameUI.prefab b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.InGameUI.prefab index ae6fdf31..a36ad55c 100644 --- a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.InGameUI.prefab +++ b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.InGameUI.prefab @@ -1,5 +1,193 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &373887944214037986 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5686739887980570022} + - component: {fileID: 7154242302869725194} + - component: {fileID: 8343011096442902954} + m_Layer: 5 + m_Name: HP Forground + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5686739887980570022 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 373887944214037986} + 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: 2962770884742879643} + 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: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7154242302869725194 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 373887944214037986} + m_CullTransparentMesh: 1 +--- !u!114 &8343011096442902954 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 373887944214037986} + 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: 0.18396229, b: 0.18396229, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + 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 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &526769192632805042 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5891565712165530425} + m_Layer: 0 + m_Name: Player Stat + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5891565712165530425 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 526769192632805042} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 3.2, y: 3.2, z: 3.2} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2962770884742879643} + - {fileID: 3350350339663771910} + - {fileID: 8862689834726366112} + m_Father: {fileID: 3954124197450694553} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 100, y: 0} + m_SizeDelta: {x: 100, y: -160} + m_Pivot: {x: 0, y: 0.5} +--- !u!1 &1679873360829968752 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 670886125791429540} + - component: {fileID: 7751117847549644398} + - component: {fileID: 713119143775663342} + m_Layer: 5 + m_Name: HP Forground + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &670886125791429540 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1679873360829968752} + 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: 7070007122897510086} + 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: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7751117847549644398 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1679873360829968752} + m_CullTransparentMesh: 1 +--- !u!114 &713119143775663342 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1679873360829968752} + 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: 0.18396229, b: 0.18396229, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + 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 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &2230928671015106332 GameObject: m_ObjectHideFlags: 0 @@ -115,10 +303,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c00fc90238999db44b3bd05365097e20, type: 3} m_Name: m_EditorClassIdentifier: - hpBar: {fileID: 0} - spBar: {fileID: 0} - hpText: {fileID: 0} - spText: {fileID: 0} + characterImage: {fileID: 4779274100179459256} + hpBar: {fileID: 8343011096442902954} + spBar: {fileID: 7703838897355702313} + stageText: {fileID: 8879455789073944256} + monsterHp: {fileID: 5427279369348982334} + monsterHpBar: {fileID: 713119143775663342} + monsterImage: {fileID: 3115676712305369735} --- !u!1 &2837283741072849140 GameObject: m_ObjectHideFlags: 0 @@ -149,13 +340,13 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 785013066348389420} + m_Father: {fileID: 3954124197450694553} 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: 64.400024, y: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -300, y: 40} m_SizeDelta: {x: 200, y: 50} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 1, y: 0.5} --- !u!222 &5379103227928931883 CanvasRenderer: m_ObjectHideFlags: 0 @@ -281,9 +472,9 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 1 m_Children: - - {fileID: 785013066348389420} - - {fileID: 2962770884742879643} - - {fileID: 8862689834726366112} + - {fileID: 5891565712165530425} + - {fileID: 8456465457182026322} + - {fileID: 1442053628981883187} m_Father: {fileID: 5957244545150369457} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} @@ -291,7 +482,7 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 200} m_Pivot: {x: 0.5, y: 1} ---- !u!1 &3496399392294800122 +--- !u!1 &3469684745482015687 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -299,51 +490,88 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 785013066348389420} - - component: {fileID: 2198073928601018855} - - component: {fileID: 3886354633703200103} - m_Layer: 5 - m_Name: StageNumberText + - component: {fileID: 1442053628981883187} + m_Layer: 0 + m_Name: Monster Stat m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &785013066348389420 + m_IsActive: 0 +--- !u!224 &1442053628981883187 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3496399392294800122} + m_GameObject: {fileID: 3469684745482015687} 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: 3.2, y: 3.2, z: 3.2} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 8456465457182026322} + - {fileID: 1740643575397254800} + - {fileID: 7070007122897510086} + - {fileID: 6444670562919482404} m_Father: {fileID: 3954124197450694553} 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.5, y: 46} - m_SizeDelta: {x: 200, y: 50} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 250, y: 50} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2198073928601018855 +--- !u!1 &4081970894265446798 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6444670562919482404} + - component: {fileID: 5008739763687368696} + - component: {fileID: 5427279369348982334} + m_Layer: 0 + m_Name: Monster Hp text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6444670562919482404 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4081970894265446798} + 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: 1442053628981883187} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 20, y: 0} + m_SizeDelta: {x: -40, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5008739763687368696 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3496399392294800122} + m_GameObject: {fileID: 4081970894265446798} m_CullTransparentMesh: 1 ---- !u!114 &3886354633703200103 +--- !u!114 &5427279369348982334 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3496399392294800122} + m_GameObject: {fileID: 4081970894265446798} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} @@ -357,7 +585,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 0 + m_text: 0000/0000 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -384,8 +612,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 36 - m_fontSizeBase: 36 + m_fontSize: 20 + m_fontSizeBase: 20 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -426,6 +654,81 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &4187967072567164329 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1740643575397254800} + - component: {fileID: 5143667142169579507} + - component: {fileID: 3115676712305369735} + m_Layer: 5 + m_Name: Monster Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1740643575397254800 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4187967072567164329} + 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: 1442053628981883187} + 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: 0} + m_SizeDelta: {x: 40, y: 40} + m_Pivot: {x: 0, y: 0.5} +--- !u!222 &5143667142169579507 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4187967072567164329} + m_CullTransparentMesh: 1 +--- !u!114 &3115676712305369735 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4187967072567164329} + 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: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + 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 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &5891093615522916541 GameObject: m_ObjectHideFlags: 0 @@ -438,7 +741,7 @@ GameObject: - component: {fileID: 5743897069254935881} - component: {fileID: 8225509816876513334} m_Layer: 5 - m_Name: HPGaugeImage + m_Name: HP m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -451,17 +754,18 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5891093615522916541} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + 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: 3954124197450694553} + m_Children: + - {fileID: 5686739887980570022} + m_Father: {fileID: 5891565712165530425} 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: -744, y: 21} - m_SizeDelta: {x: 220.9956, y: 43.3312} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 60, y: 5} + m_SizeDelta: {x: 90, y: 12} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5743897069254935881 CanvasRenderer: @@ -484,7 +788,82 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.3207547, g: 0.3207547, b: 0.3207547, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + 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 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &6581386796333780369 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1712334487781914764} + - component: {fileID: 6401350082994437720} + - component: {fileID: 7703838897355702313} + m_Layer: 5 + m_Name: MP Forground + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1712334487781914764 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6581386796333780369} + 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: 3350350339663771910} + 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: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6401350082994437720 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6581386796333780369} + m_CullTransparentMesh: 1 +--- !u!114 &7703838897355702313 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6581386796333780369} + 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: 0.19339621, g: 0.23507464, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -513,7 +892,7 @@ GameObject: - component: {fileID: 7099043198836620589} - component: {fileID: 4779274100179459256} m_Layer: 5 - m_Name: PlayerImage + m_Name: Player Image m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -526,17 +905,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6656489444392724936} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -1} + 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: 3954124197450694553} + m_Father: {fileID: 5891565712165530425} 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: -890.3, y: 28.600006} - m_SizeDelta: {x: 102, y: 90} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 40, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7099043198836620589 CanvasRenderer: @@ -566,7 +945,159 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 5021cb96ec94b874e84cf5e86e7a6e81, type: 3} + 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 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &6971401164212538161 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7070007122897510086} + - component: {fileID: 1463115000252890476} + - component: {fileID: 3475733295885508203} + m_Layer: 5 + m_Name: HP + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7070007122897510086 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6971401164212538161} + 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: + - {fileID: 670886125791429540} + m_Father: {fileID: 1442053628981883187} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 20, y: 0} + m_SizeDelta: {x: -40, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1463115000252890476 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6971401164212538161} + m_CullTransparentMesh: 1 +--- !u!114 &3475733295885508203 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6971401164212538161} + 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: 0.3207547, g: 0.3207547, b: 0.3207547, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + 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 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &8667755511864038612 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3350350339663771910} + - component: {fileID: 2615222035187413884} + - component: {fileID: 1736066566878018005} + m_Layer: 5 + m_Name: MP + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3350350339663771910 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8667755511864038612} + 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: + - {fileID: 1712334487781914764} + m_Father: {fileID: 5891565712165530425} + 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: 60, y: -10} + m_SizeDelta: {x: 90, y: 12} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2615222035187413884 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8667755511864038612} + m_CullTransparentMesh: 1 +--- !u!114 &1736066566878018005 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8667755511864038612} + 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: 0.32156864, g: 0.32156864, b: 0.32156864, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.OptionUI.prefab b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.OptionUI.prefab index 0b1b7664..30de88e6 100644 --- a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.OptionUI.prefab +++ b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.OptionUI.prefab @@ -494,7 +494,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -100, y: 0} + m_AnchoredPosition: {x: -80, y: 0} m_SizeDelta: {x: 550, y: 100} m_Pivot: {x: 1, y: 0.5} --- !u!114 &5021670431844709229 diff --git a/Gameton-06/Assets/Gameton/Scripts/Character/CharacterController.cs b/Gameton-06/Assets/Gameton/Scripts/Character/CharacterController.cs index 67d8b399..38c53f73 100644 --- a/Gameton-06/Assets/Gameton/Scripts/Character/CharacterController.cs +++ b/Gameton-06/Assets/Gameton/Scripts/Character/CharacterController.cs @@ -15,5 +15,12 @@ namespace TON linkedCharactor = GetComponent(); } + private void Start() + { + IngameUI.Instance.SetHP(linkedCharactor.currentHP, linkedCharactor.maxHP); + IngameUI.Instance.SetSP(linkedCharactor.currentSP, linkedCharactor.maxSP); + IngameUI.Instance.SetPlayerImage(PlayerDataManager.Singleton.player.type); + } + } } diff --git a/Gameton-06/Assets/Gameton/Scripts/UI/IngameUI.cs b/Gameton-06/Assets/Gameton/Scripts/UI/IngameUI.cs index 01fd8220..10a7c46b 100644 --- a/Gameton-06/Assets/Gameton/Scripts/UI/IngameUI.cs +++ b/Gameton-06/Assets/Gameton/Scripts/UI/IngameUI.cs @@ -2,6 +2,7 @@ using System.Collections; using System.Collections.Generic; using TMPro; using UnityEngine; +using UnityEngine.Assertions; using UnityEngine.UI; namespace TON @@ -10,32 +11,70 @@ namespace TON { public static IngameUI Instance => UIManager.Singleton.GetUI(UIList.IngameUI); + public Image characterImage; public Image hpBar; public Image spBar; - public TextMeshProUGUI hpText; - public TextMeshProUGUI spText; + public TextMeshProUGUI stageText; + public TextMeshProUGUI monsterHp; + public Image monsterHpBar; + public Image monsterImage; + + + private float currentHP; + private float maxHP; + private float currentSP; + private float maxSP; + private string playerType; + + private void OnEnable() + { + // UI가 활성화될 때 저장된 값들로 업데이트 + RefreshUI(); + } public void SetHP(float current, float max) { - hpBar.fillAmount = current / max; - hpText.text = $"{current:0} / {max: 0}"; + currentHP = current; + maxHP = max; + if (gameObject.activeInHierarchy) + { + hpBar.fillAmount = current / max; + } } public void SetSP(float current, float max) { - spBar.fillAmount = current / max; - spText.text = $"{current:0} / {max: 0}"; + currentSP = current; + maxSP = max; + if (gameObject.activeInHierarchy) + { + spBar.fillAmount = current / max; + } } - - - public void OnPressPauseButton() + public void SetPlayerImage(string type) { - UIManager.Show(UIList.PauseUI); + playerType = type; + if (gameObject.activeInHierarchy) + { + UpdatePlayerImage(); + } + } - // 게임 일시 정지 - Time.timeScale = 0f; + private void RefreshUI() + { + if (maxHP > 0) SetHP(currentHP, maxHP); + if (maxSP > 0) SetSP(currentSP, maxSP); + if (!string.IsNullOrEmpty(playerType)) UpdatePlayerImage(); + } + + private void UpdatePlayerImage() + { + if (AssetManager.Singleton.LoadPlayerIcon(playerType, FaceStatue.Idle, out Sprite result)) + { + characterImage.sprite = result; + } } }