diff --git a/.vs/GlobalGameJame/v16/Server/sqlite3/storage.ide b/.vs/GlobalGameJame/v16/Server/sqlite3/storage.ide index 3260203..78c4325 100644 Binary files a/.vs/GlobalGameJame/v16/Server/sqlite3/storage.ide and b/.vs/GlobalGameJame/v16/Server/sqlite3/storage.ide differ diff --git a/Assets/Prefabs/PillsObject.prefab b/Assets/Prefabs/PillsObject.prefab new file mode 100644 index 0000000..4991d43 --- /dev/null +++ b/Assets/Prefabs/PillsObject.prefab @@ -0,0 +1,157 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3435627263884782620 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3435627263884782622} + - component: {fileID: 3435627263884782623} + - component: {fileID: 3435627263884782617} + m_Layer: 0 + m_Name: PillsObject + m_TagString: Interact + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3435627263884782622 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3435627263884782620} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.008133344, y: 1.265739, z: -2.023658} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 8352172027178710535} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3435627263884782623 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3435627263884782620} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a26079dbac7f3cd4bacb95972241b8cb, type: 3} + m_Name: + m_EditorClassIdentifier: + blockType: 6 + health: 30 + healthRate: 15 + amountModels: [] + pills: {fileID: 5022562433003553812} + prefabPills: {fileID: 8423879596285337014, guid: d946f9dd565b97e49919fc8bd91aae4e, + type: 3} + spawnPillsPoint: {x: 0.008133344, y: 1.265739, z: -2.023658} + audioSource: {fileID: 0} + doorSound: {fileID: 0} +--- !u!65 &3435627263884782617 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3435627263884782620} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 0.2, y: 0.4, z: 0.2} + m_Center: {x: 0, y: 0.15, z: 0} +--- !u!1001 &3554492602056808866 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 3435627263884782622} + m_Modifications: + - target: {fileID: 4808991200749645733, guid: d946f9dd565b97e49919fc8bd91aae4e, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4808991200749645733, guid: d946f9dd565b97e49919fc8bd91aae4e, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4808991200749645733, guid: d946f9dd565b97e49919fc8bd91aae4e, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4808991200749645733, guid: d946f9dd565b97e49919fc8bd91aae4e, + type: 3} + propertyPath: m_LocalRotation.x + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 4808991200749645733, guid: d946f9dd565b97e49919fc8bd91aae4e, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4808991200749645733, guid: d946f9dd565b97e49919fc8bd91aae4e, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4808991200749645733, guid: d946f9dd565b97e49919fc8bd91aae4e, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 4808991200749645733, guid: d946f9dd565b97e49919fc8bd91aae4e, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4808991200749645733, guid: d946f9dd565b97e49919fc8bd91aae4e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 4808991200749645733, guid: d946f9dd565b97e49919fc8bd91aae4e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4808991200749645733, guid: d946f9dd565b97e49919fc8bd91aae4e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7843994914498914666, guid: d946f9dd565b97e49919fc8bd91aae4e, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 362f55bd6cc53b74dbd4f875ded5b5f1, type: 2} + - target: {fileID: 8423879596285337014, guid: d946f9dd565b97e49919fc8bd91aae4e, + type: 3} + propertyPath: m_Name + value: painkillers + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 5689278253577398147, guid: d946f9dd565b97e49919fc8bd91aae4e, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: d946f9dd565b97e49919fc8bd91aae4e, type: 3} +--- !u!1 &5022562433003553812 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8423879596285337014, guid: d946f9dd565b97e49919fc8bd91aae4e, + type: 3} + m_PrefabInstance: {fileID: 3554492602056808866} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8352172027178710535 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4808991200749645733, guid: d946f9dd565b97e49919fc8bd91aae4e, + type: 3} + m_PrefabInstance: {fileID: 3554492602056808866} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/PillsObject.prefab.meta b/Assets/Prefabs/PillsObject.prefab.meta new file mode 100644 index 0000000..f3a03f5 --- /dev/null +++ b/Assets/Prefabs/PillsObject.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 51b65bc1216f2c4469761bc1039bfce1 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab index e01ba26..b9f16fc 100644 --- a/Assets/Prefabs/Player.prefab +++ b/Assets/Prefabs/Player.prefab @@ -44,7 +44,7 @@ AudioSource: OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 0} m_PlayOnAwake: 1 - m_Volume: 1 + m_Volume: 0.05 m_Pitch: 1 Loop: 0 Mute: 0 @@ -141,8 +141,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: musicSource: {fileID: 5981860502065413816} - DayMusic: {fileID: 0} - NightMusic: {fileID: 0} + DayMusic: {fileID: 8300000, guid: dbd637c87d6302e47b3dc18075b6de89, type: 3} + NightMusic: {fileID: 8300000, guid: 2565765545848aa4daee89afd5ea506b, type: 3} Sun: {fileID: 0} --- !u!1 &7985979212931499537 GameObject: @@ -192,10 +192,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 885220d038aa1a6468127c63dd90a926, type: 3} m_Name: m_EditorClassIdentifier: - speed: 10 - runSpeed: 25 + speed: 5 + runSpeed: 10 rotateSpeed: 5 - mouseSensitive: 200 + mouseSensitive: 50 buildRate: 0.5 health: 100 actualHealth: 100 @@ -204,11 +204,14 @@ MonoBehaviour: weaponList: - {fileID: 2179056336067526865, guid: 666835f3de085f9409e62598a45208bf, type: 3} - {fileID: 2587956328074680696, guid: 4ce5febc0b514174abbed9882322d1ed, type: 3} + - {fileID: 7279375804173823597, guid: f7f441e621e5e5f40b11b7617756a0af, type: 3} spikes: {fileID: 1999182813209888360, guid: 7933df0606f61e94e9008c58a313b22c, type: 3} spikesImage: {fileID: 21300000, guid: 4962f21e920045b47be23a8e53f5716b, type: 3} handImage: {fileID: 21300000, guid: 53484c385de7af24a87aa73334775b28, type: 3} guiManager: {fileID: 0} selectedWeapon: 0 + audio: {fileID: 532783939} + lose: {fileID: 8300000, guid: 82c454fc5bd3770438a50747eec0fc06, type: 3} --- !u!136 &7985979212931499551 CapsuleCollider: m_ObjectHideFlags: 0 @@ -251,7 +254,7 @@ AudioSource: OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 0} m_PlayOnAwake: 1 - m_Volume: 1 + m_Volume: 0.5 m_Pitch: 1 Loop: 0 Mute: 0 diff --git a/Assets/Prefabs/Weapon_1.prefab b/Assets/Prefabs/Weapon_1.prefab index 37269d9..e20200c 100644 --- a/Assets/Prefabs/Weapon_1.prefab +++ b/Assets/Prefabs/Weapon_1.prefab @@ -51,8 +51,9 @@ MonoBehaviour: spawnShoot: {fileID: 4234349944776735638} particleShoot: {fileID: 9220017394946394338, guid: 6480cbf8d57433a49b5d77875ceb391c, type: 3} - damage: 8 + damage: 15 fireRate: 0.5 + ammoCost: 2 animator: {fileID: 0} player: {fileID: 0} hit: 0 @@ -79,7 +80,7 @@ AudioSource: SpatializePostEffects: 0 Priority: 128 DopplerLevel: 1 - MinDistance: 1 + MinDistance: 1.705212 MaxDistance: 500 Pan2D: 0 rolloffMode: 0 diff --git a/Assets/Prefabs/Weapon_2.prefab b/Assets/Prefabs/Weapon_2.prefab index e2f2a5d..124edf0 100644 --- a/Assets/Prefabs/Weapon_2.prefab +++ b/Assets/Prefabs/Weapon_2.prefab @@ -66,11 +66,12 @@ MonoBehaviour: particleShoot: {fileID: 0} damage: 50 fireRate: 0.1 + ammoCost: 2 animator: {fileID: 562605605} player: {fileID: 0} hit: 0 audioSource: {fileID: 0} - shootSound: {fileID: 0} + shootSound: [] --- !u!1 &2587956328074680696 GameObject: m_ObjectHideFlags: 0 @@ -119,13 +120,14 @@ MonoBehaviour: weaponRange: 2 spawnShoot: {fileID: 0} particleShoot: {fileID: 0} - damage: 25 + damage: 50 fireRate: 0.1 + ammoCost: 2 animator: {fileID: 562605605} player: {fileID: 0} hit: 0 audioSource: {fileID: 0} - shootSound: {fileID: 0} + shootSound: [] --- !u!1001 &8629712593250585003 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Weapon_3.prefab b/Assets/Prefabs/Weapon_3.prefab index 87df254..997206f 100644 --- a/Assets/Prefabs/Weapon_3.prefab +++ b/Assets/Prefabs/Weapon_3.prefab @@ -203,7 +203,7 @@ AudioSource: SpatializePostEffects: 0 Priority: 128 DopplerLevel: 1 - MinDistance: 1 + MinDistance: 2.4825754 MaxDistance: 500 Pan2D: 0 rolloffMode: 0 diff --git a/Assets/Prefabs/ammo_box.prefab b/Assets/Prefabs/ammo_box.prefab index c504438..7d5ae3c 100644 --- a/Assets/Prefabs/ammo_box.prefab +++ b/Assets/Prefabs/ammo_box.prefab @@ -253,6 +253,9 @@ MonoBehaviour: - {fileID: 8452048823607473439} - {fileID: 5205200862043998919} - {fileID: 4443642083919416725} + pills: {fileID: 0} + prefabPills: {fileID: 0} + spawnPillsPoint: {x: 0, y: 0, z: 0} audioSource: {fileID: 0} doorSound: {fileID: 0} --- !u!65 &8296172667468284673 diff --git a/Assets/Prefabs/camp_fire.prefab b/Assets/Prefabs/camp_fire.prefab index 817a9dc..5bc5de6 100644 --- a/Assets/Prefabs/camp_fire.prefab +++ b/Assets/Prefabs/camp_fire.prefab @@ -5568,6 +5568,8 @@ GameObject: m_Component: - component: {fileID: 5775934073915093630} - component: {fileID: 1536441875377869462} + - component: {fileID: 1210041720} + - component: {fileID: 1210041719} m_Layer: 0 m_Name: camp_fire m_TagString: Untagged @@ -5618,8 +5620,43 @@ MonoBehaviour: health: 100 healthRate: 5 amountModels: [] + pills: {fileID: 0} + prefabPills: {fileID: 0} + spawnPillsPoint: {x: 0, y: 0, z: 0} audioSource: {fileID: 0} doorSound: {fileID: 0} +--- !u!208 &1210041720 +NavMeshObstacle: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7382354890369941613} + m_Enabled: 1 + serializedVersion: 3 + m_Shape: 0 + m_Extents: {x: 5.5, y: 2.5, z: 5.5} + m_MoveThreshold: 0.1 + m_Carve: 0 + m_CarveOnlyStationary: 1 + m_Center: {x: 1, y: 0, z: 0} + m_TimeToStationary: 0.5 +--- !u!114 &1210041719 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7382354890369941613} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b0314a14d6c40f643bdaaf2fb3e0228d, type: 3} + m_Name: + m_EditorClassIdentifier: + parentParticle: {fileID: 1536441875314504533} + activeInDay: 0 + activeInNight: 1 + dayManager: {fileID: 0} --- !u!1 &7816027402426589345 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/PlayScene.unity b/Assets/Scenes/PlayScene.unity index 75cf888..0bd3f77 100644 --- a/Assets/Scenes/PlayScene.unity +++ b/Assets/Scenes/PlayScene.unity @@ -121,6 +121,75 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 23800000, guid: 210c0a45ca7dddb429c704640ac83479, type: 2} +--- !u!1001 &158086489 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3435627263884782620, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_Name + value: PillsObject (4) + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalPosition.x + value: -13.213615 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalPosition.y + value: -2.2976084 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalPosition.z + value: 43.361923 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 51b65bc1216f2c4469761bc1039bfce1, type: 3} --- !u!1 &158876903 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1536441875314504533, guid: 82f30cc3e62668541884fb7b59b793b6, @@ -177,7 +246,7 @@ PrefabInstance: - target: {fileID: 1064119418816636838, guid: d2947b7cd556cb74f84ecd7339936f32, type: 3} propertyPath: m_RootOrder - value: 18 + value: 24 objectReference: {fileID: 0} - target: {fileID: 1064119418816636838, guid: d2947b7cd556cb74f84ecd7339936f32, type: 3} @@ -246,7 +315,7 @@ PrefabInstance: - target: {fileID: 1064119418816636838, guid: d2947b7cd556cb74f84ecd7339936f32, type: 3} propertyPath: m_RootOrder - value: 20 + value: 27 objectReference: {fileID: 0} - target: {fileID: 1064119418816636838, guid: d2947b7cd556cb74f84ecd7339936f32, type: 3} @@ -315,7 +384,7 @@ PrefabInstance: - target: {fileID: 1064119418816636838, guid: d2947b7cd556cb74f84ecd7339936f32, type: 3} propertyPath: m_RootOrder - value: 21 + value: 28 objectReference: {fileID: 0} - target: {fileID: 1064119418816636838, guid: d2947b7cd556cb74f84ecd7339936f32, type: 3} @@ -472,7 +541,7 @@ PrefabInstance: - target: {fileID: -4216859302048453862, guid: 187e7593e510e0445b95707cb14176d6, type: 3} propertyPath: m_RootOrder - value: 12 + value: 18 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: 187e7593e510e0445b95707cb14176d6, type: 3} @@ -516,6 +585,75 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 187e7593e510e0445b95707cb14176d6, type: 3} +--- !u!1001 &517682423 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3435627263884782620, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_Name + value: PillsObject (3) + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalPosition.x + value: 23.96904 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.08828926 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalPosition.z + value: 23.601364 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 51b65bc1216f2c4469761bc1039bfce1, type: 3} --- !u!1001 &522161419 PrefabInstance: m_ObjectHideFlags: 0 @@ -571,7 +709,7 @@ PrefabInstance: - target: {fileID: 3734911236611146652, guid: f614b02c1b25fce4ba5bee61a982ff4f, type: 3} propertyPath: m_RootOrder - value: 6 + value: 12 objectReference: {fileID: 0} - target: {fileID: 3734911236611146652, guid: f614b02c1b25fce4ba5bee61a982ff4f, type: 3} @@ -855,8 +993,9 @@ RectTransform: - {fileID: 1692949638} - {fileID: 1327297297} - {fileID: 1191888897} + - {fileID: 1368020646} m_Father: {fileID: 0} - m_RootOrder: 32 + m_RootOrder: 38 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -879,6 +1018,7 @@ MonoBehaviour: Wood: {fileID: 863154880} Ammo: {fileID: 802293425} healthBar: {fileID: 562374831} + waves: {fileID: 1942255809} --- !u!1001 &591872493 PrefabInstance: m_ObjectHideFlags: 0 @@ -929,7 +1069,7 @@ PrefabInstance: - target: {fileID: 1064119418816636838, guid: d2947b7cd556cb74f84ecd7339936f32, type: 3} propertyPath: m_RootOrder - value: 19 + value: 25 objectReference: {fileID: 0} - target: {fileID: 1064119418816636838, guid: d2947b7cd556cb74f84ecd7339936f32, type: 3} @@ -993,7 +1133,7 @@ PrefabInstance: - target: {fileID: 759113255365536963, guid: a9ed136ba2be534419d4299db71802df, type: 3} propertyPath: m_RootOrder - value: 1 + value: 7 objectReference: {fileID: 0} - target: {fileID: 759113255365536963, guid: a9ed136ba2be534419d4299db71802df, type: 3} @@ -1023,6 +1163,75 @@ Transform: type: 3} m_PrefabInstance: {fileID: 591872493} m_PrefabAsset: {fileID: 0} +--- !u!1001 &700603880 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3435627263884782620, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_Name + value: PillsObject (6) + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalPosition.x + value: -25.458845 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.53990936 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalPosition.z + value: -24.259186 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 51b65bc1216f2c4469761bc1039bfce1, type: 3} --- !u!1 &747164718 stripped GameObject: m_CorrespondingSourceObject: {fileID: 5974751188148447902, guid: 17027e96daa46634eac3c9bcf07b06b0, @@ -1106,7 +1315,7 @@ PrefabInstance: - target: {fileID: 3734911236611146652, guid: f614b02c1b25fce4ba5bee61a982ff4f, type: 3} propertyPath: m_RootOrder - value: 7 + value: 13 objectReference: {fileID: 0} - target: {fileID: 3734911236611146652, guid: f614b02c1b25fce4ba5bee61a982ff4f, type: 3} @@ -1217,7 +1426,7 @@ Transform: m_LocalScale: {x: 100, y: 100, z: 100} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 33 + m_RootOrder: 39 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &787940993 PrefabInstance: @@ -1274,7 +1483,7 @@ PrefabInstance: - target: {fileID: 3734911236611146652, guid: f614b02c1b25fce4ba5bee61a982ff4f, type: 3} propertyPath: m_RootOrder - value: 4 + value: 10 objectReference: {fileID: 0} - target: {fileID: 3734911236611146652, guid: f614b02c1b25fce4ba5bee61a982ff4f, type: 3} @@ -1370,6 +1579,12 @@ RectTransform: m_AnchoredPosition: {x: 40, y: 40} m_SizeDelta: {x: 150, y: 150} m_Pivot: {x: 0, y: 0} +--- !u!82 &824965140 stripped +AudioSource: + m_CorrespondingSourceObject: {fileID: 5981860502065413816, guid: 204c7411afdd01a478b1a1e25607d50c, + type: 3} + m_PrefabInstance: {fileID: 7985979212702423926} + m_PrefabAsset: {fileID: 0} --- !u!1 &863154877 GameObject: m_ObjectHideFlags: 0 @@ -1502,7 +1717,7 @@ PrefabInstance: - target: {fileID: 3734911236611146652, guid: f614b02c1b25fce4ba5bee61a982ff4f, type: 3} propertyPath: m_RootOrder - value: 2 + value: 8 objectReference: {fileID: 0} - target: {fileID: 3734911236611146652, guid: f614b02c1b25fce4ba5bee61a982ff4f, type: 3} @@ -1521,6 +1736,75 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f614b02c1b25fce4ba5bee61a982ff4f, type: 3} +--- !u!1001 &900690521 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3435627263884782620, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_Name + value: PillsObject (1) + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalPosition.x + value: -11.065693 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.0018310547 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalPosition.z + value: -24.562832 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_RootOrder + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 51b65bc1216f2c4469761bc1039bfce1, type: 3} --- !u!1001 &1011884372 PrefabInstance: m_ObjectHideFlags: 0 @@ -1590,7 +1874,7 @@ PrefabInstance: - target: {fileID: 5775934073915093630, guid: 82f30cc3e62668541884fb7b59b793b6, type: 3} propertyPath: m_RootOrder - value: 15 + value: 21 objectReference: {fileID: 0} - target: {fileID: 5775934073915093630, guid: 82f30cc3e62668541884fb7b59b793b6, type: 3} @@ -1614,6 +1898,75 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 82f30cc3e62668541884fb7b59b793b6, type: 3} +--- !u!1001 &1083353202 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3435627263884782620, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_Name + value: PillsObject (2) + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalPosition.x + value: 45.40143 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalPosition.y + value: -3.5726056 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalPosition.z + value: -13.354382 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 51b65bc1216f2c4469761bc1039bfce1, type: 3} --- !u!4 &1090758819 stripped Transform: m_CorrespondingSourceObject: {fileID: 759113255365536963, guid: a9ed136ba2be534419d4299db71802df, @@ -1684,7 +2037,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 29 + m_RootOrder: 35 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &1131703976 stripped Transform: @@ -6565,7 +6918,7 @@ PrefabInstance: - target: {fileID: -4216859302048453862, guid: 01af5eaeb15b4cf469b3d5c80775fd22, type: 3} propertyPath: m_RootOrder - value: 13 + value: 19 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: 01af5eaeb15b4cf469b3d5c80775fd22, type: 3} @@ -6773,6 +7126,80 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 19bf5b78376a3b94882c1e26afe7c633, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1368020645 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1368020646} + - component: {fileID: 1368020648} + - component: {fileID: 1368020647} + m_Layer: 5 + m_Name: Panel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1368020646 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1368020645} + 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: 1942255811} + m_Father: {fileID: 587476773} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -70} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 1} +--- !u!114 &1368020647 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1368020645} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: aca2defce6c6d644bb6e1a60a2ddae23, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1368020648 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1368020645} + m_CullTransparentMesh: 0 --- !u!1001 &1433009970 PrefabInstance: m_ObjectHideFlags: 0 @@ -6828,7 +7255,7 @@ PrefabInstance: - target: {fileID: 3734911236611146652, guid: f614b02c1b25fce4ba5bee61a982ff4f, type: 3} propertyPath: m_RootOrder - value: 5 + value: 11 objectReference: {fileID: 0} - target: {fileID: 3734911236611146652, guid: f614b02c1b25fce4ba5bee61a982ff4f, type: 3} @@ -6847,6 +7274,75 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f614b02c1b25fce4ba5bee61a982ff4f, type: 3} +--- !u!1001 &1528993452 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3435627263884782620, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_Name + value: PillsObject (5) + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalPosition.x + value: -30.904196 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.33564377 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalPosition.z + value: 21.493011 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 51b65bc1216f2c4469761bc1039bfce1, type: 3} --- !u!1001 &1603512920 PrefabInstance: m_ObjectHideFlags: 0 @@ -6892,7 +7388,7 @@ PrefabInstance: - target: {fileID: -4216859302048453862, guid: ec72b044b4a1b8848bcd8dec5bfb74f5, type: 3} propertyPath: m_RootOrder - value: 17 + value: 23 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: ec72b044b4a1b8848bcd8dec5bfb74f5, type: 3} @@ -7109,7 +7605,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 28 + m_RootOrder: 34 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1765588425 PrefabInstance: @@ -7156,7 +7652,7 @@ PrefabInstance: - target: {fileID: -4216859302048453862, guid: b5a9b7f0ff35a024b974960e652c8e33, type: 3} propertyPath: m_RootOrder - value: 16 + value: 22 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: b5a9b7f0ff35a024b974960e652c8e33, type: 3} @@ -7241,6 +7737,7 @@ MonoBehaviour: m_EditorClassIdentifier: enemyList: - {fileID: 3545622996904709018, guid: b4e392e2cdb417b4c8bdf8e683bceb9b, type: 3} + - {fileID: 8155479231926181706, guid: c3421148b2471cb448b7e8fe5e20058f, type: 3} spawnPoints: - {fileID: 752538979} - {fileID: 1131703976} @@ -7260,7 +7757,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 31 + m_RootOrder: 37 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1814508279 stripped GameObject: @@ -7337,7 +7834,7 @@ PrefabInstance: - target: {fileID: 3734911236611146652, guid: f614b02c1b25fce4ba5bee61a982ff4f, type: 3} propertyPath: m_RootOrder - value: 9 + value: 15 objectReference: {fileID: 0} - target: {fileID: 3734911236611146652, guid: f614b02c1b25fce4ba5bee61a982ff4f, type: 3} @@ -7411,7 +7908,7 @@ PrefabInstance: - target: {fileID: 3734911236611146652, guid: f614b02c1b25fce4ba5bee61a982ff4f, type: 3} propertyPath: m_RootOrder - value: 11 + value: 17 objectReference: {fileID: 0} - target: {fileID: 3734911236611146652, guid: f614b02c1b25fce4ba5bee61a982ff4f, type: 3} @@ -7482,7 +7979,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 30 + m_RootOrder: 36 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1922663893 PrefabInstance: @@ -7511,6 +8008,11 @@ PrefabInstance: propertyPath: m_Enabled value: 1 objectReference: {fileID: 0} + - target: {fileID: 5536355216553759363, guid: b5bdffdb5058d5e458831042023d3abc, + type: 3} + propertyPath: guiManager + value: + objectReference: {fileID: 587476774} - target: {fileID: 8150345748488139401, guid: b5bdffdb5058d5e458831042023d3abc, type: 3} propertyPath: m_Name @@ -7639,7 +8141,7 @@ PrefabInstance: - target: {fileID: 8150345748488139403, guid: b5bdffdb5058d5e458831042023d3abc, type: 3} propertyPath: m_RootOrder - value: 25 + value: 32 objectReference: {fileID: 0} - target: {fileID: 8150345748488139403, guid: b5bdffdb5058d5e458831042023d3abc, type: 3} @@ -7713,7 +8215,7 @@ PrefabInstance: - target: {fileID: 3734911236611146652, guid: f614b02c1b25fce4ba5bee61a982ff4f, type: 3} propertyPath: m_RootOrder - value: 3 + value: 9 objectReference: {fileID: 0} - target: {fileID: 3734911236611146652, guid: f614b02c1b25fce4ba5bee61a982ff4f, type: 3} @@ -7732,7 +8234,7 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f614b02c1b25fce4ba5bee61a982ff4f, type: 3} ---- !u!1 &1990836489 +--- !u!1 &1942255808 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -7740,66 +8242,75 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1990836491} - - component: {fileID: 1990836490} - - component: {fileID: 1990836492} - m_Layer: 0 - m_Name: PillsObject - m_TagString: Interact + - component: {fileID: 1942255811} + - component: {fileID: 1942255810} + - component: {fileID: 1942255809} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &1990836490 +--- !u!114 &1942255809 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1990836489} + m_GameObject: {fileID: 1942255808} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a26079dbac7f3cd4bacb95972241b8cb, type: 3} + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: - blockType: 6 - health: 30 - healthRate: 15 - amountModels: [] - pills: {fileID: 7646678029089908993} - prefabPills: {fileID: 8423879596285337014, guid: d946f9dd565b97e49919fc8bd91aae4e, - type: 3} - spawnPillsPoint: {x: 0.008133344, y: 1.265739, z: -2.023658} - audioSource: {fileID: 0} - doorSound: {fileID: 0} ---- !u!4 &1990836491 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1990836489} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.008133344, y: 1.265739, z: -2.023658} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 6648769901767351058} - m_Father: {fileID: 0} - m_RootOrder: 34 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!65 &1990836492 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1990836489} m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 0.2, y: 0.4, z: 0.2} - m_Center: {x: 0, y: 0.15, z: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 20 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 1 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: +--- !u!222 &1942255810 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1942255808} + m_CullTransparentMesh: 0 +--- !u!224 &1942255811 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1942255808} + 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: 1368020646} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -3.8} + m_SizeDelta: {x: 130, y: 24} + m_Pivot: {x: 0.5, y: 1} --- !u!1 &2079126252 stripped GameObject: m_CorrespondingSourceObject: {fileID: 835007492758508419, guid: 5322794fa1699704b8e50a14cef106b1, @@ -7941,83 +8452,8 @@ Transform: m_Children: - {fileID: 1139190780} m_Father: {fileID: 0} - m_RootOrder: 27 + m_RootOrder: 33 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &2232049265454068919 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1990836491} - m_Modifications: - - target: {fileID: 4808991200749645733, guid: d946f9dd565b97e49919fc8bd91aae4e, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4808991200749645733, guid: d946f9dd565b97e49919fc8bd91aae4e, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4808991200749645733, guid: d946f9dd565b97e49919fc8bd91aae4e, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4808991200749645733, guid: d946f9dd565b97e49919fc8bd91aae4e, - type: 3} - propertyPath: m_LocalRotation.x - value: -0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 4808991200749645733, guid: d946f9dd565b97e49919fc8bd91aae4e, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4808991200749645733, guid: d946f9dd565b97e49919fc8bd91aae4e, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4808991200749645733, guid: d946f9dd565b97e49919fc8bd91aae4e, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 4808991200749645733, guid: d946f9dd565b97e49919fc8bd91aae4e, - type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4808991200749645733, guid: d946f9dd565b97e49919fc8bd91aae4e, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: -90 - objectReference: {fileID: 0} - - target: {fileID: 4808991200749645733, guid: d946f9dd565b97e49919fc8bd91aae4e, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4808991200749645733, guid: d946f9dd565b97e49919fc8bd91aae4e, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7843994914498914666, guid: d946f9dd565b97e49919fc8bd91aae4e, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 362f55bd6cc53b74dbd4f875ded5b5f1, type: 2} - - target: {fileID: 8423879596285337014, guid: d946f9dd565b97e49919fc8bd91aae4e, - type: 3} - propertyPath: m_Name - value: painkillers - objectReference: {fileID: 0} - m_RemovedComponents: - - {fileID: 5689278253577398147, guid: d946f9dd565b97e49919fc8bd91aae4e, type: 3} - m_SourcePrefab: {fileID: 100100000, guid: d946f9dd565b97e49919fc8bd91aae4e, type: 3} --- !u!1001 &2435173729303179787 PrefabInstance: m_ObjectHideFlags: 0 @@ -8068,7 +8504,7 @@ PrefabInstance: - target: {fileID: 7255806235893078157, guid: 17027e96daa46634eac3c9bcf07b06b0, type: 3} propertyPath: m_RootOrder - value: 22 + value: 29 objectReference: {fileID: 0} - target: {fileID: 7255806235893078157, guid: 17027e96daa46634eac3c9bcf07b06b0, type: 3} @@ -8247,7 +8683,7 @@ PrefabInstance: - target: {fileID: 3734911236611146652, guid: f614b02c1b25fce4ba5bee61a982ff4f, type: 3} propertyPath: m_RootOrder - value: 8 + value: 14 objectReference: {fileID: 0} - target: {fileID: 3734911236611146652, guid: f614b02c1b25fce4ba5bee61a982ff4f, type: 3} @@ -8266,6 +8702,75 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f614b02c1b25fce4ba5bee61a982ff4f, type: 3} +--- !u!1001 &3435627264125316373 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3435627263884782620, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_Name + value: PillsObject + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.008133344 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalPosition.y + value: 1.265739 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalPosition.z + value: -2.023658 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_RootOrder + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3435627263884782622, guid: 51b65bc1216f2c4469761bc1039bfce1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 51b65bc1216f2c4469761bc1039bfce1, type: 3} --- !u!1001 &5702864032930705300 PrefabInstance: m_ObjectHideFlags: 0 @@ -8311,7 +8816,7 @@ PrefabInstance: - target: {fileID: 5702864032601655364, guid: 92320a40631a69845b70cc43c23a3681, type: 3} propertyPath: m_RootOrder - value: 14 + value: 20 objectReference: {fileID: 0} - target: {fileID: 5702864032601655364, guid: 92320a40631a69845b70cc43c23a3681, type: 3} @@ -8385,7 +8890,7 @@ PrefabInstance: - target: {fileID: 759113255365536963, guid: a9ed136ba2be534419d4299db71802df, type: 3} propertyPath: m_RootOrder - value: 23 + value: 30 objectReference: {fileID: 0} - target: {fileID: 759113255365536963, guid: a9ed136ba2be534419d4299db71802df, type: 3} @@ -8744,7 +9249,7 @@ PrefabInstance: - target: {fileID: 7425287328957043289, guid: 5322794fa1699704b8e50a14cef106b1, type: 3} propertyPath: m_RootOrder - value: 24 + value: 31 objectReference: {fileID: 0} - target: {fileID: 7425287328957043289, guid: 5322794fa1699704b8e50a14cef106b1, type: 3} @@ -8822,18 +9327,6 @@ PrefabInstance: - {fileID: 4090411522576814766, guid: 5322794fa1699704b8e50a14cef106b1, type: 3} - {fileID: 7851948758291723579, guid: 5322794fa1699704b8e50a14cef106b1, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 5322794fa1699704b8e50a14cef106b1, type: 3} ---- !u!4 &6648769901767351058 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4808991200749645733, guid: d946f9dd565b97e49919fc8bd91aae4e, - type: 3} - m_PrefabInstance: {fileID: 2232049265454068919} - m_PrefabAsset: {fileID: 0} ---- !u!1 &7646678029089908993 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 8423879596285337014, guid: d946f9dd565b97e49919fc8bd91aae4e, - type: 3} - m_PrefabInstance: {fileID: 2232049265454068919} - m_PrefabAsset: {fileID: 0} --- !u!1001 &7985979212702423926 PrefabInstance: m_ObjectHideFlags: 0 @@ -8842,54 +9335,41 @@ PrefabInstance: m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 532783939, guid: 204c7411afdd01a478b1a1e25607d50c, type: 3} - propertyPath: m_Volume - value: 0.5 + propertyPath: MinDistance + value: 3.2005157 + objectReference: {fileID: 0} + - target: {fileID: 532783939, guid: 204c7411afdd01a478b1a1e25607d50c, type: 3} + propertyPath: m_Volume + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 532783939, guid: 204c7411afdd01a478b1a1e25607d50c, type: 3} + propertyPath: Priority + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 532783939, guid: 204c7411afdd01a478b1a1e25607d50c, type: 3} + propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value + value: 1 objectReference: {fileID: 0} - - target: {fileID: 4607742650766078089, guid: 204c7411afdd01a478b1a1e25607d50c, - type: 3} - propertyPath: NightMusic - value: - objectReference: {fileID: 8300000, guid: 2565765545848aa4daee89afd5ea506b, type: 3} - - target: {fileID: 4607742650766078089, guid: 204c7411afdd01a478b1a1e25607d50c, - type: 3} - propertyPath: DayMusic - value: - objectReference: {fileID: 8300000, guid: dbd637c87d6302e47b3dc18075b6de89, type: 3} - target: {fileID: 4607742650766078089, guid: 204c7411afdd01a478b1a1e25607d50c, type: 3} propertyPath: Sun value: objectReference: {fileID: 1345459422} - - target: {fileID: 5981860502065413816, guid: 204c7411afdd01a478b1a1e25607d50c, - type: 3} - propertyPath: Loop - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5981860502065413816, guid: 204c7411afdd01a478b1a1e25607d50c, - type: 3} - propertyPath: Priority - value: 128 - objectReference: {fileID: 0} - target: {fileID: 5981860502065413816, guid: 204c7411afdd01a478b1a1e25607d50c, type: 3} propertyPath: m_Volume - value: 0.05 + value: 0.08 objectReference: {fileID: 0} - target: {fileID: 6900128296167351179, guid: 204c7411afdd01a478b1a1e25607d50c, type: 3} - propertyPath: m_LocalPosition.x - value: 0 + propertyPath: m_LocalPosition.y + value: 1.796 objectReference: {fileID: 0} - target: {fileID: 7985979212931499537, guid: 204c7411afdd01a478b1a1e25607d50c, type: 3} propertyPath: m_Name value: Player objectReference: {fileID: 0} - - target: {fileID: 7985979212931499548, guid: 204c7411afdd01a478b1a1e25607d50c, - type: 3} - propertyPath: weaponList.Array.size - value: 3 - objectReference: {fileID: 0} - target: {fileID: 7985979212931499548, guid: 204c7411afdd01a478b1a1e25607d50c, type: 3} propertyPath: guiManager @@ -8897,25 +9377,9 @@ PrefabInstance: objectReference: {fileID: 587476774} - target: {fileID: 7985979212931499548, guid: 204c7411afdd01a478b1a1e25607d50c, type: 3} - propertyPath: mouseSensitive - value: 50 - objectReference: {fileID: 0} - - target: {fileID: 7985979212931499548, guid: 204c7411afdd01a478b1a1e25607d50c, - type: 3} - propertyPath: speed - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 7985979212931499548, guid: 204c7411afdd01a478b1a1e25607d50c, - type: 3} - propertyPath: runSpeed - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 7985979212931499548, guid: 204c7411afdd01a478b1a1e25607d50c, - type: 3} - propertyPath: weaponList.Array.data[2] + propertyPath: audio value: - objectReference: {fileID: 7279375804173823597, guid: f7f441e621e5e5f40b11b7617756a0af, - type: 3} + objectReference: {fileID: 824965140} - target: {fileID: 7985979212931499549, guid: 204c7411afdd01a478b1a1e25607d50c, type: 3} propertyPath: m_LocalPosition.x @@ -9023,7 +9487,7 @@ PrefabInstance: - target: {fileID: 4198863072573714306, guid: 52aecb86af67bc64782a3b7bece87dfd, type: 3} propertyPath: m_RootOrder - value: 10 + value: 16 objectReference: {fileID: 0} - target: {fileID: 4198863072573714306, guid: 52aecb86af67bc64782a3b7bece87dfd, type: 3} diff --git a/Assets/Scenes/Test-Haitem.unity b/Assets/Scenes/Test-Haitem.unity index be2ff49..dd7b5da 100644 --- a/Assets/Scenes/Test-Haitem.unity +++ b/Assets/Scenes/Test-Haitem.unity @@ -787,6 +787,7 @@ MonoBehaviour: Wood: {fileID: 863154880} Ammo: {fileID: 802293425} healthBar: {fileID: 562374831} + waves: {fileID: 0} --- !u!1001 &591872493 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/BarricadeManager.cs b/Assets/Scripts/BarricadeManager.cs index e1ea608..4a7d437 100644 --- a/Assets/Scripts/BarricadeManager.cs +++ b/Assets/Scripts/BarricadeManager.cs @@ -39,9 +39,9 @@ public class BarricadeManager : MonoBehaviour public void addPlank() { - if (health < (barricadePlanks.Count * 35)) { + if (health < (barricadePlanks.Count * 20)) { audioSource.PlayOneShot(buildSound); - health += 35; + health += 20; offMeshLink.enabled = false; } } @@ -59,7 +59,7 @@ public class BarricadeManager : MonoBehaviour { for (int i = 0; i < barricadePlanks.Count; i++) { - if (i < (health / 35)) { + if (i < (health / 20)) { barricadePlanks[i].SetActive(true); } else diff --git a/Assets/Scripts/DayManager.cs b/Assets/Scripts/DayManager.cs index 7a6f136..ecac937 100644 --- a/Assets/Scripts/DayManager.cs +++ b/Assets/Scripts/DayManager.cs @@ -10,6 +10,7 @@ public class DayManager : MonoBehaviour public AudioSource mainSource = new AudioSource(); public AudioClip dayClip; public AudioClip nigtClip; + public GuiManager guiManager; public int daySurvived = 0; @@ -22,6 +23,10 @@ public class DayManager : MonoBehaviour // Update is called once per frame void Update() { + if (guiManager != null) + { + guiManager.setWave(daySurvived+1); + } float sunRotationX = transform.localEulerAngles.x; sunRotationX = (sunRotationX > 180) ? sunRotationX - 360 : sunRotationX; if (sunRotationX < 0 && !night) diff --git a/Assets/Scripts/GuiManager.cs b/Assets/Scripts/GuiManager.cs index 42711f3..b81c727 100644 --- a/Assets/Scripts/GuiManager.cs +++ b/Assets/Scripts/GuiManager.cs @@ -9,6 +9,7 @@ public class GuiManager : MonoBehaviour public Text Wood; public Text Ammo; public Image healthBar; + public Text waves; // Start is called before the first frame update void Start() @@ -35,4 +36,9 @@ public class GuiManager : MonoBehaviour { healthBar.fillAmount = health; } + + public void setWave(int wave) + { + waves.text = "Wave: " + wave; + } } diff --git a/Assets/Scripts/PlayerManager.cs b/Assets/Scripts/PlayerManager.cs index b3bdb1e..40ef7fc 100644 --- a/Assets/Scripts/PlayerManager.cs +++ b/Assets/Scripts/PlayerManager.cs @@ -28,6 +28,10 @@ public class PlayerManager : MonoBehaviour public int selectedWeapon = 0; private float selectRate = 1; private float selectTime = 1; + public AudioSource audio; + public AudioClip lose; + private float nextMapeTime = 3; + private float nextMapeTime2 = 3; // Start is called before the first frame update @@ -58,7 +62,20 @@ public class PlayerManager : MonoBehaviour if (actualHealth <= 0) { - SceneManager.LoadScene(SceneManager.GetActiveScene().name, LoadSceneMode.Single); + if (audio != null && lose != null && (nextMapeTime2 + 1) <= Time.time) + { + playerCamera.transform.parent = null; + rigidBody.freezeRotation = true; + speed = 0; + runSpeed = 0; + audio.Stop(); + audio.volume = 0.5f; + audio.PlayOneShot(lose); + nextMapeTime2 = nextMapeTime + Time.time; + } + if (nextMapeTime2 <= Time.time) { + SceneManager.LoadScene(SceneManager.GetActiveScene().name, LoadSceneMode.Single); + } } float hpInPrcent = (actualHealth / (health / 100.0f));