From 855ec29723e98efe0f8f56456e22b473b50e0f36 Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Sun, 19 Apr 2020 03:48:15 +0200 Subject: [PATCH] zzz --- Assets/Prefabs/Game Controller.prefab | 295 ++++++++++++++- .../Microgames/Test Microgame 2.prefab | 4 +- .../Prefabs/Microgames/Test Microgame.prefab | 4 +- Assets/Prefabs/UI/Lives Panel.prefab | 15 + Assets/Prefabs/UI/Score Panel.prefab | 39 +- Assets/Prefabs/UI/Static Background.prefab | 14 + Assets/Prefabs/UI/Time Panel.prefab | 14 + Assets/Prefabs/UI/Wheel Panel.prefab | 112 +++++- Assets/Scenes/Default.unity | 335 ++---------------- Assets/Scripts/Main/GameController.cs | 14 +- Assets/Scripts/Main/SoundPitchAdjust.cs | 24 ++ Assets/Scripts/Main/SoundPitchAdjust.cs.meta | 11 + .../Scripts/Microgame/MicrogameController.cs | 23 +- Assets/Scripts/Microgame/TestMicrogame.cs | 2 +- Assets/Scripts/UI/LivesPanel.cs | 2 +- Assets/Scripts/UI/MicrogamePanel.cs | 2 + Assets/Sound/wheel_boop.wav | 3 + Assets/Sound/wheel_boop.wav.meta | 22 ++ Assets/Sound/wheel_click.wav | 3 + Assets/Sound/wheel_click.wav.meta | 22 ++ Assets/Sprites/casella.png.meta | 128 +++++++ ProjectSettings/GraphicsSettings.asset | 7 +- ProjectSettings/UnityConnectSettings.asset | 2 +- 23 files changed, 767 insertions(+), 330 deletions(-) create mode 100644 Assets/Scripts/Main/SoundPitchAdjust.cs create mode 100644 Assets/Scripts/Main/SoundPitchAdjust.cs.meta create mode 100644 Assets/Sound/wheel_boop.wav create mode 100644 Assets/Sound/wheel_boop.wav.meta create mode 100644 Assets/Sound/wheel_click.wav create mode 100644 Assets/Sound/wheel_click.wav.meta create mode 100644 Assets/Sprites/casella.png.meta diff --git a/Assets/Prefabs/Game Controller.prefab b/Assets/Prefabs/Game Controller.prefab index 9da7937..810f4f0 100644 --- a/Assets/Prefabs/Game Controller.prefab +++ b/Assets/Prefabs/Game Controller.prefab @@ -42,7 +42,7 @@ Camera: m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 2 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_BackGroundColor: {r: 0, g: 0, b: 0, a: 1} m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 @@ -83,6 +83,146 @@ AudioListener: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 519420028} m_Enabled: 1 +--- !u!1 &934303051 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 934303052} + - component: {fileID: 934303053} + - component: {fileID: 934303054} + m_Layer: 0 + m_Name: Wheel Boop AudioSource + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &934303052 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 934303051} + 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: 742014442006323160} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &934303053 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 934303051} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: e5dcec8314ee41643b541ec9a60f18fe, type: 3} + m_PlayOnAwake: 0 + m_Volume: 0.34 + 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!114 &934303054 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 934303051} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1219c341d913e3e4e912d424f804a6b7, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &742014442006323162 GameObject: m_ObjectHideFlags: 0 @@ -112,6 +252,8 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 519420032} + - {fileID: 1824369216394371268} + - {fileID: 934303052} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -129,7 +271,156 @@ MonoBehaviour: m_EditorClassIdentifier: camera: {fileID: 0} startingLives: 4 + maxLives: 4 startingTimescale: 1 startingDifficulty: 1 startingScore: 0 - microgames: [] + microgames: + - {fileID: 1798768979100361691, guid: 630cd222aaffefe4cb13161eeca7bf03, type: 3} + - {fileID: -1447348138257578213, guid: 4b285685b4a4a4c49ab075aaecba236e, type: 3} + timescaleIncreaseFactor: 0.05 + wheelSelectionDelay: 0.05 + wheelSelectionTime: 2 + wheelDisplayTime: 2 + wheelClickAudioSource: {fileID: 5259517143936955431} + wheelBoopAudioSource: {fileID: 934303053} +--- !u!1 &839116773049434249 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1824369216394371268} + - component: {fileID: 5259517143936955431} + - component: {fileID: 1259775723} + m_Layer: 0 + m_Name: Wheel Click AudioSource + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1824369216394371268 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 839116773049434249} + 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: 742014442006323160} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &5259517143936955431 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 839116773049434249} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: c89c99f5b204ee84685547721ebd380a, type: 3} + m_PlayOnAwake: 0 + m_Volume: 0.2 + 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!114 &1259775723 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 839116773049434249} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1219c341d913e3e4e912d424f804a6b7, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/Prefabs/Microgames/Test Microgame 2.prefab b/Assets/Prefabs/Microgames/Test Microgame 2.prefab index b44a80b..452fab8 100644 --- a/Assets/Prefabs/Microgames/Test Microgame 2.prefab +++ b/Assets/Prefabs/Microgames/Test Microgame 2.prefab @@ -43,5 +43,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a2f6067f11d26b446b444ebbc8c54b50, type: 3} m_Name: m_EditorClassIdentifier: - microgameName: TESTATA startingTime: 4 + microgameName: URSELF + microgameNameColor: {r: 1, g: 0.3882353, b: 0.015686275, a: 1} + microgameNameFont: {fileID: 12800000, guid: 75c9cbfd49e877c468331f81fc132714, type: 3} diff --git a/Assets/Prefabs/Microgames/Test Microgame.prefab b/Assets/Prefabs/Microgames/Test Microgame.prefab index 217ca92..e3c5248 100644 --- a/Assets/Prefabs/Microgames/Test Microgame.prefab +++ b/Assets/Prefabs/Microgames/Test Microgame.prefab @@ -43,5 +43,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a2f6067f11d26b446b444ebbc8c54b50, type: 3} m_Name: m_EditorClassIdentifier: - microgameName: TESTER startingTime: 4 + microgameName: TESTER + microgameNameColor: {r: 0.015686274, g: 0.5258843, b: 1, a: 1} + microgameNameFont: {fileID: 12800000, guid: 75c9cbfd49e877c468331f81fc132714, type: 3} diff --git a/Assets/Prefabs/UI/Lives Panel.prefab b/Assets/Prefabs/UI/Lives Panel.prefab index cf90ed3..92b135d 100644 --- a/Assets/Prefabs/UI/Lives Panel.prefab +++ b/Assets/Prefabs/UI/Lives Panel.prefab @@ -10,6 +10,7 @@ GameObject: m_Component: - component: {fileID: 903729140753789853} - component: {fileID: 903729140753789852} + - component: {fileID: 548149272} m_Layer: 5 m_Name: Lives Panel m_TagString: Untagged @@ -52,3 +53,17 @@ MonoBehaviour: type: 3} lifeFull: {fileID: 21300000, guid: fc3a2bfc205f4934bbe9b6731864f902, type: 3} lifeEmpty: {fileID: 21300000, guid: 14110adfd90d7c64188cbd99eb444d7d, type: 3} + livesImagesGap: 12 +--- !u!114 &548149272 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 903729140753789854} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fed311aa263b18f4388ee281b1c72764, type: 3} + m_Name: + m_EditorClassIdentifier: + displayWhen: 0 diff --git a/Assets/Prefabs/UI/Score Panel.prefab b/Assets/Prefabs/UI/Score Panel.prefab index e915eb4..810b662 100644 --- a/Assets/Prefabs/UI/Score Panel.prefab +++ b/Assets/Prefabs/UI/Score Panel.prefab @@ -12,7 +12,7 @@ GameObject: - component: {fileID: 943358902} - component: {fileID: 943358901} m_Layer: 5 - m_Name: Score + m_Name: Text m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -58,17 +58,17 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.27450982, g: 0.75686276, b: 0.52156866, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 51 + m_Font: {fileID: 12800000, guid: 75c9cbfd49e877c468331f81fc132714, type: 3} + m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 5 + m_MinSize: 0 m_MaxSize: 51 m_Alignment: 3 m_AlignByGeometry: 0 @@ -140,7 +140,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 99105f4799d793046a16750012838841, type: 3} + m_Sprite: {fileID: 21300000, guid: bbf043ba8a6f2c341ad9db4d7e0f4b0a, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -160,6 +160,8 @@ GameObject: m_Component: - component: {fileID: 4957884999417998573} - component: {fileID: 4957884999417998579} + - component: {fileID: 3121501029723249967} + - component: {fileID: 3121501029723249969} m_Layer: 5 m_Name: Score Panel m_TagString: Untagged @@ -196,3 +198,28 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4957884999417998574} m_CullTransparentMesh: 0 +--- !u!114 &3121501029723249967 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4957884999417998574} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 68e459f5818c0884ca089d91defc1409, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &3121501029723249969 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4957884999417998574} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fed311aa263b18f4388ee281b1c72764, type: 3} + m_Name: + m_EditorClassIdentifier: + displayWhen: 0 diff --git a/Assets/Prefabs/UI/Static Background.prefab b/Assets/Prefabs/UI/Static Background.prefab index 979180a..b52274a 100644 --- a/Assets/Prefabs/UI/Static Background.prefab +++ b/Assets/Prefabs/UI/Static Background.prefab @@ -12,6 +12,7 @@ GameObject: - component: {fileID: 5804266078435074430} - component: {fileID: 5804266078435074429} - component: {fileID: 5804266078435074428} + - component: {fileID: 1519855736} m_Layer: 0 m_Name: Static Background m_TagString: Untagged @@ -94,3 +95,16 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!114 &1519855736 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5804266078435074427} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fed311aa263b18f4388ee281b1c72764, type: 3} + m_Name: + m_EditorClassIdentifier: + displayWhen: 2 diff --git a/Assets/Prefabs/UI/Time Panel.prefab b/Assets/Prefabs/UI/Time Panel.prefab index ff41b46..70847d5 100644 --- a/Assets/Prefabs/UI/Time Panel.prefab +++ b/Assets/Prefabs/UI/Time Panel.prefab @@ -10,6 +10,7 @@ GameObject: m_Component: - component: {fileID: 6450387887428008748} - component: {fileID: 8899329926894868071} + - component: {fileID: 1842189699} m_Layer: 5 m_Name: Time Panel m_TagString: Untagged @@ -49,6 +50,19 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b6be74c25dc4be24589a9f33539949b6, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &1842189699 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 386012858326575855} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fed311aa263b18f4388ee281b1c72764, type: 3} + m_Name: + m_EditorClassIdentifier: + displayWhen: 1 --- !u!1 &2446418358487178256 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/UI/Wheel Panel.prefab b/Assets/Prefabs/UI/Wheel Panel.prefab index cfd7b4e..ae3f58d 100644 --- a/Assets/Prefabs/UI/Wheel Panel.prefab +++ b/Assets/Prefabs/UI/Wheel Panel.prefab @@ -31,7 +31,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 62263835697235544} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} @@ -59,7 +59,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 0, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -90,6 +90,79 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d018469007e919d4d90cb08c6e810721, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &914644880 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 914644881} + - component: {fileID: 914644883} + - component: {fileID: 914644882} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &914644881 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 914644880} + 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: 62263835697235544} + m_RootOrder: 0 + 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: 0, y: -1.72} + m_SizeDelta: {x: 337.00037, y: 163.59747} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &914644883 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 914644880} + m_CullTransparentMesh: 0 +--- !u!114 &914644882 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 914644880} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 78a001f60740e4c4f93e7c007077cb97, type: 3} + m_Type: 2 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &1475586331092748119 GameObject: m_ObjectHideFlags: 0 @@ -99,6 +172,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1475586331092748118} + - component: {fileID: 1686871874} m_Layer: 5 m_Name: Wheel Panel m_TagString: Untagged @@ -128,6 +202,19 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -320, y: 634} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1686871874 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1475586331092748119} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fed311aa263b18f4388ee281b1c72764, type: 3} + m_Name: + m_EditorClassIdentifier: + displayWhen: 2 --- !u!1 &1475586332062904173 GameObject: m_ObjectHideFlags: 0 @@ -193,10 +280,10 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: 75c9cbfd49e877c468331f81fc132714, type: 3} - m_FontSize: 50 + m_FontSize: 45 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 5 + m_MinSize: 4 m_MaxSize: 84 m_Alignment: 5 m_AlignByGeometry: 0 @@ -204,7 +291,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: KEEP + m_Text: 'KEEP ' --- !u!1 &1475586332177117423 GameObject: m_ObjectHideFlags: 0 @@ -239,8 +326,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 295, y: 0} + m_AnchoredPosition: {x: 10, y: 0} + m_SizeDelta: {x: 300, y: 0} m_Pivot: {x: 1, y: 0.5} --- !u!222 &1475586332177117420 CanvasRenderer: @@ -270,10 +357,10 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: 75c9cbfd49e877c468331f81fc132714, type: 3} - m_FontSize: 50 + m_FontSize: 45 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 5 + m_MinSize: 0 m_MaxSize: 84 m_Alignment: 3 m_AlignByGeometry: 0 @@ -281,7 +368,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: ALIVE + m_Text: ' ALIVE' --- !u!1 &3876737460387516449 GameObject: m_ObjectHideFlags: 0 @@ -309,12 +396,13 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 914644881} - {fileID: 182637522} m_Father: {fileID: 1475586331092748118} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -27.5, y: 0} - m_SizeDelta: {x: -565, y: 0} + m_AnchoredPosition: {x: -30, y: 0} + m_SizeDelta: {x: -614, y: 0} m_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/Scenes/Default.unity b/Assets/Scenes/Default.unity index fb7e5b1..341a4ce 100644 --- a/Assets/Scenes/Default.unity +++ b/Assets/Scenes/Default.unity @@ -121,31 +121,12 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &548149269 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 903729140753789854, guid: 05cacb7278bee4f4e80876f7f0dd4d4a, - type: 3} - m_PrefabInstance: {fileID: 903729141283580811} - m_PrefabAsset: {fileID: 0} --- !u!224 &548149270 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 903729140753789853, guid: 05cacb7278bee4f4e80876f7f0dd4d4a, type: 3} m_PrefabInstance: {fileID: 903729141283580811} m_PrefabAsset: {fileID: 0} ---- !u!114 &548149272 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 548149269} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fed311aa263b18f4388ee281b1c72764, type: 3} - m_Name: - m_EditorClassIdentifier: - displayWhen: 0 --- !u!1 &706082052 GameObject: m_ObjectHideFlags: 0 @@ -194,10 +175,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} m_Name: m_EditorClassIdentifier: - m_UiScaleMode: 0 + m_UiScaleMode: 1 m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} + m_ReferenceResolution: {x: 1920, y: 1080} m_ScreenMatchMode: 0 m_MatchWidthOrHeight: 0 m_PhysicalUnit: 3 @@ -314,129 +295,18 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &914644880 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 914644881} - - component: {fileID: 914644883} - - component: {fileID: 914644882} - m_Layer: 5 - m_Name: Background - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &914644881 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 914644880} - 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: 1686871873} - m_RootOrder: 3 - 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: -27.5, y: -0.00068665} - m_SizeDelta: {x: 100, y: 208.49422} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &914644882 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 914644880} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 8775703ca5803e342869809d245f6553, type: 3} - m_Type: 0 - m_PreserveAspect: 1 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &914644883 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 914644880} - m_CullTransparentMesh: 0 ---- !u!1 &1686871872 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1475586331092748119, guid: 83b3c042c2cf3ce4fafc6b3346509ad9, - type: 3} - m_PrefabInstance: {fileID: 1475586331571591191} - m_PrefabAsset: {fileID: 0} --- !u!224 &1686871873 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 1475586331092748118, guid: 83b3c042c2cf3ce4fafc6b3346509ad9, type: 3} m_PrefabInstance: {fileID: 1475586331571591191} m_PrefabAsset: {fileID: 0} ---- !u!114 &1686871874 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1686871872} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fed311aa263b18f4388ee281b1c72764, type: 3} - m_Name: - m_EditorClassIdentifier: - displayWhen: 2 ---- !u!1 &1842189696 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 386012858326575855, guid: f55c76379fd1c594b9b5138efc539234, - type: 3} - m_PrefabInstance: {fileID: 3646290606250593900} - m_PrefabAsset: {fileID: 0} --- !u!224 &1842189697 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 6450387887428008748, guid: f55c76379fd1c594b9b5138efc539234, type: 3} m_PrefabInstance: {fileID: 3646290606250593900} m_PrefabAsset: {fileID: 0} ---- !u!114 &1842189699 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1842189696} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fed311aa263b18f4388ee281b1c72764, type: 3} - m_Name: - m_EditorClassIdentifier: - displayWhen: 1 --- !u!1001 &742014443134654871 PrefabInstance: m_ObjectHideFlags: 0 @@ -444,26 +314,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 519420031, guid: e2bb5f24fc04fd94fa7d6f04c3713df6, type: 3} - propertyPath: m_BackGroundColor.r - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 519420031, guid: e2bb5f24fc04fd94fa7d6f04c3713df6, type: 3} - propertyPath: m_BackGroundColor.g - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 519420031, guid: e2bb5f24fc04fd94fa7d6f04c3713df6, type: 3} - propertyPath: m_BackGroundColor.b - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 519420031, guid: e2bb5f24fc04fd94fa7d6f04c3713df6, type: 3} - propertyPath: m_BackGroundColor.a - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 519420031, guid: e2bb5f24fc04fd94fa7d6f04c3713df6, type: 3} - propertyPath: m_ClearFlags - value: 2 - objectReference: {fileID: 0} - target: {fileID: 742014442006323160, guid: e2bb5f24fc04fd94fa7d6f04c3713df6, type: 3} propertyPath: m_LocalPosition.x @@ -519,23 +369,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 742014442006323161, guid: e2bb5f24fc04fd94fa7d6f04c3713df6, - type: 3} - propertyPath: microgames.Array.size - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 742014442006323161, guid: e2bb5f24fc04fd94fa7d6f04c3713df6, - type: 3} - propertyPath: microgames.Array.data[0] - value: - objectReference: {fileID: 1798768979100361691, guid: 630cd222aaffefe4cb13161eeca7bf03, - type: 3} - - target: {fileID: 742014442006323161, guid: e2bb5f24fc04fd94fa7d6f04c3713df6, - type: 3} - propertyPath: microgames.Array.data[1] - value: - objectReference: {fileID: -1447348138257578213, guid: 4b285685b4a4a4c49ab075aaecba236e, - type: 3} - target: {fileID: 742014442006323162, guid: e2bb5f24fc04fd94fa7d6f04c3713df6, type: 3} propertyPath: m_Name @@ -550,11 +383,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 706082056} m_Modifications: - - target: {fileID: 903729140753789852, guid: 05cacb7278bee4f4e80876f7f0dd4d4a, - type: 3} - propertyPath: livesImagesGap - value: 12 - objectReference: {fileID: 0} - target: {fileID: 903729140753789853, guid: 05cacb7278bee4f4e80876f7f0dd4d4a, type: 3} propertyPath: m_LocalPosition.x @@ -674,15 +502,37 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 706082056} m_Modifications: - - target: {fileID: 62263835697235544, guid: 83b3c042c2cf3ce4fafc6b3346509ad9, - type: 3} - propertyPath: m_AnchoredPosition.x - value: -26.999985 + - target: {fileID: 182637523, guid: 83b3c042c2cf3ce4fafc6b3346509ad9, type: 3} + propertyPath: m_FontData.m_MaxSize + value: 300 objectReference: {fileID: 0} - - target: {fileID: 62263835697235544, guid: 83b3c042c2cf3ce4fafc6b3346509ad9, - type: 3} + - target: {fileID: 182637523, guid: 83b3c042c2cf3ce4fafc6b3346509ad9, type: 3} + propertyPath: m_Text + value: IT + objectReference: {fileID: 0} + - target: {fileID: 914644881, guid: 83b3c042c2cf3ce4fafc6b3346509ad9, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 914644881, guid: 83b3c042c2cf3ce4fafc6b3346509ad9, type: 3} propertyPath: m_SizeDelta.x - value: -610.0005 + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 914644881, guid: 83b3c042c2cf3ce4fafc6b3346509ad9, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 914644881, guid: 83b3c042c2cf3ce4fafc6b3346509ad9, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 914644881, guid: 83b3c042c2cf3ce4fafc6b3346509ad9, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0.0000013113022 + objectReference: {fileID: 0} + - target: {fileID: 914644882, guid: 83b3c042c2cf3ce4fafc6b3346509ad9, type: 3} + propertyPath: m_PixelsPerUnitMultiplier + value: 1.3 objectReference: {fileID: 0} - target: {fileID: 1475586331092748118, guid: 83b3c042c2cf3ce4fafc6b3346509ad9, type: 3} @@ -742,7 +592,7 @@ PrefabInstance: - target: {fileID: 1475586331092748118, guid: 83b3c042c2cf3ce4fafc6b3346509ad9, type: 3} propertyPath: m_AnchoredPosition.x - value: 25 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1475586331092748118, guid: 83b3c042c2cf3ce4fafc6b3346509ad9, type: 3} @@ -752,12 +602,12 @@ PrefabInstance: - target: {fileID: 1475586331092748118, guid: 83b3c042c2cf3ce4fafc6b3346509ad9, type: 3} propertyPath: m_SizeDelta.x - value: -250 + value: -824 objectReference: {fileID: 0} - target: {fileID: 1475586331092748118, guid: 83b3c042c2cf3ce4fafc6b3346509ad9, type: 3} propertyPath: m_SizeDelta.y - value: 634 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1475586331092748118, guid: 83b3c042c2cf3ce4fafc6b3346509ad9, type: 3} @@ -767,7 +617,7 @@ PrefabInstance: - target: {fileID: 1475586331092748118, guid: 83b3c042c2cf3ce4fafc6b3346509ad9, type: 3} propertyPath: m_AnchorMin.y - value: 0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1475586331092748118, guid: 83b3c042c2cf3ce4fafc6b3346509ad9, type: 3} @@ -777,7 +627,7 @@ PrefabInstance: - target: {fileID: 1475586331092748118, guid: 83b3c042c2cf3ce4fafc6b3346509ad9, type: 3} propertyPath: m_AnchorMax.y - value: 0.5 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1475586331092748118, guid: 83b3c042c2cf3ce4fafc6b3346509ad9, type: 3} @@ -794,50 +644,14 @@ PrefabInstance: propertyPath: m_Name value: Wheel Area objectReference: {fileID: 0} - - target: {fileID: 1475586331092748119, guid: 83b3c042c2cf3ce4fafc6b3346509ad9, - type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 83b3c042c2cf3ce4fafc6b3346509ad9, type: 3} ---- !u!1 &3121501029723249965 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 4957884999417998574, guid: fe08badedad41a140a1f9181fb76a976, - type: 3} - m_PrefabInstance: {fileID: 8042371781856047555} - m_PrefabAsset: {fileID: 0} --- !u!224 &3121501029723249966 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 4957884999417998573, guid: fe08badedad41a140a1f9181fb76a976, type: 3} m_PrefabInstance: {fileID: 8042371781856047555} m_PrefabAsset: {fileID: 0} ---- !u!114 &3121501029723249967 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3121501029723249965} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 68e459f5818c0884ca089d91defc1409, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &3121501029723249969 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3121501029723249965} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fed311aa263b18f4388ee281b1c72764, type: 3} - m_Name: - m_EditorClassIdentifier: - displayWhen: 0 --- !u!1001 &3646290606250593900 PrefabInstance: m_ObjectHideFlags: 0 @@ -850,56 +664,16 @@ PrefabInstance: propertyPath: m_Name value: Time Panel objectReference: {fileID: 0} - - target: {fileID: 386012858326575855, guid: f55c76379fd1c594b9b5138efc539234, - type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2375294738568543451, guid: f55c76379fd1c594b9b5138efc539234, + - target: {fileID: 5258333842059966781, guid: f55c76379fd1c594b9b5138efc539234, type: 3} propertyPath: m_AnchorMax.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2375294738568543451, guid: f55c76379fd1c594b9b5138efc539234, - type: 3} - propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2375294738568543451, guid: f55c76379fd1c594b9b5138efc539234, - type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - target: {fileID: 5258333842059966781, guid: f55c76379fd1c594b9b5138efc539234, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 5258333842059966781, guid: f55c76379fd1c594b9b5138efc539234, - type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5975627601604633840, guid: f55c76379fd1c594b9b5138efc539234, - type: 3} - propertyPath: m_AnchorMax.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5975627601604633840, guid: f55c76379fd1c594b9b5138efc539234, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5975627601604633840, guid: f55c76379fd1c594b9b5138efc539234, - type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5975627601604633840, guid: f55c76379fd1c594b9b5138efc539234, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - target: {fileID: 6450387887428008748, guid: f55c76379fd1c594b9b5138efc539234, type: 3} propertyPath: m_LocalPosition.x @@ -1005,13 +779,7 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6527954791001967706, guid: f55c76379fd1c594b9b5138efc539234, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: - - {fileID: 8451133771192635742, guid: f55c76379fd1c594b9b5138efc539234, type: 3} + m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f55c76379fd1c594b9b5138efc539234, type: 3} --- !u!1001 &5804266076916140296 PrefabInstance: @@ -1025,11 +793,6 @@ PrefabInstance: propertyPath: m_Name value: Static Background objectReference: {fileID: 0} - - target: {fileID: 5804266078435074427, guid: bb65950cd5f10a448b1ecd42a3814aeb, - type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - target: {fileID: 5804266078435074431, guid: bb65950cd5f10a448b1ecd42a3814aeb, type: 3} propertyPath: m_LocalPosition.x @@ -1094,28 +857,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 706082056} m_Modifications: - - target: {fileID: 943358899, guid: fe08badedad41a140a1f9181fb76a976, type: 3} - propertyPath: m_Name - value: Text - objectReference: {fileID: 0} - - target: {fileID: 943358901, guid: fe08badedad41a140a1f9181fb76a976, type: 3} - propertyPath: m_FontData.m_Font - value: - objectReference: {fileID: 12800000, guid: 75c9cbfd49e877c468331f81fc132714, - type: 3} - - target: {fileID: 943358901, guid: fe08badedad41a140a1f9181fb76a976, type: 3} - propertyPath: m_FontData.m_FontSize - value: 30 - objectReference: {fileID: 0} - - target: {fileID: 943358901, guid: fe08badedad41a140a1f9181fb76a976, type: 3} - propertyPath: m_FontData.m_MinSize - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1511648626, guid: fe08badedad41a140a1f9181fb76a976, type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: bbf043ba8a6f2c341ad9db4d7e0f4b0a, - type: 3} - target: {fileID: 4957884999417998573, guid: fe08badedad41a140a1f9181fb76a976, type: 3} propertyPath: m_LocalPosition.x diff --git a/Assets/Scripts/Main/GameController.cs b/Assets/Scripts/Main/GameController.cs index 7c19726..e0157ee 100644 --- a/Assets/Scripts/Main/GameController.cs +++ b/Assets/Scripts/Main/GameController.cs @@ -107,18 +107,24 @@ public class GameController : MonoBehaviour OnMicrogameTimeLeftChange?.Invoke(previous, current); } - private void OnMicrogameEnd(MicrogameController microgame) { + private void OnMicrogameEnd(MicrogameController microgame, bool victory) { Debug.Assert(microgame != null); - if(microgame.MicrogameResults()) { + if(victory) { Score += 1; } else { Lives -= 1; } CurrentMicrogame = null; + Faster(); StartCoroutine("SpinTheWheel"); } + public float timescaleIncreaseFactor = 0.05f; + private void Faster() { + Timescale += timescaleIncreaseFactor; + } + private MicrogameController displayedMicrogame; public delegate void OnDisplayedMicrogameChangeHandler(MicrogameController previous, MicrogameController current); @@ -137,15 +143,19 @@ public class GameController : MonoBehaviour public float wheelSelectionDelay = 0.1f; public float wheelSelectionTime = 2f; public float wheelDisplayTime = 2f; + public AudioSource wheelClickAudioSource; + public AudioSource wheelBoopAudioSource; IEnumerator SpinTheWheel() { float timePassed = 0f; while(timePassed < wheelSelectionTime) { DisplayedMicrogame = GetRandomMicrogame(); + wheelClickAudioSource.Play(); yield return new WaitForSeconds(wheelSelectionDelay); timePassed += wheelSelectionDelay; } DisplayedMicrogame = GetRandomMicrogame(); + wheelBoopAudioSource.Play(); yield return new WaitForSeconds(wheelDisplayTime); CurrentMicrogame = DisplayedMicrogame; } diff --git a/Assets/Scripts/Main/SoundPitchAdjust.cs b/Assets/Scripts/Main/SoundPitchAdjust.cs new file mode 100644 index 0000000..4939c93 --- /dev/null +++ b/Assets/Scripts/Main/SoundPitchAdjust.cs @@ -0,0 +1,24 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +[RequireComponent(typeof(AudioSource))] +public class SoundPitchAdjust : MonoBehaviour +{ + private GameController gameController; + private AudioSource audioSource; + + private void Awake() { + gameController = GameObject.FindGameObjectWithTag("GameController").GetComponent(); + audioSource = GetComponentInChildren(); + } + + private void Start() { + gameController.OnSpeedChange += OnSpeedChange; + } + + private void OnSpeedChange(float previous, float current) { + audioSource.pitch = current; + } +} diff --git a/Assets/Scripts/Main/SoundPitchAdjust.cs.meta b/Assets/Scripts/Main/SoundPitchAdjust.cs.meta new file mode 100644 index 0000000..c75fa8e --- /dev/null +++ b/Assets/Scripts/Main/SoundPitchAdjust.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 1219c341d913e3e4e912d424f804a6b7 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Microgame/MicrogameController.cs b/Assets/Scripts/Microgame/MicrogameController.cs index 36e4ac6..d6b806c 100644 --- a/Assets/Scripts/Microgame/MicrogameController.cs +++ b/Assets/Scripts/Microgame/MicrogameController.cs @@ -4,11 +4,20 @@ using UnityEngine; public abstract class MicrogameController : MonoBehaviour { - [BeforeStart] - public string microgameName = "[UNSET]"; + [Header("Microgame Settings")] [BeforeStart] public float startingTime = 4f; + [Header("Wheel Settings")] + [BeforeStart] + public string microgameName; + [BeforeStart] + public Color microgameNameColor; + [BeforeStart] + public Font microgameNameFont; + + protected GameController gameController; + public delegate void OnTimeLeftChangeHandler(float previous, float current); public event OnTimeLeftChangeHandler OnTimeLeftChange; private float timeLeft; @@ -32,10 +41,14 @@ public abstract class MicrogameController : MonoBehaviour public delegate void OnMicrogameStartHandler(MicrogameController microgame); public event OnMicrogameStartHandler OnMicrogameStart; - public delegate void OnMicrogameEndHandler(MicrogameController microgame); + public delegate void OnMicrogameEndHandler(MicrogameController microgame, bool victory); public event OnMicrogameEndHandler OnMicrogameEnd; - public abstract bool MicrogameResults(); + protected abstract bool MicrogameResults(); + + private void Awake() { + gameController = GameObject.FindGameObjectWithTag("GameController").GetComponent(); + } private void Start() { timeLeft = startingTime; @@ -43,7 +56,7 @@ public abstract class MicrogameController : MonoBehaviour } private void End() { - OnMicrogameEnd?.Invoke(this); + OnMicrogameEnd?.Invoke(this, MicrogameResults()); } private void Update() { diff --git a/Assets/Scripts/Microgame/TestMicrogame.cs b/Assets/Scripts/Microgame/TestMicrogame.cs index 3fb3fa4..ad4e3f3 100644 --- a/Assets/Scripts/Microgame/TestMicrogame.cs +++ b/Assets/Scripts/Microgame/TestMicrogame.cs @@ -4,7 +4,7 @@ using UnityEngine; public class TestMicrogame : MicrogameController { - public override bool MicrogameResults() { + protected override bool MicrogameResults() { return true; } } diff --git a/Assets/Scripts/UI/LivesPanel.cs b/Assets/Scripts/UI/LivesPanel.cs index 144ee63..6f9feb8 100644 --- a/Assets/Scripts/UI/LivesPanel.cs +++ b/Assets/Scripts/UI/LivesPanel.cs @@ -34,7 +34,7 @@ public class LivesPanel : MonoBehaviour private void OnLivesChange(int previous, int current) { for(int i = 0; i < livesImages.Length; i++) { - if(i <= current) { + if(i < current) { livesImages[i].sprite = lifeFull; } else { diff --git a/Assets/Scripts/UI/MicrogamePanel.cs b/Assets/Scripts/UI/MicrogamePanel.cs index 78dff87..79ebd40 100644 --- a/Assets/Scripts/UI/MicrogamePanel.cs +++ b/Assets/Scripts/UI/MicrogamePanel.cs @@ -19,5 +19,7 @@ public class MicrogamePanel : MonoBehaviour private void OnDisplayedMicrogameChange(MicrogameController previous, MicrogameController current) { text.text = current.microgameName; + text.color = current.microgameNameColor; + text.font = current.microgameNameFont; } } diff --git a/Assets/Sound/wheel_boop.wav b/Assets/Sound/wheel_boop.wav new file mode 100644 index 0000000..897de27 --- /dev/null +++ b/Assets/Sound/wheel_boop.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9d11dc231676f783be1c370178ca63fdc3aad5536b1791457aa2eedf08553e34 +size 19856 diff --git a/Assets/Sound/wheel_boop.wav.meta b/Assets/Sound/wheel_boop.wav.meta new file mode 100644 index 0000000..0d639e7 --- /dev/null +++ b/Assets/Sound/wheel_boop.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: e5dcec8314ee41643b541ec9a60f18fe +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/Sound/wheel_click.wav b/Assets/Sound/wheel_click.wav new file mode 100644 index 0000000..8987210 --- /dev/null +++ b/Assets/Sound/wheel_click.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a8e533281c013db7db2e616809e5ecb897e02fcf398cc7385ee9ec4dcccd2ba4 +size 9036 diff --git a/Assets/Sound/wheel_click.wav.meta b/Assets/Sound/wheel_click.wav.meta new file mode 100644 index 0000000..e2630bd --- /dev/null +++ b/Assets/Sound/wheel_click.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: c89c99f5b204ee84685547721ebd380a +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/Sprites/casella.png.meta b/Assets/Sprites/casella.png.meta new file mode 100644 index 0000000..cbf15eb --- /dev/null +++ b/Assets/Sprites/casella.png.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: 78a001f60740e4c4f93e7c007077cb97 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 0 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 37, y: 37, z: 37, w: 37} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index 6c2632a..4654e13 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -3,7 +3,7 @@ --- !u!30 &1 GraphicsSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 + serializedVersion: 13 m_Deferred: m_Mode: 1 m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0} @@ -31,6 +31,9 @@ GraphicsSettings: m_AlwaysIncludedShaders: - {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0} m_PreloadedShaders: [] m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} @@ -55,3 +58,5 @@ GraphicsSettings: m_AlbedoSwatchInfos: [] m_LightsUseLinearIntensity: 0 m_LightsUseColorTemperature: 0 + m_LogWhenShaderIsCompiled: 0 + m_AllowEnlightenSupportForUpgradedProject: 1 diff --git a/ProjectSettings/UnityConnectSettings.asset b/ProjectSettings/UnityConnectSettings.asset index 5a85733..584eee7 100644 --- a/ProjectSettings/UnityConnectSettings.asset +++ b/ProjectSettings/UnityConnectSettings.asset @@ -4,7 +4,7 @@ UnityConnectSettings: m_ObjectHideFlags: 0 serializedVersion: 1 - m_Enabled: 0 + m_Enabled: 1 m_TestMode: 0 m_EventOldUrl: https://api.uca.cloud.unity3d.com/v1/events m_EventUrl: https://cdp.cloud.unity3d.com/v1/events