From e37f77ef9426084abcb013ae7d1955e1cccde8c9 Mon Sep 17 00:00:00 2001 From: chyknkat Date: Sun, 2 Feb 2020 15:07:28 -0500 Subject: [PATCH 1/5] Update GameIntro.unity --- Assets/Scenes/GameIntro.unity | 129 ++++++++++++++++++++++++++++++++++ 1 file changed, 129 insertions(+) diff --git a/Assets/Scenes/GameIntro.unity b/Assets/Scenes/GameIntro.unity index 209b5a7..bd348e2 100644 --- a/Assets/Scenes/GameIntro.unity +++ b/Assets/Scenes/GameIntro.unity @@ -329,6 +329,135 @@ MonoBehaviour: sceneA: {fileID: 163099070} sceneB: {fileID: 1767155644} sceneC: {fileID: 1641291250} + sprites: [] + camera: {fileID: 0} +--- !u!1 &766330446 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 766330448} + - component: {fileID: 766330447} + m_Layer: 0 + m_Name: Music + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!82 &766330447 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 766330446} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: a01c0a314f63f5c4aaf9d28a33e9d2f2, type: 3} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!4 &766330448 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 766330446} + 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: 0} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1641291249 GameObject: m_ObjectHideFlags: 0 From 0aeea4833cc3dadbd878376ac07e75e308892be7 Mon Sep 17 00:00:00 2001 From: Giovani Date: Sun, 2 Feb 2020 15:16:13 -0500 Subject: [PATCH 2/5] fixe collectibles --- Assets/{Coffee.cs => CoffeeOrPizza.cs} | 8 +- .../{Coffee.cs.meta => CoffeeOrPizza.cs.meta} | 0 Assets/Prefabs/Coffee.prefab | 13 + Assets/Scenes/LevelOne.unity | 465 ++++++++++++++---- Assets/Scripts/Player.cs | 10 +- 5 files changed, 407 insertions(+), 89 deletions(-) rename Assets/{Coffee.cs => CoffeeOrPizza.cs} (55%) rename Assets/{Coffee.cs.meta => CoffeeOrPizza.cs.meta} (100%) diff --git a/Assets/Coffee.cs b/Assets/CoffeeOrPizza.cs similarity index 55% rename from Assets/Coffee.cs rename to Assets/CoffeeOrPizza.cs index ae54775..492f4f4 100644 --- a/Assets/Coffee.cs +++ b/Assets/CoffeeOrPizza.cs @@ -2,8 +2,9 @@ using System.Collections.Generic; using UnityEngine; -public class Coffee : MonoBehaviour +public class CoffeeOrPizza : MonoBehaviour { + // Start is called before the first frame update void Start() { @@ -15,4 +16,9 @@ public class Coffee : MonoBehaviour { } + + private void OnTriggerEnter2D(Collider2D collision) + { + collision.gameObject.GetComponent().OnConsumable(GetComponent()); + } } diff --git a/Assets/Coffee.cs.meta b/Assets/CoffeeOrPizza.cs.meta similarity index 100% rename from Assets/Coffee.cs.meta rename to Assets/CoffeeOrPizza.cs.meta diff --git a/Assets/Prefabs/Coffee.prefab b/Assets/Prefabs/Coffee.prefab index af6d425..3939d52 100644 --- a/Assets/Prefabs/Coffee.prefab +++ b/Assets/Prefabs/Coffee.prefab @@ -13,6 +13,7 @@ GameObject: - component: {fileID: 5520736153122788072} - component: {fileID: 1518483160148691188} - component: {fileID: 6284992550610256572} + - component: {fileID: 3900805189195330219} m_Layer: 0 m_Name: Coffee m_TagString: Untagged @@ -150,3 +151,15 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &3900805189195330219 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6870250841519595495} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5b72c6073f9135a4894350d4cde51a76, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/Scenes/LevelOne.unity b/Assets/Scenes/LevelOne.unity index f47d6aa..e2c84f8 100644 --- a/Assets/Scenes/LevelOne.unity +++ b/Assets/Scenes/LevelOne.unity @@ -367,7 +367,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1692173778} m_Modifications: - target: {fileID: 1518483160148691188, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} @@ -397,7 +397,7 @@ PrefabInstance: - target: {fileID: 5520736153122788072, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_Offset.y - value: -0.09003568 + value: -0.51 objectReference: {fileID: 0} - target: {fileID: 5520736153122788072, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} @@ -407,12 +407,12 @@ PrefabInstance: - target: {fileID: 5520736153122788072, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_IsTrigger - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6870250841519595495, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_Name - value: CoffeeTwo + value: Coffee objectReference: {fileID: 0} - target: {fileID: 6870250841519595495, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} @@ -437,17 +437,17 @@ PrefabInstance: - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} @@ -457,7 +457,7 @@ PrefabInstance: - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_RootOrder - value: 6 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} @@ -477,12 +477,60 @@ PrefabInstance: m_RemovedComponents: - {fileID: 1518483160148691188, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} +--- !u!1 &138132881 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 138132883} + - component: {fileID: 138132882} + m_Layer: 0 + m_Name: PizzaGrid + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!156049354 &138132882 +Grid: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 138132881} + m_Enabled: 1 + m_CellSize: {x: 1, y: 1, z: 0} + m_CellGap: {x: 0, y: 0, z: 0} + m_CellLayout: 0 + m_CellSwizzle: 0 +--- !u!4 &138132883 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 138132881} + 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: 1034377009} + - {fileID: 1722190031} + - {fileID: 1821309074} + - {fileID: 1016030299} + - {fileID: 1123784853} + m_Father: {fileID: 0} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &170428179 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1692173778} m_Modifications: - target: {fileID: 1518483160148691188, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} @@ -502,12 +550,17 @@ PrefabInstance: - target: {fileID: 5520736153122788072, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_IsTrigger - value: 0 + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5520736153122788072, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_Offset.y + value: -0.51 objectReference: {fileID: 0} - target: {fileID: 6870250841519595495, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_Name - value: CoffeeSix + value: Coffee objectReference: {fileID: 0} - target: {fileID: 6870250841519595495, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} @@ -532,17 +585,17 @@ PrefabInstance: - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} @@ -552,7 +605,7 @@ PrefabInstance: - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_RootOrder - value: 10 + value: 5 objectReference: {fileID: 0} - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} @@ -1213,7 +1266,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 138132883} m_Modifications: - target: {fileID: 256661142209474860, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} @@ -1231,10 +1284,15 @@ PrefabInstance: value: objectReference: {fileID: 1702949257448659930, guid: 595c2e3d43f63344e8d4392619cda1d0, type: 3} + - target: {fileID: 271381267833183223, guid: f859e1c9214db2c4eaaeff51febb3222, + type: 3} + propertyPath: m_IsTrigger + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1137786072160203054, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} propertyPath: m_Name - value: PizzaTwo + value: Pizza objectReference: {fileID: 0} - target: {fileID: 1137786072160203054, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} @@ -1259,17 +1317,17 @@ PrefabInstance: - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} @@ -1279,7 +1337,7 @@ PrefabInstance: - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} propertyPath: m_RootOrder - value: 3 + value: 2 objectReference: {fileID: 0} - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} @@ -1298,6 +1356,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} +--- !u!4 &439930394 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + m_PrefabInstance: {fileID: 1028911173} + m_PrefabAsset: {fileID: 0} --- !u!1001 &553298993 PrefabInstance: m_ObjectHideFlags: 0 @@ -1427,7 +1491,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1692173778} m_Modifications: - target: {fileID: 1518483160148691188, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} @@ -1447,12 +1511,17 @@ PrefabInstance: - target: {fileID: 5520736153122788072, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_IsTrigger - value: 0 + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5520736153122788072, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_Offset.y + value: -0.51 objectReference: {fileID: 0} - target: {fileID: 6870250841519595495, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_Name - value: CoffeeFife + value: Coffee objectReference: {fileID: 0} - target: {fileID: 6870250841519595495, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} @@ -1477,17 +1546,17 @@ PrefabInstance: - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} @@ -1497,7 +1566,7 @@ PrefabInstance: - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_RootOrder - value: 9 + value: 4 objectReference: {fileID: 0} - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} @@ -1516,6 +1585,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} +--- !u!4 &661251797 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + m_PrefabInstance: {fileID: 55524261} + m_PrefabAsset: {fileID: 0} --- !u!1001 &673614425 PrefabInstance: m_ObjectHideFlags: 0 @@ -1636,6 +1711,18 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1879087608} m_PrefabAsset: {fileID: 0} +--- !u!4 &852262087 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + m_PrefabInstance: {fileID: 7653345758327600075} + m_PrefabAsset: {fileID: 0} +--- !u!4 &856721814 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + m_PrefabInstance: {fileID: 1486274757} + m_PrefabAsset: {fileID: 0} --- !u!1 &925144586 GameObject: m_ObjectHideFlags: 0 @@ -1774,7 +1861,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 12 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &951888604 PrefabInstance: @@ -1924,8 +2011,32 @@ Transform: - {fileID: 1042834705} - {fileID: 1950090158} m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1016030294 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1137786072160203054, guid: f859e1c9214db2c4eaaeff51febb3222, + type: 3} + m_PrefabInstance: {fileID: 2009885838} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1016030299 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, + type: 3} + m_PrefabInstance: {fileID: 2009885838} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1016030300 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1016030294} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5b72c6073f9135a4894350d4cde51a76, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!4 &1028395223 stripped Transform: m_CorrespondingSourceObject: {fileID: 8989126000173721722, guid: cc74a3ff6f657d842b5731190a6074d7, @@ -1937,7 +2048,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1692173778} m_Modifications: - target: {fileID: 1518483160148691188, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} @@ -1967,7 +2078,7 @@ PrefabInstance: - target: {fileID: 5520736153122788072, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_Offset.y - value: -0.08594322 + value: -0.51 objectReference: {fileID: 0} - target: {fileID: 5520736153122788072, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} @@ -1977,12 +2088,12 @@ PrefabInstance: - target: {fileID: 5520736153122788072, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_IsTrigger - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6870250841519595495, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_Name - value: CoffeeThree + value: Coffee objectReference: {fileID: 0} - target: {fileID: 6870250841519595495, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} @@ -2007,17 +2118,17 @@ PrefabInstance: - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} @@ -2027,7 +2138,7 @@ PrefabInstance: - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_RootOrder - value: 7 + value: 2 objectReference: {fileID: 0} - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} @@ -2046,12 +2157,66 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} +--- !u!4 &1031922257 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + m_PrefabInstance: {fileID: 170428179} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1034377004 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1137786072160203054, guid: f859e1c9214db2c4eaaeff51febb3222, + type: 3} + m_PrefabInstance: {fileID: 2287649440171223521} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1034377009 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, + type: 3} + m_PrefabInstance: {fileID: 2287649440171223521} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1034377010 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1034377004} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5b72c6073f9135a4894350d4cde51a76, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!4 &1042834705 stripped Transform: m_CorrespondingSourceObject: {fileID: 8989126000173721722, guid: cc74a3ff6f657d842b5731190a6074d7, type: 3} m_PrefabInstance: {fileID: 673614425} m_PrefabAsset: {fileID: 0} +--- !u!1 &1123784848 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1137786072160203054, guid: f859e1c9214db2c4eaaeff51febb3222, + type: 3} + m_PrefabInstance: {fileID: 2052920381} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1123784853 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, + type: 3} + m_PrefabInstance: {fileID: 2052920381} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1123784854 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1123784848} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5b72c6073f9135a4894350d4cde51a76, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1146013786 stripped GameObject: m_CorrespondingSourceObject: {fileID: 5711328081315814053, guid: fe8fb0c1c30f84b43885e84de26e0f11, @@ -47318,7 +47483,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 11 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1246342466 PrefabInstance: @@ -47450,7 +47615,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1692173778} m_Modifications: - target: {fileID: 1518483160148691188, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} @@ -47470,12 +47635,17 @@ PrefabInstance: - target: {fileID: 5520736153122788072, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_IsTrigger - value: 0 + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5520736153122788072, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_Offset.y + value: -0.51 objectReference: {fileID: 0} - target: {fileID: 6870250841519595495, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_Name - value: CoffeeFoor + value: Coffee objectReference: {fileID: 0} - target: {fileID: 6870250841519595495, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} @@ -47485,12 +47655,12 @@ PrefabInstance: - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_LocalPosition.x - value: 226.5 + value: 226.22 objectReference: {fileID: 0} - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_LocalPosition.y - value: 2.68 + value: 5.6 objectReference: {fileID: 0} - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} @@ -47500,17 +47670,17 @@ PrefabInstance: - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} @@ -47520,7 +47690,7 @@ PrefabInstance: - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_RootOrder - value: 8 + value: 3 objectReference: {fileID: 0} - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} @@ -47664,7 +47834,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1692173778} m_Modifications: - target: {fileID: 1518483160148691188, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} @@ -47694,7 +47864,7 @@ PrefabInstance: - target: {fileID: 5520736153122788072, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_Offset.y - value: -0.09043503 + value: -0.51 objectReference: {fileID: 0} - target: {fileID: 5520736153122788072, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} @@ -47734,17 +47904,17 @@ PrefabInstance: - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} @@ -47754,7 +47924,7 @@ PrefabInstance: - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_RootOrder - value: 13 + value: 6 objectReference: {fileID: 0} - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} @@ -47774,6 +47944,12 @@ PrefabInstance: m_RemovedComponents: - {fileID: 1518483160148691188, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} +--- !u!4 &1633849203 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + m_PrefabInstance: {fileID: 567733218} + m_PrefabAsset: {fileID: 0} --- !u!1 &1671840916 GameObject: m_ObjectHideFlags: 0 @@ -47803,8 +47979,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1671840916} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 37, y: -13, z: 0} - m_LocalPosition: {x: -10.5, y: 4, z: 0} + m_LocalPosition: {x: 14.5, y: -10.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1008122163} @@ -47942,12 +48117,62 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &1692173776 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1692173778} + - component: {fileID: 1692173777} + m_Layer: 0 + m_Name: CoffeeGrid + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!156049354 &1692173777 +Grid: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1692173776} + m_Enabled: 1 + m_CellSize: {x: 1, y: 1, z: 0} + m_CellGap: {x: 0, y: 0, z: 0} + m_CellLayout: 0 + m_CellSwizzle: 0 +--- !u!4 &1692173778 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1692173776} + 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: 852262087} + - {fileID: 661251797} + - {fileID: 439930394} + - {fileID: 1988411914} + - {fileID: 1633849203} + - {fileID: 1031922257} + - {fileID: 856721814} + m_Father: {fileID: 0} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1699044890 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 138132883} m_Modifications: - target: {fileID: 256661142209474860, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} @@ -47959,10 +48184,15 @@ PrefabInstance: propertyPath: m_SortingLayer value: 1 objectReference: {fileID: 0} + - target: {fileID: 271381267833183223, guid: f859e1c9214db2c4eaaeff51febb3222, + type: 3} + propertyPath: m_IsTrigger + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1137786072160203054, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} propertyPath: m_Name - value: PizzaThree + value: Pizza objectReference: {fileID: 0} - target: {fileID: 1137786072160203054, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} @@ -47987,17 +48217,17 @@ PrefabInstance: - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} @@ -48007,7 +48237,7 @@ PrefabInstance: - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} propertyPath: m_RootOrder - value: 5 + value: 3 objectReference: {fileID: 0} - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} @@ -48166,6 +48396,30 @@ Tilemap: e31: 0 e32: 0 e33: 1 +--- !u!1 &1722190026 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1137786072160203054, guid: f859e1c9214db2c4eaaeff51febb3222, + type: 3} + m_PrefabInstance: {fileID: 414764564} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1722190031 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, + type: 3} + m_PrefabInstance: {fileID: 414764564} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1722190032 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1722190026} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5b72c6073f9135a4894350d4cde51a76, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!4 &1727766209 Transform: m_ObjectHideFlags: 0 @@ -48244,6 +48498,30 @@ MonoBehaviour: baseCamera: {fileID: 1337282922} baseRenderer: {fileID: 1727766210} scrollRate: {x: 0.4, y: 0.4} +--- !u!1 &1821309069 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1137786072160203054, guid: f859e1c9214db2c4eaaeff51febb3222, + type: 3} + m_PrefabInstance: {fileID: 1699044890} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1821309074 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, + type: 3} + m_PrefabInstance: {fileID: 1699044890} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1821309075 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1821309069} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5b72c6073f9135a4894350d4cde51a76, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &1879087608 PrefabInstance: m_ObjectHideFlags: 0 @@ -48467,12 +48745,18 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1246342466} m_PrefabAsset: {fileID: 0} +--- !u!4 &1988411914 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + m_PrefabInstance: {fileID: 1247320639} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2009885838 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 138132883} m_Modifications: - target: {fileID: 256661142209474860, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} @@ -48484,6 +48768,11 @@ PrefabInstance: propertyPath: m_SortingLayer value: 1 objectReference: {fileID: 0} + - target: {fileID: 271381267833183223, guid: f859e1c9214db2c4eaaeff51febb3222, + type: 3} + propertyPath: m_IsTrigger + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1137786072160203054, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} propertyPath: m_Name @@ -48512,17 +48801,17 @@ PrefabInstance: - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} @@ -48532,7 +48821,7 @@ PrefabInstance: - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} propertyPath: m_RootOrder - value: 14 + value: 4 objectReference: {fileID: 0} - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} @@ -48556,7 +48845,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 138132883} m_Modifications: - target: {fileID: 256661142209474860, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} @@ -48568,6 +48857,11 @@ PrefabInstance: propertyPath: m_SortingLayer value: 1 objectReference: {fileID: 0} + - target: {fileID: 271381267833183223, guid: f859e1c9214db2c4eaaeff51febb3222, + type: 3} + propertyPath: m_IsTrigger + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1137786072160203054, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} propertyPath: m_Name @@ -48596,17 +48890,17 @@ PrefabInstance: - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} @@ -48616,7 +48910,7 @@ PrefabInstance: - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} propertyPath: m_RootOrder - value: 15 + value: 5 objectReference: {fileID: 0} - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} @@ -48720,7 +49014,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 138132883} m_Modifications: - target: {fileID: 256661142209474860, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} @@ -48732,6 +49026,11 @@ PrefabInstance: propertyPath: m_SortingLayer value: 1 objectReference: {fileID: 0} + - target: {fileID: 271381267833183223, guid: f859e1c9214db2c4eaaeff51febb3222, + type: 3} + propertyPath: m_IsTrigger + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1137786072160203054, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} propertyPath: m_Name @@ -48760,17 +49059,17 @@ PrefabInstance: - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} @@ -48974,7 +49273,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1692173778} m_Modifications: - target: {fileID: 1518483160148691188, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} @@ -49004,7 +49303,7 @@ PrefabInstance: - target: {fileID: 5520736153122788072, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_Offset.y - value: -0.09043503 + value: -0.51 objectReference: {fileID: 0} - target: {fileID: 5520736153122788072, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} @@ -49014,7 +49313,7 @@ PrefabInstance: - target: {fileID: 5520736153122788072, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_IsTrigger - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6870250841519595495, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} @@ -49044,17 +49343,17 @@ PrefabInstance: - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} @@ -49064,7 +49363,7 @@ PrefabInstance: - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_RootOrder - value: 4 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} diff --git a/Assets/Scripts/Player.cs b/Assets/Scripts/Player.cs index cf8d4e8..af0ef39 100644 --- a/Assets/Scripts/Player.cs +++ b/Assets/Scripts/Player.cs @@ -76,18 +76,18 @@ public class Player : MonoBehaviour } - void OnCollisionEnter2D(Collision2D coll) + public void OnConsumable(Collider2D collision) { - if (coll.gameObject.tag == "Pizza") + if (collision.gameObject.tag == "Pizza") { SoundManagerScript.PlaySound("eat"); - Destroy(coll.gameObject); + Destroy(collision.gameObject); currentHealth += currentHealth < startHealth ? 1 : 0; healthBar.size = new Vector2(1.5f * currentHealth, this.healthBar.size.y); } - else if (coll.gameObject.tag == "Coffee") + else if (collision.gameObject.tag == "Coffee") { - Destroy(coll.gameObject); + Destroy(collision.gameObject); DrinkCoffee(); } } From add46e7203cac838608c5fb60e8de5ea9549ef15 Mon Sep 17 00:00:00 2001 From: Jack Rus Date: Sun, 2 Feb 2020 15:16:44 -0500 Subject: [PATCH 3/5] progress --- Assets/Scenes/GameOver.unity | 492 +++++++++++---------- Assets/Sprites/Collectibles/CoffeAnim.anim | 14 +- Assets/Sprites/Collectibles/PizzaAnim.anim | 14 +- Assets/Textures/Game Over Screen.png | Bin 0 -> 2251 bytes Assets/Textures/Game Over Screen.png.meta | 91 ++++ 5 files changed, 356 insertions(+), 255 deletions(-) create mode 100644 Assets/Textures/Game Over Screen.png create mode 100644 Assets/Textures/Game Over Screen.png.meta diff --git a/Assets/Scenes/GameOver.unity b/Assets/Scenes/GameOver.unity index 3932586..4057732 100644 --- a/Assets/Scenes/GameOver.unity +++ b/Assets/Scenes/GameOver.unity @@ -120,251 +120,12 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &776002143 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 776002144} - - component: {fileID: 776002146} - - component: {fileID: 776002145} - m_Layer: 5 - m_Name: GAME OVER - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 4294967295 - m_IsActive: 1 ---- !u!224 &776002144 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 776002143} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 2.0390081, y: 1.326184, z: 1.326184} - m_Children: [] - m_Father: {fileID: 1820456178} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 55.5} - m_SizeDelta: {x: 256, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &776002145 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 776002143} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 43d59b5c638b0664db55f3a4e4d130ef, type: 2} - m_Color: {r: 1, g: 0, b: 0.20116901, a: 1} - m_RaycastTarget: 0 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 35 - m_FontStyle: 1 - m_BestFit: 0 - m_MinSize: 1 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 0 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: 'GAME - - OVER' ---- !u!222 &776002146 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 776002143} - m_CullTransparentMesh: 0 --- !u!20 &998016119 stripped Camera: m_CorrespondingSourceObject: {fileID: 5711328081315814051, guid: fe8fb0c1c30f84b43885e84de26e0f11, type: 3} m_PrefabInstance: {fileID: 1197329722} m_PrefabAsset: {fileID: 0} ---- !u!1 &1025781617 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1025781619} - - component: {fileID: 1025781618} - m_Layer: 0 - m_Name: Coffee - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!212 &1025781618 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1025781617} - 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_ReceiveGI: 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: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 66b61c174b527e14e9b5ad791405c46e, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1.5, y: 1.5} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!4 &1025781619 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1025781617} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -4.564754, y: 1.8036937, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 7 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1027433821 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1027433823} - - component: {fileID: 1027433822} - m_Layer: 0 - m_Name: Pizza - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!212 &1027433822 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1027433821} - 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_ReceiveGI: 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: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: e6c9043b5a052f544b71e5612261b1be, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1.5, y: 1.5} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!4 &1027433823 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1027433821} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 6.77, y: 3.12, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 8 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1182104965 GameObject: m_ObjectHideFlags: 0 @@ -601,6 +362,91 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1240454727 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 6870250841519595495, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_Name + value: Coffee + objectReference: {fileID: 0} + - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_LocalPosition.x + value: -5.76 + objectReference: {fileID: 0} + - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_LocalPosition.y + value: 3.96 + objectReference: {fileID: 0} + - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_LocalPosition.z + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_RootOrder + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_LocalScale.z + value: -0.45 + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 1518483160148691188, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} --- !u!1 &1373063663 GameObject: m_ObjectHideFlags: 0 @@ -678,6 +524,86 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1373063663} m_CullTransparentMesh: 0 +--- !u!1 &1392404505 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1392404506} + - component: {fileID: 1392404507} + m_Layer: 0 + m_Name: Game Over Screen + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1392404506 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1392404505} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 3.6, y: 56.6, z: -1600} + m_LocalScale: {x: 47.36, y: 47.36, z: 47.36} + m_Children: [] + m_Father: {fileID: 1820456178} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1392404507 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1392404505} + 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_ReceiveGI: 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: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: 36246861c4a500545ab783da2610e29b, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 2.56, y: 2.4} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &1451273275 GameObject: m_ObjectHideFlags: 0 @@ -810,6 +736,90 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: button: {fileID: 1451273277} +--- !u!1001 &1626069623 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1137786072160203054, guid: f859e1c9214db2c4eaaeff51febb3222, + type: 3} + propertyPath: m_Name + value: Pizza + objectReference: {fileID: 0} + - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, + type: 3} + propertyPath: m_LocalPosition.x + value: 5.69 + objectReference: {fileID: 0} + - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, + type: 3} + propertyPath: m_LocalPosition.y + value: 3.46 + objectReference: {fileID: 0} + - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, + type: 3} + propertyPath: m_LocalPosition.z + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, + type: 3} + propertyPath: m_RootOrder + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, + type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, + type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, + type: 3} + propertyPath: m_LocalScale.z + value: 0.0625 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} --- !u!1 &1774738188 GameObject: m_ObjectHideFlags: 0 @@ -1002,8 +1012,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} m_Children: + - {fileID: 1392404506} - {fileID: 2106947133} - - {fileID: 776002144} - {fileID: 1451273276} m_Father: {fileID: 0} m_RootOrder: 1 @@ -1289,7 +1299,7 @@ Transform: m_LocalScale: {x: 16, y: 16, z: 1} m_Children: [] m_Father: {fileID: 1820456178} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &2106947134 SpriteRenderer: diff --git a/Assets/Sprites/Collectibles/CoffeAnim.anim b/Assets/Sprites/Collectibles/CoffeAnim.anim index f518912..9267bfc 100644 --- a/Assets/Sprites/Collectibles/CoffeAnim.anim +++ b/Assets/Sprites/Collectibles/CoffeAnim.anim @@ -22,26 +22,26 @@ AnimationClip: - time: 0 value: {fileID: 7517966211872351750, guid: 9c84b707645e8ef48a94be5c93579154, type: 3} - - time: 0.06666667 + - time: 0.1 value: {fileID: -1599933099690305131, guid: 9c84b707645e8ef48a94be5c93579154, type: 3} - - time: 0.13333334 + - time: 0.2 value: {fileID: -7233012564116182953, guid: 9c84b707645e8ef48a94be5c93579154, type: 3} - - time: 0.2 + - time: 0.3 value: {fileID: 1030234472550356571, guid: 9c84b707645e8ef48a94be5c93579154, type: 3} - - time: 0.26666668 + - time: 0.4 value: {fileID: 1045035048788072705, guid: 9c84b707645e8ef48a94be5c93579154, type: 3} - - time: 0.33333334 + - time: 0.5 value: {fileID: -5154125455451761606, guid: 9c84b707645e8ef48a94be5c93579154, type: 3} attribute: m_Sprite path: classID: 212 script: {fileID: 0} - m_SampleRate: 15 + m_SampleRate: 10 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} @@ -67,7 +67,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.4 + m_StopTime: 0.6 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/Sprites/Collectibles/PizzaAnim.anim b/Assets/Sprites/Collectibles/PizzaAnim.anim index c90e811..75f409a 100644 --- a/Assets/Sprites/Collectibles/PizzaAnim.anim +++ b/Assets/Sprites/Collectibles/PizzaAnim.anim @@ -22,26 +22,26 @@ AnimationClip: - time: 0 value: {fileID: 1702949257448659930, guid: 595c2e3d43f63344e8d4392619cda1d0, type: 3} - - time: 0.06666667 + - time: 0.1 value: {fileID: 2228231786184334263, guid: 595c2e3d43f63344e8d4392619cda1d0, type: 3} - - time: 0.13333334 + - time: 0.2 value: {fileID: 7883326084881811524, guid: 595c2e3d43f63344e8d4392619cda1d0, type: 3} - - time: 0.2 + - time: 0.3 value: {fileID: 1401680154723100908, guid: 595c2e3d43f63344e8d4392619cda1d0, type: 3} - - time: 0.26666668 + - time: 0.4 value: {fileID: 7996375002285474790, guid: 595c2e3d43f63344e8d4392619cda1d0, type: 3} - - time: 0.33333334 + - time: 0.5 value: {fileID: -3004614339896886377, guid: 595c2e3d43f63344e8d4392619cda1d0, type: 3} attribute: m_Sprite path: classID: 212 script: {fileID: 0} - m_SampleRate: 15 + m_SampleRate: 10 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} @@ -67,7 +67,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.4 + m_StopTime: 0.6 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/Textures/Game Over Screen.png b/Assets/Textures/Game Over Screen.png new file mode 100644 index 0000000000000000000000000000000000000000..68a9c002eeb63c1fbf67f21e2ef97040eca30377 GIT binary patch literal 2251 zcmd^B`&Sd!7Cs?hxGF-qRaJM6J!CIgy&;%-o*cQ1^jDir*T2Ok!LqZIaOzH#F zR%vSy5qZ=;v<)P;h$e(4vG$Sn3I>*h;0<9=A(4b6NSwqx=S~o+UH%DOv)1f=_TJ~4 zeZGD6UUMuhH925@$b0}mK+2}XbO3Oe3a0#huy-C3ehw3a@|1Uz2xC4z|BQKMo+Mp? znU3yqA3Dn0V`Z7jsUyd*Ul^F(4g*vwr;!h~-@ z!n+9o{7}2VmG6hG=k0tuIT4`Vr&V&{l-E+8o|*wRfRBOjk56qIF_>pl5)D-AGT@?a1)0)e93&Z+yM+eK)PWGH`L*So2Ox zU{UpRoM2_K8NVO_s(jm&hwr>f6%`JWiYYUl*WQS)4)t zoZf+h^BfIBwSOSiGFSifgu45y2xw>-O=_R==vVgLZ^~#8=LWcYjB!xq#<}71*{>KYo%R<-9}G>p#wMr7l@!gAm-Wg%#W1Ih zFT57swnTaS|aSf`pgIagOCd(WXpD)wK#M3wwjg|D#RSmj_^ zm^@~-;)uhzAS3V=m{EGqbytEs9N0CKq&e7->CS1aJ%%l61h@Fyc)nj z=^i?gS;b#VJe&~qiViniqL%TkOrGG*K1usuH~bbJl(+$ehWLQ~ATV>haTZuRY!&d_ z8a+>xQ(UCQ4X4@6TJu%`nYQZM6HYAu0jErvKI1fBY0f;+NGP#TRZO$YX^$A_!$Khj z+ve$RF$Zt#!Heunm}K5c`}O;l1Ph>h^o}sPn@NGkr$QH=e?BU3R134AAG6tuTR4A- zCec57GChp_&lHcr+FPD^1ZMJL1#k2&G&Xs+lKT9>7MmN+oK2xPv&#Y$db2k2I`rjv z9j;jk_ZFN+gM;T(=vW_%TYxYv4db$9Uf#a^Gk*QCIaTH>jGw8zKbT|fmtK4vPu8e- z6%BhL%mPY1bn+z^bo&bW0?L@td0CXeRzBR(@vyjFZ9lGG+l#+w;El>w({;Ryv`EY+ zIEYF`O@dC&cpO(Oo$qnpsgQ~*XNx$1WKO|Lg%+h!&_MW)ql)Qb%8gauAj3WhPh3eX zv5aOynu_`pL>s-@p-CAj$h<>2KkUy$@MXf1pOJR9!AJ)Z>9I{)@gq!LI`_Bw-iBK@rAZMK-D9zBP6 zZ@i>tEop?raG1BiBTc!@jH-eXc3l)|G6+mMq6)W;IHAwGK&PwUtozQu``XT=K@18s zRtJOn?LUsmb*onf@CBb^4d7O~_;}HmDRPMs_@l*GWs;^E%60vmi zS;&S^ZI)z_-@(GicM9kz;%`=X$JsypU zrcsc#vlf&uESyjXv1XjH4Jjl!-_=Hc%efvg>^qZw!7*zCVW=bhVXckI>vv4P5t!zO zc6s)S+Z2N=ZrDQwLcK|6SDYbSJc#aqq9ubhg#4i1MHY}b)nX8Qt8#qUH0v@B);u*q z-{{4^_Y=gIojqx|#2~iL_v~{kJF~q5;-PJtx~r3Ht7wRsTq=iX(B&9@Al8SY0+YNQ zeNj=*;;y_;wPhq}&|Ka1xcFj7XvZ3KYUWHB$14tv|@rF78Z}%u2Q09YjrD*u!(yFERSk>#Din<| z!ve0Ac{9fiv)13GsA%mNBMNK`aK@PYT@<>3QuHQu8B@pt49QuOThxxWA#FsaA@1q} z1ry$6;|vc%gOz-;31ePg8Le@aW~18;T_%w?9jrQ=oN))DH7ajRtO+aJM2lJa*(}Zu z_Kv3rxrGhnDZ45A-bk(5p~zB%%QZ3BgreS*kc3Ff Date: Sun, 2 Feb 2020 15:26:50 -0500 Subject: [PATCH 4/5] stamina and health fix --- Assets/Scenes/LevelOne.unity | 3 ++- Assets/Scripts/Player.cs | 17 ++++++++++++----- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/Assets/Scenes/LevelOne.unity b/Assets/Scenes/LevelOne.unity index e2c84f8..6da7db7 100644 --- a/Assets/Scenes/LevelOne.unity +++ b/Assets/Scenes/LevelOne.unity @@ -47979,7 +47979,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1671840916} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 14.5, y: -10.5, z: 0} + m_LocalPosition: {x: -9, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1008122163} @@ -48096,6 +48096,7 @@ MonoBehaviour: coffeValuePercent: 10 bugStaminaDamagePercent: 15 hurtVelocity: 20 + fightSoundLength: 5 healthBar: {fileID: 367096170} staminaBar: {fileID: 1895829831} --- !u!95 &1671840923 diff --git a/Assets/Scripts/Player.cs b/Assets/Scripts/Player.cs index af0ef39..9500fed 100644 --- a/Assets/Scripts/Player.cs +++ b/Assets/Scripts/Player.cs @@ -18,6 +18,7 @@ public class Player : MonoBehaviour [SerializeField] private int coffeValuePercent = 10; [SerializeField] private int bugStaminaDamagePercent = 15; [SerializeField] private float hurtVelocity = 15f; + [SerializeField] private int fightSoundLength = 5; private int currentHealth; private int currentStamina; @@ -32,7 +33,7 @@ public class Player : MonoBehaviour private bool isMovementEnabled = true; private bool isFighting = false; private bool isHurt = false; - + private int fightSoundAccumalator = 0; private bool isPlayerHurt = false; private void Start() @@ -116,7 +117,6 @@ public class Player : MonoBehaviour private void Hurt() { - currentHealth = 3; // TODO: REMOVE! currentHealth -= currentHealth > 0 ? 1 : 0; healthBar.size = new Vector2(1.5f * currentHealth, this.healthBar.size.y); @@ -143,7 +143,6 @@ public class Player : MonoBehaviour isHurt = false; }; - PlayFightSound(); HandleAnimations(); } @@ -264,7 +263,15 @@ public class Player : MonoBehaviour { if (isFighting && !isPlayerHurt) { - SoundManagerScript.PlaySound(GetRandomFightClipName()); + if (fightSoundAccumalator >= fightSoundLength) + { + SoundManagerScript.PlaySound(GetRandomFightClipName()); + fightSoundAccumalator = 0; + } + else + { + fightSoundAccumalator++; + } } } @@ -304,6 +311,6 @@ public class Player : MonoBehaviour public float GetStaminaDifficultyFactor() { - return currentStamina / (startStamina * 1f); + return Mathf.Clamp(currentStamina / (startStamina * 1f), 0.27f, 1); } } From 0706b3497b32787dff649991a9cf0dfd1a11345d Mon Sep 17 00:00:00 2001 From: Giovani Date: Sun, 2 Feb 2020 15:53:52 -0500 Subject: [PATCH 5/5] level design --- Assets/Scenes/LevelOne.unity | 1808 +++++++++++++++++++++++----------- Assets/Scripts/Player.cs | 2 +- 2 files changed, 1239 insertions(+), 571 deletions(-) diff --git a/Assets/Scenes/LevelOne.unity b/Assets/Scenes/LevelOne.unity index 6da7db7..df87f90 100644 --- a/Assets/Scenes/LevelOne.unity +++ b/Assets/Scenes/LevelOne.unity @@ -362,121 +362,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 553298993} m_PrefabAsset: {fileID: 0} ---- !u!1001 &55524261 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1692173778} - m_Modifications: - - target: {fileID: 1518483160148691188, guid: 2ccb08e2c4b8851498f8ecbf1a873146, - type: 3} - propertyPath: m_BodyType - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 1747974818995494046, guid: 2ccb08e2c4b8851498f8ecbf1a873146, - type: 3} - propertyPath: m_SortingLayerID - value: -115631929 - objectReference: {fileID: 0} - - target: {fileID: 1747974818995494046, guid: 2ccb08e2c4b8851498f8ecbf1a873146, - type: 3} - propertyPath: m_SortingLayer - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5520736153122788072, guid: 2ccb08e2c4b8851498f8ecbf1a873146, - type: 3} - propertyPath: m_Offset.x - value: 0.040924072 - objectReference: {fileID: 0} - - target: {fileID: 5520736153122788072, guid: 2ccb08e2c4b8851498f8ecbf1a873146, - type: 3} - propertyPath: m_Size.x - value: 0.9434204 - objectReference: {fileID: 0} - - target: {fileID: 5520736153122788072, guid: 2ccb08e2c4b8851498f8ecbf1a873146, - type: 3} - propertyPath: m_Offset.y - value: -0.51 - objectReference: {fileID: 0} - - target: {fileID: 5520736153122788072, guid: 2ccb08e2c4b8851498f8ecbf1a873146, - type: 3} - propertyPath: m_Size.y - value: 1.3199286 - objectReference: {fileID: 0} - - target: {fileID: 5520736153122788072, guid: 2ccb08e2c4b8851498f8ecbf1a873146, - type: 3} - propertyPath: m_IsTrigger - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6870250841519595495, guid: 2ccb08e2c4b8851498f8ecbf1a873146, - type: 3} - propertyPath: m_Name - value: Coffee - objectReference: {fileID: 0} - - target: {fileID: 6870250841519595495, guid: 2ccb08e2c4b8851498f8ecbf1a873146, - type: 3} - propertyPath: m_TagString - value: Coffee - objectReference: {fileID: 0} - - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, - type: 3} - propertyPath: m_LocalPosition.x - value: 132.4 - objectReference: {fileID: 0} - - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, - type: 3} - propertyPath: m_LocalPosition.y - value: -18.2 - objectReference: {fileID: 0} - - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, - type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: - - {fileID: 1518483160148691188, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} - m_SourcePrefab: {fileID: 100100000, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} --- !u!1 &138132881 GameObject: m_ObjectHideFlags: 0 @@ -522,6 +407,7 @@ Transform: - {fileID: 1821309074} - {fileID: 1016030299} - {fileID: 1123784853} + - {fileID: 430966061} m_Father: {fileID: 0} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -605,7 +491,7 @@ PrefabInstance: - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_RootOrder - value: 5 + value: 4 objectReference: {fileID: 0} - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} @@ -1302,12 +1188,12 @@ PrefabInstance: - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} propertyPath: m_LocalPosition.x - value: 127.31 + value: 127.5 objectReference: {fileID: 0} - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} propertyPath: m_LocalPosition.y - value: 10.67 + value: 12 objectReference: {fileID: 0} - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} @@ -1337,7 +1223,7 @@ PrefabInstance: - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} propertyPath: m_RootOrder - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} @@ -1356,12 +1242,255 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} +--- !u!4 &422631201 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + m_PrefabInstance: {fileID: 455598281} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &430966060 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 138132883} + m_Modifications: + - target: {fileID: 256661142209474860, guid: f859e1c9214db2c4eaaeff51febb3222, + type: 3} + propertyPath: m_SortingLayerID + value: -115631929 + objectReference: {fileID: 0} + - target: {fileID: 256661142209474860, guid: f859e1c9214db2c4eaaeff51febb3222, + type: 3} + propertyPath: m_SortingLayer + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 271381267833183223, guid: f859e1c9214db2c4eaaeff51febb3222, + type: 3} + propertyPath: m_IsTrigger + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1137786072160203054, guid: f859e1c9214db2c4eaaeff51febb3222, + type: 3} + propertyPath: m_Name + value: Pizza + objectReference: {fileID: 0} + - target: {fileID: 1137786072160203054, guid: f859e1c9214db2c4eaaeff51febb3222, + type: 3} + propertyPath: m_TagString + value: Pizza + objectReference: {fileID: 0} + - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, + type: 3} + propertyPath: m_LocalPosition.x + value: 83 + objectReference: {fileID: 0} + - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, + type: 3} + propertyPath: m_LocalPosition.y + value: -10.5 + objectReference: {fileID: 0} + - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, + type: 3} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} +--- !u!4 &430966061 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, + type: 3} + m_PrefabInstance: {fileID: 430966060} + m_PrefabAsset: {fileID: 0} +--- !u!1 &430966062 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1137786072160203054, guid: f859e1c9214db2c4eaaeff51febb3222, + type: 3} + m_PrefabInstance: {fileID: 430966060} + m_PrefabAsset: {fileID: 0} +--- !u!114 &430966063 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 430966062} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5b72c6073f9135a4894350d4cde51a76, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!4 &439930394 stripped Transform: m_CorrespondingSourceObject: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} m_PrefabInstance: {fileID: 1028911173} m_PrefabAsset: {fileID: 0} +--- !u!1001 &455598281 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1008122163} + m_Modifications: + - target: {fileID: 3827363133515929328, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_Offset.y + value: -0.022842407 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929328, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_Size.y + value: 2.624854 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929328, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_Offset.x + value: -0.001704216 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929328, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_Size.x + value: 3.1920948 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_LocalPosition.x + value: 83 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_LocalPosition.y + value: -16.5 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_RootOrder + value: 12 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_LocalScale.x + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929333, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_Name + value: GioBug + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929334, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_Constraints + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929335, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: playerCollider + value: + objectReference: {fileID: 1671840919} + - target: {fileID: 3827363133515929335, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: eventControls + value: + objectReference: {fileID: 1491655} + - target: {fileID: 3827363133515929335, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: player + value: + objectReference: {fileID: 1671840921} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, type: 3} --- !u!1001 &553298993 PrefabInstance: m_ObjectHideFlags: 0 @@ -1566,7 +1695,7 @@ PrefabInstance: - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_RootOrder - value: 4 + value: 3 objectReference: {fileID: 0} - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} @@ -1585,12 +1714,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} ---- !u!4 &661251797 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, - type: 3} - m_PrefabInstance: {fileID: 55524261} - m_PrefabAsset: {fileID: 0} --- !u!1001 &673614425 PrefabInstance: m_ObjectHideFlags: 0 @@ -1705,6 +1828,126 @@ PrefabInstance: objectReference: {fileID: 1671840921} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: cc74a3ff6f657d842b5731190a6074d7, type: 3} +--- !u!1001 &730216393 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1692173778} + m_Modifications: + - target: {fileID: 1518483160148691188, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_BodyType + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1747974818995494046, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_SortingLayerID + value: -115631929 + objectReference: {fileID: 0} + - target: {fileID: 1747974818995494046, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_SortingLayer + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5520736153122788072, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_Offset.x + value: 0.032886505 + objectReference: {fileID: 0} + - target: {fileID: 5520736153122788072, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_Size.x + value: 0.95738983 + objectReference: {fileID: 0} + - target: {fileID: 5520736153122788072, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_Offset.y + value: -0.51 + objectReference: {fileID: 0} + - target: {fileID: 5520736153122788072, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_Size.y + value: 1.31913 + objectReference: {fileID: 0} + - target: {fileID: 5520736153122788072, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_IsTrigger + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6870250841519595495, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_Name + value: Coffee + objectReference: {fileID: 0} + - target: {fileID: 6870250841519595495, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_TagString + value: Coffee + objectReference: {fileID: 0} + - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_LocalPosition.x + value: 31 + objectReference: {fileID: 0} + - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_RootOrder + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} +--- !u!4 &730216394 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + m_PrefabInstance: {fileID: 730216393} + m_PrefabAsset: {fileID: 0} --- !u!4 &851631687 stripped Transform: m_CorrespondingSourceObject: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, @@ -2010,6 +2253,8 @@ Transform: - {fileID: 1028395223} - {fileID: 1042834705} - {fileID: 1950090158} + - {fileID: 422631201} + - {fileID: 1550570322} m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2103,12 +2348,12 @@ PrefabInstance: - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_LocalPosition.x - value: 132.502 + value: 132.5 objectReference: {fileID: 0} - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_LocalPosition.y - value: 37.694 + value: 38.5 objectReference: {fileID: 0} - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} @@ -2138,7 +2383,7 @@ PrefabInstance: - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_RootOrder - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} @@ -2328,33 +2573,17 @@ CompositeCollider2D: Y: -50000000 - X: 150000000 Y: -70000000 - - X: 299999900 + - X: 300000000 Y: -70000000 - - X: 299999900 + - X: 300000000 Y: -180000000 - X: 10000000 Y: -180000000 - X: 10000000 Y: -200000000 - - X: 319999900 + - X: 330000000 Y: -200000000 - - X: 319999900 - Y: -200000041 - - X: 319999959 - Y: -200000100 - - X: 329999959 - Y: -200000100 - - X: 329999900 - Y: -200000041 - - X: 329999900 - Y: -50000041 - - X: 329999959 - Y: -50000100 - - X: 340000041 - Y: -50000100 - - X: 340000100 - Y: -50000041 - - X: 340000100 + - X: 330000000 Y: -50000000 - X: 400000000 Y: -50000000 @@ -2496,42 +2725,20 @@ CompositeCollider2D: Y: -230000000 - X: 400000000 Y: -190000000 - - X: 380000100 + - X: 380000000 Y: -190000000 - - X: 380000100 - Y: -189999959 - - X: 380000041 - Y: -189999900 - - X: 380000000 - Y: -189999900 - X: 380000000 Y: -150000000 - X: 360000000 Y: -150000000 - X: 360000000 - Y: -189999900 - - X: 349999959 - Y: -189999900 - - X: 349999900 - Y: -189999959 - - X: 349999900 - Y: -200000041 - - X: 349999959 - Y: -200000100 + Y: -190000000 + - X: 350000000 + Y: -190000000 + - X: 350000000 + Y: -200000000 - X: 360000000 - Y: -200000100 - - X: 360000000 - Y: -209999900 - - X: 359999959 - Y: -209999900 - - X: 359999900 - Y: -209999959 - - X: 359999900 - Y: -220000041 - - X: 359999959 - Y: -220000100 - - X: 360000000 - Y: -220000100 + Y: -200000000 - X: 360000000 Y: -230000000 - X: -20000000 @@ -2926,66 +3133,6 @@ CompositeCollider2D: Y: 240000000 - X: 10000000 Y: 220000000 - - - X: 2120000000 - Y: 320000000 - - X: 2100000000 - Y: 320000000 - - X: 2100000000 - Y: 310000000 - - X: 2120000000 - Y: 310000000 - - - X: 1710000000 - Y: 310000000 - - X: 1740000000 - Y: 310000000 - - X: 1740000000 - Y: 320000000 - - X: 1700000000 - Y: 320000000 - - X: 1700000000 - Y: 300000000 - - X: 1710000000 - Y: 300000000 - - - X: 2180000000 - Y: 320000000 - - X: 2160000000 - Y: 320000000 - - X: 2160000000 - Y: 310000000 - - X: 2180000000 - Y: 310000000 - - - X: 2240000000 - Y: 320000000 - - X: 2220000000 - Y: 320000000 - - X: 2220000000 - Y: 310000000 - - X: 2240000000 - Y: 310000000 - - - X: 20000000 - Y: 320000000 - - X: -20000000 - Y: 320000000 - - X: -20000000 - Y: 300000000 - - X: 20000000 - Y: 300000000 - - - X: 2060000000 - Y: 320000000 - - X: 2040000000 - Y: 320000000 - - X: 2040000000 - Y: 310000000 - - X: 2060000000 - Y: 310000000 - - - X: 1380000000 - Y: 320000000 - - X: 1270000000 - Y: 320000000 - - X: 1270000000 - Y: 300000000 - - X: 1380000000 - Y: 300000000 - - X: 1880000000 Y: 320000000 - X: 1860000000 @@ -2994,14 +3141,6 @@ CompositeCollider2D: Y: 310000000 - X: 1880000000 Y: 310000000 - - - X: 2289999872 - Y: 320000000 - - X: 2280000000 - Y: 320000000 - - X: 2280000000 - Y: 300000000 - - X: 2289999872 - Y: 300000000 - - X: 1940000000 Y: 320000000 - X: 1920000000 @@ -3018,13 +3157,65 @@ CompositeCollider2D: Y: 310000000 - X: 2000000000 Y: 310000000 - - - X: -40000000 + - - X: 2060000000 Y: 320000000 - - X: -80000000 + - X: 2040000000 Y: 320000000 - - X: -80000000 + - X: 2040000000 + Y: 310000000 + - X: 2060000000 + Y: 310000000 + - - X: 2120000000 + Y: 320000000 + - X: 2100000000 + Y: 320000000 + - X: 2100000000 + Y: 310000000 + - X: 2120000000 + Y: 310000000 + - - X: 2180000000 + Y: 320000000 + - X: 2160000000 + Y: 320000000 + - X: 2160000000 + Y: 310000000 + - X: 2180000000 + Y: 310000000 + - - X: 2240000000 + Y: 320000000 + - X: 2220000000 + Y: 320000000 + - X: 2220000000 + Y: 310000000 + - X: 2240000000 + Y: 310000000 + - - X: 2289999872 + Y: 320000000 + - X: 2280000000 + Y: 320000000 + - X: 2280000000 Y: 300000000 - - X: -40000000 + - X: 2289999872 + Y: 300000000 + - - X: 1710000000 + Y: 310000000 + - X: 1740000000 + Y: 310000000 + - X: 1740000000 + Y: 320000000 + - X: 1700000000 + Y: 320000000 + - X: 1700000000 + Y: 300000000 + - X: 1710000000 + Y: 300000000 + - - X: 1380000000 + Y: 320000000 + - X: 1270000000 + Y: 320000000 + - X: 1270000000 + Y: 300000000 + - X: 1380000000 Y: 300000000 - - X: 1820000000 Y: 320000000 @@ -3034,14 +3225,22 @@ CompositeCollider2D: Y: 310000000 - X: 1820000000 Y: 310000000 - - - X: 410000000 + - - X: 20000000 + Y: 320000000 + - X: -20000000 + Y: 320000000 + - X: -20000000 Y: 300000000 - - X: 270000000 + - X: 20000000 + Y: 300000000 + - - X: -40000000 + Y: 320000000 + - X: -80000000 + Y: 320000000 + - X: -80000000 + Y: 300000000 + - X: -40000000 Y: 300000000 - - X: 270000000 - Y: 280000000 - - X: 410000000 - Y: 280000000 - - X: 1010000000 Y: 90000000 - X: 1020000000 @@ -3270,14 +3469,14 @@ CompositeCollider2D: Y: 70000000 - X: 1010000000 Y: 70000000 - - - X: 10000000 - Y: 290000000 - - X: -10000000 - Y: 290000000 - - X: -10000000 - Y: 270000000 - - X: 10000000 - Y: 270000000 + - - X: 410000000 + Y: 300000000 + - X: 270000000 + Y: 300000000 + - X: 270000000 + Y: 280000000 + - X: 410000000 + Y: 280000000 - - X: -40000000 Y: 290000000 - X: -60000000 @@ -3286,6 +3485,14 @@ CompositeCollider2D: Y: 270000000 - X: -40000000 Y: 270000000 + - - X: 10000000 + Y: 290000000 + - X: -10000000 + Y: 290000000 + - X: -10000000 + Y: 270000000 + - X: 10000000 + Y: 270000000 - - X: 1400000000 Y: 270000000 - X: 1250000000 @@ -3294,14 +3501,6 @@ CompositeCollider2D: Y: 250000000 - X: 1400000000 Y: 250000000 - - - X: 2240000000 - Y: 260000000 - - X: 2169999872 - Y: 260000000 - - X: 2169999872 - Y: 240000000 - - X: 2240000000 - Y: 240000000 - - X: -10000000 Y: 260000000 - X: -50000000 @@ -3310,38 +3509,14 @@ CompositeCollider2D: Y: 250000000 - X: -10000000 Y: 250000000 - - - X: 430000000 - Y: 220000000 - - X: 410000000 - Y: 220000000 - - X: 410000000 - Y: 200000000 - - X: 430000000 - Y: 200000000 - - - X: 1920000000 - Y: 220000000 - - X: 1910000000 - Y: 220000000 - - X: 1910000000 - Y: 210000000 - - X: 1920000000 - Y: 210000000 - - - X: 2050000000 - Y: 220000000 - - X: 2040000000 - Y: 220000000 - - X: 2040000000 - Y: 210000000 - - X: 2050000000 - Y: 210000000 - - - X: 1860000000 - Y: 220000000 - - X: 1850000000 - Y: 220000000 - - X: 1850000000 - Y: 210000000 - - X: 1860000000 - Y: 210000000 + - - X: 2240000000 + Y: 260000000 + - X: 2169999872 + Y: 260000000 + - X: 2169999872 + Y: 240000000 + - X: 2240000000 + Y: 240000000 - - X: 1430000000 Y: 220000000 - X: 1220000000 @@ -3350,34 +3525,6 @@ CompositeCollider2D: Y: 200000000 - X: 1430000000 Y: 200000000 - - - X: 2040000000 - Y: 210000000 - - X: 2030000000 - Y: 210000000 - - X: 2030000000 - Y: 200000000 - - X: 2020000000 - Y: 200000000 - - X: 2020000000 - Y: 220000000 - - X: 2010000000 - Y: 220000000 - - X: 2010000000 - Y: 200000000 - - X: 2000000000 - Y: 200000000 - - X: 2000000000 - Y: 210000000 - - X: 1990000000 - Y: 210000000 - - X: 1990000000 - Y: 200000000 - - X: 2000000000 - Y: 200000000 - - X: 2000000000 - Y: 160000000 - - X: 2040000000 - Y: 160000000 - - X: 1900000000 Y: 200000000 - X: 1890000000 @@ -3398,6 +3545,50 @@ CompositeCollider2D: Y: 160000000 - X: 1900000000 Y: 160000000 + - - X: 430000000 + Y: 220000000 + - X: 410000000 + Y: 220000000 + - X: 410000000 + Y: 200000000 + - X: 430000000 + Y: 200000000 + - - X: 2050000000 + Y: 220000000 + - X: 2040000000 + Y: 220000000 + - X: 2040000000 + Y: 210000000 + - X: 2050000000 + Y: 210000000 + - - X: 1990000000 + Y: 210000000 + - X: 1990000000 + Y: 200000000 + - X: 2000000000 + Y: 200000000 + - X: 2000000000 + Y: 160000000 + - X: 2040000000 + Y: 160000000 + - X: 2040000000 + Y: 210000000 + - X: 2030000000 + Y: 210000000 + - X: 2030000000 + Y: 200000000 + - X: 2020000000 + Y: 200000000 + - X: 2020000000 + Y: 220000000 + - X: 2010000000 + Y: 220000000 + - X: 2010000000 + Y: 200000000 + - X: 2000000000 + Y: 200000000 + - X: 2000000000 + Y: 210000000 - - X: 1990000000 Y: 220000000 - X: 1980000000 @@ -3406,6 +3597,46 @@ CompositeCollider2D: Y: 210000000 - X: 1990000000 Y: 210000000 + - - X: 1920000000 + Y: 220000000 + - X: 1910000000 + Y: 220000000 + - X: 1910000000 + Y: 210000000 + - X: 1920000000 + Y: 210000000 + - - X: 1860000000 + Y: 220000000 + - X: 1850000000 + Y: 220000000 + - X: 1850000000 + Y: 210000000 + - X: 1860000000 + Y: 210000000 + - - X: 2160000000 + Y: 210000000 + - X: 2130000000 + Y: 210000000 + - X: 2130000000 + Y: 200000000 + - X: 2120000000 + Y: 200000000 + - X: 2120000000 + Y: 190000000 + - X: 2110000000 + Y: 190000000 + - X: 2110000000 + Y: 180000000 + - X: 2120000000 + Y: 180000000 + - X: 2120000000 + Y: 160000000 + - X: 2130000000 + Y: 160000000 + - X: 2130000000 + Y: 150000000 + - X: 2160000000 + Y: 150000000 - - X: 1910000000 Y: 210000000 - X: 1900000000 @@ -3442,50 +3673,6 @@ CompositeCollider2D: Y: 140000000 - X: 1770000000 Y: 140000000 - - - X: 2160000000 - Y: 210000000 - - X: 2130000000 - Y: 210000000 - - X: 2130000000 - Y: 200000000 - - X: 2120000000 - Y: 200000000 - - X: 2120000000 - Y: 190000000 - - X: 2110000000 - Y: 190000000 - - X: 2110000000 - Y: 180000000 - - X: 2120000000 - Y: 180000000 - - X: 2120000000 - Y: 160000000 - - X: 2130000000 - Y: 160000000 - - X: 2130000000 - Y: 150000000 - - X: 2160000000 - Y: 150000000 - - - X: 1750000000 - Y: 160000000 - - X: 1750000000 - Y: 190000000 - - X: 1740000000 - Y: 190000000 - - X: 1740000000 - Y: 200000000 - - X: 1760000000 - Y: 200000000 - - X: 1760000000 - Y: 190000000 - - X: 1770000000 - Y: 190000000 - - X: 1770000000 - Y: 180000000 - - X: 1760000000 - Y: 180000000 - - X: 1760000000 - Y: 160000000 - - X: 710000000 Y: 200000000 - X: 690000000 @@ -3510,6 +3697,26 @@ CompositeCollider2D: Y: 200000000 - X: 2150000128 Y: 160000000 + - - X: 1750000000 + Y: 160000000 + - X: 1750000000 + Y: 190000000 + - X: 1740000000 + Y: 190000000 + - X: 1740000000 + Y: 200000000 + - X: 1760000000 + Y: 200000000 + - X: 1760000000 + Y: 190000000 + - X: 1770000000 + Y: 190000000 + - X: 1770000000 + Y: 180000000 + - X: 1760000000 + Y: 180000000 + - X: 1760000000 + Y: 160000000 - - X: 1160000000 Y: 200000000 - X: 1150000000 @@ -3550,14 +3757,6 @@ CompositeCollider2D: Y: 130000000 - X: 730000000 Y: 130000000 - - - X: 520000000 - Y: 140000000 - - X: 480000000 - Y: 140000000 - - X: 480000000 - Y: 120000000 - - X: 520000000 - Y: 120000000 - - X: 2110000000 Y: 140000000 - X: 2090000000 @@ -3590,6 +3789,14 @@ CompositeCollider2D: Y: 120000000 - X: 1510000000 Y: 120000000 + - - X: 520000000 + Y: 140000000 + - X: 480000000 + Y: 140000000 + - X: 480000000 + Y: 120000000 + - X: 520000000 + Y: 120000000 - - X: 450000000 Y: 120000000 - X: 370000000 @@ -3702,14 +3909,6 @@ CompositeCollider2D: Y: 10000000 - X: 1280000000 Y: 10000000 - - - X: 1550000000 - Y: 100000000 - - X: 1530000000 - Y: 100000000 - - X: 1530000000 - Y: 80000000 - - X: 1550000000 - Y: 80000000 - - X: 760000000 Y: 100000000 - X: 700000000 @@ -3718,6 +3917,14 @@ CompositeCollider2D: Y: 80000000 - X: 760000000 Y: 80000000 + - - X: 1550000000 + Y: 100000000 + - X: 1530000000 + Y: 100000000 + - X: 1530000000 + Y: 80000000 + - X: 1550000000 + Y: 80000000 - - X: 2040000000 Y: 50000000 - X: 2050000000 @@ -3758,14 +3965,6 @@ CompositeCollider2D: Y: 40000000 - X: 2040000000 Y: 40000000 - - - X: 290000000 - Y: 80000000 - - X: 240000000 - Y: 80000000 - - X: 240000000 - Y: 60000000 - - X: 290000000 - Y: 60000000 - - X: 2220000000 Y: 80000000 - X: 2169999872 @@ -3774,6 +3973,14 @@ CompositeCollider2D: Y: 50000000 - X: 2220000000 Y: 50000000 + - - X: 290000000 + Y: 80000000 + - X: 240000000 + Y: 80000000 + - X: 240000000 + Y: 60000000 + - X: 290000000 + Y: 60000000 - - X: 380000000 Y: 70000000 - X: 330000000 @@ -3790,14 +3997,6 @@ CompositeCollider2D: Y: 70000000 - X: 2020000000 Y: 50000000 - - - X: 1800000000 - Y: 60000000 - - X: 1770000000 - Y: 60000000 - - X: 1770000000 - Y: 40000000 - - X: 1800000000 - Y: 40000000 - - X: 910000000 Y: -110000000 - X: 1030000000 @@ -3878,6 +4077,14 @@ CompositeCollider2D: Y: -200000000 - X: 910000000 Y: -200000000 + - - X: 1800000000 + Y: 60000000 + - X: 1770000000 + Y: 60000000 + - X: 1770000000 + Y: 40000000 + - X: 1800000000 + Y: 40000000 - - X: 840000000 Y: 50000000 - X: 760000000 @@ -3886,14 +4093,6 @@ CompositeCollider2D: Y: 30000000 - X: 840000000 Y: 30000000 - - - X: 1050000000 - Y: 30000000 - - X: 1030000000 - Y: 30000000 - - X: 1030000000 - Y: 10000000 - - X: 1050000000 - Y: 10000000 - - X: 590000000 Y: 30000000 - X: 520000000 @@ -3910,6 +4109,14 @@ CompositeCollider2D: Y: 10000000 - X: 250000000 Y: 10000000 + - - X: 1050000000 + Y: 30000000 + - X: 1030000000 + Y: 30000000 + - X: 1030000000 + Y: 10000000 + - X: 1050000000 + Y: 10000000 - - X: 2270000128 Y: 20000000 - X: 2260000000 @@ -3918,6 +4125,14 @@ CompositeCollider2D: Y: 10000000 - X: 2270000128 Y: 10000000 + - - X: 1000000000 + Y: 10000000 + - X: 940000000 + Y: 10000000 + - X: 940000000 + Y: -10000000 + - X: 1000000000 + Y: -10000000 - - X: 2160000000 Y: -40000000 - X: 2150000128 @@ -3978,14 +4193,6 @@ CompositeCollider2D: Y: -60000000 - X: 2160000000 Y: -60000000 - - - X: 1000000000 - Y: 10000000 - - X: 940000000 - Y: 10000000 - - X: 940000000 - Y: -10000000 - - X: 1000000000 - Y: -10000000 - - X: 1750000000 Y: 10000000 - X: 1670000000 @@ -4018,22 +4225,34 @@ CompositeCollider2D: Y: -60000000 - X: 2270000128 Y: -60000000 - - - X: 1170000100 - Y: -110000041 - - X: 1170000100 - Y: -79999959 - - X: 1170000041 - Y: -79999900 - - X: 1140000041 - Y: -79999900 - - X: 1140000100 - Y: -79999959 - - X: 1140000100 - Y: -110000041 - - X: 1140000041 - Y: -110000100 - - X: 1170000041 - Y: -110000100 + - - X: 1170000000 + Y: -80000000 + - X: 1140000000 + Y: -80000000 + - X: 1140000000 + Y: -110000000 + - X: 1170000000 + Y: -110000000 + - - X: 2140000000 + Y: -110000000 + - X: 2230000128 + Y: -110000000 + - X: 2230000128 + Y: -90000000 + - X: 2130000000 + Y: -90000000 + - X: 2130000000 + Y: -100000000 + - X: 2120000000 + Y: -100000000 + - X: 2120000000 + Y: -150000000 + - X: 2090000000 + Y: -150000000 + - X: 2090000000 + Y: -170000000 + - X: 2140000000 + Y: -170000000 - - X: 1550000000 Y: -90000000 - X: 1530000000 @@ -4062,26 +4281,6 @@ CompositeCollider2D: Y: -110000000 - X: 1240000000 Y: -110000000 - - - X: 2140000000 - Y: -110000000 - - X: 2230000128 - Y: -110000000 - - X: 2230000128 - Y: -90000000 - - X: 2130000000 - Y: -90000000 - - X: 2130000000 - Y: -100000000 - - X: 2120000000 - Y: -100000000 - - X: 2120000000 - Y: -150000000 - - X: 2090000000 - Y: -150000000 - - X: 2090000000 - Y: -170000000 - - X: 2140000000 - Y: -170000000 - - X: 1780000000 Y: -120000000 - X: 1730000000 @@ -4090,14 +4289,6 @@ CompositeCollider2D: Y: -140000000 - X: 1780000000 Y: -140000000 - - - X: 1510000000 - Y: -130000000 - - X: 1490000000 - Y: -130000000 - - X: 1490000000 - Y: -150000000 - - X: 1510000000 - Y: -150000000 - - X: 1140000000 Y: -130000000 - X: 1050000000 @@ -4106,14 +4297,6 @@ CompositeCollider2D: Y: -150000000 - X: 1140000000 Y: -150000000 - - - X: 1320000000 - Y: -130000000 - - X: 1240000000 - Y: -130000000 - - X: 1240000000 - Y: -150000000 - - X: 1320000000 - Y: -150000000 - - X: -90000000 Y: -150000000 - X: -50000000 @@ -4138,6 +4321,22 @@ CompositeCollider2D: Y: -160000000 - X: -90000000 Y: -160000000 + - - X: 1510000000 + Y: -130000000 + - X: 1490000000 + Y: -130000000 + - X: 1490000000 + Y: -150000000 + - X: 1510000000 + Y: -150000000 + - - X: 1320000000 + Y: -130000000 + - X: 1240000000 + Y: -130000000 + - X: 1240000000 + Y: -150000000 + - X: 1320000000 + Y: -150000000 - - X: 2270000128 Y: -140000000 - X: 2260000000 @@ -4146,6 +4345,22 @@ CompositeCollider2D: Y: -150000000 - X: 2270000128 Y: -150000000 + - - X: 2050000000 + Y: -150000000 + - X: 2010000000 + Y: -150000000 + - X: 2010000000 + Y: -170000000 + - X: 2050000000 + Y: -170000000 + - - X: 1970000000 + Y: -150000000 + - X: 1930000000 + Y: -150000000 + - X: 1930000000 + Y: -170000000 + - X: 1970000000 + Y: -170000000 - - X: 1790000000 Y: -190000000 - X: 1810000000 @@ -4170,22 +4385,6 @@ CompositeCollider2D: Y: -200000000 - X: 1790000000 Y: -200000000 - - - X: 2050000000 - Y: -150000000 - - X: 2010000000 - Y: -150000000 - - X: 2010000000 - Y: -170000000 - - X: 2050000000 - Y: -170000000 - - - X: 1970000000 - Y: -150000000 - - X: 1930000000 - Y: -150000000 - - X: 1930000000 - Y: -170000000 - - X: 1970000000 - Y: -170000000 - - X: 1720000000 Y: -170000000 - X: 1640000000 @@ -4202,6 +4401,22 @@ CompositeCollider2D: Y: -190000000 - X: 1550000000 Y: -190000000 + - - X: 840000000 + Y: -180000000 + - X: 820000000 + Y: -180000000 + - X: 820000000 + Y: -200000000 + - X: 840000000 + Y: -200000000 + - - X: 740000000 + Y: -180000000 + - X: 720000000 + Y: -180000000 + - X: 720000000 + Y: -200000000 + - X: 740000000 + Y: -200000000 - - X: 690000000 Y: -180000000 - X: 670000000 @@ -4210,38 +4425,6 @@ CompositeCollider2D: Y: -200000000 - X: 690000000 Y: -200000000 - - - X: 540000000 - Y: -180000000 - - X: 520000000 - Y: -180000000 - - X: 520000000 - Y: -200000000 - - X: 540000000 - Y: -200000000 - - - X: 990000000 - Y: -180000000 - - X: 930000000 - Y: -180000000 - - X: 930000000 - Y: -200000000 - - X: 990000000 - Y: -200000000 - - - X: 1110000000 - Y: -180000000 - - X: 1020000000 - Y: -180000000 - - X: 1020000000 - Y: -200000000 - - X: 1110000000 - Y: -200000000 - - - X: 590000000 - Y: -180000000 - - X: 570000000 - Y: -180000000 - - X: 570000000 - Y: -200000000 - - X: 590000000 - Y: -200000000 - - X: 640000000 Y: -180000000 - X: 620000000 @@ -4250,13 +4433,37 @@ CompositeCollider2D: Y: -200000000 - X: 640000000 Y: -200000000 - - - X: 840000000 + - - X: 590000000 Y: -180000000 - - X: 820000000 + - X: 570000000 Y: -180000000 - - X: 820000000 + - X: 570000000 Y: -200000000 - - X: 840000000 + - X: 590000000 + Y: -200000000 + - - X: 540000000 + Y: -180000000 + - X: 520000000 + Y: -180000000 + - X: 520000000 + Y: -200000000 + - X: 540000000 + Y: -200000000 + - - X: 1110000000 + Y: -180000000 + - X: 1020000000 + Y: -180000000 + - X: 1020000000 + Y: -200000000 + - X: 1110000000 + Y: -200000000 + - - X: 990000000 + Y: -180000000 + - X: 930000000 + Y: -180000000 + - X: 930000000 + Y: -200000000 + - X: 990000000 Y: -200000000 - - X: 790000000 Y: -180000000 @@ -4266,14 +4473,6 @@ CompositeCollider2D: Y: -200000000 - X: 790000000 Y: -200000000 - - - X: 740000000 - Y: -180000000 - - X: 720000000 - Y: -180000000 - - X: 720000000 - Y: -200000000 - - X: 740000000 - Y: -200000000 m_CompositePaths: m_Paths: - - {x: 234.99998, y: -26} @@ -4283,13 +4482,13 @@ CompositeCollider2D: - - {x: 136, y: -22.999971} - {x: 40, y: -22.999971} - {x: 39.999973, y: -19} - - {x: 38, y: -18.99996} + - {x: 38, y: -18.999971} - {x: 37.999973, y: -15} - {x: 36, y: -15.000029} - - {x: 35.999973, y: -18.99999} - - {x: 34.999992, y: -19.000027} - - {x: 35.000027, y: -20.00001} - - {x: 36, y: -20.00004} + - {x: 35.999973, y: -19} + - {x: 35, y: -19.000029} + - {x: 35.00003, y: -20} + - {x: 36, y: -20.000029} - {x: 35.999973, y: -23} - {x: -2, y: -22.999971} - {x: -2.0000293, y: -17} @@ -4309,12 +4508,12 @@ CompositeCollider2D: - {x: 12.00003, y: -5} - {x: 15, y: -5.0000296} - {x: 15.000029, y: -7} - - {x: 29.99999, y: -7.0000296} - - {x: 29.999962, y: -18} + - {x: 30, y: -7.0000296} + - {x: 29.999971, y: -18} - {x: 1, y: -18.000029} - {x: 1.0000293, y: -20} - - {x: 32.999992, y: -19.999975} - - {x: 33.000027, y: -5.00001} + - {x: 33, y: -19.999971} + - {x: 33.00003, y: -5} - {x: 40, y: -5.0000296} - {x: 40.00003, y: -15} - {x: 43, y: -15.000029} @@ -4882,10 +5081,6 @@ CompositeCollider2D: - {x: 72.99997, y: 15} - {x: 71, y: 14.999971} - {x: 71.00003, y: 13} - - - {x: 150.99997, y: 12} - - {x: 150.99997, y: 14} - - {x: 149, y: 13.999971} - - {x: 149.00003, y: 12} - - {x: 179.99997, y: 12} - {x: 180.00003, y: 13} - {x: 181, y: 13.00003} @@ -4902,6 +5097,10 @@ CompositeCollider2D: - {x: 51.999973, y: 14} - {x: 48, y: 13.999971} - {x: 48.00003, y: 12} + - - {x: 150.99997, y: 12} + - {x: 150.99997, y: 14} + - {x: 149, y: 13.999971} + - {x: 149.00003, y: 12} - - {x: 44.999973, y: 10} - {x: 44.999973, y: 12} - {x: 37, y: 11.99997} @@ -5116,10 +5315,10 @@ CompositeCollider2D: - {x: 226.99998, y: -5} - {x: 226, y: -5.000029} - {x: 226.00003, y: -6} - - - {x: 116.99998, y: -11.00001} - - {x: 116.99998, y: -7.9999905} - - {x: 114.000015, y: -8.000026} - - {x: 114.00004, y: -11.00001} + - - {x: 116.99998, y: -11} + - {x: 116.99998, y: -8} + - {x: 114, y: -8.00003} + - {x: 114.00003, y: -11} - - {x: 154.99997, y: -11} - {x: 154.99997, y: -9} - {x: 153, y: -9.00003} @@ -5204,6 +5403,14 @@ CompositeCollider2D: - {x: 154.99997, y: -17} - {x: 153, y: -17.000029} - {x: 153.00003, y: -19} + - - {x: 73.99997, y: -20} + - {x: 73.99997, y: -18} + - {x: 72, y: -18.000029} + - {x: 72.00003, y: -20} + - - {x: 83.99997, y: -20} + - {x: 83.99997, y: -18} + - {x: 82, y: -18.000029} + - {x: 82.00003, y: -20} - - {x: 98.99997, y: -20} - {x: 98.99997, y: -18} - {x: 93, y: -18.000029} @@ -5232,14 +5439,6 @@ CompositeCollider2D: - {x: 68.99997, y: -18} - {x: 67, y: -18.000029} - {x: 67.00003, y: -20} - - - {x: 73.99997, y: -20} - - {x: 73.99997, y: -18} - - {x: 72, y: -18.000029} - - {x: 72.00003, y: -20} - - - {x: 83.99997, y: -20} - - {x: 83.99997, y: -18} - - {x: 82, y: -18.000029} - - {x: 82.00003, y: -20} m_VertexDistance: 0.0005 m_OffsetDistance: 0.00005 --- !u!50 &1168076125 @@ -47485,6 +47684,127 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1244787351 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1692173778} + m_Modifications: + - target: {fileID: 1518483160148691188, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_BodyType + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1747974818995494046, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_SortingLayerID + value: -115631929 + objectReference: {fileID: 0} + - target: {fileID: 1747974818995494046, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_SortingLayer + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5520736153122788072, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_Offset.x + value: 0.032886505 + objectReference: {fileID: 0} + - target: {fileID: 5520736153122788072, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_Size.x + value: 0.95738983 + objectReference: {fileID: 0} + - target: {fileID: 5520736153122788072, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_Offset.y + value: -0.51 + objectReference: {fileID: 0} + - target: {fileID: 5520736153122788072, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_Size.y + value: 1.31913 + objectReference: {fileID: 0} + - target: {fileID: 5520736153122788072, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_IsTrigger + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6870250841519595495, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_Name + value: Coffee + objectReference: {fileID: 0} + - target: {fileID: 6870250841519595495, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_TagString + value: Coffee + objectReference: {fileID: 0} + - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_LocalPosition.x + value: -8 + objectReference: {fileID: 0} + - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_LocalPosition.y + value: -10.5 + objectReference: {fileID: 0} + - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_RootOrder + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 1518483160148691188, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} +--- !u!4 &1244787352 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + m_PrefabInstance: {fileID: 1244787351} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1246342466 PrefabInstance: m_ObjectHideFlags: 0 @@ -47690,7 +48010,7 @@ PrefabInstance: - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_RootOrder - value: 3 + value: 2 objectReference: {fileID: 0} - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} @@ -47894,7 +48214,7 @@ PrefabInstance: - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_LocalPosition.y - value: -9.6 + value: -10 objectReference: {fileID: 0} - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} @@ -47924,7 +48244,7 @@ PrefabInstance: - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_RootOrder - value: 6 + value: 5 objectReference: {fileID: 0} - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} @@ -47944,6 +48264,111 @@ PrefabInstance: m_RemovedComponents: - {fileID: 1518483160148691188, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} +--- !u!1001 &1550570321 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1008122163} + m_Modifications: + - target: {fileID: 4815066122311201376, guid: c98830a6bebcdc24b91c550a26c9b621, + type: 3} + propertyPath: playerCollider + value: + objectReference: {fileID: 1671840919} + - target: {fileID: 4815066122311201376, guid: c98830a6bebcdc24b91c550a26c9b621, + type: 3} + propertyPath: eventControls + value: + objectReference: {fileID: 1491655} + - target: {fileID: 4815066122311201376, guid: c98830a6bebcdc24b91c550a26c9b621, + type: 3} + propertyPath: player + value: + objectReference: {fileID: 1671840921} + - target: {fileID: 4815066122311201376, guid: c98830a6bebcdc24b91c550a26c9b621, + type: 3} + propertyPath: movementSpeed + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4815066122311201377, guid: c98830a6bebcdc24b91c550a26c9b621, + type: 3} + propertyPath: m_Material + value: + objectReference: {fileID: 6200000, guid: 8bbf95d8d23ff94449785e66e0ae11ec, type: 2} + - target: {fileID: 4815066122311201378, guid: c98830a6bebcdc24b91c550a26c9b621, + type: 3} + propertyPath: m_Name + value: KatBug + objectReference: {fileID: 0} + - target: {fileID: 4815066122311201381, guid: c98830a6bebcdc24b91c550a26c9b621, + type: 3} + propertyPath: m_LocalPosition.x + value: 131 + objectReference: {fileID: 0} + - target: {fileID: 4815066122311201381, guid: c98830a6bebcdc24b91c550a26c9b621, + type: 3} + propertyPath: m_LocalPosition.y + value: -23 + objectReference: {fileID: 0} + - target: {fileID: 4815066122311201381, guid: c98830a6bebcdc24b91c550a26c9b621, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4815066122311201381, guid: c98830a6bebcdc24b91c550a26c9b621, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4815066122311201381, guid: c98830a6bebcdc24b91c550a26c9b621, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4815066122311201381, guid: c98830a6bebcdc24b91c550a26c9b621, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4815066122311201381, guid: c98830a6bebcdc24b91c550a26c9b621, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4815066122311201381, guid: c98830a6bebcdc24b91c550a26c9b621, + type: 3} + propertyPath: m_RootOrder + value: 13 + objectReference: {fileID: 0} + - target: {fileID: 4815066122311201381, guid: c98830a6bebcdc24b91c550a26c9b621, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4815066122311201381, guid: c98830a6bebcdc24b91c550a26c9b621, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4815066122311201381, guid: c98830a6bebcdc24b91c550a26c9b621, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4815066122311201381, guid: c98830a6bebcdc24b91c550a26c9b621, + type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c98830a6bebcdc24b91c550a26c9b621, type: 3} +--- !u!4 &1550570322 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4815066122311201381, guid: c98830a6bebcdc24b91c550a26c9b621, + type: 3} + m_PrefabInstance: {fileID: 1550570321} + m_PrefabAsset: {fileID: 0} --- !u!4 &1633849203 stripped Transform: m_CorrespondingSourceObject: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, @@ -47979,7 +48404,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1671840916} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -9, y: 0, z: 0} + m_LocalPosition: {x: 120, y: -18, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1008122163} @@ -48118,6 +48543,126 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1001 &1675027072 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1692173778} + m_Modifications: + - target: {fileID: 1518483160148691188, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_BodyType + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1747974818995494046, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_SortingLayerID + value: -115631929 + objectReference: {fileID: 0} + - target: {fileID: 1747974818995494046, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_SortingLayer + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5520736153122788072, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_Offset.x + value: 0.032886505 + objectReference: {fileID: 0} + - target: {fileID: 5520736153122788072, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_Size.x + value: 0.95738983 + objectReference: {fileID: 0} + - target: {fileID: 5520736153122788072, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_Offset.y + value: -0.51 + objectReference: {fileID: 0} + - target: {fileID: 5520736153122788072, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_Size.y + value: 1.31913 + objectReference: {fileID: 0} + - target: {fileID: 5520736153122788072, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_IsTrigger + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6870250841519595495, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_Name + value: Coffee + objectReference: {fileID: 0} + - target: {fileID: 6870250841519595495, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_TagString + value: Coffee + objectReference: {fileID: 0} + - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_LocalPosition.x + value: 31 + objectReference: {fileID: 0} + - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_RootOrder + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} +--- !u!4 &1675027073 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + m_PrefabInstance: {fileID: 1675027072} + m_PrefabAsset: {fileID: 0} --- !u!1 &1692173776 GameObject: m_ObjectHideFlags: 0 @@ -48159,12 +48704,15 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 852262087} - - {fileID: 661251797} - {fileID: 439930394} - {fileID: 1988411914} - {fileID: 1633849203} - {fileID: 1031922257} - {fileID: 856721814} + - {fileID: 1244787352} + - {fileID: 730216394} + - {fileID: 1675027073} + - {fileID: 2078084725} m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -48238,7 +48786,7 @@ PrefabInstance: - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} propertyPath: m_RootOrder - value: 3 + value: 2 objectReference: {fileID: 0} - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} @@ -48822,7 +49370,7 @@ PrefabInstance: - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} propertyPath: m_RootOrder - value: 4 + value: 3 objectReference: {fileID: 0} - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} @@ -48911,7 +49459,7 @@ PrefabInstance: - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} propertyPath: m_RootOrder - value: 5 + value: 4 objectReference: {fileID: 0} - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} @@ -48930,6 +49478,126 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} +--- !u!1001 &2078084724 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1692173778} + m_Modifications: + - target: {fileID: 1518483160148691188, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_BodyType + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1747974818995494046, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_SortingLayerID + value: -115631929 + objectReference: {fileID: 0} + - target: {fileID: 1747974818995494046, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_SortingLayer + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5520736153122788072, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_Offset.x + value: 0.032886505 + objectReference: {fileID: 0} + - target: {fileID: 5520736153122788072, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_Size.x + value: 0.95738983 + objectReference: {fileID: 0} + - target: {fileID: 5520736153122788072, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_Offset.y + value: -0.51 + objectReference: {fileID: 0} + - target: {fileID: 5520736153122788072, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_Size.y + value: 1.31913 + objectReference: {fileID: 0} + - target: {fileID: 5520736153122788072, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_IsTrigger + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6870250841519595495, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_Name + value: Coffee + objectReference: {fileID: 0} + - target: {fileID: 6870250841519595495, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_TagString + value: Coffee + objectReference: {fileID: 0} + - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_LocalPosition.x + value: 134 + objectReference: {fileID: 0} + - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_LocalPosition.y + value: -10.5 + objectReference: {fileID: 0} + - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_RootOrder + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} +--- !u!4 &2078084725 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + m_PrefabInstance: {fileID: 2078084724} + m_PrefabAsset: {fileID: 0} --- !u!1 &2086987803 GameObject: m_ObjectHideFlags: 0 @@ -49080,7 +49748,7 @@ PrefabInstance: - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} propertyPath: m_RootOrder - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} diff --git a/Assets/Scripts/Player.cs b/Assets/Scripts/Player.cs index 9500fed..e92b974 100644 --- a/Assets/Scripts/Player.cs +++ b/Assets/Scripts/Player.cs @@ -15,7 +15,7 @@ public class Player : MonoBehaviour [SerializeField] private float runErrorThreshold = 0.05f; [SerializeField] private int startHealth = 3; [SerializeField] private int startStamina = 100; - [SerializeField] private int coffeValuePercent = 10; + [SerializeField] private int coffeValuePercent = 18; [SerializeField] private int bugStaminaDamagePercent = 15; [SerializeField] private float hurtVelocity = 15f; [SerializeField] private int fightSoundLength = 5;