diff --git a/Assets/Audio.meta b/Assets/Audio.meta new file mode 100644 index 0000000..58dbc1b --- /dev/null +++ b/Assets/Audio.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: df8d37290860705c4a7b9d330166298e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/demonAttack.mp3 b/Assets/Audio/demonAttack.mp3 new file mode 100644 index 0000000..5a4790e Binary files /dev/null and b/Assets/Audio/demonAttack.mp3 differ diff --git a/Assets/Audio/demonAttack.mp3.meta b/Assets/Audio/demonAttack.mp3.meta new file mode 100644 index 0000000..6c4a2ba --- /dev/null +++ b/Assets/Audio/demonAttack.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: f2bea68db9f67a4eab4427f8d524638d +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/earthPowerUp.mp3 b/Assets/Audio/earthPowerUp.mp3 new file mode 100644 index 0000000..ac73549 Binary files /dev/null and b/Assets/Audio/earthPowerUp.mp3 differ diff --git a/Assets/Audio/earthPowerUp.mp3.meta b/Assets/Audio/earthPowerUp.mp3.meta new file mode 100644 index 0000000..de7abc9 --- /dev/null +++ b/Assets/Audio/earthPowerUp.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 7e9fa875a3f9e88858f46c59a03d88ff +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/electricityPowerUp.mp3 b/Assets/Audio/electricityPowerUp.mp3 new file mode 100644 index 0000000..c8cb1c5 Binary files /dev/null and b/Assets/Audio/electricityPowerUp.mp3 differ diff --git a/Assets/Audio/electricityPowerUp.mp3.meta b/Assets/Audio/electricityPowerUp.mp3.meta new file mode 100644 index 0000000..ce476d7 --- /dev/null +++ b/Assets/Audio/electricityPowerUp.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: dd84dcff15f66430b94bd54a91334fd1 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/firePowerUp.mp3 b/Assets/Audio/firePowerUp.mp3 new file mode 100644 index 0000000..c0efb9e Binary files /dev/null and b/Assets/Audio/firePowerUp.mp3 differ diff --git a/Assets/Audio/firePowerUp.mp3.meta b/Assets/Audio/firePowerUp.mp3.meta new file mode 100644 index 0000000..a2f32fb --- /dev/null +++ b/Assets/Audio/firePowerUp.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: adb1ae88171d6e8ba975251f2ded28d4 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/ghostAttack.mp3 b/Assets/Audio/ghostAttack.mp3 new file mode 100644 index 0000000..856ee53 Binary files /dev/null and b/Assets/Audio/ghostAttack.mp3 differ diff --git a/Assets/Audio/ghostAttack.mp3.meta b/Assets/Audio/ghostAttack.mp3.meta new file mode 100644 index 0000000..8cf9c9b --- /dev/null +++ b/Assets/Audio/ghostAttack.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 3782e6596fe0d8b1a90640876855b232 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/ingameLoopSoundtrack.mp3 b/Assets/Audio/ingameLoopSoundtrack.mp3 new file mode 100644 index 0000000..782fa71 Binary files /dev/null and b/Assets/Audio/ingameLoopSoundtrack.mp3 differ diff --git a/Assets/Audio/ingameLoopSoundtrack.mp3.meta b/Assets/Audio/ingameLoopSoundtrack.mp3.meta new file mode 100644 index 0000000..bac59bc --- /dev/null +++ b/Assets/Audio/ingameLoopSoundtrack.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 02cc2e7c4909b64b3b2343fe6bdcac69 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/menuSoundtrack.mp3 b/Assets/Audio/menuSoundtrack.mp3 new file mode 100644 index 0000000..8211cc3 Binary files /dev/null and b/Assets/Audio/menuSoundtrack.mp3 differ diff --git a/Assets/Audio/menuSoundtrack.mp3.meta b/Assets/Audio/menuSoundtrack.mp3.meta new file mode 100644 index 0000000..348b814 --- /dev/null +++ b/Assets/Audio/menuSoundtrack.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 380989744d74f9faeb95071ebdf97112 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/snakeAttack.mp3 b/Assets/Audio/snakeAttack.mp3 new file mode 100644 index 0000000..07c1380 Binary files /dev/null and b/Assets/Audio/snakeAttack.mp3 differ diff --git a/Assets/Audio/snakeAttack.mp3.meta b/Assets/Audio/snakeAttack.mp3.meta new file mode 100644 index 0000000..2935122 --- /dev/null +++ b/Assets/Audio/snakeAttack.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 2ff0882a09d5c77f8a356a490efe2d90 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/swordAttack.mp3 b/Assets/Audio/swordAttack.mp3 new file mode 100644 index 0000000..4dc80f3 Binary files /dev/null and b/Assets/Audio/swordAttack.mp3 differ diff --git a/Assets/Audio/swordAttack.mp3.meta b/Assets/Audio/swordAttack.mp3.meta new file mode 100644 index 0000000..68b4764 --- /dev/null +++ b/Assets/Audio/swordAttack.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 7b687cbe286d24ef1b3edd855aaaee6c +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/waterPowerUp.mp3 b/Assets/Audio/waterPowerUp.mp3 new file mode 100644 index 0000000..e7908a2 Binary files /dev/null and b/Assets/Audio/waterPowerUp.mp3 differ diff --git a/Assets/Audio/waterPowerUp.mp3.meta b/Assets/Audio/waterPowerUp.mp3.meta new file mode 100644 index 0000000..10f7640 --- /dev/null +++ b/Assets/Audio/waterPowerUp.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 1fe7bc11c8c45d9fca8f2ae4f98caadf +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefab/AudioManager.prefab b/Assets/Prefab/AudioManager.prefab new file mode 100644 index 0000000..4bee534 --- /dev/null +++ b/Assets/Prefab/AudioManager.prefab @@ -0,0 +1,106 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &378146469847001456 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5543451162187738079} + - component: {fileID: 6430396782246739571} + m_Layer: 0 + m_Name: AudioManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5543451162187738079 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 378146469847001456} + 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: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6430396782246739571 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 378146469847001456} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 331b553990af210e7a97d606f80d1206, type: 3} + m_Name: + m_EditorClassIdentifier: + sounds: + - name: waterPowerUp + clip: {fileID: 8300000, guid: 1fe7bc11c8c45d9fca8f2ae4f98caadf, type: 3} + volume: 1 + pitch: 1 + loop: 0 + source: {fileID: 0} + - name: firePowerUp + clip: {fileID: 8300000, guid: adb1ae88171d6e8ba975251f2ded28d4, type: 3} + volume: 1 + pitch: 1 + loop: 0 + source: {fileID: 0} + - name: earthPowerUp + clip: {fileID: 8300000, guid: 7e9fa875a3f9e88858f46c59a03d88ff, type: 3} + volume: 1 + pitch: 1 + loop: 0 + source: {fileID: 0} + - name: electricityPowerUp + clip: {fileID: 8300000, guid: dd84dcff15f66430b94bd54a91334fd1, type: 3} + volume: 1 + pitch: 1 + loop: 0 + source: {fileID: 0} + - name: snakeAttack + clip: {fileID: 8300000, guid: 2ff0882a09d5c77f8a356a490efe2d90, type: 3} + volume: 1 + pitch: 1 + loop: 0 + source: {fileID: 0} + - name: swordAttack + clip: {fileID: 8300000, guid: 7b687cbe286d24ef1b3edd855aaaee6c, type: 3} + volume: 1 + pitch: 1 + loop: 0 + source: {fileID: 0} + - name: ghostAttack + clip: {fileID: 8300000, guid: 3782e6596fe0d8b1a90640876855b232, type: 3} + volume: 1 + pitch: 1 + loop: 0 + source: {fileID: 0} + - name: demonAttack + clip: {fileID: 8300000, guid: f2bea68db9f67a4eab4427f8d524638d, type: 3} + volume: 1 + pitch: 1 + loop: 0 + source: {fileID: 0} + - name: ingameLoopSoundtrack + clip: {fileID: 8300000, guid: 02cc2e7c4909b64b3b2343fe6bdcac69, type: 3} + volume: 0.334 + pitch: 1 + loop: 1 + source: {fileID: 0} + - name: menuSoundtrack + clip: {fileID: 8300000, guid: 380989744d74f9faeb95071ebdf97112, type: 3} + volume: 0.339 + pitch: 1 + loop: 0 + source: {fileID: 0} diff --git a/Assets/Prefab/AudioManager.prefab.meta b/Assets/Prefab/AudioManager.prefab.meta new file mode 100644 index 0000000..6649473 --- /dev/null +++ b/Assets/Prefab/AudioManager.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d168e5b14aaca41c0bc8527bc9ae6a1d +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/SFX.meta b/Assets/SFX.meta new file mode 100644 index 0000000..f31f0a1 --- /dev/null +++ b/Assets/SFX.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7047bb1983384f79aa7357106b1128b2 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Combat.unity b/Assets/Scenes/Combat.unity index 17d6a02..e128834 100644 --- a/Assets/Scenes/Combat.unity +++ b/Assets/Scenes/Combat.unity @@ -425,7 +425,7 @@ RectTransform: - {fileID: 460470247} - {fileID: 1190046787} m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1033,7 +1033,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &884485345 GameObject: @@ -1866,7 +1866,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1340602887 GameObject: @@ -2095,7 +2095,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1461315606 GameObject: @@ -2537,6 +2537,63 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1875247019} m_CullTransparentMesh: 1 +--- !u!1001 &1880059624 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 378146469847001456, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_Name + value: AudioManager + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} --- !u!1 &1974666315 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/EduloScene.unity b/Assets/Scenes/EduloScene.unity index 44d2b12..913bbaa 100644 --- a/Assets/Scenes/EduloScene.unity +++ b/Assets/Scenes/EduloScene.unity @@ -123,6 +123,63 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1001 &130187390 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 378146469847001456, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_Name + value: AudioManager + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} --- !u!1 &459736356 GameObject: m_ObjectHideFlags: 0 @@ -221,7 +278,7 @@ RectTransform: - {fileID: 600090009} - {fileID: 955021416} m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -324,7 +381,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &600090008 GameObject: @@ -443,7 +500,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &714467297 GameObject: @@ -940,7 +997,7 @@ Transform: - {fileID: 714467298} - {fileID: 1384596417} m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!95 &1406668552 Animator: @@ -12210,7 +12267,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1794853019 GameObject: @@ -12255,7 +12312,7 @@ Transform: - {fileID: 1946425489} - {fileID: 1718283341} m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1804269629 GameObject: @@ -15150,7 +15207,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2106914501 GameObject: @@ -15244,7 +15301,7 @@ PrefabInstance: objectReference: {fileID: 1406668551} - target: {fileID: 7773432864216598726, guid: 94ead530331febb4eb106c6108ab9b5b, type: 3} propertyPath: m_RootOrder - value: 7 + value: 8 objectReference: {fileID: 0} - target: {fileID: 7773432864216598726, guid: 94ead530331febb4eb106c6108ab9b5b, type: 3} propertyPath: m_LocalPosition.x diff --git a/Assets/Scenes/GameOver.unity b/Assets/Scenes/GameOver.unity index a6299e4..6c4e44a 100644 --- a/Assets/Scenes/GameOver.unity +++ b/Assets/Scenes/GameOver.unity @@ -266,7 +266,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &393435881 GameObject: @@ -310,7 +310,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &445346924 GameObject: @@ -409,7 +409,7 @@ RectTransform: - {fileID: 873877019} - {fileID: 224655645} m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -647,7 +647,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1601639365 GameObject: @@ -827,3 +827,60 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1001 &2070301324 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 378146469847001456, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_Name + value: AudioManager + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity index ce273f8..25fe82c 100644 --- a/Assets/Scenes/MainMenu.unity +++ b/Assets/Scenes/MainMenu.unity @@ -352,7 +352,7 @@ RectTransform: - {fileID: 593667618} - {fileID: 1133902147} m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -802,7 +802,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1926518465 GameObject: @@ -868,7 +868,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2012418749 GameObject: @@ -1078,3 +1078,60 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2113235712} m_CullTransparentMesh: 1 +--- !u!1001 &7323465715995289511 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 378146469847001456, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_Name + value: AudioManager + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} diff --git a/Assets/Scenes/Powerup.unity b/Assets/Scenes/Powerup.unity index 65f0d17..ad7c9b2 100644 --- a/Assets/Scenes/Powerup.unity +++ b/Assets/Scenes/Powerup.unity @@ -123,6 +123,63 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1001 &398851347 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 378146469847001456, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_Name + value: AudioManager + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} --- !u!1 &459736356 GameObject: m_ObjectHideFlags: 0 @@ -221,7 +278,7 @@ RectTransform: - {fileID: 600090009} - {fileID: 955021416} m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -324,7 +381,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &600090008 GameObject: @@ -443,7 +500,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &714467297 GameObject: @@ -942,7 +999,7 @@ Transform: - {fileID: 714467298} - {fileID: 1384596417} m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!95 &1406668552 Animator: @@ -975,7 +1032,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: afe947a9bad011a44a9d441c37140ef5, type: 3} m_Name: m_EditorClassIdentifier: - coolDown: 1 --- !u!114 &1406668554 MonoBehaviour: m_ObjectHideFlags: 0 @@ -12241,7 +12297,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1794853019 GameObject: @@ -12286,7 +12342,7 @@ Transform: - {fileID: 1946425489} - {fileID: 1718283341} m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1804269629 GameObject: @@ -15181,7 +15237,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2106914501 GameObject: @@ -15279,7 +15335,7 @@ PrefabInstance: objectReference: {fileID: 1406668551} - target: {fileID: 7773432864216598726, guid: 94ead530331febb4eb106c6108ab9b5b, type: 3} propertyPath: m_RootOrder - value: 7 + value: 8 objectReference: {fileID: 0} - target: {fileID: 7773432864216598726, guid: 94ead530331febb4eb106c6108ab9b5b, type: 3} propertyPath: m_LocalPosition.x diff --git a/Assets/Scenes/Room1.unity b/Assets/Scenes/Room1.unity index d58cfc7..d3e4638 100644 --- a/Assets/Scenes/Room1.unity +++ b/Assets/Scenes/Room1.unity @@ -169,7 +169,7 @@ Transform: - {fileID: 643351662} - {fileID: 1334155590} m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &103051096 GameObject: @@ -265,7 +265,7 @@ RectTransform: - {fileID: 412724635} - {fileID: 445340391} m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -2460,7 +2460,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: RoomNumber: 2 - toCombat: 0 --- !u!19719996 &643351666 TilemapCollider2D: m_ObjectHideFlags: 0 @@ -5193,7 +5192,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &992252151 PrefabInstance: @@ -5570,7 +5569,7 @@ Transform: m_Children: - {fileID: 637598874} m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1289488679 GameObject: @@ -5737,7 +5736,7 @@ Transform: m_LocalScale: {x: 3.4156759, y: 3.4083574, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1292773407 PrefabInstance: @@ -6515,7 +6514,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: RoomNumber: 2 - toCombat: 0 --- !u!19719996 &1334155594 TilemapCollider2D: m_ObjectHideFlags: 0 @@ -6901,7 +6899,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1683933847 PrefabInstance: @@ -7435,6 +7433,110 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1767212164 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1767212166} + - component: {fileID: 1767212165} + m_Layer: 0 + m_Name: AudioManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1767212165 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1767212164} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 331b553990af210e7a97d606f80d1206, type: 3} + m_Name: + m_EditorClassIdentifier: + sounds: + - name: waterPowerUp + clip: {fileID: 8300000, guid: 1fe7bc11c8c45d9fca8f2ae4f98caadf, type: 3} + volume: 1 + pitch: 1 + loop: 0 + source: {fileID: 0} + - name: firePowerUp + clip: {fileID: 8300000, guid: adb1ae88171d6e8ba975251f2ded28d4, type: 3} + volume: 1 + pitch: 1 + loop: 0 + source: {fileID: 0} + - name: earthPowerUp + clip: {fileID: 8300000, guid: 7e9fa875a3f9e88858f46c59a03d88ff, type: 3} + volume: 1 + pitch: 1 + loop: 0 + source: {fileID: 0} + - name: electricityPowerUp + clip: {fileID: 8300000, guid: dd84dcff15f66430b94bd54a91334fd1, type: 3} + volume: 1 + pitch: 1 + loop: 0 + source: {fileID: 0} + - name: snakeAttack + clip: {fileID: 8300000, guid: 2ff0882a09d5c77f8a356a490efe2d90, type: 3} + volume: 1 + pitch: 1 + loop: 0 + source: {fileID: 0} + - name: swordAttack + clip: {fileID: 8300000, guid: 7b687cbe286d24ef1b3edd855aaaee6c, type: 3} + volume: 1 + pitch: 1 + loop: 0 + source: {fileID: 0} + - name: ghostAttack + clip: {fileID: 8300000, guid: 3782e6596fe0d8b1a90640876855b232, type: 3} + volume: 1 + pitch: 1 + loop: 0 + source: {fileID: 0} + - name: demonAttack + clip: {fileID: 8300000, guid: f2bea68db9f67a4eab4427f8d524638d, type: 3} + volume: 1 + pitch: 1 + loop: 0 + source: {fileID: 0} + - name: ingameLoopSoundtrack + clip: {fileID: 8300000, guid: 02cc2e7c4909b64b3b2343fe6bdcac69, type: 3} + volume: 0.303 + pitch: 1 + loop: 1 + source: {fileID: 0} + - name: menuSoundtrack + clip: {fileID: 8300000, guid: 380989744d74f9faeb95071ebdf97112, type: 3} + volume: 1 + pitch: 1 + loop: 0 + source: {fileID: 0} +--- !u!4 &1767212166 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1767212164} + 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: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1823790086 diff --git a/Assets/Scenes/Room10.unity b/Assets/Scenes/Room10.unity index 2f1f8ed..00ed87a 100644 --- a/Assets/Scenes/Room10.unity +++ b/Assets/Scenes/Room10.unity @@ -172,7 +172,7 @@ Transform: - {fileID: 1366166183} - {fileID: 1927007748} m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &264393370 GameObject: @@ -271,7 +271,7 @@ Transform: m_Children: - {fileID: 1667903101} m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &489124164 PrefabInstance: @@ -452,7 +452,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &617314503 GameObject: @@ -619,7 +619,7 @@ Transform: m_LocalScale: {x: 3.4156759, y: 3.4083574, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &647152626 PrefabInstance: @@ -1303,7 +1303,7 @@ Transform: m_Children: - {fileID: 647152627} m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &862593988 PrefabInstance: @@ -5764,7 +5764,7 @@ Transform: m_Children: - {fileID: 489124165} m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1667903100 PrefabInstance: @@ -6042,6 +6042,63 @@ Tilemap: e31: 0 e32: 0 e33: 1 +--- !u!1001 &2001100755 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 378146469847001456, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_Name + value: AudioManager + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} --- !u!1001 &2009404003 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Room13.unity b/Assets/Scenes/Room13.unity index 47e4e46..230ba24 100644 --- a/Assets/Scenes/Room13.unity +++ b/Assets/Scenes/Room13.unity @@ -204,7 +204,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &24669179 GameObject: @@ -3725,7 +3725,7 @@ Transform: - {fileID: 62332168} - {fileID: 1196541127} m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &768355625 GameObject: @@ -4080,7 +4080,7 @@ Transform: m_LocalScale: {x: 3.4156759, y: 3.4083574, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1044450299 GameObject: @@ -4736,6 +4736,63 @@ Transform: m_CorrespondingSourceObject: {fileID: 3585729283532034766, guid: 306d509d7c5b07c4391117b57a33099a, type: 3} m_PrefabInstance: {fileID: 1406169792} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1510424514 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 378146469847001456, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_Name + value: AudioManager + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} --- !u!1 &1656594899 GameObject: m_ObjectHideFlags: 0 @@ -4833,7 +4890,7 @@ Transform: m_Children: - {fileID: 1406169793} m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1764562084 GameObject: diff --git a/Assets/Scenes/Room2.unity b/Assets/Scenes/Room2.unity index c7bb681..665f55c 100644 --- a/Assets/Scenes/Room2.unity +++ b/Assets/Scenes/Room2.unity @@ -577,7 +577,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: RoomNumber: 3 - toCombat: 0 --- !u!483693784 &89634868 TilemapRenderer: m_ObjectHideFlags: 0 @@ -1006,7 +1005,7 @@ RectTransform: - {fileID: 696471758} - {fileID: 1558546251} m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1249,6 +1248,63 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 330540073} m_CullTransparentMesh: 1 +--- !u!1001 &347652663 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 378146469847001456, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_Name + value: AudioManager + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} --- !u!1 &369983642 GameObject: m_ObjectHideFlags: 0 @@ -2092,7 +2148,7 @@ Transform: - {fileID: 1458584303} - {fileID: 89634865} m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &511738305 PrefabInstance: @@ -3205,7 +3261,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &928198879 GameObject: @@ -3304,7 +3360,7 @@ Transform: m_Children: - {fileID: 6972891} m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &942025439 PrefabInstance: @@ -4364,7 +4420,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1430058993 GameObject: @@ -4664,7 +4720,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: RoomNumber: 3 - toCombat: 0 --- !u!483693784 &1458584306 TilemapRenderer: m_ObjectHideFlags: 0 @@ -6974,7 +7029,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1635974365 PrefabInstance: @@ -7354,7 +7409,7 @@ Transform: m_LocalScale: {x: 3.4156759, y: 3.4083574, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1909642130 PrefabInstance: diff --git a/Assets/Scenes/Room22.unity b/Assets/Scenes/Room22.unity index cc2aa6a..12e67ff 100644 --- a/Assets/Scenes/Room22.unity +++ b/Assets/Scenes/Room22.unity @@ -322,7 +322,7 @@ Transform: m_Children: - {fileID: 171478154} m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &171478153 PrefabInstance: @@ -656,8 +656,65 @@ Transform: - {fileID: 337708132} - {fileID: 1348728959} m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &663691700 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 378146469847001456, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_Name + value: AudioManager + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} --- !u!1 &812885047 GameObject: m_ObjectHideFlags: 0 @@ -1142,7 +1199,7 @@ Transform: m_Children: - {fileID: 2057812649} m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1009291511 PrefabInstance: @@ -1414,7 +1471,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1543536076 GameObject: @@ -1946,7 +2003,7 @@ Transform: m_LocalScale: {x: 3.4156759, y: 3.4083574, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1856426642 GameObject: diff --git a/Assets/Scenes/Room3.unity b/Assets/Scenes/Room3.unity index 6de2b36..ec5ad86 100644 --- a/Assets/Scenes/Room3.unity +++ b/Assets/Scenes/Room3.unity @@ -888,6 +888,63 @@ Tilemap: e31: 0 e32: 0 e33: 1 +--- !u!1001 &289897817 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 378146469847001456, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_Name + value: AudioManager + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} --- !u!1 &394826463 GameObject: m_ObjectHideFlags: 0 @@ -952,7 +1009,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &470205235 GameObject: @@ -1600,7 +1657,7 @@ Transform: - {fileID: 1145875935} - {fileID: 470205236} m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &656082775 PrefabInstance: @@ -2061,7 +2118,7 @@ Transform: m_LocalScale: {x: 3.4156759, y: 3.4083574, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &706155835 GameObject: @@ -2870,7 +2927,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: RoomNumber: 4 - toCombat: 0 --- !u!483693784 &1145875938 TilemapRenderer: m_ObjectHideFlags: 0 @@ -3085,7 +3141,7 @@ RectTransform: - {fileID: 1873281739} - {fileID: 862459940} m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -3162,7 +3218,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1247504272 GameObject: @@ -3453,7 +3509,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1394929696 GameObject: @@ -4025,7 +4081,7 @@ Transform: m_Children: - {fileID: 960769444} m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1629678463 PrefabInstance: @@ -7613,7 +7669,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: RoomNumber: 4 - toCombat: 0 --- !u!483693784 &2098148755 TilemapRenderer: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Room4.unity b/Assets/Scenes/Room4.unity index 2f64714..c8f12cb 100644 --- a/Assets/Scenes/Room4.unity +++ b/Assets/Scenes/Room4.unity @@ -217,7 +217,7 @@ RectTransform: - {fileID: 1705494306} - {fileID: 202130197} m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -310,7 +310,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: RoomNumber: 5 - toCombat: 0 --- !u!19719996 &254373460 TilemapCollider2D: m_ObjectHideFlags: 0 @@ -1183,7 +1182,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &602836175 PrefabInstance: @@ -1803,7 +1802,7 @@ Transform: - {fileID: 254373458} - {fileID: 1170330972} m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &816880383 PrefabInstance: @@ -2143,7 +2142,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &863853423 PrefabInstance: @@ -2909,7 +2908,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: RoomNumber: 5 - toCombat: 0 --- !u!19719996 &1170330974 TilemapCollider2D: m_ObjectHideFlags: 0 @@ -3796,6 +3794,63 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1309527001} m_CullTransparentMesh: 1 +--- !u!1001 &1478160826 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 378146469847001456, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_Name + value: AudioManager + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} --- !u!1 &1491017080 GameObject: m_ObjectHideFlags: 0 @@ -4018,7 +4073,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1650500206 GameObject: @@ -7421,7 +7476,7 @@ Transform: m_Children: - {fileID: 1027020193} m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2099241629 GameObject: @@ -7588,7 +7643,7 @@ Transform: m_LocalScale: {x: 3.4156759, y: 3.4083574, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &2102665505 PrefabInstance: diff --git a/Assets/Scenes/Room5.unity b/Assets/Scenes/Room5.unity index 21ae30a..dc4dc88 100644 --- a/Assets/Scenes/Room5.unity +++ b/Assets/Scenes/Room5.unity @@ -687,6 +687,63 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3cd7260c1bff22947888d562faf26002, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1001 &192601220 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 378146469847001456, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_Name + value: AudioManager + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} --- !u!1001 &196091722 PrefabInstance: m_ObjectHideFlags: 0 @@ -1208,7 +1265,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &347255992 PrefabInstance: @@ -1441,7 +1498,7 @@ RectTransform: - {fileID: 1615164054} - {fileID: 1887401845} m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1763,7 +1820,7 @@ Transform: m_Children: - {fileID: 662860502} m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &529387302 GameObject: @@ -3130,7 +3187,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: RoomNumber: 6 - toCombat: 0 --- !u!19719996 &875091976 TilemapCollider2D: m_ObjectHideFlags: 0 @@ -3821,7 +3877,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: RoomNumber: 6 - toCombat: 0 --- !u!19719996 &1110996821 TilemapCollider2D: m_ObjectHideFlags: 0 @@ -7435,7 +7490,7 @@ Transform: m_LocalScale: {x: 3.4156759, y: 3.4083574, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1933277558 GameObject: @@ -7501,7 +7556,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1946251152 GameObject: @@ -8033,5 +8088,5 @@ Transform: - {fileID: 1946251153} - {fileID: 1463665253} m_Father: {fileID: 0} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Scenes/Room6.unity b/Assets/Scenes/Room6.unity index e52f6dd..603a5cb 100644 --- a/Assets/Scenes/Room6.unity +++ b/Assets/Scenes/Room6.unity @@ -344,7 +344,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &139522107 GameObject: @@ -897,7 +897,7 @@ RectTransform: - {fileID: 1162327178} - {fileID: 520548771} m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1373,6 +1373,63 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3cd7260c1bff22947888d562faf26002, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1001 &676950642 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 378146469847001456, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_Name + value: AudioManager + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} --- !u!1 &678358497 GameObject: m_ObjectHideFlags: 0 @@ -1991,7 +2048,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: RoomNumber: 7 - toCombat: 0 --- !u!19719996 &875091976 TilemapCollider2D: m_ObjectHideFlags: 0 @@ -2543,7 +2599,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: RoomNumber: 7 - toCombat: 0 --- !u!19719996 &1110996821 TilemapCollider2D: m_ObjectHideFlags: 0 @@ -7381,7 +7436,7 @@ Transform: m_LocalScale: {x: 3.4156759, y: 3.4083574, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1946251152 GameObject: @@ -7695,7 +7750,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2091558859 GameObject: @@ -7794,7 +7849,7 @@ Transform: m_Children: - {fileID: 1045098712} m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2111008594 GameObject: @@ -7844,7 +7899,7 @@ Transform: - {fileID: 1946251153} - {fileID: 1463665253} m_Father: {fileID: 0} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &2115737971 PrefabInstance: diff --git a/Assets/Scenes/RoomBoss.unity b/Assets/Scenes/RoomBoss.unity index 694e8b1..70b213d 100644 --- a/Assets/Scenes/RoomBoss.unity +++ b/Assets/Scenes/RoomBoss.unity @@ -292,7 +292,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &323472618 PrefabInstance: @@ -1720,7 +1720,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: RoomNumber: 1 - toCombat: 0 --- !u!19719996 &875091976 TilemapCollider2D: m_ObjectHideFlags: 0 @@ -2401,7 +2400,7 @@ RectTransform: - {fileID: 128763729} - {fileID: 451665235} m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -2456,7 +2455,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: RoomNumber: 1 - toCombat: 0 --- !u!19719996 &1110996821 TilemapCollider2D: m_ObjectHideFlags: 0 @@ -3167,6 +3165,63 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1183020789} m_CullTransparentMesh: 1 +--- !u!1001 &1215458698 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 378146469847001456, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_Name + value: AudioManager + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} --- !u!1001 &1218218370 PrefabInstance: m_ObjectHideFlags: 0 @@ -6131,7 +6186,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1797097326 PrefabInstance: @@ -6694,7 +6749,7 @@ Transform: m_LocalScale: {x: 3.4156759, y: 3.4083574, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1922628401 PrefabInstance: @@ -7519,7 +7574,7 @@ Transform: - {fileID: 1946251153} - {fileID: 1463665253} m_Father: {fileID: 0} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &2136306379 PrefabInstance: diff --git a/Assets/Scenes/RoomStart.unity b/Assets/Scenes/RoomStart.unity index 12ca8f6..a8d40c8 100644 --- a/Assets/Scenes/RoomStart.unity +++ b/Assets/Scenes/RoomStart.unity @@ -278,7 +278,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &33484402 MonoBehaviour: @@ -1063,7 +1063,7 @@ Transform: - {fileID: 166926810} - {fileID: 1501613287} m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &410031630 stripped MonoBehaviour: @@ -1324,7 +1324,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &560046693 GameObject: @@ -2494,7 +2494,7 @@ Transform: m_LocalScale: {x: 3.4156759, y: 3.4083574, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!50 &860279758 Rigidbody2D: @@ -3296,7 +3296,7 @@ RectTransform: - {fileID: 1724300383} - {fileID: 731390036} m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -4433,6 +4433,63 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 86862501386033394, guid: 49af3aed783bdd044a5ed946756dee46, type: 3} m_PrefabInstance: {fileID: 1389859313} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1390653723 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 378146469847001456, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_Name + value: AudioManager + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} --- !u!114 &1420941032 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 2710819478826613177, guid: 49af3aed783bdd044a5ed946756dee46, type: 3} @@ -4995,7 +5052,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1699090882 stripped MonoBehaviour: diff --git a/Assets/Scenes/StartScreen.unity b/Assets/Scenes/StartScreen.unity index e6dd751..21f111f 100644 --- a/Assets/Scenes/StartScreen.unity +++ b/Assets/Scenes/StartScreen.unity @@ -165,7 +165,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &512461251 GameObject: @@ -231,7 +231,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &790369254 GameObject: @@ -413,7 +413,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1169218527 GameObject: @@ -511,7 +511,7 @@ RectTransform: - {fileID: 1645240989} - {fileID: 1256670319} m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -668,6 +668,63 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1645240988} m_CullTransparentMesh: 1 +--- !u!1001 &1691472995 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 378146469847001456, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_Name + value: AudioManager + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} --- !u!1 &1895193082 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/VictoryScreen.unity b/Assets/Scenes/VictoryScreen.unity index 5790c46..38a99ce 100644 --- a/Assets/Scenes/VictoryScreen.unity +++ b/Assets/Scenes/VictoryScreen.unity @@ -298,7 +298,7 @@ RectTransform: - {fileID: 1480555207} - {fileID: 1128408931} m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -381,7 +381,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1128408930 GameObject: @@ -676,8 +676,65 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &2018768417 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 378146469847001456, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_Name + value: AudioManager + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5543451162187738079, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d168e5b14aaca41c0bc8527bc9ae6a1d, type: 3} --- !u!1 &2111256663 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Audio.meta b/Assets/Scripts/Audio.meta new file mode 100644 index 0000000..604de68 --- /dev/null +++ b/Assets/Scripts/Audio.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5c2d4513d358d1f9c800bf85c8980040 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Audio/AudioManager.cs b/Assets/Scripts/Audio/AudioManager.cs new file mode 100644 index 0000000..e6f4a73 --- /dev/null +++ b/Assets/Scripts/Audio/AudioManager.cs @@ -0,0 +1,50 @@ +using UnityEngine.Audio; +using System; +using UnityEngine; + +public class AudioManager : MonoBehaviour +{ + public Sound[] sounds; + + public static AudioManager instance; + + // Start is called before the first frame update + void Awake() + { + if (instance == null) + instance = this; + else + { + Destroy(gameObject); + return; + } + + DontDestroyOnLoad(gameObject); + + foreach (Sound s in sounds) + { + s.source = gameObject.AddComponent(); + s.source.clip = s.clip; + + s.source.volume = s.volume; + s.source.pitch = s.pitch; + s.source.loop = s.loop; + } + } + + void Start() + { + Play("menuSoundtrack"); + } + + public void Play(string name) + { + Sound s = Array.Find(sounds, sound => sound.name == name); + if (s == null) + { + Debug.LogWarning("Sound: " + name + " not found!"); + return; + } + s.source.Play(); + } +} diff --git a/Assets/Scripts/Audio/AudioManager.cs.meta b/Assets/Scripts/Audio/AudioManager.cs.meta new file mode 100644 index 0000000..e7756ef --- /dev/null +++ b/Assets/Scripts/Audio/AudioManager.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 331b553990af210e7a97d606f80d1206 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Audio/Sound.cs b/Assets/Scripts/Audio/Sound.cs new file mode 100644 index 0000000..42fdbd4 --- /dev/null +++ b/Assets/Scripts/Audio/Sound.cs @@ -0,0 +1,20 @@ +using UnityEngine.Audio; +using UnityEngine; + +[System.Serializable] +public class Sound +{ + public string name; + + public AudioClip clip; + + [Range(0f, 1f)] + public float volume = 1f; + [Range(.1f, 3f)] + public float pitch = 1f; + + public bool loop; + + [HideInInspector] + public AudioSource source; +} diff --git a/Assets/Scripts/Audio/Sound.cs.meta b/Assets/Scripts/Audio/Sound.cs.meta new file mode 100644 index 0000000..1d142b1 --- /dev/null +++ b/Assets/Scripts/Audio/Sound.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 483ca7c80c447b139985b1af66ec9a9e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Combat/CombatManager.cs b/Assets/Scripts/Combat/CombatManager.cs index 8405444..f7375de 100644 --- a/Assets/Scripts/Combat/CombatManager.cs +++ b/Assets/Scripts/Combat/CombatManager.cs @@ -445,6 +445,7 @@ public void Spell(string spellName){ //Cura bastante com base na vida perdida playerUnit.healUnit(0.2f * GlobalMagicSlots.waterLevel); systemDialogue.text = "The player is greatly healed!"; + FindObjectOfType().Play("waterPowerUp"); break; case"Mud": // Diminui speed do inimigo, cura por valor pequeno e dá dano pequeno @@ -478,18 +479,21 @@ public void Spell(string spellName){ playerUnit.currStr += (int) Mathf.Ceil((0.1f * GlobalMagicSlots.fireLevel) * playerUnit.str); systemDialogue.text = "Player strength is greatly buffed!"; enemyUnit.TakeDamage(1f, playerUnit.currStr); + FindObjectOfType().Play("firePowerUp"); break; case"Earth v2": // Aumenta bastante a defesa. Causa dano baixo playerUnit.currDef += (int) Mathf.Ceil((0.1f * GlobalMagicSlots.earthLevel) * playerUnit.def); systemDialogue.text = "Player defense is greatly buffed!"; enemyUnit.TakeDamage(0.2f, playerUnit.currStr); + FindObjectOfType().Play("earthPowerUp"); break; case"Electric v2": // Aumenta bastante a velocidade. Causa dano médio playerUnit.currSpd += (int) Mathf.Ceil((0.2f * GlobalMagicSlots.eletricLevel) * playerUnit.spd); systemDialogue.text = "Player speed is greatly buffed!"; enemyUnit.TakeDamage(0.5f, playerUnit.currStr); + FindObjectOfType().Play("electricityPowerUp"); break; case"Healing Touch": diff --git a/Assets/Scripts/Enemy.cs b/Assets/Scripts/Enemy.cs index 711e550..438f1bb 100644 --- a/Assets/Scripts/Enemy.cs +++ b/Assets/Scripts/Enemy.cs @@ -45,6 +45,7 @@ private void OnTriggerEnter2D(Collider2D other) { } void TakeDamage(){ + FindObjectOfType().Play("snakeAttack"); currentHealth--; animator.SetTrigger("TookDamage"); if(currentHealth <= 0){ diff --git a/Assets/Scripts/Sword.cs b/Assets/Scripts/Sword.cs index 0c99277..30f246b 100644 --- a/Assets/Scripts/Sword.cs +++ b/Assets/Scripts/Sword.cs @@ -34,5 +34,6 @@ void Update() void Attack() { animator.SetTrigger("Attack"); + FindObjectOfType().Play("swordAttack"); } }