From eacd8c8fb36259d8456cc3626e1600477342d91c Mon Sep 17 00:00:00 2001 From: JohnCorby Date: Wed, 2 Feb 2022 21:11:00 -0800 Subject: [PATCH] cleanup --- .gitignore | 1 + QSB/AssetBundles/conversation.manifest | 48 -------------- QSB/AssetBundles/debug.manifest | 32 ---------- QSB/AssetBundles/empty.manifest | 19 ------ QSB/AssetBundles/instruments.manifest | 68 -------------------- QSB/AssetBundles/network.manifest | 86 -------------------------- QSB/AssetBundles/textassets.manifest | 17 ----- QSB/QSBNetworkManager.cs | 3 +- 8 files changed, 2 insertions(+), 272 deletions(-) delete mode 100644 QSB/AssetBundles/conversation.manifest delete mode 100644 QSB/AssetBundles/debug.manifest delete mode 100644 QSB/AssetBundles/empty.manifest delete mode 100644 QSB/AssetBundles/instruments.manifest delete mode 100644 QSB/AssetBundles/network.manifest delete mode 100644 QSB/AssetBundles/textassets.manifest diff --git a/.gitignore b/.gitignore index 2142a501..398100c7 100644 --- a/.gitignore +++ b/.gitignore @@ -359,6 +359,7 @@ MigrationBackup/ # Unecessary asset bundle file QSB/AssetBundles/AssetBundles* +QSB/AssetBundles/*.manifest QSB.csproj.user GameAssets/ Chert/ diff --git a/QSB/AssetBundles/conversation.manifest b/QSB/AssetBundles/conversation.manifest deleted file mode 100644 index 1d7a5f70..00000000 --- a/QSB/AssetBundles/conversation.manifest +++ /dev/null @@ -1,48 +0,0 @@ -ManifestFileVersion: 0 -CRC: 2158942079 -Hashes: - AssetFileHash: - serializedVersion: 2 - Hash: 21fafffc689ab0378a0b74d6a5bc856d - TypeTreeHash: - serializedVersion: 2 - Hash: 0b6dcb0adf46bff667535938056e8d8d -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: 1015169618, guid: 7f3cc24903ed9434188d184e6d0fcc8f, type: 3} -- Class: 114 - Script: {fileID: 602583937, guid: 7f3cc24903ed9434188d184e6d0fcc8f, type: 3} -- Class: 114 - Script: {fileID: 1980459831, guid: 106784ef860579a438677482e738fed4, type: 3} -- Class: 114 - Script: {fileID: 1741964061, guid: 106784ef860579a438677482e738fed4, type: 3} -- Class: 114 - Script: {fileID: -765806418, guid: 106784ef860579a438677482e738fed4, type: 3} -- Class: 114 - Script: {fileID: 708705254, guid: 106784ef860579a438677482e738fed4, type: 3} -- Class: 115 - Script: {instanceID: 0} -- Class: 128 - Script: {instanceID: 0} -- Class: 213 - Script: {instanceID: 0} -- Class: 222 - Script: {instanceID: 0} -- Class: 223 - Script: {instanceID: 0} -- Class: 224 - Script: {instanceID: 0} -SerializeReferenceClassIdentifiers: [] -Assets: -- Assets/Prefabs/DialogueBubble.prefab -- Assets/GameAssets/Texture2D/UI_DialogueBox_d.png -Dependencies: [] diff --git a/QSB/AssetBundles/debug.manifest b/QSB/AssetBundles/debug.manifest deleted file mode 100644 index 703e9701..00000000 --- a/QSB/AssetBundles/debug.manifest +++ /dev/null @@ -1,32 +0,0 @@ -ManifestFileVersion: 0 -CRC: 1531115438 -Hashes: - AssetFileHash: - serializedVersion: 2 - Hash: 69af2ff9e30a3a4e0f059dc00ea13d16 - TypeTreeHash: - serializedVersion: 2 - Hash: ae2cf77de671e115b4e55d2b65767202 -HashAppended: 0 -ClassTypes: -- Class: 1 - Script: {instanceID: 0} -- Class: 4 - Script: {instanceID: 0} -- Class: 21 - Script: {instanceID: 0} -- Class: 23 - Script: {instanceID: 0} -- Class: 33 - Script: {instanceID: 0} -- Class: 43 - Script: {instanceID: 0} -- Class: 48 - Script: {instanceID: 0} -SerializeReferenceClassIdentifiers: [] -Assets: -- Assets/Prefabs/Cube.prefab -- Assets/Prefabs/Capsule.prefab -- Assets/Materials/DebugVis.mat -- Assets/Prefabs/Sphere.prefab -Dependencies: [] diff --git a/QSB/AssetBundles/empty.manifest b/QSB/AssetBundles/empty.manifest deleted file mode 100644 index f8f58b24..00000000 --- a/QSB/AssetBundles/empty.manifest +++ /dev/null @@ -1,19 +0,0 @@ -ManifestFileVersion: 0 -CRC: 2559296127 -Hashes: - AssetFileHash: - serializedVersion: 2 - Hash: 2f0c83383bc955a9bba0653ea072b1b6 - TypeTreeHash: - serializedVersion: 2 - Hash: 27295f96fcdc2b917bd061e8817c7e02 -HashAppended: 0 -ClassTypes: -- Class: 1 - Script: {instanceID: 0} -- Class: 4 - Script: {instanceID: 0} -SerializeReferenceClassIdentifiers: [] -Assets: -- Assets/Prefabs/Empty.prefab -Dependencies: [] diff --git a/QSB/AssetBundles/instruments.manifest b/QSB/AssetBundles/instruments.manifest deleted file mode 100644 index 8ad1a37f..00000000 --- a/QSB/AssetBundles/instruments.manifest +++ /dev/null @@ -1,68 +0,0 @@ -ManifestFileVersion: 0 -CRC: 3335898647 -Hashes: - AssetFileHash: - serializedVersion: 2 - Hash: a4e42954901fbc143f242d05c42887d4 - TypeTreeHash: - serializedVersion: 2 - Hash: a1e72967751de663a1cbd29bd1e98be5 -HashAppended: 0 -ClassTypes: -- Class: 21 - Script: {instanceID: 0} -- Class: 28 - Script: {instanceID: 0} -- Class: 43 - Script: {instanceID: 0} -- Class: 48 - Script: {instanceID: 0} -- Class: 74 - Script: {instanceID: 0} -- Class: 90 - Script: {instanceID: 0} -- Class: 91 - Script: {instanceID: 0} -SerializeReferenceClassIdentifiers: [] -Assets: -- Assets/GameAssets/Texture2D/Traveller_HEA_Chert_ao.png -- Assets/GameAssets/AnimationClip/Riebeck_Playing.anim -- Assets/GameAssets/Avatar/Traveller_HEA_Chert_ANIM_Chatter_ChipperAvatar.asset -- Assets/GameAssets/AnimationClip/Chert_Drum_Panicked.anim -- Assets/GameAssets/Material/Traveller_HEA_Riebeck_mat.mat -- Assets/GameAssets/AnimatorController/Traveller_Chert.controller -- Assets/GameAssets/AnimationClip/Chert_Chatter_Chipper.anim -- Assets/GameAssets/AnimationClip/Chert_Drum_Chipper.anim -- Assets/GameAssets/Mesh/NewDrum_polySurface2.asset -- Assets/GameAssets/AnimationClip/Playing_banjo.anim -- Assets/GameAssets/Texture2D/Traveller_HEA_Riebeck_n.png -- Assets/GameAssets/Avatar/Traveller_HEA_Riebeck_ANIM_TalkingAvatar.asset -- Assets/GameAssets/Texture2D/Structure_HEA_VillageCabin_n.png -- Assets/GameAssets/AnimationClip/Chert_Chatter_Nervous.anim -- Assets/GameAssets/Mesh/Chert_DrumStick_Geo1.asset -- Assets/GameAssets/Material/Structure_HEA_VillageMetal_mat.mat -- Assets/GameAssets/Texture2D/Structure_HEA_VillageCabin_d.png -- Assets/GameAssets/Material/Structure_HEA_VillageCabin_mat.mat -- Assets/GameAssets/Texture2D/Traveller_HEA_Chert_d.png -- Assets/GameAssets/Texture2D/Traveller_HEA_Riebeck_Banjo_n.png -- Assets/GameAssets/AnimationClip/Playing_to_idle.anim -- Assets/GameAssets/Texture2D/Traveller_HEA_Chert_n.png -- Assets/GameAssets/Texture2D/Traveller_HEA_Riebeck_s.png -- Assets/GameAssets/AnimationClip/Chert_Chatter_Panicked.anim -- Assets/GameAssets/Material/Traveller_HEA_Riebeck_Banjo_mat.mat -- Assets/GameAssets/AnimationClip/Chert_Dream.anim -- Assets/GameAssets/AnimationClip/Riebeck_Talking.anim -- Assets/GameAssets/Texture2D/Traveller_HEA_Riebeck_Banjo_d.png -- Assets/GameAssets/AnimationClip/Riebeck_DreamIdle.anim -- Assets/GameAssets/Texture2D/Traveller_HEA_Riebeck_Banjo_ao.png -- Assets/GameAssets/Texture2D/Traveller_HEA_Chert_s.png -- Assets/GameAssets/Texture2D/Structure_HEA_VillageMetal_n.png -- Assets/GameAssets/Texture2D/Traveller_HEA_Riebeck_d.png -- Assets/GameAssets/AnimatorController/Traveller_Riebeck.controller -- Assets/GameAssets/Texture2D/Structure_HEA_VillageMetal_s.png -- Assets/GameAssets/Texture2D/Traveller_HEA_Riebeck_ao.png -- Assets/GameAssets/Texture2D/Structure_HEA_VillageMetal_d.png -- Assets/GameAssets/Texture2D/Traveller_HEA_Riebeck_Banjo_s.png -- Assets/GameAssets/Material/Traveller_HEA_Chert_mat.mat -- Assets/GameAssets/Texture2D/Structure_HEA_VillageCabin_s.png -Dependencies: [] diff --git a/QSB/AssetBundles/network.manifest b/QSB/AssetBundles/network.manifest deleted file mode 100644 index 2ee94a40..00000000 --- a/QSB/AssetBundles/network.manifest +++ /dev/null @@ -1,86 +0,0 @@ -ManifestFileVersion: 0 -CRC: 3534813956 -Hashes: - AssetFileHash: - serializedVersion: 2 - Hash: 677d9e2d9728a18aa772e1a8984bfbf7 - TypeTreeHash: - serializedVersion: 2 - Hash: a0f19331c041111ef6a5025afcba6279 -HashAppended: 0 -ClassTypes: -- Class: 1 - Script: {instanceID: 0} -- Class: 4 - Script: {instanceID: 0} -- Class: 20 - Script: {instanceID: 0} -- Class: 21 - Script: {instanceID: 0} -- Class: 23 - Script: {instanceID: 0} -- Class: 28 - Script: {instanceID: 0} -- Class: 33 - Script: {instanceID: 0} -- Class: 43 - Script: {instanceID: 0} -- Class: 48 - Script: {instanceID: 0} -- Class: 74 - Script: {instanceID: 0} -- Class: 90 - Script: {instanceID: 0} -- Class: 91 - Script: {instanceID: 0} -- Class: 95 - Script: {instanceID: 0} -- Class: 114 - Script: {fileID: 11500000, guid: 314f0c0103103bd478ae105cf60b1365, type: 3} -- Class: 114 - Script: {fileID: 860895539, guid: 8d4647d1c34eabf4994ee44623a0f497, type: 3} -- Class: 114 - Script: {fileID: -790547616, guid: 7f3cc24903ed9434188d184e6d0fcc8f, type: 3} -- Class: 114 - Script: {fileID: 806682216, guid: 7f3cc24903ed9434188d184e6d0fcc8f, type: 3} -- Class: 114 - Script: {fileID: 916105004, guid: 7f3cc24903ed9434188d184e6d0fcc8f, type: 3} -- Class: 114 - Script: {fileID: -1164351254, guid: 7f3cc24903ed9434188d184e6d0fcc8f, type: 3} -- Class: 114 - Script: {fileID: -1309757293, guid: 7f3cc24903ed9434188d184e6d0fcc8f, type: 3} -- Class: 114 - Script: {fileID: 78926581, guid: 7f3cc24903ed9434188d184e6d0fcc8f, type: 3} -- Class: 114 - Script: {fileID: 534438773, guid: 7f3cc24903ed9434188d184e6d0fcc8f, type: 3} -- Class: 114 - Script: {fileID: -120762068, guid: 7f3cc24903ed9434188d184e6d0fcc8f, type: 3} -- Class: 114 - Script: {fileID: -2067710655, guid: 7f3cc24903ed9434188d184e6d0fcc8f, type: 3} -- Class: 114 - Script: {fileID: -749020886, guid: 7f3cc24903ed9434188d184e6d0fcc8f, type: 3} -- Class: 114 - Script: {fileID: -270813150, guid: 7f3cc24903ed9434188d184e6d0fcc8f, type: 3} -- Class: 114 - Script: {fileID: -1617191155, guid: 7f3cc24903ed9434188d184e6d0fcc8f, type: 3} -- Class: 114 - Script: {fileID: 677635994, guid: 7f3cc24903ed9434188d184e6d0fcc8f, type: 3} -- Class: 114 - Script: {fileID: 2036222940, guid: 7f3cc24903ed9434188d184e6d0fcc8f, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: ffc24e0d00092f241ac5a55bdc4fc7a1, type: 3} -- Class: 114 - Script: {fileID: 1077175584, guid: 5140986e5c4050848b00d11439f5888c, type: 3} -- Class: 115 - Script: {instanceID: 0} -- Class: 137 - Script: {instanceID: 0} -- Class: 221 - Script: {instanceID: 0} -SerializeReferenceClassIdentifiers: [] -Assets: -- Assets/GameAssets/AnimatorController/Player.controller -- Assets/Prefabs/NETWORK_Player_Body.prefab -- Assets/Prefabs/REMOTE_Player_Body.prefab -- Assets/GameAssets/AnimatorOverrideController/PlayerUnsuitedOverride.overrideController -Dependencies: [] diff --git a/QSB/AssetBundles/textassets.manifest b/QSB/AssetBundles/textassets.manifest deleted file mode 100644 index 0cc55be0..00000000 --- a/QSB/AssetBundles/textassets.manifest +++ /dev/null @@ -1,17 +0,0 @@ -ManifestFileVersion: 0 -CRC: 3102539871 -Hashes: - AssetFileHash: - serializedVersion: 2 - Hash: a82172ddab4ffc78bd7c16996c5f9328 - TypeTreeHash: - serializedVersion: 2 - Hash: 5ad585dd02dfb5016c0dad519eab8f49 -HashAppended: 0 -ClassTypes: -- Class: 49 - Script: {instanceID: 0} -SerializeReferenceClassIdentifiers: [] -Assets: -- Assets/TextAssets/GalaxyMap.txt -Dependencies: [] diff --git a/QSB/QSBNetworkManager.cs b/QSB/QSBNetworkManager.cs index 51a074a4..521f3fda 100644 --- a/QSB/QSBNetworkManager.cs +++ b/QSB/QSBNetworkManager.cs @@ -40,10 +40,9 @@ namespace QSB public GameObject AnglerPrefab { get; private set; } public GameObject JellyfishPrefab { get; private set; } public GameObject OccasionalPrefab { get; private set; } - public string PlayerName { get; private set; } + private string PlayerName { get; set; } private const int MaxConnections = 128; - private const int MaxBufferedPackets = 64; private GameObject _probePrefab; private bool _everConnected;