fix: added destroy notice item support

Iam1337 · Mar 19, 2022 · 788ba29 · 788ba29
1 parent 22407d9
commit 788ba29
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/Assets/extDebug.UGUI/Scripts/Notifications/NoticeItem.cs b/Assets/extDebug.UGUI/Scripts/Notifications/NoticeItem.cs
@@ -44,6 +44,9 @@ public float Alpha
 
 		[NonSerialized]
 		public Vector2 Velocity;
+
+		[NonSerialized]
+		public DNNotice Notice;
 
 		#endregion
 
@@ -65,5 +68,15 @@ public float Alpha
 		private TextMeshPro _label_TextMeshPro;
 
 		#endregion
+
+		#region Unity Methods
+
+		private void OnDestroy()
+		{
+			if (Notice.Data is NoticeItem item && item == this)
+				Notice.Data = null;
+		}
+
+		#endregion
 	}
 }
diff --git a/Assets/extDebug.UGUI/Scripts/Notifications/NoticeRender.cs b/Assets/extDebug.UGUI/Scripts/Notifications/NoticeRender.cs
@@ -48,6 +48,7 @@ public NoticeRender(RectTransform noticeAnchor, NoticeItem noticePrefab, RenderT
 		void IDNRender.SetupNotice(DNNotice notice, float currentHeight)
 		{
 			var noticeData = Object.Instantiate(_noticePrefab, _noticeAnchor);
+			noticeData.Notice = notice;
 			noticeData.Text = notice.Text;
 
 			if (_type == RenderType.Default)
@@ -103,7 +104,6 @@ void IDNRender.Repaint(DNNotice notice, float timeLeft, ref float currentHeight)
 				{
 					noticeData.Alpha -= Time.unscaledDeltaTime * 4.5f;
 				}
-
 			}
 
 			// Calculate new positions