diff --git a/NewHorizons/Assets/bundles/eyelightning b/NewHorizons/Assets/bundles/eyelightning deleted file mode 100644 index eee576c6..00000000 Binary files a/NewHorizons/Assets/bundles/eyelightning and /dev/null differ diff --git a/NewHorizons/Assets/bundles/eyelightning.manifest b/NewHorizons/Assets/bundles/eyelightning.manifest deleted file mode 100644 index 348c67f2..00000000 --- a/NewHorizons/Assets/bundles/eyelightning.manifest +++ /dev/null @@ -1,54 +0,0 @@ -ManifestFileVersion: 0 -CRC: 1100413555 -Hashes: - AssetFileHash: - serializedVersion: 2 - Hash: 82cd5bf53e9f9ec8aaa9d096c6b6ed49 - TypeTreeHash: - serializedVersion: 2 - Hash: 6b0fdc2a003f312c70b7f9f23295d4ec -HashAppended: 0 -ClassTypes: -- Class: 1 - Script: {instanceID: 0} -- Class: 4 - Script: {instanceID: 0} -- Class: 21 - Script: {instanceID: 0} -- Class: 28 - Script: {instanceID: 0} -- Class: 48 - Script: {instanceID: 0} -- Class: 82 - Script: {instanceID: 0} -- Class: 83 - Script: {instanceID: 0} -- Class: 108 - Script: {instanceID: 0} -- Class: 114 - Script: {fileID: 11500000, guid: 75a120c57fd3a8b72f7ffaf3cc1e1bab, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 2145ed3a866d4bd5a94d98ee05d0fa4f, type: 3} -- Class: 115 - Script: {instanceID: 0} -- Class: 198 - Script: {instanceID: 0} -- Class: 199 - Script: {instanceID: 0} -- Class: 213 - Script: {instanceID: 0} -SerializeReferenceClassIdentifiers: [] -Assets: -- Assets/UncertainFutures/quantum lightning/LOD_Effects_EYE_LightningBolt_d.png -- Assets/UncertainFutures/quantum lightning/OW Quantum Lightning 091118 AP 05.ogg -- Assets/UncertainFutures/quantum lightning/OW Quantum Lightning 091118 AP 01.ogg -- Assets/UncertainFutures/quantum lightning/prefab_eye_quantumlightningobject.prefab -- Assets/UncertainFutures/quantum lightning/OW Quantum Lightning 091118 AP 06.ogg -- Assets/UncertainFutures/quantum lightning/LOD_Effects_EYE_LightningBolt_d.asset -- Assets/UncertainFutures/quantum lightning/Effects_EYE_LightSpeed_mat.mat -- Assets/UncertainFutures/quantum lightning/OW Quantum Lightning 091118 AP 03.ogg -- Assets/UncertainFutures/quantum lightning/OW Quantum Lightning 091118 AP 04.ogg -- Assets/UncertainFutures/quantum lightning/OW Quantum Lightning 091118 AP 07.ogg -- Assets/UncertainFutures/quantum lightning/OW Quantum Lightning 091118 AP 02.ogg -- Assets/UncertainFutures/quantum lightning/OW Quantum Lightning 091118 AP 08.ogg -Dependencies: [] diff --git a/NewHorizons/Assets/bundles/newhorizons_private b/NewHorizons/Assets/bundles/newhorizons_private index 9392dc48..01e2c265 100644 Binary files a/NewHorizons/Assets/bundles/newhorizons_private and b/NewHorizons/Assets/bundles/newhorizons_private differ diff --git a/NewHorizons/Assets/bundles/newhorizons_private.manifest b/NewHorizons/Assets/bundles/newhorizons_private.manifest index 8c9d7ad4..847ea3aa 100644 --- a/NewHorizons/Assets/bundles/newhorizons_private.manifest +++ b/NewHorizons/Assets/bundles/newhorizons_private.manifest @@ -1,12 +1,12 @@ ManifestFileVersion: 0 -CRC: 2356174904 +CRC: 2772415118 Hashes: AssetFileHash: serializedVersion: 2 - Hash: c9b4a60ca4efa0ba50065dea6e758ce7 + Hash: a1c50cfbd83ea025ed5ff8a920ceb135 TypeTreeHash: serializedVersion: 2 - Hash: 65942a71d50cdc9f2387a8fa9383a3f8 + Hash: 8a96558a3d9470a68866aeaaa30830cf HashAppended: 0 ClassTypes: - Class: 1 @@ -87,6 +87,8 @@ ClassTypes: Script: {fileID: 11500000, guid: 13ab18a571ddf1b4f8dc92e3fa31b22e, type: 3} - Class: 114 Script: {fileID: 11500000, guid: 3d5c87c5a00ca19449219c7c54f41ee7, type: 3} +- Class: 114 + Script: {fileID: 11500000, guid: db82bd26294f5b848aaa8cb1ad0dc252, type: 3} - Class: 114 Script: {fileID: 11500000, guid: 840ab63696e59254eb425242136805dd, type: 3} - Class: 114 @@ -198,5 +200,6 @@ Assets: - Assets/SlideReels/Prefab_DW_Reel_8.prefab - Assets/Vessel_Body.prefab - Assets/AmbientLight_QM.png +- Assets/QuantumLightning/Prefab_EYE_QuantumLightningObject.prefab - Assets/SlideReels/Prefab_IP_Reel_7.prefab Dependencies: [] diff --git a/NewHorizons/Builder/Props/QuantumBuilder.cs b/NewHorizons/Builder/Props/QuantumBuilder.cs index 9c38986a..0fba619b 100644 --- a/NewHorizons/Builder/Props/QuantumBuilder.cs +++ b/NewHorizons/Builder/Props/QuantumBuilder.cs @@ -55,7 +55,7 @@ namespace NewHorizons.Builder.Props var rootGo = root == default ? sector.gameObject : root.go; - var lightning = DetailBuilder.Make(planetGO, sector, Main.Instance, AssetBundleUtilities.EyeLightning.LoadAsset("Prefab_EYE_QuantumLightningObject"), new DetailInfo()); + var lightning = DetailBuilder.Make(planetGO, sector, Main.Instance, AssetBundleUtilities.NHPrivateAssetBundle.LoadAsset("Prefab_EYE_QuantumLightningObject"), new DetailInfo()); lightning.transform.position = rootGo.transform.position; lightning.transform.rotation = rootGo.transform.rotation; lightning.transform.parent = rootGo.transform.parent; diff --git a/NewHorizons/Utility/Files/AssetBundleUtilities.cs b/NewHorizons/Utility/Files/AssetBundleUtilities.cs index 8568328f..87170770 100644 --- a/NewHorizons/Utility/Files/AssetBundleUtilities.cs +++ b/NewHorizons/Utility/Files/AssetBundleUtilities.cs @@ -17,13 +17,11 @@ namespace NewHorizons.Utility.Files public static AssetBundle NHAssetBundle { get; private set; } public static AssetBundle NHPrivateAssetBundle { get; private set; } - public static AssetBundle EyeLightning { get; private set; } static AssetBundleUtilities() { NHAssetBundle = LoadRequiredBundle("Assets/bundles/newhorizons_public"); NHPrivateAssetBundle = LoadRequiredBundle("Assets/bundles/newhorizons_private"); - EyeLightning = LoadRequiredBundle("Assets/bundles/eyelightning"); } private static AssetBundle LoadRequiredBundle(string path)