Skip to content
Snippets Groups Projects
Commit f9fcbfe8 authored by Tuula's avatar Tuula
Browse files

Add instructions

parent a4c7d899
No related branches found
No related tags found
No related merge requests found
Pipeline #81226 passed
...@@ -249,6 +249,7 @@ RectTransform: ...@@ -249,6 +249,7 @@ RectTransform:
- {fileID: 968078462} - {fileID: 968078462}
- {fileID: 2129319040} - {fileID: 2129319040}
- {fileID: 669564477} - {fileID: 669564477}
- {fileID: 1556060563}
m_Father: {fileID: 1956449359} m_Father: {fileID: 1956449359}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
...@@ -766,6 +767,10 @@ PrefabInstance: ...@@ -766,6 +767,10 @@ PrefabInstance:
propertyPath: playButton propertyPath: playButton
value: value:
objectReference: {fileID: 205181260} objectReference: {fileID: 205181260}
- target: {fileID: 9220310020954901558, guid: 9e73ed29d5a239942a03d635d69da49e, type: 3}
propertyPath: returnButton
value:
objectReference: {fileID: 1556060566}
- target: {fileID: 9220310020954901558, guid: 9e73ed29d5a239942a03d635d69da49e, type: 3} - target: {fileID: 9220310020954901558, guid: 9e73ed29d5a239942a03d635d69da49e, type: 3}
propertyPath: highScoreText propertyPath: highScoreText
value: value:
...@@ -917,6 +922,261 @@ CanvasRenderer: ...@@ -917,6 +922,261 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1504911531} m_GameObject: {fileID: 1504911531}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!1 &1556060562
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1556060563}
- component: {fileID: 1556060565}
- component: {fileID: 1556060564}
- component: {fileID: 1556060566}
m_Layer: 5
m_Name: Return
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1556060563
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1556060562}
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:
- {fileID: 1760941531}
m_Father: {fileID: 205181259}
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: 3.855}
m_SizeDelta: {x: 1, y: 1}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1556060564
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1556060562}
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: 0.10980393, g: 0.6313726, b: 0.9490197, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 29d4462fd7738e14e89251ef88f22fd8, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!222 &1556060565
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1556060562}
m_CullTransparentMesh: 1
--- !u!114 &1556060566
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1556060562}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 1556060564}
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!1 &1760941530
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1760941531}
- component: {fileID: 1760941533}
- component: {fileID: 1760941532}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1760941531
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1760941530}
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: 1556060563}
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: 0}
m_SizeDelta: {x: 1, y: 1}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1760941532
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1760941530}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: Return
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4294967295
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
m_TextStyleHashCode: -1183493901
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 0.2
m_fontSizeBase: 0.2
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!222 &1760941533
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1760941530}
m_CullTransparentMesh: 1
--- !u!1 &1898712416 --- !u!1 &1898712416
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
......
This diff is collapsed.
...@@ -128,8 +128,9 @@ public class Bubble : MonoBehaviour ...@@ -128,8 +128,9 @@ public class Bubble : MonoBehaviour
private IEnumerator BlockMovement() private IEnumerator BlockMovement()
{ {
// using delta for touch controls triggers too many events, so we do a little hacky hack
moving = true; moving = true;
yield return new WaitForSeconds(0.2f); yield return new WaitForSeconds(0.1f);
moving = false; moving = false;
} }
......
...@@ -14,6 +14,7 @@ public class GameLoop : MonoBehaviour ...@@ -14,6 +14,7 @@ public class GameLoop : MonoBehaviour
private const int MAX_BUBBLES = 200; private const int MAX_BUBBLES = 200;
private const string HIGH_SCORE_PREF = "high_score"; private const string HIGH_SCORE_PREF = "high_score";
private const string GAME_SCENE = "Game"; private const string GAME_SCENE = "Game";
private const string MAIN_SCENE = "Main";
public static GameLoop Instance { get; private set; } public static GameLoop Instance { get; private set; }
...@@ -23,6 +24,7 @@ public class GameLoop : MonoBehaviour ...@@ -23,6 +24,7 @@ public class GameLoop : MonoBehaviour
[SerializeField] private TextMeshProUGUI highScoreText; [SerializeField] private TextMeshProUGUI highScoreText;
[SerializeField] private TextMeshProUGUI timerText; [SerializeField] private TextMeshProUGUI timerText;
[SerializeField] private Button playButton; [SerializeField] private Button playButton;
[SerializeField] private Button returnButton;
[SerializeField] private GameObject gameOverObject; [SerializeField] private GameObject gameOverObject;
[SerializeField] private float spawnDelayMax; [SerializeField] private float spawnDelayMax;
[SerializeField] private float spawnDelayMin; [SerializeField] private float spawnDelayMin;
...@@ -51,11 +53,13 @@ public class GameLoop : MonoBehaviour ...@@ -51,11 +53,13 @@ public class GameLoop : MonoBehaviour
highScore = PlayerPrefs.GetFloat(HIGH_SCORE_PREF); highScore = PlayerPrefs.GetFloat(HIGH_SCORE_PREF);
highScoreText.text = "High Score: " + highScore; highScoreText.text = "High Score: " + highScore;
playButton.onClick.AddListener(HandlePlayClicked); playButton.onClick.AddListener(HandlePlayClicked);
returnButton.onClick.AddListener(HandleReturnClicked);
} }
private void OnDestroy() private void OnDestroy()
{ {
playButton.onClick.RemoveListener(HandlePlayClicked); playButton.onClick.RemoveListener(HandlePlayClicked);
returnButton.onClick.RemoveListener(HandleReturnClicked);
} }
private void Start() private void Start()
...@@ -71,6 +75,11 @@ public class GameLoop : MonoBehaviour ...@@ -71,6 +75,11 @@ public class GameLoop : MonoBehaviour
SceneManager.LoadScene(GAME_SCENE); SceneManager.LoadScene(GAME_SCENE);
} }
private void HandleReturnClicked()
{
SceneManager.LoadScene(MAIN_SCENE);
}
private void UpdateHUD() private void UpdateHUD()
{ {
scoreText.text = "Score: " + score.ToString(); scoreText.text = "Score: " + score.ToString();
......
...@@ -15,6 +15,9 @@ public class MainMenu : MonoBehaviour ...@@ -15,6 +15,9 @@ public class MainMenu : MonoBehaviour
[SerializeField] private TextMeshProUGUI scoreText; [SerializeField] private TextMeshProUGUI scoreText;
[SerializeField] private Button playButton; [SerializeField] private Button playButton;
[SerializeField] private Button infoButton;
[SerializeField] private Button infoObject;
private float highScore; private float highScore;
...@@ -23,15 +26,29 @@ public class MainMenu : MonoBehaviour ...@@ -23,15 +26,29 @@ public class MainMenu : MonoBehaviour
highScore = PlayerPrefs.GetFloat(HIGH_SCORE_PREF); highScore = PlayerPrefs.GetFloat(HIGH_SCORE_PREF);
scoreText.text = "High Score: " + highScore; scoreText.text = "High Score: " + highScore;
playButton.onClick.AddListener(HandlePlayClicked); playButton.onClick.AddListener(HandlePlayClicked);
infoButton.onClick.AddListener(HandleInfoClicked);
infoObject.gameObject.SetActive(false);
infoObject.onClick.AddListener(CloseInfo);
} }
private void OnDestroy() private void OnDestroy()
{ {
playButton.onClick.RemoveListener(HandlePlayClicked); playButton.onClick.RemoveListener(HandlePlayClicked);
infoButton.onClick.RemoveListener(HandleInfoClicked);
} }
private void HandlePlayClicked() private void HandlePlayClicked()
{ {
SceneManager.LoadScene(GAME_SCENE); SceneManager.LoadScene(GAME_SCENE);
} }
private void HandleInfoClicked()
{
infoObject.gameObject.SetActive(true);
}
private void CloseInfo()
{
infoObject.gameObject.SetActive(false);
}
} }
\ No newline at end of file
Assets/Sprites/bubble.png

14.5 KiB | W: | H:

Assets/Sprites/bubble.png

10.5 KiB | W: | H:

Assets/Sprites/bubble.png
Assets/Sprites/bubble.png
Assets/Sprites/bubble.png
Assets/Sprites/bubble.png
  • 2-up
  • Swipe
  • Onion skin
No preview for this file type
No preview for this file type
No preview for this file type
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment