From 95c4682c966f20262b6f8fae10f58670f0173836 Mon Sep 17 00:00:00 2001 From: Peter Neve <69139852+UpwindPlains70@users.noreply.github.com> Date: Mon, 25 Jul 2022 16:44:23 +0800 Subject: [PATCH] Develop bugfixes (#89) * All weapon skins implemented * Fixed missing materials & unused addressable groups * Hangar - Random silo collider fix * Fixed weapon skin loading error * Fixed Skin loading late & same gun & skin loading * Fixed player on mech elevator & Wall phasing under elevator * Addressable cleanup * Fixed Quick Loader with new wait system * Fixed right silo mech elevator decal being clipped * Fixed main silo list not updating when crate opened in siloOffset not initial spawn * Fixed Aries missing material * Fixed Aries ProtheanGold leftLegFoot * Zombie removal & validation * Fixed Volume number not changing when reset * Refactored hallwayUI validation & made initial loading non-interactable * Added Sprint jump * Spinning logo not backwards * Fixed player bouncing on mech elevator * PlayerPrefs is now a service & fixed look sensitivity not saving * refactoring of how preferences work * Fixed User preferences * Final user preference fixes Co-authored-by: Mitchell Hart Co-authored-by: Brendan Ragan --- .../AddressableAssetSettings.asset | 50 ++--- ...- GrenadeLauncher - ArchonGunmetal1.asset} | 12 +- ...nadeLauncher - ArchonGunmetal1.asset.meta} | 2 +- ... => AM - GrenadeLauncher - Bullion1.asset} | 12 +- ...M - GrenadeLauncher - Bullion1.asset.meta} | 2 +- ...GrenadeLauncher - Code of Chivalry1.asset} | 12 +- ...deLauncher - Code of Chivalry1.asset.meta} | 2 +- ...AM - GrenadeLauncher - DaisonSleek1.asset} | 12 +- ...GrenadeLauncher - DaisonSleek1.asset.meta} | 2 +- ...- GrenadeLauncher - LessThanLethal1.asset} | 12 +- ...enadeLauncher - LessThanLethal1.asset.meta | 8 + ... - GrenadeLauncher - PraetorGrunge1.asset} | 12 +- ...renadeLauncher - PraetorGrunge1.asset.meta | 8 + ... - GrenadeLauncher - ReadyToQuench1.asset} | 12 +- ...renadeLauncher - ReadyToQuench1.asset.meta | 8 + ... => AM - GrenadeLauncher - SeaHawk1.asset} | 12 +- ...AM - GrenadeLauncher - SeaHawk1.asset.meta | 8 + ... AM - GrenadeLauncher - SpotYellow1.asset} | 12 +- ...- GrenadeLauncher - SpotYellow1.asset.meta | 8 + ...M - GrenadeLauncher - ThinBlueLine1.asset} | 12 +- ...GrenadeLauncher - ThinBlueLine1.asset.meta | 8 + ...M - GrenadeLauncher - UnbrokenKnot1.asset} | 12 +- ...GrenadeLauncher - UnbrokenKnot1.asset.meta | 8 + ...chon Miltech-BFG-BFG - ReadyToQuench.asset | 4 - ...hon Miltech-BFG-BFG - TellingTheBees.asset | 4 - ...renadeLauncher - LessThanLethal.asset.meta | 8 - ...GrenadeLauncher - PraetorGrunge.asset.meta | 8 - ...GrenadeLauncher - ReadyToQuench.asset.meta | 8 - ...ncher-GrenadeLauncher - SeaHawk.asset.meta | 8 - ...er-GrenadeLauncher - SpotYellow.asset.meta | 8 - ...-GrenadeLauncher - ThinBlueLine.asset.meta | 8 - ...-GrenadeLauncher - UnbrokenKnot.asset.meta | 8 - ...FlyOut.asset => Aries - FlyInFlyOut.asset} | 10 +- .../Aries - FlyInFlyOut.asset.meta | 8 + ...aliber.asset => Aries - HighCaliber.asset} | 10 +- .../Aries - HighCaliber.asset.meta | 8 + ...anSoil.asset => Aries - MartianSoil.asset} | 10 +- .../Aries - MartianSoil.asset.meta | 8 + ...cream.asset => Aries - OsmiumScream.asset} | 10 +- .../Aries - OsmiumScream.asset.meta | 8 + .../AssetGroups/Aries - PilbaraDust.asset | 2 +- ...old.asset => Aries - PrometheanGold.asset} | 10 +- .../Aries - PrometheanGold.asset.meta | 8 + ...Hill.asset => Aries - SovereignHill.asset} | 10 +- .../Aries - SovereignHill.asset.meta | 8 + .../Aries-Aries - FlyInFlyOut.asset.meta | 8 - .../Aries-Aries - HighCaliber.asset.meta | 8 - .../Aries-Aries - MartianSoil.asset.meta | 8 - .../Aries-Aries - OsmiumScream.asset.meta | 8 - .../Aries-Aries - PrometheanGold.asset.meta | 8 - .../Aries-Aries - SovereignHill.asset.meta | 8 - ...onGunmetal1_BundledAssetGroupSchema.asset} | 4 +- ...nmetal1_BundledAssetGroupSchema.asset.meta | 8 + ...nGunmetal1_ContentUpdateGroupSchema.asset} | 4 +- ...metal1_ContentUpdateGroupSchema.asset.meta | 8 + ... - Bullion1_BundledAssetGroupSchema.asset} | 4 +- ...ullion1_BundledAssetGroupSchema.asset.meta | 8 + ...- Bullion1_ContentUpdateGroupSchema.asset} | 4 +- ...llion1_ContentUpdateGroupSchema.asset.meta | 8 + ...of Chivalry1_BundledAssetGroupSchema.asset | 45 +++++ ...ivalry1_BundledAssetGroupSchema.asset.meta | 8 + ...f Chivalry1_ContentUpdateGroupSchema.asset | 16 ++ ...valry1_ContentUpdateGroupSchema.asset.meta | 8 + ...aisonSleek1_BundledAssetGroupSchema.asset} | 4 +- ...nSleek1_BundledAssetGroupSchema.asset.meta | 8 + ...isonSleek1_ContentUpdateGroupSchema.asset} | 4 +- ...Sleek1_ContentUpdateGroupSchema.asset.meta | 8 + ...sThanLethal1_BundledAssetGroupSchema.asset | 45 +++++ ...Lethal1_BundledAssetGroupSchema.asset.meta | 8 + ...ThanLethal1_ContentUpdateGroupSchema.asset | 16 ++ ...ethal1_ContentUpdateGroupSchema.asset.meta | 8 + ...etorGrunge1_BundledAssetGroupSchema.asset} | 4 +- ...Grunge1_BundledAssetGroupSchema.asset.meta | 8 + ...torGrunge1_ContentUpdateGroupSchema.asset} | 4 +- ...runge1_ContentUpdateGroupSchema.asset.meta | 8 + ...adyToQuench1_BundledAssetGroupSchema.asset | 45 +++++ ...Quench1_BundledAssetGroupSchema.asset.meta | 8 + ...dyToQuench1_ContentUpdateGroupSchema.asset | 16 ++ ...uench1_ContentUpdateGroupSchema.asset.meta | 8 + ... - SeaHawk1_BundledAssetGroupSchema.asset} | 4 +- ...eaHawk1_BundledAssetGroupSchema.asset.meta | 8 + ...- SeaHawk1_ContentUpdateGroupSchema.asset} | 4 +- ...aHawk1_ContentUpdateGroupSchema.asset.meta | 8 + ...SpotYellow1_BundledAssetGroupSchema.asset} | 4 +- ...Yellow1_BundledAssetGroupSchema.asset.meta | 8 + ...potYellow1_ContentUpdateGroupSchema.asset} | 4 +- ...ellow1_ContentUpdateGroupSchema.asset.meta | 8 + ...inBlueLine1_BundledAssetGroupSchema.asset} | 4 +- ...ueLine1_BundledAssetGroupSchema.asset.meta | 8 + ...nBlueLine1_ContentUpdateGroupSchema.asset} | 4 +- ...eLine1_ContentUpdateGroupSchema.asset.meta | 8 + ...brokenKnot1_BundledAssetGroupSchema.asset} | 4 +- ...enKnot1_BundledAssetGroupSchema.asset.meta | 8 + ...rokenKnot1_ContentUpdateGroupSchema.asset} | 4 +- ...nKnot1_ContentUpdateGroupSchema.asset.meta | 8 + ...chonGunmetal_BundledAssetGroupSchema.asset | 45 ----- ...unmetal_BundledAssetGroupSchema.asset.meta | 8 - ...honGunmetal_ContentUpdateGroupSchema.asset | 16 -- ...nmetal_ContentUpdateGroupSchema.asset.meta | 8 - ...er - Bullion_BundledAssetGroupSchema.asset | 45 ----- ...Bullion_BundledAssetGroupSchema.asset.meta | 8 - ...r - Bullion_ContentUpdateGroupSchema.asset | 16 -- ...ullion_ContentUpdateGroupSchema.asset.meta | 8 - ... of Chivalry_BundledAssetGroupSchema.asset | 45 ----- ...hivalry_BundledAssetGroupSchema.asset.meta | 8 - ...of Chivalry_ContentUpdateGroupSchema.asset | 16 -- ...ivalry_ContentUpdateGroupSchema.asset.meta | 8 - ... DaisonSleek_BundledAssetGroupSchema.asset | 45 ----- ...onSleek_BundledAssetGroupSchema.asset.meta | 8 - ...DaisonSleek_ContentUpdateGroupSchema.asset | 16 -- ...nSleek_ContentUpdateGroupSchema.asset.meta | 8 - ...ssThanLethal_BundledAssetGroupSchema.asset | 45 ----- ...nLethal_BundledAssetGroupSchema.asset.meta | 8 - ...sThanLethal_ContentUpdateGroupSchema.asset | 16 -- ...Lethal_ContentUpdateGroupSchema.asset.meta | 8 - ...raetorGrunge_BundledAssetGroupSchema.asset | 45 ----- ...rGrunge_BundledAssetGroupSchema.asset.meta | 8 - ...aetorGrunge_ContentUpdateGroupSchema.asset | 16 -- ...Grunge_ContentUpdateGroupSchema.asset.meta | 8 - ...eadyToQuench_BundledAssetGroupSchema.asset | 45 ----- ...oQuench_BundledAssetGroupSchema.asset.meta | 8 - ...adyToQuench_ContentUpdateGroupSchema.asset | 16 -- ...Quench_ContentUpdateGroupSchema.asset.meta | 8 - ...er - SeaHawk_BundledAssetGroupSchema.asset | 45 ----- ...SeaHawk_BundledAssetGroupSchema.asset.meta | 8 - ...r - SeaHawk_ContentUpdateGroupSchema.asset | 16 -- ...eaHawk_ContentUpdateGroupSchema.asset.meta | 8 - ...- SpotYellow_BundledAssetGroupSchema.asset | 45 ----- ...tYellow_BundledAssetGroupSchema.asset.meta | 8 - ... SpotYellow_ContentUpdateGroupSchema.asset | 16 -- ...Yellow_ContentUpdateGroupSchema.asset.meta | 8 - ...ThinBlueLine_BundledAssetGroupSchema.asset | 45 ----- ...lueLine_BundledAssetGroupSchema.asset.meta | 8 - ...hinBlueLine_ContentUpdateGroupSchema.asset | 16 -- ...ueLine_ContentUpdateGroupSchema.asset.meta | 8 - ...UnbrokenKnot_BundledAssetGroupSchema.asset | 45 ----- ...kenKnot_BundledAssetGroupSchema.asset.meta | 8 - ...nbrokenKnot_ContentUpdateGroupSchema.asset | 16 -- ...enKnot_ContentUpdateGroupSchema.asset.meta | 8 - ...FlyInFlyOut_BundledAssetGroupSchema.asset} | 4 +- ...nFlyOut_BundledAssetGroupSchema.asset.meta | 8 + ...lyInFlyOut_ContentUpdateGroupSchema.asset} | 4 +- ...FlyOut_ContentUpdateGroupSchema.asset.meta | 8 + ...HighCaliber_BundledAssetGroupSchema.asset} | 4 +- ...Caliber_BundledAssetGroupSchema.asset.meta | 8 + ...ighCaliber_ContentUpdateGroupSchema.asset} | 4 +- ...aliber_ContentUpdateGroupSchema.asset.meta | 8 + ...MartianSoil_BundledAssetGroupSchema.asset} | 4 +- ...ianSoil_BundledAssetGroupSchema.asset.meta | 8 + ...artianSoil_ContentUpdateGroupSchema.asset} | 4 +- ...anSoil_ContentUpdateGroupSchema.asset.meta | 8 + ...smiumScream_BundledAssetGroupSchema.asset} | 4 +- ...mScream_BundledAssetGroupSchema.asset.meta | 8 + ...miumScream_ContentUpdateGroupSchema.asset} | 4 +- ...Scream_ContentUpdateGroupSchema.asset.meta | 8 + ...metheanGold_BundledAssetGroupSchema.asset} | 4 +- ...eanGold_BundledAssetGroupSchema.asset.meta | 8 + ...etheanGold_ContentUpdateGroupSchema.asset} | 4 +- ...anGold_ContentUpdateGroupSchema.asset.meta | 8 + ...overeignHill_BundledAssetGroupSchema.asset | 45 +++++ ...ignHill_BundledAssetGroupSchema.asset.meta | 8 + ...vereignHill_ContentUpdateGroupSchema.asset | 16 ++ ...gnHill_ContentUpdateGroupSchema.asset.meta | 8 + ...nFlyOut_BundledAssetGroupSchema.asset.meta | 8 - ...FlyOut_ContentUpdateGroupSchema.asset.meta | 8 - ...Caliber_BundledAssetGroupSchema.asset.meta | 8 - ...aliber_ContentUpdateGroupSchema.asset.meta | 8 - ...ianSoil_BundledAssetGroupSchema.asset.meta | 8 - ...anSoil_ContentUpdateGroupSchema.asset.meta | 8 - ...mScream_BundledAssetGroupSchema.asset.meta | 8 - ...Scream_ContentUpdateGroupSchema.asset.meta | 8 - ...ometheanGold_BundledAssetGroupSchema.asset | 45 ----- ...eanGold_BundledAssetGroupSchema.asset.meta | 8 - ...metheanGold_ContentUpdateGroupSchema.asset | 16 -- ...anGold_ContentUpdateGroupSchema.asset.meta | 8 - ...overeignHill_BundledAssetGroupSchema.asset | 45 ----- ...ignHill_BundledAssetGroupSchema.asset.meta | 8 - ...vereignHill_ContentUpdateGroupSchema.asset | 16 -- ...gnHill_ContentUpdateGroupSchema.asset.meta | 8 - ...vyWhite_BundledAssetGroupSchema.asset.meta | 8 - ...yWhite_ContentUpdateGroupSchema.asset.meta | 8 - ...MineGod_BundledAssetGroupSchema.asset.meta | 8 - ...ineGod_ContentUpdateGroupSchema.asset.meta | 8 - ...llifier_BundledAssetGroupSchema.asset.meta | 8 - ...lifier_ContentUpdateGroupSchema.asset.meta | 8 - ...dowStealAway_BundledAssetGroupSchema.asset | 45 ----- ...ealAway_BundledAssetGroupSchema.asset.meta | 8 - ...owStealAway_ContentUpdateGroupSchema.asset | 16 -- ...alAway_ContentUpdateGroupSchema.asset.meta | 8 - ...nthPunk_BundledAssetGroupSchema.asset.meta | 8 - ...thPunk_ContentUpdateGroupSchema.asset.meta | 8 - ...ive Zero One_BundledAssetGroupSchema.asset | 45 ----- ...ero One_BundledAssetGroupSchema.asset.meta | 8 - ...ve Zero One_ContentUpdateGroupSchema.asset | 16 -- ...ro One_ContentUpdateGroupSchema.asset.meta | 8 - ... X3Kuro_BundledAssetGroupSchema.asset.meta | 8 - ...X3Kuro_ContentUpdateGroupSchema.asset.meta | 8 - ...chikoma_BundledAssetGroupSchema.asset.meta | 8 - ...hikoma_ContentUpdateGroupSchema.asset.meta | 8 - ...- HeavyWhite_BundledAssetGroupSchema.asset | 45 ----- ...vyWhite_BundledAssetGroupSchema.asset.meta | 8 - ... HeavyWhite_ContentUpdateGroupSchema.asset | 16 -- ...yWhite_ContentUpdateGroupSchema.asset.meta | 8 - ...ma - MineGod_BundledAssetGroupSchema.asset | 45 ----- ...MineGod_BundledAssetGroupSchema.asset.meta | 8 - ...a - MineGod_ContentUpdateGroupSchema.asset | 16 -- ...ineGod_ContentUpdateGroupSchema.asset.meta | 8 - ...llifier_BundledAssetGroupSchema.asset.meta | 8 - ...lifier_ContentUpdateGroupSchema.asset.meta | 8 - ...ealAway_BundledAssetGroupSchema.asset.meta | 8 - ...alAway_ContentUpdateGroupSchema.asset.meta | 8 - ...nthPunk_BundledAssetGroupSchema.asset.meta | 8 - ...thPunk_ContentUpdateGroupSchema.asset.meta | 8 - ...uma - X3Kuro_BundledAssetGroupSchema.asset | 45 ----- ... X3Kuro_BundledAssetGroupSchema.asset.meta | 8 - ...ma - X3Kuro_ContentUpdateGroupSchema.asset | 16 -- ...X3Kuro_ContentUpdateGroupSchema.asset.meta | 8 - .../AssetGroups/Shirokuma - HeavyWhite.asset | 25 --- .../Shirokuma - HeavyWhite.asset.meta | 8 - .../AssetGroups/Shirokuma - MineGod.asset | 25 --- .../Shirokuma - MineGod.asset.meta | 8 - .../AssetGroups/Shirokuma - Nullifier.asset | 25 --- .../Shirokuma - Nullifier.asset.meta | 8 - .../Shirokuma - ShadowStealAway.asset | 25 --- .../Shirokuma - ShadowStealAway.asset.meta | 8 - .../AssetGroups/Shirokuma - SynthPunk.asset | 25 --- .../Shirokuma - SynthPunk.asset.meta | 8 - .../Shirokuma - Two Five Zero One.asset | 25 --- .../Shirokuma - Two Five Zero One.asset.meta | 8 - .../AssetGroups/Shirokuma - X3Kuro.asset | 25 --- .../AssetGroups/Shirokuma - X3Kuro.asset.meta | 8 - ...irokuma-Shirokuma - 2501 - Tachikoma.asset | 25 --- ...ma-Shirokuma - 2501 - Tachikoma.asset.meta | 8 - .../Shirokuma-Shirokuma - HeavyWhite.asset | 25 --- ...hirokuma-Shirokuma - HeavyWhite.asset.meta | 8 - .../Shirokuma-Shirokuma - MineGod.asset | 25 --- .../Shirokuma-Shirokuma - MineGod.asset.meta | 8 - .../Shirokuma-Shirokuma - Nullifier.asset | 25 --- ...Shirokuma-Shirokuma - Nullifier.asset.meta | 8 - ...hirokuma-Shirokuma - ShadowStealAway.asset | 25 --- ...uma-Shirokuma - ShadowStealAway.asset.meta | 8 - .../Shirokuma-Shirokuma - SynthPunk.asset | 25 --- ...Shirokuma-Shirokuma - SynthPunk.asset.meta | 8 - .../Shirokuma-Shirokuma - X3Kuro.asset | 25 --- .../Shirokuma-Shirokuma - X3Kuro.asset.meta | 8 - .../Mechs/Aries/Materials/FlyInFlyOut.asset | 1 + .../Aries/Materials/FlyInFlyOut/Hoses.mat | 72 ++++++++ .../Materials/FlyInFlyOut/Hoses.mat.meta} | 2 +- .../Mechs/Aries/Materials/HighCaliber.asset | 1 + .../Aries/Materials/HighCaliber/Hoses.mat} | 10 +- .../Materials/HighCaliber/Hoses.mat.meta} | 2 +- .../Mechs/Aries/Materials/MartianSoil.asset | 1 + .../Aries/Materials/MartianSoil/Hoses.mat | 72 ++++++++ .../Materials/MartianSoil/Hoses.mat.meta} | 2 +- .../Mechs/Aries/Materials/OsmiumScream.asset | 1 + .../Aries/Materials/OsmiumScream/Hoses.mat} | 34 ++-- .../Materials/OsmiumScream/Hoses.mat.meta} | 2 +- .../Mechs/Aries/Materials/PilbaraDust.asset | 1 + .../Aries/Materials/PilbaraDust/Hoses.mat} | 34 ++-- .../Materials/PilbaraDust/Hoses.mat.meta | 8 + .../Aries/Materials/PrometheanGold.asset | 3 +- .../Aries/Materials/PrometheanGold/Hoses.mat} | 95 +++++----- .../Materials/PrometheanGold/Hoses.mat.meta | 8 + .../Mechs/Aries/Materials/SovereignHill.asset | 1 + .../Aries/Materials/SovereignHill/Hoses.mat} | 34 ++-- .../Materials/SovereignHill/Hoses.mat.meta | 8 + .../Aries/Materials/SovereignHill/LeftLeg.mat | 8 +- Assets/Content/Player/InitialLoading.prefab | 4 +- Assets/Content/Player/Player.prefab | 52 +++--- Assets/Content/Silo/Elevator.prefab | 5 + Assets/Content/Silo/Hangar_Silo_Left.prefab | 26 +++ .../Content/Silo/Hangar_Silo_Right BC.prefab | 2 +- .../Content/Silo/Hangar_Silo_Right RM.prefab | 2 +- .../Content/Silo/Hangar_Silo_Right Zai.prefab | 2 +- Assets/Content/Silo/Hangar_Silo_Right.prefab | 26 +++ Assets/Content/Silo/MechElevator.prefab | 14 ++ Assets/Content/Silo/MechSilo_Left.fbx | 4 +- Assets/Content/Silo/MechSilo_Right.fbx | 4 +- Assets/Content/Textures/LoadingIcon.anim | 174 ++++++++++++++++-- .../ReadyToQuench/ReadyToQuench.asset | 16 -- .../ReadyToQuench/ReadyToQuench.asset.meta | 8 - .../TellingTheBees/TellingTheBees.asset | 16 -- .../TellingTheBees/TellingTheBees.asset.meta | 8 - .../Materials/ArchonGunmetal.asset | 2 +- .../ArchonGunmetal/GrenadeLauncher.mat | 72 ++++++++ .../ArchonGunmetal/GrenadeLauncher.mat.meta | 8 + .../GrenadeLauncher/Materials/Bullion.asset | 2 +- .../Materials/Bullion/GrenadeLauncher.mat | 72 ++++++++ .../Bullion/GrenadeLauncher.mat.meta | 8 + .../Materials/Code of Chivalry.asset | 2 +- .../Code of Chivalry/GrenadeLauncher.mat | 72 ++++++++ .../Code of Chivalry/GrenadeLauncher.mat.meta | 8 + .../Materials/DaisonSleek.asset | 2 +- .../DaisonSleek/AM_GranadeLauncher.mat.meta | 8 - .../Materials/DaisonSleek/GrenadeLauncher.mat | 72 ++++++++ .../DaisonSleek/GrenadeLauncher.mat.meta | 8 + .../Materials/LessThanLethal.asset | 2 +- .../LessThanLethal/AM_GranadeLauncher.mat | 72 -------- .../AM_GranadeLauncher.mat.meta | 8 - .../LessThanLethal/GrenadeLauncher.mat | 72 ++++++++ .../LessThanLethal/GrenadeLauncher.mat.meta | 8 + .../Materials/PraetorGrunge.asset | 2 +- .../PraetorGrunge/AM_GranadeLauncher.mat | 72 -------- .../PraetorGrunge/AM_GranadeLauncher.mat.meta | 8 - .../PraetorGrunge/GrenadeLauncher.mat | 72 ++++++++ .../PraetorGrunge/GrenadeLauncher.mat.meta | 8 + .../Materials/ReadyToQuench.asset | 2 +- .../ReadyToQuench/AM_GranadeLauncher.mat | 72 -------- .../ReadyToQuench/AM_GranadeLauncher.mat.meta | 8 - .../ReadyToQuench/GrenadeLauncher.mat | 72 ++++++++ .../ReadyToQuench/GrenadeLauncher.mat.meta | 8 + .../GrenadeLauncher/Materials/SeaHawk.asset | 2 +- .../Materials/SeaHawk/AM_GranadeLauncher.mat | 72 -------- .../SeaHawk/AM_GranadeLauncher.mat.meta | 8 - .../Materials/SeaHawk/GrenadeLauncher.mat | 72 ++++++++ .../SeaHawk/GrenadeLauncher.mat.meta | 8 + .../Materials/SpotYellow.asset | 2 +- .../SpotYellow/AM_GranadeLauncher.mat | 72 -------- .../SpotYellow/AM_GranadeLauncher.mat.meta | 8 - .../Materials/SpotYellow/GrenadeLauncher.mat | 72 ++++++++ .../SpotYellow/GrenadeLauncher.mat.meta | 8 + .../Materials/ThinBlueLine.asset | 2 +- .../ThinBlueLine/AM_GranadeLauncher.mat | 72 -------- .../ThinBlueLine/AM_GranadeLauncher.mat.meta | 8 - .../ThinBlueLine/GrenadeLauncher.mat | 72 ++++++++ .../ThinBlueLine/GrenadeLauncher.mat.meta | 8 + .../Materials/UnbrokenKnot.asset | 2 +- .../UnbrokenKnot/AM_GranadeLauncher.mat | 72 -------- .../UnbrokenKnot/AM_GranadeLauncher.mat.meta | 8 - .../UnbrokenKnot/GrenadeLauncher.mat | 72 ++++++++ .../UnbrokenKnot/GrenadeLauncher.mat.meta | 8 + .../MartianSoil/PFT_Flamethrower.mat | 10 +- .../OsmiumScream/PFT_Flamethrower.mat | 10 +- .../Materials/MineGod/MineGold.asset.meta | 8 - .../Minigun/Materials/MineGod/Minigun.mat | 129 ------------- .../Materials/MineGod/Minigun.mat.meta | 8 - .../Minigun/Materials/Rebellion/Mingun.mat | 129 ------------- .../Materials/Rebellion/Mingun.mat.meta | 8 - .../Materials/Rebellion/Rebelion.asset | 16 -- .../Materials/Rebellion/Rebelion.asset.meta | 8 - .../VerdantWarsui/Warsui_Missile_Launcher.mat | 10 +- ...chonMiltechWeaponMeshMaterialNameMap.asset | 2 +- Assets/Editor/MechMeshMaterialNameMap.asset | 8 +- Assets/Resources/ProjectContext.prefab | 4 +- .../Actors/Player/PreferenceSliderUI.cs | 95 ++++++++++ ...ume.cs.meta => PreferenceSliderUI.cs.meta} | 0 .../Runtime/Actors/Player/ResetUserPrefs.cs | 28 +++ .../Actors/Player/ResetUserPrefs.cs.meta | 11 ++ Assets/Runtime/Actors/Player/SetVolume.cs | 77 -------- .../Player/SupremacyMixerInstaller.asset} | 7 +- .../Player/SupremacyMixerInstaller.asset.meta | 8 + .../Player/UserPreferenceInstaller.asset | 19 ++ .../Player/UserPreferenceInstaller.asset.meta | 8 + .../Actors/Player/UserPreferencesService.cs | 91 +++++++++ .../Player/UserPreferencesService.cs.meta | 11 ++ Assets/Runtime/Actors/Silo/SiloState.cs | 2 +- .../Actors/SiloHallway/SiloHallwayUI.cs | 20 ++ .../ContentLoader/AddressablesManager.cs | 101 ++++++---- Assets/Runtime/FirstPersonController.cs | 20 +- .../ScriptableObjects/SupremacyMixer.cs | 66 +++++++ .../ScriptableObjects/SupremacyMixer.cs.meta | 11 ++ Assets/Settings/AssetMappings.asset | 8 +- 362 files changed, 2693 insertions(+), 3617 deletions(-) rename Assets/AddressableAssetsData/AssetGroups/{Archon Miltech-GrenadeLauncher-GrenadeLauncher - ArchonGunmetal.asset => AM - GrenadeLauncher - ArchonGunmetal1.asset} (64%) rename Assets/AddressableAssetsData/AssetGroups/{Archon Miltech-GrenadeLauncher-GrenadeLauncher - Code of Chivalry.asset.meta => AM - GrenadeLauncher - ArchonGunmetal1.asset.meta} (79%) rename Assets/AddressableAssetsData/AssetGroups/{Archon Miltech-GrenadeLauncher-GrenadeLauncher - Bullion.asset => AM - GrenadeLauncher - Bullion1.asset} (65%) rename Assets/AddressableAssetsData/AssetGroups/{Archon Miltech-GrenadeLauncher-GrenadeLauncher - ArchonGunmetal.asset.meta => AM - GrenadeLauncher - Bullion1.asset.meta} (79%) rename Assets/AddressableAssetsData/AssetGroups/{Archon Miltech-GrenadeLauncher-GrenadeLauncher - Code of Chivalry.asset => AM - GrenadeLauncher - Code of Chivalry1.asset} (64%) rename Assets/AddressableAssetsData/AssetGroups/{Archon Miltech-GrenadeLauncher-GrenadeLauncher - DaisonSleek.asset.meta => AM - GrenadeLauncher - Code of Chivalry1.asset.meta} (79%) rename Assets/AddressableAssetsData/AssetGroups/{Archon Miltech-GrenadeLauncher-GrenadeLauncher - DaisonSleek.asset => AM - GrenadeLauncher - DaisonSleek1.asset} (64%) rename Assets/AddressableAssetsData/AssetGroups/{Archon Miltech-GrenadeLauncher-GrenadeLauncher - Bullion.asset.meta => AM - GrenadeLauncher - DaisonSleek1.asset.meta} (79%) rename Assets/AddressableAssetsData/AssetGroups/{Archon Miltech-GrenadeLauncher-GrenadeLauncher - LessThanLethal.asset => AM - GrenadeLauncher - LessThanLethal1.asset} (64%) create mode 100644 Assets/AddressableAssetsData/AssetGroups/AM - GrenadeLauncher - LessThanLethal1.asset.meta rename Assets/AddressableAssetsData/AssetGroups/{Archon Miltech-GrenadeLauncher-GrenadeLauncher - PraetorGrunge.asset => AM - GrenadeLauncher - PraetorGrunge1.asset} (64%) create mode 100644 Assets/AddressableAssetsData/AssetGroups/AM - GrenadeLauncher - PraetorGrunge1.asset.meta rename Assets/AddressableAssetsData/AssetGroups/{Archon Miltech-GrenadeLauncher-GrenadeLauncher - ReadyToQuench.asset => AM - GrenadeLauncher - ReadyToQuench1.asset} (64%) create mode 100644 Assets/AddressableAssetsData/AssetGroups/AM - GrenadeLauncher - ReadyToQuench1.asset.meta rename Assets/AddressableAssetsData/AssetGroups/{Archon Miltech-GrenadeLauncher-GrenadeLauncher - SeaHawk.asset => AM - GrenadeLauncher - SeaHawk1.asset} (65%) create mode 100644 Assets/AddressableAssetsData/AssetGroups/AM - GrenadeLauncher - SeaHawk1.asset.meta rename Assets/AddressableAssetsData/AssetGroups/{Archon Miltech-GrenadeLauncher-GrenadeLauncher - SpotYellow.asset => AM - GrenadeLauncher - SpotYellow1.asset} (65%) create mode 100644 Assets/AddressableAssetsData/AssetGroups/AM - GrenadeLauncher - SpotYellow1.asset.meta rename Assets/AddressableAssetsData/AssetGroups/{Archon Miltech-GrenadeLauncher-GrenadeLauncher - ThinBlueLine.asset => AM - GrenadeLauncher - ThinBlueLine1.asset} (64%) create mode 100644 Assets/AddressableAssetsData/AssetGroups/AM - GrenadeLauncher - ThinBlueLine1.asset.meta rename Assets/AddressableAssetsData/AssetGroups/{Archon Miltech-GrenadeLauncher-GrenadeLauncher - UnbrokenKnot.asset => AM - GrenadeLauncher - UnbrokenKnot1.asset} (64%) create mode 100644 Assets/AddressableAssetsData/AssetGroups/AM - GrenadeLauncher - UnbrokenKnot1.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Archon Miltech-GrenadeLauncher-GrenadeLauncher - LessThanLethal.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Archon Miltech-GrenadeLauncher-GrenadeLauncher - PraetorGrunge.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Archon Miltech-GrenadeLauncher-GrenadeLauncher - ReadyToQuench.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Archon Miltech-GrenadeLauncher-GrenadeLauncher - SeaHawk.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Archon Miltech-GrenadeLauncher-GrenadeLauncher - SpotYellow.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Archon Miltech-GrenadeLauncher-GrenadeLauncher - ThinBlueLine.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Archon Miltech-GrenadeLauncher-GrenadeLauncher - UnbrokenKnot.asset.meta rename Assets/AddressableAssetsData/AssetGroups/{Aries-Aries - FlyInFlyOut.asset => Aries - FlyInFlyOut.asset} (74%) create mode 100644 Assets/AddressableAssetsData/AssetGroups/Aries - FlyInFlyOut.asset.meta rename Assets/AddressableAssetsData/AssetGroups/{Aries-Aries - HighCaliber.asset => Aries - HighCaliber.asset} (74%) create mode 100644 Assets/AddressableAssetsData/AssetGroups/Aries - HighCaliber.asset.meta rename Assets/AddressableAssetsData/AssetGroups/{Aries-Aries - MartianSoil.asset => Aries - MartianSoil.asset} (74%) create mode 100644 Assets/AddressableAssetsData/AssetGroups/Aries - MartianSoil.asset.meta rename Assets/AddressableAssetsData/AssetGroups/{Aries-Aries - OsmiumScream.asset => Aries - OsmiumScream.asset} (73%) create mode 100644 Assets/AddressableAssetsData/AssetGroups/Aries - OsmiumScream.asset.meta rename Assets/AddressableAssetsData/AssetGroups/{Aries-Aries - PrometheanGold.asset => Aries - PrometheanGold.asset} (73%) create mode 100644 Assets/AddressableAssetsData/AssetGroups/Aries - PrometheanGold.asset.meta rename Assets/AddressableAssetsData/AssetGroups/{Aries-Aries - SovereignHill.asset => Aries - SovereignHill.asset} (73%) create mode 100644 Assets/AddressableAssetsData/AssetGroups/Aries - SovereignHill.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Aries-Aries - FlyInFlyOut.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Aries-Aries - HighCaliber.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Aries-Aries - MartianSoil.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Aries-Aries - OsmiumScream.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Aries-Aries - PrometheanGold.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Aries-Aries - SovereignHill.asset.meta rename Assets/AddressableAssetsData/AssetGroups/Schemas/{Shirokuma-Shirokuma - 2501 - Tachikoma_BundledAssetGroupSchema.asset => AM - GrenadeLauncher - ArchonGunmetal1_BundledAssetGroupSchema.asset} (90%) create mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - ArchonGunmetal1_BundledAssetGroupSchema.asset.meta rename Assets/AddressableAssetsData/AssetGroups/Schemas/{Shirokuma-Shirokuma - 2501 - Tachikoma_ContentUpdateGroupSchema.asset => AM - GrenadeLauncher - ArchonGunmetal1_ContentUpdateGroupSchema.asset} (74%) create mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - ArchonGunmetal1_ContentUpdateGroupSchema.asset.meta rename Assets/AddressableAssetsData/AssetGroups/Schemas/{Shirokuma-Shirokuma - Nullifier_BundledAssetGroupSchema.asset => AM - GrenadeLauncher - Bullion1_BundledAssetGroupSchema.asset} (90%) create mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - Bullion1_BundledAssetGroupSchema.asset.meta rename Assets/AddressableAssetsData/AssetGroups/Schemas/{Shirokuma-Shirokuma - Nullifier_ContentUpdateGroupSchema.asset => AM - GrenadeLauncher - Bullion1_ContentUpdateGroupSchema.asset} (73%) create mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - Bullion1_ContentUpdateGroupSchema.asset.meta create mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - Code of Chivalry1_BundledAssetGroupSchema.asset create mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - Code of Chivalry1_BundledAssetGroupSchema.asset.meta create mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - Code of Chivalry1_ContentUpdateGroupSchema.asset create mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - Code of Chivalry1_ContentUpdateGroupSchema.asset.meta rename Assets/AddressableAssetsData/AssetGroups/Schemas/{Aries-Aries - OsmiumScream_BundledAssetGroupSchema.asset => AM - GrenadeLauncher - DaisonSleek1_BundledAssetGroupSchema.asset} (90%) create mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - DaisonSleek1_BundledAssetGroupSchema.asset.meta rename Assets/AddressableAssetsData/AssetGroups/Schemas/{Aries-Aries - OsmiumScream_ContentUpdateGroupSchema.asset => AM - GrenadeLauncher - DaisonSleek1_ContentUpdateGroupSchema.asset} (72%) create mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - DaisonSleek1_ContentUpdateGroupSchema.asset.meta create mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - LessThanLethal1_BundledAssetGroupSchema.asset create mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - LessThanLethal1_BundledAssetGroupSchema.asset.meta create mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - LessThanLethal1_ContentUpdateGroupSchema.asset create mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - LessThanLethal1_ContentUpdateGroupSchema.asset.meta rename Assets/AddressableAssetsData/AssetGroups/Schemas/{Shirokuma-Shirokuma - ShadowStealAway_BundledAssetGroupSchema.asset => AM - GrenadeLauncher - PraetorGrunge1_BundledAssetGroupSchema.asset} (90%) create mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - PraetorGrunge1_BundledAssetGroupSchema.asset.meta rename Assets/AddressableAssetsData/AssetGroups/Schemas/{Shirokuma-Shirokuma - ShadowStealAway_ContentUpdateGroupSchema.asset => AM - GrenadeLauncher - PraetorGrunge1_ContentUpdateGroupSchema.asset} (74%) create mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - PraetorGrunge1_ContentUpdateGroupSchema.asset.meta create mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - ReadyToQuench1_BundledAssetGroupSchema.asset create mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - ReadyToQuench1_BundledAssetGroupSchema.asset.meta create mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - ReadyToQuench1_ContentUpdateGroupSchema.asset create mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - ReadyToQuench1_ContentUpdateGroupSchema.asset.meta rename Assets/AddressableAssetsData/AssetGroups/Schemas/{Shirokuma-Shirokuma - SynthPunk_BundledAssetGroupSchema.asset => AM - GrenadeLauncher - SeaHawk1_BundledAssetGroupSchema.asset} (90%) create mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - SeaHawk1_BundledAssetGroupSchema.asset.meta rename Assets/AddressableAssetsData/AssetGroups/Schemas/{Shirokuma-Shirokuma - SynthPunk_ContentUpdateGroupSchema.asset => AM - GrenadeLauncher - SeaHawk1_ContentUpdateGroupSchema.asset} (73%) create mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - SeaHawk1_ContentUpdateGroupSchema.asset.meta rename Assets/AddressableAssetsData/AssetGroups/Schemas/{Aries-Aries - MartianSoil_BundledAssetGroupSchema.asset => AM - GrenadeLauncher - SpotYellow1_BundledAssetGroupSchema.asset} (90%) create mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - SpotYellow1_BundledAssetGroupSchema.asset.meta rename Assets/AddressableAssetsData/AssetGroups/Schemas/{Aries-Aries - MartianSoil_ContentUpdateGroupSchema.asset => AM - GrenadeLauncher - SpotYellow1_ContentUpdateGroupSchema.asset} (72%) create mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - SpotYellow1_ContentUpdateGroupSchema.asset.meta rename Assets/AddressableAssetsData/AssetGroups/Schemas/{Aries-Aries - HighCaliber_BundledAssetGroupSchema.asset => AM - GrenadeLauncher - ThinBlueLine1_BundledAssetGroupSchema.asset} (90%) create mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - ThinBlueLine1_BundledAssetGroupSchema.asset.meta rename Assets/AddressableAssetsData/AssetGroups/Schemas/{Aries-Aries - HighCaliber_ContentUpdateGroupSchema.asset => AM - GrenadeLauncher - ThinBlueLine1_ContentUpdateGroupSchema.asset} (72%) create mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - ThinBlueLine1_ContentUpdateGroupSchema.asset.meta rename Assets/AddressableAssetsData/AssetGroups/Schemas/{Aries-Aries - FlyInFlyOut_BundledAssetGroupSchema.asset => AM - GrenadeLauncher - UnbrokenKnot1_BundledAssetGroupSchema.asset} (90%) create mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - UnbrokenKnot1_BundledAssetGroupSchema.asset.meta rename Assets/AddressableAssetsData/AssetGroups/Schemas/{Aries-Aries - FlyInFlyOut_ContentUpdateGroupSchema.asset => AM - GrenadeLauncher - UnbrokenKnot1_ContentUpdateGroupSchema.asset} (72%) create mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - UnbrokenKnot1_ContentUpdateGroupSchema.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - ArchonGunmetal_BundledAssetGroupSchema.asset delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - ArchonGunmetal_BundledAssetGroupSchema.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - ArchonGunmetal_ContentUpdateGroupSchema.asset delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - ArchonGunmetal_ContentUpdateGroupSchema.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - Bullion_BundledAssetGroupSchema.asset delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - Bullion_BundledAssetGroupSchema.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - Bullion_ContentUpdateGroupSchema.asset delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - Bullion_ContentUpdateGroupSchema.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - Code of Chivalry_BundledAssetGroupSchema.asset delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - Code of Chivalry_BundledAssetGroupSchema.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - Code of Chivalry_ContentUpdateGroupSchema.asset delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - Code of Chivalry_ContentUpdateGroupSchema.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - DaisonSleek_BundledAssetGroupSchema.asset delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - DaisonSleek_BundledAssetGroupSchema.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - DaisonSleek_ContentUpdateGroupSchema.asset delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - DaisonSleek_ContentUpdateGroupSchema.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - LessThanLethal_BundledAssetGroupSchema.asset delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - LessThanLethal_BundledAssetGroupSchema.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - LessThanLethal_ContentUpdateGroupSchema.asset delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - LessThanLethal_ContentUpdateGroupSchema.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - PraetorGrunge_BundledAssetGroupSchema.asset delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - PraetorGrunge_BundledAssetGroupSchema.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - PraetorGrunge_ContentUpdateGroupSchema.asset delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - PraetorGrunge_ContentUpdateGroupSchema.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - ReadyToQuench_BundledAssetGroupSchema.asset delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - ReadyToQuench_BundledAssetGroupSchema.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - ReadyToQuench_ContentUpdateGroupSchema.asset delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - ReadyToQuench_ContentUpdateGroupSchema.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - SeaHawk_BundledAssetGroupSchema.asset delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - SeaHawk_BundledAssetGroupSchema.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - SeaHawk_ContentUpdateGroupSchema.asset delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - SeaHawk_ContentUpdateGroupSchema.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - SpotYellow_BundledAssetGroupSchema.asset delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - SpotYellow_BundledAssetGroupSchema.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - SpotYellow_ContentUpdateGroupSchema.asset delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - SpotYellow_ContentUpdateGroupSchema.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - ThinBlueLine_BundledAssetGroupSchema.asset delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - ThinBlueLine_BundledAssetGroupSchema.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - ThinBlueLine_ContentUpdateGroupSchema.asset delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - ThinBlueLine_ContentUpdateGroupSchema.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - UnbrokenKnot_BundledAssetGroupSchema.asset delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - UnbrokenKnot_BundledAssetGroupSchema.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - UnbrokenKnot_ContentUpdateGroupSchema.asset delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - UnbrokenKnot_ContentUpdateGroupSchema.asset.meta rename Assets/AddressableAssetsData/AssetGroups/Schemas/{Shirokuma - MineGod_BundledAssetGroupSchema.asset => Aries - FlyInFlyOut_BundledAssetGroupSchema.asset} (91%) create mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - FlyInFlyOut_BundledAssetGroupSchema.asset.meta rename Assets/AddressableAssetsData/AssetGroups/Schemas/{Shirokuma - MineGod_ContentUpdateGroupSchema.asset => Aries - FlyInFlyOut_ContentUpdateGroupSchema.asset} (74%) create mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - FlyInFlyOut_ContentUpdateGroupSchema.asset.meta rename Assets/AddressableAssetsData/AssetGroups/Schemas/{Shirokuma - X3Kuro_BundledAssetGroupSchema.asset => Aries - HighCaliber_BundledAssetGroupSchema.asset} (91%) create mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - HighCaliber_BundledAssetGroupSchema.asset.meta rename Assets/AddressableAssetsData/AssetGroups/Schemas/{Shirokuma - X3Kuro_ContentUpdateGroupSchema.asset => Aries - HighCaliber_ContentUpdateGroupSchema.asset} (74%) create mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - HighCaliber_ContentUpdateGroupSchema.asset.meta rename Assets/AddressableAssetsData/AssetGroups/Schemas/{Shirokuma - Nullifier_BundledAssetGroupSchema.asset => Aries - MartianSoil_BundledAssetGroupSchema.asset} (91%) create mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - MartianSoil_BundledAssetGroupSchema.asset.meta rename Assets/AddressableAssetsData/AssetGroups/Schemas/{Shirokuma - Nullifier_ContentUpdateGroupSchema.asset => Aries - MartianSoil_ContentUpdateGroupSchema.asset} (74%) create mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - MartianSoil_ContentUpdateGroupSchema.asset.meta rename Assets/AddressableAssetsData/AssetGroups/Schemas/{Shirokuma - SynthPunk_BundledAssetGroupSchema.asset => Aries - OsmiumScream_BundledAssetGroupSchema.asset} (91%) create mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - OsmiumScream_BundledAssetGroupSchema.asset.meta rename Assets/AddressableAssetsData/AssetGroups/Schemas/{Shirokuma - SynthPunk_ContentUpdateGroupSchema.asset => Aries - OsmiumScream_ContentUpdateGroupSchema.asset} (74%) create mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - OsmiumScream_ContentUpdateGroupSchema.asset.meta rename Assets/AddressableAssetsData/AssetGroups/Schemas/{Shirokuma - HeavyWhite_BundledAssetGroupSchema.asset => Aries - PrometheanGold_BundledAssetGroupSchema.asset} (91%) create mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - PrometheanGold_BundledAssetGroupSchema.asset.meta rename Assets/AddressableAssetsData/AssetGroups/Schemas/{Shirokuma - HeavyWhite_ContentUpdateGroupSchema.asset => Aries - PrometheanGold_ContentUpdateGroupSchema.asset} (74%) create mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - PrometheanGold_ContentUpdateGroupSchema.asset.meta create mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - SovereignHill_BundledAssetGroupSchema.asset create mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - SovereignHill_BundledAssetGroupSchema.asset.meta create mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - SovereignHill_ContentUpdateGroupSchema.asset create mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - SovereignHill_ContentUpdateGroupSchema.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - FlyInFlyOut_BundledAssetGroupSchema.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - FlyInFlyOut_ContentUpdateGroupSchema.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - HighCaliber_BundledAssetGroupSchema.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - HighCaliber_ContentUpdateGroupSchema.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - MartianSoil_BundledAssetGroupSchema.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - MartianSoil_ContentUpdateGroupSchema.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - OsmiumScream_BundledAssetGroupSchema.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - OsmiumScream_ContentUpdateGroupSchema.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - PrometheanGold_BundledAssetGroupSchema.asset delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - PrometheanGold_BundledAssetGroupSchema.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - PrometheanGold_ContentUpdateGroupSchema.asset delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - PrometheanGold_ContentUpdateGroupSchema.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - SovereignHill_BundledAssetGroupSchema.asset delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - SovereignHill_BundledAssetGroupSchema.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - SovereignHill_ContentUpdateGroupSchema.asset delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - SovereignHill_ContentUpdateGroupSchema.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - HeavyWhite_BundledAssetGroupSchema.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - HeavyWhite_ContentUpdateGroupSchema.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - MineGod_BundledAssetGroupSchema.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - MineGod_ContentUpdateGroupSchema.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - Nullifier_BundledAssetGroupSchema.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - Nullifier_ContentUpdateGroupSchema.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - ShadowStealAway_BundledAssetGroupSchema.asset delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - ShadowStealAway_BundledAssetGroupSchema.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - ShadowStealAway_ContentUpdateGroupSchema.asset delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - ShadowStealAway_ContentUpdateGroupSchema.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - SynthPunk_BundledAssetGroupSchema.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - SynthPunk_ContentUpdateGroupSchema.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - Two Five Zero One_BundledAssetGroupSchema.asset delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - Two Five Zero One_BundledAssetGroupSchema.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - Two Five Zero One_ContentUpdateGroupSchema.asset delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - Two Five Zero One_ContentUpdateGroupSchema.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - X3Kuro_BundledAssetGroupSchema.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - X3Kuro_ContentUpdateGroupSchema.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - 2501 - Tachikoma_BundledAssetGroupSchema.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - 2501 - Tachikoma_ContentUpdateGroupSchema.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - HeavyWhite_BundledAssetGroupSchema.asset delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - HeavyWhite_BundledAssetGroupSchema.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - HeavyWhite_ContentUpdateGroupSchema.asset delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - HeavyWhite_ContentUpdateGroupSchema.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - MineGod_BundledAssetGroupSchema.asset delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - MineGod_BundledAssetGroupSchema.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - MineGod_ContentUpdateGroupSchema.asset delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - MineGod_ContentUpdateGroupSchema.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - Nullifier_BundledAssetGroupSchema.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - Nullifier_ContentUpdateGroupSchema.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - ShadowStealAway_BundledAssetGroupSchema.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - ShadowStealAway_ContentUpdateGroupSchema.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - SynthPunk_BundledAssetGroupSchema.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - SynthPunk_ContentUpdateGroupSchema.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - X3Kuro_BundledAssetGroupSchema.asset delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - X3Kuro_BundledAssetGroupSchema.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - X3Kuro_ContentUpdateGroupSchema.asset delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - X3Kuro_ContentUpdateGroupSchema.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Shirokuma - HeavyWhite.asset delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Shirokuma - HeavyWhite.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Shirokuma - MineGod.asset delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Shirokuma - MineGod.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Shirokuma - Nullifier.asset delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Shirokuma - Nullifier.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Shirokuma - ShadowStealAway.asset delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Shirokuma - ShadowStealAway.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Shirokuma - SynthPunk.asset delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Shirokuma - SynthPunk.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Shirokuma - Two Five Zero One.asset delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Shirokuma - Two Five Zero One.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Shirokuma - X3Kuro.asset delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Shirokuma - X3Kuro.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Shirokuma-Shirokuma - 2501 - Tachikoma.asset delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Shirokuma-Shirokuma - 2501 - Tachikoma.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Shirokuma-Shirokuma - HeavyWhite.asset delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Shirokuma-Shirokuma - HeavyWhite.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Shirokuma-Shirokuma - MineGod.asset delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Shirokuma-Shirokuma - MineGod.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Shirokuma-Shirokuma - Nullifier.asset delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Shirokuma-Shirokuma - Nullifier.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Shirokuma-Shirokuma - ShadowStealAway.asset delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Shirokuma-Shirokuma - ShadowStealAway.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Shirokuma-Shirokuma - SynthPunk.asset delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Shirokuma-Shirokuma - SynthPunk.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Shirokuma-Shirokuma - X3Kuro.asset delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Shirokuma-Shirokuma - X3Kuro.asset.meta create mode 100644 Assets/Content/Mechs/Aries/Materials/FlyInFlyOut/Hoses.mat rename Assets/Content/{Weapons/Archon Miltech/BFG/Materials/ReadyToQuench/BFG.mat.meta => Mechs/Aries/Materials/FlyInFlyOut/Hoses.mat.meta} (79%) rename Assets/Content/{Weapons/Archon Miltech/GrenadeLauncher/Materials/DaisonSleek/AM_GranadeLauncher.mat => Mechs/Aries/Materials/HighCaliber/Hoses.mat} (85%) rename Assets/Content/{Weapons/Archon Miltech/GrenadeLauncher/Materials/ArchonGunmetal/AM_GranadeLauncher.mat.meta => Mechs/Aries/Materials/HighCaliber/Hoses.mat.meta} (79%) create mode 100644 Assets/Content/Mechs/Aries/Materials/MartianSoil/Hoses.mat rename Assets/Content/{Weapons/Archon Miltech/GrenadeLauncher/Materials/Bullion/AM_GranadeLauncher.mat.meta => Mechs/Aries/Materials/MartianSoil/Hoses.mat.meta} (79%) rename Assets/Content/{Weapons/Archon Miltech/GrenadeLauncher/Materials/ArchonGunmetal/AM_GranadeLauncher.mat => Mechs/Aries/Materials/OsmiumScream/Hoses.mat} (85%) rename Assets/Content/{Weapons/Archon Miltech/GrenadeLauncher/Materials/Code of Chivalry/AM_GranadeLauncher.mat.meta => Mechs/Aries/Materials/OsmiumScream/Hoses.mat.meta} (79%) rename Assets/Content/{Weapons/Archon Miltech/GrenadeLauncher/Materials/Bullion/AM_GranadeLauncher.mat => Mechs/Aries/Materials/PilbaraDust/Hoses.mat} (85%) create mode 100644 Assets/Content/Mechs/Aries/Materials/PilbaraDust/Hoses.mat.meta rename Assets/Content/{Weapons/Archon Miltech/BFG/Materials/ReadyToQuench/BFG.mat => Mechs/Aries/Materials/PrometheanGold/Hoses.mat} (52%) create mode 100644 Assets/Content/Mechs/Aries/Materials/PrometheanGold/Hoses.mat.meta rename Assets/Content/{Weapons/Archon Miltech/GrenadeLauncher/Materials/Code of Chivalry/AM_GranadeLauncher.mat => Mechs/Aries/Materials/SovereignHill/Hoses.mat} (85%) create mode 100644 Assets/Content/Mechs/Aries/Materials/SovereignHill/Hoses.mat.meta delete mode 100644 Assets/Content/Weapons/Archon Miltech/BFG/Materials/ReadyToQuench/ReadyToQuench.asset delete mode 100644 Assets/Content/Weapons/Archon Miltech/BFG/Materials/ReadyToQuench/ReadyToQuench.asset.meta delete mode 100644 Assets/Content/Weapons/Archon Miltech/BFG/Materials/TellingTheBees/TellingTheBees.asset delete mode 100644 Assets/Content/Weapons/Archon Miltech/BFG/Materials/TellingTheBees/TellingTheBees.asset.meta create mode 100644 Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/ArchonGunmetal/GrenadeLauncher.mat create mode 100644 Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/ArchonGunmetal/GrenadeLauncher.mat.meta create mode 100644 Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/Bullion/GrenadeLauncher.mat create mode 100644 Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/Bullion/GrenadeLauncher.mat.meta create mode 100644 Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/Code of Chivalry/GrenadeLauncher.mat create mode 100644 Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/Code of Chivalry/GrenadeLauncher.mat.meta delete mode 100644 Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/DaisonSleek/AM_GranadeLauncher.mat.meta create mode 100644 Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/DaisonSleek/GrenadeLauncher.mat create mode 100644 Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/DaisonSleek/GrenadeLauncher.mat.meta delete mode 100644 Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/LessThanLethal/AM_GranadeLauncher.mat delete mode 100644 Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/LessThanLethal/AM_GranadeLauncher.mat.meta create mode 100644 Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/LessThanLethal/GrenadeLauncher.mat create mode 100644 Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/LessThanLethal/GrenadeLauncher.mat.meta delete mode 100644 Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/PraetorGrunge/AM_GranadeLauncher.mat delete mode 100644 Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/PraetorGrunge/AM_GranadeLauncher.mat.meta create mode 100644 Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/PraetorGrunge/GrenadeLauncher.mat create mode 100644 Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/PraetorGrunge/GrenadeLauncher.mat.meta delete mode 100644 Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/ReadyToQuench/AM_GranadeLauncher.mat delete mode 100644 Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/ReadyToQuench/AM_GranadeLauncher.mat.meta create mode 100644 Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/ReadyToQuench/GrenadeLauncher.mat create mode 100644 Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/ReadyToQuench/GrenadeLauncher.mat.meta delete mode 100644 Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/SeaHawk/AM_GranadeLauncher.mat delete mode 100644 Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/SeaHawk/AM_GranadeLauncher.mat.meta create mode 100644 Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/SeaHawk/GrenadeLauncher.mat create mode 100644 Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/SeaHawk/GrenadeLauncher.mat.meta delete mode 100644 Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/SpotYellow/AM_GranadeLauncher.mat delete mode 100644 Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/SpotYellow/AM_GranadeLauncher.mat.meta create mode 100644 Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/SpotYellow/GrenadeLauncher.mat create mode 100644 Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/SpotYellow/GrenadeLauncher.mat.meta delete mode 100644 Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/ThinBlueLine/AM_GranadeLauncher.mat delete mode 100644 Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/ThinBlueLine/AM_GranadeLauncher.mat.meta create mode 100644 Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/ThinBlueLine/GrenadeLauncher.mat create mode 100644 Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/ThinBlueLine/GrenadeLauncher.mat.meta delete mode 100644 Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/UnbrokenKnot/AM_GranadeLauncher.mat delete mode 100644 Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/UnbrokenKnot/AM_GranadeLauncher.mat.meta create mode 100644 Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/UnbrokenKnot/GrenadeLauncher.mat create mode 100644 Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/UnbrokenKnot/GrenadeLauncher.mat.meta delete mode 100644 Assets/Content/Weapons/Warsui/Minigun/Materials/MineGod/MineGold.asset.meta delete mode 100644 Assets/Content/Weapons/Warsui/Minigun/Materials/MineGod/Minigun.mat delete mode 100644 Assets/Content/Weapons/Warsui/Minigun/Materials/MineGod/Minigun.mat.meta delete mode 100644 Assets/Content/Weapons/Warsui/Minigun/Materials/Rebellion/Mingun.mat delete mode 100644 Assets/Content/Weapons/Warsui/Minigun/Materials/Rebellion/Mingun.mat.meta delete mode 100644 Assets/Content/Weapons/Warsui/Minigun/Materials/Rebellion/Rebelion.asset delete mode 100644 Assets/Content/Weapons/Warsui/Minigun/Materials/Rebellion/Rebelion.asset.meta create mode 100644 Assets/Runtime/Actors/Player/PreferenceSliderUI.cs rename Assets/Runtime/Actors/Player/{SetVolume.cs.meta => PreferenceSliderUI.cs.meta} (100%) create mode 100644 Assets/Runtime/Actors/Player/ResetUserPrefs.cs create mode 100644 Assets/Runtime/Actors/Player/ResetUserPrefs.cs.meta delete mode 100644 Assets/Runtime/Actors/Player/SetVolume.cs rename Assets/{Content/Weapons/Warsui/Minigun/Materials/MineGod/MineGold.asset => Runtime/Actors/Player/SupremacyMixerInstaller.asset} (60%) create mode 100644 Assets/Runtime/Actors/Player/SupremacyMixerInstaller.asset.meta create mode 100644 Assets/Runtime/Actors/Player/UserPreferenceInstaller.asset create mode 100644 Assets/Runtime/Actors/Player/UserPreferenceInstaller.asset.meta create mode 100644 Assets/Runtime/Actors/Player/UserPreferencesService.cs create mode 100644 Assets/Runtime/Actors/Player/UserPreferencesService.cs.meta create mode 100644 Assets/Runtime/ScriptableObjects/SupremacyMixer.cs create mode 100644 Assets/Runtime/ScriptableObjects/SupremacyMixer.cs.meta diff --git a/Assets/AddressableAssetsData/AddressableAssetSettings.asset b/Assets/AddressableAssetsData/AddressableAssetSettings.asset index 815f91e10..af246da55 100644 --- a/Assets/AddressableAssetsData/AddressableAssetSettings.asset +++ b/Assets/AddressableAssetsData/AddressableAssetSettings.asset @@ -139,12 +139,6 @@ MonoBehaviour: - {fileID: 11400000, guid: defd69272ce58cd498c0ea2d4301ee0b, type: 2} - {fileID: 11400000, guid: b4eaa31bd2e903d40a5f24c6b17d1d69, type: 2} - {fileID: 11400000, guid: e768a94ccaef1b447819fdeae1c44926, type: 2} - - {fileID: 11400000, guid: 5821e56382521854fa125f535d902e47, type: 2} - - {fileID: 11400000, guid: b2e24e5aebd93024385479bf3a4f2ffb, type: 2} - - {fileID: 11400000, guid: fad2beb6637f8ba4eb989764de3b901b, type: 2} - - {fileID: 11400000, guid: 1c02a135e767f4945a9b5e244179008e, type: 2} - - {fileID: 11400000, guid: 14de2413351d0584281fb5f88019c8b0, type: 2} - - {fileID: 11400000, guid: 20bcb2b78d01d6444ad2308d44654cb2, type: 2} - {fileID: 11400000, guid: af87e28443f4b5244856f91726d7de1c, type: 2} - {fileID: 11400000, guid: 98dfff7a53816ee458528a9e2e939a63, type: 2} - {fileID: 11400000, guid: 8451366bcbbe2b9419d0a1a90acd94ea, type: 2} @@ -173,13 +167,6 @@ MonoBehaviour: - {fileID: 11400000, guid: 34c18030713d28447be1a01ea45b6008, type: 2} - {fileID: 11400000, guid: 6e10e0dda5bccc342b75838dcaa3f5dd, type: 2} - {fileID: 11400000, guid: c2cf2daef0f3d304ab98442fded99b3c, type: 2} - - {fileID: 11400000, guid: 679194e37165c774b8804fc4545349d5, type: 2} - - {fileID: 11400000, guid: c3cef6adec11d054e987a75d7a9a1716, type: 2} - - {fileID: 11400000, guid: 7ce48e64c97ddd4478e715f8bf08dc3a, type: 2} - - {fileID: 11400000, guid: d9aac78671f2edb47a6b46d2c4030bfa, type: 2} - - {fileID: 11400000, guid: d73dcc0fa52160e42beec5cdda80fe58, type: 2} - - {fileID: 11400000, guid: 3aa0efd8be7fa424b9a35e3635a49ecf, type: 2} - - {fileID: 11400000, guid: 48d2bd45dea7166468a8d3cf14c48650, type: 2} - {fileID: 11400000, guid: 2e6ac7a80527f80468a6d3c5a762ec56, type: 2} - {fileID: 11400000, guid: e94ae688b58cce34e9f9d8020578c76a, type: 2} - {fileID: 11400000, guid: cb0684cc0880be7449819ca97babe9d8, type: 2} @@ -217,18 +204,7 @@ MonoBehaviour: - {fileID: 11400000, guid: aa48439ece8571949bfeb197451db613, type: 2} - {fileID: 11400000, guid: 46012bcc234bfe04ca45eb710b10c5cf, type: 2} - {fileID: 11400000, guid: 90f5c8e4075c1c841ae9beffc4ed057d, type: 2} - - {fileID: 11400000, guid: bb6088af644fc3a4e8850f72b597dc0a, type: 2} - - {fileID: 11400000, guid: 3e00cc53bc0f6ad4e84c5deb2ea6a917, type: 2} - - {fileID: 11400000, guid: baf38e47dadf8784eaa39e49946f6f00, type: 2} - - {fileID: 11400000, guid: afd095edce275cf429bdf427b2383f61, type: 2} - - {fileID: 11400000, guid: 07ebc17fe2207a143a4c244b47a0efbf, type: 2} - - {fileID: 11400000, guid: 90ae72e147222be448d436dd8ffd57c7, type: 2} - - {fileID: 11400000, guid: 3f1e28c8dd2dc54478e53d9b957dde2b, type: 2} - - {fileID: 11400000, guid: a43cb8e97d441d946acb668f050d2e97, type: 2} - - {fileID: 11400000, guid: 98a457945706309419170aa60e0666b6, type: 2} - {fileID: 11400000, guid: dffa2272d68c03d45acbb1b6d6a79888, type: 2} - - {fileID: 11400000, guid: 180767fc5127d5f4fbac5856f4b62489, type: 2} - - {fileID: 11400000, guid: 17a32e43d02a2bf439888c3fb80e38f5, type: 2} - {fileID: 11400000, guid: 2c4c2bdaaed390345aa46954a88e9121, type: 2} - {fileID: 11400000, guid: 83bfd90cdca3df8449e1c35277c75bd7, type: 2} - {fileID: 11400000, guid: 8726f47fb2b9d9e45a1ed5301e920ca8, type: 2} @@ -507,14 +483,6 @@ MonoBehaviour: - {fileID: 11400000, guid: 14d05e79d7c45194b888cee5c5b9422a, type: 2} - {fileID: 11400000, guid: d9b8298fdd523c74e8d3a7f8f8a67cf6, type: 2} - {fileID: 11400000, guid: 70b91e01ccabe8547a81240680fd3c91, type: 2} - - {fileID: 11400000, guid: 3051005e628654e3ca3f90e98860bb5b, type: 2} - - {fileID: 11400000, guid: dde6838949dfff0419b7ee3cb2edbc54, type: 2} - - {fileID: 11400000, guid: 3c7ff06de1e4f7c43ba2d187b85739e1, type: 2} - - {fileID: 11400000, guid: 722aa5032b73ee549930118337913515, type: 2} - - {fileID: 11400000, guid: fa310c8e20ed2054f99410dd533e6bb4, type: 2} - - {fileID: 11400000, guid: 841a020a3ec32304bba027db187c00bc, type: 2} - - {fileID: 11400000, guid: 06307f292285ecc4398b15b71647cbe2, type: 2} - - {fileID: 11400000, guid: ff6447b331f7f7348a688d8d85dc4d96, type: 2} - {fileID: 11400000, guid: 083927c153d5c944190d30d12a71e8d7, type: 2} - {fileID: 11400000, guid: 8cd6812e90fa6c9418ed1ae04fa5e84f, type: 2} - {fileID: 11400000, guid: 0d59e46cd7ebb5a4496532e33d074846, type: 2} @@ -522,6 +490,24 @@ MonoBehaviour: - {fileID: 11400000, guid: 92fd98acf0e7db3408714945bfd982c6, type: 2} - {fileID: 11400000, guid: 11cbc30554e4cb94b9cf0902ae0f4902, type: 2} - {fileID: 11400000, guid: f67cba402c239ba4e932425b8c216081, type: 2} + - {fileID: 11400000, guid: 7eb3d764cd3a71d45b3db6f00f129508, type: 2} + - {fileID: 11400000, guid: b809442094193b944b6ea32c2a370a1a, type: 2} + - {fileID: 11400000, guid: d59430008f4ae8148a2806ce3691f10c, type: 2} + - {fileID: 11400000, guid: 3e4e59bae347d064fbc1b9ca36562cfa, type: 2} + - {fileID: 11400000, guid: 11fdb120343fec24484fc1c259bed8f8, type: 2} + - {fileID: 11400000, guid: 3b3269c13f714364f8ad1054551e7440, type: 2} + - {fileID: 11400000, guid: 60f8178a6143b2e468a7a1697af0b2ce, type: 2} + - {fileID: 11400000, guid: f336f88a481c50b43bdc4bf071c2398c, type: 2} + - {fileID: 11400000, guid: a80b352745de8da4d8cf46cd01575485, type: 2} + - {fileID: 11400000, guid: 9a418516b328bb549a20345a7b68bdd6, type: 2} + - {fileID: 11400000, guid: b7b181aea9ef1b141b946e8355c49680, type: 2} + - {fileID: 11400000, guid: e1cadfab72d019441888132cdae8a60a, type: 2} + - {fileID: 11400000, guid: bad9a9ab5e9b51141b49da440cd7ee15, type: 2} + - {fileID: 11400000, guid: ae04611a3151893429f849ac3796dfff, type: 2} + - {fileID: 11400000, guid: 3ab6fb4513d183546b88869479402aeb, type: 2} + - {fileID: 11400000, guid: 3051005e628654e3ca3f90e98860bb5b, type: 2} + - {fileID: 11400000, guid: 6a249dccdc3df1a41823e42bed967914, type: 2} + - {fileID: 11400000, guid: 2834cc8469313f64289f763bb91f9e9b, type: 2} m_BuildSettings: m_CompileScriptsInVirtualMode: 0 m_CleanupStreamingAssetsAfterBuilds: 1 diff --git a/Assets/AddressableAssetsData/AssetGroups/Archon Miltech-GrenadeLauncher-GrenadeLauncher - ArchonGunmetal.asset b/Assets/AddressableAssetsData/AssetGroups/AM - GrenadeLauncher - ArchonGunmetal1.asset similarity index 64% rename from Assets/AddressableAssetsData/AssetGroups/Archon Miltech-GrenadeLauncher-GrenadeLauncher - ArchonGunmetal.asset rename to Assets/AddressableAssetsData/AssetGroups/AM - GrenadeLauncher - ArchonGunmetal1.asset index 9cc634a80..9540ac374 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Archon Miltech-GrenadeLauncher-GrenadeLauncher - ArchonGunmetal.asset +++ b/Assets/AddressableAssetsData/AssetGroups/AM - GrenadeLauncher - ArchonGunmetal1.asset @@ -10,20 +10,20 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3} - m_Name: Archon Miltech-GrenadeLauncher-GrenadeLauncher - ArchonGunmetal + m_Name: AM - GrenadeLauncher - ArchonGunmetal1 m_EditorClassIdentifier: - m_GroupName: Archon Miltech-GrenadeLauncher-GrenadeLauncher - ArchonGunmetal + m_GroupName: AM - GrenadeLauncher - ArchonGunmetal1 m_Data: m_SerializedData: [] - m_GUID: fc46c85d0102c194ba48e91ab59a7e73 + m_GUID: 147c6a7c25651c3438bf93eba7e0b4b4 m_SerializeEntries: - m_GUID: 94da081322bcae249b8fdea25766c36e - m_Address: GrenadeLauncher - ArchonGunmetal + m_Address: AM - GrenadeLauncher - ArchonGunmetal m_ReadOnly: 0 m_SerializedLabels: [] m_ReadOnly: 0 m_Settings: {fileID: 11400000, guid: 565f539c595f0d349a171b0cd6da800e, type: 2} m_SchemaSet: m_Schemas: - - {fileID: 11400000, guid: ef92cfeb2fa73e1419f58c4d060942af, type: 2} - - {fileID: 11400000, guid: c5087518d2fdf7a45af57fdc2f8adea3, type: 2} + - {fileID: 11400000, guid: 04d4e20358c1853429f3ca237f9110e4, type: 2} + - {fileID: 11400000, guid: 28789f6eb2a26f249a330bd7d81d3780, type: 2} diff --git a/Assets/AddressableAssetsData/AssetGroups/Archon Miltech-GrenadeLauncher-GrenadeLauncher - Code of Chivalry.asset.meta b/Assets/AddressableAssetsData/AssetGroups/AM - GrenadeLauncher - ArchonGunmetal1.asset.meta similarity index 79% rename from Assets/AddressableAssetsData/AssetGroups/Archon Miltech-GrenadeLauncher-GrenadeLauncher - Code of Chivalry.asset.meta rename to Assets/AddressableAssetsData/AssetGroups/AM - GrenadeLauncher - ArchonGunmetal1.asset.meta index cca49f78d..0d1c0874f 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Archon Miltech-GrenadeLauncher-GrenadeLauncher - Code of Chivalry.asset.meta +++ b/Assets/AddressableAssetsData/AssetGroups/AM - GrenadeLauncher - ArchonGunmetal1.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: baf38e47dadf8784eaa39e49946f6f00 +guid: 7eb3d764cd3a71d45b3db6f00f129508 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/AddressableAssetsData/AssetGroups/Archon Miltech-GrenadeLauncher-GrenadeLauncher - Bullion.asset b/Assets/AddressableAssetsData/AssetGroups/AM - GrenadeLauncher - Bullion1.asset similarity index 65% rename from Assets/AddressableAssetsData/AssetGroups/Archon Miltech-GrenadeLauncher-GrenadeLauncher - Bullion.asset rename to Assets/AddressableAssetsData/AssetGroups/AM - GrenadeLauncher - Bullion1.asset index 14a32777c..52ea60a01 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Archon Miltech-GrenadeLauncher-GrenadeLauncher - Bullion.asset +++ b/Assets/AddressableAssetsData/AssetGroups/AM - GrenadeLauncher - Bullion1.asset @@ -10,20 +10,20 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3} - m_Name: Archon Miltech-GrenadeLauncher-GrenadeLauncher - Bullion + m_Name: AM - GrenadeLauncher - Bullion1 m_EditorClassIdentifier: - m_GroupName: Archon Miltech-GrenadeLauncher-GrenadeLauncher - Bullion + m_GroupName: AM - GrenadeLauncher - Bullion1 m_Data: m_SerializedData: [] - m_GUID: 697bcfa984016bd44afdc7e107b1c121 + m_GUID: 55c17b7761134db4f98038411239f8b2 m_SerializeEntries: - m_GUID: 47dcbe255bf7c5c469705511ff4f687a - m_Address: GrenadeLauncher - Bullion + m_Address: AM - GrenadeLauncher - Bullion m_ReadOnly: 0 m_SerializedLabels: [] m_ReadOnly: 0 m_Settings: {fileID: 11400000, guid: 565f539c595f0d349a171b0cd6da800e, type: 2} m_SchemaSet: m_Schemas: - - {fileID: 11400000, guid: b7766597c9d00e941981666068bea423, type: 2} - - {fileID: 11400000, guid: 0b6837cb461b64c40838b8ebb1ca2481, type: 2} + - {fileID: 11400000, guid: aea3077692e31ac469e7f2f454029f02, type: 2} + - {fileID: 11400000, guid: b70f44203bec0314aa542aff52a29c75, type: 2} diff --git a/Assets/AddressableAssetsData/AssetGroups/Archon Miltech-GrenadeLauncher-GrenadeLauncher - ArchonGunmetal.asset.meta b/Assets/AddressableAssetsData/AssetGroups/AM - GrenadeLauncher - Bullion1.asset.meta similarity index 79% rename from Assets/AddressableAssetsData/AssetGroups/Archon Miltech-GrenadeLauncher-GrenadeLauncher - ArchonGunmetal.asset.meta rename to Assets/AddressableAssetsData/AssetGroups/AM - GrenadeLauncher - Bullion1.asset.meta index 30eae56a9..378f55b3b 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Archon Miltech-GrenadeLauncher-GrenadeLauncher - ArchonGunmetal.asset.meta +++ b/Assets/AddressableAssetsData/AssetGroups/AM - GrenadeLauncher - Bullion1.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: bb6088af644fc3a4e8850f72b597dc0a +guid: b809442094193b944b6ea32c2a370a1a NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/AddressableAssetsData/AssetGroups/Archon Miltech-GrenadeLauncher-GrenadeLauncher - Code of Chivalry.asset b/Assets/AddressableAssetsData/AssetGroups/AM - GrenadeLauncher - Code of Chivalry1.asset similarity index 64% rename from Assets/AddressableAssetsData/AssetGroups/Archon Miltech-GrenadeLauncher-GrenadeLauncher - Code of Chivalry.asset rename to Assets/AddressableAssetsData/AssetGroups/AM - GrenadeLauncher - Code of Chivalry1.asset index d73fcb9d8..143828c57 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Archon Miltech-GrenadeLauncher-GrenadeLauncher - Code of Chivalry.asset +++ b/Assets/AddressableAssetsData/AssetGroups/AM - GrenadeLauncher - Code of Chivalry1.asset @@ -10,20 +10,20 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3} - m_Name: Archon Miltech-GrenadeLauncher-GrenadeLauncher - Code of Chivalry + m_Name: AM - GrenadeLauncher - Code of Chivalry1 m_EditorClassIdentifier: - m_GroupName: Archon Miltech-GrenadeLauncher-GrenadeLauncher - Code of Chivalry + m_GroupName: AM - GrenadeLauncher - Code of Chivalry1 m_Data: m_SerializedData: [] - m_GUID: cc723a25dfc37114b9411f5025511d79 + m_GUID: 2ac1113d69e54574baaff5e48f4e7469 m_SerializeEntries: - m_GUID: c2f027ad208031e499bf4f76c6d3e04d - m_Address: GrenadeLauncher - Code of Chivalry + m_Address: AM - GrenadeLauncher - Code of Chivalry m_ReadOnly: 0 m_SerializedLabels: [] m_ReadOnly: 0 m_Settings: {fileID: 11400000, guid: 565f539c595f0d349a171b0cd6da800e, type: 2} m_SchemaSet: m_Schemas: - - {fileID: 11400000, guid: 9c0f13d723838d84c8d9d949019b4045, type: 2} - - {fileID: 11400000, guid: 2324c1a86a1821741a76a6731c671408, type: 2} + - {fileID: 11400000, guid: 2feee64d88f74684cba3e8164af6fdaf, type: 2} + - {fileID: 11400000, guid: f45fcefedfb603445a812c00b9079bd0, type: 2} diff --git a/Assets/AddressableAssetsData/AssetGroups/Archon Miltech-GrenadeLauncher-GrenadeLauncher - DaisonSleek.asset.meta b/Assets/AddressableAssetsData/AssetGroups/AM - GrenadeLauncher - Code of Chivalry1.asset.meta similarity index 79% rename from Assets/AddressableAssetsData/AssetGroups/Archon Miltech-GrenadeLauncher-GrenadeLauncher - DaisonSleek.asset.meta rename to Assets/AddressableAssetsData/AssetGroups/AM - GrenadeLauncher - Code of Chivalry1.asset.meta index 98b668230..733ae9bb6 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Archon Miltech-GrenadeLauncher-GrenadeLauncher - DaisonSleek.asset.meta +++ b/Assets/AddressableAssetsData/AssetGroups/AM - GrenadeLauncher - Code of Chivalry1.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: afd095edce275cf429bdf427b2383f61 +guid: d59430008f4ae8148a2806ce3691f10c NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/AddressableAssetsData/AssetGroups/Archon Miltech-GrenadeLauncher-GrenadeLauncher - DaisonSleek.asset b/Assets/AddressableAssetsData/AssetGroups/AM - GrenadeLauncher - DaisonSleek1.asset similarity index 64% rename from Assets/AddressableAssetsData/AssetGroups/Archon Miltech-GrenadeLauncher-GrenadeLauncher - DaisonSleek.asset rename to Assets/AddressableAssetsData/AssetGroups/AM - GrenadeLauncher - DaisonSleek1.asset index c7c0c6c06..45132e415 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Archon Miltech-GrenadeLauncher-GrenadeLauncher - DaisonSleek.asset +++ b/Assets/AddressableAssetsData/AssetGroups/AM - GrenadeLauncher - DaisonSleek1.asset @@ -10,20 +10,20 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3} - m_Name: Archon Miltech-GrenadeLauncher-GrenadeLauncher - DaisonSleek + m_Name: AM - GrenadeLauncher - DaisonSleek1 m_EditorClassIdentifier: - m_GroupName: Archon Miltech-GrenadeLauncher-GrenadeLauncher - DaisonSleek + m_GroupName: AM - GrenadeLauncher - DaisonSleek1 m_Data: m_SerializedData: [] - m_GUID: 0d0ff39bdeb61a24a8b9ffb9728bae4f + m_GUID: 978a236099a7dae4d9a6a6c5b5d82b4f m_SerializeEntries: - m_GUID: ae8e823202c8fe1459c9df83514265d1 - m_Address: GrenadeLauncher - DaisonSleek + m_Address: AM - GrenadeLauncher - DaisonSleek m_ReadOnly: 0 m_SerializedLabels: [] m_ReadOnly: 0 m_Settings: {fileID: 11400000, guid: 565f539c595f0d349a171b0cd6da800e, type: 2} m_SchemaSet: m_Schemas: - - {fileID: 11400000, guid: 77b4177db40740a4dbad5bb1c14cabf2, type: 2} - - {fileID: 11400000, guid: 2b593f6d5eaef8344a8cd93f0d94e6d8, type: 2} + - {fileID: 11400000, guid: 5ce65e5029f1e2142a9ff853f3804304, type: 2} + - {fileID: 11400000, guid: 53844b61ebecbe046939d8ebf7d27375, type: 2} diff --git a/Assets/AddressableAssetsData/AssetGroups/Archon Miltech-GrenadeLauncher-GrenadeLauncher - Bullion.asset.meta b/Assets/AddressableAssetsData/AssetGroups/AM - GrenadeLauncher - DaisonSleek1.asset.meta similarity index 79% rename from Assets/AddressableAssetsData/AssetGroups/Archon Miltech-GrenadeLauncher-GrenadeLauncher - Bullion.asset.meta rename to Assets/AddressableAssetsData/AssetGroups/AM - GrenadeLauncher - DaisonSleek1.asset.meta index 51ed2ebbe..e22bbbee9 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Archon Miltech-GrenadeLauncher-GrenadeLauncher - Bullion.asset.meta +++ b/Assets/AddressableAssetsData/AssetGroups/AM - GrenadeLauncher - DaisonSleek1.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3e00cc53bc0f6ad4e84c5deb2ea6a917 +guid: 3e4e59bae347d064fbc1b9ca36562cfa NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/AddressableAssetsData/AssetGroups/Archon Miltech-GrenadeLauncher-GrenadeLauncher - LessThanLethal.asset b/Assets/AddressableAssetsData/AssetGroups/AM - GrenadeLauncher - LessThanLethal1.asset similarity index 64% rename from Assets/AddressableAssetsData/AssetGroups/Archon Miltech-GrenadeLauncher-GrenadeLauncher - LessThanLethal.asset rename to Assets/AddressableAssetsData/AssetGroups/AM - GrenadeLauncher - LessThanLethal1.asset index 9c3407009..2ec1f91ee 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Archon Miltech-GrenadeLauncher-GrenadeLauncher - LessThanLethal.asset +++ b/Assets/AddressableAssetsData/AssetGroups/AM - GrenadeLauncher - LessThanLethal1.asset @@ -10,20 +10,20 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3} - m_Name: Archon Miltech-GrenadeLauncher-GrenadeLauncher - LessThanLethal + m_Name: AM - GrenadeLauncher - LessThanLethal1 m_EditorClassIdentifier: - m_GroupName: Archon Miltech-GrenadeLauncher-GrenadeLauncher - LessThanLethal + m_GroupName: AM - GrenadeLauncher - LessThanLethal1 m_Data: m_SerializedData: [] - m_GUID: 39305746189ca5b42a668edbc444cbcf + m_GUID: a87788898d87ff84d88f1e8b71ea9ff6 m_SerializeEntries: - m_GUID: dd926c779629d694689e2b1a3c917605 - m_Address: GrenadeLauncher - LessThanLethal + m_Address: AM - GrenadeLauncher - LessThanLethal m_ReadOnly: 0 m_SerializedLabels: [] m_ReadOnly: 0 m_Settings: {fileID: 11400000, guid: 565f539c595f0d349a171b0cd6da800e, type: 2} m_SchemaSet: m_Schemas: - - {fileID: 11400000, guid: 98b156f3a0147ed49ae8c1b309b13454, type: 2} - - {fileID: 11400000, guid: c7562fb24d2310e44b1707c607d219d3, type: 2} + - {fileID: 11400000, guid: 6788f57904fe1504c8102379d002fa9b, type: 2} + - {fileID: 11400000, guid: 566bcf591619a5848836076c23bad0ae, type: 2} diff --git a/Assets/AddressableAssetsData/AssetGroups/AM - GrenadeLauncher - LessThanLethal1.asset.meta b/Assets/AddressableAssetsData/AssetGroups/AM - GrenadeLauncher - LessThanLethal1.asset.meta new file mode 100644 index 000000000..2f28a931d --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/AM - GrenadeLauncher - LessThanLethal1.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 11fdb120343fec24484fc1c259bed8f8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Archon Miltech-GrenadeLauncher-GrenadeLauncher - PraetorGrunge.asset b/Assets/AddressableAssetsData/AssetGroups/AM - GrenadeLauncher - PraetorGrunge1.asset similarity index 64% rename from Assets/AddressableAssetsData/AssetGroups/Archon Miltech-GrenadeLauncher-GrenadeLauncher - PraetorGrunge.asset rename to Assets/AddressableAssetsData/AssetGroups/AM - GrenadeLauncher - PraetorGrunge1.asset index 4a6e2263a..636aed402 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Archon Miltech-GrenadeLauncher-GrenadeLauncher - PraetorGrunge.asset +++ b/Assets/AddressableAssetsData/AssetGroups/AM - GrenadeLauncher - PraetorGrunge1.asset @@ -10,20 +10,20 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3} - m_Name: Archon Miltech-GrenadeLauncher-GrenadeLauncher - PraetorGrunge + m_Name: AM - GrenadeLauncher - PraetorGrunge1 m_EditorClassIdentifier: - m_GroupName: Archon Miltech-GrenadeLauncher-GrenadeLauncher - PraetorGrunge + m_GroupName: AM - GrenadeLauncher - PraetorGrunge1 m_Data: m_SerializedData: [] - m_GUID: f77b801c05f90304da30ce71577f21cd + m_GUID: d99567955279d2247a3730a0d5ea3da5 m_SerializeEntries: - m_GUID: 4c78a3a61c550544aa12aacb755c4806 - m_Address: GrenadeLauncher - PraetorGrunge + m_Address: AM - GrenadeLauncher - PraetorGrunge m_ReadOnly: 0 m_SerializedLabels: [] m_ReadOnly: 0 m_Settings: {fileID: 11400000, guid: 565f539c595f0d349a171b0cd6da800e, type: 2} m_SchemaSet: m_Schemas: - - {fileID: 11400000, guid: 02ba3fbf15c935047a29ed7deb9b94ed, type: 2} - - {fileID: 11400000, guid: 8c125a77ef87137488f5f817bbe6eae9, type: 2} + - {fileID: 11400000, guid: 7259f8c1cdea26f4cb3f25cc9fd4a771, type: 2} + - {fileID: 11400000, guid: 6ce9063e41655c642ad544337c455925, type: 2} diff --git a/Assets/AddressableAssetsData/AssetGroups/AM - GrenadeLauncher - PraetorGrunge1.asset.meta b/Assets/AddressableAssetsData/AssetGroups/AM - GrenadeLauncher - PraetorGrunge1.asset.meta new file mode 100644 index 000000000..f94f1d3c6 --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/AM - GrenadeLauncher - PraetorGrunge1.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3b3269c13f714364f8ad1054551e7440 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Archon Miltech-GrenadeLauncher-GrenadeLauncher - ReadyToQuench.asset b/Assets/AddressableAssetsData/AssetGroups/AM - GrenadeLauncher - ReadyToQuench1.asset similarity index 64% rename from Assets/AddressableAssetsData/AssetGroups/Archon Miltech-GrenadeLauncher-GrenadeLauncher - ReadyToQuench.asset rename to Assets/AddressableAssetsData/AssetGroups/AM - GrenadeLauncher - ReadyToQuench1.asset index 546542464..4cba40a17 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Archon Miltech-GrenadeLauncher-GrenadeLauncher - ReadyToQuench.asset +++ b/Assets/AddressableAssetsData/AssetGroups/AM - GrenadeLauncher - ReadyToQuench1.asset @@ -10,20 +10,20 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3} - m_Name: Archon Miltech-GrenadeLauncher-GrenadeLauncher - ReadyToQuench + m_Name: AM - GrenadeLauncher - ReadyToQuench1 m_EditorClassIdentifier: - m_GroupName: Archon Miltech-GrenadeLauncher-GrenadeLauncher - ReadyToQuench + m_GroupName: AM - GrenadeLauncher - ReadyToQuench1 m_Data: m_SerializedData: [] - m_GUID: 5964f9d8d3f676e4aaf982d91d1520e1 + m_GUID: df39909117080a343aa8a3c6e5270c0d m_SerializeEntries: - m_GUID: 5bea523d2b227eb4780f208f6ba221ad - m_Address: GrenadeLauncher - ReadyToQuench + m_Address: AM - GrenadeLauncher - ReadyToQuench m_ReadOnly: 0 m_SerializedLabels: [] m_ReadOnly: 0 m_Settings: {fileID: 11400000, guid: 565f539c595f0d349a171b0cd6da800e, type: 2} m_SchemaSet: m_Schemas: - - {fileID: 11400000, guid: 0688e71261827754d87ae34ddf96a867, type: 2} - - {fileID: 11400000, guid: f973c4dec20c3e347af326ede3953d94, type: 2} + - {fileID: 11400000, guid: cd299262fa842234689f37e7d7d022a6, type: 2} + - {fileID: 11400000, guid: 9f451e4dcbaeda140a65c88abf0c1fd1, type: 2} diff --git a/Assets/AddressableAssetsData/AssetGroups/AM - GrenadeLauncher - ReadyToQuench1.asset.meta b/Assets/AddressableAssetsData/AssetGroups/AM - GrenadeLauncher - ReadyToQuench1.asset.meta new file mode 100644 index 000000000..53c2b191f --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/AM - GrenadeLauncher - ReadyToQuench1.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 60f8178a6143b2e468a7a1697af0b2ce +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Archon Miltech-GrenadeLauncher-GrenadeLauncher - SeaHawk.asset b/Assets/AddressableAssetsData/AssetGroups/AM - GrenadeLauncher - SeaHawk1.asset similarity index 65% rename from Assets/AddressableAssetsData/AssetGroups/Archon Miltech-GrenadeLauncher-GrenadeLauncher - SeaHawk.asset rename to Assets/AddressableAssetsData/AssetGroups/AM - GrenadeLauncher - SeaHawk1.asset index 7a5397e6a..5b547b7dc 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Archon Miltech-GrenadeLauncher-GrenadeLauncher - SeaHawk.asset +++ b/Assets/AddressableAssetsData/AssetGroups/AM - GrenadeLauncher - SeaHawk1.asset @@ -10,20 +10,20 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3} - m_Name: Archon Miltech-GrenadeLauncher-GrenadeLauncher - SeaHawk + m_Name: AM - GrenadeLauncher - SeaHawk1 m_EditorClassIdentifier: - m_GroupName: Archon Miltech-GrenadeLauncher-GrenadeLauncher - SeaHawk + m_GroupName: AM - GrenadeLauncher - SeaHawk1 m_Data: m_SerializedData: [] - m_GUID: 3b9c05a00ba98b145aaa01396a424ad2 + m_GUID: 11747267012347b43985e97ff1b56ed2 m_SerializeEntries: - m_GUID: e8f03fbab00f76940acccbfa03a12a6e - m_Address: GrenadeLauncher - SeaHawk + m_Address: AM - GrenadeLauncher - SeaHawk m_ReadOnly: 0 m_SerializedLabels: [] m_ReadOnly: 0 m_Settings: {fileID: 11400000, guid: 565f539c595f0d349a171b0cd6da800e, type: 2} m_SchemaSet: m_Schemas: - - {fileID: 11400000, guid: 745cd6e475f970042ab0a42ee67be672, type: 2} - - {fileID: 11400000, guid: 5b4bf7b35b87a144aadcecde7e3f1339, type: 2} + - {fileID: 11400000, guid: 9f8193468af80ff429d17941658c0540, type: 2} + - {fileID: 11400000, guid: d737e03cc59b4264dac9f1bafe739a31, type: 2} diff --git a/Assets/AddressableAssetsData/AssetGroups/AM - GrenadeLauncher - SeaHawk1.asset.meta b/Assets/AddressableAssetsData/AssetGroups/AM - GrenadeLauncher - SeaHawk1.asset.meta new file mode 100644 index 000000000..fc4ae7e03 --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/AM - GrenadeLauncher - SeaHawk1.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f336f88a481c50b43bdc4bf071c2398c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Archon Miltech-GrenadeLauncher-GrenadeLauncher - SpotYellow.asset b/Assets/AddressableAssetsData/AssetGroups/AM - GrenadeLauncher - SpotYellow1.asset similarity index 65% rename from Assets/AddressableAssetsData/AssetGroups/Archon Miltech-GrenadeLauncher-GrenadeLauncher - SpotYellow.asset rename to Assets/AddressableAssetsData/AssetGroups/AM - GrenadeLauncher - SpotYellow1.asset index 09049a6e6..f73d7b189 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Archon Miltech-GrenadeLauncher-GrenadeLauncher - SpotYellow.asset +++ b/Assets/AddressableAssetsData/AssetGroups/AM - GrenadeLauncher - SpotYellow1.asset @@ -10,20 +10,20 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3} - m_Name: Archon Miltech-GrenadeLauncher-GrenadeLauncher - SpotYellow + m_Name: AM - GrenadeLauncher - SpotYellow1 m_EditorClassIdentifier: - m_GroupName: Archon Miltech-GrenadeLauncher-GrenadeLauncher - SpotYellow + m_GroupName: AM - GrenadeLauncher - SpotYellow1 m_Data: m_SerializedData: [] - m_GUID: c402b984a569bfa4ba28267cc277e223 + m_GUID: 71270afbe9cb647448995dcebafdabe9 m_SerializeEntries: - m_GUID: eb200d640b9ba8c4191e820bb0d23254 - m_Address: GrenadeLauncher - SpotYellow + m_Address: AM - GrenadeLauncher - SpotYellow m_ReadOnly: 0 m_SerializedLabels: [] m_ReadOnly: 0 m_Settings: {fileID: 11400000, guid: 565f539c595f0d349a171b0cd6da800e, type: 2} m_SchemaSet: m_Schemas: - - {fileID: 11400000, guid: 977ff5f024902e44e9cc9c6f27e78742, type: 2} - - {fileID: 11400000, guid: 84c2430c387b69b4f9d8f581a96d7ce6, type: 2} + - {fileID: 11400000, guid: 2c686b102bef0fb4dba26f5711ec4426, type: 2} + - {fileID: 11400000, guid: 67644411350205848935b774eed5a167, type: 2} diff --git a/Assets/AddressableAssetsData/AssetGroups/AM - GrenadeLauncher - SpotYellow1.asset.meta b/Assets/AddressableAssetsData/AssetGroups/AM - GrenadeLauncher - SpotYellow1.asset.meta new file mode 100644 index 000000000..b14b9f0fc --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/AM - GrenadeLauncher - SpotYellow1.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a80b352745de8da4d8cf46cd01575485 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Archon Miltech-GrenadeLauncher-GrenadeLauncher - ThinBlueLine.asset b/Assets/AddressableAssetsData/AssetGroups/AM - GrenadeLauncher - ThinBlueLine1.asset similarity index 64% rename from Assets/AddressableAssetsData/AssetGroups/Archon Miltech-GrenadeLauncher-GrenadeLauncher - ThinBlueLine.asset rename to Assets/AddressableAssetsData/AssetGroups/AM - GrenadeLauncher - ThinBlueLine1.asset index a1bd4e567..b3e62e6f1 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Archon Miltech-GrenadeLauncher-GrenadeLauncher - ThinBlueLine.asset +++ b/Assets/AddressableAssetsData/AssetGroups/AM - GrenadeLauncher - ThinBlueLine1.asset @@ -10,20 +10,20 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3} - m_Name: Archon Miltech-GrenadeLauncher-GrenadeLauncher - ThinBlueLine + m_Name: AM - GrenadeLauncher - ThinBlueLine1 m_EditorClassIdentifier: - m_GroupName: Archon Miltech-GrenadeLauncher-GrenadeLauncher - ThinBlueLine + m_GroupName: AM - GrenadeLauncher - ThinBlueLine1 m_Data: m_SerializedData: [] - m_GUID: 0ae08f464a18c26439cfac6c5657f8d8 + m_GUID: 0bb61ca94bc0b7d45a622689f1a02208 m_SerializeEntries: - m_GUID: 56ea1f6009ef2954bad567d6a0fe3209 - m_Address: GrenadeLauncher - ThinBlueLine + m_Address: AM - GrenadeLauncher - ThinBlueLine m_ReadOnly: 0 m_SerializedLabels: [] m_ReadOnly: 0 m_Settings: {fileID: 11400000, guid: 565f539c595f0d349a171b0cd6da800e, type: 2} m_SchemaSet: m_Schemas: - - {fileID: 11400000, guid: 5c6416936890d45409068886ac7a0eca, type: 2} - - {fileID: 11400000, guid: 9e67829dfbb55e045ac3191cb27141b8, type: 2} + - {fileID: 11400000, guid: 2dc8f7b12493d534b8c307f128ed0925, type: 2} + - {fileID: 11400000, guid: 3a656c81eca17f64387cda8a98e636cf, type: 2} diff --git a/Assets/AddressableAssetsData/AssetGroups/AM - GrenadeLauncher - ThinBlueLine1.asset.meta b/Assets/AddressableAssetsData/AssetGroups/AM - GrenadeLauncher - ThinBlueLine1.asset.meta new file mode 100644 index 000000000..ed2dc045a --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/AM - GrenadeLauncher - ThinBlueLine1.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9a418516b328bb549a20345a7b68bdd6 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Archon Miltech-GrenadeLauncher-GrenadeLauncher - UnbrokenKnot.asset b/Assets/AddressableAssetsData/AssetGroups/AM - GrenadeLauncher - UnbrokenKnot1.asset similarity index 64% rename from Assets/AddressableAssetsData/AssetGroups/Archon Miltech-GrenadeLauncher-GrenadeLauncher - UnbrokenKnot.asset rename to Assets/AddressableAssetsData/AssetGroups/AM - GrenadeLauncher - UnbrokenKnot1.asset index 37f866fa0..c39b02fc7 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Archon Miltech-GrenadeLauncher-GrenadeLauncher - UnbrokenKnot.asset +++ b/Assets/AddressableAssetsData/AssetGroups/AM - GrenadeLauncher - UnbrokenKnot1.asset @@ -10,20 +10,20 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3} - m_Name: Archon Miltech-GrenadeLauncher-GrenadeLauncher - UnbrokenKnot + m_Name: AM - GrenadeLauncher - UnbrokenKnot1 m_EditorClassIdentifier: - m_GroupName: Archon Miltech-GrenadeLauncher-GrenadeLauncher - UnbrokenKnot + m_GroupName: AM - GrenadeLauncher - UnbrokenKnot1 m_Data: m_SerializedData: [] - m_GUID: b657e3c31c9aae246a20d33ba13e332e + m_GUID: 30f9ab9e520e21f4b8c2535ffb7c4622 m_SerializeEntries: - m_GUID: 33278098c7d457d439b868f9a64714fa - m_Address: GrenadeLauncher - UnbrokenKnot + m_Address: AM - GrenadeLauncher - UnbrokenKnot m_ReadOnly: 0 m_SerializedLabels: [] m_ReadOnly: 0 m_Settings: {fileID: 11400000, guid: 565f539c595f0d349a171b0cd6da800e, type: 2} m_SchemaSet: m_Schemas: - - {fileID: 11400000, guid: 6d53540ecb83f8c4496eb00a942bcfb1, type: 2} - - {fileID: 11400000, guid: 9e48b07784a203e47a6df01b161854cb, type: 2} + - {fileID: 11400000, guid: c5525e9c15c79854a98b68508c1eb63e, type: 2} + - {fileID: 11400000, guid: 73a86f54b48f2bd468f063b72fd8dbed, type: 2} diff --git a/Assets/AddressableAssetsData/AssetGroups/AM - GrenadeLauncher - UnbrokenKnot1.asset.meta b/Assets/AddressableAssetsData/AssetGroups/AM - GrenadeLauncher - UnbrokenKnot1.asset.meta new file mode 100644 index 000000000..551ced91d --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/AM - GrenadeLauncher - UnbrokenKnot1.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b7b181aea9ef1b141b946e8355c49680 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Archon Miltech-BFG-BFG - ReadyToQuench.asset b/Assets/AddressableAssetsData/AssetGroups/Archon Miltech-BFG-BFG - ReadyToQuench.asset index 320d919f7..6da1b6cec 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Archon Miltech-BFG-BFG - ReadyToQuench.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Archon Miltech-BFG-BFG - ReadyToQuench.asset @@ -17,10 +17,6 @@ MonoBehaviour: m_SerializedData: [] m_GUID: 6ce81cc125aa9974a902f587c1560d9e m_SerializeEntries: - - m_GUID: 66f091c8137e97d48848907a871e2051 - m_Address: BFG - ReadyToQuench - m_ReadOnly: 0 - m_SerializedLabels: [] - m_GUID: ffa93a6294922b948b20c318e3fc98a3 m_Address: BFG - ReadyToQuench m_ReadOnly: 0 diff --git a/Assets/AddressableAssetsData/AssetGroups/Archon Miltech-BFG-BFG - TellingTheBees.asset b/Assets/AddressableAssetsData/AssetGroups/Archon Miltech-BFG-BFG - TellingTheBees.asset index 2b7150278..0752a96dd 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Archon Miltech-BFG-BFG - TellingTheBees.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Archon Miltech-BFG-BFG - TellingTheBees.asset @@ -17,10 +17,6 @@ MonoBehaviour: m_SerializedData: [] m_GUID: 703a27c26ea27fa4295c23eb5e2a9167 m_SerializeEntries: - - m_GUID: 350bc6144ef06a746b1f1329de284f6d - m_Address: BFG - TellingTheBees - m_ReadOnly: 0 - m_SerializedLabels: [] - m_GUID: 9ae8534f75e0c834fad26ef93fd2bd4a m_Address: BFG - TellingTheBees m_ReadOnly: 0 diff --git a/Assets/AddressableAssetsData/AssetGroups/Archon Miltech-GrenadeLauncher-GrenadeLauncher - LessThanLethal.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Archon Miltech-GrenadeLauncher-GrenadeLauncher - LessThanLethal.asset.meta deleted file mode 100644 index a4b4298b9..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Archon Miltech-GrenadeLauncher-GrenadeLauncher - LessThanLethal.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 07ebc17fe2207a143a4c244b47a0efbf -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Archon Miltech-GrenadeLauncher-GrenadeLauncher - PraetorGrunge.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Archon Miltech-GrenadeLauncher-GrenadeLauncher - PraetorGrunge.asset.meta deleted file mode 100644 index 851f505ad..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Archon Miltech-GrenadeLauncher-GrenadeLauncher - PraetorGrunge.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 90ae72e147222be448d436dd8ffd57c7 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Archon Miltech-GrenadeLauncher-GrenadeLauncher - ReadyToQuench.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Archon Miltech-GrenadeLauncher-GrenadeLauncher - ReadyToQuench.asset.meta deleted file mode 100644 index a56bd7652..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Archon Miltech-GrenadeLauncher-GrenadeLauncher - ReadyToQuench.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 3f1e28c8dd2dc54478e53d9b957dde2b -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Archon Miltech-GrenadeLauncher-GrenadeLauncher - SeaHawk.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Archon Miltech-GrenadeLauncher-GrenadeLauncher - SeaHawk.asset.meta deleted file mode 100644 index c6fb20dcd..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Archon Miltech-GrenadeLauncher-GrenadeLauncher - SeaHawk.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: a43cb8e97d441d946acb668f050d2e97 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Archon Miltech-GrenadeLauncher-GrenadeLauncher - SpotYellow.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Archon Miltech-GrenadeLauncher-GrenadeLauncher - SpotYellow.asset.meta deleted file mode 100644 index 7bc336990..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Archon Miltech-GrenadeLauncher-GrenadeLauncher - SpotYellow.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 98a457945706309419170aa60e0666b6 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Archon Miltech-GrenadeLauncher-GrenadeLauncher - ThinBlueLine.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Archon Miltech-GrenadeLauncher-GrenadeLauncher - ThinBlueLine.asset.meta deleted file mode 100644 index f1ef253d1..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Archon Miltech-GrenadeLauncher-GrenadeLauncher - ThinBlueLine.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 180767fc5127d5f4fbac5856f4b62489 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Archon Miltech-GrenadeLauncher-GrenadeLauncher - UnbrokenKnot.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Archon Miltech-GrenadeLauncher-GrenadeLauncher - UnbrokenKnot.asset.meta deleted file mode 100644 index 235ae20e4..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Archon Miltech-GrenadeLauncher-GrenadeLauncher - UnbrokenKnot.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 17a32e43d02a2bf439888c3fb80e38f5 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Aries-Aries - FlyInFlyOut.asset b/Assets/AddressableAssetsData/AssetGroups/Aries - FlyInFlyOut.asset similarity index 74% rename from Assets/AddressableAssetsData/AssetGroups/Aries-Aries - FlyInFlyOut.asset rename to Assets/AddressableAssetsData/AssetGroups/Aries - FlyInFlyOut.asset index cbd31cd8a..0a4991825 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Aries-Aries - FlyInFlyOut.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Aries - FlyInFlyOut.asset @@ -10,12 +10,12 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3} - m_Name: Aries-Aries - FlyInFlyOut + m_Name: Aries - FlyInFlyOut m_EditorClassIdentifier: - m_GroupName: Aries-Aries - FlyInFlyOut + m_GroupName: Aries - FlyInFlyOut m_Data: m_SerializedData: [] - m_GUID: 5e0bfbd66288e804ca41ff39e87b93e8 + m_GUID: 996c46be65fb71448b149b8163d98746 m_SerializeEntries: - m_GUID: 3868defbbfcff734692a37682afcd7eb m_Address: Aries - FlyInFlyOut @@ -25,5 +25,5 @@ MonoBehaviour: m_Settings: {fileID: 11400000, guid: 565f539c595f0d349a171b0cd6da800e, type: 2} m_SchemaSet: m_Schemas: - - {fileID: 11400000, guid: 37c934e72458b7441b13ef7d1243859c, type: 2} - - {fileID: 11400000, guid: 62f273bc47eea7f4e85bf67761ce540a, type: 2} + - {fileID: 11400000, guid: 02c4e1c05b0e9ea47b1a27fd0a4168ba, type: 2} + - {fileID: 11400000, guid: 42644078e9ef99b4c8da191270227752, type: 2} diff --git a/Assets/AddressableAssetsData/AssetGroups/Aries - FlyInFlyOut.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Aries - FlyInFlyOut.asset.meta new file mode 100644 index 000000000..9cae90607 --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Aries - FlyInFlyOut.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e1cadfab72d019441888132cdae8a60a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Aries-Aries - HighCaliber.asset b/Assets/AddressableAssetsData/AssetGroups/Aries - HighCaliber.asset similarity index 74% rename from Assets/AddressableAssetsData/AssetGroups/Aries-Aries - HighCaliber.asset rename to Assets/AddressableAssetsData/AssetGroups/Aries - HighCaliber.asset index 128d2a985..4c1d87815 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Aries-Aries - HighCaliber.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Aries - HighCaliber.asset @@ -10,12 +10,12 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3} - m_Name: Aries-Aries - HighCaliber + m_Name: Aries - HighCaliber m_EditorClassIdentifier: - m_GroupName: Aries-Aries - HighCaliber + m_GroupName: Aries - HighCaliber m_Data: m_SerializedData: [] - m_GUID: 2cef8b26ee0992649b43cb287caf2e60 + m_GUID: 0369e26c0c79ab042811c86a1d233f81 m_SerializeEntries: - m_GUID: 56b7ec089d49f4943aba2ac3e2719f30 m_Address: Aries - HighCaliber @@ -25,5 +25,5 @@ MonoBehaviour: m_Settings: {fileID: 11400000, guid: 565f539c595f0d349a171b0cd6da800e, type: 2} m_SchemaSet: m_Schemas: - - {fileID: 11400000, guid: 98784e2e7e563e44187855a8b36c471f, type: 2} - - {fileID: 11400000, guid: b4311c72496c1be43bb73b14f17ebd53, type: 2} + - {fileID: 11400000, guid: 89ae28b9d7e08164e8f0698bff61663e, type: 2} + - {fileID: 11400000, guid: 3f2c480c447efd74ca6b198a5bf0893c, type: 2} diff --git a/Assets/AddressableAssetsData/AssetGroups/Aries - HighCaliber.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Aries - HighCaliber.asset.meta new file mode 100644 index 000000000..23e76cdfa --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Aries - HighCaliber.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bad9a9ab5e9b51141b49da440cd7ee15 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Aries-Aries - MartianSoil.asset b/Assets/AddressableAssetsData/AssetGroups/Aries - MartianSoil.asset similarity index 74% rename from Assets/AddressableAssetsData/AssetGroups/Aries-Aries - MartianSoil.asset rename to Assets/AddressableAssetsData/AssetGroups/Aries - MartianSoil.asset index 21c87c094..6a1f43e33 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Aries-Aries - MartianSoil.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Aries - MartianSoil.asset @@ -10,12 +10,12 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3} - m_Name: Aries-Aries - MartianSoil + m_Name: Aries - MartianSoil m_EditorClassIdentifier: - m_GroupName: Aries-Aries - MartianSoil + m_GroupName: Aries - MartianSoil m_Data: m_SerializedData: [] - m_GUID: 29e343d45ad8924468f150f5fe865d65 + m_GUID: 237c7f0e8fbeaef4ebca6581af29d196 m_SerializeEntries: - m_GUID: 5b022245703f5494a9b0a61367bab147 m_Address: Aries - MartianSoil @@ -25,5 +25,5 @@ MonoBehaviour: m_Settings: {fileID: 11400000, guid: 565f539c595f0d349a171b0cd6da800e, type: 2} m_SchemaSet: m_Schemas: - - {fileID: 11400000, guid: 7448ba59163c2824784789d966bb8d90, type: 2} - - {fileID: 11400000, guid: ad8bfd4865ba2474d8ccb9dfc17c6c90, type: 2} + - {fileID: 11400000, guid: ce4e84267b6f5ca4682d2f2e721bf1db, type: 2} + - {fileID: 11400000, guid: ec84f20edd6b9cd4886084890c5eb66b, type: 2} diff --git a/Assets/AddressableAssetsData/AssetGroups/Aries - MartianSoil.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Aries - MartianSoil.asset.meta new file mode 100644 index 000000000..bb85bfa13 --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Aries - MartianSoil.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ae04611a3151893429f849ac3796dfff +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Aries-Aries - OsmiumScream.asset b/Assets/AddressableAssetsData/AssetGroups/Aries - OsmiumScream.asset similarity index 73% rename from Assets/AddressableAssetsData/AssetGroups/Aries-Aries - OsmiumScream.asset rename to Assets/AddressableAssetsData/AssetGroups/Aries - OsmiumScream.asset index e96d746ad..218bb197a 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Aries-Aries - OsmiumScream.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Aries - OsmiumScream.asset @@ -10,12 +10,12 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3} - m_Name: Aries-Aries - OsmiumScream + m_Name: Aries - OsmiumScream m_EditorClassIdentifier: - m_GroupName: Aries-Aries - OsmiumScream + m_GroupName: Aries - OsmiumScream m_Data: m_SerializedData: [] - m_GUID: 4900ce4abc640574bb7cf09f1f2b9283 + m_GUID: e48176aeebd35b74c8cb6122f225469a m_SerializeEntries: - m_GUID: 11d26fe19190a34428da8d848ace6049 m_Address: Aries - OsmiumScream @@ -25,5 +25,5 @@ MonoBehaviour: m_Settings: {fileID: 11400000, guid: 565f539c595f0d349a171b0cd6da800e, type: 2} m_SchemaSet: m_Schemas: - - {fileID: 11400000, guid: 10661a4449e65fe4bbee54e2346ab6cc, type: 2} - - {fileID: 11400000, guid: b1b33beb60c377846bcd7e44575b494b, type: 2} + - {fileID: 11400000, guid: 9849042def465d442a0ee00aa1f2448a, type: 2} + - {fileID: 11400000, guid: 4970497937bca5244b0ea96b598e3d49, type: 2} diff --git a/Assets/AddressableAssetsData/AssetGroups/Aries - OsmiumScream.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Aries - OsmiumScream.asset.meta new file mode 100644 index 000000000..e2231ab05 --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Aries - OsmiumScream.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3ab6fb4513d183546b88869479402aeb +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Aries - PilbaraDust.asset b/Assets/AddressableAssetsData/AssetGroups/Aries - PilbaraDust.asset index 279650c22..da740f997 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Aries - PilbaraDust.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Aries - PilbaraDust.asset @@ -15,7 +15,7 @@ MonoBehaviour: m_GroupName: Aries - PilbaraDust m_Data: m_SerializedData: [] - m_GUID: 16638cdeaf5924c50b50bd8caa439c27 + m_GUID: 3ed82eec8cc036b4c980c0e57a6db18e m_SerializeEntries: - m_GUID: ec24116d73ac5490e83ef048b7765ca5 m_Address: Aries - PilbaraDust diff --git a/Assets/AddressableAssetsData/AssetGroups/Aries-Aries - PrometheanGold.asset b/Assets/AddressableAssetsData/AssetGroups/Aries - PrometheanGold.asset similarity index 73% rename from Assets/AddressableAssetsData/AssetGroups/Aries-Aries - PrometheanGold.asset rename to Assets/AddressableAssetsData/AssetGroups/Aries - PrometheanGold.asset index 08a9ad54b..68877b757 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Aries-Aries - PrometheanGold.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Aries - PrometheanGold.asset @@ -10,12 +10,12 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3} - m_Name: Aries-Aries - PrometheanGold + m_Name: Aries - PrometheanGold m_EditorClassIdentifier: - m_GroupName: Aries-Aries - PrometheanGold + m_GroupName: Aries - PrometheanGold m_Data: m_SerializedData: [] - m_GUID: 04526e9ccf62aa0458eb187070f28251 + m_GUID: 6abe93bac64aa9a468c55744d22d1fcc m_SerializeEntries: - m_GUID: fa2d6672819689e4fad00696a4398a9e m_Address: Aries - PrometheanGold @@ -25,5 +25,5 @@ MonoBehaviour: m_Settings: {fileID: 11400000, guid: 565f539c595f0d349a171b0cd6da800e, type: 2} m_SchemaSet: m_Schemas: - - {fileID: 11400000, guid: 8c121bd415338ce43b2724cd6443db02, type: 2} - - {fileID: 11400000, guid: 9bddd0e1094789848a635d22e5955731, type: 2} + - {fileID: 11400000, guid: f69e07956d9588f4e855d98dac26ca0d, type: 2} + - {fileID: 11400000, guid: 1032dc5f9d358774cba39894dc1d00d8, type: 2} diff --git a/Assets/AddressableAssetsData/AssetGroups/Aries - PrometheanGold.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Aries - PrometheanGold.asset.meta new file mode 100644 index 000000000..9202c58a5 --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Aries - PrometheanGold.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6a249dccdc3df1a41823e42bed967914 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Aries-Aries - SovereignHill.asset b/Assets/AddressableAssetsData/AssetGroups/Aries - SovereignHill.asset similarity index 73% rename from Assets/AddressableAssetsData/AssetGroups/Aries-Aries - SovereignHill.asset rename to Assets/AddressableAssetsData/AssetGroups/Aries - SovereignHill.asset index 2478e05ab..631ffa94e 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Aries-Aries - SovereignHill.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Aries - SovereignHill.asset @@ -10,12 +10,12 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3} - m_Name: Aries-Aries - SovereignHill + m_Name: Aries - SovereignHill m_EditorClassIdentifier: - m_GroupName: Aries-Aries - SovereignHill + m_GroupName: Aries - SovereignHill m_Data: m_SerializedData: [] - m_GUID: 7d33a97e02f64214e95d4e256325af15 + m_GUID: bba4a55e9abbff24a9775e9b051e41cb m_SerializeEntries: - m_GUID: e67f0e98a5c29354aa01a1507151cd7f m_Address: Aries - SovereignHill @@ -25,5 +25,5 @@ MonoBehaviour: m_Settings: {fileID: 11400000, guid: 565f539c595f0d349a171b0cd6da800e, type: 2} m_SchemaSet: m_Schemas: - - {fileID: 11400000, guid: 4c8db6f7a809f9043ae4e791b0833fa0, type: 2} - - {fileID: 11400000, guid: 5f92d53aa91e9f7409164cabc5d6ee96, type: 2} + - {fileID: 11400000, guid: 788c6cae2c22af147a8e2560635888cf, type: 2} + - {fileID: 11400000, guid: c7a62928c4f7e224a9a2bc827626d1e8, type: 2} diff --git a/Assets/AddressableAssetsData/AssetGroups/Aries - SovereignHill.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Aries - SovereignHill.asset.meta new file mode 100644 index 000000000..dc11afd81 --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Aries - SovereignHill.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2834cc8469313f64289f763bb91f9e9b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Aries-Aries - FlyInFlyOut.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Aries-Aries - FlyInFlyOut.asset.meta deleted file mode 100644 index 18d51c99c..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Aries-Aries - FlyInFlyOut.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 5821e56382521854fa125f535d902e47 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Aries-Aries - HighCaliber.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Aries-Aries - HighCaliber.asset.meta deleted file mode 100644 index 31b47670a..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Aries-Aries - HighCaliber.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: b2e24e5aebd93024385479bf3a4f2ffb -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Aries-Aries - MartianSoil.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Aries-Aries - MartianSoil.asset.meta deleted file mode 100644 index d0d408b6a..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Aries-Aries - MartianSoil.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: fad2beb6637f8ba4eb989764de3b901b -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Aries-Aries - OsmiumScream.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Aries-Aries - OsmiumScream.asset.meta deleted file mode 100644 index b63ed7ab0..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Aries-Aries - OsmiumScream.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 1c02a135e767f4945a9b5e244179008e -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Aries-Aries - PrometheanGold.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Aries-Aries - PrometheanGold.asset.meta deleted file mode 100644 index e111025eb..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Aries-Aries - PrometheanGold.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 14de2413351d0584281fb5f88019c8b0 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Aries-Aries - SovereignHill.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Aries-Aries - SovereignHill.asset.meta deleted file mode 100644 index f8a2ca824..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Aries-Aries - SovereignHill.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 20bcb2b78d01d6444ad2308d44654cb2 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - 2501 - Tachikoma_BundledAssetGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - ArchonGunmetal1_BundledAssetGroupSchema.asset similarity index 90% rename from Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - 2501 - Tachikoma_BundledAssetGroupSchema.asset rename to Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - ArchonGunmetal1_BundledAssetGroupSchema.asset index 4964b926b..243388755 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - 2501 - Tachikoma_BundledAssetGroupSchema.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - ArchonGunmetal1_BundledAssetGroupSchema.asset @@ -10,9 +10,9 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: e5d17a21594effb4e9591490b009e7aa, type: 3} - m_Name: Shirokuma-Shirokuma - 2501 - Tachikoma_BundledAssetGroupSchema + m_Name: AM - GrenadeLauncher - ArchonGunmetal1_BundledAssetGroupSchema m_EditorClassIdentifier: - m_Group: {fileID: 11400000, guid: 679194e37165c774b8804fc4545349d5, type: 2} + m_Group: {fileID: 11400000, guid: 7eb3d764cd3a71d45b3db6f00f129508, type: 2} m_InternalBundleIdMode: 1 m_Compression: 1 m_IncludeAddressInCatalog: 1 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - ArchonGunmetal1_BundledAssetGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - ArchonGunmetal1_BundledAssetGroupSchema.asset.meta new file mode 100644 index 000000000..35dc793b0 --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - ArchonGunmetal1_BundledAssetGroupSchema.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 04d4e20358c1853429f3ca237f9110e4 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - 2501 - Tachikoma_ContentUpdateGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - ArchonGunmetal1_ContentUpdateGroupSchema.asset similarity index 74% rename from Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - 2501 - Tachikoma_ContentUpdateGroupSchema.asset rename to Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - ArchonGunmetal1_ContentUpdateGroupSchema.asset index 8130a0cb5..5aef6bd5f 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - 2501 - Tachikoma_ContentUpdateGroupSchema.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - ArchonGunmetal1_ContentUpdateGroupSchema.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5834b5087d578d24c926ce20cd31e6d6, type: 3} - m_Name: Shirokuma-Shirokuma - 2501 - Tachikoma_ContentUpdateGroupSchema + m_Name: AM - GrenadeLauncher - ArchonGunmetal1_ContentUpdateGroupSchema m_EditorClassIdentifier: - m_Group: {fileID: 11400000, guid: 679194e37165c774b8804fc4545349d5, type: 2} + m_Group: {fileID: 11400000, guid: 7eb3d764cd3a71d45b3db6f00f129508, type: 2} m_StaticContent: 1 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - ArchonGunmetal1_ContentUpdateGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - ArchonGunmetal1_ContentUpdateGroupSchema.asset.meta new file mode 100644 index 000000000..ecffdd6ab --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - ArchonGunmetal1_ContentUpdateGroupSchema.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 28789f6eb2a26f249a330bd7d81d3780 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - Nullifier_BundledAssetGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - Bullion1_BundledAssetGroupSchema.asset similarity index 90% rename from Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - Nullifier_BundledAssetGroupSchema.asset rename to Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - Bullion1_BundledAssetGroupSchema.asset index 20f73a88d..0fcc10a06 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - Nullifier_BundledAssetGroupSchema.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - Bullion1_BundledAssetGroupSchema.asset @@ -10,9 +10,9 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: e5d17a21594effb4e9591490b009e7aa, type: 3} - m_Name: Shirokuma-Shirokuma - Nullifier_BundledAssetGroupSchema + m_Name: AM - GrenadeLauncher - Bullion1_BundledAssetGroupSchema m_EditorClassIdentifier: - m_Group: {fileID: 11400000, guid: d9aac78671f2edb47a6b46d2c4030bfa, type: 2} + m_Group: {fileID: 11400000, guid: b809442094193b944b6ea32c2a370a1a, type: 2} m_InternalBundleIdMode: 1 m_Compression: 1 m_IncludeAddressInCatalog: 1 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - Bullion1_BundledAssetGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - Bullion1_BundledAssetGroupSchema.asset.meta new file mode 100644 index 000000000..0ee47f85a --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - Bullion1_BundledAssetGroupSchema.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: aea3077692e31ac469e7f2f454029f02 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - Nullifier_ContentUpdateGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - Bullion1_ContentUpdateGroupSchema.asset similarity index 73% rename from Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - Nullifier_ContentUpdateGroupSchema.asset rename to Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - Bullion1_ContentUpdateGroupSchema.asset index 4af9117f1..7bc5260f4 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - Nullifier_ContentUpdateGroupSchema.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - Bullion1_ContentUpdateGroupSchema.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5834b5087d578d24c926ce20cd31e6d6, type: 3} - m_Name: Shirokuma-Shirokuma - Nullifier_ContentUpdateGroupSchema + m_Name: AM - GrenadeLauncher - Bullion1_ContentUpdateGroupSchema m_EditorClassIdentifier: - m_Group: {fileID: 11400000, guid: d9aac78671f2edb47a6b46d2c4030bfa, type: 2} + m_Group: {fileID: 11400000, guid: b809442094193b944b6ea32c2a370a1a, type: 2} m_StaticContent: 1 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - Bullion1_ContentUpdateGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - Bullion1_ContentUpdateGroupSchema.asset.meta new file mode 100644 index 000000000..53d550e11 --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - Bullion1_ContentUpdateGroupSchema.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b70f44203bec0314aa542aff52a29c75 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - Code of Chivalry1_BundledAssetGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - Code of Chivalry1_BundledAssetGroupSchema.asset new file mode 100644 index 000000000..30bacdfba --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - Code of Chivalry1_BundledAssetGroupSchema.asset @@ -0,0 +1,45 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e5d17a21594effb4e9591490b009e7aa, type: 3} + m_Name: AM - GrenadeLauncher - Code of Chivalry1_BundledAssetGroupSchema + m_EditorClassIdentifier: + m_Group: {fileID: 11400000, guid: d59430008f4ae8148a2806ce3691f10c, type: 2} + m_InternalBundleIdMode: 1 + m_Compression: 1 + m_IncludeAddressInCatalog: 1 + m_IncludeGUIDInCatalog: 1 + m_IncludeLabelsInCatalog: 1 + m_InternalIdNamingMode: 0 + m_CacheClearBehavior: 0 + m_IncludeInBuild: 1 + m_BundledAssetProviderType: + m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider + m_ForceUniqueProvider: 0 + m_UseAssetBundleCache: 1 + m_UseAssetBundleCrc: 1 + m_UseAssetBundleCrcForCachedBundles: 1 + m_UseUWRForLocalBundles: 0 + m_Timeout: 0 + m_ChunkedTransfer: 0 + m_RedirectLimit: -1 + m_RetryCount: 0 + m_BuildPath: + m_Id: 6f064d973e68a7f4d8cc1ad3c41fc138 + m_LoadPath: + m_Id: 7427d4870fdf9bc4b9453213cf7fa1ea + m_BundleMode: 0 + m_AssetBundleProviderType: + m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider + m_BundleNaming: 0 + m_AssetLoadMode: 0 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - Code of Chivalry1_BundledAssetGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - Code of Chivalry1_BundledAssetGroupSchema.asset.meta new file mode 100644 index 000000000..661d7b0b0 --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - Code of Chivalry1_BundledAssetGroupSchema.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2feee64d88f74684cba3e8164af6fdaf +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - Code of Chivalry1_ContentUpdateGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - Code of Chivalry1_ContentUpdateGroupSchema.asset new file mode 100644 index 000000000..0baa8a05c --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - Code of Chivalry1_ContentUpdateGroupSchema.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5834b5087d578d24c926ce20cd31e6d6, type: 3} + m_Name: AM - GrenadeLauncher - Code of Chivalry1_ContentUpdateGroupSchema + m_EditorClassIdentifier: + m_Group: {fileID: 11400000, guid: d59430008f4ae8148a2806ce3691f10c, type: 2} + m_StaticContent: 1 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - Code of Chivalry1_ContentUpdateGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - Code of Chivalry1_ContentUpdateGroupSchema.asset.meta new file mode 100644 index 000000000..a274e78a7 --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - Code of Chivalry1_ContentUpdateGroupSchema.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f45fcefedfb603445a812c00b9079bd0 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - OsmiumScream_BundledAssetGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - DaisonSleek1_BundledAssetGroupSchema.asset similarity index 90% rename from Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - OsmiumScream_BundledAssetGroupSchema.asset rename to Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - DaisonSleek1_BundledAssetGroupSchema.asset index e36a9b5f6..d614a2624 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - OsmiumScream_BundledAssetGroupSchema.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - DaisonSleek1_BundledAssetGroupSchema.asset @@ -10,9 +10,9 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: e5d17a21594effb4e9591490b009e7aa, type: 3} - m_Name: Aries-Aries - OsmiumScream_BundledAssetGroupSchema + m_Name: AM - GrenadeLauncher - DaisonSleek1_BundledAssetGroupSchema m_EditorClassIdentifier: - m_Group: {fileID: 11400000, guid: 1c02a135e767f4945a9b5e244179008e, type: 2} + m_Group: {fileID: 11400000, guid: 3e4e59bae347d064fbc1b9ca36562cfa, type: 2} m_InternalBundleIdMode: 1 m_Compression: 1 m_IncludeAddressInCatalog: 1 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - DaisonSleek1_BundledAssetGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - DaisonSleek1_BundledAssetGroupSchema.asset.meta new file mode 100644 index 000000000..96f7cfa7f --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - DaisonSleek1_BundledAssetGroupSchema.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5ce65e5029f1e2142a9ff853f3804304 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - OsmiumScream_ContentUpdateGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - DaisonSleek1_ContentUpdateGroupSchema.asset similarity index 72% rename from Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - OsmiumScream_ContentUpdateGroupSchema.asset rename to Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - DaisonSleek1_ContentUpdateGroupSchema.asset index cfa371f86..7ea1fd45a 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - OsmiumScream_ContentUpdateGroupSchema.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - DaisonSleek1_ContentUpdateGroupSchema.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5834b5087d578d24c926ce20cd31e6d6, type: 3} - m_Name: Aries-Aries - OsmiumScream_ContentUpdateGroupSchema + m_Name: AM - GrenadeLauncher - DaisonSleek1_ContentUpdateGroupSchema m_EditorClassIdentifier: - m_Group: {fileID: 11400000, guid: 1c02a135e767f4945a9b5e244179008e, type: 2} + m_Group: {fileID: 11400000, guid: 3e4e59bae347d064fbc1b9ca36562cfa, type: 2} m_StaticContent: 1 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - DaisonSleek1_ContentUpdateGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - DaisonSleek1_ContentUpdateGroupSchema.asset.meta new file mode 100644 index 000000000..6f65a1432 --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - DaisonSleek1_ContentUpdateGroupSchema.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 53844b61ebecbe046939d8ebf7d27375 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - LessThanLethal1_BundledAssetGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - LessThanLethal1_BundledAssetGroupSchema.asset new file mode 100644 index 000000000..4d0f7dc5c --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - LessThanLethal1_BundledAssetGroupSchema.asset @@ -0,0 +1,45 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e5d17a21594effb4e9591490b009e7aa, type: 3} + m_Name: AM - GrenadeLauncher - LessThanLethal1_BundledAssetGroupSchema + m_EditorClassIdentifier: + m_Group: {fileID: 11400000, guid: 11fdb120343fec24484fc1c259bed8f8, type: 2} + m_InternalBundleIdMode: 1 + m_Compression: 1 + m_IncludeAddressInCatalog: 1 + m_IncludeGUIDInCatalog: 1 + m_IncludeLabelsInCatalog: 1 + m_InternalIdNamingMode: 0 + m_CacheClearBehavior: 0 + m_IncludeInBuild: 1 + m_BundledAssetProviderType: + m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider + m_ForceUniqueProvider: 0 + m_UseAssetBundleCache: 1 + m_UseAssetBundleCrc: 1 + m_UseAssetBundleCrcForCachedBundles: 1 + m_UseUWRForLocalBundles: 0 + m_Timeout: 0 + m_ChunkedTransfer: 0 + m_RedirectLimit: -1 + m_RetryCount: 0 + m_BuildPath: + m_Id: 6f064d973e68a7f4d8cc1ad3c41fc138 + m_LoadPath: + m_Id: 7427d4870fdf9bc4b9453213cf7fa1ea + m_BundleMode: 0 + m_AssetBundleProviderType: + m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider + m_BundleNaming: 0 + m_AssetLoadMode: 0 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - LessThanLethal1_BundledAssetGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - LessThanLethal1_BundledAssetGroupSchema.asset.meta new file mode 100644 index 000000000..275b79334 --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - LessThanLethal1_BundledAssetGroupSchema.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6788f57904fe1504c8102379d002fa9b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - LessThanLethal1_ContentUpdateGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - LessThanLethal1_ContentUpdateGroupSchema.asset new file mode 100644 index 000000000..000e2c8b4 --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - LessThanLethal1_ContentUpdateGroupSchema.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5834b5087d578d24c926ce20cd31e6d6, type: 3} + m_Name: AM - GrenadeLauncher - LessThanLethal1_ContentUpdateGroupSchema + m_EditorClassIdentifier: + m_Group: {fileID: 11400000, guid: 11fdb120343fec24484fc1c259bed8f8, type: 2} + m_StaticContent: 1 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - LessThanLethal1_ContentUpdateGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - LessThanLethal1_ContentUpdateGroupSchema.asset.meta new file mode 100644 index 000000000..858561dfd --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - LessThanLethal1_ContentUpdateGroupSchema.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 566bcf591619a5848836076c23bad0ae +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - ShadowStealAway_BundledAssetGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - PraetorGrunge1_BundledAssetGroupSchema.asset similarity index 90% rename from Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - ShadowStealAway_BundledAssetGroupSchema.asset rename to Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - PraetorGrunge1_BundledAssetGroupSchema.asset index 070133c80..fe11b4a06 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - ShadowStealAway_BundledAssetGroupSchema.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - PraetorGrunge1_BundledAssetGroupSchema.asset @@ -10,9 +10,9 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: e5d17a21594effb4e9591490b009e7aa, type: 3} - m_Name: Shirokuma-Shirokuma - ShadowStealAway_BundledAssetGroupSchema + m_Name: AM - GrenadeLauncher - PraetorGrunge1_BundledAssetGroupSchema m_EditorClassIdentifier: - m_Group: {fileID: 11400000, guid: d73dcc0fa52160e42beec5cdda80fe58, type: 2} + m_Group: {fileID: 11400000, guid: 3b3269c13f714364f8ad1054551e7440, type: 2} m_InternalBundleIdMode: 1 m_Compression: 1 m_IncludeAddressInCatalog: 1 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - PraetorGrunge1_BundledAssetGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - PraetorGrunge1_BundledAssetGroupSchema.asset.meta new file mode 100644 index 000000000..6f47afc3c --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - PraetorGrunge1_BundledAssetGroupSchema.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7259f8c1cdea26f4cb3f25cc9fd4a771 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - ShadowStealAway_ContentUpdateGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - PraetorGrunge1_ContentUpdateGroupSchema.asset similarity index 74% rename from Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - ShadowStealAway_ContentUpdateGroupSchema.asset rename to Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - PraetorGrunge1_ContentUpdateGroupSchema.asset index 9f7adc487..db854315a 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - ShadowStealAway_ContentUpdateGroupSchema.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - PraetorGrunge1_ContentUpdateGroupSchema.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5834b5087d578d24c926ce20cd31e6d6, type: 3} - m_Name: Shirokuma-Shirokuma - ShadowStealAway_ContentUpdateGroupSchema + m_Name: AM - GrenadeLauncher - PraetorGrunge1_ContentUpdateGroupSchema m_EditorClassIdentifier: - m_Group: {fileID: 11400000, guid: d73dcc0fa52160e42beec5cdda80fe58, type: 2} + m_Group: {fileID: 11400000, guid: 3b3269c13f714364f8ad1054551e7440, type: 2} m_StaticContent: 1 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - PraetorGrunge1_ContentUpdateGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - PraetorGrunge1_ContentUpdateGroupSchema.asset.meta new file mode 100644 index 000000000..58c912e31 --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - PraetorGrunge1_ContentUpdateGroupSchema.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6ce9063e41655c642ad544337c455925 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - ReadyToQuench1_BundledAssetGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - ReadyToQuench1_BundledAssetGroupSchema.asset new file mode 100644 index 000000000..519b23bc3 --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - ReadyToQuench1_BundledAssetGroupSchema.asset @@ -0,0 +1,45 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e5d17a21594effb4e9591490b009e7aa, type: 3} + m_Name: AM - GrenadeLauncher - ReadyToQuench1_BundledAssetGroupSchema + m_EditorClassIdentifier: + m_Group: {fileID: 11400000, guid: 60f8178a6143b2e468a7a1697af0b2ce, type: 2} + m_InternalBundleIdMode: 1 + m_Compression: 1 + m_IncludeAddressInCatalog: 1 + m_IncludeGUIDInCatalog: 1 + m_IncludeLabelsInCatalog: 1 + m_InternalIdNamingMode: 0 + m_CacheClearBehavior: 0 + m_IncludeInBuild: 1 + m_BundledAssetProviderType: + m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider + m_ForceUniqueProvider: 0 + m_UseAssetBundleCache: 1 + m_UseAssetBundleCrc: 1 + m_UseAssetBundleCrcForCachedBundles: 1 + m_UseUWRForLocalBundles: 0 + m_Timeout: 0 + m_ChunkedTransfer: 0 + m_RedirectLimit: -1 + m_RetryCount: 0 + m_BuildPath: + m_Id: 6f064d973e68a7f4d8cc1ad3c41fc138 + m_LoadPath: + m_Id: 7427d4870fdf9bc4b9453213cf7fa1ea + m_BundleMode: 0 + m_AssetBundleProviderType: + m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider + m_BundleNaming: 0 + m_AssetLoadMode: 0 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - ReadyToQuench1_BundledAssetGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - ReadyToQuench1_BundledAssetGroupSchema.asset.meta new file mode 100644 index 000000000..e5219fee2 --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - ReadyToQuench1_BundledAssetGroupSchema.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cd299262fa842234689f37e7d7d022a6 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - ReadyToQuench1_ContentUpdateGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - ReadyToQuench1_ContentUpdateGroupSchema.asset new file mode 100644 index 000000000..21edd523e --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - ReadyToQuench1_ContentUpdateGroupSchema.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5834b5087d578d24c926ce20cd31e6d6, type: 3} + m_Name: AM - GrenadeLauncher - ReadyToQuench1_ContentUpdateGroupSchema + m_EditorClassIdentifier: + m_Group: {fileID: 11400000, guid: 60f8178a6143b2e468a7a1697af0b2ce, type: 2} + m_StaticContent: 1 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - ReadyToQuench1_ContentUpdateGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - ReadyToQuench1_ContentUpdateGroupSchema.asset.meta new file mode 100644 index 000000000..135c42932 --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - ReadyToQuench1_ContentUpdateGroupSchema.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9f451e4dcbaeda140a65c88abf0c1fd1 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - SynthPunk_BundledAssetGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - SeaHawk1_BundledAssetGroupSchema.asset similarity index 90% rename from Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - SynthPunk_BundledAssetGroupSchema.asset rename to Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - SeaHawk1_BundledAssetGroupSchema.asset index 6eea2997b..de0ed3f96 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - SynthPunk_BundledAssetGroupSchema.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - SeaHawk1_BundledAssetGroupSchema.asset @@ -10,9 +10,9 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: e5d17a21594effb4e9591490b009e7aa, type: 3} - m_Name: Shirokuma-Shirokuma - SynthPunk_BundledAssetGroupSchema + m_Name: AM - GrenadeLauncher - SeaHawk1_BundledAssetGroupSchema m_EditorClassIdentifier: - m_Group: {fileID: 11400000, guid: 3aa0efd8be7fa424b9a35e3635a49ecf, type: 2} + m_Group: {fileID: 11400000, guid: f336f88a481c50b43bdc4bf071c2398c, type: 2} m_InternalBundleIdMode: 1 m_Compression: 1 m_IncludeAddressInCatalog: 1 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - SeaHawk1_BundledAssetGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - SeaHawk1_BundledAssetGroupSchema.asset.meta new file mode 100644 index 000000000..07a5c0d54 --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - SeaHawk1_BundledAssetGroupSchema.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9f8193468af80ff429d17941658c0540 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - SynthPunk_ContentUpdateGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - SeaHawk1_ContentUpdateGroupSchema.asset similarity index 73% rename from Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - SynthPunk_ContentUpdateGroupSchema.asset rename to Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - SeaHawk1_ContentUpdateGroupSchema.asset index 547518177..0733e1f75 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - SynthPunk_ContentUpdateGroupSchema.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - SeaHawk1_ContentUpdateGroupSchema.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5834b5087d578d24c926ce20cd31e6d6, type: 3} - m_Name: Shirokuma-Shirokuma - SynthPunk_ContentUpdateGroupSchema + m_Name: AM - GrenadeLauncher - SeaHawk1_ContentUpdateGroupSchema m_EditorClassIdentifier: - m_Group: {fileID: 11400000, guid: 3aa0efd8be7fa424b9a35e3635a49ecf, type: 2} + m_Group: {fileID: 11400000, guid: f336f88a481c50b43bdc4bf071c2398c, type: 2} m_StaticContent: 1 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - SeaHawk1_ContentUpdateGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - SeaHawk1_ContentUpdateGroupSchema.asset.meta new file mode 100644 index 000000000..a701d5c18 --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - SeaHawk1_ContentUpdateGroupSchema.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d737e03cc59b4264dac9f1bafe739a31 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - MartianSoil_BundledAssetGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - SpotYellow1_BundledAssetGroupSchema.asset similarity index 90% rename from Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - MartianSoil_BundledAssetGroupSchema.asset rename to Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - SpotYellow1_BundledAssetGroupSchema.asset index 40ca023e2..560098601 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - MartianSoil_BundledAssetGroupSchema.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - SpotYellow1_BundledAssetGroupSchema.asset @@ -10,9 +10,9 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: e5d17a21594effb4e9591490b009e7aa, type: 3} - m_Name: Aries-Aries - MartianSoil_BundledAssetGroupSchema + m_Name: AM - GrenadeLauncher - SpotYellow1_BundledAssetGroupSchema m_EditorClassIdentifier: - m_Group: {fileID: 11400000, guid: fad2beb6637f8ba4eb989764de3b901b, type: 2} + m_Group: {fileID: 11400000, guid: a80b352745de8da4d8cf46cd01575485, type: 2} m_InternalBundleIdMode: 1 m_Compression: 1 m_IncludeAddressInCatalog: 1 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - SpotYellow1_BundledAssetGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - SpotYellow1_BundledAssetGroupSchema.asset.meta new file mode 100644 index 000000000..6df5ca00e --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - SpotYellow1_BundledAssetGroupSchema.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2c686b102bef0fb4dba26f5711ec4426 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - MartianSoil_ContentUpdateGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - SpotYellow1_ContentUpdateGroupSchema.asset similarity index 72% rename from Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - MartianSoil_ContentUpdateGroupSchema.asset rename to Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - SpotYellow1_ContentUpdateGroupSchema.asset index b26139fc8..e06b74b7a 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - MartianSoil_ContentUpdateGroupSchema.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - SpotYellow1_ContentUpdateGroupSchema.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5834b5087d578d24c926ce20cd31e6d6, type: 3} - m_Name: Aries-Aries - MartianSoil_ContentUpdateGroupSchema + m_Name: AM - GrenadeLauncher - SpotYellow1_ContentUpdateGroupSchema m_EditorClassIdentifier: - m_Group: {fileID: 11400000, guid: fad2beb6637f8ba4eb989764de3b901b, type: 2} + m_Group: {fileID: 11400000, guid: a80b352745de8da4d8cf46cd01575485, type: 2} m_StaticContent: 1 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - SpotYellow1_ContentUpdateGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - SpotYellow1_ContentUpdateGroupSchema.asset.meta new file mode 100644 index 000000000..7c64acaca --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - SpotYellow1_ContentUpdateGroupSchema.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 67644411350205848935b774eed5a167 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - HighCaliber_BundledAssetGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - ThinBlueLine1_BundledAssetGroupSchema.asset similarity index 90% rename from Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - HighCaliber_BundledAssetGroupSchema.asset rename to Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - ThinBlueLine1_BundledAssetGroupSchema.asset index f2b56921d..4c64b15c8 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - HighCaliber_BundledAssetGroupSchema.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - ThinBlueLine1_BundledAssetGroupSchema.asset @@ -10,9 +10,9 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: e5d17a21594effb4e9591490b009e7aa, type: 3} - m_Name: Aries-Aries - HighCaliber_BundledAssetGroupSchema + m_Name: AM - GrenadeLauncher - ThinBlueLine1_BundledAssetGroupSchema m_EditorClassIdentifier: - m_Group: {fileID: 11400000, guid: b2e24e5aebd93024385479bf3a4f2ffb, type: 2} + m_Group: {fileID: 11400000, guid: 9a418516b328bb549a20345a7b68bdd6, type: 2} m_InternalBundleIdMode: 1 m_Compression: 1 m_IncludeAddressInCatalog: 1 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - ThinBlueLine1_BundledAssetGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - ThinBlueLine1_BundledAssetGroupSchema.asset.meta new file mode 100644 index 000000000..7ca61e774 --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - ThinBlueLine1_BundledAssetGroupSchema.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2dc8f7b12493d534b8c307f128ed0925 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - HighCaliber_ContentUpdateGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - ThinBlueLine1_ContentUpdateGroupSchema.asset similarity index 72% rename from Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - HighCaliber_ContentUpdateGroupSchema.asset rename to Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - ThinBlueLine1_ContentUpdateGroupSchema.asset index ef92d1b98..4d967c941 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - HighCaliber_ContentUpdateGroupSchema.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - ThinBlueLine1_ContentUpdateGroupSchema.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5834b5087d578d24c926ce20cd31e6d6, type: 3} - m_Name: Aries-Aries - HighCaliber_ContentUpdateGroupSchema + m_Name: AM - GrenadeLauncher - ThinBlueLine1_ContentUpdateGroupSchema m_EditorClassIdentifier: - m_Group: {fileID: 11400000, guid: b2e24e5aebd93024385479bf3a4f2ffb, type: 2} + m_Group: {fileID: 11400000, guid: 9a418516b328bb549a20345a7b68bdd6, type: 2} m_StaticContent: 1 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - ThinBlueLine1_ContentUpdateGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - ThinBlueLine1_ContentUpdateGroupSchema.asset.meta new file mode 100644 index 000000000..7346e9504 --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - ThinBlueLine1_ContentUpdateGroupSchema.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3a656c81eca17f64387cda8a98e636cf +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - FlyInFlyOut_BundledAssetGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - UnbrokenKnot1_BundledAssetGroupSchema.asset similarity index 90% rename from Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - FlyInFlyOut_BundledAssetGroupSchema.asset rename to Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - UnbrokenKnot1_BundledAssetGroupSchema.asset index 94aa775eb..b6942595b 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - FlyInFlyOut_BundledAssetGroupSchema.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - UnbrokenKnot1_BundledAssetGroupSchema.asset @@ -10,9 +10,9 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: e5d17a21594effb4e9591490b009e7aa, type: 3} - m_Name: Aries-Aries - FlyInFlyOut_BundledAssetGroupSchema + m_Name: AM - GrenadeLauncher - UnbrokenKnot1_BundledAssetGroupSchema m_EditorClassIdentifier: - m_Group: {fileID: 11400000, guid: 5821e56382521854fa125f535d902e47, type: 2} + m_Group: {fileID: 11400000, guid: b7b181aea9ef1b141b946e8355c49680, type: 2} m_InternalBundleIdMode: 1 m_Compression: 1 m_IncludeAddressInCatalog: 1 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - UnbrokenKnot1_BundledAssetGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - UnbrokenKnot1_BundledAssetGroupSchema.asset.meta new file mode 100644 index 000000000..9f6334460 --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - UnbrokenKnot1_BundledAssetGroupSchema.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c5525e9c15c79854a98b68508c1eb63e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - FlyInFlyOut_ContentUpdateGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - UnbrokenKnot1_ContentUpdateGroupSchema.asset similarity index 72% rename from Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - FlyInFlyOut_ContentUpdateGroupSchema.asset rename to Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - UnbrokenKnot1_ContentUpdateGroupSchema.asset index 94b8921d1..418cf7092 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - FlyInFlyOut_ContentUpdateGroupSchema.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - UnbrokenKnot1_ContentUpdateGroupSchema.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5834b5087d578d24c926ce20cd31e6d6, type: 3} - m_Name: Aries-Aries - FlyInFlyOut_ContentUpdateGroupSchema + m_Name: AM - GrenadeLauncher - UnbrokenKnot1_ContentUpdateGroupSchema m_EditorClassIdentifier: - m_Group: {fileID: 11400000, guid: 5821e56382521854fa125f535d902e47, type: 2} + m_Group: {fileID: 11400000, guid: b7b181aea9ef1b141b946e8355c49680, type: 2} m_StaticContent: 1 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - UnbrokenKnot1_ContentUpdateGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - UnbrokenKnot1_ContentUpdateGroupSchema.asset.meta new file mode 100644 index 000000000..bd062a765 --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/AM - GrenadeLauncher - UnbrokenKnot1_ContentUpdateGroupSchema.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 73a86f54b48f2bd468f063b72fd8dbed +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - ArchonGunmetal_BundledAssetGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - ArchonGunmetal_BundledAssetGroupSchema.asset deleted file mode 100644 index bfd8c8355..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - ArchonGunmetal_BundledAssetGroupSchema.asset +++ /dev/null @@ -1,45 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e5d17a21594effb4e9591490b009e7aa, type: 3} - m_Name: Archon Miltech-GrenadeLauncher-GrenadeLauncher - ArchonGunmetal_BundledAssetGroupSchema - m_EditorClassIdentifier: - m_Group: {fileID: 11400000, guid: bb6088af644fc3a4e8850f72b597dc0a, type: 2} - m_InternalBundleIdMode: 1 - m_Compression: 1 - m_IncludeAddressInCatalog: 1 - m_IncludeGUIDInCatalog: 1 - m_IncludeLabelsInCatalog: 1 - m_InternalIdNamingMode: 0 - m_CacheClearBehavior: 0 - m_IncludeInBuild: 1 - m_BundledAssetProviderType: - m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider - m_ForceUniqueProvider: 0 - m_UseAssetBundleCache: 1 - m_UseAssetBundleCrc: 1 - m_UseAssetBundleCrcForCachedBundles: 1 - m_UseUWRForLocalBundles: 0 - m_Timeout: 0 - m_ChunkedTransfer: 0 - m_RedirectLimit: -1 - m_RetryCount: 0 - m_BuildPath: - m_Id: 6f064d973e68a7f4d8cc1ad3c41fc138 - m_LoadPath: - m_Id: 7427d4870fdf9bc4b9453213cf7fa1ea - m_BundleMode: 0 - m_AssetBundleProviderType: - m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider - m_BundleNaming: 0 - m_AssetLoadMode: 0 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - ArchonGunmetal_BundledAssetGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - ArchonGunmetal_BundledAssetGroupSchema.asset.meta deleted file mode 100644 index c39f6f8cb..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - ArchonGunmetal_BundledAssetGroupSchema.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: ef92cfeb2fa73e1419f58c4d060942af -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - ArchonGunmetal_ContentUpdateGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - ArchonGunmetal_ContentUpdateGroupSchema.asset deleted file mode 100644 index e693cb46e..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - ArchonGunmetal_ContentUpdateGroupSchema.asset +++ /dev/null @@ -1,16 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5834b5087d578d24c926ce20cd31e6d6, type: 3} - m_Name: Archon Miltech-GrenadeLauncher-GrenadeLauncher - ArchonGunmetal_ContentUpdateGroupSchema - m_EditorClassIdentifier: - m_Group: {fileID: 11400000, guid: bb6088af644fc3a4e8850f72b597dc0a, type: 2} - m_StaticContent: 1 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - ArchonGunmetal_ContentUpdateGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - ArchonGunmetal_ContentUpdateGroupSchema.asset.meta deleted file mode 100644 index 58403f425..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - ArchonGunmetal_ContentUpdateGroupSchema.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: c5087518d2fdf7a45af57fdc2f8adea3 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - Bullion_BundledAssetGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - Bullion_BundledAssetGroupSchema.asset deleted file mode 100644 index 8c8ceb253..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - Bullion_BundledAssetGroupSchema.asset +++ /dev/null @@ -1,45 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e5d17a21594effb4e9591490b009e7aa, type: 3} - m_Name: Archon Miltech-GrenadeLauncher-GrenadeLauncher - Bullion_BundledAssetGroupSchema - m_EditorClassIdentifier: - m_Group: {fileID: 11400000, guid: 3e00cc53bc0f6ad4e84c5deb2ea6a917, type: 2} - m_InternalBundleIdMode: 1 - m_Compression: 1 - m_IncludeAddressInCatalog: 1 - m_IncludeGUIDInCatalog: 1 - m_IncludeLabelsInCatalog: 1 - m_InternalIdNamingMode: 0 - m_CacheClearBehavior: 0 - m_IncludeInBuild: 1 - m_BundledAssetProviderType: - m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider - m_ForceUniqueProvider: 0 - m_UseAssetBundleCache: 1 - m_UseAssetBundleCrc: 1 - m_UseAssetBundleCrcForCachedBundles: 1 - m_UseUWRForLocalBundles: 0 - m_Timeout: 0 - m_ChunkedTransfer: 0 - m_RedirectLimit: -1 - m_RetryCount: 0 - m_BuildPath: - m_Id: 6f064d973e68a7f4d8cc1ad3c41fc138 - m_LoadPath: - m_Id: 7427d4870fdf9bc4b9453213cf7fa1ea - m_BundleMode: 0 - m_AssetBundleProviderType: - m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider - m_BundleNaming: 0 - m_AssetLoadMode: 0 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - Bullion_BundledAssetGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - Bullion_BundledAssetGroupSchema.asset.meta deleted file mode 100644 index 2fdaad137..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - Bullion_BundledAssetGroupSchema.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: b7766597c9d00e941981666068bea423 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - Bullion_ContentUpdateGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - Bullion_ContentUpdateGroupSchema.asset deleted file mode 100644 index 8cb3be65c..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - Bullion_ContentUpdateGroupSchema.asset +++ /dev/null @@ -1,16 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5834b5087d578d24c926ce20cd31e6d6, type: 3} - m_Name: Archon Miltech-GrenadeLauncher-GrenadeLauncher - Bullion_ContentUpdateGroupSchema - m_EditorClassIdentifier: - m_Group: {fileID: 11400000, guid: 3e00cc53bc0f6ad4e84c5deb2ea6a917, type: 2} - m_StaticContent: 1 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - Bullion_ContentUpdateGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - Bullion_ContentUpdateGroupSchema.asset.meta deleted file mode 100644 index 0c16c8b41..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - Bullion_ContentUpdateGroupSchema.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 0b6837cb461b64c40838b8ebb1ca2481 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - Code of Chivalry_BundledAssetGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - Code of Chivalry_BundledAssetGroupSchema.asset deleted file mode 100644 index 25bfc4a96..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - Code of Chivalry_BundledAssetGroupSchema.asset +++ /dev/null @@ -1,45 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e5d17a21594effb4e9591490b009e7aa, type: 3} - m_Name: Archon Miltech-GrenadeLauncher-GrenadeLauncher - Code of Chivalry_BundledAssetGroupSchema - m_EditorClassIdentifier: - m_Group: {fileID: 11400000, guid: baf38e47dadf8784eaa39e49946f6f00, type: 2} - m_InternalBundleIdMode: 1 - m_Compression: 1 - m_IncludeAddressInCatalog: 1 - m_IncludeGUIDInCatalog: 1 - m_IncludeLabelsInCatalog: 1 - m_InternalIdNamingMode: 0 - m_CacheClearBehavior: 0 - m_IncludeInBuild: 1 - m_BundledAssetProviderType: - m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider - m_ForceUniqueProvider: 0 - m_UseAssetBundleCache: 1 - m_UseAssetBundleCrc: 1 - m_UseAssetBundleCrcForCachedBundles: 1 - m_UseUWRForLocalBundles: 0 - m_Timeout: 0 - m_ChunkedTransfer: 0 - m_RedirectLimit: -1 - m_RetryCount: 0 - m_BuildPath: - m_Id: 6f064d973e68a7f4d8cc1ad3c41fc138 - m_LoadPath: - m_Id: 7427d4870fdf9bc4b9453213cf7fa1ea - m_BundleMode: 0 - m_AssetBundleProviderType: - m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider - m_BundleNaming: 0 - m_AssetLoadMode: 0 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - Code of Chivalry_BundledAssetGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - Code of Chivalry_BundledAssetGroupSchema.asset.meta deleted file mode 100644 index 67ac48bf1..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - Code of Chivalry_BundledAssetGroupSchema.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 9c0f13d723838d84c8d9d949019b4045 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - Code of Chivalry_ContentUpdateGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - Code of Chivalry_ContentUpdateGroupSchema.asset deleted file mode 100644 index fe2363f83..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - Code of Chivalry_ContentUpdateGroupSchema.asset +++ /dev/null @@ -1,16 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5834b5087d578d24c926ce20cd31e6d6, type: 3} - m_Name: Archon Miltech-GrenadeLauncher-GrenadeLauncher - Code of Chivalry_ContentUpdateGroupSchema - m_EditorClassIdentifier: - m_Group: {fileID: 11400000, guid: baf38e47dadf8784eaa39e49946f6f00, type: 2} - m_StaticContent: 1 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - Code of Chivalry_ContentUpdateGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - Code of Chivalry_ContentUpdateGroupSchema.asset.meta deleted file mode 100644 index 423f9366a..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - Code of Chivalry_ContentUpdateGroupSchema.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 2324c1a86a1821741a76a6731c671408 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - DaisonSleek_BundledAssetGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - DaisonSleek_BundledAssetGroupSchema.asset deleted file mode 100644 index b18bf1e09..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - DaisonSleek_BundledAssetGroupSchema.asset +++ /dev/null @@ -1,45 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e5d17a21594effb4e9591490b009e7aa, type: 3} - m_Name: Archon Miltech-GrenadeLauncher-GrenadeLauncher - DaisonSleek_BundledAssetGroupSchema - m_EditorClassIdentifier: - m_Group: {fileID: 11400000, guid: afd095edce275cf429bdf427b2383f61, type: 2} - m_InternalBundleIdMode: 1 - m_Compression: 1 - m_IncludeAddressInCatalog: 1 - m_IncludeGUIDInCatalog: 1 - m_IncludeLabelsInCatalog: 1 - m_InternalIdNamingMode: 0 - m_CacheClearBehavior: 0 - m_IncludeInBuild: 1 - m_BundledAssetProviderType: - m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider - m_ForceUniqueProvider: 0 - m_UseAssetBundleCache: 1 - m_UseAssetBundleCrc: 1 - m_UseAssetBundleCrcForCachedBundles: 1 - m_UseUWRForLocalBundles: 0 - m_Timeout: 0 - m_ChunkedTransfer: 0 - m_RedirectLimit: -1 - m_RetryCount: 0 - m_BuildPath: - m_Id: 6f064d973e68a7f4d8cc1ad3c41fc138 - m_LoadPath: - m_Id: 7427d4870fdf9bc4b9453213cf7fa1ea - m_BundleMode: 0 - m_AssetBundleProviderType: - m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider - m_BundleNaming: 0 - m_AssetLoadMode: 0 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - DaisonSleek_BundledAssetGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - DaisonSleek_BundledAssetGroupSchema.asset.meta deleted file mode 100644 index e95782902..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - DaisonSleek_BundledAssetGroupSchema.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 77b4177db40740a4dbad5bb1c14cabf2 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - DaisonSleek_ContentUpdateGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - DaisonSleek_ContentUpdateGroupSchema.asset deleted file mode 100644 index fc8f345d5..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - DaisonSleek_ContentUpdateGroupSchema.asset +++ /dev/null @@ -1,16 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5834b5087d578d24c926ce20cd31e6d6, type: 3} - m_Name: Archon Miltech-GrenadeLauncher-GrenadeLauncher - DaisonSleek_ContentUpdateGroupSchema - m_EditorClassIdentifier: - m_Group: {fileID: 11400000, guid: afd095edce275cf429bdf427b2383f61, type: 2} - m_StaticContent: 1 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - DaisonSleek_ContentUpdateGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - DaisonSleek_ContentUpdateGroupSchema.asset.meta deleted file mode 100644 index 0da7ff1b9..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - DaisonSleek_ContentUpdateGroupSchema.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 2b593f6d5eaef8344a8cd93f0d94e6d8 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - LessThanLethal_BundledAssetGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - LessThanLethal_BundledAssetGroupSchema.asset deleted file mode 100644 index 1e3ca9ee5..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - LessThanLethal_BundledAssetGroupSchema.asset +++ /dev/null @@ -1,45 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e5d17a21594effb4e9591490b009e7aa, type: 3} - m_Name: Archon Miltech-GrenadeLauncher-GrenadeLauncher - LessThanLethal_BundledAssetGroupSchema - m_EditorClassIdentifier: - m_Group: {fileID: 11400000, guid: 07ebc17fe2207a143a4c244b47a0efbf, type: 2} - m_InternalBundleIdMode: 1 - m_Compression: 1 - m_IncludeAddressInCatalog: 1 - m_IncludeGUIDInCatalog: 1 - m_IncludeLabelsInCatalog: 1 - m_InternalIdNamingMode: 0 - m_CacheClearBehavior: 0 - m_IncludeInBuild: 1 - m_BundledAssetProviderType: - m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider - m_ForceUniqueProvider: 0 - m_UseAssetBundleCache: 1 - m_UseAssetBundleCrc: 1 - m_UseAssetBundleCrcForCachedBundles: 1 - m_UseUWRForLocalBundles: 0 - m_Timeout: 0 - m_ChunkedTransfer: 0 - m_RedirectLimit: -1 - m_RetryCount: 0 - m_BuildPath: - m_Id: 6f064d973e68a7f4d8cc1ad3c41fc138 - m_LoadPath: - m_Id: 7427d4870fdf9bc4b9453213cf7fa1ea - m_BundleMode: 0 - m_AssetBundleProviderType: - m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider - m_BundleNaming: 0 - m_AssetLoadMode: 0 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - LessThanLethal_BundledAssetGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - LessThanLethal_BundledAssetGroupSchema.asset.meta deleted file mode 100644 index 0eb32dd94..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - LessThanLethal_BundledAssetGroupSchema.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 98b156f3a0147ed49ae8c1b309b13454 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - LessThanLethal_ContentUpdateGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - LessThanLethal_ContentUpdateGroupSchema.asset deleted file mode 100644 index 4d2ac0789..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - LessThanLethal_ContentUpdateGroupSchema.asset +++ /dev/null @@ -1,16 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5834b5087d578d24c926ce20cd31e6d6, type: 3} - m_Name: Archon Miltech-GrenadeLauncher-GrenadeLauncher - LessThanLethal_ContentUpdateGroupSchema - m_EditorClassIdentifier: - m_Group: {fileID: 11400000, guid: 07ebc17fe2207a143a4c244b47a0efbf, type: 2} - m_StaticContent: 1 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - LessThanLethal_ContentUpdateGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - LessThanLethal_ContentUpdateGroupSchema.asset.meta deleted file mode 100644 index 4660e2533..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - LessThanLethal_ContentUpdateGroupSchema.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: c7562fb24d2310e44b1707c607d219d3 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - PraetorGrunge_BundledAssetGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - PraetorGrunge_BundledAssetGroupSchema.asset deleted file mode 100644 index 6b6754162..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - PraetorGrunge_BundledAssetGroupSchema.asset +++ /dev/null @@ -1,45 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e5d17a21594effb4e9591490b009e7aa, type: 3} - m_Name: Archon Miltech-GrenadeLauncher-GrenadeLauncher - PraetorGrunge_BundledAssetGroupSchema - m_EditorClassIdentifier: - m_Group: {fileID: 11400000, guid: 90ae72e147222be448d436dd8ffd57c7, type: 2} - m_InternalBundleIdMode: 1 - m_Compression: 1 - m_IncludeAddressInCatalog: 1 - m_IncludeGUIDInCatalog: 1 - m_IncludeLabelsInCatalog: 1 - m_InternalIdNamingMode: 0 - m_CacheClearBehavior: 0 - m_IncludeInBuild: 1 - m_BundledAssetProviderType: - m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider - m_ForceUniqueProvider: 0 - m_UseAssetBundleCache: 1 - m_UseAssetBundleCrc: 1 - m_UseAssetBundleCrcForCachedBundles: 1 - m_UseUWRForLocalBundles: 0 - m_Timeout: 0 - m_ChunkedTransfer: 0 - m_RedirectLimit: -1 - m_RetryCount: 0 - m_BuildPath: - m_Id: 6f064d973e68a7f4d8cc1ad3c41fc138 - m_LoadPath: - m_Id: 7427d4870fdf9bc4b9453213cf7fa1ea - m_BundleMode: 0 - m_AssetBundleProviderType: - m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider - m_BundleNaming: 0 - m_AssetLoadMode: 0 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - PraetorGrunge_BundledAssetGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - PraetorGrunge_BundledAssetGroupSchema.asset.meta deleted file mode 100644 index 06a253ee3..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - PraetorGrunge_BundledAssetGroupSchema.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 02ba3fbf15c935047a29ed7deb9b94ed -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - PraetorGrunge_ContentUpdateGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - PraetorGrunge_ContentUpdateGroupSchema.asset deleted file mode 100644 index d44957d71..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - PraetorGrunge_ContentUpdateGroupSchema.asset +++ /dev/null @@ -1,16 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5834b5087d578d24c926ce20cd31e6d6, type: 3} - m_Name: Archon Miltech-GrenadeLauncher-GrenadeLauncher - PraetorGrunge_ContentUpdateGroupSchema - m_EditorClassIdentifier: - m_Group: {fileID: 11400000, guid: 90ae72e147222be448d436dd8ffd57c7, type: 2} - m_StaticContent: 1 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - PraetorGrunge_ContentUpdateGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - PraetorGrunge_ContentUpdateGroupSchema.asset.meta deleted file mode 100644 index fa5ca4159..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - PraetorGrunge_ContentUpdateGroupSchema.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 8c125a77ef87137488f5f817bbe6eae9 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - ReadyToQuench_BundledAssetGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - ReadyToQuench_BundledAssetGroupSchema.asset deleted file mode 100644 index fcaad5eef..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - ReadyToQuench_BundledAssetGroupSchema.asset +++ /dev/null @@ -1,45 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e5d17a21594effb4e9591490b009e7aa, type: 3} - m_Name: Archon Miltech-GrenadeLauncher-GrenadeLauncher - ReadyToQuench_BundledAssetGroupSchema - m_EditorClassIdentifier: - m_Group: {fileID: 11400000, guid: 3f1e28c8dd2dc54478e53d9b957dde2b, type: 2} - m_InternalBundleIdMode: 1 - m_Compression: 1 - m_IncludeAddressInCatalog: 1 - m_IncludeGUIDInCatalog: 1 - m_IncludeLabelsInCatalog: 1 - m_InternalIdNamingMode: 0 - m_CacheClearBehavior: 0 - m_IncludeInBuild: 1 - m_BundledAssetProviderType: - m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider - m_ForceUniqueProvider: 0 - m_UseAssetBundleCache: 1 - m_UseAssetBundleCrc: 1 - m_UseAssetBundleCrcForCachedBundles: 1 - m_UseUWRForLocalBundles: 0 - m_Timeout: 0 - m_ChunkedTransfer: 0 - m_RedirectLimit: -1 - m_RetryCount: 0 - m_BuildPath: - m_Id: 6f064d973e68a7f4d8cc1ad3c41fc138 - m_LoadPath: - m_Id: 7427d4870fdf9bc4b9453213cf7fa1ea - m_BundleMode: 0 - m_AssetBundleProviderType: - m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider - m_BundleNaming: 0 - m_AssetLoadMode: 0 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - ReadyToQuench_BundledAssetGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - ReadyToQuench_BundledAssetGroupSchema.asset.meta deleted file mode 100644 index 0b74a3413..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - ReadyToQuench_BundledAssetGroupSchema.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 0688e71261827754d87ae34ddf96a867 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - ReadyToQuench_ContentUpdateGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - ReadyToQuench_ContentUpdateGroupSchema.asset deleted file mode 100644 index ebb5c3325..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - ReadyToQuench_ContentUpdateGroupSchema.asset +++ /dev/null @@ -1,16 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5834b5087d578d24c926ce20cd31e6d6, type: 3} - m_Name: Archon Miltech-GrenadeLauncher-GrenadeLauncher - ReadyToQuench_ContentUpdateGroupSchema - m_EditorClassIdentifier: - m_Group: {fileID: 11400000, guid: 3f1e28c8dd2dc54478e53d9b957dde2b, type: 2} - m_StaticContent: 1 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - ReadyToQuench_ContentUpdateGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - ReadyToQuench_ContentUpdateGroupSchema.asset.meta deleted file mode 100644 index 2bdb0ff44..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - ReadyToQuench_ContentUpdateGroupSchema.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f973c4dec20c3e347af326ede3953d94 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - SeaHawk_BundledAssetGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - SeaHawk_BundledAssetGroupSchema.asset deleted file mode 100644 index b52acb9ca..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - SeaHawk_BundledAssetGroupSchema.asset +++ /dev/null @@ -1,45 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e5d17a21594effb4e9591490b009e7aa, type: 3} - m_Name: Archon Miltech-GrenadeLauncher-GrenadeLauncher - SeaHawk_BundledAssetGroupSchema - m_EditorClassIdentifier: - m_Group: {fileID: 11400000, guid: a43cb8e97d441d946acb668f050d2e97, type: 2} - m_InternalBundleIdMode: 1 - m_Compression: 1 - m_IncludeAddressInCatalog: 1 - m_IncludeGUIDInCatalog: 1 - m_IncludeLabelsInCatalog: 1 - m_InternalIdNamingMode: 0 - m_CacheClearBehavior: 0 - m_IncludeInBuild: 1 - m_BundledAssetProviderType: - m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider - m_ForceUniqueProvider: 0 - m_UseAssetBundleCache: 1 - m_UseAssetBundleCrc: 1 - m_UseAssetBundleCrcForCachedBundles: 1 - m_UseUWRForLocalBundles: 0 - m_Timeout: 0 - m_ChunkedTransfer: 0 - m_RedirectLimit: -1 - m_RetryCount: 0 - m_BuildPath: - m_Id: 6f064d973e68a7f4d8cc1ad3c41fc138 - m_LoadPath: - m_Id: 7427d4870fdf9bc4b9453213cf7fa1ea - m_BundleMode: 0 - m_AssetBundleProviderType: - m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider - m_BundleNaming: 0 - m_AssetLoadMode: 0 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - SeaHawk_BundledAssetGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - SeaHawk_BundledAssetGroupSchema.asset.meta deleted file mode 100644 index 5f40a7f8c..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - SeaHawk_BundledAssetGroupSchema.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 745cd6e475f970042ab0a42ee67be672 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - SeaHawk_ContentUpdateGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - SeaHawk_ContentUpdateGroupSchema.asset deleted file mode 100644 index 82417ec8f..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - SeaHawk_ContentUpdateGroupSchema.asset +++ /dev/null @@ -1,16 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5834b5087d578d24c926ce20cd31e6d6, type: 3} - m_Name: Archon Miltech-GrenadeLauncher-GrenadeLauncher - SeaHawk_ContentUpdateGroupSchema - m_EditorClassIdentifier: - m_Group: {fileID: 11400000, guid: a43cb8e97d441d946acb668f050d2e97, type: 2} - m_StaticContent: 1 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - SeaHawk_ContentUpdateGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - SeaHawk_ContentUpdateGroupSchema.asset.meta deleted file mode 100644 index 694101355..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - SeaHawk_ContentUpdateGroupSchema.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 5b4bf7b35b87a144aadcecde7e3f1339 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - SpotYellow_BundledAssetGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - SpotYellow_BundledAssetGroupSchema.asset deleted file mode 100644 index cbe134735..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - SpotYellow_BundledAssetGroupSchema.asset +++ /dev/null @@ -1,45 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e5d17a21594effb4e9591490b009e7aa, type: 3} - m_Name: Archon Miltech-GrenadeLauncher-GrenadeLauncher - SpotYellow_BundledAssetGroupSchema - m_EditorClassIdentifier: - m_Group: {fileID: 11400000, guid: 98a457945706309419170aa60e0666b6, type: 2} - m_InternalBundleIdMode: 1 - m_Compression: 1 - m_IncludeAddressInCatalog: 1 - m_IncludeGUIDInCatalog: 1 - m_IncludeLabelsInCatalog: 1 - m_InternalIdNamingMode: 0 - m_CacheClearBehavior: 0 - m_IncludeInBuild: 1 - m_BundledAssetProviderType: - m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider - m_ForceUniqueProvider: 0 - m_UseAssetBundleCache: 1 - m_UseAssetBundleCrc: 1 - m_UseAssetBundleCrcForCachedBundles: 1 - m_UseUWRForLocalBundles: 0 - m_Timeout: 0 - m_ChunkedTransfer: 0 - m_RedirectLimit: -1 - m_RetryCount: 0 - m_BuildPath: - m_Id: 6f064d973e68a7f4d8cc1ad3c41fc138 - m_LoadPath: - m_Id: 7427d4870fdf9bc4b9453213cf7fa1ea - m_BundleMode: 0 - m_AssetBundleProviderType: - m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider - m_BundleNaming: 0 - m_AssetLoadMode: 0 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - SpotYellow_BundledAssetGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - SpotYellow_BundledAssetGroupSchema.asset.meta deleted file mode 100644 index c91e59e07..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - SpotYellow_BundledAssetGroupSchema.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 977ff5f024902e44e9cc9c6f27e78742 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - SpotYellow_ContentUpdateGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - SpotYellow_ContentUpdateGroupSchema.asset deleted file mode 100644 index 1f8347726..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - SpotYellow_ContentUpdateGroupSchema.asset +++ /dev/null @@ -1,16 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5834b5087d578d24c926ce20cd31e6d6, type: 3} - m_Name: Archon Miltech-GrenadeLauncher-GrenadeLauncher - SpotYellow_ContentUpdateGroupSchema - m_EditorClassIdentifier: - m_Group: {fileID: 11400000, guid: 98a457945706309419170aa60e0666b6, type: 2} - m_StaticContent: 1 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - SpotYellow_ContentUpdateGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - SpotYellow_ContentUpdateGroupSchema.asset.meta deleted file mode 100644 index 44fe94261..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - SpotYellow_ContentUpdateGroupSchema.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 84c2430c387b69b4f9d8f581a96d7ce6 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - ThinBlueLine_BundledAssetGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - ThinBlueLine_BundledAssetGroupSchema.asset deleted file mode 100644 index e6aaef31a..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - ThinBlueLine_BundledAssetGroupSchema.asset +++ /dev/null @@ -1,45 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e5d17a21594effb4e9591490b009e7aa, type: 3} - m_Name: Archon Miltech-GrenadeLauncher-GrenadeLauncher - ThinBlueLine_BundledAssetGroupSchema - m_EditorClassIdentifier: - m_Group: {fileID: 11400000, guid: 180767fc5127d5f4fbac5856f4b62489, type: 2} - m_InternalBundleIdMode: 1 - m_Compression: 1 - m_IncludeAddressInCatalog: 1 - m_IncludeGUIDInCatalog: 1 - m_IncludeLabelsInCatalog: 1 - m_InternalIdNamingMode: 0 - m_CacheClearBehavior: 0 - m_IncludeInBuild: 1 - m_BundledAssetProviderType: - m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider - m_ForceUniqueProvider: 0 - m_UseAssetBundleCache: 1 - m_UseAssetBundleCrc: 1 - m_UseAssetBundleCrcForCachedBundles: 1 - m_UseUWRForLocalBundles: 0 - m_Timeout: 0 - m_ChunkedTransfer: 0 - m_RedirectLimit: -1 - m_RetryCount: 0 - m_BuildPath: - m_Id: 6f064d973e68a7f4d8cc1ad3c41fc138 - m_LoadPath: - m_Id: 7427d4870fdf9bc4b9453213cf7fa1ea - m_BundleMode: 0 - m_AssetBundleProviderType: - m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider - m_BundleNaming: 0 - m_AssetLoadMode: 0 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - ThinBlueLine_BundledAssetGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - ThinBlueLine_BundledAssetGroupSchema.asset.meta deleted file mode 100644 index 2eb7da008..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - ThinBlueLine_BundledAssetGroupSchema.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 5c6416936890d45409068886ac7a0eca -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - ThinBlueLine_ContentUpdateGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - ThinBlueLine_ContentUpdateGroupSchema.asset deleted file mode 100644 index ce3f9575b..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - ThinBlueLine_ContentUpdateGroupSchema.asset +++ /dev/null @@ -1,16 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5834b5087d578d24c926ce20cd31e6d6, type: 3} - m_Name: Archon Miltech-GrenadeLauncher-GrenadeLauncher - ThinBlueLine_ContentUpdateGroupSchema - m_EditorClassIdentifier: - m_Group: {fileID: 11400000, guid: 180767fc5127d5f4fbac5856f4b62489, type: 2} - m_StaticContent: 1 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - ThinBlueLine_ContentUpdateGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - ThinBlueLine_ContentUpdateGroupSchema.asset.meta deleted file mode 100644 index 5bfb32c1b..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - ThinBlueLine_ContentUpdateGroupSchema.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 9e67829dfbb55e045ac3191cb27141b8 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - UnbrokenKnot_BundledAssetGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - UnbrokenKnot_BundledAssetGroupSchema.asset deleted file mode 100644 index ed821aa16..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - UnbrokenKnot_BundledAssetGroupSchema.asset +++ /dev/null @@ -1,45 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e5d17a21594effb4e9591490b009e7aa, type: 3} - m_Name: Archon Miltech-GrenadeLauncher-GrenadeLauncher - UnbrokenKnot_BundledAssetGroupSchema - m_EditorClassIdentifier: - m_Group: {fileID: 11400000, guid: 17a32e43d02a2bf439888c3fb80e38f5, type: 2} - m_InternalBundleIdMode: 1 - m_Compression: 1 - m_IncludeAddressInCatalog: 1 - m_IncludeGUIDInCatalog: 1 - m_IncludeLabelsInCatalog: 1 - m_InternalIdNamingMode: 0 - m_CacheClearBehavior: 0 - m_IncludeInBuild: 1 - m_BundledAssetProviderType: - m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider - m_ForceUniqueProvider: 0 - m_UseAssetBundleCache: 1 - m_UseAssetBundleCrc: 1 - m_UseAssetBundleCrcForCachedBundles: 1 - m_UseUWRForLocalBundles: 0 - m_Timeout: 0 - m_ChunkedTransfer: 0 - m_RedirectLimit: -1 - m_RetryCount: 0 - m_BuildPath: - m_Id: 6f064d973e68a7f4d8cc1ad3c41fc138 - m_LoadPath: - m_Id: 7427d4870fdf9bc4b9453213cf7fa1ea - m_BundleMode: 0 - m_AssetBundleProviderType: - m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider - m_BundleNaming: 0 - m_AssetLoadMode: 0 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - UnbrokenKnot_BundledAssetGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - UnbrokenKnot_BundledAssetGroupSchema.asset.meta deleted file mode 100644 index ae8074ff2..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - UnbrokenKnot_BundledAssetGroupSchema.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 6d53540ecb83f8c4496eb00a942bcfb1 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - UnbrokenKnot_ContentUpdateGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - UnbrokenKnot_ContentUpdateGroupSchema.asset deleted file mode 100644 index 8169603ee..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - UnbrokenKnot_ContentUpdateGroupSchema.asset +++ /dev/null @@ -1,16 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5834b5087d578d24c926ce20cd31e6d6, type: 3} - m_Name: Archon Miltech-GrenadeLauncher-GrenadeLauncher - UnbrokenKnot_ContentUpdateGroupSchema - m_EditorClassIdentifier: - m_Group: {fileID: 11400000, guid: 17a32e43d02a2bf439888c3fb80e38f5, type: 2} - m_StaticContent: 1 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - UnbrokenKnot_ContentUpdateGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - UnbrokenKnot_ContentUpdateGroupSchema.asset.meta deleted file mode 100644 index a762b023a..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Archon Miltech-GrenadeLauncher-GrenadeLauncher - UnbrokenKnot_ContentUpdateGroupSchema.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 9e48b07784a203e47a6df01b161854cb -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - MineGod_BundledAssetGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - FlyInFlyOut_BundledAssetGroupSchema.asset similarity index 91% rename from Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - MineGod_BundledAssetGroupSchema.asset rename to Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - FlyInFlyOut_BundledAssetGroupSchema.asset index 0b08bf511..6224fbf8e 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - MineGod_BundledAssetGroupSchema.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - FlyInFlyOut_BundledAssetGroupSchema.asset @@ -10,9 +10,9 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: e5d17a21594effb4e9591490b009e7aa, type: 3} - m_Name: Shirokuma - MineGod_BundledAssetGroupSchema + m_Name: Aries - FlyInFlyOut_BundledAssetGroupSchema m_EditorClassIdentifier: - m_Group: {fileID: 11400000, guid: 3c7ff06de1e4f7c43ba2d187b85739e1, type: 2} + m_Group: {fileID: 11400000, guid: e1cadfab72d019441888132cdae8a60a, type: 2} m_InternalBundleIdMode: 1 m_Compression: 1 m_IncludeAddressInCatalog: 1 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - FlyInFlyOut_BundledAssetGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - FlyInFlyOut_BundledAssetGroupSchema.asset.meta new file mode 100644 index 000000000..d38d9a9b7 --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - FlyInFlyOut_BundledAssetGroupSchema.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 02c4e1c05b0e9ea47b1a27fd0a4168ba +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - MineGod_ContentUpdateGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - FlyInFlyOut_ContentUpdateGroupSchema.asset similarity index 74% rename from Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - MineGod_ContentUpdateGroupSchema.asset rename to Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - FlyInFlyOut_ContentUpdateGroupSchema.asset index 01dcadcfb..c90460a38 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - MineGod_ContentUpdateGroupSchema.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - FlyInFlyOut_ContentUpdateGroupSchema.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5834b5087d578d24c926ce20cd31e6d6, type: 3} - m_Name: Shirokuma - MineGod_ContentUpdateGroupSchema + m_Name: Aries - FlyInFlyOut_ContentUpdateGroupSchema m_EditorClassIdentifier: - m_Group: {fileID: 11400000, guid: 3c7ff06de1e4f7c43ba2d187b85739e1, type: 2} + m_Group: {fileID: 11400000, guid: e1cadfab72d019441888132cdae8a60a, type: 2} m_StaticContent: 1 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - FlyInFlyOut_ContentUpdateGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - FlyInFlyOut_ContentUpdateGroupSchema.asset.meta new file mode 100644 index 000000000..a6c7fe297 --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - FlyInFlyOut_ContentUpdateGroupSchema.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 42644078e9ef99b4c8da191270227752 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - X3Kuro_BundledAssetGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - HighCaliber_BundledAssetGroupSchema.asset similarity index 91% rename from Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - X3Kuro_BundledAssetGroupSchema.asset rename to Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - HighCaliber_BundledAssetGroupSchema.asset index 5ea6263e1..5330f914d 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - X3Kuro_BundledAssetGroupSchema.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - HighCaliber_BundledAssetGroupSchema.asset @@ -10,9 +10,9 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: e5d17a21594effb4e9591490b009e7aa, type: 3} - m_Name: Shirokuma - X3Kuro_BundledAssetGroupSchema + m_Name: Aries - HighCaliber_BundledAssetGroupSchema m_EditorClassIdentifier: - m_Group: {fileID: 11400000, guid: ff6447b331f7f7348a688d8d85dc4d96, type: 2} + m_Group: {fileID: 11400000, guid: bad9a9ab5e9b51141b49da440cd7ee15, type: 2} m_InternalBundleIdMode: 1 m_Compression: 1 m_IncludeAddressInCatalog: 1 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - HighCaliber_BundledAssetGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - HighCaliber_BundledAssetGroupSchema.asset.meta new file mode 100644 index 000000000..c8f23178c --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - HighCaliber_BundledAssetGroupSchema.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 89ae28b9d7e08164e8f0698bff61663e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - X3Kuro_ContentUpdateGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - HighCaliber_ContentUpdateGroupSchema.asset similarity index 74% rename from Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - X3Kuro_ContentUpdateGroupSchema.asset rename to Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - HighCaliber_ContentUpdateGroupSchema.asset index b4d54ebe7..5185bdc07 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - X3Kuro_ContentUpdateGroupSchema.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - HighCaliber_ContentUpdateGroupSchema.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5834b5087d578d24c926ce20cd31e6d6, type: 3} - m_Name: Shirokuma - X3Kuro_ContentUpdateGroupSchema + m_Name: Aries - HighCaliber_ContentUpdateGroupSchema m_EditorClassIdentifier: - m_Group: {fileID: 11400000, guid: ff6447b331f7f7348a688d8d85dc4d96, type: 2} + m_Group: {fileID: 11400000, guid: bad9a9ab5e9b51141b49da440cd7ee15, type: 2} m_StaticContent: 1 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - HighCaliber_ContentUpdateGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - HighCaliber_ContentUpdateGroupSchema.asset.meta new file mode 100644 index 000000000..8f1dce788 --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - HighCaliber_ContentUpdateGroupSchema.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3f2c480c447efd74ca6b198a5bf0893c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - Nullifier_BundledAssetGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - MartianSoil_BundledAssetGroupSchema.asset similarity index 91% rename from Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - Nullifier_BundledAssetGroupSchema.asset rename to Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - MartianSoil_BundledAssetGroupSchema.asset index de7e6a96c..045127cf6 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - Nullifier_BundledAssetGroupSchema.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - MartianSoil_BundledAssetGroupSchema.asset @@ -10,9 +10,9 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: e5d17a21594effb4e9591490b009e7aa, type: 3} - m_Name: Shirokuma - Nullifier_BundledAssetGroupSchema + m_Name: Aries - MartianSoil_BundledAssetGroupSchema m_EditorClassIdentifier: - m_Group: {fileID: 11400000, guid: 722aa5032b73ee549930118337913515, type: 2} + m_Group: {fileID: 11400000, guid: ae04611a3151893429f849ac3796dfff, type: 2} m_InternalBundleIdMode: 1 m_Compression: 1 m_IncludeAddressInCatalog: 1 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - MartianSoil_BundledAssetGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - MartianSoil_BundledAssetGroupSchema.asset.meta new file mode 100644 index 000000000..29a2a333f --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - MartianSoil_BundledAssetGroupSchema.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ce4e84267b6f5ca4682d2f2e721bf1db +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - Nullifier_ContentUpdateGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - MartianSoil_ContentUpdateGroupSchema.asset similarity index 74% rename from Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - Nullifier_ContentUpdateGroupSchema.asset rename to Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - MartianSoil_ContentUpdateGroupSchema.asset index 31ade56f4..898f9dc28 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - Nullifier_ContentUpdateGroupSchema.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - MartianSoil_ContentUpdateGroupSchema.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5834b5087d578d24c926ce20cd31e6d6, type: 3} - m_Name: Shirokuma - Nullifier_ContentUpdateGroupSchema + m_Name: Aries - MartianSoil_ContentUpdateGroupSchema m_EditorClassIdentifier: - m_Group: {fileID: 11400000, guid: 722aa5032b73ee549930118337913515, type: 2} + m_Group: {fileID: 11400000, guid: ae04611a3151893429f849ac3796dfff, type: 2} m_StaticContent: 1 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - MartianSoil_ContentUpdateGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - MartianSoil_ContentUpdateGroupSchema.asset.meta new file mode 100644 index 000000000..7ef173157 --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - MartianSoil_ContentUpdateGroupSchema.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ec84f20edd6b9cd4886084890c5eb66b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - SynthPunk_BundledAssetGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - OsmiumScream_BundledAssetGroupSchema.asset similarity index 91% rename from Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - SynthPunk_BundledAssetGroupSchema.asset rename to Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - OsmiumScream_BundledAssetGroupSchema.asset index 9a03e8e6a..c7bc4cb8e 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - SynthPunk_BundledAssetGroupSchema.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - OsmiumScream_BundledAssetGroupSchema.asset @@ -10,9 +10,9 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: e5d17a21594effb4e9591490b009e7aa, type: 3} - m_Name: Shirokuma - SynthPunk_BundledAssetGroupSchema + m_Name: Aries - OsmiumScream_BundledAssetGroupSchema m_EditorClassIdentifier: - m_Group: {fileID: 11400000, guid: 841a020a3ec32304bba027db187c00bc, type: 2} + m_Group: {fileID: 11400000, guid: 3ab6fb4513d183546b88869479402aeb, type: 2} m_InternalBundleIdMode: 1 m_Compression: 1 m_IncludeAddressInCatalog: 1 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - OsmiumScream_BundledAssetGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - OsmiumScream_BundledAssetGroupSchema.asset.meta new file mode 100644 index 000000000..c6b7de45d --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - OsmiumScream_BundledAssetGroupSchema.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9849042def465d442a0ee00aa1f2448a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - SynthPunk_ContentUpdateGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - OsmiumScream_ContentUpdateGroupSchema.asset similarity index 74% rename from Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - SynthPunk_ContentUpdateGroupSchema.asset rename to Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - OsmiumScream_ContentUpdateGroupSchema.asset index 9d4f8b32d..5a5912005 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - SynthPunk_ContentUpdateGroupSchema.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - OsmiumScream_ContentUpdateGroupSchema.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5834b5087d578d24c926ce20cd31e6d6, type: 3} - m_Name: Shirokuma - SynthPunk_ContentUpdateGroupSchema + m_Name: Aries - OsmiumScream_ContentUpdateGroupSchema m_EditorClassIdentifier: - m_Group: {fileID: 11400000, guid: 841a020a3ec32304bba027db187c00bc, type: 2} + m_Group: {fileID: 11400000, guid: 3ab6fb4513d183546b88869479402aeb, type: 2} m_StaticContent: 1 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - OsmiumScream_ContentUpdateGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - OsmiumScream_ContentUpdateGroupSchema.asset.meta new file mode 100644 index 000000000..f46d65323 --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - OsmiumScream_ContentUpdateGroupSchema.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4970497937bca5244b0ea96b598e3d49 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - HeavyWhite_BundledAssetGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - PrometheanGold_BundledAssetGroupSchema.asset similarity index 91% rename from Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - HeavyWhite_BundledAssetGroupSchema.asset rename to Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - PrometheanGold_BundledAssetGroupSchema.asset index 1ebc4bf09..fb3977155 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - HeavyWhite_BundledAssetGroupSchema.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - PrometheanGold_BundledAssetGroupSchema.asset @@ -10,9 +10,9 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: e5d17a21594effb4e9591490b009e7aa, type: 3} - m_Name: Shirokuma - HeavyWhite_BundledAssetGroupSchema + m_Name: Aries - PrometheanGold_BundledAssetGroupSchema m_EditorClassIdentifier: - m_Group: {fileID: 11400000, guid: dde6838949dfff0419b7ee3cb2edbc54, type: 2} + m_Group: {fileID: 11400000, guid: 6a249dccdc3df1a41823e42bed967914, type: 2} m_InternalBundleIdMode: 1 m_Compression: 1 m_IncludeAddressInCatalog: 1 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - PrometheanGold_BundledAssetGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - PrometheanGold_BundledAssetGroupSchema.asset.meta new file mode 100644 index 000000000..93d41a82a --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - PrometheanGold_BundledAssetGroupSchema.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f69e07956d9588f4e855d98dac26ca0d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - HeavyWhite_ContentUpdateGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - PrometheanGold_ContentUpdateGroupSchema.asset similarity index 74% rename from Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - HeavyWhite_ContentUpdateGroupSchema.asset rename to Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - PrometheanGold_ContentUpdateGroupSchema.asset index e2b9083a8..8eb2eb256 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - HeavyWhite_ContentUpdateGroupSchema.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - PrometheanGold_ContentUpdateGroupSchema.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5834b5087d578d24c926ce20cd31e6d6, type: 3} - m_Name: Shirokuma - HeavyWhite_ContentUpdateGroupSchema + m_Name: Aries - PrometheanGold_ContentUpdateGroupSchema m_EditorClassIdentifier: - m_Group: {fileID: 11400000, guid: dde6838949dfff0419b7ee3cb2edbc54, type: 2} + m_Group: {fileID: 11400000, guid: 6a249dccdc3df1a41823e42bed967914, type: 2} m_StaticContent: 1 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - PrometheanGold_ContentUpdateGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - PrometheanGold_ContentUpdateGroupSchema.asset.meta new file mode 100644 index 000000000..777bb19b1 --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - PrometheanGold_ContentUpdateGroupSchema.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1032dc5f9d358774cba39894dc1d00d8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - SovereignHill_BundledAssetGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - SovereignHill_BundledAssetGroupSchema.asset new file mode 100644 index 000000000..95919f8d3 --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - SovereignHill_BundledAssetGroupSchema.asset @@ -0,0 +1,45 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e5d17a21594effb4e9591490b009e7aa, type: 3} + m_Name: Aries - SovereignHill_BundledAssetGroupSchema + m_EditorClassIdentifier: + m_Group: {fileID: 11400000, guid: 2834cc8469313f64289f763bb91f9e9b, type: 2} + m_InternalBundleIdMode: 1 + m_Compression: 1 + m_IncludeAddressInCatalog: 1 + m_IncludeGUIDInCatalog: 1 + m_IncludeLabelsInCatalog: 1 + m_InternalIdNamingMode: 0 + m_CacheClearBehavior: 0 + m_IncludeInBuild: 1 + m_BundledAssetProviderType: + m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider + m_ForceUniqueProvider: 0 + m_UseAssetBundleCache: 1 + m_UseAssetBundleCrc: 1 + m_UseAssetBundleCrcForCachedBundles: 1 + m_UseUWRForLocalBundles: 0 + m_Timeout: 0 + m_ChunkedTransfer: 0 + m_RedirectLimit: -1 + m_RetryCount: 0 + m_BuildPath: + m_Id: 6f064d973e68a7f4d8cc1ad3c41fc138 + m_LoadPath: + m_Id: 7427d4870fdf9bc4b9453213cf7fa1ea + m_BundleMode: 0 + m_AssetBundleProviderType: + m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider + m_BundleNaming: 0 + m_AssetLoadMode: 0 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - SovereignHill_BundledAssetGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - SovereignHill_BundledAssetGroupSchema.asset.meta new file mode 100644 index 000000000..4ae15ee3d --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - SovereignHill_BundledAssetGroupSchema.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 788c6cae2c22af147a8e2560635888cf +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - SovereignHill_ContentUpdateGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - SovereignHill_ContentUpdateGroupSchema.asset new file mode 100644 index 000000000..9f567f072 --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - SovereignHill_ContentUpdateGroupSchema.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5834b5087d578d24c926ce20cd31e6d6, type: 3} + m_Name: Aries - SovereignHill_ContentUpdateGroupSchema + m_EditorClassIdentifier: + m_Group: {fileID: 11400000, guid: 2834cc8469313f64289f763bb91f9e9b, type: 2} + m_StaticContent: 1 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - SovereignHill_ContentUpdateGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - SovereignHill_ContentUpdateGroupSchema.asset.meta new file mode 100644 index 000000000..9294c78c3 --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries - SovereignHill_ContentUpdateGroupSchema.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c7a62928c4f7e224a9a2bc827626d1e8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - FlyInFlyOut_BundledAssetGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - FlyInFlyOut_BundledAssetGroupSchema.asset.meta deleted file mode 100644 index 5698d6b67..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - FlyInFlyOut_BundledAssetGroupSchema.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 37c934e72458b7441b13ef7d1243859c -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - FlyInFlyOut_ContentUpdateGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - FlyInFlyOut_ContentUpdateGroupSchema.asset.meta deleted file mode 100644 index 499610fcc..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - FlyInFlyOut_ContentUpdateGroupSchema.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 62f273bc47eea7f4e85bf67761ce540a -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - HighCaliber_BundledAssetGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - HighCaliber_BundledAssetGroupSchema.asset.meta deleted file mode 100644 index 0845b9d55..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - HighCaliber_BundledAssetGroupSchema.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 98784e2e7e563e44187855a8b36c471f -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - HighCaliber_ContentUpdateGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - HighCaliber_ContentUpdateGroupSchema.asset.meta deleted file mode 100644 index 31e6c2806..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - HighCaliber_ContentUpdateGroupSchema.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: b4311c72496c1be43bb73b14f17ebd53 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - MartianSoil_BundledAssetGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - MartianSoil_BundledAssetGroupSchema.asset.meta deleted file mode 100644 index 944ccc14c..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - MartianSoil_BundledAssetGroupSchema.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 7448ba59163c2824784789d966bb8d90 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - MartianSoil_ContentUpdateGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - MartianSoil_ContentUpdateGroupSchema.asset.meta deleted file mode 100644 index 78befe7ad..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - MartianSoil_ContentUpdateGroupSchema.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: ad8bfd4865ba2474d8ccb9dfc17c6c90 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - OsmiumScream_BundledAssetGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - OsmiumScream_BundledAssetGroupSchema.asset.meta deleted file mode 100644 index b14969aae..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - OsmiumScream_BundledAssetGroupSchema.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 10661a4449e65fe4bbee54e2346ab6cc -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - OsmiumScream_ContentUpdateGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - OsmiumScream_ContentUpdateGroupSchema.asset.meta deleted file mode 100644 index 0a2f70fff..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - OsmiumScream_ContentUpdateGroupSchema.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: b1b33beb60c377846bcd7e44575b494b -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - PrometheanGold_BundledAssetGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - PrometheanGold_BundledAssetGroupSchema.asset deleted file mode 100644 index 9bdad472f..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - PrometheanGold_BundledAssetGroupSchema.asset +++ /dev/null @@ -1,45 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e5d17a21594effb4e9591490b009e7aa, type: 3} - m_Name: Aries-Aries - PrometheanGold_BundledAssetGroupSchema - m_EditorClassIdentifier: - m_Group: {fileID: 11400000, guid: 14de2413351d0584281fb5f88019c8b0, type: 2} - m_InternalBundleIdMode: 1 - m_Compression: 1 - m_IncludeAddressInCatalog: 1 - m_IncludeGUIDInCatalog: 1 - m_IncludeLabelsInCatalog: 1 - m_InternalIdNamingMode: 0 - m_CacheClearBehavior: 0 - m_IncludeInBuild: 1 - m_BundledAssetProviderType: - m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider - m_ForceUniqueProvider: 0 - m_UseAssetBundleCache: 1 - m_UseAssetBundleCrc: 1 - m_UseAssetBundleCrcForCachedBundles: 1 - m_UseUWRForLocalBundles: 0 - m_Timeout: 0 - m_ChunkedTransfer: 0 - m_RedirectLimit: -1 - m_RetryCount: 0 - m_BuildPath: - m_Id: 6f064d973e68a7f4d8cc1ad3c41fc138 - m_LoadPath: - m_Id: 7427d4870fdf9bc4b9453213cf7fa1ea - m_BundleMode: 0 - m_AssetBundleProviderType: - m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider - m_BundleNaming: 0 - m_AssetLoadMode: 0 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - PrometheanGold_BundledAssetGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - PrometheanGold_BundledAssetGroupSchema.asset.meta deleted file mode 100644 index 595b8e444..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - PrometheanGold_BundledAssetGroupSchema.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 8c121bd415338ce43b2724cd6443db02 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - PrometheanGold_ContentUpdateGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - PrometheanGold_ContentUpdateGroupSchema.asset deleted file mode 100644 index ac9b8d708..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - PrometheanGold_ContentUpdateGroupSchema.asset +++ /dev/null @@ -1,16 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5834b5087d578d24c926ce20cd31e6d6, type: 3} - m_Name: Aries-Aries - PrometheanGold_ContentUpdateGroupSchema - m_EditorClassIdentifier: - m_Group: {fileID: 11400000, guid: 14de2413351d0584281fb5f88019c8b0, type: 2} - m_StaticContent: 1 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - PrometheanGold_ContentUpdateGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - PrometheanGold_ContentUpdateGroupSchema.asset.meta deleted file mode 100644 index 2c1cc504f..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - PrometheanGold_ContentUpdateGroupSchema.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 9bddd0e1094789848a635d22e5955731 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - SovereignHill_BundledAssetGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - SovereignHill_BundledAssetGroupSchema.asset deleted file mode 100644 index 8469f3ec2..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - SovereignHill_BundledAssetGroupSchema.asset +++ /dev/null @@ -1,45 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e5d17a21594effb4e9591490b009e7aa, type: 3} - m_Name: Aries-Aries - SovereignHill_BundledAssetGroupSchema - m_EditorClassIdentifier: - m_Group: {fileID: 11400000, guid: 20bcb2b78d01d6444ad2308d44654cb2, type: 2} - m_InternalBundleIdMode: 1 - m_Compression: 1 - m_IncludeAddressInCatalog: 1 - m_IncludeGUIDInCatalog: 1 - m_IncludeLabelsInCatalog: 1 - m_InternalIdNamingMode: 0 - m_CacheClearBehavior: 0 - m_IncludeInBuild: 1 - m_BundledAssetProviderType: - m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider - m_ForceUniqueProvider: 0 - m_UseAssetBundleCache: 1 - m_UseAssetBundleCrc: 1 - m_UseAssetBundleCrcForCachedBundles: 1 - m_UseUWRForLocalBundles: 0 - m_Timeout: 0 - m_ChunkedTransfer: 0 - m_RedirectLimit: -1 - m_RetryCount: 0 - m_BuildPath: - m_Id: 6f064d973e68a7f4d8cc1ad3c41fc138 - m_LoadPath: - m_Id: 7427d4870fdf9bc4b9453213cf7fa1ea - m_BundleMode: 0 - m_AssetBundleProviderType: - m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider - m_BundleNaming: 0 - m_AssetLoadMode: 0 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - SovereignHill_BundledAssetGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - SovereignHill_BundledAssetGroupSchema.asset.meta deleted file mode 100644 index 2ae2f9478..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - SovereignHill_BundledAssetGroupSchema.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 4c8db6f7a809f9043ae4e791b0833fa0 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - SovereignHill_ContentUpdateGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - SovereignHill_ContentUpdateGroupSchema.asset deleted file mode 100644 index 6a782fbef..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - SovereignHill_ContentUpdateGroupSchema.asset +++ /dev/null @@ -1,16 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5834b5087d578d24c926ce20cd31e6d6, type: 3} - m_Name: Aries-Aries - SovereignHill_ContentUpdateGroupSchema - m_EditorClassIdentifier: - m_Group: {fileID: 11400000, guid: 20bcb2b78d01d6444ad2308d44654cb2, type: 2} - m_StaticContent: 1 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - SovereignHill_ContentUpdateGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - SovereignHill_ContentUpdateGroupSchema.asset.meta deleted file mode 100644 index f67824d8f..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Aries-Aries - SovereignHill_ContentUpdateGroupSchema.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 5f92d53aa91e9f7409164cabc5d6ee96 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - HeavyWhite_BundledAssetGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - HeavyWhite_BundledAssetGroupSchema.asset.meta deleted file mode 100644 index dd5ae3209..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - HeavyWhite_BundledAssetGroupSchema.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 7fa00844e11fade4e8d02699d2852a3a -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - HeavyWhite_ContentUpdateGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - HeavyWhite_ContentUpdateGroupSchema.asset.meta deleted file mode 100644 index c358bd8ea..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - HeavyWhite_ContentUpdateGroupSchema.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: ccd276d018ae5e54e9eff88935b6381a -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - MineGod_BundledAssetGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - MineGod_BundledAssetGroupSchema.asset.meta deleted file mode 100644 index fc2d41382..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - MineGod_BundledAssetGroupSchema.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: cac35f64f7b64384f9e0757cdbd6e533 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - MineGod_ContentUpdateGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - MineGod_ContentUpdateGroupSchema.asset.meta deleted file mode 100644 index 197b08e57..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - MineGod_ContentUpdateGroupSchema.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e915bb1236345d245b1c2c926e8de84b -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - Nullifier_BundledAssetGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - Nullifier_BundledAssetGroupSchema.asset.meta deleted file mode 100644 index 576feeccb..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - Nullifier_BundledAssetGroupSchema.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 28340ac502e34014fb888594483aac40 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - Nullifier_ContentUpdateGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - Nullifier_ContentUpdateGroupSchema.asset.meta deleted file mode 100644 index e5c9c7c55..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - Nullifier_ContentUpdateGroupSchema.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 99267485f4c510042bd8db041d7d2764 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - ShadowStealAway_BundledAssetGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - ShadowStealAway_BundledAssetGroupSchema.asset deleted file mode 100644 index d29ac46d4..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - ShadowStealAway_BundledAssetGroupSchema.asset +++ /dev/null @@ -1,45 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e5d17a21594effb4e9591490b009e7aa, type: 3} - m_Name: Shirokuma - ShadowStealAway_BundledAssetGroupSchema - m_EditorClassIdentifier: - m_Group: {fileID: 11400000, guid: fa310c8e20ed2054f99410dd533e6bb4, type: 2} - m_InternalBundleIdMode: 1 - m_Compression: 1 - m_IncludeAddressInCatalog: 1 - m_IncludeGUIDInCatalog: 1 - m_IncludeLabelsInCatalog: 1 - m_InternalIdNamingMode: 0 - m_CacheClearBehavior: 0 - m_IncludeInBuild: 1 - m_BundledAssetProviderType: - m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider - m_ForceUniqueProvider: 0 - m_UseAssetBundleCache: 1 - m_UseAssetBundleCrc: 1 - m_UseAssetBundleCrcForCachedBundles: 1 - m_UseUWRForLocalBundles: 0 - m_Timeout: 0 - m_ChunkedTransfer: 0 - m_RedirectLimit: -1 - m_RetryCount: 0 - m_BuildPath: - m_Id: 6f064d973e68a7f4d8cc1ad3c41fc138 - m_LoadPath: - m_Id: 7427d4870fdf9bc4b9453213cf7fa1ea - m_BundleMode: 0 - m_AssetBundleProviderType: - m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider - m_BundleNaming: 0 - m_AssetLoadMode: 0 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - ShadowStealAway_BundledAssetGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - ShadowStealAway_BundledAssetGroupSchema.asset.meta deleted file mode 100644 index f1599643c..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - ShadowStealAway_BundledAssetGroupSchema.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 5e42d718350db7242a3d3665c151d141 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - ShadowStealAway_ContentUpdateGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - ShadowStealAway_ContentUpdateGroupSchema.asset deleted file mode 100644 index 27585ea53..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - ShadowStealAway_ContentUpdateGroupSchema.asset +++ /dev/null @@ -1,16 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5834b5087d578d24c926ce20cd31e6d6, type: 3} - m_Name: Shirokuma - ShadowStealAway_ContentUpdateGroupSchema - m_EditorClassIdentifier: - m_Group: {fileID: 11400000, guid: fa310c8e20ed2054f99410dd533e6bb4, type: 2} - m_StaticContent: 1 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - ShadowStealAway_ContentUpdateGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - ShadowStealAway_ContentUpdateGroupSchema.asset.meta deleted file mode 100644 index 992ea6230..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - ShadowStealAway_ContentUpdateGroupSchema.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: d9383156f064c0d4e8589b0462eefa10 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - SynthPunk_BundledAssetGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - SynthPunk_BundledAssetGroupSchema.asset.meta deleted file mode 100644 index b49838c8d..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - SynthPunk_BundledAssetGroupSchema.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f1bd295dcaba8e24b808d4aa0e7fdfec -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - SynthPunk_ContentUpdateGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - SynthPunk_ContentUpdateGroupSchema.asset.meta deleted file mode 100644 index b51611d64..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - SynthPunk_ContentUpdateGroupSchema.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: c21cba2e83b1deb44ab84da492309109 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - Two Five Zero One_BundledAssetGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - Two Five Zero One_BundledAssetGroupSchema.asset deleted file mode 100644 index 3bc38daf6..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - Two Five Zero One_BundledAssetGroupSchema.asset +++ /dev/null @@ -1,45 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e5d17a21594effb4e9591490b009e7aa, type: 3} - m_Name: Shirokuma - Two Five Zero One_BundledAssetGroupSchema - m_EditorClassIdentifier: - m_Group: {fileID: 11400000, guid: 06307f292285ecc4398b15b71647cbe2, type: 2} - m_InternalBundleIdMode: 1 - m_Compression: 1 - m_IncludeAddressInCatalog: 1 - m_IncludeGUIDInCatalog: 1 - m_IncludeLabelsInCatalog: 1 - m_InternalIdNamingMode: 0 - m_CacheClearBehavior: 0 - m_IncludeInBuild: 1 - m_BundledAssetProviderType: - m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider - m_ForceUniqueProvider: 0 - m_UseAssetBundleCache: 1 - m_UseAssetBundleCrc: 1 - m_UseAssetBundleCrcForCachedBundles: 1 - m_UseUWRForLocalBundles: 0 - m_Timeout: 0 - m_ChunkedTransfer: 0 - m_RedirectLimit: -1 - m_RetryCount: 0 - m_BuildPath: - m_Id: 6f064d973e68a7f4d8cc1ad3c41fc138 - m_LoadPath: - m_Id: 7427d4870fdf9bc4b9453213cf7fa1ea - m_BundleMode: 0 - m_AssetBundleProviderType: - m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider - m_BundleNaming: 0 - m_AssetLoadMode: 0 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - Two Five Zero One_BundledAssetGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - Two Five Zero One_BundledAssetGroupSchema.asset.meta deleted file mode 100644 index 4b62909c7..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - Two Five Zero One_BundledAssetGroupSchema.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 5ccd74a5ecd084949ad598d0623fd282 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - Two Five Zero One_ContentUpdateGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - Two Five Zero One_ContentUpdateGroupSchema.asset deleted file mode 100644 index a31f6b18e..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - Two Five Zero One_ContentUpdateGroupSchema.asset +++ /dev/null @@ -1,16 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5834b5087d578d24c926ce20cd31e6d6, type: 3} - m_Name: Shirokuma - Two Five Zero One_ContentUpdateGroupSchema - m_EditorClassIdentifier: - m_Group: {fileID: 11400000, guid: 06307f292285ecc4398b15b71647cbe2, type: 2} - m_StaticContent: 1 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - Two Five Zero One_ContentUpdateGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - Two Five Zero One_ContentUpdateGroupSchema.asset.meta deleted file mode 100644 index f8387012d..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - Two Five Zero One_ContentUpdateGroupSchema.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: bc24b3bc8e3a4f04aac1f990cfe86258 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - X3Kuro_BundledAssetGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - X3Kuro_BundledAssetGroupSchema.asset.meta deleted file mode 100644 index a5ca21802..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - X3Kuro_BundledAssetGroupSchema.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: c553b22157503f947ae6e654826f59a3 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - X3Kuro_ContentUpdateGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - X3Kuro_ContentUpdateGroupSchema.asset.meta deleted file mode 100644 index 2d692e657..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma - X3Kuro_ContentUpdateGroupSchema.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 57f6f213e2fab6b4ebc05f8edd38bc4f -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - 2501 - Tachikoma_BundledAssetGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - 2501 - Tachikoma_BundledAssetGroupSchema.asset.meta deleted file mode 100644 index 494491316..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - 2501 - Tachikoma_BundledAssetGroupSchema.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 5570c6a6533bf8e4bb36a4b968ddbaa7 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - 2501 - Tachikoma_ContentUpdateGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - 2501 - Tachikoma_ContentUpdateGroupSchema.asset.meta deleted file mode 100644 index 15f3bab4c..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - 2501 - Tachikoma_ContentUpdateGroupSchema.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: dcace4d445c3e0345966d461b6925bdd -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - HeavyWhite_BundledAssetGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - HeavyWhite_BundledAssetGroupSchema.asset deleted file mode 100644 index a6f1015c5..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - HeavyWhite_BundledAssetGroupSchema.asset +++ /dev/null @@ -1,45 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e5d17a21594effb4e9591490b009e7aa, type: 3} - m_Name: Shirokuma-Shirokuma - HeavyWhite_BundledAssetGroupSchema - m_EditorClassIdentifier: - m_Group: {fileID: 11400000, guid: c3cef6adec11d054e987a75d7a9a1716, type: 2} - m_InternalBundleIdMode: 1 - m_Compression: 1 - m_IncludeAddressInCatalog: 1 - m_IncludeGUIDInCatalog: 1 - m_IncludeLabelsInCatalog: 1 - m_InternalIdNamingMode: 0 - m_CacheClearBehavior: 0 - m_IncludeInBuild: 1 - m_BundledAssetProviderType: - m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider - m_ForceUniqueProvider: 0 - m_UseAssetBundleCache: 1 - m_UseAssetBundleCrc: 1 - m_UseAssetBundleCrcForCachedBundles: 1 - m_UseUWRForLocalBundles: 0 - m_Timeout: 0 - m_ChunkedTransfer: 0 - m_RedirectLimit: -1 - m_RetryCount: 0 - m_BuildPath: - m_Id: 6f064d973e68a7f4d8cc1ad3c41fc138 - m_LoadPath: - m_Id: 7427d4870fdf9bc4b9453213cf7fa1ea - m_BundleMode: 0 - m_AssetBundleProviderType: - m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider - m_BundleNaming: 0 - m_AssetLoadMode: 0 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - HeavyWhite_BundledAssetGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - HeavyWhite_BundledAssetGroupSchema.asset.meta deleted file mode 100644 index 73f703582..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - HeavyWhite_BundledAssetGroupSchema.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: b95efaab91a2c034bb5d6f02bb1afda9 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - HeavyWhite_ContentUpdateGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - HeavyWhite_ContentUpdateGroupSchema.asset deleted file mode 100644 index 7ef3eca18..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - HeavyWhite_ContentUpdateGroupSchema.asset +++ /dev/null @@ -1,16 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5834b5087d578d24c926ce20cd31e6d6, type: 3} - m_Name: Shirokuma-Shirokuma - HeavyWhite_ContentUpdateGroupSchema - m_EditorClassIdentifier: - m_Group: {fileID: 11400000, guid: c3cef6adec11d054e987a75d7a9a1716, type: 2} - m_StaticContent: 1 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - HeavyWhite_ContentUpdateGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - HeavyWhite_ContentUpdateGroupSchema.asset.meta deleted file mode 100644 index c8a809dce..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - HeavyWhite_ContentUpdateGroupSchema.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 7b1fe5c61e6f5624e8b8f3dd87a7ce8b -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - MineGod_BundledAssetGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - MineGod_BundledAssetGroupSchema.asset deleted file mode 100644 index c8aeb5a2b..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - MineGod_BundledAssetGroupSchema.asset +++ /dev/null @@ -1,45 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e5d17a21594effb4e9591490b009e7aa, type: 3} - m_Name: Shirokuma-Shirokuma - MineGod_BundledAssetGroupSchema - m_EditorClassIdentifier: - m_Group: {fileID: 11400000, guid: 7ce48e64c97ddd4478e715f8bf08dc3a, type: 2} - m_InternalBundleIdMode: 1 - m_Compression: 1 - m_IncludeAddressInCatalog: 1 - m_IncludeGUIDInCatalog: 1 - m_IncludeLabelsInCatalog: 1 - m_InternalIdNamingMode: 0 - m_CacheClearBehavior: 0 - m_IncludeInBuild: 1 - m_BundledAssetProviderType: - m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider - m_ForceUniqueProvider: 0 - m_UseAssetBundleCache: 1 - m_UseAssetBundleCrc: 1 - m_UseAssetBundleCrcForCachedBundles: 1 - m_UseUWRForLocalBundles: 0 - m_Timeout: 0 - m_ChunkedTransfer: 0 - m_RedirectLimit: -1 - m_RetryCount: 0 - m_BuildPath: - m_Id: 6f064d973e68a7f4d8cc1ad3c41fc138 - m_LoadPath: - m_Id: 7427d4870fdf9bc4b9453213cf7fa1ea - m_BundleMode: 0 - m_AssetBundleProviderType: - m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider - m_BundleNaming: 0 - m_AssetLoadMode: 0 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - MineGod_BundledAssetGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - MineGod_BundledAssetGroupSchema.asset.meta deleted file mode 100644 index f9f69d677..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - MineGod_BundledAssetGroupSchema.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: dac23b1850d64ea4a92cd1f5b128cb4b -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - MineGod_ContentUpdateGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - MineGod_ContentUpdateGroupSchema.asset deleted file mode 100644 index 3b301927c..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - MineGod_ContentUpdateGroupSchema.asset +++ /dev/null @@ -1,16 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5834b5087d578d24c926ce20cd31e6d6, type: 3} - m_Name: Shirokuma-Shirokuma - MineGod_ContentUpdateGroupSchema - m_EditorClassIdentifier: - m_Group: {fileID: 11400000, guid: 7ce48e64c97ddd4478e715f8bf08dc3a, type: 2} - m_StaticContent: 1 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - MineGod_ContentUpdateGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - MineGod_ContentUpdateGroupSchema.asset.meta deleted file mode 100644 index 97b00fe0f..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - MineGod_ContentUpdateGroupSchema.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 2902ed70a221f174b935c3de8fb1226a -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - Nullifier_BundledAssetGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - Nullifier_BundledAssetGroupSchema.asset.meta deleted file mode 100644 index 43c719372..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - Nullifier_BundledAssetGroupSchema.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f0555d3490e279042b47d3db4580ed79 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - Nullifier_ContentUpdateGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - Nullifier_ContentUpdateGroupSchema.asset.meta deleted file mode 100644 index 9acb0c4dc..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - Nullifier_ContentUpdateGroupSchema.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e2ee69a49d0ad334ba1cc77e2159580d -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - ShadowStealAway_BundledAssetGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - ShadowStealAway_BundledAssetGroupSchema.asset.meta deleted file mode 100644 index 0d408fe7e..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - ShadowStealAway_BundledAssetGroupSchema.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f149469b7db7d764f85edfae8bc053dc -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - ShadowStealAway_ContentUpdateGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - ShadowStealAway_ContentUpdateGroupSchema.asset.meta deleted file mode 100644 index d672c4aae..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - ShadowStealAway_ContentUpdateGroupSchema.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 171c258d7d10ed945aea5a10f037fae2 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - SynthPunk_BundledAssetGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - SynthPunk_BundledAssetGroupSchema.asset.meta deleted file mode 100644 index 04ff97d9e..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - SynthPunk_BundledAssetGroupSchema.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 54b37b6a246ec464499432a7e44ff060 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - SynthPunk_ContentUpdateGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - SynthPunk_ContentUpdateGroupSchema.asset.meta deleted file mode 100644 index 6d144941a..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - SynthPunk_ContentUpdateGroupSchema.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 78dc31735bc720e42a759648ebb9b9e3 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - X3Kuro_BundledAssetGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - X3Kuro_BundledAssetGroupSchema.asset deleted file mode 100644 index f18c73ed9..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - X3Kuro_BundledAssetGroupSchema.asset +++ /dev/null @@ -1,45 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e5d17a21594effb4e9591490b009e7aa, type: 3} - m_Name: Shirokuma-Shirokuma - X3Kuro_BundledAssetGroupSchema - m_EditorClassIdentifier: - m_Group: {fileID: 11400000, guid: 48d2bd45dea7166468a8d3cf14c48650, type: 2} - m_InternalBundleIdMode: 1 - m_Compression: 1 - m_IncludeAddressInCatalog: 1 - m_IncludeGUIDInCatalog: 1 - m_IncludeLabelsInCatalog: 1 - m_InternalIdNamingMode: 0 - m_CacheClearBehavior: 0 - m_IncludeInBuild: 1 - m_BundledAssetProviderType: - m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider - m_ForceUniqueProvider: 0 - m_UseAssetBundleCache: 1 - m_UseAssetBundleCrc: 1 - m_UseAssetBundleCrcForCachedBundles: 1 - m_UseUWRForLocalBundles: 0 - m_Timeout: 0 - m_ChunkedTransfer: 0 - m_RedirectLimit: -1 - m_RetryCount: 0 - m_BuildPath: - m_Id: 6f064d973e68a7f4d8cc1ad3c41fc138 - m_LoadPath: - m_Id: 7427d4870fdf9bc4b9453213cf7fa1ea - m_BundleMode: 0 - m_AssetBundleProviderType: - m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider - m_BundleNaming: 0 - m_AssetLoadMode: 0 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - X3Kuro_BundledAssetGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - X3Kuro_BundledAssetGroupSchema.asset.meta deleted file mode 100644 index fa8b4bf57..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - X3Kuro_BundledAssetGroupSchema.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 7a3fb2be824cbd940ab092e6a12e35a2 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - X3Kuro_ContentUpdateGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - X3Kuro_ContentUpdateGroupSchema.asset deleted file mode 100644 index 7aa2df9a3..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - X3Kuro_ContentUpdateGroupSchema.asset +++ /dev/null @@ -1,16 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5834b5087d578d24c926ce20cd31e6d6, type: 3} - m_Name: Shirokuma-Shirokuma - X3Kuro_ContentUpdateGroupSchema - m_EditorClassIdentifier: - m_Group: {fileID: 11400000, guid: 48d2bd45dea7166468a8d3cf14c48650, type: 2} - m_StaticContent: 1 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - X3Kuro_ContentUpdateGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - X3Kuro_ContentUpdateGroupSchema.asset.meta deleted file mode 100644 index f2cded5df..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Shirokuma-Shirokuma - X3Kuro_ContentUpdateGroupSchema.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 4b47857eed6121c4eaec45b4256ffb5b -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Shirokuma - HeavyWhite.asset b/Assets/AddressableAssetsData/AssetGroups/Shirokuma - HeavyWhite.asset deleted file mode 100644 index bc5d4940a..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Shirokuma - HeavyWhite.asset +++ /dev/null @@ -1,25 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3} - m_Name: Shirokuma - HeavyWhite - m_EditorClassIdentifier: - m_GroupName: Shirokuma - HeavyWhite - m_Data: - m_SerializedData: [] - m_GUID: 0ed833d1ad29eb547b9fc9b7c8f8e647 - m_SerializeEntries: [] - m_ReadOnly: 0 - m_Settings: {fileID: 11400000, guid: 565f539c595f0d349a171b0cd6da800e, type: 2} - m_SchemaSet: - m_Schemas: - - {fileID: 11400000, guid: 7fa00844e11fade4e8d02699d2852a3a, type: 2} - - {fileID: 11400000, guid: ccd276d018ae5e54e9eff88935b6381a, type: 2} diff --git a/Assets/AddressableAssetsData/AssetGroups/Shirokuma - HeavyWhite.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Shirokuma - HeavyWhite.asset.meta deleted file mode 100644 index 02787dc9b..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Shirokuma - HeavyWhite.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: dde6838949dfff0419b7ee3cb2edbc54 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Shirokuma - MineGod.asset b/Assets/AddressableAssetsData/AssetGroups/Shirokuma - MineGod.asset deleted file mode 100644 index 23107ff55..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Shirokuma - MineGod.asset +++ /dev/null @@ -1,25 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3} - m_Name: Shirokuma - MineGod - m_EditorClassIdentifier: - m_GroupName: Shirokuma - MineGod - m_Data: - m_SerializedData: [] - m_GUID: 4e5c04f8e22e81a4dbb4e481cf1d098d - m_SerializeEntries: [] - m_ReadOnly: 0 - m_Settings: {fileID: 11400000, guid: 565f539c595f0d349a171b0cd6da800e, type: 2} - m_SchemaSet: - m_Schemas: - - {fileID: 11400000, guid: cac35f64f7b64384f9e0757cdbd6e533, type: 2} - - {fileID: 11400000, guid: e915bb1236345d245b1c2c926e8de84b, type: 2} diff --git a/Assets/AddressableAssetsData/AssetGroups/Shirokuma - MineGod.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Shirokuma - MineGod.asset.meta deleted file mode 100644 index 31856aa03..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Shirokuma - MineGod.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 3c7ff06de1e4f7c43ba2d187b85739e1 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Shirokuma - Nullifier.asset b/Assets/AddressableAssetsData/AssetGroups/Shirokuma - Nullifier.asset deleted file mode 100644 index 1cd7b7f9a..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Shirokuma - Nullifier.asset +++ /dev/null @@ -1,25 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3} - m_Name: Shirokuma - Nullifier - m_EditorClassIdentifier: - m_GroupName: Shirokuma - Nullifier - m_Data: - m_SerializedData: [] - m_GUID: 4287127860f77724db2eded2ff5015fb - m_SerializeEntries: [] - m_ReadOnly: 0 - m_Settings: {fileID: 11400000, guid: 565f539c595f0d349a171b0cd6da800e, type: 2} - m_SchemaSet: - m_Schemas: - - {fileID: 11400000, guid: 28340ac502e34014fb888594483aac40, type: 2} - - {fileID: 11400000, guid: 99267485f4c510042bd8db041d7d2764, type: 2} diff --git a/Assets/AddressableAssetsData/AssetGroups/Shirokuma - Nullifier.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Shirokuma - Nullifier.asset.meta deleted file mode 100644 index 0392ea59b..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Shirokuma - Nullifier.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 722aa5032b73ee549930118337913515 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Shirokuma - ShadowStealAway.asset b/Assets/AddressableAssetsData/AssetGroups/Shirokuma - ShadowStealAway.asset deleted file mode 100644 index 2426cd0d9..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Shirokuma - ShadowStealAway.asset +++ /dev/null @@ -1,25 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3} - m_Name: Shirokuma - ShadowStealAway - m_EditorClassIdentifier: - m_GroupName: Shirokuma - ShadowStealAway - m_Data: - m_SerializedData: [] - m_GUID: 9d908f793ad2ba242a01920b4dd43a46 - m_SerializeEntries: [] - m_ReadOnly: 0 - m_Settings: {fileID: 11400000, guid: 565f539c595f0d349a171b0cd6da800e, type: 2} - m_SchemaSet: - m_Schemas: - - {fileID: 11400000, guid: 5e42d718350db7242a3d3665c151d141, type: 2} - - {fileID: 11400000, guid: d9383156f064c0d4e8589b0462eefa10, type: 2} diff --git a/Assets/AddressableAssetsData/AssetGroups/Shirokuma - ShadowStealAway.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Shirokuma - ShadowStealAway.asset.meta deleted file mode 100644 index 8a0056cb0..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Shirokuma - ShadowStealAway.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: fa310c8e20ed2054f99410dd533e6bb4 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Shirokuma - SynthPunk.asset b/Assets/AddressableAssetsData/AssetGroups/Shirokuma - SynthPunk.asset deleted file mode 100644 index 1f010e6d4..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Shirokuma - SynthPunk.asset +++ /dev/null @@ -1,25 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3} - m_Name: Shirokuma - SynthPunk - m_EditorClassIdentifier: - m_GroupName: Shirokuma - SynthPunk - m_Data: - m_SerializedData: [] - m_GUID: 986c8f779373fac478f5894c8d71c2a8 - m_SerializeEntries: [] - m_ReadOnly: 0 - m_Settings: {fileID: 11400000, guid: 565f539c595f0d349a171b0cd6da800e, type: 2} - m_SchemaSet: - m_Schemas: - - {fileID: 11400000, guid: f1bd295dcaba8e24b808d4aa0e7fdfec, type: 2} - - {fileID: 11400000, guid: c21cba2e83b1deb44ab84da492309109, type: 2} diff --git a/Assets/AddressableAssetsData/AssetGroups/Shirokuma - SynthPunk.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Shirokuma - SynthPunk.asset.meta deleted file mode 100644 index 647b8ea1d..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Shirokuma - SynthPunk.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 841a020a3ec32304bba027db187c00bc -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Shirokuma - Two Five Zero One.asset b/Assets/AddressableAssetsData/AssetGroups/Shirokuma - Two Five Zero One.asset deleted file mode 100644 index a1ff2e9e2..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Shirokuma - Two Five Zero One.asset +++ /dev/null @@ -1,25 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3} - m_Name: Shirokuma - Two Five Zero One - m_EditorClassIdentifier: - m_GroupName: Shirokuma - Two Five Zero One - m_Data: - m_SerializedData: [] - m_GUID: bacd8843f28d22247af74ffc0724498b - m_SerializeEntries: [] - m_ReadOnly: 0 - m_Settings: {fileID: 11400000, guid: 565f539c595f0d349a171b0cd6da800e, type: 2} - m_SchemaSet: - m_Schemas: - - {fileID: 11400000, guid: 5ccd74a5ecd084949ad598d0623fd282, type: 2} - - {fileID: 11400000, guid: bc24b3bc8e3a4f04aac1f990cfe86258, type: 2} diff --git a/Assets/AddressableAssetsData/AssetGroups/Shirokuma - Two Five Zero One.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Shirokuma - Two Five Zero One.asset.meta deleted file mode 100644 index 332c5aa05..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Shirokuma - Two Five Zero One.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 06307f292285ecc4398b15b71647cbe2 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Shirokuma - X3Kuro.asset b/Assets/AddressableAssetsData/AssetGroups/Shirokuma - X3Kuro.asset deleted file mode 100644 index 6404f2aa0..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Shirokuma - X3Kuro.asset +++ /dev/null @@ -1,25 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3} - m_Name: Shirokuma - X3Kuro - m_EditorClassIdentifier: - m_GroupName: Shirokuma - X3Kuro - m_Data: - m_SerializedData: [] - m_GUID: 048952c7ee345454f8a76161ff3dac14 - m_SerializeEntries: [] - m_ReadOnly: 0 - m_Settings: {fileID: 11400000, guid: 565f539c595f0d349a171b0cd6da800e, type: 2} - m_SchemaSet: - m_Schemas: - - {fileID: 11400000, guid: c553b22157503f947ae6e654826f59a3, type: 2} - - {fileID: 11400000, guid: 57f6f213e2fab6b4ebc05f8edd38bc4f, type: 2} diff --git a/Assets/AddressableAssetsData/AssetGroups/Shirokuma - X3Kuro.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Shirokuma - X3Kuro.asset.meta deleted file mode 100644 index 9be8b93c6..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Shirokuma - X3Kuro.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: ff6447b331f7f7348a688d8d85dc4d96 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Shirokuma-Shirokuma - 2501 - Tachikoma.asset b/Assets/AddressableAssetsData/AssetGroups/Shirokuma-Shirokuma - 2501 - Tachikoma.asset deleted file mode 100644 index e8dedeb69..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Shirokuma-Shirokuma - 2501 - Tachikoma.asset +++ /dev/null @@ -1,25 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3} - m_Name: Shirokuma-Shirokuma - 2501 - Tachikoma - m_EditorClassIdentifier: - m_GroupName: Shirokuma-Shirokuma - 2501 - Tachikoma - m_Data: - m_SerializedData: [] - m_GUID: 1f644f8c2aa0cf143af30d09ec6f2a5a - m_SerializeEntries: [] - m_ReadOnly: 0 - m_Settings: {fileID: 11400000, guid: 565f539c595f0d349a171b0cd6da800e, type: 2} - m_SchemaSet: - m_Schemas: - - {fileID: 11400000, guid: 5570c6a6533bf8e4bb36a4b968ddbaa7, type: 2} - - {fileID: 11400000, guid: dcace4d445c3e0345966d461b6925bdd, type: 2} diff --git a/Assets/AddressableAssetsData/AssetGroups/Shirokuma-Shirokuma - 2501 - Tachikoma.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Shirokuma-Shirokuma - 2501 - Tachikoma.asset.meta deleted file mode 100644 index d32b9978f..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Shirokuma-Shirokuma - 2501 - Tachikoma.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 679194e37165c774b8804fc4545349d5 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Shirokuma-Shirokuma - HeavyWhite.asset b/Assets/AddressableAssetsData/AssetGroups/Shirokuma-Shirokuma - HeavyWhite.asset deleted file mode 100644 index 94e0fdd3c..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Shirokuma-Shirokuma - HeavyWhite.asset +++ /dev/null @@ -1,25 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3} - m_Name: Shirokuma-Shirokuma - HeavyWhite - m_EditorClassIdentifier: - m_GroupName: Shirokuma-Shirokuma - HeavyWhite - m_Data: - m_SerializedData: [] - m_GUID: c3be969dd5e754449a9ab3682a6f3356 - m_SerializeEntries: [] - m_ReadOnly: 0 - m_Settings: {fileID: 11400000, guid: 565f539c595f0d349a171b0cd6da800e, type: 2} - m_SchemaSet: - m_Schemas: - - {fileID: 11400000, guid: b95efaab91a2c034bb5d6f02bb1afda9, type: 2} - - {fileID: 11400000, guid: 7b1fe5c61e6f5624e8b8f3dd87a7ce8b, type: 2} diff --git a/Assets/AddressableAssetsData/AssetGroups/Shirokuma-Shirokuma - HeavyWhite.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Shirokuma-Shirokuma - HeavyWhite.asset.meta deleted file mode 100644 index c642198de..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Shirokuma-Shirokuma - HeavyWhite.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: c3cef6adec11d054e987a75d7a9a1716 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Shirokuma-Shirokuma - MineGod.asset b/Assets/AddressableAssetsData/AssetGroups/Shirokuma-Shirokuma - MineGod.asset deleted file mode 100644 index 7edafb031..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Shirokuma-Shirokuma - MineGod.asset +++ /dev/null @@ -1,25 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3} - m_Name: Shirokuma-Shirokuma - MineGod - m_EditorClassIdentifier: - m_GroupName: Shirokuma-Shirokuma - MineGod - m_Data: - m_SerializedData: [] - m_GUID: 581643bcaf07444488f0a9bb84899294 - m_SerializeEntries: [] - m_ReadOnly: 0 - m_Settings: {fileID: 11400000, guid: 565f539c595f0d349a171b0cd6da800e, type: 2} - m_SchemaSet: - m_Schemas: - - {fileID: 11400000, guid: dac23b1850d64ea4a92cd1f5b128cb4b, type: 2} - - {fileID: 11400000, guid: 2902ed70a221f174b935c3de8fb1226a, type: 2} diff --git a/Assets/AddressableAssetsData/AssetGroups/Shirokuma-Shirokuma - MineGod.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Shirokuma-Shirokuma - MineGod.asset.meta deleted file mode 100644 index bde86fb95..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Shirokuma-Shirokuma - MineGod.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 7ce48e64c97ddd4478e715f8bf08dc3a -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Shirokuma-Shirokuma - Nullifier.asset b/Assets/AddressableAssetsData/AssetGroups/Shirokuma-Shirokuma - Nullifier.asset deleted file mode 100644 index 9da842c00..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Shirokuma-Shirokuma - Nullifier.asset +++ /dev/null @@ -1,25 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3} - m_Name: Shirokuma-Shirokuma - Nullifier - m_EditorClassIdentifier: - m_GroupName: Shirokuma-Shirokuma - Nullifier - m_Data: - m_SerializedData: [] - m_GUID: 721b737404100524fa6468a1af8e593f - m_SerializeEntries: [] - m_ReadOnly: 0 - m_Settings: {fileID: 11400000, guid: 565f539c595f0d349a171b0cd6da800e, type: 2} - m_SchemaSet: - m_Schemas: - - {fileID: 11400000, guid: f0555d3490e279042b47d3db4580ed79, type: 2} - - {fileID: 11400000, guid: e2ee69a49d0ad334ba1cc77e2159580d, type: 2} diff --git a/Assets/AddressableAssetsData/AssetGroups/Shirokuma-Shirokuma - Nullifier.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Shirokuma-Shirokuma - Nullifier.asset.meta deleted file mode 100644 index 32b8159e8..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Shirokuma-Shirokuma - Nullifier.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: d9aac78671f2edb47a6b46d2c4030bfa -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Shirokuma-Shirokuma - ShadowStealAway.asset b/Assets/AddressableAssetsData/AssetGroups/Shirokuma-Shirokuma - ShadowStealAway.asset deleted file mode 100644 index 87a194313..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Shirokuma-Shirokuma - ShadowStealAway.asset +++ /dev/null @@ -1,25 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3} - m_Name: Shirokuma-Shirokuma - ShadowStealAway - m_EditorClassIdentifier: - m_GroupName: Shirokuma-Shirokuma - ShadowStealAway - m_Data: - m_SerializedData: [] - m_GUID: 8d67fc88858c1ae429839593a4b3970f - m_SerializeEntries: [] - m_ReadOnly: 0 - m_Settings: {fileID: 11400000, guid: 565f539c595f0d349a171b0cd6da800e, type: 2} - m_SchemaSet: - m_Schemas: - - {fileID: 11400000, guid: f149469b7db7d764f85edfae8bc053dc, type: 2} - - {fileID: 11400000, guid: 171c258d7d10ed945aea5a10f037fae2, type: 2} diff --git a/Assets/AddressableAssetsData/AssetGroups/Shirokuma-Shirokuma - ShadowStealAway.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Shirokuma-Shirokuma - ShadowStealAway.asset.meta deleted file mode 100644 index 6cf861328..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Shirokuma-Shirokuma - ShadowStealAway.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: d73dcc0fa52160e42beec5cdda80fe58 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Shirokuma-Shirokuma - SynthPunk.asset b/Assets/AddressableAssetsData/AssetGroups/Shirokuma-Shirokuma - SynthPunk.asset deleted file mode 100644 index 5a6e117ff..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Shirokuma-Shirokuma - SynthPunk.asset +++ /dev/null @@ -1,25 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3} - m_Name: Shirokuma-Shirokuma - SynthPunk - m_EditorClassIdentifier: - m_GroupName: Shirokuma-Shirokuma - SynthPunk - m_Data: - m_SerializedData: [] - m_GUID: 4b9db3945bb5496478bde0e94aaf3691 - m_SerializeEntries: [] - m_ReadOnly: 0 - m_Settings: {fileID: 11400000, guid: 565f539c595f0d349a171b0cd6da800e, type: 2} - m_SchemaSet: - m_Schemas: - - {fileID: 11400000, guid: 54b37b6a246ec464499432a7e44ff060, type: 2} - - {fileID: 11400000, guid: 78dc31735bc720e42a759648ebb9b9e3, type: 2} diff --git a/Assets/AddressableAssetsData/AssetGroups/Shirokuma-Shirokuma - SynthPunk.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Shirokuma-Shirokuma - SynthPunk.asset.meta deleted file mode 100644 index 4a884c2f8..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Shirokuma-Shirokuma - SynthPunk.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 3aa0efd8be7fa424b9a35e3635a49ecf -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Shirokuma-Shirokuma - X3Kuro.asset b/Assets/AddressableAssetsData/AssetGroups/Shirokuma-Shirokuma - X3Kuro.asset deleted file mode 100644 index 3e63ea3ea..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Shirokuma-Shirokuma - X3Kuro.asset +++ /dev/null @@ -1,25 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3} - m_Name: Shirokuma-Shirokuma - X3Kuro - m_EditorClassIdentifier: - m_GroupName: Shirokuma-Shirokuma - X3Kuro - m_Data: - m_SerializedData: [] - m_GUID: d1b4fd334d2423a4bbeddea8a39a6e0d - m_SerializeEntries: [] - m_ReadOnly: 0 - m_Settings: {fileID: 11400000, guid: 565f539c595f0d349a171b0cd6da800e, type: 2} - m_SchemaSet: - m_Schemas: - - {fileID: 11400000, guid: 7a3fb2be824cbd940ab092e6a12e35a2, type: 2} - - {fileID: 11400000, guid: 4b47857eed6121c4eaec45b4256ffb5b, type: 2} diff --git a/Assets/AddressableAssetsData/AssetGroups/Shirokuma-Shirokuma - X3Kuro.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Shirokuma-Shirokuma - X3Kuro.asset.meta deleted file mode 100644 index 3be54cce1..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Shirokuma-Shirokuma - X3Kuro.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 48d2bd45dea7166468a8d3cf14c48650 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Content/Mechs/Aries/Materials/FlyInFlyOut.asset b/Assets/Content/Mechs/Aries/Materials/FlyInFlyOut.asset index 2450a0f13..8a5ac83c6 100644 --- a/Assets/Content/Mechs/Aries/Materials/FlyInFlyOut.asset +++ b/Assets/Content/Mechs/Aries/Materials/FlyInFlyOut.asset @@ -23,3 +23,4 @@ MonoBehaviour: - {fileID: 2100000, guid: ee80cbaf602ceb44e8fe9e10f9eebca7, type: 2} - {fileID: 2100000, guid: b7a8054db59e00d478b13db8f8d458af, type: 2} - {fileID: 2100000, guid: 050d198c86d7f444ea14a2f04e0978c8, type: 2} + - {fileID: 2100000, guid: 1fe8672d64e05c94ba87d16480509ca4, type: 2} diff --git a/Assets/Content/Mechs/Aries/Materials/FlyInFlyOut/Hoses.mat b/Assets/Content/Mechs/Aries/Materials/FlyInFlyOut/Hoses.mat new file mode 100644 index 000000000..80e1a1901 --- /dev/null +++ b/Assets/Content/Mechs/Aries/Materials/FlyInFlyOut/Hoses.mat @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-1464923588357674061 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 5 +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Hoses + m_Shader: {fileID: -6465566751694194690, guid: 6e321fdac3365444bbb1429cfbd45873, + type: 3} + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 2 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 98a4e699c2555544b8e416c4834e7643, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 2800000, guid: 3074469026854b94ba996340f7be82f4, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 2800000, guid: dce7c13b3775f084e8de56fc9f919729, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _Emissive_Intensity: 0 + - _QueueControl: 0 + - _QueueOffset: 0 + - _Roughness_Intensity: 0.5 + m_Colors: [] + m_BuildTextureStacks: [] diff --git a/Assets/Content/Weapons/Archon Miltech/BFG/Materials/ReadyToQuench/BFG.mat.meta b/Assets/Content/Mechs/Aries/Materials/FlyInFlyOut/Hoses.mat.meta similarity index 79% rename from Assets/Content/Weapons/Archon Miltech/BFG/Materials/ReadyToQuench/BFG.mat.meta rename to Assets/Content/Mechs/Aries/Materials/FlyInFlyOut/Hoses.mat.meta index e4ac7f1ad..55e7d95ac 100644 --- a/Assets/Content/Weapons/Archon Miltech/BFG/Materials/ReadyToQuench/BFG.mat.meta +++ b/Assets/Content/Mechs/Aries/Materials/FlyInFlyOut/Hoses.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: eb4ecca9acb9a6d4890ba2cdcfff27ed +guid: 1fe8672d64e05c94ba87d16480509ca4 NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 diff --git a/Assets/Content/Mechs/Aries/Materials/HighCaliber.asset b/Assets/Content/Mechs/Aries/Materials/HighCaliber.asset index c78386de5..1c9561b8c 100644 --- a/Assets/Content/Mechs/Aries/Materials/HighCaliber.asset +++ b/Assets/Content/Mechs/Aries/Materials/HighCaliber.asset @@ -23,3 +23,4 @@ MonoBehaviour: - {fileID: 2100000, guid: 77d5c410d5d10bf4384b3ffa247a5e57, type: 2} - {fileID: 2100000, guid: d453807f0c6bde045971c4b2d83dbed6, type: 2} - {fileID: 2100000, guid: 940d1b746a9946942b9ad5d9037bdcda, type: 2} + - {fileID: 2100000, guid: 53f5da89e288952468dadd29af667cb2, type: 2} diff --git a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/DaisonSleek/AM_GranadeLauncher.mat b/Assets/Content/Mechs/Aries/Materials/HighCaliber/Hoses.mat similarity index 85% rename from Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/DaisonSleek/AM_GranadeLauncher.mat rename to Assets/Content/Mechs/Aries/Materials/HighCaliber/Hoses.mat index dedcf9fe7..8ac979a1c 100644 --- a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/DaisonSleek/AM_GranadeLauncher.mat +++ b/Assets/Content/Mechs/Aries/Materials/HighCaliber/Hoses.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: AM_GranadeLauncher + m_Name: Hoses m_Shader: {fileID: -6465566751694194690, guid: 6e321fdac3365444bbb1429cfbd45873, type: 3} m_ValidKeywords: [] @@ -22,11 +22,11 @@ Material: serializedVersion: 3 m_TexEnvs: - _BaseMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 69e959456ab0f45429caf57b554fb38e, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BumpMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 74498f05f4fe4324d9766966f8bbefbb, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _EmissionMap: @@ -34,7 +34,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _OcclusionMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 0076ef4299a60094e93054c45fb97fdb, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - unity_Lightmaps: @@ -57,7 +57,7 @@ Material: - _Roughness_Intensity: 0.5 m_Colors: [] m_BuildTextureStacks: [] ---- !u!114 &3045062758406656421 +--- !u!114 &592808776929805844 MonoBehaviour: m_ObjectHideFlags: 11 m_CorrespondingSourceObject: {fileID: 0} diff --git a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/ArchonGunmetal/AM_GranadeLauncher.mat.meta b/Assets/Content/Mechs/Aries/Materials/HighCaliber/Hoses.mat.meta similarity index 79% rename from Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/ArchonGunmetal/AM_GranadeLauncher.mat.meta rename to Assets/Content/Mechs/Aries/Materials/HighCaliber/Hoses.mat.meta index a563feb9f..a87797ccc 100644 --- a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/ArchonGunmetal/AM_GranadeLauncher.mat.meta +++ b/Assets/Content/Mechs/Aries/Materials/HighCaliber/Hoses.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 089f5c1faf422934da523611164e45b9 +guid: 53f5da89e288952468dadd29af667cb2 NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 diff --git a/Assets/Content/Mechs/Aries/Materials/MartianSoil.asset b/Assets/Content/Mechs/Aries/Materials/MartianSoil.asset index 5d18bfcc2..88bc8cd10 100644 --- a/Assets/Content/Mechs/Aries/Materials/MartianSoil.asset +++ b/Assets/Content/Mechs/Aries/Materials/MartianSoil.asset @@ -23,3 +23,4 @@ MonoBehaviour: - {fileID: 2100000, guid: 8f7b0d62af6e30c4895a5014d806c7b8, type: 2} - {fileID: 2100000, guid: 74a030ef47b052e4199bf536a0eb36a6, type: 2} - {fileID: 2100000, guid: 6f70bbc3a107bf84bb7ad6daea4fe7e6, type: 2} + - {fileID: 2100000, guid: 7c3383f8b943f6943943bb60a0a8ee46, type: 2} diff --git a/Assets/Content/Mechs/Aries/Materials/MartianSoil/Hoses.mat b/Assets/Content/Mechs/Aries/Materials/MartianSoil/Hoses.mat new file mode 100644 index 000000000..d0cb693de --- /dev/null +++ b/Assets/Content/Mechs/Aries/Materials/MartianSoil/Hoses.mat @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-5269670039690760567 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 5 +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Hoses + m_Shader: {fileID: -6465566751694194690, guid: 6e321fdac3365444bbb1429cfbd45873, + type: 3} + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 2 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 08ad20bf82721c14b9cd62001d2daca2, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 2800000, guid: fe1b4372d5d516b42961073068c29b37, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 2800000, guid: 27368d9753efc7f4b8a00349a119df37, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _Emissive_Intensity: 0 + - _QueueControl: 0 + - _QueueOffset: 0 + - _Roughness_Intensity: 0.5 + m_Colors: [] + m_BuildTextureStacks: [] diff --git a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/Bullion/AM_GranadeLauncher.mat.meta b/Assets/Content/Mechs/Aries/Materials/MartianSoil/Hoses.mat.meta similarity index 79% rename from Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/Bullion/AM_GranadeLauncher.mat.meta rename to Assets/Content/Mechs/Aries/Materials/MartianSoil/Hoses.mat.meta index d55781ab3..a56c75f57 100644 --- a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/Bullion/AM_GranadeLauncher.mat.meta +++ b/Assets/Content/Mechs/Aries/Materials/MartianSoil/Hoses.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 015c75a7615b14f40ac5f1d8a02fc207 +guid: 7c3383f8b943f6943943bb60a0a8ee46 NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 diff --git a/Assets/Content/Mechs/Aries/Materials/OsmiumScream.asset b/Assets/Content/Mechs/Aries/Materials/OsmiumScream.asset index 175c8da08..74214d605 100644 --- a/Assets/Content/Mechs/Aries/Materials/OsmiumScream.asset +++ b/Assets/Content/Mechs/Aries/Materials/OsmiumScream.asset @@ -23,3 +23,4 @@ MonoBehaviour: - {fileID: 2100000, guid: f1d876bc08971264bbbda19d66535c00, type: 2} - {fileID: 2100000, guid: f76a1ff3a2e3ad54fa524782acb59851, type: 2} - {fileID: 2100000, guid: 683ae28dce8620f45b0e1176a6d93d67, type: 2} + - {fileID: 2100000, guid: d7f11181ccf04da468f4e4fcfa079555, type: 2} diff --git a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/ArchonGunmetal/AM_GranadeLauncher.mat b/Assets/Content/Mechs/Aries/Materials/OsmiumScream/Hoses.mat similarity index 85% rename from Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/ArchonGunmetal/AM_GranadeLauncher.mat rename to Assets/Content/Mechs/Aries/Materials/OsmiumScream/Hoses.mat index 221f1eeb0..79dc248ed 100644 --- a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/ArchonGunmetal/AM_GranadeLauncher.mat +++ b/Assets/Content/Mechs/Aries/Materials/OsmiumScream/Hoses.mat @@ -1,18 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!114 &-8346296253278537631 -MonoBehaviour: - m_ObjectHideFlags: 11 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} - m_Name: - m_EditorClassIdentifier: - version: 5 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -20,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: AM_GranadeLauncher + m_Name: Hoses m_Shader: {fileID: -6465566751694194690, guid: 6e321fdac3365444bbb1429cfbd45873, type: 3} m_ValidKeywords: [] @@ -35,11 +22,11 @@ Material: serializedVersion: 3 m_TexEnvs: - _BaseMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 906596536267b67488501fe49edd1f5b, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BumpMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: f484dbcff23c5c041931128b9d4871eb, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _EmissionMap: @@ -47,7 +34,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _OcclusionMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 724f0763295cf86479b148f6dc12721c, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - unity_Lightmaps: @@ -70,3 +57,16 @@ Material: - _Roughness_Intensity: 0.5 m_Colors: [] m_BuildTextureStacks: [] +--- !u!114 &2730352685501000221 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 5 diff --git a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/Code of Chivalry/AM_GranadeLauncher.mat.meta b/Assets/Content/Mechs/Aries/Materials/OsmiumScream/Hoses.mat.meta similarity index 79% rename from Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/Code of Chivalry/AM_GranadeLauncher.mat.meta rename to Assets/Content/Mechs/Aries/Materials/OsmiumScream/Hoses.mat.meta index 73078eef2..f371ebcec 100644 --- a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/Code of Chivalry/AM_GranadeLauncher.mat.meta +++ b/Assets/Content/Mechs/Aries/Materials/OsmiumScream/Hoses.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 766253edf4ae8ef448e0e2dc39c3a64a +guid: d7f11181ccf04da468f4e4fcfa079555 NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 diff --git a/Assets/Content/Mechs/Aries/Materials/PilbaraDust.asset b/Assets/Content/Mechs/Aries/Materials/PilbaraDust.asset index a6915ee5f..1356c4973 100644 --- a/Assets/Content/Mechs/Aries/Materials/PilbaraDust.asset +++ b/Assets/Content/Mechs/Aries/Materials/PilbaraDust.asset @@ -23,3 +23,4 @@ MonoBehaviour: - {fileID: 2100000, guid: 9c63c8e74213040c28faac4f1d1bbe9e, type: 2} - {fileID: 2100000, guid: fe9d335ed4e924c9c8523cb5b20c45e0, type: 2} - {fileID: 2100000, guid: ef8475330d4f9410ea167de339337adf, type: 2} + - {fileID: 2100000, guid: 2d81e571d8ac73c41b360e03ddbdda51, type: 2} diff --git a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/Bullion/AM_GranadeLauncher.mat b/Assets/Content/Mechs/Aries/Materials/PilbaraDust/Hoses.mat similarity index 85% rename from Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/Bullion/AM_GranadeLauncher.mat rename to Assets/Content/Mechs/Aries/Materials/PilbaraDust/Hoses.mat index 009209237..754299b42 100644 --- a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/Bullion/AM_GranadeLauncher.mat +++ b/Assets/Content/Mechs/Aries/Materials/PilbaraDust/Hoses.mat @@ -1,18 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!114 &-2122349613182186990 -MonoBehaviour: - m_ObjectHideFlags: 11 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} - m_Name: - m_EditorClassIdentifier: - version: 5 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -20,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: AM_GranadeLauncher + m_Name: Hoses m_Shader: {fileID: -6465566751694194690, guid: 6e321fdac3365444bbb1429cfbd45873, type: 3} m_ValidKeywords: [] @@ -35,11 +22,11 @@ Material: serializedVersion: 3 m_TexEnvs: - _BaseMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: d60ccda22f58c2d4c8b9faa2ecb6934e, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BumpMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 04e137d5d7ae8cc4291a2b6fd3217b2a, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _EmissionMap: @@ -47,7 +34,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _OcclusionMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: fee6dd6cbeb35e24fb2c4de7a9e3de44, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - unity_Lightmaps: @@ -70,3 +57,16 @@ Material: - _Roughness_Intensity: 0.5 m_Colors: [] m_BuildTextureStacks: [] +--- !u!114 &5739642912167914416 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 5 diff --git a/Assets/Content/Mechs/Aries/Materials/PilbaraDust/Hoses.mat.meta b/Assets/Content/Mechs/Aries/Materials/PilbaraDust/Hoses.mat.meta new file mode 100644 index 000000000..cf553b46f --- /dev/null +++ b/Assets/Content/Mechs/Aries/Materials/PilbaraDust/Hoses.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2d81e571d8ac73c41b360e03ddbdda51 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Mechs/Aries/Materials/PrometheanGold.asset b/Assets/Content/Mechs/Aries/Materials/PrometheanGold.asset index f9d723946..8a7d44a5f 100644 --- a/Assets/Content/Mechs/Aries/Materials/PrometheanGold.asset +++ b/Assets/Content/Mechs/Aries/Materials/PrometheanGold.asset @@ -18,8 +18,9 @@ MonoBehaviour: - {fileID: 2100000, guid: 8e05af4359ebb94448ce577c1c2ca1d8, type: 2} - {fileID: 2100000, guid: b23e63efdfae061418e159ee6be96894, type: 2} - {fileID: 2100000, guid: 38e0daa731464c04db8f4e2f74cdbf32, type: 2} - - {fileID: 2100000, guid: 6261a394027616b449ee0537579e571a, type: 2} + - {fileID: 2100000, guid: dd957cf181e5e5e45baa9ec4ba5b2d42, type: 2} - {fileID: 2100000, guid: 74ecf06254fdf18468d3edc5867eb342, type: 2} - {fileID: 2100000, guid: 075354a0b73be8d4585ee8090e6351fc, type: 2} - {fileID: 2100000, guid: f1ea757123b68cb44ba8f5c3a27e22ca, type: 2} - {fileID: 2100000, guid: a61588b32d8736d41a485d4a62ca81b6, type: 2} + - {fileID: 2100000, guid: 3d665ad83b1b6cf408bd7e9e99d13f43, type: 2} diff --git a/Assets/Content/Weapons/Archon Miltech/BFG/Materials/ReadyToQuench/BFG.mat b/Assets/Content/Mechs/Aries/Materials/PrometheanGold/Hoses.mat similarity index 52% rename from Assets/Content/Weapons/Archon Miltech/BFG/Materials/ReadyToQuench/BFG.mat rename to Assets/Content/Mechs/Aries/Materials/PrometheanGold/Hoses.mat index 226233aab..20b4e7886 100644 --- a/Assets/Content/Weapons/Archon Miltech/BFG/Materials/ReadyToQuench/BFG.mat +++ b/Assets/Content/Mechs/Aries/Materials/PrometheanGold/Hoses.mat @@ -7,12 +7,12 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: BFG - m_Shader: {fileID: -6465566751694194690, guid: 6e321fdac3365444bbb1429cfbd45873, + m_Name: Hoses + m_Shader: {fileID: -6465566751694194690, guid: 3f2ab9478bc882b438d59946d78aef4e, type: 3} m_ValidKeywords: [] m_InvalidKeywords: [] - m_LightmapFlags: 4 + m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 @@ -21,48 +21,48 @@ Material: m_SavedProperties: serializedVersion: 3 m_TexEnvs: - - _BaseMap: - m_Texture: {fileID: 2800000, guid: 8c61b41db4d67584b8a996c55f2b5b72, type: 3} + - _AORM: + m_Texture: {fileID: 2800000, guid: 6ff1bd19815a62b469a5f15605b39a3c, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - - _BumpMap: - m_Texture: {fileID: 2800000, guid: 6ca62f75e301dc84f857086a7679ac36, type: 3} + - _AlbedoTransparency: + m_Texture: {fileID: 2800000, guid: f87bd9ef0042ab948b708b2b70140e64, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} + - _BaseMap: + m_Texture: {fileID: 2800000, guid: f87bd9ef0042ab948b708b2b70140e64, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} + - _Base_Emission: + m_Texture: {fileID: 2800000, guid: 76da517059bf97e47852f4ed8f0a99c6, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} + - _BumpMap: + m_Texture: {fileID: 2800000, guid: f8d999bf4adbcdf4dacba68aec0a8eeb, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _EmissionMap: - m_Texture: {fileID: 2800000, guid: feda148d0f2d8fc4dbc9bff7b0285a31, type: 3} + m_Texture: {fileID: 2800000, guid: 76da517059bf97e47852f4ed8f0a99c6, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - - _MainTex: + - _Gradient_Normal: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} + - _Gradient_Texture: + m_Texture: {fileID: 2800000, guid: 2027a4ba04f1fe7429de07a83ecb803a, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 2800000, guid: c696286eaf309aa48b7a1309dbac7a5c, type: 3} + - _Normal: + m_Texture: {fileID: 2800000, guid: f8d999bf4adbcdf4dacba68aec0a8eeb, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} + - _OcclusionMap: + m_Texture: {fileID: 2800000, guid: 6ff1bd19815a62b469a5f15605b39a3c, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - - _SpecGlossMap: - m_Texture: {fileID: 0} + - _Rolling_Emissive_Mask: + m_Texture: {fileID: 2800000, guid: 54761267d7c02a645a79b34601b8506e, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - unity_Lightmaps: @@ -79,42 +79,29 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - - _AlphaClip: 0 - - _Blend: 0 - - _BumpScale: 1 - - _ClearCoatMask: 0 - - _ClearCoatSmoothness: 0 - - _Cull: 2 - - _Cutoff: 0.5 - - _DetailAlbedoMapScale: 1 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 + - _Base_Emissive_Intensity: 0 + - _Base_Normal_Intensity: 1 - _Emissive_Intensity: 1 - - _EnvironmentReflections: 1 - - _GlossMapScale: 0 - - _Glossiness: 0 - - _GlossyReflections: 0 - - _Metallic: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.005 + - _Gradient_Normal_Intensity: 0 + - _Gradient_Normal_Speed_Multiplier: 0 + - _Gradient_Scale: 0 + - _Metallic_Intensity: 1 + - _Normal_Blend_Strength: 0 - _QueueControl: 0 - _QueueOffset: 0 - - _ReceiveShadows: 1 - - _Roughness_Intensity: 0.5 - - _Smoothness: 0.5 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _Surface: 0 - - _WorkflowMode: 1 - - _ZWrite: 1 + - _Rolling_Emissive_Intensity: 50 + - _Rolling_Emissive_Mask_Contrast: 1 + - _Rolling_Emissive_Secondary_Intensity: 50 + - _Rolling_Emissive_Secondary_Rotation: 90 + - _Rolling_Emissive_Secondary_Time_Shift: 2 + - _Rolling_Emissive_Speed: 0.2 + - _Roughness_Intensity: 0.6 m_Colors: - - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + - _Base_Emissive_Tint: {r: 1, g: 0.73333335, b: 0, a: 0} + - _Rolling_Emissive_Second_Tint: {r: 1, g: 0.19215687, b: 0, a: 0} + - _Rolling_Emissive_Tint: {r: 1, g: 0.52156866, b: 0, a: 0} m_BuildTextureStacks: [] ---- !u!114 &4955491782424181478 +--- !u!114 &2869177243056955934 MonoBehaviour: m_ObjectHideFlags: 11 m_CorrespondingSourceObject: {fileID: 0} diff --git a/Assets/Content/Mechs/Aries/Materials/PrometheanGold/Hoses.mat.meta b/Assets/Content/Mechs/Aries/Materials/PrometheanGold/Hoses.mat.meta new file mode 100644 index 000000000..8bce100c3 --- /dev/null +++ b/Assets/Content/Mechs/Aries/Materials/PrometheanGold/Hoses.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3d665ad83b1b6cf408bd7e9e99d13f43 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Mechs/Aries/Materials/SovereignHill.asset b/Assets/Content/Mechs/Aries/Materials/SovereignHill.asset index 6b63dfa80..db258fff1 100644 --- a/Assets/Content/Mechs/Aries/Materials/SovereignHill.asset +++ b/Assets/Content/Mechs/Aries/Materials/SovereignHill.asset @@ -23,3 +23,4 @@ MonoBehaviour: - {fileID: 2100000, guid: aee6365bab865394fa79f6d0b8674108, type: 2} - {fileID: 2100000, guid: 0d9a06cab1190ea47a56ace01eda7f64, type: 2} - {fileID: 2100000, guid: 858839f95185e4648a1d9c098bec6b8b, type: 2} + - {fileID: 2100000, guid: b969b17b3d0390142962398eeb913a20, type: 2} diff --git a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/Code of Chivalry/AM_GranadeLauncher.mat b/Assets/Content/Mechs/Aries/Materials/SovereignHill/Hoses.mat similarity index 85% rename from Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/Code of Chivalry/AM_GranadeLauncher.mat rename to Assets/Content/Mechs/Aries/Materials/SovereignHill/Hoses.mat index 5412fa831..e31b6d685 100644 --- a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/Code of Chivalry/AM_GranadeLauncher.mat +++ b/Assets/Content/Mechs/Aries/Materials/SovereignHill/Hoses.mat @@ -1,18 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!114 &-7262815551318494697 -MonoBehaviour: - m_ObjectHideFlags: 11 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} - m_Name: - m_EditorClassIdentifier: - version: 5 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -20,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: AM_GranadeLauncher + m_Name: Hoses m_Shader: {fileID: -6465566751694194690, guid: 6e321fdac3365444bbb1429cfbd45873, type: 3} m_ValidKeywords: [] @@ -35,11 +22,11 @@ Material: serializedVersion: 3 m_TexEnvs: - _BaseMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 60163bedb877f88479e4962dd5fb4313, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BumpMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 80cefc6419d4fbd4e988c9e8bf763f2d, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _EmissionMap: @@ -47,7 +34,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _OcclusionMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 9f90c852a234a5e47943bc2f9a999c50, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - unity_Lightmaps: @@ -70,3 +57,16 @@ Material: - _Roughness_Intensity: 0.5 m_Colors: [] m_BuildTextureStacks: [] +--- !u!114 &5690931402020697662 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 5 diff --git a/Assets/Content/Mechs/Aries/Materials/SovereignHill/Hoses.mat.meta b/Assets/Content/Mechs/Aries/Materials/SovereignHill/Hoses.mat.meta new file mode 100644 index 000000000..228dd76e3 --- /dev/null +++ b/Assets/Content/Mechs/Aries/Materials/SovereignHill/Hoses.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b969b17b3d0390142962398eeb913a20 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Mechs/Aries/Materials/SovereignHill/LeftLeg.mat b/Assets/Content/Mechs/Aries/Materials/SovereignHill/LeftLeg.mat index e96176751..b23fcbd40 100644 --- a/Assets/Content/Mechs/Aries/Materials/SovereignHill/LeftLeg.mat +++ b/Assets/Content/Mechs/Aries/Materials/SovereignHill/LeftLeg.mat @@ -35,19 +35,19 @@ Material: serializedVersion: 3 m_TexEnvs: - _BaseMap: - m_Texture: {fileID: 2800000, guid: 3fa48aa7cf1ac02499f3cfa6a4891bc7, type: 3} + m_Texture: {fileID: 2800000, guid: ae476b86514706c47bb0036bf12513ed, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BumpMap: - m_Texture: {fileID: 2800000, guid: 08b32c2f0bfa22f4493612f8408cbacc, type: 3} + m_Texture: {fileID: 2800000, guid: 06dc7c083d8905247b7922855f91a750, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _EmissionMap: - m_Texture: {fileID: 2800000, guid: 3626b5a547a106b43983a29e684c5a2f, type: 3} + m_Texture: {fileID: 2800000, guid: 0403cf49fb4c9514980e40e2b8c99c80, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _OcclusionMap: - m_Texture: {fileID: 2800000, guid: 216ea8002f6196145bcaa9874058dd3a, type: 3} + m_Texture: {fileID: 2800000, guid: 5a52b7e49736d264cbe9ada07c241a25, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - unity_Lightmaps: diff --git a/Assets/Content/Player/InitialLoading.prefab b/Assets/Content/Player/InitialLoading.prefab index b7daf7341..394b492cf 100644 --- a/Assets/Content/Player/InitialLoading.prefab +++ b/Assets/Content/Player/InitialLoading.prefab @@ -785,7 +785,7 @@ MonoBehaviour: m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0} m_ColorMultiplier: 1 m_FadeDuration: 0.1 m_SpriteState: @@ -799,7 +799,7 @@ MonoBehaviour: m_PressedTrigger: Pressed m_SelectedTrigger: Selected m_DisabledTrigger: Disabled - m_Interactable: 1 + m_Interactable: 0 m_TargetGraphic: {fileID: 6872516661418699813} m_FillRect: {fileID: 4357929424863541115} m_HandleRect: {fileID: 6702232645531253029} diff --git a/Assets/Content/Player/Player.prefab b/Assets/Content/Player/Player.prefab index 7163d35a8..89f4e76ea 100644 --- a/Assets/Content/Player/Player.prefab +++ b/Assets/Content/Player/Player.prefab @@ -1379,8 +1379,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6ac3f9ee8eaab944c8cb33b9607d2ab3, type: 3} m_Name: m_EditorClassIdentifier: - mixer: {fileID: 24100000, guid: 6030a6e528f25fb4c889c453e8368ada, type: 2} - volumeTypes: 1 + preferenceType: 2 slider: {fileID: 7477993431731113667} textSliderValue: {fileID: 7293421960193844513} --- !u!1 &2529855418179373436 @@ -3447,6 +3446,7 @@ MonoBehaviour: RotationSpeed: 1 SpeedChangeRate: 50 JumpHeight: 0.5 + SprintJumpHeight: 1.5 Gravity: -15 JumpTimeout: 0.1 FallTimeout: 0.15 @@ -3617,7 +3617,9 @@ Transform: m_LocalPosition: {x: 0, y: 1.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [{fileID: 4202415858163844564}, {fileID: 3035775801944715152}] + m_Children: + - {fileID: 4202415858163844564} + - {fileID: 3035775801944715152} m_Father: {fileID: 5955572307729721532} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -4024,6 +4026,7 @@ GameObject: m_Component: - component: {fileID: 2479740920755452568} - component: {fileID: 8583767581441973817} + - component: {fileID: 1018689474740527303} m_Layer: 5 m_Name: Sensitivity Control m_TagString: Untagged @@ -4104,31 +4107,22 @@ MonoBehaviour: m_Value: 1 m_OnValueChanged: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 5559177617585130688} - m_TargetAssemblyTypeName: SliderValueToText, SupremacyHangar.Runtime - m_MethodName: ShowSliderValue - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - - m_Target: {fileID: 4485854370576264475} - m_TargetAssemblyTypeName: SupremacyHangar.Runtime.FirstPersonController, SupremacyHangar.Runtime - m_MethodName: set_UpdateRotationSpeed - m_Mode: 0 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 + m_Calls: [] +--- !u!114 &1018689474740527303 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6728607153278198225} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6ac3f9ee8eaab944c8cb33b9607d2ab3, type: 3} + m_Name: + m_EditorClassIdentifier: + preferenceType: 0 + slider: {fileID: 8583767581441973817} + textSliderValue: {fileID: 5008615263489658438} --- !u!1 &6764979349556853993 GameObject: m_ObjectHideFlags: 0 @@ -4273,7 +4267,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6764979349556853993} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 3246b90adf4d11a4c84e0aab445a24a6, type: 3} m_Name: diff --git a/Assets/Content/Silo/Elevator.prefab b/Assets/Content/Silo/Elevator.prefab index de2d3552b..f42e0f34f 100644 --- a/Assets/Content/Silo/Elevator.prefab +++ b/Assets/Content/Silo/Elevator.prefab @@ -416,6 +416,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: -8113099759198220430, guid: 243ac1399120f43abb65e1ea2257b070, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.89 + objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: 243ac1399120f43abb65e1ea2257b070, type: 3} propertyPath: m_Name diff --git a/Assets/Content/Silo/Hangar_Silo_Left.prefab b/Assets/Content/Silo/Hangar_Silo_Left.prefab index e3820bc86..8007254dd 100644 --- a/Assets/Content/Silo/Hangar_Silo_Left.prefab +++ b/Assets/Content/Silo/Hangar_Silo_Left.prefab @@ -1733,6 +1733,11 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 1 objectReference: {fileID: 0} + - target: {fileID: -3027905732983813231, guid: f57a02f03d3174ab3a9519bf5bfab176, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: -2917231245451794709, guid: f57a02f03d3174ab3a9519bf5bfab176, type: 3} propertyPath: m_Materials.Array.data[0] @@ -2045,6 +2050,7 @@ PrefabInstance: - {fileID: -5114316773070438937, guid: f57a02f03d3174ab3a9519bf5bfab176, type: 3} - {fileID: 2152104820251900905, guid: f57a02f03d3174ab3a9519bf5bfab176, type: 3} - {fileID: 48959343086590978, guid: f57a02f03d3174ab3a9519bf5bfab176, type: 3} + - {fileID: -3027905732983813231, guid: f57a02f03d3174ab3a9519bf5bfab176, type: 3} m_SourcePrefab: {fileID: 100100000, guid: f57a02f03d3174ab3a9519bf5bfab176, type: 3} --- !u!1 &73998147356384971 stripped GameObject: @@ -2246,6 +2252,26 @@ MeshCollider: m_Convex: 1 m_CookingOptions: 30 m_Mesh: {fileID: 8494710361033483254, guid: f57a02f03d3174ab3a9519bf5bfab176, type: 3} +--- !u!1 &1257123749582088671 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -3205499302806455796, guid: f57a02f03d3174ab3a9519bf5bfab176, + type: 3} + m_PrefabInstance: {fileID: 4823905222428021715} + m_PrefabAsset: {fileID: 0} +--- !u!64 &9143596193358148562 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1257123749582088671} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: -4193766019843010931, guid: f57a02f03d3174ab3a9519bf5bfab176, type: 3} --- !u!1 &1289212383173270226 stripped GameObject: m_CorrespondingSourceObject: {fileID: -3236460952984844031, guid: f57a02f03d3174ab3a9519bf5bfab176, diff --git a/Assets/Content/Silo/Hangar_Silo_Right BC.prefab b/Assets/Content/Silo/Hangar_Silo_Right BC.prefab index 00c295368..cf7549199 100644 --- a/Assets/Content/Silo/Hangar_Silo_Right BC.prefab +++ b/Assets/Content/Silo/Hangar_Silo_Right BC.prefab @@ -487,7 +487,7 @@ PrefabInstance: - target: {fileID: 4306887690906533964, guid: 529641181e468564ebb8e29e94740055, type: 3} propertyPath: m_LocalPosition.y - value: 0.01 + value: 0.02 objectReference: {fileID: 0} - target: {fileID: 4306887690906533964, guid: 529641181e468564ebb8e29e94740055, type: 3} diff --git a/Assets/Content/Silo/Hangar_Silo_Right RM.prefab b/Assets/Content/Silo/Hangar_Silo_Right RM.prefab index 85fb3fdf3..c025a4f4c 100644 --- a/Assets/Content/Silo/Hangar_Silo_Right RM.prefab +++ b/Assets/Content/Silo/Hangar_Silo_Right RM.prefab @@ -20,7 +20,7 @@ PrefabInstance: - target: {fileID: 4306887690906533964, guid: 529641181e468564ebb8e29e94740055, type: 3} propertyPath: m_LocalPosition.y - value: 0.01 + value: 0.02 objectReference: {fileID: 0} - target: {fileID: 4306887690906533964, guid: 529641181e468564ebb8e29e94740055, type: 3} diff --git a/Assets/Content/Silo/Hangar_Silo_Right Zai.prefab b/Assets/Content/Silo/Hangar_Silo_Right Zai.prefab index 91669a47f..f33d54fd8 100644 --- a/Assets/Content/Silo/Hangar_Silo_Right Zai.prefab +++ b/Assets/Content/Silo/Hangar_Silo_Right Zai.prefab @@ -1310,7 +1310,7 @@ PrefabInstance: - target: {fileID: 4306887690906533964, guid: 529641181e468564ebb8e29e94740055, type: 3} propertyPath: m_LocalPosition.y - value: 0.01 + value: 0.02 objectReference: {fileID: 0} - target: {fileID: 4306887690906533964, guid: 529641181e468564ebb8e29e94740055, type: 3} diff --git a/Assets/Content/Silo/Hangar_Silo_Right.prefab b/Assets/Content/Silo/Hangar_Silo_Right.prefab index 850c2a120..f28ea19e9 100644 --- a/Assets/Content/Silo/Hangar_Silo_Right.prefab +++ b/Assets/Content/Silo/Hangar_Silo_Right.prefab @@ -2338,6 +2338,11 @@ PrefabInstance: propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: -3027905732983813231, guid: ff01ddb75b74d43c793f9ef2e5f2114f, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: -2917231245451794709, guid: ff01ddb75b74d43c793f9ef2e5f2114f, type: 3} propertyPath: m_Materials.Array.data[0] @@ -2955,6 +2960,7 @@ PrefabInstance: - {fileID: -5114316773070438937, guid: ff01ddb75b74d43c793f9ef2e5f2114f, type: 3} - {fileID: 2152104820251900905, guid: ff01ddb75b74d43c793f9ef2e5f2114f, type: 3} - {fileID: 48959343086590978, guid: ff01ddb75b74d43c793f9ef2e5f2114f, type: 3} + - {fileID: -3027905732983813231, guid: ff01ddb75b74d43c793f9ef2e5f2114f, type: 3} m_SourcePrefab: {fileID: 100100000, guid: ff01ddb75b74d43c793f9ef2e5f2114f, type: 3} --- !u!1 &111782956441950876 stripped GameObject: @@ -3022,6 +3028,26 @@ MeshCollider: m_Convex: 1 m_CookingOptions: 30 m_Mesh: {fileID: 8494710361033483254, guid: ff01ddb75b74d43c793f9ef2e5f2114f, type: 3} +--- !u!1 &682717599973040356 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -3205499302806455796, guid: ff01ddb75b74d43c793f9ef2e5f2114f, + type: 3} + m_PrefabInstance: {fileID: 6555630634301758184} + m_PrefabAsset: {fileID: 0} +--- !u!64 &3820646678815817443 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 682717599973040356} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: -4193766019843010931, guid: ff01ddb75b74d43c793f9ef2e5f2114f, type: 3} --- !u!1 &715932415076537321 stripped GameObject: m_CorrespondingSourceObject: {fileID: -3236460952984844031, guid: ff01ddb75b74d43c793f9ef2e5f2114f, diff --git a/Assets/Content/Silo/MechElevator.prefab b/Assets/Content/Silo/MechElevator.prefab index 3fd4c6df4..40f632a96 100644 --- a/Assets/Content/Silo/MechElevator.prefab +++ b/Assets/Content/Silo/MechElevator.prefab @@ -42,6 +42,7 @@ GameObject: - component: {fileID: 502131707286467970} - component: {fileID: 5471961846238418165} - component: {fileID: 6103409504894073598} + - component: {fileID: 2672635690420332097} m_Layer: 0 m_Name: MechElevator m_TagString: Untagged @@ -181,6 +182,19 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 +--- !u!65 &2672635690420332097 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 864189950081158655} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 47, y: 1.211236, z: 44.741096} + m_Center: {x: 0, y: 0.40561795, z: 0.06925678} --- !u!1001 &8356563355702529834 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Content/Silo/MechSilo_Left.fbx b/Assets/Content/Silo/MechSilo_Left.fbx index bbf5c70a2..e4bb8130b 100644 --- a/Assets/Content/Silo/MechSilo_Left.fbx +++ b/Assets/Content/Silo/MechSilo_Left.fbx @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1de66e00899a39d2939a43a91ae4584d075b08c4a193e8c9398aeec0aefbbc17 -size 1224992 +oid sha256:19b35272c6606167c88d789b8a2d81b6409b1562637e82bff917b3f5ece52469 +size 1229136 diff --git a/Assets/Content/Silo/MechSilo_Right.fbx b/Assets/Content/Silo/MechSilo_Right.fbx index e7647be2b..0753c870e 100644 --- a/Assets/Content/Silo/MechSilo_Right.fbx +++ b/Assets/Content/Silo/MechSilo_Right.fbx @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7b4f5507aa6f0064d255ddffbe38837b77359c76e42604edfcf474ec9ddfa16d -size 1227840 +oid sha256:3b8cb6f0a60f892dce8464337200e52f3475b66398502def651d7759de7ca0df +size 1231456 diff --git a/Assets/Content/Textures/LoadingIcon.anim b/Assets/Content/Textures/LoadingIcon.anim index 0e57686e1..9dadd76be 100644 --- a/Assets/Content/Textures/LoadingIcon.anim +++ b/Assets/Content/Textures/LoadingIcon.anim @@ -18,7 +18,7 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0.48333332 + time: 0 value: {x: 0, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -27,17 +27,17 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 1.4833333 + time: 1 value: {x: 0, y: 180, z: 0} - inSlope: {x: 0, y: 175, z: 0} - outSlope: {x: 0, y: 175, z: 0} + inSlope: {x: 0, y: 179.5, z: 0} + outSlope: {x: 0, y: 179.5, z: 0} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 2.4833333 - value: {x: 0, y: 350, z: 0} + time: 2 + value: {x: 0, y: 359, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -49,7 +49,41 @@ AnimationClip: m_RotationOrder: 4 path: m_PositionCurves: [] - m_ScaleCurves: [] + m_ScaleCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0.5574679, y: 0.61128545, z: 0.61128545} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 1 + value: {x: -0.55747, y: 0.61128545, z: 0.61128545} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 2 + value: {x: 0.5574679, y: 0.61128545, z: 0.61128545} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: m_FloatCurves: [] m_PPtrCurves: [] m_SampleRate: 60 @@ -66,13 +100,20 @@ AnimationClip: typeID: 4 customType: 4 isPPtrCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 3 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 2.4833333 + m_StopTime: 2 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -92,7 +133,7 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0.48333332 + time: 0 value: 0 inSlope: 0 outSlope: 0 @@ -101,7 +142,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.4833333 + time: 1 value: 0 inSlope: 0 outSlope: 0 @@ -110,7 +151,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 2.4833333 + time: 2 value: 0 inSlope: 0 outSlope: 0 @@ -129,7 +170,7 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0.48333332 + time: 0 value: 0 inSlope: 0 outSlope: 0 @@ -138,17 +179,17 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.4833333 + time: 1 value: 180 - inSlope: 175 - outSlope: 175 + inSlope: 179.5 + outSlope: 179.5 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 2.4833333 - value: 350 + time: 2 + value: 359 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -166,7 +207,7 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0.48333332 + time: 0 value: 0 inSlope: 0 outSlope: 0 @@ -175,7 +216,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.4833333 + time: 1 value: 0 inSlope: 0 outSlope: 0 @@ -184,7 +225,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 2.4833333 + time: 2 value: 0 inSlope: 0 outSlope: 0 @@ -199,6 +240,99 @@ AnimationClip: path: classID: 224 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.5574679 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: -0.55747 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2 + value: 0.5574679 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.x + path: + classID: 224 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.61128545 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2 + value: 0.61128545 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.y + path: + classID: 224 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.61128545 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2 + value: 0.61128545 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.z + path: + classID: 224 + script: {fileID: 0} m_EulerEditorCurves: - curve: serializedVersion: 2 diff --git a/Assets/Content/Weapons/Archon Miltech/BFG/Materials/ReadyToQuench/ReadyToQuench.asset b/Assets/Content/Weapons/Archon Miltech/BFG/Materials/ReadyToQuench/ReadyToQuench.asset deleted file mode 100644 index eba63b46c..000000000 --- a/Assets/Content/Weapons/Archon Miltech/BFG/Materials/ReadyToQuench/ReadyToQuench.asset +++ /dev/null @@ -1,16 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6691a633fee507c468fbb61f649f459a, type: 3} - m_Name: ReadyToQuench - m_EditorClassIdentifier: - mats: - - {fileID: 2100000, guid: eb4ecca9acb9a6d4890ba2cdcfff27ed, type: 2} diff --git a/Assets/Content/Weapons/Archon Miltech/BFG/Materials/ReadyToQuench/ReadyToQuench.asset.meta b/Assets/Content/Weapons/Archon Miltech/BFG/Materials/ReadyToQuench/ReadyToQuench.asset.meta deleted file mode 100644 index 44c147f63..000000000 --- a/Assets/Content/Weapons/Archon Miltech/BFG/Materials/ReadyToQuench/ReadyToQuench.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 66f091c8137e97d48848907a871e2051 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Content/Weapons/Archon Miltech/BFG/Materials/TellingTheBees/TellingTheBees.asset b/Assets/Content/Weapons/Archon Miltech/BFG/Materials/TellingTheBees/TellingTheBees.asset deleted file mode 100644 index a380cf500..000000000 --- a/Assets/Content/Weapons/Archon Miltech/BFG/Materials/TellingTheBees/TellingTheBees.asset +++ /dev/null @@ -1,16 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6691a633fee507c468fbb61f649f459a, type: 3} - m_Name: TellingTheBees - m_EditorClassIdentifier: - mats: - - {fileID: 2100000, guid: e2cc849e691eb354092e9f5eac56a623, type: 2} diff --git a/Assets/Content/Weapons/Archon Miltech/BFG/Materials/TellingTheBees/TellingTheBees.asset.meta b/Assets/Content/Weapons/Archon Miltech/BFG/Materials/TellingTheBees/TellingTheBees.asset.meta deleted file mode 100644 index 43b713062..000000000 --- a/Assets/Content/Weapons/Archon Miltech/BFG/Materials/TellingTheBees/TellingTheBees.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 350bc6144ef06a746b1f1329de284f6d -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/ArchonGunmetal.asset b/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/ArchonGunmetal.asset index f8eb9990b..ad45c7c0e 100644 --- a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/ArchonGunmetal.asset +++ b/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/ArchonGunmetal.asset @@ -13,4 +13,4 @@ MonoBehaviour: m_Name: ArchonGunmetal m_EditorClassIdentifier: mats: - - {fileID: 2100000, guid: 089f5c1faf422934da523611164e45b9, type: 2} + - {fileID: 2100000, guid: 0a8206f76e040834a97356eda5573c32, type: 2} diff --git a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/ArchonGunmetal/GrenadeLauncher.mat b/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/ArchonGunmetal/GrenadeLauncher.mat new file mode 100644 index 000000000..20e6c7188 --- /dev/null +++ b/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/ArchonGunmetal/GrenadeLauncher.mat @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: GrenadeLauncher + m_Shader: {fileID: -6465566751694194690, guid: 6e321fdac3365444bbb1429cfbd45873, + type: 3} + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 2 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 4e9f9721038363b47a2a353919e3b4a0, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 2800000, guid: 5033b572af00f4f429648ee2186d4f6e, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 2800000, guid: eff4f5a3854d94b42ab9aca5a822afde, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 2800000, guid: d7560d420df6c394c9a6c4bc8ad1b7cf, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _Emissive_Intensity: 1 + - _QueueControl: 0 + - _QueueOffset: 0 + - _Roughness_Intensity: 0.5 + m_Colors: [] + m_BuildTextureStacks: [] +--- !u!114 &663701091045166858 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 5 diff --git a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/ArchonGunmetal/GrenadeLauncher.mat.meta b/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/ArchonGunmetal/GrenadeLauncher.mat.meta new file mode 100644 index 000000000..48d85974a --- /dev/null +++ b/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/ArchonGunmetal/GrenadeLauncher.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0a8206f76e040834a97356eda5573c32 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/Bullion.asset b/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/Bullion.asset index 3265a495e..8c8581f14 100644 --- a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/Bullion.asset +++ b/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/Bullion.asset @@ -13,4 +13,4 @@ MonoBehaviour: m_Name: Bullion m_EditorClassIdentifier: mats: - - {fileID: 2100000, guid: 015c75a7615b14f40ac5f1d8a02fc207, type: 2} + - {fileID: 2100000, guid: 85747842a35b55f46b0a65b4bc1d6250, type: 2} diff --git a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/Bullion/GrenadeLauncher.mat b/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/Bullion/GrenadeLauncher.mat new file mode 100644 index 000000000..a724ca161 --- /dev/null +++ b/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/Bullion/GrenadeLauncher.mat @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-1697296897125065058 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 5 +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: GrenadeLauncher + m_Shader: {fileID: -6465566751694194690, guid: 6e321fdac3365444bbb1429cfbd45873, + type: 3} + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 2 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 3e722cf3cf8371946a1a06702cd379ef, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 2800000, guid: b435c860f1875c649b87db21e496fd79, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 2800000, guid: 6276bf01936aba9418d30a821b272306, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 2800000, guid: ac864c5398f951b458dac35e0e5aa8a5, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _Emissive_Intensity: 1 + - _QueueControl: 0 + - _QueueOffset: 0 + - _Roughness_Intensity: 0.5 + m_Colors: [] + m_BuildTextureStacks: [] diff --git a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/Bullion/GrenadeLauncher.mat.meta b/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/Bullion/GrenadeLauncher.mat.meta new file mode 100644 index 000000000..388359e9a --- /dev/null +++ b/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/Bullion/GrenadeLauncher.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 85747842a35b55f46b0a65b4bc1d6250 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/Code of Chivalry.asset b/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/Code of Chivalry.asset index 08faa9e18..d2c909a3a 100644 --- a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/Code of Chivalry.asset +++ b/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/Code of Chivalry.asset @@ -13,4 +13,4 @@ MonoBehaviour: m_Name: Code of Chivalry m_EditorClassIdentifier: mats: - - {fileID: 2100000, guid: 766253edf4ae8ef448e0e2dc39c3a64a, type: 2} + - {fileID: 2100000, guid: b147c8eb85804c04ba7ca643acf0a110, type: 2} diff --git a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/Code of Chivalry/GrenadeLauncher.mat b/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/Code of Chivalry/GrenadeLauncher.mat new file mode 100644 index 000000000..379347c3a --- /dev/null +++ b/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/Code of Chivalry/GrenadeLauncher.mat @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-751122508932237319 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 5 +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: GrenadeLauncher + m_Shader: {fileID: -6465566751694194690, guid: 6e321fdac3365444bbb1429cfbd45873, + type: 3} + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 2 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 13c088c2dcf3fd94e948fb172623c1ce, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 2800000, guid: 4cb1f449e40a7094590f61d5a4ebe45d, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 2800000, guid: 123dd75cfe6f55347b1e34dee2a8c182, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 2800000, guid: 3c36ff763c7f83545ad6d210396629d7, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _Emissive_Intensity: 1 + - _QueueControl: 0 + - _QueueOffset: 0 + - _Roughness_Intensity: 0.5 + m_Colors: [] + m_BuildTextureStacks: [] diff --git a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/Code of Chivalry/GrenadeLauncher.mat.meta b/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/Code of Chivalry/GrenadeLauncher.mat.meta new file mode 100644 index 000000000..f51ec2116 --- /dev/null +++ b/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/Code of Chivalry/GrenadeLauncher.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b147c8eb85804c04ba7ca643acf0a110 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/DaisonSleek.asset b/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/DaisonSleek.asset index 4580c7f9f..48bc5b257 100644 --- a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/DaisonSleek.asset +++ b/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/DaisonSleek.asset @@ -13,4 +13,4 @@ MonoBehaviour: m_Name: DaisonSleek m_EditorClassIdentifier: mats: - - {fileID: 2100000, guid: c2693efc661f6484788cd9dee2ee0e9b, type: 2} + - {fileID: 2100000, guid: 491203818cd97d94cb747db971bbdfef, type: 2} diff --git a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/DaisonSleek/AM_GranadeLauncher.mat.meta b/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/DaisonSleek/AM_GranadeLauncher.mat.meta deleted file mode 100644 index 84efbfa3e..000000000 --- a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/DaisonSleek/AM_GranadeLauncher.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: c2693efc661f6484788cd9dee2ee0e9b -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/DaisonSleek/GrenadeLauncher.mat b/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/DaisonSleek/GrenadeLauncher.mat new file mode 100644 index 000000000..baf108bcc --- /dev/null +++ b/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/DaisonSleek/GrenadeLauncher.mat @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: GrenadeLauncher + m_Shader: {fileID: -6465566751694194690, guid: 6e321fdac3365444bbb1429cfbd45873, + type: 3} + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 2 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: daff4fcb13ea7c4479efe5228b7ea754, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 2800000, guid: c30cd0c74d6173f4691cb3102080210b, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 2800000, guid: 7edc2fc9e1ec4344c8bab0c43d3317a0, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 2800000, guid: da8c57fcac5fc364f8aea33479ceeef0, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _Emissive_Intensity: 1 + - _QueueControl: 0 + - _QueueOffset: 0 + - _Roughness_Intensity: 0.5 + m_Colors: [] + m_BuildTextureStacks: [] +--- !u!114 &2926934253614634098 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 5 diff --git a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/DaisonSleek/GrenadeLauncher.mat.meta b/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/DaisonSleek/GrenadeLauncher.mat.meta new file mode 100644 index 000000000..218ed014f --- /dev/null +++ b/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/DaisonSleek/GrenadeLauncher.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 491203818cd97d94cb747db971bbdfef +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/LessThanLethal.asset b/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/LessThanLethal.asset index f208795d2..58b394985 100644 --- a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/LessThanLethal.asset +++ b/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/LessThanLethal.asset @@ -13,4 +13,4 @@ MonoBehaviour: m_Name: LessThanLethal m_EditorClassIdentifier: mats: - - {fileID: 2100000, guid: 727182afbec913e4b99e10e9f03cfebd, type: 2} + - {fileID: 2100000, guid: ce277bd92076ed6499259bf955824f15, type: 2} diff --git a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/LessThanLethal/AM_GranadeLauncher.mat b/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/LessThanLethal/AM_GranadeLauncher.mat deleted file mode 100644 index 48a4be5a8..000000000 --- a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/LessThanLethal/AM_GranadeLauncher.mat +++ /dev/null @@ -1,72 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: AM_GranadeLauncher - m_Shader: {fileID: -6465566751694194690, guid: 6e321fdac3365444bbb1429cfbd45873, - type: 3} - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 2 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BaseMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_Lightmaps: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_LightmapsInd: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_ShadowMasks: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _Emissive_Intensity: 0 - - _QueueControl: 0 - - _QueueOffset: 0 - - _Roughness_Intensity: 0.5 - m_Colors: [] - m_BuildTextureStacks: [] ---- !u!114 &6599387372662959460 -MonoBehaviour: - m_ObjectHideFlags: 11 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} - m_Name: - m_EditorClassIdentifier: - version: 5 diff --git a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/LessThanLethal/AM_GranadeLauncher.mat.meta b/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/LessThanLethal/AM_GranadeLauncher.mat.meta deleted file mode 100644 index 1c10e7de3..000000000 --- a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/LessThanLethal/AM_GranadeLauncher.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 727182afbec913e4b99e10e9f03cfebd -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/LessThanLethal/GrenadeLauncher.mat b/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/LessThanLethal/GrenadeLauncher.mat new file mode 100644 index 000000000..cf52f0de7 --- /dev/null +++ b/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/LessThanLethal/GrenadeLauncher.mat @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: GrenadeLauncher + m_Shader: {fileID: -6465566751694194690, guid: 6e321fdac3365444bbb1429cfbd45873, + type: 3} + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 2 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 7948ee3dcf348b846bb1099a9d1f35ab, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 2800000, guid: feb91bef36607ef49aa888c6663104a7, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 2800000, guid: c7bb3fe7c316d5f40a9528821c295e1d, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 2800000, guid: 01bf7cc9e70f44449b5dc351c61ecb09, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _Emissive_Intensity: 1 + - _QueueControl: 0 + - _QueueOffset: 0 + - _Roughness_Intensity: 0.5 + m_Colors: [] + m_BuildTextureStacks: [] +--- !u!114 &1863024127096376680 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 5 diff --git a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/LessThanLethal/GrenadeLauncher.mat.meta b/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/LessThanLethal/GrenadeLauncher.mat.meta new file mode 100644 index 000000000..40cd98a55 --- /dev/null +++ b/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/LessThanLethal/GrenadeLauncher.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ce277bd92076ed6499259bf955824f15 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/PraetorGrunge.asset b/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/PraetorGrunge.asset index 7d17a1547..ff0a055c4 100644 --- a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/PraetorGrunge.asset +++ b/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/PraetorGrunge.asset @@ -13,4 +13,4 @@ MonoBehaviour: m_Name: PraetorGrunge m_EditorClassIdentifier: mats: - - {fileID: 2100000, guid: 4c389983ce6fe3d46ad2895ca82dd880, type: 2} + - {fileID: 2100000, guid: 7ea014b4a861b9a4080ae99dba1a7630, type: 2} diff --git a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/PraetorGrunge/AM_GranadeLauncher.mat b/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/PraetorGrunge/AM_GranadeLauncher.mat deleted file mode 100644 index 45ab656cb..000000000 --- a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/PraetorGrunge/AM_GranadeLauncher.mat +++ /dev/null @@ -1,72 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: AM_GranadeLauncher - m_Shader: {fileID: -6465566751694194690, guid: 6e321fdac3365444bbb1429cfbd45873, - type: 3} - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 2 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BaseMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_Lightmaps: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_LightmapsInd: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_ShadowMasks: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _Emissive_Intensity: 0 - - _QueueControl: 0 - - _QueueOffset: 0 - - _Roughness_Intensity: 0.5 - m_Colors: [] - m_BuildTextureStacks: [] ---- !u!114 &6663560899988881896 -MonoBehaviour: - m_ObjectHideFlags: 11 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} - m_Name: - m_EditorClassIdentifier: - version: 5 diff --git a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/PraetorGrunge/AM_GranadeLauncher.mat.meta b/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/PraetorGrunge/AM_GranadeLauncher.mat.meta deleted file mode 100644 index 955f1c396..000000000 --- a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/PraetorGrunge/AM_GranadeLauncher.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 4c389983ce6fe3d46ad2895ca82dd880 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/PraetorGrunge/GrenadeLauncher.mat b/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/PraetorGrunge/GrenadeLauncher.mat new file mode 100644 index 000000000..b9589e578 --- /dev/null +++ b/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/PraetorGrunge/GrenadeLauncher.mat @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: GrenadeLauncher + m_Shader: {fileID: -6465566751694194690, guid: 6e321fdac3365444bbb1429cfbd45873, + type: 3} + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 2 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 9f45aed41834d6c478807176b1e0af12, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 2800000, guid: bb0863312dcf3be4e95e36768cd7408c, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 2800000, guid: 385b4265a8d46d645b517ceb026e8c97, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 2800000, guid: 965987dd0d786d14c9e44fdb7ead4c30, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _Emissive_Intensity: 1 + - _QueueControl: 0 + - _QueueOffset: 0 + - _Roughness_Intensity: 0.5 + m_Colors: [] + m_BuildTextureStacks: [] +--- !u!114 &8560990731940399316 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 5 diff --git a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/PraetorGrunge/GrenadeLauncher.mat.meta b/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/PraetorGrunge/GrenadeLauncher.mat.meta new file mode 100644 index 000000000..a4ebf17f2 --- /dev/null +++ b/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/PraetorGrunge/GrenadeLauncher.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7ea014b4a861b9a4080ae99dba1a7630 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/ReadyToQuench.asset b/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/ReadyToQuench.asset index d1af870c8..b6c44494e 100644 --- a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/ReadyToQuench.asset +++ b/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/ReadyToQuench.asset @@ -13,4 +13,4 @@ MonoBehaviour: m_Name: ReadyToQuench m_EditorClassIdentifier: mats: - - {fileID: 2100000, guid: 5c8cae9131375ff4cbc8f32df505314b, type: 2} + - {fileID: 2100000, guid: effe3033b5de1964698960246490246c, type: 2} diff --git a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/ReadyToQuench/AM_GranadeLauncher.mat b/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/ReadyToQuench/AM_GranadeLauncher.mat deleted file mode 100644 index e365140c8..000000000 --- a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/ReadyToQuench/AM_GranadeLauncher.mat +++ /dev/null @@ -1,72 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: AM_GranadeLauncher - m_Shader: {fileID: -6465566751694194690, guid: 6e321fdac3365444bbb1429cfbd45873, - type: 3} - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 2 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BaseMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_Lightmaps: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_LightmapsInd: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_ShadowMasks: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _Emissive_Intensity: 0 - - _QueueControl: 0 - - _QueueOffset: 0 - - _Roughness_Intensity: 0.5 - m_Colors: [] - m_BuildTextureStacks: [] ---- !u!114 &7088037932096072421 -MonoBehaviour: - m_ObjectHideFlags: 11 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} - m_Name: - m_EditorClassIdentifier: - version: 5 diff --git a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/ReadyToQuench/AM_GranadeLauncher.mat.meta b/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/ReadyToQuench/AM_GranadeLauncher.mat.meta deleted file mode 100644 index 8d97906cf..000000000 --- a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/ReadyToQuench/AM_GranadeLauncher.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 5c8cae9131375ff4cbc8f32df505314b -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/ReadyToQuench/GrenadeLauncher.mat b/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/ReadyToQuench/GrenadeLauncher.mat new file mode 100644 index 000000000..d826f829f --- /dev/null +++ b/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/ReadyToQuench/GrenadeLauncher.mat @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: GrenadeLauncher + m_Shader: {fileID: -6465566751694194690, guid: 6e321fdac3365444bbb1429cfbd45873, + type: 3} + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 2 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 48159e86224dd154fabf253c00c55d59, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 2800000, guid: be367791b9a6ac44a8d320151d9cebff, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 2800000, guid: a6bad51cae2a8f741b4e51b432efe5df, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 2800000, guid: 494095d52f15c1a418149d88c227ea93, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _Emissive_Intensity: 1 + - _QueueControl: 0 + - _QueueOffset: 0 + - _Roughness_Intensity: 0.5 + m_Colors: [] + m_BuildTextureStacks: [] +--- !u!114 &2270946132101185724 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 5 diff --git a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/ReadyToQuench/GrenadeLauncher.mat.meta b/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/ReadyToQuench/GrenadeLauncher.mat.meta new file mode 100644 index 000000000..ba8f3ec8c --- /dev/null +++ b/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/ReadyToQuench/GrenadeLauncher.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: effe3033b5de1964698960246490246c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/SeaHawk.asset b/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/SeaHawk.asset index c74894685..d1010948c 100644 --- a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/SeaHawk.asset +++ b/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/SeaHawk.asset @@ -13,4 +13,4 @@ MonoBehaviour: m_Name: SeaHawk m_EditorClassIdentifier: mats: - - {fileID: 2100000, guid: 637c66f4d4ea5cd49b0b670cd053d134, type: 2} + - {fileID: 2100000, guid: bb44f29dba6a5e54581efd1b33c8636e, type: 2} diff --git a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/SeaHawk/AM_GranadeLauncher.mat b/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/SeaHawk/AM_GranadeLauncher.mat deleted file mode 100644 index e880d139a..000000000 --- a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/SeaHawk/AM_GranadeLauncher.mat +++ /dev/null @@ -1,72 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: AM_GranadeLauncher - m_Shader: {fileID: -6465566751694194690, guid: 6e321fdac3365444bbb1429cfbd45873, - type: 3} - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 2 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BaseMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_Lightmaps: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_LightmapsInd: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_ShadowMasks: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _Emissive_Intensity: 0 - - _QueueControl: 0 - - _QueueOffset: 0 - - _Roughness_Intensity: 0.5 - m_Colors: [] - m_BuildTextureStacks: [] ---- !u!114 &1656527859976535884 -MonoBehaviour: - m_ObjectHideFlags: 11 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} - m_Name: - m_EditorClassIdentifier: - version: 5 diff --git a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/SeaHawk/AM_GranadeLauncher.mat.meta b/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/SeaHawk/AM_GranadeLauncher.mat.meta deleted file mode 100644 index a9d8ad0c3..000000000 --- a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/SeaHawk/AM_GranadeLauncher.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 637c66f4d4ea5cd49b0b670cd053d134 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/SeaHawk/GrenadeLauncher.mat b/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/SeaHawk/GrenadeLauncher.mat new file mode 100644 index 000000000..cccbb9419 --- /dev/null +++ b/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/SeaHawk/GrenadeLauncher.mat @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: GrenadeLauncher + m_Shader: {fileID: -6465566751694194690, guid: 6e321fdac3365444bbb1429cfbd45873, + type: 3} + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 2 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: db5899cb44c4dec489f75cd15cd4512f, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 2800000, guid: 5fb5c593705e94146862f902c30e4227, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 2800000, guid: 8a4586dc11f802044a56901731aefed8, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 2800000, guid: 6d7b64c5c079a1e49aa4b9f939af78f1, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _Emissive_Intensity: 1 + - _QueueControl: 0 + - _QueueOffset: 0 + - _Roughness_Intensity: 0.5 + m_Colors: [] + m_BuildTextureStacks: [] +--- !u!114 &4647660242605060749 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 5 diff --git a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/SeaHawk/GrenadeLauncher.mat.meta b/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/SeaHawk/GrenadeLauncher.mat.meta new file mode 100644 index 000000000..0ff913a70 --- /dev/null +++ b/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/SeaHawk/GrenadeLauncher.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bb44f29dba6a5e54581efd1b33c8636e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/SpotYellow.asset b/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/SpotYellow.asset index 9ee67bf27..1f35ec32f 100644 --- a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/SpotYellow.asset +++ b/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/SpotYellow.asset @@ -13,4 +13,4 @@ MonoBehaviour: m_Name: SpotYellow m_EditorClassIdentifier: mats: - - {fileID: 2100000, guid: 65fc44be146e1d747ae01c269bf591a0, type: 2} + - {fileID: 2100000, guid: a3c1ae8ded9499b428599c1bda3d0415, type: 2} diff --git a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/SpotYellow/AM_GranadeLauncher.mat b/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/SpotYellow/AM_GranadeLauncher.mat deleted file mode 100644 index 45a27a557..000000000 --- a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/SpotYellow/AM_GranadeLauncher.mat +++ /dev/null @@ -1,72 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &-3764962560498844973 -MonoBehaviour: - m_ObjectHideFlags: 11 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} - m_Name: - m_EditorClassIdentifier: - version: 5 ---- !u!21 &2100000 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: AM_GranadeLauncher - m_Shader: {fileID: -6465566751694194690, guid: 6e321fdac3365444bbb1429cfbd45873, - type: 3} - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 2 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BaseMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_Lightmaps: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_LightmapsInd: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_ShadowMasks: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _Emissive_Intensity: 0 - - _QueueControl: 0 - - _QueueOffset: 0 - - _Roughness_Intensity: 0.5 - m_Colors: [] - m_BuildTextureStacks: [] diff --git a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/SpotYellow/AM_GranadeLauncher.mat.meta b/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/SpotYellow/AM_GranadeLauncher.mat.meta deleted file mode 100644 index 7e28b6a1b..000000000 --- a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/SpotYellow/AM_GranadeLauncher.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 65fc44be146e1d747ae01c269bf591a0 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/SpotYellow/GrenadeLauncher.mat b/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/SpotYellow/GrenadeLauncher.mat new file mode 100644 index 000000000..3123adb11 --- /dev/null +++ b/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/SpotYellow/GrenadeLauncher.mat @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: GrenadeLauncher + m_Shader: {fileID: -6465566751694194690, guid: 6e321fdac3365444bbb1429cfbd45873, + type: 3} + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 2 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 81de5352ad7daec498aecfce20140894, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 2800000, guid: 70d96aacf1cb7d6469b8ab26e2c0f154, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 2800000, guid: 9ad9a5cc0176f9642b7f868fdcf72427, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 2800000, guid: cf31e8e8622ab4a45bfe4f173e0df869, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _Emissive_Intensity: 1 + - _QueueControl: 0 + - _QueueOffset: 0 + - _Roughness_Intensity: 0.5 + m_Colors: [] + m_BuildTextureStacks: [] +--- !u!114 &78209933993796493 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 5 diff --git a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/SpotYellow/GrenadeLauncher.mat.meta b/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/SpotYellow/GrenadeLauncher.mat.meta new file mode 100644 index 000000000..ff9e37f49 --- /dev/null +++ b/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/SpotYellow/GrenadeLauncher.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a3c1ae8ded9499b428599c1bda3d0415 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/ThinBlueLine.asset b/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/ThinBlueLine.asset index dd0ca2abb..998adac72 100644 --- a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/ThinBlueLine.asset +++ b/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/ThinBlueLine.asset @@ -13,4 +13,4 @@ MonoBehaviour: m_Name: ThinBlueLine m_EditorClassIdentifier: mats: - - {fileID: 2100000, guid: 10c0a4eb3af86dd47ae4d8c3e3f66456, type: 2} + - {fileID: 2100000, guid: c0788844e50df974493e264a0e529a67, type: 2} diff --git a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/ThinBlueLine/AM_GranadeLauncher.mat b/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/ThinBlueLine/AM_GranadeLauncher.mat deleted file mode 100644 index 1db9157a9..000000000 --- a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/ThinBlueLine/AM_GranadeLauncher.mat +++ /dev/null @@ -1,72 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: AM_GranadeLauncher - m_Shader: {fileID: -6465566751694194690, guid: 6e321fdac3365444bbb1429cfbd45873, - type: 3} - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 2 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BaseMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_Lightmaps: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_LightmapsInd: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_ShadowMasks: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _Emissive_Intensity: 0 - - _QueueControl: 0 - - _QueueOffset: 0 - - _Roughness_Intensity: 0.5 - m_Colors: [] - m_BuildTextureStacks: [] ---- !u!114 &7331790288246289009 -MonoBehaviour: - m_ObjectHideFlags: 11 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} - m_Name: - m_EditorClassIdentifier: - version: 5 diff --git a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/ThinBlueLine/AM_GranadeLauncher.mat.meta b/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/ThinBlueLine/AM_GranadeLauncher.mat.meta deleted file mode 100644 index 39a8c9478..000000000 --- a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/ThinBlueLine/AM_GranadeLauncher.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 10c0a4eb3af86dd47ae4d8c3e3f66456 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/ThinBlueLine/GrenadeLauncher.mat b/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/ThinBlueLine/GrenadeLauncher.mat new file mode 100644 index 000000000..91353221d --- /dev/null +++ b/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/ThinBlueLine/GrenadeLauncher.mat @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-5875046391147685917 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 5 +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: GrenadeLauncher + m_Shader: {fileID: -6465566751694194690, guid: 6e321fdac3365444bbb1429cfbd45873, + type: 3} + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 2 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 0a6330ba5f0cea94e8bd1af966092620, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 2800000, guid: 4c8c3002473688448bc02f206ef6eb78, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 2800000, guid: 3b6e5bed2c4641045afb937caae1625e, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 2800000, guid: c8f88db0ee48e1245bec60bc09c71a62, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _Emissive_Intensity: 1 + - _QueueControl: 0 + - _QueueOffset: 0 + - _Roughness_Intensity: 0.5 + m_Colors: [] + m_BuildTextureStacks: [] diff --git a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/ThinBlueLine/GrenadeLauncher.mat.meta b/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/ThinBlueLine/GrenadeLauncher.mat.meta new file mode 100644 index 000000000..65c91a31e --- /dev/null +++ b/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/ThinBlueLine/GrenadeLauncher.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c0788844e50df974493e264a0e529a67 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/UnbrokenKnot.asset b/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/UnbrokenKnot.asset index fcecb9403..6b1527d52 100644 --- a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/UnbrokenKnot.asset +++ b/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/UnbrokenKnot.asset @@ -13,4 +13,4 @@ MonoBehaviour: m_Name: UnbrokenKnot m_EditorClassIdentifier: mats: - - {fileID: 2100000, guid: 2c12edb17285d00459000cd9425fbdab, type: 2} + - {fileID: 2100000, guid: 824ca7b9b51a6d540b4ad358ad18e117, type: 2} diff --git a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/UnbrokenKnot/AM_GranadeLauncher.mat b/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/UnbrokenKnot/AM_GranadeLauncher.mat deleted file mode 100644 index 2003e46d9..000000000 --- a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/UnbrokenKnot/AM_GranadeLauncher.mat +++ /dev/null @@ -1,72 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: AM_GranadeLauncher - m_Shader: {fileID: -6465566751694194690, guid: 6e321fdac3365444bbb1429cfbd45873, - type: 3} - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 2 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BaseMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_Lightmaps: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_LightmapsInd: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_ShadowMasks: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _Emissive_Intensity: 0 - - _QueueControl: 0 - - _QueueOffset: 0 - - _Roughness_Intensity: 0.5 - m_Colors: [] - m_BuildTextureStacks: [] ---- !u!114 &1638249949339438223 -MonoBehaviour: - m_ObjectHideFlags: 11 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} - m_Name: - m_EditorClassIdentifier: - version: 5 diff --git a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/UnbrokenKnot/AM_GranadeLauncher.mat.meta b/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/UnbrokenKnot/AM_GranadeLauncher.mat.meta deleted file mode 100644 index fa33b4da5..000000000 --- a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/UnbrokenKnot/AM_GranadeLauncher.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 2c12edb17285d00459000cd9425fbdab -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/UnbrokenKnot/GrenadeLauncher.mat b/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/UnbrokenKnot/GrenadeLauncher.mat new file mode 100644 index 000000000..d1308b122 --- /dev/null +++ b/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/UnbrokenKnot/GrenadeLauncher.mat @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: GrenadeLauncher + m_Shader: {fileID: -6465566751694194690, guid: 6e321fdac3365444bbb1429cfbd45873, + type: 3} + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 2 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: b91bfa689ebe682468a61478628de47a, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 2800000, guid: c5c9ad25606462e41a0ea67e83e41468, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 2800000, guid: 809ce1e76661d7d419bbd4e1c8775260, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 2800000, guid: a248f3c996d73e04fa75380153b05fea, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _Emissive_Intensity: 1 + - _QueueControl: 0 + - _QueueOffset: 0 + - _Roughness_Intensity: 0.5 + m_Colors: [] + m_BuildTextureStacks: [] +--- !u!114 &8986361990973033728 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 5 diff --git a/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/UnbrokenKnot/GrenadeLauncher.mat.meta b/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/UnbrokenKnot/GrenadeLauncher.mat.meta new file mode 100644 index 000000000..104ae462b --- /dev/null +++ b/Assets/Content/Weapons/Archon Miltech/GrenadeLauncher/Materials/UnbrokenKnot/GrenadeLauncher.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 824ca7b9b51a6d540b4ad358ad18e117 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Weapons/Pyrotronics/Flamethrower/Materials/MartianSoil/PFT_Flamethrower.mat b/Assets/Content/Weapons/Pyrotronics/Flamethrower/Materials/MartianSoil/PFT_Flamethrower.mat index 55b1ea925..46b17e9df 100644 --- a/Assets/Content/Weapons/Pyrotronics/Flamethrower/Materials/MartianSoil/PFT_Flamethrower.mat +++ b/Assets/Content/Weapons/Pyrotronics/Flamethrower/Materials/MartianSoil/PFT_Flamethrower.mat @@ -22,19 +22,19 @@ Material: serializedVersion: 3 m_TexEnvs: - _BaseMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 460f2f15db82b9c4695c9cf4f4ec86b1, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BumpMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 38c0bc012c825774aaacae5fa6826246, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _EmissionMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 3192d83a976f37847a1ec95696307dac, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _OcclusionMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 59a0bbbad0203e9448f8f523b026fb41, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - unity_Lightmaps: @@ -51,7 +51,7 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - - _Emissive_Intensity: 0 + - _Emissive_Intensity: 1 - _QueueControl: 0 - _QueueOffset: 0 - _Roughness_Intensity: 0.5 diff --git a/Assets/Content/Weapons/Pyrotronics/Flamethrower/Materials/OsmiumScream/PFT_Flamethrower.mat b/Assets/Content/Weapons/Pyrotronics/Flamethrower/Materials/OsmiumScream/PFT_Flamethrower.mat index cb1e26cab..b01231484 100644 --- a/Assets/Content/Weapons/Pyrotronics/Flamethrower/Materials/OsmiumScream/PFT_Flamethrower.mat +++ b/Assets/Content/Weapons/Pyrotronics/Flamethrower/Materials/OsmiumScream/PFT_Flamethrower.mat @@ -22,19 +22,19 @@ Material: serializedVersion: 3 m_TexEnvs: - _BaseMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: c3c50144cac584e488fb4a3b315fe94b, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BumpMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 893b7680821569943bce61c5e85b119a, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _EmissionMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 0f3fd186400801946a367ef8c0454cee, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _OcclusionMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: ad3df6cf93ab23049975a6790343e1d5, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - unity_Lightmaps: @@ -51,7 +51,7 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - - _Emissive_Intensity: 0 + - _Emissive_Intensity: 1 - _QueueControl: 0 - _QueueOffset: 0 - _Roughness_Intensity: 0.5 diff --git a/Assets/Content/Weapons/Warsui/Minigun/Materials/MineGod/MineGold.asset.meta b/Assets/Content/Weapons/Warsui/Minigun/Materials/MineGod/MineGold.asset.meta deleted file mode 100644 index 4f7299946..000000000 --- a/Assets/Content/Weapons/Warsui/Minigun/Materials/MineGod/MineGold.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 28aa3529758f0ee49a0e72cc144778c6 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Content/Weapons/Warsui/Minigun/Materials/MineGod/Minigun.mat b/Assets/Content/Weapons/Warsui/Minigun/Materials/MineGod/Minigun.mat deleted file mode 100644 index 81e7e66d5..000000000 --- a/Assets/Content/Weapons/Warsui/Minigun/Materials/MineGod/Minigun.mat +++ /dev/null @@ -1,129 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Minigun - m_Shader: {fileID: -6465566751694194690, guid: 6e321fdac3365444bbb1429cfbd45873, - type: 3} - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BaseMap: - m_Texture: {fileID: 2800000, guid: 88e047368b46ae74ab8e34d6011bc0ff, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _BumpMap: - m_Texture: {fileID: 2800000, guid: e12d12fff4523c6408b8c696ad7678d3, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 2800000, guid: 35fd20f9b3bdea244bf33b152170b614, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 2800000, guid: baa8192578b799344adb5dad3097000e, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _SpecGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_Lightmaps: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_LightmapsInd: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_ShadowMasks: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _AlphaClip: 0 - - _Blend: 0 - - _BumpScale: 1 - - _ClearCoatMask: 0 - - _ClearCoatSmoothness: 0 - - _Cull: 2 - - _Cutoff: 0.5 - - _DetailAlbedoMapScale: 1 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _Emissive_Intensity: 1 - - _EnvironmentReflections: 1 - - _GlossMapScale: 0 - - _Glossiness: 0 - - _GlossyReflections: 0 - - _Metallic: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.005 - - _QueueControl: 0 - - _QueueOffset: 0 - - _ReceiveShadows: 1 - - _Roughness_Intensity: 0.5 - - _Smoothness: 0.5 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _Surface: 0 - - _WorkflowMode: 1 - - _ZWrite: 1 - m_Colors: - - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - m_BuildTextureStacks: [] ---- !u!114 &4955491782424181478 -MonoBehaviour: - m_ObjectHideFlags: 11 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} - m_Name: - m_EditorClassIdentifier: - version: 5 diff --git a/Assets/Content/Weapons/Warsui/Minigun/Materials/MineGod/Minigun.mat.meta b/Assets/Content/Weapons/Warsui/Minigun/Materials/MineGod/Minigun.mat.meta deleted file mode 100644 index 900498fc9..000000000 --- a/Assets/Content/Weapons/Warsui/Minigun/Materials/MineGod/Minigun.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: ae203075b714b8644886639ce37df8f0 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Content/Weapons/Warsui/Minigun/Materials/Rebellion/Mingun.mat b/Assets/Content/Weapons/Warsui/Minigun/Materials/Rebellion/Mingun.mat deleted file mode 100644 index 413768a8d..000000000 --- a/Assets/Content/Weapons/Warsui/Minigun/Materials/Rebellion/Mingun.mat +++ /dev/null @@ -1,129 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Mingun - m_Shader: {fileID: -6465566751694194690, guid: 6e321fdac3365444bbb1429cfbd45873, - type: 3} - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BaseMap: - m_Texture: {fileID: 2800000, guid: 962d22551f112894191c92ee1101a16c, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _BumpMap: - m_Texture: {fileID: 2800000, guid: 2410376b940c1984888bb7f0a69e886e, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 2800000, guid: 7c1950333b219644cbb7726a13e70d86, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 2800000, guid: a991878485434c2448d98de909748d06, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _SpecGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_Lightmaps: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_LightmapsInd: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_ShadowMasks: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _AlphaClip: 0 - - _Blend: 0 - - _BumpScale: 1 - - _ClearCoatMask: 0 - - _ClearCoatSmoothness: 0 - - _Cull: 2 - - _Cutoff: 0.5 - - _DetailAlbedoMapScale: 1 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _Emissive_Intensity: 1 - - _EnvironmentReflections: 1 - - _GlossMapScale: 0 - - _Glossiness: 0 - - _GlossyReflections: 0 - - _Metallic: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.005 - - _QueueControl: 0 - - _QueueOffset: 0 - - _ReceiveShadows: 1 - - _Roughness_Intensity: 0.5 - - _Smoothness: 0.5 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _Surface: 0 - - _WorkflowMode: 1 - - _ZWrite: 1 - m_Colors: - - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - m_BuildTextureStacks: [] ---- !u!114 &4955491782424181478 -MonoBehaviour: - m_ObjectHideFlags: 11 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} - m_Name: - m_EditorClassIdentifier: - version: 5 diff --git a/Assets/Content/Weapons/Warsui/Minigun/Materials/Rebellion/Mingun.mat.meta b/Assets/Content/Weapons/Warsui/Minigun/Materials/Rebellion/Mingun.mat.meta deleted file mode 100644 index 6dfd19ea1..000000000 --- a/Assets/Content/Weapons/Warsui/Minigun/Materials/Rebellion/Mingun.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 607dca1fe607ec147b2893e0134c1bb6 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Content/Weapons/Warsui/Minigun/Materials/Rebellion/Rebelion.asset b/Assets/Content/Weapons/Warsui/Minigun/Materials/Rebellion/Rebelion.asset deleted file mode 100644 index aa64c070a..000000000 --- a/Assets/Content/Weapons/Warsui/Minigun/Materials/Rebellion/Rebelion.asset +++ /dev/null @@ -1,16 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6691a633fee507c468fbb61f649f459a, type: 3} - m_Name: Rebelion - m_EditorClassIdentifier: - mats: - - {fileID: 2100000, guid: 607dca1fe607ec147b2893e0134c1bb6, type: 2} diff --git a/Assets/Content/Weapons/Warsui/Minigun/Materials/Rebellion/Rebelion.asset.meta b/Assets/Content/Weapons/Warsui/Minigun/Materials/Rebellion/Rebelion.asset.meta deleted file mode 100644 index 292fef07b..000000000 --- a/Assets/Content/Weapons/Warsui/Minigun/Materials/Rebellion/Rebelion.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 7ce7c997eb50b1147a301881b4f3bfb7 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Content/Weapons/Warsui/MissileLauncher/Materials/VerdantWarsui/Warsui_Missile_Launcher.mat b/Assets/Content/Weapons/Warsui/MissileLauncher/Materials/VerdantWarsui/Warsui_Missile_Launcher.mat index c8ac83a86..8d9968ebd 100644 --- a/Assets/Content/Weapons/Warsui/MissileLauncher/Materials/VerdantWarsui/Warsui_Missile_Launcher.mat +++ b/Assets/Content/Weapons/Warsui/MissileLauncher/Materials/VerdantWarsui/Warsui_Missile_Launcher.mat @@ -35,19 +35,19 @@ Material: serializedVersion: 3 m_TexEnvs: - _BaseMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 70a89dfecba397048891f681900df268, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BumpMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: aaf97048d60d7b7498a9664aed4e6461, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _EmissionMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 58aedbdd21737204d81a4cf57eed1928, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _OcclusionMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 6461918f50246e74982b4e157fe051b3, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - unity_Lightmaps: @@ -64,7 +64,7 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - - _Emissive_Intensity: 0 + - _Emissive_Intensity: 1 - _QueueControl: 0 - _QueueOffset: 0 - _Roughness_Intensity: 0.5 diff --git a/Assets/Editor/ArchonMiltechWeaponMeshMaterialNameMap.asset b/Assets/Editor/ArchonMiltechWeaponMeshMaterialNameMap.asset index 1df0f3166..c9c9f74ac 100644 --- a/Assets/Editor/ArchonMiltechWeaponMeshMaterialNameMap.asset +++ b/Assets/Editor/ArchonMiltechWeaponMeshMaterialNameMap.asset @@ -25,7 +25,7 @@ MonoBehaviour: - AM_Shotgun - Mesh: {fileID: 8347601449702216776, guid: 65e6558ff3ac14542a1d5c4a3d5c9338, type: 3} MaterialNames: - - AM_GranadeLauncher + - GrenadeLauncher - Mesh: {fileID: 8347601449702216776, guid: f1be6fbfb8534144988f44719ace20df, type: 3} MaterialNames: - AM_Laser diff --git a/Assets/Editor/MechMeshMaterialNameMap.asset b/Assets/Editor/MechMeshMaterialNameMap.asset index 4f936d0c2..69eebb378 100644 --- a/Assets/Editor/MechMeshMaterialNameMap.asset +++ b/Assets/Editor/MechMeshMaterialNameMap.asset @@ -55,12 +55,12 @@ MonoBehaviour: - Torso - RightArm - Connectors + - Hoses - Mesh: {fileID: 1858076446634623171, guid: 7a99f688e3fb8354ea2661c348113d6f, type: 3} MaterialNames: + - Legs - Head - - null - Chest - - Legs - Mesh: {fileID: 8369447950273266316, guid: 85dfe6b0b304173439a086e7c18b650a, type: 3} MaterialNames: - Head @@ -97,5 +97,5 @@ MonoBehaviour: - LowerDetails - MidCore - MidDetails - - LegLeft - - LegRight + - LegFrontLeft + - LegFrontRight diff --git a/Assets/Resources/ProjectContext.prefab b/Assets/Resources/ProjectContext.prefab index b5de112b9..710f39f90 100644 --- a/Assets/Resources/ProjectContext.prefab +++ b/Assets/Resources/ProjectContext.prefab @@ -47,7 +47,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a4e6589720da476459dc6dd71624b071, type: 3} m_Name: m_EditorClassIdentifier: - _scriptableObjectInstallers: [] + _scriptableObjectInstallers: + - {fileID: 11400000, guid: c1f32f0d33ce3ad44acf465f54c5da84, type: 2} + - {fileID: 11400000, guid: 1430ef74e99657144a6a75599f390e26, type: 2} _monoInstallers: - {fileID: 7776942803935884160} - {fileID: -2783684923435114094} diff --git a/Assets/Runtime/Actors/Player/PreferenceSliderUI.cs b/Assets/Runtime/Actors/Player/PreferenceSliderUI.cs new file mode 100644 index 000000000..84e5858de --- /dev/null +++ b/Assets/Runtime/Actors/Player/PreferenceSliderUI.cs @@ -0,0 +1,95 @@ +using System.Collections; +using System.Collections.Generic; +using TMPro; +using UnityEngine; +using UnityEngine.Audio; +using UnityEngine.EventSystems; +using UnityEngine.UI; +using Zenject; + +namespace SupremacyHangar.Runtime.Actors.Player +{ + enum PreferenceTypes + { + LookSensitivity, + MusicVolume, + MasterVolume, + EffectsVolume, + } + + [RequireComponent(typeof(Slider))] + public class PreferenceSliderUI : MonoBehaviour + { + [SerializeField] private PreferenceTypes preferenceType; + private Slider slider; + [SerializeField] private TextMeshProUGUI textSliderValue; + + private UserPreferencesService userPreferences; + + [Inject] + public void InjectDependencies(UserPreferencesService userPreferences) + { + slider = GetComponent(); + this.userPreferences = userPreferences; + slider.onValueChanged.AddListener(SetLevel); + + switch (preferenceType) + { + case PreferenceTypes.LookSensitivity: + slider.value = userPreferences.MouseSensitivity; + break; + case PreferenceTypes.MasterVolume: + slider.value = userPreferences.MasterVolume; + break; + case PreferenceTypes.MusicVolume: + slider.value = userPreferences.MusicVolume; + break; + default: + break; + } + } + + private void SetTextValue() + { + float sliderValue = 0; + switch (preferenceType) + { + case PreferenceTypes.LookSensitivity: + sliderValue = slider.value; + textSliderValue.text = "(" + sliderValue.ToString("F1") + ")"; + break; + case PreferenceTypes.MasterVolume: + case PreferenceTypes.MusicVolume: + case PreferenceTypes.EffectsVolume: + sliderValue = slider.value * 100; + textSliderValue.text = "(" + sliderValue.ToString("F0") + ")"; + break; + default: + break; + } + } + + public void SetLevel(float value) + { +// slider.value = value; + switch(preferenceType) + { + case PreferenceTypes.LookSensitivity: + userPreferences.SetMouseSensitivity(value); + break; + case PreferenceTypes.MusicVolume: + userPreferences.SetMusicVolume(value); + break; + case PreferenceTypes.MasterVolume: + userPreferences.SetMasterVolume(value); + break; + case PreferenceTypes.EffectsVolume: + userPreferences.SetEffectsVolume(value); + break; + default: + break; + } +// SetTextValue(); + } + } +} \ No newline at end of file diff --git a/Assets/Runtime/Actors/Player/SetVolume.cs.meta b/Assets/Runtime/Actors/Player/PreferenceSliderUI.cs.meta similarity index 100% rename from Assets/Runtime/Actors/Player/SetVolume.cs.meta rename to Assets/Runtime/Actors/Player/PreferenceSliderUI.cs.meta diff --git a/Assets/Runtime/Actors/Player/ResetUserPrefs.cs b/Assets/Runtime/Actors/Player/ResetUserPrefs.cs new file mode 100644 index 000000000..ba954bb68 --- /dev/null +++ b/Assets/Runtime/Actors/Player/ResetUserPrefs.cs @@ -0,0 +1,28 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.EventSystems; +using UnityEngine.UI; +using Zenject; + +namespace SupremacyHangar.Runtime.Actors.Player +{ + public class ResetUserPrefs : MonoBehaviour, ISelectHandler + { + private UserPreferencesService userPreferences; + + [Inject] + public void InjectDependencies(UserPreferencesService userPreferences) + { + this.userPreferences = userPreferences; + } + + public void OnSelect(BaseEventData eventData) + { + userPreferences.ResetMasterVolume(); + userPreferences.ResetEffectsVolume(); + userPreferences.ResetMouseSensitivity(); + userPreferences.ResetMusicVolume(); + } + } +} diff --git a/Assets/Runtime/Actors/Player/ResetUserPrefs.cs.meta b/Assets/Runtime/Actors/Player/ResetUserPrefs.cs.meta new file mode 100644 index 000000000..74499b3f6 --- /dev/null +++ b/Assets/Runtime/Actors/Player/ResetUserPrefs.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 017f7be3d31bf9f48ae0be4cd0bcee4c +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Runtime/Actors/Player/SetVolume.cs b/Assets/Runtime/Actors/Player/SetVolume.cs deleted file mode 100644 index 491f302db..000000000 --- a/Assets/Runtime/Actors/Player/SetVolume.cs +++ /dev/null @@ -1,77 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using TMPro; -using UnityEngine; -using UnityEngine.Audio; -using UnityEngine.EventSystems; -using UnityEngine.UI; - -namespace SupremacyHangar.Runtime.Actors.Player -{ - enum VolumeTypes - { - Music, - Master, - Effects, - } - - [RequireComponent(typeof(Slider))] - public class SetVolume : MonoBehaviour, IUpdateSelectedHandler - { - [SerializeField] private AudioMixer mixer; - [SerializeField] private VolumeTypes volumeTypes; - [SerializeField] private Slider slider; - [SerializeField] private TextMeshProUGUI textSliderValue; - - void Start() - { - switch (volumeTypes) - { - case VolumeTypes.Music: - slider.value = PlayerPrefs.GetFloat("MusicVolume", 0.75f); - break; - case VolumeTypes.Master: - slider.value = PlayerPrefs.GetFloat("MasterVolume", 0.75f); - break; - case VolumeTypes.Effects: - slider.value = PlayerPrefs.GetFloat("EffectsVolume", 0.75f); - break; - default: - break; - } - } - - private void SetTextValue() - { - var sliderValue = slider.value * 100; - textSliderValue.text = "(" + sliderValue.ToString("F0") + ")"; - } - - public void SetLevel(string volumeName, string group) - { - float sliderValue = slider.value; - SetTextValue(); - mixer.SetFloat(volumeName, Mathf.Log10(sliderValue) * 20); - PlayerPrefs.SetFloat(group, sliderValue); - PlayerPrefs.Save(); - } - - public void OnUpdateSelected(BaseEventData eventData) - { - switch (volumeTypes) - { - case VolumeTypes.Music: - SetLevel("MusicVol", "MusicVolume"); - break; - case VolumeTypes.Master: - SetLevel("MasterVol", "MasterVolume"); - break; - case VolumeTypes.Effects: - SetLevel("EffectsVol", "EffectsVolume"); - break; - default: - break; - } - } - } -} \ No newline at end of file diff --git a/Assets/Content/Weapons/Warsui/Minigun/Materials/MineGod/MineGold.asset b/Assets/Runtime/Actors/Player/SupremacyMixerInstaller.asset similarity index 60% rename from Assets/Content/Weapons/Warsui/Minigun/Materials/MineGod/MineGold.asset rename to Assets/Runtime/Actors/Player/SupremacyMixerInstaller.asset index ac67c1da4..703447905 100644 --- a/Assets/Content/Weapons/Warsui/Minigun/Materials/MineGod/MineGold.asset +++ b/Assets/Runtime/Actors/Player/SupremacyMixerInstaller.asset @@ -9,8 +9,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6691a633fee507c468fbb61f649f459a, type: 3} - m_Name: MineGold + m_Script: {fileID: 11500000, guid: d2e208bf98e26a84fa5159a190fadfeb, type: 3} + m_Name: SupremacyMixerInstaller m_EditorClassIdentifier: - mats: - - {fileID: 2100000, guid: ae203075b714b8644886639ce37df8f0, type: 2} + mixer: {fileID: 24100000, guid: 6030a6e528f25fb4c889c453e8368ada, type: 2} diff --git a/Assets/Runtime/Actors/Player/SupremacyMixerInstaller.asset.meta b/Assets/Runtime/Actors/Player/SupremacyMixerInstaller.asset.meta new file mode 100644 index 000000000..9741d463b --- /dev/null +++ b/Assets/Runtime/Actors/Player/SupremacyMixerInstaller.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1430ef74e99657144a6a75599f390e26 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Runtime/Actors/Player/UserPreferenceInstaller.asset b/Assets/Runtime/Actors/Player/UserPreferenceInstaller.asset new file mode 100644 index 000000000..fb4d504c9 --- /dev/null +++ b/Assets/Runtime/Actors/Player/UserPreferenceInstaller.asset @@ -0,0 +1,19 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8c5d90480cbb2db4cad017357733efdc, type: 3} + m_Name: UserPreferenceInstaller + m_EditorClassIdentifier: + mouseSensitivityDefault: 1 + masterVolumeDefault: 0.75 + effectsVolumeDefault: 0.75 + musicVolumeDefault: 0.75 + masterMixer: {fileID: 11400000, guid: 1430ef74e99657144a6a75599f390e26, type: 2} diff --git a/Assets/Runtime/Actors/Player/UserPreferenceInstaller.asset.meta b/Assets/Runtime/Actors/Player/UserPreferenceInstaller.asset.meta new file mode 100644 index 000000000..de6c5f0b9 --- /dev/null +++ b/Assets/Runtime/Actors/Player/UserPreferenceInstaller.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c1f32f0d33ce3ad44acf465f54c5da84 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Runtime/Actors/Player/UserPreferencesService.cs b/Assets/Runtime/Actors/Player/UserPreferencesService.cs new file mode 100644 index 000000000..527e38a2f --- /dev/null +++ b/Assets/Runtime/Actors/Player/UserPreferencesService.cs @@ -0,0 +1,91 @@ +using System; +using UnityEngine; +using UnityEngine.Audio; +using Zenject; + +namespace SupremacyHangar.Runtime.Actors.Player +{ + [CreateAssetMenu(fileName = "UserPreferencesService", menuName = "Supremacy/Installers/User Preferences Service")] + public class UserPreferencesService : ScriptableObjectInstaller + { + [SerializeField] private float mouseSensitivityDefault = 1.0f; + [SerializeField] private float masterVolumeDefault = 0.75f; + [SerializeField] private float effectsVolumeDefault = 0.75f; + [SerializeField] private float musicVolumeDefault = 0.75f; + + private const string LookSensitivityKey = "LookSensitivity"; + private const string MasterVolumeKey = "MasterVolume"; + private const string EffectsVolumeKey = "EffectsVolume"; + private const string MusicVolumeKey = "MusicVolume"; + + public float MouseSensitivity => mouseSensitivity; + public float MasterVolume => masterVolume; + public float EffectsVolume => effectsVolume; + public float MusicVolume => musicVolume; + + public event Action OnMouseSensitivityChange; + public event Action OnMasterVolumeChange; + public event Action OnEffectsVolumeChange; + public event Action OnMusicVolumeChange; + + private float mouseSensitivity, masterVolume, effectsVolume, musicVolume; + + public void OnEnable() + { + mouseSensitivity = PlayerPrefs.GetFloat(LookSensitivityKey, mouseSensitivityDefault); + masterVolume = PlayerPrefs.GetFloat(MasterVolumeKey, masterVolumeDefault); + effectsVolume = PlayerPrefs.GetFloat(EffectsVolumeKey, effectsVolumeDefault); + musicVolume = PlayerPrefs.GetFloat(MusicVolumeKey, musicVolumeDefault); + } + + public override void InstallBindings() + { + Container.Bind().FromInstance(this).AsSingle(); + } + + public void SetMouseSensitivity(float value) + { + if (Mathf.Approximately(value, mouseSensitivity)) return; + mouseSensitivity = value; + PlayerPrefs.SetFloat(LookSensitivityKey, value); + PlayerPrefs.Save(); + OnMouseSensitivityChange?.Invoke(value); + } + + public void ResetMouseSensitivity() => SetMouseSensitivity(mouseSensitivityDefault); + + public void SetMasterVolume(float value) + { + if (Mathf.Approximately(value, masterVolume)) return; + masterVolume = value; + PlayerPrefs.SetFloat(MasterVolumeKey, value); + PlayerPrefs.Save(); + OnMasterVolumeChange?.Invoke(value); + } + + public void ResetMasterVolume() => SetMasterVolume(masterVolumeDefault); + + public void SetEffectsVolume(float value) + { + if (Mathf.Approximately(value, effectsVolume)) return; + effectsVolume = value; + PlayerPrefs.SetFloat(EffectsVolumeKey, value); + PlayerPrefs.Save(); + OnEffectsVolumeChange?.Invoke(value); + } + + public void ResetEffectsVolume() => SetEffectsVolume(effectsVolumeDefault); + + public void SetMusicVolume(float value) + { + if (Mathf.Approximately(value, musicVolume)) return; + musicVolume = value; + PlayerPrefs.SetFloat(MusicVolumeKey, value); + PlayerPrefs.Save(); + OnMusicVolumeChange?.Invoke(value); + } + + public void ResetMusicVolume() => SetMusicVolume(musicVolumeDefault); + + } +} \ No newline at end of file diff --git a/Assets/Runtime/Actors/Player/UserPreferencesService.cs.meta b/Assets/Runtime/Actors/Player/UserPreferencesService.cs.meta new file mode 100644 index 000000000..001bf27d5 --- /dev/null +++ b/Assets/Runtime/Actors/Player/UserPreferencesService.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 8c5d90480cbb2db4cad017357733efdc +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Runtime/Actors/Silo/SiloState.cs b/Assets/Runtime/Actors/Silo/SiloState.cs index baea4a07c..752e18369 100644 --- a/Assets/Runtime/Actors/Silo/SiloState.cs +++ b/Assets/Runtime/Actors/Silo/SiloState.cs @@ -96,7 +96,7 @@ public void ChangeSiloContentToCrate(SiloItem crateContent) case Mech: case Weapon: contents = crateContent; - environmentManager.UpdatePlayerInventory(siloOffset, crateContent); + environmentManager.UpdatePlayerInventory(SiloNumber, crateContent); break; } diff --git a/Assets/Runtime/Actors/SiloHallway/SiloHallwayUI.cs b/Assets/Runtime/Actors/SiloHallway/SiloHallwayUI.cs index bf7dbc392..199ae8b53 100644 --- a/Assets/Runtime/Actors/SiloHallway/SiloHallwayUI.cs +++ b/Assets/Runtime/Actors/SiloHallway/SiloHallwayUI.cs @@ -106,6 +106,11 @@ private void PopulateDisplay() } } + public void OnAwake() + { + ValidateInteractionButton(); + } + public void OnEnable() { if (bus == null || subscribed) return; @@ -115,6 +120,7 @@ public void OnEnable() public void OnDisable() { + if (siloState != null) siloState.OnStateChanged -= SiloStateChanged; if (bus == null) return; bus.TryUnsubscribe(ProgressUpdated); } @@ -165,6 +171,20 @@ private void SiloStateChanged(SiloState.StateName newState) } } + private bool ValidateInteractionButton() + { + if (interactionButton != null) return true; + + Debug.LogError($"Interaction button NOT set {this.name}.", this); + enabled = false; + + if (interactionButton != null && interactionButtonProgress != null) return true; + + Debug.LogError($"Interaction button progress NOT set {this.name}.", this); + enabled = false; + return false; + } + private void SetupOpenButton() { interactionButtonText.text = openRequestText; diff --git a/Assets/Runtime/ContentLoader/AddressablesManager.cs b/Assets/Runtime/ContentLoader/AddressablesManager.cs index c52b23c43..c91df9e2b 100644 --- a/Assets/Runtime/ContentLoader/AddressablesManager.cs +++ b/Assets/Runtime/ContentLoader/AddressablesManager.cs @@ -51,12 +51,18 @@ public SupremacyData.Runtime.Faction CurrentFaction private bool isComposable = false; private bool isInsideCrate = false; + private Dictionary skinToMeshMap = new(); + private Dictionary reusedMeshNSkin = new(); + private List skinsLoaded = new(); + private Transform siloDirection; + //These are used in editor only private Transform prevTransform; private bool sameMechChassis = false; private AssetReference previousMech; private bool crateOpened = false; private GameObject crateInstance; + private bool quickLoad = false; [Inject] public void Construct(SignalBus bus, SiloSignalHandler siloHandler, CrateSignalHandler crateHandler) @@ -254,22 +260,23 @@ public void QuickSpawn(Transform newSpawn = null, bool isWeapon = false, bool in Debug.LogError("No prior spawn set"); return; } + quickLoad = true; if (newSpawn) - SpawnMech(newSpawn, inCrate, isWeapon, true); + SpawnMech(newSpawn, inCrate, isWeapon); else - SpawnMech(prevTransform, false, isWeapon, true); + SpawnMech(prevTransform, false, isWeapon); } #endif - private Dictionary skinToMeshMap = new(); public void ResetSkinMapping() { - skinToMeshMap.Clear(); + skinToMeshMap.Clear(); + reusedMeshNSkin.Clear(); + skinsLoaded.Clear(); } - private Transform siloDirection; - public void SpawnMech(Transform spawnLocation, bool insideCrate = false, bool isWeaponOnly = false, bool quickLoad = false) + public void SpawnMech(Transform spawnLocation, bool insideCrate = false, bool isWeaponOnly = false) { if (TargetMech == null) { @@ -284,7 +291,7 @@ public void SpawnMech(Transform spawnLocation, bool insideCrate = false, bool is #if UNITY_EDITOR //When new mech is spawned remove previous unless inside crate if (quickLoad) - UnloadMech(quickLoad, insideCrate); + UnloadMech(insideCrate); #endif previousMech = TargetMech; @@ -301,27 +308,33 @@ public void SpawnMech(Transform spawnLocation, bool insideCrate = false, bool is Vector3 spawnPosition = spawnLocation.position; Quaternion spawnRotation = Quaternion.LookRotation(spawnLocation.forward, spawnLocation.up); - //Load and spawn mech - var mechOperationHandler = TargetMech.InstantiateAsync(spawnPosition, spawnRotation, spawnLocation); - StartCoroutine(loadingProgressContext.LoadingAssetProgress(mechOperationHandler, "Loading Mesh")); - - skinToMeshMap.Add(mechOperationHandler, TargetSkin); + if (skinToMeshMap.ContainsValue(TargetSkin)) + reusedMeshNSkin.Add(TargetSkin, spawnLocation); + else + { - mechOperationHandler.Completed += (mech) => - { - if (insideCrate && !crateInstance) - crateInstance = myMech.mech; + //Load and spawn mech + var mechOperationHandler = TargetMech.InstantiateAsync(spawnPosition, spawnRotation, spawnLocation); + StartCoroutine(loadingProgressContext.LoadingAssetProgress(mechOperationHandler, "Loading Mesh")); - myMech.mech = mech.Result; + skinToMeshMap.Add(mechOperationHandler, TargetSkin); - if (isWeaponOnly && !insideCrate) + mechOperationHandler.Completed += (mech) => { - mech.Result.transform.Rotate(Vector3.right, -90.0f); - mech.Result.transform.Rotate(Vector3.forward, -90.0f); - } - - SetLoadedSkin(mech.Result, FindMeshSkin(mech.Result), insideCrate); - }; + if (insideCrate && !crateInstance) + crateInstance = myMech.mech; + + myMech.mech = mech.Result; + + if (isWeaponOnly && !insideCrate) + { + mech.Result.transform.Rotate(Vector3.right, -90.0f); + mech.Result.transform.Rotate(Vector3.forward, -90.0f); + } + + SetLoadedSkin(mech.Result, FindMeshSkin(mech.Result), insideCrate); + }; + } } private AssetReferenceSkin FindMeshSkin(GameObject currentMeshObj) @@ -356,9 +369,20 @@ private void SetLoadedSkin(GameObject result, AssetReferenceSkin skinReference, loadingProgressContext.ProgressSignalHandler.FinishedLoading(result); + foreach (var spawn in reusedMeshNSkin) + { + if (spawn.Key == skinReference) + { + Quaternion spawnRotation = Quaternion.LookRotation(spawn.Value.forward, spawn.Value.up); + Instantiate(result, spawn.Value.position, spawnRotation, spawn.Value); + } + } + + skinsLoaded.Add(true); + if (isInsideCrate) { - if (!WaitingOnComposable()) + if (ComposablesLoaded()) { isInsideCrate = false; _crateSignalHandler.OpenCrate(); @@ -371,8 +395,11 @@ private void SetLoadedSkin(GameObject result, AssetReferenceSkin skinReference, if (isComposable) { - if (!WaitingOnComposable()) + if (ComposablesLoaded()) + { + isComposable= false; _siloSignalHandler.SiloFilled(); + } } else { @@ -383,23 +410,21 @@ private void SetLoadedSkin(GameObject result, AssetReferenceSkin skinReference, ); } - private bool WaitingOnComposable() + private bool ComposablesLoaded() { - float total = 0; - foreach (var loader in skinToMeshMap) - { - total += loader.Key.PercentComplete; - } - if (total >= skinToMeshMap.Count && skinToMeshMap.Count > 1) + if(quickLoad) return true; + + + return isComposable switch { - isComposable = false; - return false; - } - return true; + true when skinToMeshMap.Count > 1 => skinsLoaded.Count == skinToMeshMap.Count, + false => skinsLoaded.Count == skinToMeshMap.Count, + _ => false + }; } #if UNITY_EDITOR - public void UnloadMech(bool quickLoad = false, bool insideCrate = false) + public void UnloadMech(bool insideCrate = false) { if (myMech.skin != null) { diff --git a/Assets/Runtime/FirstPersonController.cs b/Assets/Runtime/FirstPersonController.cs index 10727397f..c2dceea96 100644 --- a/Assets/Runtime/FirstPersonController.cs +++ b/Assets/Runtime/FirstPersonController.cs @@ -25,15 +25,13 @@ public class FirstPersonController : MonoBehaviour [Tooltip("Acceleration and deceleration")] public float SpeedChangeRate = 10.0f; - public float UpdateRotationSpeed - { - get { return RotationSpeed; } - set { RotationSpeed = value; } - } + private UserPreferencesService userPreferences; [Space(10)] [Tooltip("The height the player can jump")] public float JumpHeight = 1.2f; + [Tooltip("The height the player can jump while sprinting")] + public float SprintJumpHeight = 1.5f; [Tooltip("The character uses its own gravity value. The engine default is -9.81f")] public float Gravity = -15.0f; @@ -131,8 +129,9 @@ public void Awake() } [Inject] - public void Inject(SignalBus aBus) + public void Inject(SignalBus aBus, UserPreferencesService userPreferences) { + this.userPreferences = userPreferences; bus = aBus; bus.Subscribe(Resumed); bus.Subscribe(Paused); @@ -329,8 +328,8 @@ private void CameraRotation() //Don't multiply mouse input by Time.deltaTime float deltaTimeMultiplier = IsCurrentDeviceMouse ? 1.0f : Time.deltaTime; - _cinemachineTargetPitch += look.y * RotationSpeed * deltaTimeMultiplier; - _rotationVelocity = look.x * RotationSpeed * deltaTimeMultiplier; + _cinemachineTargetPitch += look.y * RotationSpeed * userPreferences.MouseSensitivity * deltaTimeMultiplier; + _rotationVelocity = look.x * RotationSpeed * userPreferences.MouseSensitivity * deltaTimeMultiplier; // clamp our pitch rotation _cinemachineTargetPitch = ClampAngle(_cinemachineTargetPitch, BottomClamp, TopClamp); @@ -446,7 +445,10 @@ private void JumpAndGravity() if (jump && _jumpTimeoutDelta <= 0.0f) { // the square root of H * -2 * G = how much velocity needed to reach desired height - _verticalVelocity = Mathf.Sqrt(JumpHeight * -2f * Gravity); + if(sprint) + _verticalVelocity = Mathf.Sqrt(SprintJumpHeight * -2f * Gravity); + else + _verticalVelocity = Mathf.Sqrt(JumpHeight * -2f * Gravity); } // jump timeout diff --git a/Assets/Runtime/ScriptableObjects/SupremacyMixer.cs b/Assets/Runtime/ScriptableObjects/SupremacyMixer.cs new file mode 100644 index 000000000..c75029bb0 --- /dev/null +++ b/Assets/Runtime/ScriptableObjects/SupremacyMixer.cs @@ -0,0 +1,66 @@ +using System; +using SupremacyHangar.Runtime.Actors.Player; +using UnityEngine; +using UnityEngine.Audio; +using Zenject; + +namespace SupremacyHangar +{ + [CreateAssetMenu(fileName = "NewSupremacyMixerHandler", menuName = "Supremacy/Audio/Mixer Handler")] + public class SupremacyMixer : ScriptableObjectInstaller + { + [SerializeField] private AudioMixer mixer; + + private UserPreferencesService preferencesService; + + public override void InstallBindings() + { + Container.Bind().FromInstance(this).AsSingle(); + } + + public void OnEnable() + { + if (preferencesService == null) return; + } + + [Inject] + public void InjectDependencies(UserPreferencesService prefsService) + { + preferencesService = prefsService; + preferencesService.OnMasterVolumeChange += SetMasterMixer; + SetMasterMixer(prefsService.MasterVolume); + preferencesService.OnMusicVolumeChange += SetMusicMixer; + SetMusicMixer(prefsService.MusicVolume); + preferencesService.OnEffectsVolumeChange += SetMusicMixer; + SetEffectsMixer(prefsService.EffectsVolume); + } + + public void OnDisable() + { + if (preferencesService == null) return; + preferencesService.OnMasterVolumeChange -= SetMasterMixer; + preferencesService.OnMusicVolumeChange -= SetMusicMixer; + preferencesService.OnEffectsVolumeChange -= SetMusicMixer; + } + + private void SetMasterMixer(float sliderValue) + { + mixer.SetFloat("MasterVol", CalcVolume(sliderValue)); + } + + private void SetMusicMixer(float sliderValue) + { + mixer.SetFloat("MusicVol", CalcVolume(sliderValue)); + } + + private void SetEffectsMixer(float sliderValue) + { + mixer.SetFloat("EffectsVol", CalcVolume(sliderValue)); + } + + private float CalcVolume(float value) + { + return Mathf.Log10(value) * 20; + } + } +} diff --git a/Assets/Runtime/ScriptableObjects/SupremacyMixer.cs.meta b/Assets/Runtime/ScriptableObjects/SupremacyMixer.cs.meta new file mode 100644 index 000000000..2cde1f338 --- /dev/null +++ b/Assets/Runtime/ScriptableObjects/SupremacyMixer.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d2e208bf98e26a84fa5159a190fadfeb +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Settings/AssetMappings.asset b/Assets/Settings/AssetMappings.asset index 6356af998..dfcc153bd 100644 --- a/Assets/Settings/AssetMappings.asset +++ b/Assets/Settings/AssetMappings.asset @@ -1849,10 +1849,10 @@ MonoBehaviour: - containsError: 0 data: {fileID: 804412582113391668, guid: 8be4ef3bc8d5a4e9e9dc0aa252d59a4b, type: 2} reference: - m_AssetGUID: 350bc6144ef06a746b1f1329de284f6d + m_AssetGUID: 9ae8534f75e0c834fad26ef93fd2bd4a m_SubObjectName: m_SubObjectType: - m_EditorAssetChanged: 1 + m_EditorAssetChanged: 0 - containsError: 0 data: {fileID: 5065763395433890026, guid: 8be4ef3bc8d5a4e9e9dc0aa252d59a4b, type: 2} reference: @@ -1884,10 +1884,10 @@ MonoBehaviour: - containsError: 0 data: {fileID: 975694709911912681, guid: 8be4ef3bc8d5a4e9e9dc0aa252d59a4b, type: 2} reference: - m_AssetGUID: 66f091c8137e97d48848907a871e2051 + m_AssetGUID: ffa93a6294922b948b20c318e3fc98a3 m_SubObjectName: m_SubObjectType: - m_EditorAssetChanged: 1 + m_EditorAssetChanged: 0 - containsError: 0 data: {fileID: 5458548568719826459, guid: 8be4ef3bc8d5a4e9e9dc0aa252d59a4b, type: 2} reference: