From 1bcca0e9252888d9d2c1c3ed7832644ffe8f851b Mon Sep 17 00:00:00 2001 From: Shaun M Reed Date: Tue, 5 Sep 2017 18:12:08 -0400 Subject: [PATCH] Reworked (bad)notification system - Reduced huge amount of fluff logic, loops, conditionals - Fixed infinite loop within 4+ calls to SendNotification() -- Replaced with new function MakePopup(string contents) -- Spawns a prefab, can call as much as you want (overlapping issue) -Add combining of colliding Popups with similar contents (exp) -- Add a tag passed into MakePopup() as argument used to combine similar values ( and increase time left to Destroy(), raise speed of transform to move away from other popups) - Popups rotate within a range of -4 to 4 for trendy not-perfect look *shrug* --- Assets/Prefabs/Pop-up Panel.prefab | Bin 0 -> 11776 bytes Assets/Prefabs/Pop-up Panel.prefab.meta | 9 + Assets/Prefabs/Pop-up Panels.meta | 9 + .../Pop-up Panels/Pop-up Panel 1.prefab | Bin 0 -> 11792 bytes .../Pop-up Panels/Pop-up Panel 1.prefab.meta | 9 + .../Pop-up Panels/Pop-up Panel 2.prefab | Bin 0 -> 11788 bytes .../Pop-up Panels/Pop-up Panel 2.prefab.meta | 9 + .../Pop-up Panels/Pop-up Panel 3.prefab | Bin 0 -> 11792 bytes .../Pop-up Panels/Pop-up Panel 3.prefab.meta | 9 + .../Pop-up Panels/Pop-up Panel 4.prefab | Bin 0 -> 11792 bytes .../Pop-up Panels/Pop-up Panel 4.prefab.meta | 9 + Assets/Scenes/Main.unity | Bin 120520 -> 113552 bytes Assets/Scripts/ExperienceBar.cs | 9 + Assets/Scripts/GameManager.cs | 161 +----------------- Assets/Scripts/PopupNotification.cs | 31 ++-- ProjectSettings/TagManager.asset | Bin 4376 -> 4388 bytes 16 files changed, 93 insertions(+), 162 deletions(-) create mode 100644 Assets/Prefabs/Pop-up Panel.prefab create mode 100644 Assets/Prefabs/Pop-up Panel.prefab.meta create mode 100644 Assets/Prefabs/Pop-up Panels.meta create mode 100644 Assets/Prefabs/Pop-up Panels/Pop-up Panel 1.prefab create mode 100644 Assets/Prefabs/Pop-up Panels/Pop-up Panel 1.prefab.meta create mode 100644 Assets/Prefabs/Pop-up Panels/Pop-up Panel 2.prefab create mode 100644 Assets/Prefabs/Pop-up Panels/Pop-up Panel 2.prefab.meta create mode 100644 Assets/Prefabs/Pop-up Panels/Pop-up Panel 3.prefab create mode 100644 Assets/Prefabs/Pop-up Panels/Pop-up Panel 3.prefab.meta create mode 100644 Assets/Prefabs/Pop-up Panels/Pop-up Panel 4.prefab create mode 100644 Assets/Prefabs/Pop-up Panels/Pop-up Panel 4.prefab.meta diff --git a/Assets/Prefabs/Pop-up Panel.prefab b/Assets/Prefabs/Pop-up Panel.prefab new file mode 100644 index 0000000000000000000000000000000000000000..1788eaddd84a791c2121d3533719cbddbd23f786 GIT binary patch literal 11776 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 literal 0 HcmV?d00001 diff --git a/Assets/Prefabs/Pop-up Panel.prefab.meta b/Assets/Prefabs/Pop-up Panel.prefab.meta new file mode 100644 index 0000000..43299ab --- /dev/null +++ b/Assets/Prefabs/Pop-up Panel.prefab.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 28a82baf8aadfa844a76fc5dd71094f8 +timeCreated: 1504643709 +licenseType: Free +NativeFormatImporter: + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Pop-up Panels.meta b/Assets/Prefabs/Pop-up Panels.meta new file mode 100644 index 0000000..b6f2937 --- /dev/null +++ b/Assets/Prefabs/Pop-up Panels.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 10e2d344b53a4c64b854b8b3904b369e +folderAsset: yes +timeCreated: 1504644496 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Pop-up Panels/Pop-up Panel 1.prefab b/Assets/Prefabs/Pop-up Panels/Pop-up Panel 1.prefab new file mode 100644 index 0000000000000000000000000000000000000000..a7c6d87fa0e2375f67be0ee25826409aa8e312d6 GIT binary patch literal 11792 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 literal 0 HcmV?d00001 diff --git a/Assets/Prefabs/Pop-up Panels/Pop-up Panel 2.prefab.meta b/Assets/Prefabs/Pop-up Panels/Pop-up Panel 2.prefab.meta new file mode 100644 index 0000000..3e9bb83 --- /dev/null +++ b/Assets/Prefabs/Pop-up Panels/Pop-up Panel 2.prefab.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 4cf0708b040fc2c4aa29a200bec6056f +timeCreated: 1504644516 +licenseType: Free +NativeFormatImporter: + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Pop-up Panels/Pop-up Panel 3.prefab b/Assets/Prefabs/Pop-up Panels/Pop-up Panel 3.prefab new file mode 100644 index 0000000000000000000000000000000000000000..5d5f55c410f2fcd640f52860834c2bf38b90101c GIT binary patch literal 11792 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 literal 0 HcmV?d00001 diff --git a/Assets/Prefabs/Pop-up Panels/Pop-up Panel 3.prefab.meta b/Assets/Prefabs/Pop-up Panels/Pop-up Panel 3.prefab.meta new file mode 100644 index 0000000..c016641 --- /dev/null +++ b/Assets/Prefabs/Pop-up Panels/Pop-up Panel 3.prefab.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: acc04bbf04d68f24fa01177bb3ed86b8 +timeCreated: 1504644530 +licenseType: Free +NativeFormatImporter: + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Pop-up Panels/Pop-up Panel 4.prefab b/Assets/Prefabs/Pop-up Panels/Pop-up Panel 4.prefab new file mode 100644 index 0000000000000000000000000000000000000000..875cf58f06401772f8419b6169b6abcd6e234b43 GIT binary patch literal 11792 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 literal 0 HcmV?d00001 diff --git a/Assets/Prefabs/Pop-up Panels/Pop-up Panel 4.prefab.meta b/Assets/Prefabs/Pop-up Panels/Pop-up Panel 4.prefab.meta new file mode 100644 index 0000000..cad248d --- /dev/null +++ b/Assets/Prefabs/Pop-up Panels/Pop-up Panel 4.prefab.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 3296a1925269b9c4699c0f4de17d0366 +timeCreated: 1504644532 +licenseType: Free +NativeFormatImporter: + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index 82fce2aee298e528f17fe22f6af9979dc2bd3de5..c490b9a3a44138933cf3593da22edf07382ea141 100644 GIT binary patch delta 6604 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 diff --git a/Assets/Scripts/ExperienceBar.cs b/Assets/Scripts/ExperienceBar.cs index 0a5bab1..6200c9c 100644 --- a/Assets/Scripts/ExperienceBar.cs +++ b/Assets/Scripts/ExperienceBar.cs @@ -20,15 +20,21 @@ public class ExperienceBar : MonoBehaviour { private float lerpSpeed; [SerializeField] private int clicks; + + [SerializeField] + private GameObject eventSystem; + private float clicksNeeded = 10; private float previousExpRequired; private float barMovement; private float barPosition; private float Increment = 10; + private string notify; // Use this for initialization void Start () { + eventSystem = GameObject.Find("EventSystem"); fillAmount = currentExp / currentRequirement; } @@ -60,6 +66,9 @@ public class ExperienceBar : MonoBehaviour { ++clicks; currentExp = currentExp + Increment; fillAmount = currentExp / currentRequirement; + notify = "+" + Increment + "EXP"; + eventSystem.GetComponent().MakePopup(notify); + //Debug.Log("fillAmount = " + fillAmount); } diff --git a/Assets/Scripts/GameManager.cs b/Assets/Scripts/GameManager.cs index 5b4e0b6..d2a5cbd 100644 --- a/Assets/Scripts/GameManager.cs +++ b/Assets/Scripts/GameManager.cs @@ -24,38 +24,15 @@ public class GameManager : MonoBehaviour { } - public string notify; - public bool wait; - public bool activeOne; - public bool activeTwo; - public bool activeThree; - public bool activeFour; public float idleExp; - public GameObject popupOne; - public GameObject popupTwo; - public GameObject popupThree; - public GameObject popupFour; - public float timer; - // Update is called once per frame - void Update () { - - } - - - - void OnEnable() - { - Load(); - } - - void OnApplicationPause() - { - Save(); - } + public GameObject popup; + public GameObject popupSpawn; + public string notify; void OnApplicationFocus(bool pauseStatus) { + Debug.Log("OnApplicationFocused"); if (pauseStatus) { //your app is NO LONGER in the background @@ -73,28 +50,6 @@ public class GameManager : MonoBehaviour { Save(); } - public void Start() - { - popupOne.SetActive(false); - popupTwo.SetActive(false); - popupThree.SetActive(false); - popupFour.SetActive(false); - - - } - - void FixedUpdate() - { - UpdatePopups(); - timer += 0.02f; - if(timer > 9999.0f) - { - timer = 0.0f; - } - - - } - public void Save() { BinaryFormatter bf = new BinaryFormatter(); @@ -145,7 +100,7 @@ public class GameManager : MonoBehaviour { if (idleExp >= 0.0f) { string notification = ("+" + idleExp + "EXP"); - SendNotification(notification); + MakePopup(notification); } Debug.Log("Loaded"); @@ -179,109 +134,11 @@ public class GameManager : MonoBehaviour { return secondsPassed; } - public void UpdatePopups() + public void MakePopup(string content) { - - if (GameObject.Find("Pop-up Panel 1") == null) - { - activeOne = false; - } - else - { - activeOne = true; - } - - if (GameObject.Find("Pop-up Panel 2") == null) - { - activeTwo = false; - } - else - { - activeTwo = true; - } - - if (GameObject.Find("Pop-up Panel 3") == null) - { - activeThree = false; - } - else - { - activeThree = true; - } - - if (GameObject.Find("Pop-up Panel 4") == null) - { - activeFour = false; - }else - { - activeFour = true; - } - - } - - public void SendNotification(string notification) - { - - /* - List popups = new List(); - GameObject[] allPopups = GameObject.Find("Notification Panel").GetComponentsInChildren(true); - foreach (GameObject obj in allPopups) - { - popups.Add(obj.GetComponent()); - } - */ - - - - //Debug.Log("Number of Popups: " + popups.Count); - - - for (;;) - { - Debug.Log("For1"); - if (wait == true) - { - Debug.Log("For1.1"); - continue; - }else - { - Debug.Log("For1.1"); - notify = notification; - break; - } - } - - - for (;;) - { - Debug.Log("For2"); - if (activeOne == false) - { - popupOne.SetActive(true); - wait = false; - break; - } else if (activeTwo == false) - { - popupTwo.SetActive(true); - wait = false; - break; - } else if (activeThree == false) - { - popupThree.SetActive(true); - wait = false; - break; - } else if (activeFour == false) - { - popupFour.SetActive(true); - wait = false; - break; - } else - { - wait = true; - continue; - } - } - + notify = content; + Instantiate(popup, popupSpawn.transform.position, popupSpawn.transform.rotation, GameObject.Find("Notification Panel").gameObject.transform ); + Debug.Log("Popup Created"); } public string GetNotify() diff --git a/Assets/Scripts/PopupNotification.cs b/Assets/Scripts/PopupNotification.cs index e68f075..4ec8742 100644 --- a/Assets/Scripts/PopupNotification.cs +++ b/Assets/Scripts/PopupNotification.cs @@ -12,27 +12,38 @@ public class PopupNotification : MonoBehaviour { public string localNotify; // Use this for initialization - void OnEnable () { + void OnEnable () + { active = true; + double randomRotation = GetRandomNumber(-4.0, 4.0); + transform.Rotate(0.0f, 0.0f, (float)randomRotation); + Debug.Log("Rotation set to :" + randomRotation); origin = this.transform.localPosition; localNotify = GameObject.Find("EventSystem").GetComponent().GetNotify(); } - - // Update is called once per frame - void FixedUpdate () { + + // Update is called once per frame + void FixedUpdate() + { timer += 0.02f; - this.gameObject.transform.Translate(new Vector3(0, 10f * Time.deltaTime, 0)); + this.gameObject.transform.Translate(new Vector3(0, 50f * Time.deltaTime, 0)); this.gameObject.GetComponentInChildren().text = localNotify; - - if(timer >= 3) + + if (timer >= 3) { - this.gameObject.SetActive(false); active = false; timer = 0.0f; - this.gameObject.transform.localPosition = origin; + Destroy(this.gameObject); } - } + + public double GetRandomNumber(double min, double max) + { + System.Random random = new System.Random(); + return random.NextDouble() * (max - min) + min; + } + } + diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 8d1360ae557ad8301155fa311d01a665396e086f..23c99fe143b7ad70225f1eb6783a1e96a9186b80 100644 GIT binary patch delta 46 zcmbQCv_y%6fr05S1B0N-Mvfm$j4GQMng8=JvP@