[TASK] Added more duck spawn, performance fixes, instruction in the minigame, option to zoom in on stickers

This commit is contained in:
2019-08-30 00:39:13 +02:00
parent bb4b5afb18
commit c60a130874
51 changed files with 86781 additions and 45090 deletions

View File

@@ -1,9 +1,5 @@
using System;
using System.Collections;
using System.Collections.Generic;
using Mapbox.Map;
using UnityEngine;
using UnityEngine.Serialization;
public enum GameState
{
@@ -12,6 +8,8 @@ public enum GameState
public class BadeendGoGameManager : MonoBehaviour
{
public DuckStickerData simpleDuckSticker;
public GameObject profileButton;
public GameObject mainMap;
public CollectedStickersUI stickerDisplay;
@@ -19,6 +17,7 @@ public class BadeendGoGameManager : MonoBehaviour
public GameObject minigameOverlay;
public DuckCollectedScreen duckCollectedScreen;
private GameState _gameState;
private CollectableDuckData _minigamePlayingForDuck;
@@ -28,13 +27,15 @@ public class BadeendGoGameManager : MonoBehaviour
set
{
_gameState = value;
profileButton.SetActive(value == GameState.Map);
minigameOverlay.SetActive(value == GameState.Minigame);
mainMap.SetActive(value == GameState.Map || value == GameState.DuckCollectedScreen);
stickerDisplay.gameObject.SetActive(value == GameState.StickerOverview);
miniGame.SetActive(value == GameState.Minigame);
duckCollectedScreen.gameObject.SetActive(value == GameState.DuckCollectedScreen);
profileButton.SetActive(value == GameState.Map);
minigameOverlay.SetActive(value == GameState.Minigame);
}
}
@@ -94,12 +95,23 @@ public class BadeendGoGameManager : MonoBehaviour
{
duckCollectedScreen.CollectedSticker = _minigamePlayingForDuck.StickerData;
}
else
{
duckCollectedScreen.CollectedSticker = simpleDuckSticker;
}
if (miniGameResult == MiniGameResult.Success)
{
// Duck collected
DuckStickerManager.Instance.OnStickerCollected(_minigamePlayingForDuck.StickerData);
CollectableDuckManager.Instance.OnDuckCollected(_minigamePlayingForDuck);
if (_minigamePlayingForDuck != null)
{
DuckStickerManager.Instance.OnStickerCollected(_minigamePlayingForDuck.StickerData);
CollectableDuckManager.Instance.OnDuckCollected(_minigamePlayingForDuck);
}
else
{
DuckStickerManager.Instance.OnStickerCollected(simpleDuckSticker);
}
}
}
}