diff --git a/Emerald/Assets/Scripts/GameManager.cs b/Emerald/Assets/Scripts/GameManager.cs index 07604bd5..5005d19d 100644 --- a/Emerald/Assets/Scripts/GameManager.cs +++ b/Emerald/Assets/Scripts/GameManager.cs @@ -59,7 +59,6 @@ public class GameManager : MonoBehaviour public static float InputDelay; [HideInInspector] public static bool UIDragging; - public AudioMixer audioMixer; @@ -113,7 +112,6 @@ public void MapInformation(S.MapInformation p) FindObjectOfType().LoadScene(p.SceneName, p.FileName); } - public void UserInformation(S.UserInformation p) { User.gameObject.SetActive(true); @@ -158,8 +156,7 @@ public void UserInformation(S.UserInformation p) ObjectList.Add(p.ObjectID, User.Player); UserGameObject.GetComponentInChildren().enabled = true; Tooltip.cam = User.Player.Camera.GetComponent(); - GameScene.partyController.name = User.Player.Name; - + GameScene.partyController.name = User.Player.Name; } public void ShowReviveMessage() @@ -375,8 +372,6 @@ public void ObjectMonster(S.ObjectMonster p) monster.BossUI(monster); } - - public void ObjectNPC(S.ObjectNPC p) { MapObject ob; @@ -435,8 +430,7 @@ public void ObjectGold(S.ObjectGold p) CurrentScene.Cells[p.Location.X, p.Location.Y].AddObject(gold); ObjectList.Add(p.ObjectID, gold); } - - + public void ObjectItem(S.ObjectItem p) { GameObject model = Instantiate(Resources.Load($"{p.Image}"), CurrentScene.Cells[p.Location.X, p.Location.Y].position, Quaternion.identity) as GameObject; @@ -480,7 +474,6 @@ public void ObjectRemove(S.ObjectRemove p) } } - public void ObjectTurn(S.ObjectTurn p) { if (ObjectList.TryGetValue(p.ObjectID, out MapObject ob)) @@ -543,12 +536,14 @@ public void ObjectHealth(S.ObjectHealth p) ob.HealthBar.gameObject.SetActive(true); } } + public void Revived() { User.Player.SetAction(); User.Player.Dead = false; //bool Effect = GetComponentInChildren().GetBool("Revied"); } + public void ObjectRevived(S.ObjectRevived p) { if (ObjectList.TryGetValue(p.ObjectID, out MapObject ob)) @@ -558,6 +553,7 @@ public void ObjectRevived(S.ObjectRevived p) ob.ActionFeed.Add(new QueuedAction { Action = MirAction.Revive, Direction = ob.Direction, Location = ob.CurrentLocation }); } } + public void DamageIndicator(S.DamageIndicator p) { if (ObjectList.TryGetValue(p.ObjectID, out MapObject ob)) @@ -575,10 +571,8 @@ public void DamageIndicator(S.DamageIndicator p) public void Death(S.Death p) { User.Player.Dead = true; - User.Player.ActionFeed.Add(new QueuedAction { Action = MirAction.Die, Direction = p.Direction, Location = new Vector2Int(p.Location.X, p.Location.Y) }); ShowReviveMessage(); - } public void ObjectDied(S.ObjectDied p) @@ -834,6 +828,4 @@ public Color ConvertSystemColor(System.Drawing.Color color) Color NameColorOut = new Color32(color.R, color.G, color.B, color.A); return NameColorOut; } - - }