diff --git a/AssetBundles/conversation b/AssetBundles/conversation index 3e8dbe72..dc830635 100644 Binary files a/AssetBundles/conversation and b/AssetBundles/conversation differ diff --git a/AssetBundles/conversation.manifest b/AssetBundles/conversation.manifest index 44af1863..5f486847 100644 --- a/AssetBundles/conversation.manifest +++ b/AssetBundles/conversation.manifest @@ -1,12 +1,12 @@ ManifestFileVersion: 0 -CRC: 2873277448 +CRC: 2681871399 Hashes: AssetFileHash: serializedVersion: 2 - Hash: 2fa456f0727e9c3b70108af0a1278f56 + Hash: d9191ca383ce2fbef699ba7106af389e TypeTreeHash: serializedVersion: 2 - Hash: 50a27bfc3e679077929938a6fa57f4db + Hash: a0ed95779b7375b06978e51f19fbfba7 HashAppended: 0 ClassTypes: - Class: 1 @@ -25,6 +25,10 @@ ClassTypes: Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - Class: 114 Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} +- Class: 114 + Script: {fileID: 1015169618, guid: 27687deae413b90448366870cb0de502, type: 3} +- Class: 114 + Script: {fileID: 602583937, guid: 27687deae413b90448366870cb0de502, type: 3} - Class: 115 Script: {instanceID: 0} - Class: 128 @@ -39,6 +43,6 @@ ClassTypes: Script: {instanceID: 0} SerializeReferenceClassIdentifiers: [] Assets: -- Assets/DialogueBubble.prefab +- Assets/Prefabs/DialogueBubble.prefab - Assets/GameAssets/Texture2D/UI_DialogueBox_d.png Dependencies: [] diff --git a/QSB/ConversationSync/ConversationManager.cs b/QSB/ConversationSync/ConversationManager.cs index ba18f6c3..2304d018 100644 --- a/QSB/ConversationSync/ConversationManager.cs +++ b/QSB/ConversationSync/ConversationManager.cs @@ -21,7 +21,7 @@ namespace QSB.ConversationSync { Instance = this; - _boxPrefab = QSBCore.ConversationAssetBundle.LoadAsset("assets/dialoguebubble.prefab"); + _boxPrefab = QSBCore.ConversationAssetBundle.LoadAsset("assets/Prefabs/dialoguebubble.prefab"); var font = (Font)Resources.Load(@"fonts\english - latin\HVD Fonts - BrandonGrotesque-Bold_Dynamic"); if (font == null) @@ -118,9 +118,7 @@ namespace QSB.ConversationSync newBox.transform.SetParent(parent); newBox.transform.localPosition = new Vector3(0, vertOffset, 0); newBox.transform.rotation = parent.rotation; - newBox.AddComponent(); newBox.GetComponent().text = text; - newBox.AddComponent(); newBox.SetActive(true); return newBox; } diff --git a/QSB/Utility/DebugBoxManager.cs b/QSB/Utility/DebugBoxManager.cs index 8d2481c6..53df477e 100644 --- a/QSB/Utility/DebugBoxManager.cs +++ b/QSB/Utility/DebugBoxManager.cs @@ -10,7 +10,7 @@ namespace QSB.Utility public static void Init() { - _boxPrefab = QSBCore.ConversationAssetBundle.LoadAsset("assets/dialoguebubble.prefab"); + _boxPrefab = QSBCore.ConversationAssetBundle.LoadAsset("assets/Prefabs/dialoguebubble.prefab"); var font = (Font)Resources.Load(@"fonts\english - latin\spacemono-bold"); if (font == null) { @@ -28,9 +28,7 @@ namespace QSB.Utility newBox.transform.SetParent(parent); newBox.transform.localPosition = new Vector3(0, vertOffset, 0); newBox.transform.rotation = parent.rotation; - newBox.AddComponent(); newBox.GetComponent().text = text; - newBox.AddComponent(); newBox.SetActive(true); return newBox; }