Change responsibility for popup picking

The popup images now reside in the popup prefab, which means much less effort is required to add more images.
hackerspace-ntnu · Oct 29, 2023 · e9615a4 · e9615a4
1 parent 68cf241
commit e9615a4
Show file tree

Hide file tree

Showing 22 changed files with 42 additions and 959 deletions.
diff --git a/Assets/Prefabs/Input/Player.prefab b/Assets/Prefabs/Input/Player.prefab
@@ -350,20 +350,11 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 054f8241b622aff439e7b31758f43d23, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  popups:
-  - {fileID: 2749458525383876187, guid: 6e375834f9190b44b85120879f9bbee1, type: 3}
-  - {fileID: 2749458525383876187, guid: 15bf7d33161a3734eaefb8975e001114, type: 3}
-  - {fileID: 2749458525383876187, guid: 1af2b41242ef9bf43af3c4e831969bb2, type: 3}
-  - {fileID: 2749458525383876187, guid: ae8e33214ea99344f86253dedb58ec06, type: 3}
-  - {fileID: 2749458525383876187, guid: e0f1b937001ff7649ad573268ee3fd22, type: 3}
-  - {fileID: 2749458525383876187, guid: 3f5f7e4507b4232498fd0c647e19d5fb, type: 3}
-  - {fileID: 2749458525383876187, guid: d190bdb973688c1489e3999e7a2405fb, type: 3}
-  - {fileID: 2749458525383876187, guid: 8f8cc66de768a2f48801942cf6b2988c, type: 3}
-  - {fileID: 2749458525383876187, guid: b7a759f9f3fd15148a9e7c555c4c3209, type: 3}
+  popup: {fileID: 2749458525383876187, guid: 8f8cc66de768a2f48801942cf6b2988c, type: 3}
   spamTarget: {fileID: 3484089900029681523}
   hud: {fileID: 3570743071879246586}
-  minSpamDelay: 0.1
-  maxSpamDelay: 0.3
+  minSpamDelay: 0.05
+  maxSpamDelay: 0.2
 --- !u!1 &345906872987025452
 GameObject:
   m_ObjectHideFlags: 0

diff --git a/Assets/Prefabs/UI/Spam/AreYouARobot.prefab → Assets/Prefabs/UI/Popup.prefab b/Assets/Prefabs/UI/Spam/AreYouARobot.prefab → Assets/Prefabs/UI/Popup.prefab
@@ -14,7 +14,7 @@ GameObject:
   - component: {fileID: 2749458525383876187}
   - component: {fileID: 3979177335964750275}
   m_Layer: 5
-  m_Name: AreYouARobot
+  m_Name: Popup
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -90,6 +90,16 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: bf36c31efc151dc4b96cecf0ef7f1f29, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  images:
+  - {fileID: 21300000, guid: ab44202eec4be834ebe703395ce0be10, type: 3}
+  - {fileID: 21300000, guid: d6118307f4d46794aaf12308777f7998, type: 3}
+  - {fileID: 21300000, guid: 6424aedc56cc3eb45b68a2c706ad8a6b, type: 3}
+  - {fileID: 21300000, guid: c5b3e91cfc17d334da2ff85b1b81da52, type: 3}
+  - {fileID: 21300000, guid: e18defbd3e27dec4ea8373a61fd48ca6, type: 3}
+  - {fileID: 21300000, guid: 96cf5dc65b0d08c45a679ef1b9e8974e, type: 3}
+  - {fileID: 21300000, guid: ad42293612d301343a4977e9e196b5e3, type: 3}
+  - {fileID: 21300000, guid: 4d456d205f21d3149bccc5a1b308797c, type: 3}
+  - {fileID: 21300000, guid: 340d815cba208754fb239dc4df778088, type: 3}
   minTimeout: 2
   maxTimeout: 4
 --- !u!114 &3979177335964750275

diff --git a/.../Prefabs/UI/Spam/AreYouARobot.prefab.meta → Assets/Prefabs/UI/Popup.prefab.meta b/.../Prefabs/UI/Spam/AreYouARobot.prefab.meta → Assets/Prefabs/UI/Popup.prefab.meta
diff --git a/Assets/Prefabs/UI/Spam.meta b/Assets/Prefabs/UI/Spam.meta
diff --git a/Assets/Prefabs/UI/Spam/DownloadMoreRam.prefab b/Assets/Prefabs/UI/Spam/DownloadMoreRam.prefab
diff --git a/Assets/Prefabs/UI/Spam/DownloadMoreRam.prefab.meta b/Assets/Prefabs/UI/Spam/DownloadMoreRam.prefab.meta
diff --git a/Assets/Prefabs/UI/Spam/EnlargeYourDongle.prefab b/Assets/Prefabs/UI/Spam/EnlargeYourDongle.prefab
diff --git a/Assets/Prefabs/UI/Spam/EnlargeYourDongle.prefab.meta b/Assets/Prefabs/UI/Spam/EnlargeYourDongle.prefab.meta