Start EventManager

This commit is contained in:
Antoine H 2021-01-17 10:57:00 +01:00
parent 8c2c988c70
commit 5466d6d66e
8 changed files with 193 additions and 6 deletions

View file

@ -1,5 +1,49 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &221308801621687712
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 183449879215217602}
- component: {fileID: 7408334756516261553}
m_Layer: 0
m_Name: EventManager
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &183449879215217602
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 221308801621687712}
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: 2157073180203202247}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &7408334756516261553
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 221308801621687712}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 71c5cbaefd379ae48875ee243e0435c9, type: 3}
m_Name:
m_EditorClassIdentifier:
range: 10
--- !u!1 &2157073178696562865
GameObject:
m_ObjectHideFlags: 0
@ -73,7 +117,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2157073180203202247}
m_RootOrder: 2
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
--- !u!114 &2157073178828809470
MonoBehaviour:
@ -137,7 +181,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2157073180203202247}
m_RootOrder: 1
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &2157073179154264261
MonoBehaviour:
@ -214,7 +258,7 @@ Transform:
m_Children:
- {fileID: 2157073179686492908}
m_Father: {fileID: 2157073180203202247}
m_RootOrder: 3
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2157073180013227982
GameObject:
@ -244,7 +288,7 @@ Transform:
m_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
m_Children: []
m_Father: {fileID: 2157073180203202247}
m_RootOrder: 4
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2157073180203202245
GameObject:
@ -275,6 +319,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 2157073178696562864}
- {fileID: 183449879215217602}
- {fileID: 2157073179154264258}
- {fileID: 2157073178828809457}
- {fileID: 2157073179837706944}

View file

@ -85,7 +85,7 @@ SpriteRenderer:
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
m_SpriteSortPoint: 1
--- !u!61 &4478636634695997808
BoxCollider2D:
m_ObjectHideFlags: 0
@ -130,7 +130,7 @@ MonoBehaviour:
product_name: beer
product_value: 10
product_sprite: {fileID: 21300000, guid: 17d59b2d4d882c04480a40119a442279, type: 3}
stock: 5
initial_stock: 5
--- !u!1 &8573757128841810314
GameObject:
m_ObjectHideFlags: 0

View file

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 44acad361b97731448f488b641b0e467
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View file

@ -3682,6 +3682,11 @@ PrefabInstance:
propertyPath: m_SortingLayer
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4478636634695997811, guid: 3baa223794d1dea4c986a5384a835c16,
type: 3}
propertyPath: m_SortingOrder
value: 5
objectReference: {fileID: 0}
- target: {fileID: 4478636634695997811, guid: 3baa223794d1dea4c986a5384a835c16,
type: 3}
propertyPath: m_SortingLayerID
@ -32623,6 +32628,16 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7408334756516261553, guid: dfb09d229e85c1446bee2e4f9357610e,
type: 3}
propertyPath: range
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7408334756516261553, guid: dfb09d229e85c1446bee2e4f9357610e,
type: 3}
propertyPath: nbMaxEvents
value: 3
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: dfb09d229e85c1446bee2e4f9357610e, type: 3}
--- !u!1 &1809057616

View file

@ -136,6 +136,8 @@ public class Client_controller : MonoBehaviour, IUsable
if(status=="entering" && !agent.pathPending && agent.remainingDistance==0) //Reached seat ?
{
EventManager.Instance.spawnEvent(transform.position);
status="waiting";
waitTimer=waitingTime;
order = ClientManager.Instance.assignOrder();

View file

@ -27,6 +27,7 @@ public sealed class ClientManager : MonoBehaviour
float maxTimeNewClients = 2.0f; //Longest waiting time for new clients
bool clientSpawnReady = false;
[SerializeField]
string ClientRessourceFolder = "Clients";
private Object[] clients;
GameObject ClientContainer = null;

View file

@ -0,0 +1,105 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.AI;
//Define the system managing the events. (Singleton)
public sealed class EventManager : MonoBehaviour
{
//Singleton
private static EventManager _instance=null;
public static EventManager Instance { get
{
if(_instance is null)
Debug.LogError("Missing EventManager instance");
return _instance;
}
}
[HideInInspector]
public bool ready = false; //Wether the ClientManager is initialized
[SerializeField]
float SpawnRange = 1.0f;
[SerializeField]
int nbMaxEvents = 1; //Maximum active clients
[SerializeField]
float eventSpawnTimer = 0.5f; //Intial time before first spawn (pseudo-random after that)
[SerializeField]
float maxTimeNewEvents = 2.0f; //Longest waiting time for new clients
bool eventSpawnReady = false;
[SerializeField]
string EventRessourceFolder = "Events";
private Object[] events;
GameObject EventContainer=null;
List<int> eventIDs = new List<int>();
//Try to find a random point on NavMesh inside a range circle. A result would at a maximum distance of 2*range.
bool RandomPoint(Vector3 center, float range, out Vector3 result)
{
for (int i = 0; i < 50; i++)
{
Vector3 randomPoint = center + (Vector3)Random.insideUnitCircle * range;
NavMeshHit hit;
if (NavMesh.SamplePosition(randomPoint, out hit, range, NavMesh.AllAreas))
{
result = hit.position;
return true;
}
}
result = Vector3.zero;
return false;
}
public void spawnEvent(Vector3 position)
{
Vector3 spawnPoint;
if (eventSpawnReady && eventIDs.Count<nbMaxEvents && RandomPoint(position, SpawnRange, out spawnPoint))
{
Debug.DrawRay(spawnPoint, Vector3.up, Color.blue, 2.0f);
int prefabChoice = Random.Range(0, events.Length);
GameObject newEvent = Instantiate((GameObject)events[prefabChoice], spawnPoint, Quaternion.identity, EventContainer.transform); //Instantiate new event inside ClientManager
eventIDs.Add(newEvent.GetInstanceID()); //Save ID
newEvent.name = newEvent.name.Split('(')[0]+eventIDs[eventIDs.Count-1]; //Rename new client
eventSpawnTimer=Random.Range(1.0f, maxTimeNewEvents); //Need more random ?
eventSpawnReady=false;
}
}
//Awake is called when the script instance is being loaded.
void Awake()
{
//Singleton
if (_instance != null && _instance != this)
Destroy(this.gameObject);
else
_instance = this;
if(!ready)
{
EventContainer = GameObject.Find("/GameSystem/EventManager");
if (EventContainer is null)
throw new System.Exception("No EventManager found under GameSystem");
events = Resources.LoadAll(EventRessourceFolder);
if (events.Length==0)
{
Debug.LogWarning("EventManager didn't find events prefab in ressource folder : "+EventRessourceFolder);
}
ready = true;
}
}
// Update is called once per frame
void Update()
{
if(!eventSpawnReady)
{
eventSpawnTimer-= Time.deltaTime;
if(eventSpawnTimer<=0)
eventSpawnReady=true;
}
}
}

View file

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 71c5cbaefd379ae48875ee243e0435c9
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant: