[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,22 +1,43 @@
using System;
using System.Collections.Generic;
using System.Linq;
using DefaultNamespace;
using Mapbox.CheapRulerCs;
using Mapbox.Unity.Map;
using Mapbox.Utils;
using UnityEngine;
using Random = UnityEngine.Random;
public class CollectableDuckManager : MonoBehaviour
{
private class SimpleDuckData
{
public Vector2d location;
public DateTime spawnTime;
public DateTime despawnTime;
}
public List<CollectableDuckData> collectableDucks;
private readonly HashSet<CollectableDuckData> _collectedDucks = new HashSet<CollectableDuckData>();
private readonly Dictionary<CollectableDuckData, CollectableDuck> _spawnedDucks = new Dictionary<CollectableDuckData, CollectableDuck>();
private List<SimpleDuckData> existingSimpleDucks = new List<SimpleDuckData>();
private readonly Dictionary<SimpleDuckData, CollectableDuck> _spawnedSimpleDucks = new Dictionary<SimpleDuckData,CollectableDuck>();
public AbstractMap map;
public Transform player;
public Transform collectableDuckParent;
public float spawnStandardDuckTimeout = 1f;
public float spawnStandardDuckProbability = 0.1f;
public float standardDuckTimeout = 15 * 60;
public GameObject simpleDuckPrefab;
private float timeSinceStandardDuckSpawn = 0f;
public event EventHandler<CollectableDuckData> DuckClicked;
/// <summary>
@@ -82,6 +103,53 @@ public class CollectableDuckManager : MonoBehaviour
RemoveDuck(duck);
}
}
timeSinceStandardDuckSpawn += Time.deltaTime;
if (timeSinceStandardDuckSpawn > spawnStandardDuckTimeout)
{
timeSinceStandardDuckSpawn = 0;
if (Random.value < spawnStandardDuckProbability)
{
// Time to spawn a duck somewhere close to the player
double[] max = ruler.Destination(playerPosition, 100, 45);
double[] min = ruler.Destination(playerPosition, 100, 225);
var latDiff = max[0] - min[0];
var lonDiff = max[1] - min[1];
var duckCoord = new Vector2d(min[0] + (latDiff * Random.value), min[1] + (lonDiff * Random.value));
existingSimpleDucks.Add(new SimpleDuckData()
{
location = duckCoord,
despawnTime = DateTime.Now.AddSeconds(standardDuckTimeout),
spawnTime = DateTime.Now
});
}
}
for (int i = 0; i < existingSimpleDucks.Count; i++)
{
var duck = existingSimpleDucks[i];
if (duck.despawnTime < DateTime.Now)
{
existingSimpleDucks.RemoveAt(i);
i--;
HideSimpleDuck(duck);
}
else
{
var duckCoord = duck.location;
var dist = ruler.Distance(duckCoord.ToArray(), playerPosition);
// Debug.Log("Distance to " + duck.name + ": " + dist);
if (dist < spawnDistance)
{
SpawnSimpleDuck(duck);
}
else
{
HideSimpleDuck(duck);
}
}
}
}
private void SpawnDuck(CollectableDuckData duck)
@@ -105,6 +173,27 @@ public class CollectableDuckManager : MonoBehaviour
}
}
}
private void SpawnSimpleDuck(SimpleDuckData duck)
{
if (!_spawnedSimpleDucks.ContainsKey(duck))
{
// Spawn the duck
var duckSpawn = Instantiate(duckSpawnPrefab, map.GeoToWorldPosition(duck.location),
Quaternion.identity, collectableDuckParent);
var duckModel = Instantiate(simpleDuckPrefab, duckSpawn.transform);
duckModel.transform.localPosition = Vector3.zero;
_spawnedSimpleDucks[duck] = duckSpawn;
}
else
{
if (!_spawnedSimpleDucks[duck].gameObject.activeSelf)
{
_spawnedSimpleDucks[duck].gameObject.SetActive(true);
}
}
}
private void RemoveDuck(CollectableDuckData duck)
{
@@ -117,13 +206,23 @@ public class CollectableDuckManager : MonoBehaviour
}
}
private void HideSimpleDuck(SimpleDuckData duck)
{
if (_spawnedSimpleDucks.ContainsKey(duck))
{
if (_spawnedSimpleDucks[duck].gameObject.activeSelf)
{
_spawnedSimpleDucks[duck].gameObject.SetActive(false);
}
}
}
public void OnDuckClicked(CollectableDuckData duck)
{
if (DuckClicked != null)
{
DuckClicked.Invoke(this, duck);
}
}
public void OnDuckCollected(CollectableDuckData duck)