diff --git a/Assets/Fonts/NEW/NexaRegular COOL.asset b/Assets/Fonts/NEW/NexaRegular COOL.asset index 25a115d..3429684 100644 --- a/Assets/Fonts/NEW/NexaRegular COOL.asset +++ b/Assets/Fonts/NEW/NexaRegular COOL.asset @@ -11349,7 +11349,7 @@ Material: - _ClipRect: {r: -32767, g: -32767, b: 32767, a: 32767} - _EnvMatrixRotation: {r: 0, g: 0, b: 0, a: 0} - _FaceColor: {r: 1, g: 1, b: 1, a: 1} - - _GlowColor: {r: 1, g: 0, b: 0.8832669, a: 1} + - _GlowColor: {r: 1, g: 0.77535063, b: 0, a: 1} - _MaskCoord: {r: 0, g: 0, b: 32767, a: 32767} - _OutlineColor: {r: 0.554717, g: 0.554717, b: 0.554717, a: 1} - _ReflectFaceColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/Prefabs/EffectMedal Razbiv.prefab b/Assets/Prefabs/EffectMedal Razbiv.prefab index 4f588fd..c830a2a 100644 --- a/Assets/Prefabs/EffectMedal Razbiv.prefab +++ b/Assets/Prefabs/EffectMedal Razbiv.prefab @@ -11,7 +11,6 @@ GameObject: - component: {fileID: 1934001747030340478} - component: {fileID: 6682825986629121117} - component: {fileID: 5304695959123045136} - - component: {fileID: 3734482736062713757} m_Layer: 0 m_Name: EffectMedal Razbiv m_TagString: Untagged @@ -4831,99 +4830,3 @@ ParticleSystemRenderer: m_MeshWeighting2: 1 m_MeshWeighting3: 1 m_MaskInteraction: 0 ---- !u!82 &3734482736062713757 -AudioSource: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4693170823100873933} - m_Enabled: 1 - serializedVersion: 4 - OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 8300000, guid: 6f2175ed1cc28524d8658732ee85f0d7, type: 3} - m_PlayOnAwake: 1 - m_Volume: 1 - m_Pitch: 1 - Loop: 0 - Mute: 0 - Spatialize: 0 - SpatializePostEffects: 0 - Priority: 128 - DopplerLevel: 1 - MinDistance: 1 - MaxDistance: 500 - Pan2D: 0 - rolloffMode: 0 - BypassEffects: 0 - BypassListenerEffects: 0 - BypassReverbZones: 0 - rolloffCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - panLevelCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - spreadCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - reverbZoneMixCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 diff --git a/Assets/Prefabs/EffectMedalCollecting.prefab b/Assets/Prefabs/EffectMedalCollecting.prefab index 2f1d7df..5165a64 100644 --- a/Assets/Prefabs/EffectMedalCollecting.prefab +++ b/Assets/Prefabs/EffectMedalCollecting.prefab @@ -11,7 +11,6 @@ GameObject: - component: {fileID: 5239249465097018595} - component: {fileID: 5236451302430057120} - component: {fileID: 5820331991878566820} - - component: {fileID: -6709214592579957364} m_Layer: 0 m_Name: EffectMedalCollecting m_TagString: Untagged @@ -4831,99 +4830,3 @@ ParticleSystemRenderer: m_MeshWeighting2: 1 m_MeshWeighting3: 1 m_MaskInteraction: 0 ---- !u!82 &-6709214592579957364 -AudioSource: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5918934508201492763} - m_Enabled: 1 - serializedVersion: 4 - OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 8300000, guid: 7fb340d179cafc04cb2e4baa2ddde96f, type: 3} - m_PlayOnAwake: 1 - m_Volume: 1 - m_Pitch: 1 - Loop: 0 - Mute: 0 - Spatialize: 0 - SpatializePostEffects: 0 - Priority: 128 - DopplerLevel: 1 - MinDistance: 1 - MaxDistance: 500 - Pan2D: 0 - rolloffMode: 0 - BypassEffects: 0 - BypassListenerEffects: 0 - BypassReverbZones: 0 - rolloffCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - panLevelCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - spreadCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - reverbZoneMixCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 diff --git a/Assets/Prefabs/Шкала.prefab b/Assets/Prefabs/Шкала.prefab index 3d2cdf2..8ccc7c7 100644 --- a/Assets/Prefabs/Шкала.prefab +++ b/Assets/Prefabs/Шкала.prefab @@ -5174,6 +5174,8 @@ MonoBehaviour: count: 0 CommonAnimator: {fileID: 34621677912034804} PrizeAnimator: {fileID: 5154886500150386823} + plusMedal: {fileID: 8300000, guid: 7fb340d179cafc04cb2e4baa2ddde96f, type: 3} + minusMedal: {fileID: 8300000, guid: 6f2175ed1cc28524d8658732ee85f0d7, type: 3} --- !u!95 &34621677912034804 Animator: serializedVersion: 5 diff --git a/Assets/Scenes/GameScene3D.unity b/Assets/Scenes/GameScene3D.unity index 2921b27..6979ebe 100644 --- a/Assets/Scenes/GameScene3D.unity +++ b/Assets/Scenes/GameScene3D.unity @@ -2428,11 +2428,11 @@ MonoBehaviour: IconSize: 100 PointSize: 30 SubpointSize: 15 - PointOffsetX: 75 + PointOffsetX: 100 LinkWidth: 2 - StrokeWidth: 10.53 - StrokeGap: 2 - prizetextFontsize: 22 + StrokeWidth: 12 + StrokeGap: 3 + prizetextFontsize: 26 instructionFontsize: 22 giftImageSizeMultiplier: 1 circle: {fileID: -2413806693520163455, guid: ebe73ca9363db456bacf42c025bb4847, type: 3} @@ -4523,8 +4523,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 331.4, y: 0} - m_SizeDelta: {x: 429.2, y: 540} + m_AnchoredPosition: {x: 388.99014, y: 0} + m_SizeDelta: {x: 411.97, y: 540} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &219261900 MonoBehaviour: @@ -7931,6 +7931,14 @@ PrefabInstance: propertyPath: m_Name value: "\u0428\u043A\u0430\u043B\u0430\u0418\u0433\u0440\u043E\u043A2" objectReference: {fileID: 0} + - target: {fileID: 6698109479490350841, guid: 5184cc10cdfe613439bfd695689fa234, type: 3} + propertyPath: plusMedal + value: + objectReference: {fileID: 8300000, guid: 7fb340d179cafc04cb2e4baa2ddde96f, type: 3} + - target: {fileID: 6698109479490350841, guid: 5184cc10cdfe613439bfd695689fa234, type: 3} + propertyPath: minusMedal + value: + objectReference: {fileID: 8300000, guid: 6f2175ed1cc28524d8658732ee85f0d7, type: 3} - target: {fileID: 6698109479490350841, guid: 5184cc10cdfe613439bfd695689fa234, type: 3} propertyPath: ParticleColor.b value: 1 @@ -34589,8 +34597,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -214.6, y: 0} - m_SizeDelta: {x: 662.8, y: 540} + m_AnchoredPosition: {x: -208.25, y: 0} + m_SizeDelta: {x: 762.55, y: 540} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1156371199 MonoBehaviour: @@ -38033,6 +38041,14 @@ PrefabInstance: propertyPath: m_SortingLayerID value: 500331691 objectReference: {fileID: 0} + - target: {fileID: 6698109479490350841, guid: 5184cc10cdfe613439bfd695689fa234, type: 3} + propertyPath: plusMedal + value: + objectReference: {fileID: 8300000, guid: 7fb340d179cafc04cb2e4baa2ddde96f, type: 3} + - target: {fileID: 6698109479490350841, guid: 5184cc10cdfe613439bfd695689fa234, type: 3} + propertyPath: minusMedal + value: + objectReference: {fileID: 8300000, guid: 6f2175ed1cc28524d8658732ee85f0d7, type: 3} - target: {fileID: 6698109479490350841, guid: 5184cc10cdfe613439bfd695689fa234, type: 3} propertyPath: effectPrefab value: @@ -71126,6 +71142,14 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 6698109479490350841, guid: 5184cc10cdfe613439bfd695689fa234, type: 3} + propertyPath: plusMedal + value: + objectReference: {fileID: 8300000, guid: 7fb340d179cafc04cb2e4baa2ddde96f, type: 3} + - target: {fileID: 6698109479490350841, guid: 5184cc10cdfe613439bfd695689fa234, type: 3} + propertyPath: minusMedal + value: + objectReference: {fileID: 8300000, guid: 6f2175ed1cc28524d8658732ee85f0d7, type: 3} - target: {fileID: 6698109479490350841, guid: 5184cc10cdfe613439bfd695689fa234, type: 3} propertyPath: effectPrefab value: diff --git a/Assets/Scripts/VictoryScale.cs b/Assets/Scripts/VictoryScale.cs index 71b4cb0..0087c34 100644 --- a/Assets/Scripts/VictoryScale.cs +++ b/Assets/Scripts/VictoryScale.cs @@ -19,7 +19,8 @@ public class VictoryScale : MonoBehaviour [SerializeField] Animator CommonAnimator; [SerializeField] Animator PrizeAnimator; - + [SerializeField] private AudioClip plusMedal; + [SerializeField] private AudioClip minusMedal; private void OnEnable() @@ -86,6 +87,7 @@ public class VictoryScale : MonoBehaviour private void EnableMedal(int index) { GameObject effect = CollectEffect; + SoundManager.instance.playClip(plusMedal); Instantiate(effect, medals[index].position, Quaternion.identity); medals[index].gameObject.SetActive(true); } @@ -93,6 +95,7 @@ public class VictoryScale : MonoBehaviour public void DisableMedal(int index) { GameObject effect = RemoveEffect; + SoundManager.instance.playClip(minusMedal); Instantiate(effect, medals[index].position, Quaternion.identity); medals[index].gameObject.SetActive(false); } diff --git a/Assets/Scripts/WinPanel.cs b/Assets/Scripts/WinPanel.cs index 1625855..d001b65 100644 --- a/Assets/Scripts/WinPanel.cs +++ b/Assets/Scripts/WinPanel.cs @@ -23,7 +23,7 @@ public class WinPanel : MonoBehaviour winBot.SetActive(true); break; } - sound.volume = 1; + sound.volume = SettingsManager.GetFloat("SoundsVolume", 0); sound.Play(); StartCoroutine(OpenPanel()); @@ -56,7 +56,6 @@ public class WinPanel : MonoBehaviour param -= Time.deltaTime; param = Mathf.Clamp01(param); transform.localScale = new Vector3(1, param, 1); - sound.volume = param; yield return null; }