Merge pull request #327 from misternebula/dev

0.12.1
qsb-dev · Oct 26, 2021 · 91fbfd1 · 91fbfd1
2 parents b369923 + 91c5774
commit 91fbfd1
Show file tree

Hide file tree

Showing 13 changed files with 235 additions and 189 deletions.
diff --git a/AssetBundles/conversation b/AssetBundles/conversation
diff --git a/AssetBundles/conversation.manifest b/AssetBundles/conversation.manifest
@@ -1,26 +1,36 @@
 ManifestFileVersion: 0
-CRC: 1518538429
+CRC: 3328595786
 Hashes:
   AssetFileHash:
     serializedVersion: 2
-    Hash: cda9c91e090f27b94734bfca3a7cb9e2
+    Hash: b1b55f9f86f72ed72608b36f0729af6d
   TypeTreeHash:
     serializedVersion: 2
-    Hash: 90db08ff16f71e0f4005d38a4650eff2
+    Hash: 50a27bfc3e679077929938a6fa57f4db
 HashAppended: 0
 ClassTypes:
 - Class: 1
   Script: {instanceID: 0}
+- Class: 21
+  Script: {instanceID: 0}
+- Class: 28
+  Script: {instanceID: 0}
+- Class: 48
+  Script: {instanceID: 0}
 - Class: 114
-  Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
 - Class: 114
   Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
 - Class: 114
-  Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
 - Class: 114
-  Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
 - Class: 115
   Script: {instanceID: 0}
+- Class: 128
+  Script: {instanceID: 0}
+- Class: 213
+  Script: {instanceID: 0}
 - Class: 222
   Script: {instanceID: 0}
 - Class: 223
@@ -30,4 +40,5 @@ ClassTypes:
 SerializeReferenceClassIdentifiers: []
 Assets:
 - Assets/DialogueBubble.prefab
+- Assets/GameAssets/Texture2D/UI_DialogueBox_d.png
 Dependencies: []
diff --git a/AssetBundles/debug.manifest b/AssetBundles/debug.manifest
@@ -3,7 +3,7 @@ CRC: 3095198160
 Hashes:
   AssetFileHash:
     serializedVersion: 2
-    Hash: aeeeeba83ed0a32973e863d3787067c0
+    Hash: 44badca86c2222e5cc39a8497439be0c
   TypeTreeHash:
     serializedVersion: 2
     Hash: b2ece8ae09df261ff59d764d08696641

diff --git a/AssetBundles/network.manifest b/AssetBundles/network.manifest
@@ -3,7 +3,7 @@ CRC: 1991351671
 Hashes:
   AssetFileHash:
     serializedVersion: 2
-    Hash: 494875ba5d9a67b7d87421e95e386357
+    Hash: e0f93ad04981fd266a4300b0be721792
   TypeTreeHash:
     serializedVersion: 2
     Hash: 6968c5d2bbef57a79632abd61ea01bb3

diff --git a/QSB/ConversationSync/ConversationManager.cs b/QSB/ConversationSync/ConversationManager.cs
@@ -22,9 +22,8 @@ public void Start()
 			Instance = this;
 
 			_boxPrefab = QSBCore.ConversationAssetBundle.LoadAsset<GameObject>("assets/dialoguebubble.prefab");
-			// BUG : make dynamic so it can be different sizes!
-			// the dynamic font seems to be super lo-res at this size...?
-			var font = (Font)Resources.Load(@"fonts\english - latin\spacemono-bold");
+
+			var font = (Font)Resources.Load(@"fonts\english - latin\HVD Fonts - BrandonGrotesque-Bold_Dynamic");
 			if (font == null)
 			{
 				DebugLog.ToConsole("Error - Font is null!", MessageType.Error);

diff --git a/QSB/Events/QSBEvent.cs b/QSB/Events/QSBEvent.cs
@@ -4,6 +4,7 @@
 using QSB.Player.TransformSync;
 using QSB.Utility;
 using QuantumUNET.Components;
+using System;
 
 namespace QSB.Events
 {
@@ -78,14 +79,21 @@ private void OnReceive(bool isServer, T message)
 				return;
 			}
 
-			if (message.FromId == QSBPlayerManager.LocalPlayerId ||
+			try
+			{
+				if (message.FromId == QSBPlayerManager.LocalPlayerId ||
 				QSBPlayerManager.IsBelongingToLocalPlayer(message.FromId))
+				{
+					OnReceiveLocal(QSBCore.IsHost, message);
+					return;
+				}
+
+				OnReceiveRemote(QSBCore.IsHost, message);
+			}
+			catch (Exception ex)
 			{
-				OnReceiveLocal(QSBCore.IsHost, message);
-				return;
+				DebugLog.ToConsole($"Error - Exception handling message {message.GetType().Name} : {ex}", MessageType.Error);
 			}
-
-			OnReceiveRemote(QSBCore.IsHost, message);
 		}
 	}
 }
diff --git a/QSB/OrbSync/Events/OrbUserEvent.cs b/QSB/OrbSync/Events/OrbUserEvent.cs
@@ -69,7 +69,7 @@ private static void HandleServer(WorldObjectMessage message)
 				DebugLog.ToConsole("Error - FromPlayer is null!", MessageType.Error);
 			}
 
-			var orbSync = NomaiOrbTransformSync.OrbTransformSyncs
+			var orbSync = NomaiOrbTransformSync.OrbTransformSyncs.Where(x => x != null)
 				.FirstOrDefault(x => x.AttachedObject == QSBWorldSync.OldOrbList[message.ObjectId].transform);
 			if (orbSync == null)
 			{
@@ -115,13 +115,13 @@ private static void HandleClient(WorldObjectMessage message)
 				return;
 			}
 
-			if (!NomaiOrbTransformSync.OrbTransformSyncs.Any(x => x.AttachedObject == QSBWorldSync.OldOrbList[message.ObjectId].transform))
+			if (!NomaiOrbTransformSync.OrbTransformSyncs.Where(x => x != null).Any(x => x.AttachedObject == QSBWorldSync.OldOrbList[message.ObjectId].transform))
 			{
 				DebugLog.ToConsole($"Error - No NomaiOrbTransformSync has AttachedOrb with objectId {message.ObjectId}!");
 				return;
 			}
 
-			var orb = NomaiOrbTransformSync.OrbTransformSyncs
+			var orb = NomaiOrbTransformSync.OrbTransformSyncs.Where(x => x != null)
 				.First(x => x.AttachedObject == QSBWorldSync.OldOrbList[message.ObjectId].transform);
 			orb.enabled = true;
 		}

diff --git a/QSB/Utility/DebugActions.cs b/QSB/Utility/DebugActions.cs
@@ -59,6 +59,7 @@ public void Update()
 
 			if (Keyboard.current[Key.Numpad9].wasPressedThisFrame)
 			{
+				PlayerData.SaveWarpedToTheEye(60);
 				LoadManager.LoadSceneAsync(OWScene.EyeOfTheUniverse, true, LoadManager.FadeType.ToWhite);
 			}
 		}

diff --git a/QSB/WorldSync/QSBWorldSync.cs b/QSB/WorldSync/QSBWorldSync.cs
@@ -165,7 +165,7 @@ public static void HandleSlotStateChange(NomaiInterfaceSlot slot, NomaiInterface
 				return;
 			}
 
-			var orbSync = NomaiOrbTransformSync.OrbTransformSyncs.FirstOrDefault(x => x.AttachedObject == affectingOrb.transform);
+			var orbSync = NomaiOrbTransformSync.OrbTransformSyncs.Where(x => x != null).FirstOrDefault(x => x.AttachedObject == affectingOrb.transform);
 			if (orbSync == null)
 			{
 				DebugLog.ToConsole($"Error - No NomaiOrbTransformSync found for {affectingOrb.name} (For slot {slot.name})!", MessageType.Error);

diff --git a/QSB/manifest.json b/QSB/manifest.json
@@ -8,7 +8,7 @@
 		"body": "- Disable *all* other mods. (Can heavily affect performance)\n- Make sure you are not running any other network-intensive applications.\n- Make sure you have forwarded/opened the correct ports. (See the GitHub readme.)"
 	},
 	"uniqueName": "Raicuparta.QuantumSpaceBuddies",
-	"version": "0.12.0-pr4",
+	"version": "0.12.1",
 	"owmlVersion": "2.1.0",
 	"dependencies": [ "_nebula.MenuFramework" ]
 }