diff --git a/Assets/Scenes/GameScene3D.unity b/Assets/Scenes/GameScene3D.unity index 61c980e..8016a1b 100644 --- a/Assets/Scenes/GameScene3D.unity +++ b/Assets/Scenes/GameScene3D.unity @@ -1186,135 +1186,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &71076714 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 71076716} - - component: {fileID: 71076715} - m_Layer: 0 - m_Name: falling - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!82 &71076715 -AudioSource: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 71076714} - m_Enabled: 1 - serializedVersion: 4 - OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 0} - m_Resource: {fileID: 8300000, guid: ace1a1deb536e2f40afea144deb94ee7, type: 3} - m_PlayOnAwake: 0 - m_Volume: 1 - m_Pitch: 1 - Loop: 0 - Mute: 0 - Spatialize: 0 - SpatializePostEffects: 0 - Priority: 128 - DopplerLevel: 1 - MinDistance: 1 - MaxDistance: 500 - Pan2D: 0 - rolloffMode: 0 - BypassEffects: 0 - BypassListenerEffects: 0 - BypassReverbZones: 0 - rolloffCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - panLevelCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - spreadCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - reverbZoneMixCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 ---- !u!4 &71076716 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 71076714} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.72745085, y: 0.32872033, z: -0.007429284} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 151433695} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &74905316 GameObject: m_ObjectHideFlags: 0 @@ -2001,6 +1872,8 @@ GameObject: m_Component: - component: {fileID: 151433695} - component: {fileID: 151433694} + - component: {fileID: 151433697} + - component: {fileID: 151433696} m_Layer: 0 m_Name: SoundManager m_TagString: Untagged @@ -2020,23 +1893,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e756e5e8684bbf643834dcad30123ebf, type: 3} m_Name: m_EditorClassIdentifier: - chipLandSound: {fileID: 1874015818} - chipDownSound: {fileID: 71076715} - down1: {fileID: 8300000, guid: 08f58e4f459a963469a7b50b60bc25fd, type: 3} - down2: {fileID: 8300000, guid: ace1a1deb536e2f40afea144deb94ee7, type: 3} - VideoAudio: {fileID: 172285187} - music: {fileID: 525996511} - wrongSound: {fileID: 627356410} - winEffect: {fileID: 1079625009} - addCoin: {fileID: 2106690468} - removeCoin: {fileID: 670562165} - noMoney: {fileID: 1448709066} - explosion: {fileID: 1235843521} - choose: {fileID: 1703329793} - timer: {fileID: 899274035} - switchEffectPrefab: {fileID: 2610659100565043189, guid: 5d8706b81b3dfae4f8f7c5d49d659cb2, type: 3} - Player1Land: {fileID: 2610659100565043189, guid: 1b275e29696820140be2ae6fa7cca3a5, type: 3} - Player2Land: {fileID: 2610659100565043189, guid: b3b0c5cfeae48cd408bc39678ff7d125, type: 3} + _musicSource: {fileID: 151433697} + _sfxSource: {fileID: 151433696} --- !u!4 &151433695 Transform: m_ObjectHideFlags: 0 @@ -2049,20 +1907,203 @@ Transform: m_LocalPosition: {x: 5, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 71076716} - - {fileID: 525996512} - - {fileID: 627356411} - - {fileID: 1079625010} - - {fileID: 1874015819} - - {fileID: 2106690467} - - {fileID: 670562166} - - {fileID: 1448709067} - - {fileID: 1235843520} - - {fileID: 1703329794} - - {fileID: 899274036} + m_Children: [] m_Father: {fileID: 259182280} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &151433696 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 151433692} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} + m_PlayOnAwake: 0 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!82 &151433697 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 151433692} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_Resource: {fileID: 8300000, guid: a2e8f041b3f938d4e8846a47ef306539, 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!1 &157258767 GameObject: m_ObjectHideFlags: 0 @@ -5613,135 +5654,6 @@ MonoBehaviour: m_VarianceClampScale: 0.9 m_ContrastAdaptiveSharpening: 0 m_Version: 2 ---- !u!1 &525996510 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 525996512} - - component: {fileID: 525996511} - m_Layer: 0 - m_Name: FonMusic - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!82 &525996511 -AudioSource: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 525996510} - m_Enabled: 1 - serializedVersion: 4 - OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 0} - m_Resource: {fileID: 8300000, guid: a2e8f041b3f938d4e8846a47ef306539, 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!4 &525996512 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 525996510} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -1.658225, y: 1.508986, z: 0.023267653} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 151433695} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &557139805 GameObject: m_ObjectHideFlags: 0 @@ -6445,135 +6357,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 616524721} m_CullTransparentMesh: 1 ---- !u!1 &627356409 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 627356411} - - component: {fileID: 627356410} - m_Layer: 0 - m_Name: WrongSound - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!82 &627356410 -AudioSource: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 627356409} - m_Enabled: 1 - serializedVersion: 4 - OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 0} - m_Resource: {fileID: 8300000, guid: 1954eabc85d17bd47972cda7a84e7afa, type: 3} - m_PlayOnAwake: 0 - m_Volume: 1 - m_Pitch: 1 - Loop: 0 - Mute: 0 - Spatialize: 0 - SpatializePostEffects: 0 - Priority: 128 - DopplerLevel: 1 - MinDistance: 1 - MaxDistance: 500 - Pan2D: 0 - rolloffMode: 0 - BypassEffects: 0 - BypassListenerEffects: 0 - BypassReverbZones: 0 - rolloffCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - panLevelCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - spreadCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - reverbZoneMixCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 ---- !u!4 &627356411 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 627356409} - serializedVersion: 2 - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 151433695} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &662223607 GameObject: m_ObjectHideFlags: 0 @@ -6913,135 +6696,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 668427084} m_CullTransparentMesh: 1 ---- !u!1 &670562164 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 670562166} - - component: {fileID: 670562165} - m_Layer: 0 - m_Name: RemoveCoin - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!82 &670562165 -AudioSource: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 670562164} - m_Enabled: 1 - serializedVersion: 4 - OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 0} - m_Resource: {fileID: 8300000, guid: 8c773283f9de53543b2c44cd738d48f7, type: 3} - m_PlayOnAwake: 0 - m_Volume: 1 - m_Pitch: 1 - Loop: 0 - Mute: 0 - Spatialize: 0 - SpatializePostEffects: 0 - Priority: 128 - DopplerLevel: 1 - MinDistance: 1 - MaxDistance: 500 - Pan2D: 0 - rolloffMode: 0 - BypassEffects: 0 - BypassListenerEffects: 0 - BypassReverbZones: 0 - rolloffCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - panLevelCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - spreadCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - reverbZoneMixCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 ---- !u!4 &670562166 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 670562164} - serializedVersion: 2 - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 151433695} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &679125155 GameObject: m_ObjectHideFlags: 0 @@ -8539,135 +8193,6 @@ CanvasGroup: m_Interactable: 0 m_BlocksRaycasts: 0 m_IgnoreParentGroups: 0 ---- !u!1 &899274034 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 899274036} - - component: {fileID: 899274035} - m_Layer: 0 - m_Name: "\u0411\u0443\u0434\u0438\u043B\u044C\u043D\u0438\u043A" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!82 &899274035 -AudioSource: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 899274034} - m_Enabled: 1 - serializedVersion: 4 - OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 0} - m_Resource: {fileID: 8300000, guid: db339a9f1ff51964ebce93696ce37ba5, type: 3} - m_PlayOnAwake: 0 - m_Volume: 1 - m_Pitch: 1 - Loop: 0 - Mute: 0 - Spatialize: 0 - SpatializePostEffects: 0 - Priority: 128 - DopplerLevel: 1 - MinDistance: 1 - MaxDistance: 500 - Pan2D: 0 - rolloffMode: 0 - BypassEffects: 0 - BypassListenerEffects: 0 - BypassReverbZones: 0 - rolloffCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - panLevelCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - spreadCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - reverbZoneMixCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 ---- !u!4 &899274036 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 899274034} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.72745085, y: 0.32872033, z: -0.007429284} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 151433695} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &907092511 GameObject: m_ObjectHideFlags: 0 @@ -9949,135 +9474,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1079482313} m_CullTransparentMesh: 1 ---- !u!1 &1079625008 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1079625010} - - component: {fileID: 1079625009} - m_Layer: 0 - m_Name: winSound - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!82 &1079625009 -AudioSource: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1079625008} - m_Enabled: 1 - serializedVersion: 4 - OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 0} - m_Resource: {fileID: 8300000, guid: 3472c4af594600544b2663743ecea72c, type: 3} - m_PlayOnAwake: 0 - m_Volume: 0.548 - m_Pitch: 1 - Loop: 0 - Mute: 0 - Spatialize: 0 - SpatializePostEffects: 0 - Priority: 128 - DopplerLevel: 1 - MinDistance: 1 - MaxDistance: 500 - Pan2D: 0 - rolloffMode: 0 - BypassEffects: 0 - BypassListenerEffects: 0 - BypassReverbZones: 0 - rolloffCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - panLevelCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - spreadCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - reverbZoneMixCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 ---- !u!4 &1079625010 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1079625008} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.72745085, y: 0.32872033, z: -0.007429284} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 151433695} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1081324695 GameObject: m_ObjectHideFlags: 0 @@ -11561,135 +10957,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1232377787} m_CullTransparentMesh: 1 ---- !u!1 &1235843519 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1235843520} - - component: {fileID: 1235843521} - m_Layer: 0 - m_Name: "\u0412\u0437\u0440\u044B\u0432" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1235843520 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1235843519} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.72745085, y: 0.32872033, z: -0.007429284} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 151433695} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!82 &1235843521 -AudioSource: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1235843519} - m_Enabled: 1 - serializedVersion: 4 - OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 0} - m_Resource: {fileID: 8300000, guid: d5a6f23944be64342a11b74040abea50, type: 3} - m_PlayOnAwake: 0 - m_Volume: 1 - m_Pitch: 1.6 - Loop: 0 - Mute: 0 - Spatialize: 0 - SpatializePostEffects: 0 - Priority: 128 - DopplerLevel: 1 - MinDistance: 1 - MaxDistance: 500 - Pan2D: 0 - rolloffMode: 0 - BypassEffects: 0 - BypassListenerEffects: 0 - BypassReverbZones: 0 - rolloffCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - panLevelCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - spreadCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - reverbZoneMixCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 --- !u!1 &1242584384 GameObject: m_ObjectHideFlags: 0 @@ -13207,135 +12474,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1432728894} m_CullTransparentMesh: 1 ---- !u!1 &1448709065 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1448709067} - - component: {fileID: 1448709066} - m_Layer: 0 - m_Name: NotEnoughMoney - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!82 &1448709066 -AudioSource: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1448709065} - m_Enabled: 1 - serializedVersion: 4 - OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 0} - m_Resource: {fileID: 8300000, guid: 2bd130daa76d7b94e9a53101470f5322, type: 3} - m_PlayOnAwake: 0 - m_Volume: 1 - m_Pitch: 1 - Loop: 0 - Mute: 0 - Spatialize: 0 - SpatializePostEffects: 0 - Priority: 128 - DopplerLevel: 1 - MinDistance: 1 - MaxDistance: 500 - Pan2D: 0 - rolloffMode: 0 - BypassEffects: 0 - BypassListenerEffects: 0 - BypassReverbZones: 0 - rolloffCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - panLevelCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - spreadCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - reverbZoneMixCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 ---- !u!4 &1448709067 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1448709065} - serializedVersion: 2 - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 151433695} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1450075490 GameObject: m_ObjectHideFlags: 0 @@ -15913,135 +15051,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1694584614} m_CullTransparentMesh: 1 ---- !u!1 &1703329792 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1703329794} - - component: {fileID: 1703329793} - m_Layer: 0 - m_Name: Choose - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!82 &1703329793 -AudioSource: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1703329792} - m_Enabled: 1 - serializedVersion: 4 - OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 0} - m_Resource: {fileID: 8300000, guid: f6487badb5f19654987d378966c5362e, type: 3} - m_PlayOnAwake: 0 - m_Volume: 1 - m_Pitch: 1 - Loop: 0 - Mute: 0 - Spatialize: 0 - SpatializePostEffects: 0 - Priority: 128 - DopplerLevel: 1 - MinDistance: 1 - MaxDistance: 500 - Pan2D: 0 - rolloffMode: 0 - BypassEffects: 0 - BypassListenerEffects: 0 - BypassReverbZones: 0 - rolloffCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - panLevelCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - spreadCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - reverbZoneMixCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 ---- !u!4 &1703329794 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1703329792} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.72745085, y: 0.32872033, z: -0.007429284} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 151433695} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1731104200 GameObject: m_ObjectHideFlags: 0 @@ -16540,6 +15549,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Assembly-CSharp::Board pointer: {fileID: 1615046714} + _clearSound: {fileID: 8300000, guid: d5a6f23944be64342a11b74040abea50, type: 3} _pvpInnerColor: {r: 0.6313726, g: 0.9960785, b: 0.15294118, a: 1} _pvpOutlineColor: {r: 1, g: 0.92549026, b: 0.003921569, a: 1} _pvpCellsColor: {r: 1, g: 0.92549026, b: 0.003921569, a: 1} @@ -17587,135 +16597,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1868972345} m_CullTransparentMesh: 1 ---- !u!1 &1874015817 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1874015819} - - component: {fileID: 1874015818} - m_Layer: 0 - m_Name: land - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!82 &1874015818 -AudioSource: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1874015817} - m_Enabled: 1 - serializedVersion: 4 - OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 0} - m_Resource: {fileID: 8300000, guid: 64844d11163d0cc4e88a797a49a0743d, type: 3} - m_PlayOnAwake: 0 - m_Volume: 1 - m_Pitch: 1.55 - Loop: 0 - Mute: 0 - Spatialize: 0 - SpatializePostEffects: 0 - Priority: 128 - DopplerLevel: 1 - MinDistance: 1 - MaxDistance: 500 - Pan2D: 0 - rolloffMode: 0 - BypassEffects: 0 - BypassListenerEffects: 0 - BypassReverbZones: 0 - rolloffCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - panLevelCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - spreadCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - reverbZoneMixCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 ---- !u!4 &1874015819 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1874015817} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.72745085, y: 0.32872033, z: -0.007429284} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 151433695} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1890198495 GameObject: m_ObjectHideFlags: 0 @@ -21142,135 +20023,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2096785945} m_CullTransparentMesh: 1 ---- !u!1 &2106690466 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2106690467} - - component: {fileID: 2106690468} - m_Layer: 0 - m_Name: AddCoin - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2106690467 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2106690466} - serializedVersion: 2 - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 151433695} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!82 &2106690468 -AudioSource: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2106690466} - m_Enabled: 1 - serializedVersion: 4 - OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 0} - m_Resource: {fileID: 8300000, guid: 6052462f43b4b0d4cafb0b1cafabda00, type: 3} - m_PlayOnAwake: 0 - m_Volume: 1 - m_Pitch: 1 - Loop: 0 - Mute: 0 - Spatialize: 0 - SpatializePostEffects: 0 - Priority: 128 - DopplerLevel: 1 - MinDistance: 1 - MaxDistance: 500 - Pan2D: 0 - rolloffMode: 0 - BypassEffects: 0 - BypassListenerEffects: 0 - BypassReverbZones: 0 - rolloffCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - panLevelCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - spreadCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - reverbZoneMixCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 --- !u!1 &2109370309 GameObject: m_ObjectHideFlags: 0 @@ -22756,6 +21508,18 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1122363135} m_Modifications: + - target: {fileID: 3244100895163941589, guid: 36522aeb3edb1f14eb882ff35e1a57bd, type: 3} + propertyPath: _coinAddedSound + value: + objectReference: {fileID: 8300000, guid: 6052462f43b4b0d4cafb0b1cafabda00, type: 3} + - target: {fileID: 3244100895163941589, guid: 36522aeb3edb1f14eb882ff35e1a57bd, type: 3} + propertyPath: _coinRemovedSound + value: + objectReference: {fileID: 8300000, guid: 8c773283f9de53543b2c44cd738d48f7, type: 3} + - target: {fileID: 3244100895163941589, guid: 36522aeb3edb1f14eb882ff35e1a57bd, type: 3} + propertyPath: _notEnoughMoneySound + value: + objectReference: {fileID: 8300000, guid: 2bd130daa76d7b94e9a53101470f5322, type: 3} - target: {fileID: 5596715831000475182, guid: 36522aeb3edb1f14eb882ff35e1a57bd, type: 3} propertyPath: m_Pivot.x value: 0.5 diff --git a/Assets/Scripts/Audio/SoundManager.cs b/Assets/Scripts/Audio/SoundManager.cs index 90148d4..0d06854 100644 --- a/Assets/Scripts/Audio/SoundManager.cs +++ b/Assets/Scripts/Audio/SoundManager.cs @@ -1,306 +1,129 @@ -using DG.Tweening; using System.Collections; +using DG.Tweening; using UnityEngine; -//зависит от ComWrapper, SettingsManager public class SoundManager : MonoBehaviour { public static SoundManager instance; - public AudioSource chipLandSound; - public AudioSource chipDownSound; - public AudioClip down1, down2; - public AudioSource VideoAudio; - public AudioSource music; - public AudioSource wrongSound; - public AudioSource winEffect; - public AudioSource addCoin; - public AudioSource removeCoin; - public AudioSource noMoney; - public AudioSource explosion; - public AudioSource choose; - public AudioSource timer; - public GameObject switchEffectPrefab; - public GameObject Player1Land, Player2Land; - - // Кешированные длительности клипов - private float switchEffectDuration; - private float player1LandDuration; - private float player2LandDuration; - private float effectsVolume; - - // Кешированные AudioClips для пула - private AudioClip switchEffectClip; - private AudioClip player1LandClip; - private AudioClip player2LandClip; - - // Пул объектов для звуковых эффектов - private const int AUDIO_POOL_SIZE = 12; - private GameObject[] audioPool; - private int poolIndex = 0; + [SerializeField] private AudioSource _musicSource; + [SerializeField] private AudioSource _sfxSource; + private Tween _musicFadeTween; + private Coroutine _musicDuckCoroutine; public float MusicVolume { get; private set; } = 0.5f; - public float PromoVolume { get; private set; } = 0.5f; - public void FadeMusic(bool enable, float duration) + private void OnDestroy() { - float targetVolume = enable ? MusicVolume : 0; - music.DOFade(targetVolume, duration).PlayForward(); + if (instance != this) + return; + + SettingsManager.OnSettingsChanged -= ApplySettings; + _musicFadeTween?.Kill(); + instance = null; } public void Initialize() { - if (instance == null) - { - instance = this; - InitializeAudioPool(); - } - else + if (instance != null && instance != this) { Destroy(gameObject); + return; } - - //switchEffectClip = switchEffectPrefab.GetComponent().clip; - //switchEffectDuration = switchEffectClip.length; - - //player1LandClip = Player1Land.GetComponent().clip; - //player1LandDuration = player1LandClip.length; - - //player2LandClip = Player2Land.GetComponent().clip; - //player2LandDuration = player2LandClip.length; - - PaymentSystem.onCoinAdded += playAddCoin; - PaymentSystem.onCoinRemoved += playRemoveCoin; - PaymentSystem.OnNotEnoughMoney += playNoMoney; - + instance = this; ApplySettings(); + SettingsManager.OnSettingsChanged -= ApplySettings; SettingsManager.OnSettingsChanged += ApplySettings; + if (_musicSource.clip != null && _musicSource.isPlaying == false) + _musicSource.Play(); } - private void InitializeAudioPool() - { - audioPool = new GameObject[AUDIO_POOL_SIZE]; - for (int i = 0; i < AUDIO_POOL_SIZE; i++) - { - audioPool[i] = new GameObject("AudioPoolObject"); - audioPool[i].AddComponent(); - audioPool[i].SetActive(false); - } - } - - private GameObject GetPooledAudioObject() - { - GameObject obj = audioPool[poolIndex]; - poolIndex = (poolIndex + 1) % AUDIO_POOL_SIZE; - return obj; - } - - public void ApplySettings() { - print("Применяем настройки звука"); MusicVolume = SettingsManager.GetFloat(SettingKey.MUSIC_VOLUME); - PromoVolume = SettingsManager.GetFloat(SettingKey.PROMO_VOLUME); - - music.volume = MusicVolume; - - effectsVolume = SettingsManager.GetFloat(SettingKey.SOUNDS_VOLUME); - - // Массив для оптимизации установки громкости - AudioSource[] audioSources = { chipLandSound, chipDownSound, wrongSound, winEffect, - addCoin, removeCoin, noMoney, explosion, choose }; - - foreach (var audioSource in audioSources) - { - audioSource.volume = effectsVolume; - } - - VideoAudio.volume = PromoVolume; - + _musicSource.volume = MusicVolume; + _sfxSource.volume = SettingsManager.GetFloat(SettingKey.SOUNDS_VOLUME); } - public void SetMusicVolumeToVideo() => VideoAudio.volume = MusicVolume; - public void SetPromoVolumeToVideo() => VideoAudio.volume = PromoVolume; + public void PlaySfx(AudioClip clip) + => PlaySfx(clip, 1f); - public void playClip(AudioClip clip) + public void PlaySfx(AudioClip clip, float relativeVolume) { if (clip == null) { Debug.LogWarning("Не установлен звук"); return; } - GameObject effect = GetPooledAudioObject(); - AudioSource audioSource = effect.GetComponent(); - //AudioClip clipToPlay = GameManager.instance.currentPlayer == CellState.Player1 ? down1 : down2; - AudioClip clipToPlay = clip; - - - - audioSource.clip = clipToPlay; - audioSource.pitch = 1; - audioSource.volume = effectsVolume; - - effect.SetActive(true); - audioSource.Play(); - - // Возвращаем в пул через время клипа - StartCoroutine(ReturnToPool(effect, clipToPlay.length)); + _sfxSource.PlayOneShot(clip, Mathf.Max(0f, relativeVolume)); } - public void playClip(AudioClip clip, float volume) + public void FadeMusic(bool enable, float duration) { - if (clip == null) - { - Debug.LogWarning("Не установлен звук"); + StopMusicTransitions(); + float targetVolume = enable ? MusicVolume : 0f; + _musicFadeTween = _musicSource.DOFade(targetVolume, duration); + _musicFadeTween.PlayForward(); + } + + public void DuckMusic(float fadeDuration, float holdDuration, float targetVolumePercent) + { + StopMusicTransitions(); + _musicDuckCoroutine = StartCoroutine( + DuckMusicCoroutine(fadeDuration, holdDuration, targetVolumePercent)); + } + + private void StopMusicTransitions() + { + _musicFadeTween?.Kill(); + _musicFadeTween = null; + + if (_musicDuckCoroutine == null) return; - } - GameObject effect = GetPooledAudioObject(); - AudioSource audioSource = effect.GetComponent(); - //AudioClip clipToPlay = GameManager.instance.currentPlayer == CellState.Player1 ? down1 : down2; - AudioClip clipToPlay = clip; - - - - audioSource.clip = clipToPlay; - audioSource.pitch = 1; - audioSource.volume = effectsVolume * volume; - - effect.SetActive(true); - audioSource.Play(); - - // Возвращаем в пул через время клипа - StartCoroutine(ReturnToPool(effect, clipToPlay.length)); - } - public void playDropDown() - { - - - // Используем пул объектов вместо создания новых - GameObject effect = GetPooledAudioObject(); - AudioSource audioSource = effect.GetComponent(); - - //AudioClip clipToPlay = GameManager.instance.currentPlayer == CellState.Player1 ? down1 : down2; - AudioClip clipToPlay = down2; - - - - audioSource.clip = clipToPlay; - //audioSource.pitch = 1 + Random.Range(0, 2) * 0.6f; - audioSource.pitch = GameManager.Instance.currentPlayer == Team.Player1 ? 1 : 1.3f; - audioSource.volume = effectsVolume; - - - effect.SetActive(true); - audioSource.Play(); - - // Возвращаем в пул через время клипа - StartCoroutine(ReturnToPool(effect, clipToPlay.length)); - } - public void playChipBounce() - { - // Используем пул объектов вместо Instantiate - GameObject effect = GetPooledAudioObject(); - AudioSource audioSource = effect.GetComponent(); - - // Выбираем нужный клип и длительность - - AudioClip clipToPlay = player1LandClip; - float duration = player1LandDuration; - - audioSource.clip = clipToPlay; - audioSource.volume = effectsVolume; - audioSource.pitch = GameManager.Instance.currentPlayer == Team.Player1 ? 0.8f : 0.85f; - - effect.SetActive(true); - audioSource.Play(); - // Возвращаем в пул через время клипа - StartCoroutine(ReturnToPool(effect, duration)); + StopCoroutine(_musicDuckCoroutine); + _musicDuckCoroutine = null; } - - - public void playSwitch() + private IEnumerator DuckMusicCoroutine( + float fadeDuration, + float holdDuration, + float targetVolumePercent) { - // Используем пул объектов вместо Instantiate - GameObject effect = GetPooledAudioObject(); - AudioSource audioSource = effect.GetComponent(); - - audioSource.clip = switchEffectClip; - audioSource.volume = effectsVolume; - audioSource.pitch = 1f; // Сбрасываем pitch для consistency - - effect.SetActive(true); - audioSource.Play(); - - // Возвращаем в пул через время клипа - StartCoroutine(ReturnToPool(effect, switchEffectDuration)); - } - - private IEnumerator ReturnToPool(GameObject obj, float delay) - { - yield return new WaitForSeconds(delay); - obj.SetActive(false); - } - - Coroutine musicCoroutine; - public void MusicFade(float fadeDuration, float holdDuration, float targetVolumePercent) - { - if (musicCoroutine != null) - { - StopCoroutine(musicCoroutine); - } - - //восстанавливаю громкость - float musicVolume = SettingsManager.GetFloat(SettingKey.MUSIC_VOLUME); - music.volume = musicVolume; - - musicCoroutine = StartCoroutine(MusicFadeCoroutine(fadeDuration, holdDuration, targetVolumePercent)); - - } - IEnumerator MusicFadeCoroutine(float fadeDuration, float holdDuration, float targetVolumePercent) - { - float startVolume = music.volume; + float startVolume = MusicVolume; float targetVolume = startVolume * Mathf.Clamp01(targetVolumePercent); - // Fade to target volume - float timer = 0f; - while (timer < fadeDuration) - { - timer += Time.deltaTime; - float progress = timer / fadeDuration; - music.volume = Mathf.Lerp(startVolume, targetVolume, progress); - yield return null; - } - music.volume = targetVolume; // Ensure exact target volume + yield return FadeMusicVolume(startVolume, targetVolume, fadeDuration); - // Hold at target volume if (holdDuration > 0f) yield return new WaitForSeconds(holdDuration); - // Fade back to original volume - timer = 0f; - while (timer < fadeDuration) - { - timer += Time.deltaTime; - float progress = timer / fadeDuration; - music.volume = Mathf.Lerp(targetVolume, startVolume, progress); - yield return null; - } - music.volume = startVolume; // Ensure exact start volume + yield return FadeMusicVolume(targetVolume, MusicVolume, fadeDuration); + _musicDuckCoroutine = null; } + private IEnumerator FadeMusicVolume(float startVolume, float targetVolume, float duration) + { + if (duration <= 0f) + { + _musicSource.volume = targetVolume; + yield break; + } - public void playWrong() => wrongSound.Play(); - public void playWin() => winEffect.Play(); - public void playAddCoin(int newCount) => addCoin.Play(); - public void playRemoveCoin(int newCount) => removeCoin.Play(); - public void playNoMoney() => noMoney.Play(); - public void playExplosion() => explosion.Play(); - public void playChoose() => choose.Play(); - public void playTimer() => timer.Play(); + float elapsedTime = 0f; + + while (elapsedTime < duration) + { + elapsedTime += Time.deltaTime; + float progress = Mathf.Clamp01(elapsedTime / duration); + _musicSource.volume = Mathf.Lerp(startVolume, targetVolume, progress); + yield return null; + } + + _musicSource.volume = targetVolume; + } } diff --git a/Assets/Scripts/Characters/Replicas/MessageBox.cs b/Assets/Scripts/Characters/Replicas/MessageBox.cs index e7fa301..49005fe 100644 --- a/Assets/Scripts/Characters/Replicas/MessageBox.cs +++ b/Assets/Scripts/Characters/Replicas/MessageBox.cs @@ -112,7 +112,7 @@ namespace CharacterSystem if (SoundManager.instance != null) { - SoundManager.instance.MusicFade( + SoundManager.instance.DuckMusic( fadeDuration: 0.2f, holdDuration: Mathf.Max(replica.clip.length - 0.2f, 0f), targetVolumePercent: 0.5f); diff --git a/Assets/Scripts/Characters/VisualModule.cs b/Assets/Scripts/Characters/VisualModule.cs index 5da2955..a1afa54 100644 --- a/Assets/Scripts/Characters/VisualModule.cs +++ b/Assets/Scripts/Characters/VisualModule.cs @@ -101,7 +101,7 @@ namespace CharacterSystem } public void InvokeThrowChip() - => SoundManager.instance.playClip(chipThrowClip); + => SoundManager.instance.PlaySfx(chipThrowClip); public void ResetModule() { diff --git a/Assets/Scripts/Common/CoinCounter.cs b/Assets/Scripts/Common/CoinCounter.cs index 88a99f3..b081270 100644 --- a/Assets/Scripts/Common/CoinCounter.cs +++ b/Assets/Scripts/Common/CoinCounter.cs @@ -8,6 +8,9 @@ public class CoinCounter : MonoBehaviour public CanvasGroup balanceSignGroup; [SerializeField] private CanvasGroup _notEnoughSignGroup; [SerializeField] private RectTransform _notEnoughSign; + [SerializeField] private AudioClip _coinAddedSound; + [SerializeField] private AudioClip _coinRemovedSound; + [SerializeField] private AudioClip _notEnoughMoneySound; private bool _initialized; private Sequence _notEnoughSequence; @@ -71,8 +74,15 @@ public class CoinCounter : MonoBehaviour _notEnoughSequence.SetLoops(flashesCount); _notEnoughSequence.OnComplete(ResetNotEnoughSign); _notEnoughSequence.PlayForward(); + SoundManager.instance.PlaySfx(_notEnoughMoneySound); } + private void PlayCoinAddedSound(int amount) + => SoundManager.instance.PlaySfx(_coinAddedSound); + + private void PlayCoinRemovedSound(int amount) + => SoundManager.instance.PlaySfx(_coinRemovedSound); + private void StopNotEnoughAnimation() { _notEnoughSequence?.Kill(); @@ -90,6 +100,8 @@ public class CoinCounter : MonoBehaviour { Unsubscribe(); PaymentSystem.OnBalanceChanged += UpdateBalanceLabel; + PaymentSystem.onCoinAdded += PlayCoinAddedSound; + PaymentSystem.onCoinRemoved += PlayCoinRemovedSound; PaymentSystem.OnNotEnoughMoney += PlayNotEnoughAnimation; SettingsManager.OnSettingsChanged += UpdateBalanceLabelBySettings; } @@ -97,6 +109,8 @@ public class CoinCounter : MonoBehaviour private void Unsubscribe() { PaymentSystem.OnBalanceChanged -= UpdateBalanceLabel; + PaymentSystem.onCoinAdded -= PlayCoinAddedSound; + PaymentSystem.onCoinRemoved -= PlayCoinRemovedSound; PaymentSystem.OnNotEnoughMoney -= PlayNotEnoughAnimation; SettingsManager.OnSettingsChanged -= UpdateBalanceLabelBySettings; } diff --git a/Assets/Scripts/Gameplay/Board.cs b/Assets/Scripts/Gameplay/Board.cs index bc0d331..9cc859b 100644 --- a/Assets/Scripts/Gameplay/Board.cs +++ b/Assets/Scripts/Gameplay/Board.cs @@ -7,6 +7,7 @@ using UnityEngine; public class Board : MonoBehaviour { [SerializeField] private ChipPointer pointer; + [SerializeField] private AudioClip _clearSound; [Header("PvP colors")] [SerializeField] private Color _pvpInnerColor = new Color(0.2f, 0.65f, 1f, 1f); @@ -116,7 +117,7 @@ public class Board : MonoBehaviour private void PerformChipsClear() { - SoundManager.instance.playExplosion(); + SoundManager.instance.PlaySfx(_clearSound); GameManager.Instance.currentChip?.RemoveFromField(); if (Grid == null) return; diff --git a/Assets/Scripts/Gameplay/Timer.cs b/Assets/Scripts/Gameplay/Timer.cs index e5f272b..0bb226c 100644 --- a/Assets/Scripts/Gameplay/Timer.cs +++ b/Assets/Scripts/Gameplay/Timer.cs @@ -1,75 +1,70 @@ -using TMPro; +using TMPro; using UnityEngine; using UnityEngine.Events; - +using UnityEngine.Serialization; public class Timer : MonoBehaviour { - [SerializeField] private float restTime; - private bool processing = false; - public TextMeshProUGUI TimeLabel; - - private bool recentlyPlayed = false; - private float lastSignalTime = 0; - public UnityEvent OnTimerEnded; + [FormerlySerializedAs("TimeLabel")] public TextMeshProUGUI timeLabel; - void Update() + [SerializeField, FormerlySerializedAs("restTime")] private float _restTime; + [SerializeField] private AudioClip _warningSound; + + private bool _processing; + private bool _recentlyPlayed; + private float _lastSignalTime; + + private void Update() { - if (processing) + if (_processing == false) + return; + + UiDraw(); + _restTime -= Time.deltaTime; + + if (_restTime <= 0f) { - UiDraw(); - - restTime -= Time.deltaTime; - - if (restTime <= 0) - { - restTime = 0; - StopTimer(); - OnTimerEnded?.Invoke(); - } - - int rest = (int)restTime; - if (!recentlyPlayed && (rest % 60 == 0 || rest == 30 || rest < 11)) - { - SoundManager.instance.playTimer(); - recentlyPlayed = true; - lastSignalTime = Time.time; - } - - if (recentlyPlayed) - { - if (Time.time - lastSignalTime >= 1f) - { - recentlyPlayed = false; - } - } + _restTime = 0f; + StopTimer(); + OnTimerEnded?.Invoke(); } + + int rest = (int)_restTime; + if (_recentlyPlayed == false && (rest % 60 == 0 || rest == 30 || rest < 11)) + { + SoundManager.instance.PlaySfx(_warningSound); + _recentlyPlayed = true; + _lastSignalTime = Time.time; + } + + if (_recentlyPlayed && Time.time - _lastSignalTime >= 1f) + _recentlyPlayed = false; } public void SetupTimer(float seconds) { - restTime = seconds; + _restTime = seconds; UiDraw(); } public void StartTimer() - { - processing = true; - } + => _processing = true; + public void StopTimer() - { - processing = false; - } - void UiDraw() - { - string minutes = ((int)(restTime / 60)).ToString(); - string seconds = ((int)(restTime % 60)).ToString(); + => _processing = false; - if (minutes.Length < 2) minutes = "0" + minutes; - if (seconds.Length < 2) seconds = "0" + seconds; + private void UiDraw() + { + string minutes = ((int)(_restTime / 60)).ToString(); + string seconds = ((int)(_restTime % 60)).ToString(); - string result = minutes + ":" + seconds; - TimeLabel.text = result; + if (minutes.Length < 2) + minutes = "0" + minutes; + + if (seconds.Length < 2) + seconds = "0" + seconds; + + timeLabel.text = minutes + ":" + seconds; } -} \ No newline at end of file +} diff --git a/Assets/Scripts/Media/VideoUtility.cs b/Assets/Scripts/Media/VideoUtility.cs index 090e398..ae40cfd 100644 --- a/Assets/Scripts/Media/VideoUtility.cs +++ b/Assets/Scripts/Media/VideoUtility.cs @@ -35,6 +35,9 @@ public class VideoUtility : MonoBehaviour PlayEnding(); } + private void OnDestroy() + => SettingsManager.OnSettingsChanged -= ApplyAudioSettings; + public void Initialize() { if (_instance == null) @@ -43,6 +46,9 @@ public class VideoUtility : MonoBehaviour ConfigureBackgroundPlayer(_primaryPlayer); ConfigureBackgroundPlayer(_secondaryPlayer); _activeBackgroundPlayer = _primaryPlayer; + ApplyAudioSettings(); + SettingsManager.OnSettingsChanged -= ApplyAudioSettings; + SettingsManager.OnSettingsChanged += ApplyAudioSettings; PlayBackgroundImmediately(_menuBackground); } @@ -187,4 +193,7 @@ public class VideoUtility : MonoBehaviour _audioSource.Play(); _primaryPlayer.Play(); } + + private void ApplyAudioSettings() + => _audioSource.volume = SettingsManager.GetFloat(SettingKey.PROMO_VOLUME); } diff --git a/Assets/Scripts/Notifications/NotificationSystem.cs b/Assets/Scripts/Notifications/NotificationSystem.cs index 7a3f069..f5a0df2 100644 --- a/Assets/Scripts/Notifications/NotificationSystem.cs +++ b/Assets/Scripts/Notifications/NotificationSystem.cs @@ -148,7 +148,7 @@ public class NotificationSystem : MonoBehaviour } //подождать - SoundManager.instance.playClip(notification.audioClip); + SoundManager.instance.PlaySfx(notification.audioClip); yield return new WaitForSeconds(standTime); //#ЗАДВИНУТЬ ВНИЗ diff --git a/Assets/Scripts/PrizeSystem/PrizeSystemManager.cs b/Assets/Scripts/PrizeSystem/PrizeSystemManager.cs index 1f0eae7..275952d 100644 --- a/Assets/Scripts/PrizeSystem/PrizeSystemManager.cs +++ b/Assets/Scripts/PrizeSystem/PrizeSystemManager.cs @@ -148,7 +148,7 @@ namespace PrizeSystem else { SetPrizingError(true); - SoundManager.instance.playClip(prizeErrorSound); + SoundManager.instance.PlaySfx(prizeErrorSound); } } if (atLeastOnePrize) @@ -208,7 +208,7 @@ namespace PrizeSystem int random = UnityEngine.Random.Range(0, PrizeNotificationSounds.Count); AudioClip notification = PrizeNotificationSounds[random]; - SoundManager.instance.playClip(notification); + SoundManager.instance.PlaySfx(notification); } public static Sprite GetPrizeIcon(PrizeType prizeType) diff --git a/Assets/Scripts/PrizeSystem/UI/PrizeButton.cs b/Assets/Scripts/PrizeSystem/UI/PrizeButton.cs index 8635e5d..60d7e3f 100644 --- a/Assets/Scripts/PrizeSystem/UI/PrizeButton.cs +++ b/Assets/Scripts/PrizeSystem/UI/PrizeButton.cs @@ -19,7 +19,7 @@ public class PrizeButton : MSignalButton _animation.AppendCallback(() => { OnPrize?.Invoke(_prizeType); - SoundManager.instance.playClip(_clip); + SoundManager.instance.PlaySfx(_clip); }); _animation.PlayForward(); diff --git a/Assets/Scripts/Settings/Controls/MSignalButton.cs b/Assets/Scripts/Settings/Controls/MSignalButton.cs index bd4c963..37eca9f 100644 --- a/Assets/Scripts/Settings/Controls/MSignalButton.cs +++ b/Assets/Scripts/Settings/Controls/MSignalButton.cs @@ -41,7 +41,7 @@ public class MSignalButton : MonoBehaviour _animation.AppendCallback(() => { OnClick?.Invoke(); - SoundManager.instance.playClip(_clip); + SoundManager.instance.PlaySfx(_clip); }); _animation.PlayForward(); @@ -73,4 +73,4 @@ public class MSignalButton : MonoBehaviour _animation = null; } } -} \ No newline at end of file +} diff --git a/Assets/Scripts/Settings/Controls/MToggle.cs b/Assets/Scripts/Settings/Controls/MToggle.cs index d8a68b1..c5a91c8 100644 --- a/Assets/Scripts/Settings/Controls/MToggle.cs +++ b/Assets/Scripts/Settings/Controls/MToggle.cs @@ -33,7 +33,7 @@ public class MToggle : MonoBehaviour public void SetValue(bool value) { Value = value; - SoundManager.instance.playClip(value ? EnableSound : DisableSound); + SoundManager.instance.PlaySfx(value ? EnableSound : DisableSound); StopAnimation(); _animation = GetAnimation(value); @@ -75,4 +75,4 @@ public class MToggle : MonoBehaviour _animation.Kill(); _animation = null; } -} \ No newline at end of file +} diff --git a/Assets/Scripts/Settings/Controls/SettingFunctions.cs b/Assets/Scripts/Settings/Controls/SettingFunctions.cs index a732d6e..aabc7e4 100644 --- a/Assets/Scripts/Settings/Controls/SettingFunctions.cs +++ b/Assets/Scripts/Settings/Controls/SettingFunctions.cs @@ -142,7 +142,7 @@ public class SettingFunctions : MonoBehaviour if (replica == null) continue; - SoundManager.instance.playClip(replica); + SoundManager.instance.PlaySfx(replica); return; } @@ -168,7 +168,7 @@ public class SettingFunctions : MonoBehaviour _activeQrTestPanel = null; if (SoundManager.instance != null) - SoundManager.instance.playClip(_qrTestUnavailableClip); + SoundManager.instance.PlaySfx(_qrTestUnavailableClip); return; } diff --git a/Assets/Scripts/Settings/Views/StringView.cs b/Assets/Scripts/Settings/Views/StringView.cs index 0859c55..38c81a0 100644 --- a/Assets/Scripts/Settings/Views/StringView.cs +++ b/Assets/Scripts/Settings/Views/StringView.cs @@ -20,7 +20,7 @@ public class StringView : BaseSettingView private void _stepper_OnValueChanged(string newValue) { CachedSetting.StringValue = newValue; - SoundManager.instance.playClip(SwitchClip); + SoundManager.instance.PlaySfx(SwitchClip); SettingsManager.TriggerSettingsChanged(); } -} \ No newline at end of file +} diff --git a/Assets/Scripts/UI/Promo/Promo.cs b/Assets/Scripts/UI/Promo/Promo.cs index 4fa8492..ced1363 100644 --- a/Assets/Scripts/UI/Promo/Promo.cs +++ b/Assets/Scripts/UI/Promo/Promo.cs @@ -29,7 +29,7 @@ public class Promo : MonoBehaviour, IControlable { KillActiveAnimation(); ControlsEnabled = true; - _audioSource.volume = SoundManager.instance.PromoVolume; + _audioSource.volume = SettingsManager.GetFloat(SettingKey.PROMO_VOLUME); _panel.gameObject.SetActive(true); _videoPlayer.Play(); _videoPlayer.loopPointReached += VideoEnded; @@ -85,4 +85,4 @@ public class Promo : MonoBehaviour, IControlable if (In.AnyButton()) _menuPromoTransit.GotoMenu(); } -} \ No newline at end of file +}