Clean up logic for popup.

Assets/Cryville/Crtr/UI/Popup.cs

@@ -1,29 +1,33 @@
 using System;
+using TMPro;
 using UnityEngine;
-using UnityEngine.UI;
 
 namespace Cryville.Crtr.UI {
+	[RequireComponent(typeof(CanvasGroup))]
 	public class Popup : MonoBehaviour {
-		public string Message = "";
+		CanvasGroup _group;
-		CanvasGroup group;
+		[SerializeField]
-		float timer = 0;
+		TextMeshProUGUI m_text;
+		public string Message {
+			get { return m_text.text; }
+			set { m_text.text = value; }
+		}
 
-		const float DURATION = 5.0f;
+		[SerializeField]
-		const float DURIN = 0.4f;
+		AnimationCurve m_fadeCurve;
-		const float DUROUT = 0.4f;
+		float _timer;
 
-		void Start() {
+		void Awake() {
-			group = GetComponent<CanvasGroup>();
+			_group = GetComponent<CanvasGroup>();
-			group.alpha = 0;
+			_group.alpha = 0;
-			GetComponentInChildren<Text>().text = Message;
-			transform.SetParent(GameObject.Find("PopupList").transform, false);
 		}
 
 		void Update() {
-			if (timer <= DURIN) group.alpha = timer / DURIN;
+			_timer += Time.deltaTime;
-			else if (timer >= DURATION) GameObject.Destroy(gameObject);
+			_group.alpha = m_fadeCurve.Evaluate(_timer);
-			else if (timer >= DURATION - DUROUT) group.alpha = (DURATION - timer) / DUROUT;
+			if (_timer > m_fadeCurve[m_fadeCurve.length - 1].time) {
-			timer += Time.deltaTime;
+				Destroy(gameObject);
+			}
 		}
 
 		public static void CreateException(Exception ex) {
@@ -31,7 +35,7 @@ namespace Cryville.Crtr.UI {
 		}
 
 		public static void Create(string msg) {
-			Instantiate(Resources.Load<GameObject>("Common/Popup")).GetComponent<Popup>().Message = msg;
+			PopupManager.Instance.Create(msg);
 		}
 	}
 }

Assets/Cryville/Crtr/UI/PopupManager.cs

@@ -0,0 +1,25 @@
+using System;
+using UnityEngine;
+using UnityEngine.UI;
+
+namespace Cryville.Crtr.UI {
+	public class PopupManager : MonoBehaviour {
+		static PopupManager s_instance;
+		public static PopupManager Instance { get { return s_instance; } }
+
+		[SerializeField]
+		GameObject m_popupPrefab;
+
+		void Awake() {
+			if (s_instance != null) {
+				Destroy(gameObject);
+				throw new InvalidOperationException("Attempted to initialize a singleton twice.");
+			}
+			s_instance = this;
+		}
+
+		public void Create(string msg) {
+			Instantiate(m_popupPrefab, transform, false).GetComponent<Popup>().Message = msg;
+		}
+	}
+}

Assets/Cryville/Crtr/UI/PopupManager.cs.meta

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

Assets/Interface2/Prefabs/Popup.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: fef0bd1fec806d2438e9567086c4dd3f
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Menu2.unity

@@ -1816,7 +1816,7 @@ Canvas:
   m_OverrideSorting: 0
   m_OverridePixelPerfect: 0
   m_SortingBucketNormalizedSize: 0
-  m_AdditionalShaderChannelsFlag: 0
+  m_AdditionalShaderChannelsFlag: 25
   m_SortingLayerID: 0
   m_SortingOrder: 1
   m_TargetDisplay: 0
@@ -2937,6 +2937,7 @@ GameObject:
   - component: {fileID: 707529287}
   - component: {fileID: 707529286}
   - component: {fileID: 707529285}
+  - component: {fileID: 707529288}
   m_Layer: 5
   m_Name: PopupList
   m_TagString: Untagged
@@ -3012,6 +3013,20 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 707529283}
   m_CullTransparentMesh: 1
+--- !u!114 &707529288
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 707529283}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0163e060f642c57498b7c58073d19e3e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_popupPrefab: {fileID: 7484313361774163703, guid: fef0bd1fec806d2438e9567086c4dd3f,
+    type: 3}
 --- !u!1 &736199962
 GameObject:
   m_ObjectHideFlags: 0

Assets/Resources/Common.meta

@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 59f037603defd014f9b80616da5c1185
-folderAsset: yes
-timeCreated: 1594731449
-licenseType: Pro
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Resources/Common/Popup.prefab

@@ -1,213 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!1 &175032
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 22426874}
-  - component: {fileID: 22239948}
-  - component: {fileID: 11446842}
-  - component: {fileID: 11436044}
-  - component: {fileID: 1218772818163767843}
-  - component: {fileID: 386472129593089895}
-  m_Layer: 5
-  m_Name: Popup
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &22426874
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 175032}
-  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_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 22489496}
-  m_Father: {fileID: 0}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &22239948
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 175032}
-  m_CullTransparentMesh: 1
---- !u!114 &11446842
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 175032}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 0.1254902, g: 0.1254902, b: 0.1254902, a: 0.7529412}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 0}
-  m_Type: 1
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
---- !u!114 &11436044
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 175032}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 7b4b06c6db17f5a498bf12bb00aa07cf, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  Message: 
---- !u!114 &1218772818163767843
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 175032}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Padding:
-    m_Left: 8
-    m_Right: 8
-    m_Top: 8
-    m_Bottom: 8
-  m_ChildAlignment: 0
-  m_Spacing: 0
-  m_ChildForceExpandWidth: 1
-  m_ChildForceExpandHeight: 0
-  m_ChildControlWidth: 1
-  m_ChildControlHeight: 1
-  m_ChildScaleWidth: 0
-  m_ChildScaleHeight: 0
-  m_ReverseArrangement: 0
---- !u!225 &386472129593089895
-CanvasGroup:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 175032}
-  m_Enabled: 1
-  m_Alpha: 0
-  m_Interactable: 0
-  m_BlocksRaycasts: 0
-  m_IgnoreParentGroups: 0
---- !u!1 &196368
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 22489496}
-  - component: {fileID: 22249498}
-  - component: {fileID: 11489400}
-  m_Layer: 5
-  m_Name: Text
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &22489496
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 196368}
-  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_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 22426874}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0.5, y: 1}
---- !u!222 &22249498
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 196368}
-  m_CullTransparentMesh: 1
---- !u!114 &11489400
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 196368}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 26
-    m_FontStyle: 0
-    m_BestFit: 0
-    m_MinSize: 2
-    m_MaxSize: 30
-    m_Alignment: 1
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: (Message)

Assets/Resources/Common/Popup.prefab.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 4bd83d5c54389a24886caf98045b89b8
-timeCreated: 1594270184
-licenseType: Pro
-NativeFormatImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: