diff --git a/Assets/Audio/Ingame_Theme.wav b/Assets/Audio/Ingame_Theme.wav index 2f924b6..41b930a 100644 Binary files a/Assets/Audio/Ingame_Theme.wav and b/Assets/Audio/Ingame_Theme.wav differ diff --git a/Assets/Audio/Ingame_Theme.wav.meta b/Assets/Audio/Ingame_Theme.wav.meta index a51a51c..6112ef9 100644 --- a/Assets/Audio/Ingame_Theme.wav.meta +++ b/Assets/Audio/Ingame_Theme.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: bd37e0997c3891d41960e3d4a2820944 +guid: 2d412f6ffd22d7b46817fa720aa8bdd7 AudioImporter: externalObjects: {} serializedVersion: 7 diff --git a/Assets/Audio/Mop Menu.wav b/Assets/Audio/Mop Menu.wav new file mode 100644 index 0000000..030be24 Binary files /dev/null and b/Assets/Audio/Mop Menu.wav differ diff --git a/Assets/Audio/Mop Menu.wav.meta b/Assets/Audio/Mop Menu.wav.meta new file mode 100644 index 0000000..83e14c5 --- /dev/null +++ b/Assets/Audio/Mop Menu.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 854b42033fd862844aed3740a9bdf1ee +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity index 7b919b4..d5e58bf 100644 --- a/Assets/Scenes/MainMenu.unity +++ b/Assets/Scenes/MainMenu.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 10 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -44,7 +44,6 @@ RenderSettings: LightmapSettings: m_ObjectHideFlags: 0 serializedVersion: 12 - m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 m_BounceScale: 1 @@ -67,9 +66,6 @@ LightmapSettings: m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 m_TextureCompression: 1 - m_FinalGather: 0 - m_FinalGatherFiltering: 1 - m_FinalGatherRayCount: 256 m_ReflectionCompression: 2 m_MixedBakeMode: 2 m_BakeBackend: 1 @@ -204,13 +200,14 @@ Animation: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 77115104} m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Animation: {fileID: 7400000, guid: 6c40ba921358dac448ccc70202ac898a, type: 2} m_Animations: - {fileID: 7400000, guid: 6c40ba921358dac448ccc70202ac898a, type: 2} m_WrapMode: 0 m_PlayAutomatically: 1 m_AnimatePhysics: 0 + m_UpdateMode: 0 m_CullingType: 0 --- !u!1 &78868669 GameObject: @@ -324,7 +321,7 @@ RectTransform: m_Pivot: {x: 0.5, y: 0.5} --- !u!95 &87785590 Animator: - serializedVersion: 5 + serializedVersion: 7 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -338,6 +335,7 @@ Animator: m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 m_StabilizeFeet: 0 + m_AnimatePhysics: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 @@ -424,13 +422,14 @@ Animation: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 154129647} m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Animation: {fileID: 7400000, guid: 6c23d68c4b0445148a1b46ed07b1ecb6, type: 2} m_Animations: - {fileID: 7400000, guid: 6c23d68c4b0445148a1b46ed07b1ecb6, type: 2} m_WrapMode: 0 m_PlayAutomatically: 1 m_AnimatePhysics: 0 + m_UpdateMode: 0 m_CullingType: 0 --- !u!114 &154129650 MonoBehaviour: @@ -495,15 +494,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -574,7 +575,7 @@ RectTransform: m_Pivot: {x: 0.5, y: 0.5} --- !u!95 &307201469 Animator: - serializedVersion: 5 + serializedVersion: 7 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -588,6 +589,7 @@ Animator: m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 m_StabilizeFeet: 0 + m_AnimatePhysics: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 @@ -958,13 +960,14 @@ Animation: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 496720120} m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Animation: {fileID: 7400000, guid: 97b6752026eacdd4a84d4086367839ce, type: 2} m_Animations: - {fileID: 7400000, guid: 97b6752026eacdd4a84d4086367839ce, type: 2} m_WrapMode: 0 m_PlayAutomatically: 1 m_AnimatePhysics: 0 + m_UpdateMode: 0 m_CullingType: 0 --- !u!1 &514680250 GameObject: @@ -1065,7 +1068,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 576358554} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 040287643b9fdae4095a418d31927fde, type: 3} m_Name: @@ -1131,13 +1134,14 @@ Animation: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 595937125} m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Animation: {fileID: 7400000, guid: 8a619a3f2d26236429c542df6d825825, type: 2} m_Animations: - {fileID: 7400000, guid: 8a619a3f2d26236429c542df6d825825, type: 2} m_WrapMode: 0 m_PlayAutomatically: 1 m_AnimatePhysics: 0 + m_UpdateMode: 0 m_CullingType: 0 --- !u!114 &595937128 MonoBehaviour: @@ -1220,13 +1224,14 @@ Animation: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 616631032} m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Animation: {fileID: 7400000, guid: 056e4c902929fd34b8933bf62182646e, type: 2} m_Animations: - {fileID: 7400000, guid: 056e4c902929fd34b8933bf62182646e, type: 2} m_WrapMode: 0 m_PlayAutomatically: 1 m_AnimatePhysics: 0 + m_UpdateMode: 0 m_CullingType: 0 --- !u!114 &616631035 MonoBehaviour: @@ -1387,6 +1392,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 3147574454562838623, guid: ec5007446d8bbca48bf02b3a7e752da1, type: 3} + propertyPath: GlobalObjectIdHash + value: 4055791953 + objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 2042633577611342856, guid: ec5007446d8bbca48bf02b3a7e752da1, type: 3} m_RemovedGameObjects: [] @@ -1809,13 +1818,14 @@ Animation: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1526912310} m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Animation: {fileID: 7400000, guid: 6c23d68c4b0445148a1b46ed07b1ecb6, type: 2} m_Animations: - {fileID: 7400000, guid: 6c23d68c4b0445148a1b46ed07b1ecb6, type: 2} m_WrapMode: 0 m_PlayAutomatically: 1 m_AnimatePhysics: 0 + m_UpdateMode: 0 m_CullingType: 0 --- !u!1 &1612955651 GameObject: @@ -1966,13 +1976,14 @@ Animation: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1686695106} m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Animation: {fileID: 7400000, guid: 3dc656a9ee0128c4685b8cb9066e0f41, type: 2} m_Animations: - {fileID: 7400000, guid: 3dc656a9ee0128c4685b8cb9066e0f41, type: 2} m_WrapMode: 0 m_PlayAutomatically: 1 m_AnimatePhysics: 0 + m_UpdateMode: 0 m_CullingType: 0 --- !u!114 &1686695109 MonoBehaviour: @@ -2286,6 +2297,7 @@ GameObject: - component: {fileID: 2132464282} - component: {fileID: 2132464281} - component: {fileID: 2132464284} + - component: {fileID: 2132464285} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -2411,6 +2423,103 @@ MonoBehaviour: mipBias: 0 varianceClampScale: 0.9 contrastAdaptiveSharpening: 0 +--- !u!82 &2132464285 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2132464280} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 854b42033fd862844aed3740a9bdf1ee, type: 3} + m_Resource: {fileID: 8300000, guid: 854b42033fd862844aed3740a9bdf1ee, type: 3} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 1 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0