diff --git a/Assets/Assets.meta b/Assets/Assets.meta new file mode 100644 index 0000000..4eba494 --- /dev/null +++ b/Assets/Assets.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0460346d99d385241a6d87bbd10aceb8 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/PhysMats.meta b/Assets/PhysMats.meta new file mode 100644 index 0000000..bc5b1b2 --- /dev/null +++ b/Assets/PhysMats.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e823a56cb429e4b49becdc740fba66b9 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Entities/Player.prefab b/Assets/Prefabs/Entities/Player.prefab index 4d5a080..ab414b1 100644 --- a/Assets/Prefabs/Entities/Player.prefab +++ b/Assets/Prefabs/Entities/Player.prefab @@ -178,7 +178,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f16e1b4841b0d4546a52853aafbb7d85, type: 3} m_Name: m_EditorClassIdentifier: - hpTrueMax: 10 + hpTrueMax: 20 overlappable: 0 hpMax: 10 hp: 0 diff --git a/Assets/Prefabs/Entities/SHOP Rapier.prefab b/Assets/Prefabs/Entities/SHOP Rapier.prefab index c3bbb7f..7af8ef8 100644 --- a/Assets/Prefabs/Entities/SHOP Rapier.prefab +++ b/Assets/Prefabs/Entities/SHOP Rapier.prefab @@ -96,8 +96,8 @@ MonoBehaviour: overlappable: 1 hpMax: 1 hp: 1 - hpChange: -1 - maxHpChange: -1 + hpChange: -2 + maxHpChange: -2 damage: 3 attackAnimation: {fileID: 5896060810164205279, guid: 602b69921902efc44ab8a008655b6574, type: 3} diff --git a/Assets/Prefabs/Entities/SHOP Sword.prefab b/Assets/Prefabs/Entities/SHOP Sword.prefab index 7a09832..0e80a1b 100644 --- a/Assets/Prefabs/Entities/SHOP Sword.prefab +++ b/Assets/Prefabs/Entities/SHOP Sword.prefab @@ -96,8 +96,8 @@ MonoBehaviour: overlappable: 1 hpMax: 1 hp: 0 - hpChange: -1 - maxHpChange: -1 + hpChange: -6 + maxHpChange: -6 damage: 5 attackAnimation: {fileID: 5896060810164205279, guid: 602b69921902efc44ab8a008655b6574, type: 3} diff --git a/Assets/Prefabs/Entities/Slime.prefab b/Assets/Prefabs/Entities/Slime.prefab index 62a5378..5aedadc 100644 --- a/Assets/Prefabs/Entities/Slime.prefab +++ b/Assets/Prefabs/Entities/Slime.prefab @@ -95,7 +95,7 @@ MonoBehaviour: hpTrueMax: 2 overlappable: 0 hpMax: 2 - hp: 0 + hp: 2 monsterName: Slime moveChance: 0.5 visionRange: 4 diff --git a/Assets/Prefabs/Entities/Vase.prefab b/Assets/Prefabs/Entities/Vase.prefab new file mode 100644 index 0000000..8e15214 --- /dev/null +++ b/Assets/Prefabs/Entities/Vase.prefab @@ -0,0 +1,99 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &7181825274690322774 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1996216475365497337} + - component: {fileID: 7422743443337537171} + - component: {fileID: 3130402855955491661} + m_Layer: 0 + m_Name: Vase + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1996216475365497337 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7181825274690322774} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 12.020314, y: 5.839661, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &7422743443337537171 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7181825274690322774} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: -522733599 + m_SortingLayer: 1 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: 06bf72b80e8a4d745bb2c5c1140b4bbc, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.42, y: 0.36} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!114 &3130402855955491661 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7181825274690322774} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: aec5e971190b4b544a78be24566f9e6c, type: 3} + m_Name: + m_EditorClassIdentifier: + hpTrueMax: 1 + overlappable: 0 + hpMax: 0 + hp: 0 + monsterName: Vase diff --git a/Assets/Prefabs/Entities/Vase.prefab.meta b/Assets/Prefabs/Entities/Vase.prefab.meta new file mode 100644 index 0000000..5810881 --- /dev/null +++ b/Assets/Prefabs/Entities/Vase.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: df9720599c92797409d8a71ef65d4815 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/GameController.prefab b/Assets/Prefabs/GameController.prefab index 19c4f92..03d5309 100644 --- a/Assets/Prefabs/GameController.prefab +++ b/Assets/Prefabs/GameController.prefab @@ -33,6 +33,7 @@ RectTransform: - {fileID: 6763073704789207265} - {fileID: 9068024689038202676} - {fileID: 9068024689794909323} + - {fileID: 3736131471701239906} - {fileID: 2174908496911848014} m_Father: {fileID: 1651829514} m_RootOrder: 0 @@ -130,56 +131,9 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1591973061} - - {fileID: 1816923098} m_Father: {fileID: 1419775483983031142} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1816923097 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1816923098} - - component: {fileID: 1816923100} - m_Layer: 0 - m_Name: EventSystem - m_TagString: EventSystem - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1816923098 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1816923097} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1651829514} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1816923100 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1816923097} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -619905303, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_FirstSelected: {fileID: 0} - m_sendNavigationEvents: 1 - m_DragThreshold: 10 --- !u!1 &1792584738874209504 GameObject: m_ObjectHideFlags: 0 @@ -293,10 +247,27 @@ MonoBehaviour: - {fileID: 8811060229651695861, guid: 62cd302b5f1887840acff35feb8fb5f9, type: 3} - {fileID: 8811060229651695861, guid: 62cd302b5f1887840acff35feb8fb5f9, type: 3} - {fileID: 2071995852067845502, guid: ea7f7cf3dc500f84cb102a47d86a30ea, type: 3} + - {fileID: 1164136568549368904, guid: a4aeecfb369f0974490d158ef9489335, type: 3} + - {fileID: 1164136568549368904, guid: a4aeecfb369f0974490d158ef9489335, type: 3} + - {fileID: 1164136568549368904, guid: a4aeecfb369f0974490d158ef9489335, type: 3} enemiesToSpawn: 15 curiositiesPrefabs: - {fileID: 9176106732687901849, guid: f706c9b9b5b3ec1459e524a5defeb1c8, type: 3} + - {fileID: 9176106732687901849, guid: f706c9b9b5b3ec1459e524a5defeb1c8, type: 3} + - {fileID: 9176106732687901849, guid: f706c9b9b5b3ec1459e524a5defeb1c8, type: 3} + - {fileID: 9176106732687901849, guid: f706c9b9b5b3ec1459e524a5defeb1c8, type: 3} + - {fileID: 9176106732687901849, guid: f706c9b9b5b3ec1459e524a5defeb1c8, type: 3} + - {fileID: 9176106732687901849, guid: f706c9b9b5b3ec1459e524a5defeb1c8, type: 3} + - {fileID: 9176106732687901849, guid: f706c9b9b5b3ec1459e524a5defeb1c8, type: 3} + - {fileID: 9176106732687901849, guid: f706c9b9b5b3ec1459e524a5defeb1c8, type: 3} + - {fileID: 9176106732687901849, guid: f706c9b9b5b3ec1459e524a5defeb1c8, type: 3} + - {fileID: 9176106732687901849, guid: f706c9b9b5b3ec1459e524a5defeb1c8, type: 3} - {fileID: 1288417210725829930, guid: 57d866d01961d914f87c8a539cd908aa, type: 3} + - {fileID: 7181825274690322774, guid: df9720599c92797409d8a71ef65d4815, type: 3} + - {fileID: 7181825274690322774, guid: df9720599c92797409d8a71ef65d4815, type: 3} + - {fileID: 7181825274690322774, guid: df9720599c92797409d8a71ef65d4815, type: 3} + - {fileID: 7181825274690322774, guid: df9720599c92797409d8a71ef65d4815, type: 3} + - {fileID: 7257741361926167410, guid: affdf13cb7fd6d14ca520499064b4380, type: 3} - {fileID: 7257741361926167410, guid: affdf13cb7fd6d14ca520499064b4380, type: 3} curiositiesToSpawn: 35 stairsPrefab: {fileID: 6102638172941227538, guid: 772ce20bae1b4ee41a0f142397309d32, @@ -394,6 +365,99 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: disappearanceSpeed: 0.3 +--- !u!1 &6842804098541719657 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3736131471701239906} + - component: {fileID: 4522795980538533010} + - component: {fileID: 4291900176776798355} + - component: {fileID: 4033831656443804205} + m_Layer: 5 + m_Name: HP Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3736131471701239906 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6842804098541719657} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1591973061} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -85, y: 53.200012} + m_SizeDelta: {x: 48.22, y: 43.5} + m_Pivot: {x: 1, y: 0} +--- !u!222 &4522795980538533010 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6842804098541719657} + m_CullTransparentMesh: 0 +--- !u!114 &4291900176776798355 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6842804098541719657} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: feeeba28bb1da554f908645dd468e2ad, type: 3} + m_FontSize: 18 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 40 + m_Alignment: 6 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 20.0 +--- !u!114 &4033831656443804205 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6842804098541719657} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 11a80e02d0c9d564fb72bc892bea0662, type: 3} + m_Name: + m_EditorClassIdentifier: + max: 0 --- !u!1 &8062251348500245978 GameObject: m_ObjectHideFlags: 0 @@ -424,11 +488,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1591973061} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -10, y: 10} + m_AnchoredPosition: {x: -9.999878, y: 10} m_SizeDelta: {x: 219.6, y: 86.7} m_Pivot: {x: 1, y: 0} --- !u!222 &5009307415127730587 @@ -634,7 +698,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -10, y: 10} + m_AnchoredPosition: {x: -9.999878, y: 10} m_SizeDelta: {x: 219.6, y: 86.7} m_Pivot: {x: 1, y: 0} --- !u!222 &9068024689794909326 diff --git a/Assets/Scenes/Game.unity b/Assets/Scenes/Game.unity index 9cbf830..1b53883 100644 --- a/Assets/Scenes/Game.unity +++ b/Assets/Scenes/Game.unity @@ -120,791 +120,77 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &1332612184 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1332612185} - - component: {fileID: 1332612188} - - component: {fileID: 1332612187} - - component: {fileID: 1332612186} - m_Layer: 5 - m_Name: HP Bar - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1332612185 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1332612184} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 8182065399967645508} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -10, y: 10} - m_SizeDelta: {x: 219.6, y: 86.7} - m_Pivot: {x: 1, y: 0} ---- !u!114 &1332612186 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1332612184} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cbf8b0d2fd980e14f9956f5345d82ddc, type: 3} - m_Name: - m_EditorClassIdentifier: - max: 0 ---- !u!114 &1332612187 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1332612184} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 0, b: 0, a: 1} - m_RaycastTarget: 0 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: ad2b5d778bd508349988ad289efdf15a, type: 3} - m_Type: 3 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 0 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 1 - m_UseSpriteMesh: 0 ---- !u!222 &1332612188 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1332612184} - m_CullTransparentMesh: 0 ---- !u!1 &2051317733 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2051317734} - - component: {fileID: 2051317737} - - component: {fileID: 2051317736} - - component: {fileID: 2051317735} - m_Layer: 5 - m_Name: MaxHP Bar - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2051317734 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2051317733} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 8182065399967645508} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -10, y: 10} - m_SizeDelta: {x: 219.6, y: 86.7} - m_Pivot: {x: 1, y: 0} ---- !u!114 &2051317735 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2051317733} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cbf8b0d2fd980e14f9956f5345d82ddc, type: 3} - m_Name: - m_EditorClassIdentifier: - max: 1 ---- !u!114 &2051317736 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2051317733} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.3962264, g: 0, b: 0, a: 1} - m_RaycastTarget: 0 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: ad2b5d778bd508349988ad289efdf15a, type: 3} - m_Type: 3 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 0 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 1 - m_UseSpriteMesh: 0 ---- !u!222 &2051317737 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2051317733} - m_CullTransparentMesh: 0 ---- !u!1001 &365882321541334849 +--- !u!1001 &9068024691089508562 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 1583397669518592851, guid: 724674536bb835145984a0082871530e, + - target: {fileID: 1792584738874209504, guid: 4c25f33cb89f6624db48fc49d353a7f2, type: 3} propertyPath: m_Name - value: GameObject + value: GameController objectReference: {fileID: 0} - - target: {fileID: 7476914477509890938, guid: 724674536bb835145984a0082871530e, + - target: {fileID: 1419775483983031142, guid: 4c25f33cb89f6624db48fc49d353a7f2, type: 3} propertyPath: m_LocalPosition.x - value: 15.984027 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 7476914477509890938, guid: 724674536bb835145984a0082871530e, + - target: {fileID: 1419775483983031142, guid: 4c25f33cb89f6624db48fc49d353a7f2, type: 3} propertyPath: m_LocalPosition.y - value: 16.344006 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 7476914477509890938, guid: 724674536bb835145984a0082871530e, + - target: {fileID: 1419775483983031142, guid: 4c25f33cb89f6624db48fc49d353a7f2, type: 3} propertyPath: m_LocalPosition.z - value: -5.046875 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 7476914477509890938, guid: 724674536bb835145984a0082871530e, + - target: {fileID: 1419775483983031142, guid: 4c25f33cb89f6624db48fc49d353a7f2, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7476914477509890938, guid: 724674536bb835145984a0082871530e, + - target: {fileID: 1419775483983031142, guid: 4c25f33cb89f6624db48fc49d353a7f2, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7476914477509890938, guid: 724674536bb835145984a0082871530e, + - target: {fileID: 1419775483983031142, guid: 4c25f33cb89f6624db48fc49d353a7f2, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7476914477509890938, guid: 724674536bb835145984a0082871530e, + - target: {fileID: 1419775483983031142, guid: 4c25f33cb89f6624db48fc49d353a7f2, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 7476914477509890938, guid: 724674536bb835145984a0082871530e, + - target: {fileID: 1419775483983031142, guid: 4c25f33cb89f6624db48fc49d353a7f2, type: 3} propertyPath: m_RootOrder - value: 1 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 7476914477509890938, guid: 724674536bb835145984a0082871530e, + - target: {fileID: 1419775483983031142, guid: 4c25f33cb89f6624db48fc49d353a7f2, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7476914477509890938, guid: 724674536bb835145984a0082871530e, + - target: {fileID: 1419775483983031142, guid: 4c25f33cb89f6624db48fc49d353a7f2, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7476914477509890938, guid: 724674536bb835145984a0082871530e, + - target: {fileID: 1419775483983031142, guid: 4c25f33cb89f6624db48fc49d353a7f2, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2174908496911848014, guid: 4c25f33cb89f6624db48fc49d353a7f2, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -9.999878 + objectReference: {fileID: 0} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 724674536bb835145984a0082871530e, type: 3} ---- !u!1 &630169749068828386 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 789309134560668627} - - component: {fileID: 3393512626222444985} - m_Layer: 0 - m_Name: Entities - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &789309134560668627 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 630169749068828386} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 7077555690451730663} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1313580544782099720 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7203168577643633308} - - component: {fileID: 4061326455747354953} - - component: {fileID: 2984726599447885319} - m_Layer: 5 - m_Name: HP Bar Border - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &1583397669518592851 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 1583397669518592851, guid: 724674536bb835145984a0082871530e, - type: 3} - m_PrefabInstance: {fileID: 365882321541334849} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7476914477509890938} - m_Layer: 0 - m_Name: GameObject - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &2984726599447885319 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1313580544782099720} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 9c22556080c471a48a14188af3c88967, type: 3} - m_Type: 3 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 2 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 1 - m_UseSpriteMesh: 0 ---- !u!114 &3195245192869872477 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3195245192869872481} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9584516e85b5cb54eab0c7dafa1094f1, type: 3} - m_Name: - m_EditorClassIdentifier: - disappearanceSpeed: 0.3 ---- !u!224 &3195245192869872480 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3195245192869872481} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 8182065399967645508} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 30} - m_Pivot: {x: 0.5, y: 1} ---- !u!1 &3195245192869872481 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3195245192869872480} - - component: {fileID: 3195245192869872482} - - component: {fileID: 3195245192869872483} - - component: {fileID: 3195245192869872477} - m_Layer: 5 - m_Name: Message Bar - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!222 &3195245192869872482 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3195245192869872481} - m_CullTransparentMesh: 0 ---- !u!114 &3195245192869872483 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3195245192869872481} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 12800000, guid: feeeba28bb1da554f908645dd468e2ad, type: 3} - m_FontSize: 18 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 0 - m_MaxSize: 40 - m_Alignment: 1 - m_AlignByGeometry: 0 - m_RichText: 0 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Hello! I'm THE MESSAGE BAR! ---- !u!114 &3393512626222444985 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 630169749068828386} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2447171af2ad9634498f2d769d7f5200, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!222 &4061326455747354953 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1313580544782099720} - m_CullTransparentMesh: 0 ---- !u!114 &4337666034323184198 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4341632257663970948} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 052bc569472779a429bfc51246f723d4, type: 3} - m_Name: - m_EditorClassIdentifier: - mapSize: 40 - roomsToGenerate: 8 - minRoomSize: 2 - maxRoomSize: 8 - maxRoomIterations: 100 - floorSprites: - - {fileID: 21300000, guid: e0e60c9a4ff0b8e429e6cfe316da9bbf, type: 3} - - {fileID: 21300000, guid: e0e60c9a4ff0b8e429e6cfe316da9bbf, type: 3} - - {fileID: 21300000, guid: e0e60c9a4ff0b8e429e6cfe316da9bbf, type: 3} - - {fileID: 21300000, guid: e0e60c9a4ff0b8e429e6cfe316da9bbf, type: 3} - - {fileID: 21300000, guid: e0e60c9a4ff0b8e429e6cfe316da9bbf, type: 3} - - {fileID: 21300000, guid: e0e60c9a4ff0b8e429e6cfe316da9bbf, type: 3} - - {fileID: 21300000, guid: e0e60c9a4ff0b8e429e6cfe316da9bbf, type: 3} - - {fileID: 21300000, guid: e0e60c9a4ff0b8e429e6cfe316da9bbf, type: 3} - - {fileID: 21300000, guid: e0e60c9a4ff0b8e429e6cfe316da9bbf, type: 3} - - {fileID: 21300000, guid: fa4c9841fd8a5fb4f94ff78c95301065, type: 3} - botWallSprites: - - {fileID: 21300000, guid: 82ccea6ce8f2edf4cae6f99e1127b0c3, type: 3} - tilePrefab: {fileID: 2955896503201886234, guid: 0e0b618b5499bbb40b076c0291d55487, - type: 3} - playerPrefab: {fileID: 2935319493830293412, guid: e8ff38be23e53db40a793f6959c6f4ec, - type: 3} - enemyPrefabs: - - {fileID: 1164136568549368904, guid: a4aeecfb369f0974490d158ef9489335, type: 3} - - {fileID: 1164136568549368904, guid: a4aeecfb369f0974490d158ef9489335, type: 3} - - {fileID: 1164136568549368904, guid: a4aeecfb369f0974490d158ef9489335, type: 3} - - {fileID: 1164136568549368904, guid: a4aeecfb369f0974490d158ef9489335, type: 3} - - {fileID: 1164136568549368904, guid: a4aeecfb369f0974490d158ef9489335, type: 3} - - {fileID: 1164136568549368904, guid: a4aeecfb369f0974490d158ef9489335, type: 3} - - {fileID: 1164136568549368904, guid: a4aeecfb369f0974490d158ef9489335, type: 3} - - {fileID: 1164136568549368904, guid: a4aeecfb369f0974490d158ef9489335, type: 3} - - {fileID: 1164136568549368904, guid: a4aeecfb369f0974490d158ef9489335, type: 3} - - {fileID: 1164136568549368904, guid: a4aeecfb369f0974490d158ef9489335, type: 3} - - {fileID: 8811060229651695861, guid: 62cd302b5f1887840acff35feb8fb5f9, type: 3} - - {fileID: 8811060229651695861, guid: 62cd302b5f1887840acff35feb8fb5f9, type: 3} - - {fileID: 8811060229651695861, guid: 62cd302b5f1887840acff35feb8fb5f9, type: 3} - - {fileID: 2071995852067845502, guid: ea7f7cf3dc500f84cb102a47d86a30ea, type: 3} - enemiesToSpawn: 15 - curiositiesPrefabs: - - {fileID: 9176106732687901849, guid: f706c9b9b5b3ec1459e524a5defeb1c8, type: 3} - - {fileID: 1288417210725829930, guid: 57d866d01961d914f87c8a539cd908aa, type: 3} - - {fileID: 7257741361926167410, guid: affdf13cb7fd6d14ca520499064b4380, type: 3} - curiositiesToSpawn: 35 - stairsPrefab: {fileID: 6102638172941227538, guid: 772ce20bae1b4ee41a0f142397309d32, - type: 3} ---- !u!1 &4341632257663970948 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4979146984560623434} - - component: {fileID: 4337666034323184198} - m_Layer: 0 - m_Name: Map - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4979146984560623434 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4341632257663970948} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 7077555690451730663} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &7077555690451730663 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7596450466852265825} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 789309134560668627} - - {fileID: 4979146984560623434} - - {fileID: 8182065398968123531} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!224 &7203168577643633308 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1313580544782099720} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 8182065399967645508} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -10, y: 10} - m_SizeDelta: {x: 219.6, y: 86.7} - m_Pivot: {x: 1, y: 0} ---- !u!4 &7476914477509890938 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 7476914477509890938, guid: 724674536bb835145984a0082871530e, - type: 3} - m_PrefabInstance: {fileID: 365882321541334849} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1583397669518592851} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 15.984027, y: 16.344006, z: -5.046875} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &7596450466852265825 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7077555690451730663} - m_Layer: 0 - m_Name: GameController - m_TagString: GameController - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &8182065398968123528 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8182065398968123531} - m_Layer: 0 - m_Name: UI - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &8182065398968123531 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8182065398968123528} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 8182065399967645508} - - {fileID: 8182065399139557467} - m_Father: {fileID: 7077555690451730663} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &8182065399139557464 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8182065399139557467} - - component: {fileID: 8182065399139557469} - m_Layer: 0 - m_Name: EventSystem - m_TagString: EventSystem - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &8182065399139557467 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8182065399139557464} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 8182065398968123531} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &8182065399139557469 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8182065399139557464} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -619905303, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_FirstSelected: {fileID: 0} - m_sendNavigationEvents: 1 - m_DragThreshold: 10 ---- !u!224 &8182065399967645508 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8182065399967645509} - 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_Children: - - {fileID: 3195245192869872480} - - {fileID: 2051317734} - - {fileID: 1332612185} - - {fileID: 7203168577643633308} - m_Father: {fileID: 8182065398968123531} - m_RootOrder: 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 &8182065399967645509 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8182065399967645508} - - component: {fileID: 8182065399967645513} - - component: {fileID: 8182065399967645510} - - component: {fileID: 8182065399967645511} - m_Layer: 5 - m_Name: Canvas - m_TagString: Canvas - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &8182065399967645510 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8182065399967645509} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, 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 ---- !u!114 &8182065399967645511 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8182065399967645509} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 4294967295 ---- !u!223 &8182065399967645513 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8182065399967645509} - 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_AdditionalShaderChannelsFlag: 0 - m_SortingLayerID: 0 - m_SortingOrder: 0 - m_TargetDisplay: 0 + m_SourcePrefab: {fileID: 100100000, guid: 4c25f33cb89f6624db48fc49d353a7f2, type: 3} diff --git a/Assets/Scripts/EntityItemShopSword.cs b/Assets/Scripts/EntityItemShopSword.cs index 9bbcc54..fae9512 100644 --- a/Assets/Scripts/EntityItemShopSword.cs +++ b/Assets/Scripts/EntityItemShopSword.cs @@ -15,9 +15,8 @@ public class EntityItemShopSword : EntityItemShop { protected override void OnPurchase(EntityPlayer player) { Destroy(player.GetComponent()); - player.gameObject.AddComponent(); - PlayerAttackMelee pam = player.GetComponent(); + PlayerAttackMelee pam = player.gameObject.AddComponent(); pam.damage = this.damage; - pam.attackAnimation = attackAnimation; + pam.attackAnimation = this.attackAnimation; } } \ No newline at end of file diff --git a/Assets/Scripts/EntityMonster.cs b/Assets/Scripts/EntityMonster.cs index 599a1ef..853ea5c 100644 --- a/Assets/Scripts/EntityMonster.cs +++ b/Assets/Scripts/EntityMonster.cs @@ -6,8 +6,8 @@ public class EntityMonster : Entity { public string monsterName; - public virtual void OnTurn(){ - Debug.LogWarning("OnTurn() not overridden"); + public virtual void OnTurn() { + //Do nothing. } public override void Die() { diff --git a/Assets/Scripts/EntityMonsterWatcher.cs b/Assets/Scripts/EntityMonsterWatcher.cs index d0f1997..9cb507c 100644 --- a/Assets/Scripts/EntityMonsterWatcher.cs +++ b/Assets/Scripts/EntityMonsterWatcher.cs @@ -4,7 +4,7 @@ using UnityEngine; public class EntityMonsterWatcher : EntityMonster { -public float moveChance = 1f; + public float moveChance = 1f; public float visionRange = 5f; public float attackRange = 1f; public float damage = 2f; diff --git a/Assets/Scripts/EntityPlayer.cs b/Assets/Scripts/EntityPlayer.cs index cec7c2b..cf017be 100644 --- a/Assets/Scripts/EntityPlayer.cs +++ b/Assets/Scripts/EntityPlayer.cs @@ -100,16 +100,22 @@ public class EntityPlayer : Entity } } if(hasMoved) { + bool doTurn = true; //Check for pickuppable items List entities = turnHandler.GetEntitiesAtPosition(MapPosition); foreach(Entity entity in entities) { if(entity is EntityItem) { EntityItem item = entity as EntityItem; + if(item is EntityItemStairs) { + doTurn = false; + } item.OnPickup(this); } } //Turn happens! - turnHandler.OnTurn(); + if(doTurn) { + turnHandler.OnTurn(); + } } } @@ -120,7 +126,6 @@ public class EntityPlayer : Entity } } - //This is not an error wtf public override void OnNewLevel() {} public override void Die() { diff --git a/Assets/Scripts/Map.cs b/Assets/Scripts/Map.cs index 988595e..93f1ede 100644 --- a/Assets/Scripts/Map.cs +++ b/Assets/Scripts/Map.cs @@ -131,7 +131,9 @@ public class Map : MonoBehaviour public bool CanMoveTo(Vector2Int position) { try { - bool walkable = GetTile(position).walkable; + MapTile tile = GetTile(position); + if(tile == null) return false; + bool walkable = tile.walkable; List entities = turnHandler.GetEntitiesAtPosition(position); bool free = true; foreach(Entity entity in entities) { @@ -257,6 +259,9 @@ public class Map : MonoBehaviour for(int i = 0; i < enemiesToSpawn; i++) { MapRoom room = rooms[Random.Range(0, rooms.Count)]; Vector2Int point = room.RandomPoint(); + if(turnHandler.GetEntitiesAtPosition(point).Count > 0) { + continue; + } GameObject enemyPrefab = enemyPrefabs[Random.Range(0, enemyPrefabs.Count)]; GameObject enemyObject = Instantiate(enemyPrefab, turnHandler.transform); enemyObject.name = "Enemy " + i.ToString(); @@ -268,6 +273,9 @@ public class Map : MonoBehaviour for(int i = 0; i < curiositiesToSpawn; i++) { MapRoom room = rooms[Random.Range(0, rooms.Count)]; Vector2Int point = room.RandomPoint(); + if(turnHandler.GetEntitiesAtPosition(point).Count > 0) { + continue; + } GameObject curiosityPrefab = curiositiesPrefabs[Random.Range(0, curiositiesPrefabs.Count)]; GameObject curiosityObject = Instantiate(curiosityPrefab, turnHandler.transform); curiosityObject.name = "Curiosity " + i.ToString(); diff --git a/Assets/Scripts/MessageBar.cs.meta b/Assets/Scripts/MessageBar.cs.meta index d67dcf1..d011e68 100644 --- a/Assets/Scripts/MessageBar.cs.meta +++ b/Assets/Scripts/MessageBar.cs.meta @@ -4,7 +4,7 @@ MonoImporter: externalObjects: {} serializedVersion: 2 defaultReferences: [] - executionOrder: 0 + executionOrder: -50 icon: {instanceID: 0} userData: assetBundleName: diff --git a/Assets/Scripts/TextFromPlayerHP.cs b/Assets/Scripts/TextFromPlayerHP.cs new file mode 100644 index 0000000..9af6e6e --- /dev/null +++ b/Assets/Scripts/TextFromPlayerHP.cs @@ -0,0 +1,25 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +public class TextFromPlayerHP : MonoBehaviour +{ + private EntityPlayer player; + private Text text; + public bool max; + + private void Start() { + player = GameObject.FindGameObjectWithTag("Player").GetComponent(); + text = GetComponent(); + } + + private void Update() { + if(max) { + text.text = "/ " + player.hpMax.ToString("0.0"); + } + else { + text.text = player.hp.ToString("0.0"); + } + } +} diff --git a/Assets/Scripts/TextFromPlayerHP.cs.meta b/Assets/Scripts/TextFromPlayerHP.cs.meta new file mode 100644 index 0000000..b3a3d2d --- /dev/null +++ b/Assets/Scripts/TextFromPlayerHP.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 11a80e02d0c9d564fb72bc892bea0662 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 101 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sounds/Dungeon Music.ogg b/Assets/Sounds/DungeonMusic.ogg similarity index 100% rename from Assets/Sounds/Dungeon Music.ogg rename to Assets/Sounds/DungeonMusic.ogg diff --git a/Assets/Sounds/Dungeon Music.ogg.meta b/Assets/Sounds/DungeonMusic.ogg.meta similarity index 100% rename from Assets/Sounds/Dungeon Music.ogg.meta rename to Assets/Sounds/DungeonMusic.ogg.meta diff --git a/Assets/Sprites/Candle1.png.meta b/Assets/Sprites/Candle1.png.meta index 8d49723..a33399a 100644 --- a/Assets/Sprites/Candle1.png.meta +++ b/Assets/Sprites/Candle1.png.meta @@ -45,7 +45,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 40 + spritePixelsToUnits: 34 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -97,7 +97,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: da5d40c84f8595f47b80dcea5d2deb3a + spriteID: 3e6eb75314db5e244bebb22f21c94026 internalID: 0 vertices: [] indices: diff --git a/Assets/Sprites/Candle2.png.meta b/Assets/Sprites/Candle2.png.meta index b7afd62..991606f 100644 --- a/Assets/Sprites/Candle2.png.meta +++ b/Assets/Sprites/Candle2.png.meta @@ -45,7 +45,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 40 + spritePixelsToUnits: 34 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -97,7 +97,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: b492c21463e3a0f4a9b0be683bd11dda + spriteID: 6be7daae85043be438bbec5cd6228385 internalID: 0 vertices: [] indices: diff --git a/Assets/Sprites/Candle3.png.meta b/Assets/Sprites/Candle3.png.meta index 2906292..2877485 100644 --- a/Assets/Sprites/Candle3.png.meta +++ b/Assets/Sprites/Candle3.png.meta @@ -45,7 +45,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 40 + spritePixelsToUnits: 34 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -97,7 +97,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: 7c02f5004020e06428309e8025378000 + spriteID: 386bca1aff16bf940a124f9e4fd86f4b internalID: 0 vertices: [] indices: diff --git a/Assets/Sprites/Candle4.png.meta b/Assets/Sprites/Candle4.png.meta index 0c2270a..204be5e 100644 --- a/Assets/Sprites/Candle4.png.meta +++ b/Assets/Sprites/Candle4.png.meta @@ -45,7 +45,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 40 + spritePixelsToUnits: 34 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -97,7 +97,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: 9f0d734ca5077c34f8b6bfb253e68903 + spriteID: 7021a274552590543af602108d3f2751 internalID: 0 vertices: [] indices: diff --git a/Assets/Sprites/Candle5.png.meta b/Assets/Sprites/Candle5.png.meta index d6f809d..2f7d542 100644 --- a/Assets/Sprites/Candle5.png.meta +++ b/Assets/Sprites/Candle5.png.meta @@ -45,7 +45,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 40 + spritePixelsToUnits: 34 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -97,7 +97,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: 554f6d8e091900346aa7a07426a523ee + spriteID: ac8a71570b1ff934596f7800b57ecfd2 internalID: 0 vertices: [] indices: diff --git a/Assets/Sprites/ShopKeepah.png b/Assets/Sprites/ShopKeepah.png new file mode 100644 index 0000000..3c0dc48 --- /dev/null +++ b/Assets/Sprites/ShopKeepah.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:82bd3089dd0320f88aa596c09533a5a5923c5fb19e4624c4dd49ac523f4ab187 +size 7311 diff --git a/Assets/Sprites/VaseRandom.png.meta b/Assets/Sprites/VaseRandom.png.meta index 984f567..0da9dcd 100644 --- a/Assets/Sprites/VaseRandom.png.meta +++ b/Assets/Sprites/VaseRandom.png.meta @@ -45,7 +45,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 40 + spritePixelsToUnits: 30 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index 6c2632a..ab4d074 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -31,6 +31,9 @@ GraphicsSettings: m_AlwaysIncludedShaders: - {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0} m_PreloadedShaders: [] m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}