diff --git a/Assets/Import/materials/07___Default_0.mat b/Assets/Import/materials/07___Default_0.mat index c0474d721e2ba6306bca19cb492441512bf265f0..fbaf849e20e2e71c73162c519b008f7c2ea47411 100644 --- a/Assets/Import/materials/07___Default_0.mat +++ b/Assets/Import/materials/07___Default_0.mat @@ -26,7 +26,6 @@ Material: m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _METALLICSPECGLOSSMAP - - _NORMALMAP m_InvalidKeywords: - _METALLICGLOSSMAP m_LightmapFlags: 4 diff --git a/Assets/Scenes/FinalStage.unity b/Assets/Scenes/FinalStage.unity index 0f0a6d0ed61fe9c948be5a7f4209f9370c94235d..06c9630d90591904d75f14595b9d17a2a268f1e1 100644 --- a/Assets/Scenes/FinalStage.unity +++ b/Assets/Scenes/FinalStage.unity @@ -345,8 +345,17 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_RemovedGameObjects: + - {fileID: 4360221590896980479, guid: 2efde1f742401b345992c5c07ac5d64d, type: 3} + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 8743020687667344940, guid: 2efde1f742401b345992c5c07ac5d64d, + type: 3} + insertIndex: 1 + addedObject: {fileID: 1082504882} + - targetCorrespondingSourceObject: {fileID: 8743020687667344940, guid: 2efde1f742401b345992c5c07ac5d64d, + type: 3} + insertIndex: 6 + addedObject: {fileID: 923018678} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2efde1f742401b345992c5c07ac5d64d, type: 3} --- !u!1 &48917072 stripped @@ -355,6 +364,96 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 48917071} m_PrefabAsset: {fileID: 0} +--- !u!224 &48917073 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8743020687667344940, guid: 2efde1f742401b345992c5c07ac5d64d, + type: 3} + m_PrefabInstance: {fileID: 48917071} + m_PrefabAsset: {fileID: 0} +--- !u!114 &48917074 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6996945697729140689, guid: 2efde1f742401b345992c5c07ac5d64d, + type: 3} + m_PrefabInstance: {fileID: 48917071} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &48917075 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2556371953134110589, guid: 2efde1f742401b345992c5c07ac5d64d, + type: 3} + m_PrefabInstance: {fileID: 48917071} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &48917076 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2261296204684676316, guid: 2efde1f742401b345992c5c07ac5d64d, + type: 3} + m_PrefabInstance: {fileID: 48917071} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &48917077 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2525808155420465753, guid: 2efde1f742401b345992c5c07ac5d64d, + type: 3} + m_PrefabInstance: {fileID: 48917071} + m_PrefabAsset: {fileID: 0} +--- !u!114 &48917078 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7238542208034607587, guid: 2efde1f742401b345992c5c07ac5d64d, + type: 3} + m_PrefabInstance: {fileID: 48917071} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &48917079 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 4826796673589713399, guid: 2efde1f742401b345992c5c07ac5d64d, + type: 3} + m_PrefabInstance: {fileID: 48917071} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &48917080 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6156841489287955234, guid: 2efde1f742401b345992c5c07ac5d64d, + type: 3} + m_PrefabInstance: {fileID: 48917071} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &48917081 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8593515693264656183, guid: 2efde1f742401b345992c5c07ac5d64d, + type: 3} + m_PrefabInstance: {fileID: 48917071} + m_PrefabAsset: {fileID: 0} --- !u!64 &64476522 MeshCollider: m_ObjectHideFlags: 0 @@ -377,6 +476,24 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: -7344904042371295554, guid: 64861ff52786dae46891015bd91c9696, type: 3} +--- !u!114 &71749163 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1197901225989701175, guid: 2efde1f742401b345992c5c07ac5d64d, + type: 3} + m_PrefabInstance: {fileID: 48917071} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &71749164 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4316714462513033709, guid: 2efde1f742401b345992c5c07ac5d64d, + type: 3} + m_PrefabInstance: {fileID: 48917071} + m_PrefabAsset: {fileID: 0} --- !u!114 &77536272 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 8255534528456056578, guid: 2efde1f742401b345992c5c07ac5d64d, @@ -1352,12 +1469,6 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 8929397184234729502, guid: 64861ff52786dae46891015bd91c9696, type: 3} ---- !u!1 &212556466 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 4360221590896980479, guid: 2efde1f742401b345992c5c07ac5d64d, - type: 3} - m_PrefabInstance: {fileID: 48917071} - m_PrefabAsset: {fileID: 0} --- !u!1 &231799707 GameObject: m_ObjectHideFlags: 0 @@ -1516,6 +1627,81 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 242507723} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &266100083 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 266100084} + - component: {fileID: 266100086} + - component: {fileID: 266100085} + m_Layer: 5 + m_Name: BackHealthBar + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &266100084 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 266100083} + 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: 923018678} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: -475, y: 10} + m_SizeDelta: {x: 950, y: 10} + m_Pivot: {x: 0, y: 0.5} +--- !u!114 &266100085 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 266100083} + 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.5568628, g: 0.15686275, b: 0.08235294, 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: 21300000, guid: be4aaa577701c6142b73fbd348cd4c27, type: 3} + m_Type: 3 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 0 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &266100086 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 266100083} + m_CullTransparentMesh: 1 --- !u!64 &267100313 MeshCollider: m_ObjectHideFlags: 0 @@ -2379,6 +2565,81 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &480554279 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 480554280} + - component: {fileID: 480554282} + - component: {fileID: 480554281} + m_Layer: 5 + m_Name: BackgroundHealthBar + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &480554280 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 480554279} + 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: 923018678} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: -480, y: 10} + m_SizeDelta: {x: 960, y: 20} + m_Pivot: {x: 0, y: 0.5} +--- !u!114 &480554281 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 480554279} + 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, g: 0, b: 0, 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: 21300000, guid: be4aaa577701c6142b73fbd348cd4c27, type: 3} + m_Type: 3 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 0 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &480554282 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 480554279} + m_CullTransparentMesh: 1 --- !u!1 &482393973 GameObject: m_ObjectHideFlags: 0 @@ -2739,11 +3000,12 @@ MonoBehaviour: - {fileID: 624626187} isStageCompleted: 0 survivalTime: 0 - saveButton: {fileID: 0} - countdown: {fileID: 212556466} - countdownText: {fileID: 1587857333} - countdownShop: {fileID: 0} - countdownTextShop: {fileID: 0} + saveButton: {fileID: 7157623620608268509} + countdown: {fileID: 1082504881} + countdownText: {fileID: 1087642053} + countdownShop: {fileID: 8415524791773960096, guid: 295068a5918084542a8b4a315530e4d1, + type: 3} + countdownTextShop: {fileID: 1186824648} --- !u!64 &547410050 MeshCollider: m_ObjectHideFlags: 0 @@ -4024,6 +4286,45 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: -5221083203794505268, guid: 64861ff52786dae46891015bd91c9696, type: 3} +--- !u!1 &923018677 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 923018678} + m_Layer: 5 + m_Name: BossHealthBar + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &923018678 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 923018677} + 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: 1524550745} + - {fileID: 480554280} + - {fileID: 266100084} + - {fileID: 1663659653} + m_Father: {fileID: 48917073} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: -325, y: -120} + m_SizeDelta: {x: 650, y: 80} + m_Pivot: {x: 0, y: 0} --- !u!114 &923459257 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 1604671993335288653, guid: 2efde1f742401b345992c5c07ac5d64d, @@ -4647,36 +4948,248 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 4200582798582052924, guid: 64861ff52786dae46891015bd91c9696, type: 3} ---- !u!64 &1098192401 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1772298231} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 5 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 9187030933164564250, guid: 64861ff52786dae46891015bd91c9696, type: 3} ---- !u!64 &1099117555 -MeshCollider: +--- !u!1 &1082504881 +GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1772298136} - m_Material: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1082504882} + - component: {fileID: 1082504884} + - component: {fileID: 1082504883} + m_Layer: 5 + m_Name: Countdown + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1082504882 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1082504881} + 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: 1186824647} + - {fileID: 1087642052} + m_Father: {fileID: 48917073} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -35} + m_SizeDelta: {x: 600, y: 70} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1082504883 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1082504881} + 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: 0.94509804} + 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: 21300000, guid: 1d2fb551f6b4d954797961695713d0f9, 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 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1082504884 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1082504881} + m_CullTransparentMesh: 1 +--- !u!1 &1087642051 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1087642052} + - component: {fileID: 1087642054} + - component: {fileID: 1087642053} + m_Layer: 5 + m_Name: Text (TMP) (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1087642052 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1087642051} + 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: 1082504882} + 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!114 &1087642053 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1087642051} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: 15 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 58225e3fa5fbfef4bb79d20104380b9d, type: 2} + m_sharedMaterial: {fileID: -885190336337333371, guid: 58225e3fa5fbfef4bb79d20104380b9d, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 30 + m_fontSizeBase: 30 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 1024 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1087642054 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1087642051} + m_CullTransparentMesh: 1 +--- !u!64 &1098192401 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1772298231} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 9187030933164564250, guid: 64861ff52786dae46891015bd91c9696, type: 3} +--- !u!64 &1099117555 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1772298136} + m_Material: {fileID: 0} m_IncludeLayers: serializedVersion: 2 m_Bits: 0 @@ -4789,12 +5302,27 @@ PrefabInstance: - target: {fileID: 2654664943295515621, guid: f1c66f5692810124bb5401e3db3a1c90, type: 3} propertyPath: m_Enabled - value: 0 + value: 1 objectReference: {fileID: 0} + - target: {fileID: 2654664943295515621, guid: f1c66f5692810124bb5401e3db3a1c90, + type: 3} + propertyPath: backHealthBar + value: + objectReference: {fileID: 266100085} + - target: {fileID: 2654664943295515621, guid: f1c66f5692810124bb5401e3db3a1c90, + type: 3} + propertyPath: frontHealthBar + value: + objectReference: {fileID: 1663659654} - target: {fileID: 6876318178612049735, guid: f1c66f5692810124bb5401e3db3a1c90, type: 3} propertyPath: damage - value: 30 + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 6876318178612049735, guid: f1c66f5692810124bb5401e3db3a1c90, + type: 3} + propertyPath: health + value: 10000 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -4845,6 +5373,141 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: -629719859055844128, guid: 64861ff52786dae46891015bd91c9696, type: 3} +--- !u!1 &1186824646 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1186824647} + - component: {fileID: 1186824649} + - component: {fileID: 1186824648} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1186824647 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1186824646} + 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: 1082504882} + 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!114 &1186824648 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1186824646} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: Countdown for next stage + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 58225e3fa5fbfef4bb79d20104380b9d, type: 2} + m_sharedMaterial: {fileID: -885190336337333371, guid: 58225e3fa5fbfef4bb79d20104380b9d, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 30 + m_fontSizeBase: 30 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1186824649 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1186824646} + m_CullTransparentMesh: 1 --- !u!64 &1198096120 MeshCollider: m_ObjectHideFlags: 0 @@ -5584,72 +6247,311 @@ MeshCollider: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1772298172} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 5 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: -4771821394836744272, guid: 64861ff52786dae46891015bd91c9696, type: 3} ---- !u!64 &1459136272 -MeshCollider: + m_GameObject: {fileID: 1772298172} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: -4771821394836744272, guid: 64861ff52786dae46891015bd91c9696, type: 3} +--- !u!64 &1459136272 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1772298123} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 6181293131206855803, guid: 64861ff52786dae46891015bd91c9696, type: 3} +--- !u!64 &1462794722 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1772298207} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: -4568712281489378779, guid: 64861ff52786dae46891015bd91c9696, type: 3} +--- !u!1 &1468104161 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1468104168} + - component: {fileID: 1468104167} + - component: {fileID: 1468104166} + - component: {fileID: 1468104165} + - component: {fileID: 1468104164} + - component: {fileID: 1468104163} + - component: {fileID: 1468104162} + m_Layer: 5 + m_Name: FadeOut + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!95 &1468104162 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1468104161} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 77d810e151cf1b843b841ae5fc4e3b67, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!114 &1468104163 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1468104161} + 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, g: 0, b: 0, 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!222 &1468104164 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1468104161} + m_CullTransparentMesh: 1 +--- !u!114 &1468104165 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1468104161} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &1468104166 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1468104161} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!223 &1468104167 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1468104161} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!224 &1468104168 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1468104161} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!1 &1494378619 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5820787490940508662, guid: 51cde55a2a5a5c3448cd8df1ab6225dd, + type: 3} + m_PrefabInstance: {fileID: 1230702347393119482} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1524550744 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1524550745} + - component: {fileID: 1524550747} + - component: {fileID: 1524550746} + m_Layer: 5 + m_Name: Name + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1524550745 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1524550744} + 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: 1915474392} + m_Father: {fileID: 923018678} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -22.5} + m_SizeDelta: {x: 400, y: 45} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1524550746 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1772298123} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 + m_GameObject: {fileID: 1524550744} m_Enabled: 1 - serializedVersion: 5 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 6181293131206855803, guid: 64861ff52786dae46891015bd91c9696, type: 3} ---- !u!64 &1462794722 -MeshCollider: + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, 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: 21300000, guid: 1d2fb551f6b4d954797961695713d0f9, 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 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1524550747 +CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1772298207} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 5 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: -4568712281489378779, guid: 64861ff52786dae46891015bd91c9696, type: 3} ---- !u!1 &1494378619 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 5820787490940508662, guid: 51cde55a2a5a5c3448cd8df1ab6225dd, - type: 3} - m_PrefabInstance: {fileID: 1230702347393119482} - m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1524550744} + m_CullTransparentMesh: 1 --- !u!114 &1531715027 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 5122384647402422178, guid: 2efde1f742401b345992c5c07ac5d64d, @@ -5684,18 +6586,6 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: -2663618426755406219, guid: 64861ff52786dae46891015bd91c9696, type: 3} ---- !u!114 &1587857333 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 1157716481710310529, guid: 2efde1f742401b345992c5c07ac5d64d, - type: 3} - m_PrefabInstance: {fileID: 48917071} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1588702987 GameObject: m_ObjectHideFlags: 0 @@ -6125,6 +7015,81 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1663659652 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1663659653} + - component: {fileID: 1663659655} + - component: {fileID: 1663659654} + m_Layer: 5 + m_Name: FrontHealthBar + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1663659653 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1663659652} + 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: 923018678} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: -475, y: 10} + m_SizeDelta: {x: 950, y: 10} + m_Pivot: {x: 0, y: 0.5} +--- !u!114 &1663659654 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1663659652} + 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.84313726, g: 0.18431373, b: 0.0627451, 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: 21300000, guid: 8ee26e538cc92f94080a3960e59ca598, type: 3} + m_Type: 3 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 0 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1663659655 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1663659652} + m_CullTransparentMesh: 1 --- !u!64 &1674789928 MeshCollider: m_ObjectHideFlags: 0 @@ -9364,44 +10329,207 @@ MeshCollider: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1772298239} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: + m_GameObject: {fileID: 1772298239} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: -868227346695080935, guid: 64861ff52786dae46891015bd91c9696, type: 3} +--- !u!64 &1776613268 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1772298119} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: -1104200071632127571, guid: 64861ff52786dae46891015bd91c9696, type: 3} +--- !u!1 &1795724928 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1795724935} + - component: {fileID: 1795724934} + - component: {fileID: 1795724933} + - component: {fileID: 1795724932} + - component: {fileID: 1795724931} + - component: {fileID: 1795724930} + - component: {fileID: 1795724929} + m_Layer: 5 + m_Name: FadeIn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!95 &1795724929 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1795724928} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: e9239d7ba86f98849833268cc10710d4, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!114 &1795724930 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1795724928} + 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, g: 0, b: 0, 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: 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!222 &1795724931 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1795724928} + m_CullTransparentMesh: 1 +--- !u!114 &1795724932 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1795724928} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: serializedVersion: 2 m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 +--- !u!114 &1795724933 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1795724928} m_Enabled: 1 - serializedVersion: 5 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: -868227346695080935, guid: 64861ff52786dae46891015bd91c9696, type: 3} ---- !u!64 &1776613268 -MeshCollider: + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!223 &1795724934 +Canvas: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1772298119} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 + m_GameObject: {fileID: 1795724928} m_Enabled: 1 - serializedVersion: 5 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: -1104200071632127571, guid: 64861ff52786dae46891015bd91c9696, type: 3} + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!224 &1795724935 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1795724928} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} --- !u!114 &1801358903 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 1756131465317978774, guid: 295068a5918084542a8b4a315530e4d1, @@ -9669,6 +10797,141 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1915474391 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1915474392} + - component: {fileID: 1915474394} + - component: {fileID: 1915474393} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1915474392 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1915474391} + 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: 1524550745} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 5, y: 0} + m_SizeDelta: {x: -10, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1915474393 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1915474391} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: Azathoth + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 58225e3fa5fbfef4bb79d20104380b9d, type: 2} + m_sharedMaterial: {fileID: -885190336337333371, guid: 58225e3fa5fbfef4bb79d20104380b9d, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 34 + m_fontSizeBase: 34 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1915474394 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1915474391} + m_CullTransparentMesh: 1 --- !u!64 &1923479454 MeshCollider: m_ObjectHideFlags: 0 @@ -10257,6 +11520,11 @@ PrefabInstance: propertyPath: gameOverText value: objectReference: {fileID: 126995662} + - target: {fileID: 82616962848050741, guid: 51cde55a2a5a5c3448cd8df1ab6225dd, + type: 3} + propertyPath: FadeOutCanvas + value: + objectReference: {fileID: 1468104161} - target: {fileID: 82616962848050741, guid: 51cde55a2a5a5c3448cd8df1ab6225dd, type: 3} propertyPath: enemiesKilled @@ -10822,6 +12090,46 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.y value: -85.81 objectReference: {fileID: 0} + - target: {fileID: 6678157685655472961, guid: 51cde55a2a5a5c3448cd8df1ab6225dd, + type: 3} + propertyPath: petName1 + value: + objectReference: {fileID: 48917076} + - target: {fileID: 6678157685655472961, guid: 51cde55a2a5a5c3448cd8df1ab6225dd, + type: 3} + propertyPath: petName2 + value: + objectReference: {fileID: 48917080} + - target: {fileID: 6678157685655472961, guid: 51cde55a2a5a5c3448cd8df1ab6225dd, + type: 3} + propertyPath: petHealthBar1 + value: + objectReference: {fileID: 48917077} + - target: {fileID: 6678157685655472961, guid: 51cde55a2a5a5c3448cd8df1ab6225dd, + type: 3} + propertyPath: petHealthBar2 + value: + objectReference: {fileID: 48917081} + - target: {fileID: 6678157685655472961, guid: 51cde55a2a5a5c3448cd8df1ab6225dd, + type: 3} + propertyPath: backHealthBar1 + value: + objectReference: {fileID: 48917075} + - target: {fileID: 6678157685655472961, guid: 51cde55a2a5a5c3448cd8df1ab6225dd, + type: 3} + propertyPath: backHealthBar2 + value: + objectReference: {fileID: 48917079} + - target: {fileID: 6678157685655472961, guid: 51cde55a2a5a5c3448cd8df1ab6225dd, + type: 3} + propertyPath: frontHealthBar1 + value: + objectReference: {fileID: 48917074} + - target: {fileID: 6678157685655472961, guid: 51cde55a2a5a5c3448cd8df1ab6225dd, + type: 3} + propertyPath: frontHealthBar2 + value: + objectReference: {fileID: 48917078} - target: {fileID: 7152517654346318397, guid: 51cde55a2a5a5c3448cd8df1ab6225dd, type: 3} propertyPath: field of view @@ -11419,6 +12727,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 76055dead16e1844cb0d263df451e436, type: 3} m_Name: m_EditorClassIdentifier: + timeline: {fileID: 0} + virtualCamera: {fileID: 0} --- !u!1001 &4739606442214425609 PrefabInstance: m_ObjectHideFlags: 0 @@ -11527,11 +12837,21 @@ PrefabInstance: propertyPath: wave value: objectReference: {fileID: 1304587568} + - target: {fileID: 6997738934615977069, guid: da6f8a21a762b8b449958966637f7373, + type: 3} + propertyPath: chapterText + value: + objectReference: {fileID: 71749164} - target: {fileID: 6997738934615977069, guid: da6f8a21a762b8b449958966637f7373, type: 3} propertyPath: currentStage value: 4 objectReference: {fileID: 0} + - target: {fileID: 6997738934615977069, guid: da6f8a21a762b8b449958966637f7373, + type: 3} + propertyPath: chapterTextMesh + value: + objectReference: {fileID: 71749163} - target: {fileID: 6997738934615977069, guid: da6f8a21a762b8b449958966637f7373, type: 3} propertyPath: stages.Array.size @@ -11556,6 +12876,7 @@ PrefabInstance: m_RemovedGameObjects: - {fileID: 4092746690584682938, guid: da6f8a21a762b8b449958966637f7373, type: 3} - {fileID: 6071649473104805442, guid: da6f8a21a762b8b449958966637f7373, type: 3} + - {fileID: 4380889649618805672, guid: da6f8a21a762b8b449958966637f7373, type: 3} m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: 5616496841289685347, guid: da6f8a21a762b8b449958966637f7373, type: 3} @@ -11704,11 +13025,85 @@ PrefabInstance: propertyPath: player value: objectReference: {fileID: 1494378619} + - target: {fileID: 9099820566532357781, guid: 34eecfba829a3414a8ba80f8d7a9a7a1, + type: 3} + propertyPath: shopHUD + value: + objectReference: {fileID: 8415524791773960096, guid: 295068a5918084542a8b4a315530e4d1, + type: 3} + - target: {fileID: 9099820566532357781, guid: 34eecfba829a3414a8ba80f8d7a9a7a1, + type: 3} + propertyPath: defaultSave + value: + objectReference: {fileID: 7157623620608268507} + - target: {fileID: 9099820566532357781, guid: 34eecfba829a3414a8ba80f8d7a9a7a1, + type: 3} + propertyPath: defaultPause + value: + objectReference: {fileID: 7157623620608268508} + - target: {fileID: 9099820566532357781, guid: 34eecfba829a3414a8ba80f8d7a9a7a1, + type: 3} + propertyPath: FadeOutCanvas + value: + objectReference: {fileID: 1468104161} + - target: {fileID: 9099820566532357781, guid: 34eecfba829a3414a8ba80f8d7a9a7a1, + type: 3} + propertyPath: defaultSettings + value: + objectReference: {fileID: 7157623620608268506} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 34eecfba829a3414a8ba80f8d7a9a7a1, type: 3} +--- !u!114 &7157623620608268506 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3334097939977253523, guid: 34eecfba829a3414a8ba80f8d7a9a7a1, + type: 3} + m_PrefabInstance: {fileID: 7157623620608268505} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &7157623620608268507 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7326771201957628739, guid: 34eecfba829a3414a8ba80f8d7a9a7a1, + type: 3} + m_PrefabInstance: {fileID: 7157623620608268505} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &7157623620608268508 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3016649647311339327, guid: 34eecfba829a3414a8ba80f8d7a9a7a1, + type: 3} + m_PrefabInstance: {fileID: 7157623620608268505} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &7157623620608268509 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 4441180843521330980, guid: 34eecfba829a3414a8ba80f8d7a9a7a1, + type: 3} + m_PrefabInstance: {fileID: 7157623620608268505} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 @@ -11716,6 +13111,7 @@ SceneRoots: - {fileID: 1772298099} - {fileID: 951381254} - {fileID: 877876528} + - {fileID: 1795724935} - {fileID: 7157623620608268505} - {fileID: 48917071} - {fileID: 1257533374} @@ -11727,3 +13123,4 @@ SceneRoots: - {fileID: 1588702990} - {fileID: 1162384300} - {fileID: 2563494445740876859} + - {fileID: 1468104168} diff --git a/Assets/Script/Bot/Enemy/Azathoth/Azathoth.cs b/Assets/Script/Bot/Enemy/Azathoth/Azathoth.cs index 0729338dd4fc330982f9ed691e86f900835abdb4..2595ec6d7584d68132c3f7934d7b7b6a022c45d6 100644 --- a/Assets/Script/Bot/Enemy/Azathoth/Azathoth.cs +++ b/Assets/Script/Bot/Enemy/Azathoth/Azathoth.cs @@ -1,6 +1,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; +using UnityEngine.UI; public class Azathoth : MonoBehaviour { @@ -15,6 +16,13 @@ public class Azathoth : MonoBehaviour private bool negativeEffect; private float movementSpeedDebuff = 0.5f; private float damageDebuff = 0.5f; + + [Header("Health Bar")] + public float chipSpeed = 2f; + public Image frontHealthBar; + public Image backHealthBar; + private float lerpTimer; + void Start() { isSpawnReady = true; @@ -56,6 +64,8 @@ public class Azathoth : MonoBehaviour RemoveNegativeEffect(); } } + + UpdateHealthUI(); } private void SpawnSlave() @@ -88,4 +98,34 @@ public class Azathoth : MonoBehaviour player.GetComponent<PlayerMotor>().speed /= movementSpeedDebuff; player.GetComponent<PlayerHealth>().damageMultiplier /= damageDebuff; } + + public void UpdateHealthUI() + { + float health = GetComponent<Enemy>().health; + float maxHealth = GetComponent<Enemy>().maxHealth; + health = Mathf.Clamp(health, 0, maxHealth); + + float fillF = frontHealthBar.fillAmount; + float fillB = backHealthBar.fillAmount; + float hFraction = health / maxHealth; + Debug.Log("Health:" + health); + Debug.Log("Max:" + maxHealth); + + if (fillB > hFraction) + { + frontHealthBar.fillAmount = hFraction; + lerpTimer += Time.deltaTime; + float percentComplete = lerpTimer / chipSpeed; + percentComplete = percentComplete * percentComplete; + backHealthBar.fillAmount = Mathf.Lerp(fillB, hFraction, percentComplete); + } + if (fillF < hFraction) + { + backHealthBar.fillAmount = hFraction; + lerpTimer += Time.deltaTime; + float percentComplete = lerpTimer / chipSpeed; + percentComplete = percentComplete * percentComplete; + frontHealthBar.fillAmount = Mathf.Lerp(fillF, backHealthBar.fillAmount, percentComplete); + } + } } diff --git a/Assets/Script/Bot/Enemy/Enemy.cs b/Assets/Script/Bot/Enemy/Enemy.cs index 7ed9f5b82909cb7f60e2adaf061cc27968eeca0e..94335ce3fb4fd939b80dbd7a15a5d1cf05ab8529 100644 --- a/Assets/Script/Bot/Enemy/Enemy.cs +++ b/Assets/Script/Bot/Enemy/Enemy.cs @@ -28,6 +28,7 @@ public class Enemy : MonoBehaviour [Header("Health")] public int health = 100; + public int maxHealth; public float deathTimer = 0f; [Header("Dropped Object")] @@ -71,6 +72,7 @@ public class Enemy : MonoBehaviour } health = (int)(health * difficultyMultiplier); + maxHealth = health; damage = (int)(damage * difficultyMultiplier); } diff --git a/Assets/Script/Bot/Pet/WolfPet/WolfPetAttackState.cs b/Assets/Script/Bot/Pet/WolfPet/WolfPetAttackState.cs index fe1b14c98078c3801e4b8bd8f9f6a20fc4f4db6a..8a720321dd3343bba593878edf08c7cd14943700 100644 --- a/Assets/Script/Bot/Pet/WolfPet/WolfPetAttackState.cs +++ b/Assets/Script/Bot/Pet/WolfPet/WolfPetAttackState.cs @@ -7,7 +7,7 @@ using UnityEngine.AI; public class WolfPetAttackState : StateMachineBehaviour { public float attackDistance = 5f; - public int attackDamage = 10; + public int attackDamage = 1; private GameObject target; NavMeshAgent agent; diff --git a/Assets/Script/Menu/LoadMenu.cs b/Assets/Script/Menu/LoadMenu.cs index 138acb86022fc69c47495e22cdfa1f5faeec5832..4fe0a57a8673d2d527c5bf994c27210defd194ad 100644 --- a/Assets/Script/Menu/LoadMenu.cs +++ b/Assets/Script/Menu/LoadMenu.cs @@ -73,7 +73,7 @@ public class LoadMenu : MonoBehaviour FadeOut.SetActive(true); if (data.stageNumber == 4) { - StartCoroutine(StartGameWithDelay(3)); + StartCoroutine(StartGameWithDelay(5)); } else { @@ -88,7 +88,7 @@ public class LoadMenu : MonoBehaviour FadeOut.SetActive(true); if (data.stageNumber == 4) { - StartCoroutine(StartGameWithDelay(3)); + StartCoroutine(StartGameWithDelay(5)); } else { @@ -103,7 +103,7 @@ public class LoadMenu : MonoBehaviour FadeOut.SetActive(true); if (data.stageNumber == 4) { - StartCoroutine(StartGameWithDelay(3)); + StartCoroutine(StartGameWithDelay(5)); } else { diff --git a/Assets/Script/Menu/PauseMenu.cs b/Assets/Script/Menu/PauseMenu.cs index d578f26c308a0bf2f44a7c391eb5347305e9ea96..6ce69ea0b70bf26a065f398dd3cdc10b068a713d 100644 --- a/Assets/Script/Menu/PauseMenu.cs +++ b/Assets/Script/Menu/PauseMenu.cs @@ -34,11 +34,11 @@ public class PauseMenu : MonoBehaviour { if (Input.GetKeyDown(KeyCode.Escape) || Input.GetKeyDown(KeyCode.JoystickButton7)) { - if (GameIsPaused && !player.GetComponent<PlayerHealth>().isDead && !shopHUD.activeSelf) + if (GameIsPaused && !player.GetComponent<PlayerHealth>().isDead) { Resume(); } - else if (!GameIsPaused && !player.GetComponent<PlayerHealth>().isDead && !shopHUD.activeSelf) + else if (!GameIsPaused && !player.GetComponent<PlayerHealth>().isDead) { Pause(); }