diff --git a/.editorconfig b/.editorconfig index 6194ecaa..6bd14d64 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1609,3 +1609,7 @@ resharper_xaml_xaml_unknown_device_family_type_highlighting_highlighting = warni resharper_xaml_xaml_xamarin_forms_data_type_and_binding_context_type_mismatched_highlighting_highlighting = warning resharper_xaml_x_key_attribute_disallowed_highlighting = error resharper_xunit_xunit_test_with_console_output_highlighting = warning + +[*.{yml,yaml}] +indent_size = 2 +tab_width = 2 \ No newline at end of file diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 1e87625b..1ae493cc 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -1,6 +1,4 @@ -If you want to contribute to Submerged, you can take a look at the list of open issues and pick something from there. +If you want to contribute to Submerged, you can take a look at the list of open issues and pick something from there. If you want to add an improvement/enhancement/something new, please open an issue first to talk about it. Feel free to pull request bug fixes or other small changes like mod compatibility. - -We do not accept pull request for updating game versions. diff --git a/.github/FOR MOD DEVELOPERS.md b/.github/FOR MOD DEVELOPERS.md index 811373d5..82afab54 100644 --- a/.github/FOR MOD DEVELOPERS.md +++ b/.github/FOR MOD DEVELOPERS.md @@ -16,23 +16,22 @@ Submerged tries to patch as little as possible in order to allow other mods to b - SpawnablePrefabs - `11` - SubmarineStatus -- RPCCalls +- Systems + - `130` - SubmarineOxygenSystem + - `136` - SubmarineElevatorSystem (HallwayLeft) + - `137` - SubmarineElevatorSystem (HallwayRight) + - `138` - SubmarineElevatorSystem (LobbyLeft) + - `139` - SubmarineElevatorSystem (LobbyRight) + - `140` - SubmarineElevatorSystem (Service) + - `141` - SubmarinePlayerFloorSystem + - `142` - SubmarineSecuritySabotageSystem + - `143` - SubmarineSpawnInSystem + - `144` - SubmarineBoxCatSystem +- Reactor MethodRPCs - `210` - SetCustomData - `211` - RequestChangeFloor - - `212` - AcknowledgeChangeFloor - `213` - EngineVent - `214` - OxygenDeath -- Systems - - `130` - SubmarineOxygenSystem - - `136` - SubmarineElevatorSystem (HallwayLeft) - - `137` - SubmarineElevatorSystem (HallwayRight) - - `138` - SubmarineElevatorSystem (LobbyLeft) - - `139` - SubmarineElevatorSystem (LobbyRight) - - `140` - SubmarineElevatorSystem (Service) - - `141` - SubmarinePlayerFloorSystem - - `142` - SubmarineSecuritySabotageSystem - - `143` - SubmarineSpawnInSystem - - `144` - SubmarineBoxCatSystem # Important Classes @@ -46,7 +45,7 @@ Location: `Submerged.Elevators.Objects.ElevatorMover` ## GenericShadowBehaviour -This compnent can be added to objects in order to make them cast a shadow from upper deck to lower deck. You might need to create custom shadow renderers to describe how the shadow needs to be drawn. These classes extend `RelativeShadowRenderer` +This component can be added to objects in order to make them cast a shadow from upper deck to lower deck. You might need to create custom shadow renderers to describe how the shadow needs to be drawn. These classes extend `RelativeShadowRenderer` Location: `Submerged.Floors.Objects.GenericShadowBehaviour` diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 76d97060..e5dd666f 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -2,7 +2,7 @@ name: Bug report about: Create a report to help us improve title: '' -labels: bug +type: Bug assignees: '' --- diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md index 59094e26..f13b4139 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -2,7 +2,7 @@ name: Feature request about: Suggest an idea for this project title: '' -labels: enhancement +type: Feature assignees: '' --- diff --git a/.github/ISSUE_TEMPLATE/submit_translation.md b/.github/ISSUE_TEMPLATE/submit_translation.md index 482c2bf7..74f9bca9 100644 --- a/.github/ISSUE_TEMPLATE/submit_translation.md +++ b/.github/ISSUE_TEMPLATE/submit_translation.md @@ -2,7 +2,7 @@ name: Submit translation about: Help us translate Submerged to other languages title: '' -labels: translation +type: Feature assignees: '' --- diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 00000000..055235c3 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,91 @@ +name: Build + +on: + push: + branches: + - "*" + workflow_dispatch: + +env: + DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true + DOTNET_NOLOGO: true + DOTNET_CLI_TELEMETRY_OPTOUT: true + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Setup .NET + uses: actions/setup-dotnet@v4 + with: + dotnet-version: 9 + + - name: Restore NuGet packages + run: dotnet restore + + - name: Build Debug + run: dotnet build -c Debug --no-restore + + - name: Build Release + run: dotnet build -c Release --no-restore + + - name: Upload mod dll + uses: actions/upload-artifact@v4 + with: + name: Submerged + path: Submerged/bin/Submerged/Release/net6.0/Submerged.dll + + - name: Cache BepInEx and Reactor download + id: cache + uses: actions/cache@v4 + with: + path: BepInEx + key: BepInEx-${{ hashFiles('**/packages.lock.json') }} + + - name: Download BepInEx + if: steps.cache.outputs.cache-hit != 'true' + run: | + BEPINEX_VERSION=$(grep '`v2024.10.29`
`v2024.9.4`
`v2024.8.13` | `v2025.1.30` | [Download](https://github.com/SubmergedAmongUs/Submerged/releases/tag/v2025.1.30/) | +| `v17.0.1`
`v17.0.0` | `v2025.10.22` | [Download](https://github.com/SubmergedAmongUs/Submerged/releases/tag/v2025.10.22/) | +| `v16.1.0`
`v16.0.5`
`v16.0.3`
`v16.0.2`
`v16.0.0` | Unavailable | - | +| `v2024.11.26`
`v2024.10.29`
`v2024.9.4`
`v2024.8.13` | `v2025.1.30` | [Download](https://github.com/SubmergedAmongUs/Submerged/releases/tag/v2025.1.30/) | | `v2024.6.18` | `v2024.8.1` | [Download](https://github.com/SubmergedAmongUs/Submerged/releases/tag/v2024.8.1/) | | `v2024.6.4`
`v2024.3.5` | `v2024.3.25` | [Download](https://github.com/SubmergedAmongUs/Submerged/releases/tag/v2024.3.25/) | | `v2023.11.28` | `v2023.11.29` | [Download](https://github.com/SubmergedAmongUs/Submerged/releases/tag/v2023.11.29/) | @@ -66,10 +68,10 @@ The table below lists the most recent Submerged release for each Among Us versio Submerged depends on the following mods and modding tools in order to function properly: -| Mod | Version | -|-----------------------------------------------------------|--------------------------| -| [BepInEx](https://builds.bepinex.dev/projects/bepinex_be) | `v6.0.0-be.692` or later | -| [Reactor](https://github.com/nuclearpowered/reactor) | `v2.3.0` or later | +| Mod | Version | +|-----------------------------------------------------------|-------------------| +| [BepInEx](https://builds.bepinex.dev/projects/bepinex_be) | `v6.0.0-be.735` | +| [Reactor](https://github.com/nuclearpowered/reactor) | `v2.5.0` or later | > [!Note] > If you are using the Microsoft Store version of Among Us, you will need to download the `Unity (IL2CPP) for Windows (x64) games` version of BepInEx. Otherwise, you will need to download the `Unity (IL2CPP) for Windows (x86) games` version. @@ -87,7 +89,7 @@ This mod has been tested and works with the Steam, Epic, itch.io and Microsoft S 1. Download the correct ZIP [release](#releases) based on your Among Us version. 2. Navigate to your Among Us installation directory. 3. Extract the downloaded files there. Ensure that the `BepInEx` folder is located in the same folder as the `Among Us.exe` file (Check screenshot below). -![Folder Structure](./.github/Images/Folder-Structure.png) + ![Folder Structure](./.github/Images/Folder-Structure.png) 4. Run the game (Please note that the first launch might take some time). @@ -100,16 +102,16 @@ Submerged is available in the languages listed below. If you would like to help | Language | ❔ | Status | |-------------------------|:--:|:---------------------------------:| | English | ✅ | - | -| Deutsch | ✅ | Fully Translated | -| Français | ✅ | Fully Translated | -| Italiano | ✅ | Fully Translated | -| Nederlands | ✅ | Fully Translated | -| Português (Brasil) | ✅ | Fully Translated | -| Русский | ✅ | Fully Translated | -| 日本語 | ✅ | Fully Translated | -| 简体中文 | ✅ | Fully Translated | -| 繁體中文 | ✅ | Fully Translated | +| Deutsch | 🟡 | Partially Translated | | Español | 🟡 | Partially Translated | +| Français | 🟡 | Partially Translated | +| Italiano | 🟡 | Partially Translated | +| Nederlands | 🟡 | Partially Translated | +| Português (Brasil) | 🟡 | Partially Translated | +| Русский | 🟡 | Partially Translated | +| 日本語 | 🟡 | Partially Translated | +| 简体中文 | 🟡 | Partially Translated | +| 繁體中文 | 🟡 | Partially Translated | | Bisaya | ❌ | Not Translated | | Español (Latinoamérica) | ❌ | Not Translated
(Using Español) | | Gaeilge | ❌ | Not Translated | @@ -140,41 +142,41 @@ _This mod is not affiliated with Among Us or Innersloth LLC, and the content con For business inquiries, please contact us at `submergedamongus@gmail.com`. - # Credits - Project Lead - - [5up](https://twitch.tv/5up/) + - [5up](https://twitch.tv/5up/) - Developers - - [Alexejhero](https://github.com/Alexejhero/) - - [arctic_zeph](https://twitter.com/arctic_zeph/) - - [probablyadnf](https://github.com/simonkellly/) + - [Alexejhero](https://github.com/Alexejhero/) + - [arctic_zeph](https://twitter.com/arctic_zeph/) + - [probablyadnf](https://github.com/simonkellly/) - Map Design - - [Axyn](https://twitter.com/itsAxyn/) - - [Blaustoise](https://twitter.com/blaustoise/) + - [Axyn](https://twitter.com/itsAxyn/) + - [Blaustoise](https://twitter.com/blaustoise/) - Artists - - [colerobin_](https://twitter.com/colerobin_) - - [flipsonthemoon](https://twitter.com/flipsonthemoon/) - - [mushrium](https://twitter.com/mushrium/) - - [sabimrtn](https://twitter.com/sabimrtn/) - - [theinkpages](https://www.instagram.com/theinkpages/) - - [xiiyta](https://twitter.com/xiiyta/) -- Technical Support - - [cybershard](https://github.com/cybershard/) - - [js6pak](https://github.com/js6pak) - - [Sanae6](https://twitter.com/Sanae6k/) + - [colerobin_](https://twitter.com/colerobin_) + - [flipsonthemoon](https://twitter.com/flipsonthemoon/) + - [mushrium](https://twitter.com/mushrium/) + - [sabimrtn](https://twitter.com/sabimrtn/) + - [theinkpages](https://www.instagram.com/theinkpages/) + - [xiiyta](https://twitter.com/xiiyta/) +- Contributors + - [cybershard](https://github.com/cybershard/) + - [js6pak](https://github.com/js6pak) + - [Sanae6](https://twitter.com/Sanae6k/) + - [XtraCube](https://github.com/xtracube/) - Additional Art - - [acronmd](https://twitter.com/acronmd/) - - [pb](https://twitter.com/QueenTamandua/) + - [acronmd](https://twitter.com/acronmd/) + - [QueenPb](https://twitter.com/QueenTamandua/) - Translators - - Dekokiyo - 日本語 - - ItsNiceCraft - Deutsch - - MissJukebox - Español - - Monid73 - Русский - - PENGUN - Italiano - - RevoLou - Português do Brasil - - RobinRMC - Nederlands - - SPRLC - Français - - ねろちゃん - 日本語 - - 阿龍DragonTw - 繁體中文 - - 黑客Hecker - 简体中文 + - Dekokiyo - 日本語 + - ItsNiceCraft - Deutsch + - MissJukebox - Español + - Monid73 - Русский + - PENGUN - Italiano + - RevoLou - Português do Brasil + - RobinRMC - Nederlands + - SPRLC - Français + - ねろちゃん - 日本語 + - 阿龍DragonTw - 繁體中文 + - 黑客Hecker - 简体中文 diff --git a/Submerged/BaseGame/BaseGameCodeAttribute.cs b/Submerged/BaseGame/BaseGameCodeAttribute.cs index 49536a54..49e40bab 100644 --- a/Submerged/BaseGame/BaseGameCodeAttribute.cs +++ b/Submerged/BaseGame/BaseGameCodeAttribute.cs @@ -5,7 +5,8 @@ namespace Submerged.BaseGame; public enum LastChecked { // ReSharper disable InconsistentNaming - v2024_8_13, + v17_0_0, + v17_0_1 // ReSharper restore InconsistentNaming } diff --git a/Submerged/BaseGame/Extensions/Minigame.cs b/Submerged/BaseGame/Extensions/Minigame.cs index 0d2e9fb2..43f46ea5 100644 --- a/Submerged/BaseGame/Extensions/Minigame.cs +++ b/Submerged/BaseGame/Extensions/Minigame.cs @@ -4,43 +4,34 @@ namespace Submerged.BaseGame.Extensions; public static class MinigameExtensions { - [BaseGameCode(LastChecked.v2024_8_13, "Entire method is copied from base game because we can't call it from the base pointer since that causes an infinite loop.")] + [BaseGameCode(LastChecked.v17_0_0, "Entire method is copied from base game because we can't call it from the base pointer since that causes an infinite loop.")] public static void BaseClose(this Minigame self) { - bool isComplete; - if (self.amClosing == Minigame.CloseState.Closing) + if (self.amClosing != Minigame.CloseState.Closing) { - UnityEngine.Object.Destroy(self.gameObject); + if (self.CloseSound && Constants.ShouldPlaySfx()) + { + SoundManager.Instance.PlaySound(self.CloseSound, false); + } + if (PlayerControl.LocalPlayer.Data.Role.TeamType == RoleTeamTypes.Crewmate) + { + GameManager.Instance.LogicMinigame.OnMinigameClose(); + } + if (PlayerControl.LocalPlayer) + { + PlayerControl.HideCursorTemporarily(); + } + self.amClosing = Minigame.CloseState.Closing; + self.logger.Info("Closing minigame " + self.GetType().Name); + IAnalyticsReporter analytics = DebugAnalytics.Instance.Analytics; + NetworkedPlayerInfo data = PlayerControl.LocalPlayer.Data; + TaskTypes taskType = self.TaskType; + float num = Time.realtimeSinceStartup - self.timeOpened; + PlayerTask myTask = self.MyTask; + analytics.MinigameClosed(data, taskType, num, myTask != null && myTask.IsComplete); + self.StartCoroutine(self.CoDestroySelf()); return; } - if (self.CloseSound && Constants.ShouldPlaySfx()) - { - SoundManager.Instance.PlaySound(self.CloseSound, false, 1f, null); - } - if (PlayerControl.LocalPlayer.Data.Role.TeamType == RoleTeamTypes.Crewmate) - { - GameManager.Instance.LogicMinigame.OnMinigameClose(); - } - if (PlayerControl.LocalPlayer) - { - PlayerControl.HideCursorTemporarily(); - } - self.amClosing = Minigame.CloseState.Closing; - self.logger.Info(string.Concat("Closing minigame ", self.GetType().Name)); - IAnalyticsReporter analytics = DestroyableSingleton.Instance.Analytics; - NetworkedPlayerInfo data = PlayerControl.LocalPlayer.Data; - TaskTypes taskType = self.TaskType; - float realtimeSinceStartup = Time.realtimeSinceStartup - self.timeOpened; - PlayerTask myTask = self.MyTask; - if (myTask != null) - { - isComplete = myTask.IsComplete; - } - else - { - isComplete = false; - } - analytics.MinigameClosed(data, taskType, realtimeSinceStartup, isComplete); - self.StartCoroutine(self.CoDestroySelf()); + UnityObject.Destroy(self.gameObject); } } diff --git a/Submerged/BaseGame/Interfaces/IDoorMinigame.cs b/Submerged/BaseGame/Interfaces/IDoorMinigame.cs index 2fa1a9cc..95f64589 100644 --- a/Submerged/BaseGame/Interfaces/IDoorMinigame.cs +++ b/Submerged/BaseGame/Interfaces/IDoorMinigame.cs @@ -3,7 +3,7 @@ // ReSharper disable once InconsistentNaming public sealed partial class AU { - [BaseGameCode(LastChecked.v2024_8_13)] + [BaseGameCode(LastChecked.v17_0_0)] public interface IDoorMinigame { [UsedImplicitly] diff --git a/Submerged/BaseGame/Interfaces/ISystemType.cs b/Submerged/BaseGame/Interfaces/ISystemType.cs index c554f6fb..5ea7ffdd 100644 --- a/Submerged/BaseGame/Interfaces/ISystemType.cs +++ b/Submerged/BaseGame/Interfaces/ISystemType.cs @@ -5,7 +5,7 @@ namespace Submerged.BaseGame.Interfaces; // ReSharper disable once InconsistentNaming public sealed partial class AU { - [BaseGameCode(LastChecked.v2024_8_13)] + [BaseGameCode(LastChecked.v17_0_0)] public interface ISystemType { [UsedImplicitly] @@ -17,6 +17,9 @@ public interface ISystemType [UsedImplicitly] void UpdateSystem(PlayerControl player, MessageReader msgReader); + [UsedImplicitly] + void MarkClean(); + [UsedImplicitly] void Serialize(MessageWriter writer, bool initialState); diff --git a/Submerged/BaseGame/Interfaces/IUsable.cs b/Submerged/BaseGame/Interfaces/IUsable.cs index 83947dac..5bb027eb 100644 --- a/Submerged/BaseGame/Interfaces/IUsable.cs +++ b/Submerged/BaseGame/Interfaces/IUsable.cs @@ -3,7 +3,7 @@ // ReSharper disable once InconsistentNaming public sealed partial class AU { - [BaseGameCode(LastChecked.v2024_8_13)] + [BaseGameCode(LastChecked.v17_0_0)] public interface IUsable { [UsedImplicitly] diff --git a/Submerged/BaseGame/Interfaces/IUsableCooldown.cs b/Submerged/BaseGame/Interfaces/IUsableCooldown.cs index 1e35f01e..19457a7e 100644 --- a/Submerged/BaseGame/Interfaces/IUsableCooldown.cs +++ b/Submerged/BaseGame/Interfaces/IUsableCooldown.cs @@ -3,7 +3,7 @@ // ReSharper disable once InconsistentNaming public sealed partial class AU { - [BaseGameCode(LastChecked.v2024_8_13)] + [BaseGameCode(LastChecked.v17_0_0)] public interface IUsableCoolDown : IUsable { [UsedImplicitly] diff --git a/Submerged/BaseGame/Patches/AirshipUploadGame.cs b/Submerged/BaseGame/Patches/AirshipUploadGame.cs index e36d3eb7..f49af818 100644 --- a/Submerged/BaseGame/Patches/AirshipUploadGame.cs +++ b/Submerged/BaseGame/Patches/AirshipUploadGame.cs @@ -8,7 +8,8 @@ public static class AirshipUploadGameUpdatePatches { [HarmonyPatch(typeof(AirshipUploadGame), nameof(AirshipUploadGame.Update))] [HarmonyPrefix] - [BaseGameCode(LastChecked.v2024_8_13, "Patching the method with it's own code because C# > C++")] + [BaseGameCode(LastChecked.v17_0_0, "This minigame would not work unles we patched this method with its own code. " + + "If it works without this patch then the patch can be removed.")] public static void Prefix(AirshipUploadGame __instance, out bool __runOriginal) { __runOriginal = false; diff --git a/Submerged/BaseGame/Patches/TextTranslatorTMP.cs b/Submerged/BaseGame/Patches/TextTranslatorTMP.cs index 07533ac2..d07dd507 100644 --- a/Submerged/BaseGame/Patches/TextTranslatorTMP.cs +++ b/Submerged/BaseGame/Patches/TextTranslatorTMP.cs @@ -8,17 +8,20 @@ public static class TextTranslatorTMPPatches { [HarmonyPatch(typeof(TextTranslatorTMP), nameof(TextTranslatorTMP.ResetText))] [HarmonyPrefix] - [BaseGameCode(LastChecked.v2024_8_13, "We are patching this with its own code to get rid of inlining that ruins our translation patches")] + [BaseGameCode(LastChecked.v17_0_0, "We are patching this with its own code to get rid of inlining that ruins our translation patches")] public static void ResetTextPatch(TextTranslatorTMP __instance, out bool __runOriginal) { __runOriginal = false; - if (__instance.ResetOnlyWhenNoDefault) return; + if (__instance.ResetOnlyWhenNoDefault && string.IsNullOrEmpty(__instance.defaultStr)) return; TextMeshPro component = __instance.GetComponent(); - string text = DestroyableSingleton.Instance.GetStringWithDefault(__instance.TargetText, __instance.defaultStr); + string text = TranslationController.Instance.GetStringWithDefault(__instance.TargetText, __instance.defaultStr); - if (__instance.ToUpper) text = text.ToUpperInvariant(); + if (__instance.ToUpper) + { + text = text.ToUpperInvariant(); + } if (component != null) { diff --git a/Submerged/Debugging/DebugMode.cs b/Submerged/Debugging/DebugMode.cs index 7fda0d0c..c6bf9e76 100644 --- a/Submerged/Debugging/DebugMode.cs +++ b/Submerged/Debugging/DebugMode.cs @@ -14,7 +14,7 @@ public static void Initialize(SubmergedPlugin plugin) DebugWindow.Instance.Tabs.Add(new SubmergedTab()); DebugWindow.Instance.Tabs.Add(new ModdingTab()); DebugWindow.Instance.Tabs.Add(new KillAnimEditorTab()); - GameOptionsData.MaxImpostors = Enumerable.Repeat(3, 16).ToArray(); - HideNSeekGameOptionsV07.MaxImpostors = Enumerable.Repeat(1, 16).ToArray(); + NormalGameOptionsV09.MaxImpostors = Enumerable.Repeat(3, 16).ToArray(); + HideNSeekGameOptionsV09.MaxImpostors = Enumerable.Repeat(1, 16).ToArray(); } } diff --git a/Submerged/Debugging/Patches/GameTestingPatches.cs b/Submerged/Debugging/Patches/GameTestingPatches.cs index 48aec3d4..b5a22042 100644 --- a/Submerged/Debugging/Patches/GameTestingPatches.cs +++ b/Submerged/Debugging/Patches/GameTestingPatches.cs @@ -1,4 +1,5 @@ -using HarmonyLib; +using AmongUs.Data.Player; +using HarmonyLib; namespace Submerged.Debugging.Patches; @@ -12,7 +13,7 @@ public static void AllowStartingWithOnePlayerPatch(GameStartManager __instance) __instance.MinPlayers = 1; } - [HarmonyPatch(typeof(StatsManager), nameof(StatsManager.AmBanned), MethodType.Getter)] + [HarmonyPatch(typeof(PlayerBanData), nameof(PlayerBanData.IsBanned), MethodType.Getter)] [HarmonyPostfix] public static void PreventBanPatch(out bool __result) { @@ -27,11 +28,10 @@ public static void PreventBanPatch(out bool __result) [HarmonyPriority(Priority.First)] public static bool StopGameEndingPatch() => false; - [HarmonyPatch(typeof(AprilFoolsMode), nameof(AprilFoolsMode.ShouldShowAprilFoolsToggle))] - [HarmonyPrefix] - public static bool EnableAprilFoolsTogglePatch(out bool __result) + [HarmonyPatch(typeof(CreateGameOptions), nameof(CreateGameOptions.Show))] + [HarmonyPostfix] + public static void ShowAprilFoolsToggle(CreateGameOptions __instance) { - __result = true; - return false; + __instance.AprilFoolsToggle.SetActive(true); } } diff --git a/Submerged/Debugging/Tabs/IDebugTab.cs b/Submerged/Debugging/Tabs/IDebugTab.cs index 5629e682..8669f545 100644 --- a/Submerged/Debugging/Tabs/IDebugTab.cs +++ b/Submerged/Debugging/Tabs/IDebugTab.cs @@ -2,8 +2,8 @@ public interface IDebugTab { - public string Name { get; } - public bool ShouldShow { get; } + string Name { get; } + bool ShouldShow { get; } - public void BuildGUI(); + void BuildGUI(); } diff --git a/Submerged/Debugging/Tabs/ModdingTab.cs b/Submerged/Debugging/Tabs/ModdingTab.cs index ef34a813..3e78f10f 100644 --- a/Submerged/Debugging/Tabs/ModdingTab.cs +++ b/Submerged/Debugging/Tabs/ModdingTab.cs @@ -8,6 +8,7 @@ using Submerged.KillAnimation.Patches; using Submerged.Loading; using Submerged.Map; +using Submerged.Systems.Oxygen; using UnityEngine; namespace Submerged.Debugging.Tabs; @@ -54,15 +55,13 @@ public void BuildGUI() if (GUILayout.Button("Murder Self (O2)")) { OxygenDeathAnimationPatches.IsOxygenDeath = true; - OxygenDeathRpcPatches.MurderPlayerAsOxygenDeath = true; try { - PlayerControl.LocalPlayer.RpcMurderPlayer(PlayerControl.LocalPlayer, true); + SubmarineOxygenSystem.RpcOxygenDeath(PlayerControl.LocalPlayer); } finally { - OxygenDeathRpcPatches.MurderPlayerAsOxygenDeath = false; OxygenDeathAnimationPatches.IsOxygenDeath = false; } } diff --git a/Submerged/Elevators/Patches/GameplayObjectsInElevatorPatches.cs b/Submerged/Elevators/Patches/GameplayObjectsInElevatorPatches.cs index ec4fdedc..2bfb1d92 100644 --- a/Submerged/Elevators/Patches/GameplayObjectsInElevatorPatches.cs +++ b/Submerged/Elevators/Patches/GameplayObjectsInElevatorPatches.cs @@ -1,3 +1,4 @@ +using AmongUs.GameOptions; using HarmonyLib; using Submerged.Elevators.Objects; using Submerged.Extensions; @@ -15,7 +16,7 @@ public static class GameplayObjectsInElevatorPatches public static bool MoveShapeshifterEvidencePatch(ShapeshifterRole __instance) { if (!ShipStatus.Instance.IsSubmerged()) return true; - if (!GameManager.Instance.LogicOptions.GetShapeshifterLeaveSkin()) return false; + if (!GameManager.Instance.LogicOptions.GetRoleBool(BoolOptionNames.ShapeshifterLeaveSkin)) return false; ShapeshifterEvidence evidence = UnityObject.Instantiate(__instance.EvidencePrefab); Vector3 evidencePosition = __instance.Player.transform.position + __instance.EvidenceOffset * 0.7f; diff --git a/Submerged/Elevators/SubmarineElevatorSystem.cs b/Submerged/Elevators/SubmarineElevatorSystem.cs index 868988b9..ed50c7b3 100644 --- a/Submerged/Elevators/SubmarineElevatorSystem.cs +++ b/Submerged/Elevators/SubmarineElevatorSystem.cs @@ -94,6 +94,11 @@ public void Deserialize(MessageReader reader, bool initialState) lerpTimer = 0; } + public void MarkClean() + { + IsDirty = false; + } + public void Serialize(MessageWriter writer, bool initialState) { writer.Write(upperDeckIsTargetFloor); diff --git a/Submerged/Enums/CustomRpcCalls.cs b/Submerged/Enums/CustomRpcCalls.cs index 482f5ab8..9e3cacab 100644 --- a/Submerged/Enums/CustomRpcCalls.cs +++ b/Submerged/Enums/CustomRpcCalls.cs @@ -5,7 +5,6 @@ public static class CustomRpcCalls // ReSharper disable InconsistentNaming public const byte SetCustomData = 210; public const byte RequestChangeFloor = 211; - public const byte AcknowledgeChangeFloor = 212; public const byte EngineVent = 213; public const byte OxygenDeath = 214; // ReSharper restore InconsistentNaming diff --git a/Submerged/Enums/CustomStringNames.cs b/Submerged/Enums/CustomStringNames.cs index 19af379f..b63328fa 100644 --- a/Submerged/Enums/CustomStringNames.cs +++ b/Submerged/Enums/CustomStringNames.cs @@ -40,6 +40,7 @@ private CustomStringNames(int stringName, string constantValue) : this(stringNam // General public static readonly CustomStringNames Submerged = new(555_0_000, "Submerged"); + public static readonly CustomStringNames SubmergedTooltip = new(555_0_001, () => General.SubmergedTooltip); // Rooms public static readonly CustomStringNames Research = new(555_1_000, () => Locations.Research); diff --git a/Submerged/Enums/CustomTaskTypes.cs b/Submerged/Enums/CustomTaskTypes.cs index 9ae92e2e..fecf2985 100644 --- a/Submerged/Enums/CustomTaskTypes.cs +++ b/Submerged/Enums/CustomTaskTypes.cs @@ -1,10 +1,11 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using static NormalPlayerTask.TaskLength; using static Submerged.Enums.CustomTaskTypes.Floor; namespace Submerged.Enums; -public readonly struct CustomTaskTypes +public readonly struct CustomTaskTypes : IEquatable { #region Struct implementation @@ -40,6 +41,16 @@ public enum Floor Both = LowerDeck | UpperDeck } + public bool Equals(CustomTaskTypes other) => taskType == other.taskType; + + public override bool Equals(object obj) => obj is CustomTaskTypes other && Equals(other); + + public override int GetHashCode() => (int) taskType; + + public static bool operator ==(CustomTaskTypes left, CustomTaskTypes right) => left.Equals(right); + + public static bool operator !=(CustomTaskTypes left, CustomTaskTypes right) => !left.Equals(right); + #endregion #region Enum members @@ -132,7 +143,7 @@ public enum Floor [UsedImplicitly] public static readonly CustomTaskTypes RetrieveOxygenMask = new(0x98, CustomStringNames.RetrieveOxygenMask, Both, None); - // ReSharper restore InconsistentNaming, UnusedMember.Global + // ReSharper restore InconsistentNaming #endregion } diff --git a/Submerged/ExileCutscene/FishController.cs b/Submerged/ExileCutscene/FishController.cs index d1d5a6da..e50e1132 100644 --- a/Submerged/ExileCutscene/FishController.cs +++ b/Submerged/ExileCutscene/FishController.cs @@ -66,8 +66,14 @@ public void PlayBite() public void Closed() { - targetObj!?.gameObject.SetActive(false); - bubbles!?.Stop(); + if (targetObj != null) + { + targetObj.gameObject.SetActive(false); + } + if (bubbles != null) + { + bubbles.Stop(); + } this.StartCoroutine(LerpSpeed(0.5f, _speed, 25f)); } diff --git a/Submerged/ExileCutscene/SubmergedExileController.cs b/Submerged/ExileCutscene/SubmergedExileController.cs index 7b98a184..9ed0b988 100644 --- a/Submerged/ExileCutscene/SubmergedExileController.cs +++ b/Submerged/ExileCutscene/SubmergedExileController.cs @@ -193,9 +193,9 @@ private IEnumerator HandleText() yield return WrapUpAndSpawn(); } - // CLeanup this WrapUpAndSpawn method + // Cleanup this WrapUpAndSpawn method [HideFromIl2Cpp] - [BaseGameCode(LastChecked.v2024_8_13, "Similar to AirshipExileController.WrapUpAndSpawn")] + [BaseGameCode(LastChecked.v17_0_0, "Similar to AirshipExileController.WrapUpAndSpawn")] public IEnumerator WrapUpAndSpawn() { if (initData != null && initData.networkedPlayer) @@ -212,19 +212,18 @@ public IEnumerator WrapUpAndSpawn() if (TutorialManager.InstanceExists || (GameManager.Instance && !GameManager.Instance.LogicFlow.IsGameOverDueToDeath())) { - ShipStatus.Instance.StartCoroutine(ShipStatus.Instance.PrespawnStep()); + yield return ShipStatus.Instance.PrespawnStep(); // We can't use ReEnableGameplay because it fades the screen to clear and we don't want that PlayerControl.LocalPlayer.SetKillTimer(GameManager.Instance.LogicOptions.GetKillCooldown()); ShipStatus.Instance.EmergencyCooldown = GameManager.Instance.LogicOptions.GetEmergencyCooldown(); - Camera.main!.GetComponent().Locked = false; - DestroyableSingleton.Instance.SetHudActive(true); + HudManager.Instance.PlayerCam.Locked = false; + HudManager.Instance.SetMapButtonEnabled(true); + HudManager.Instance.SetHudActive(true); ControllerManager.Instance.CloseAndResetAll(); } Destroy(gameObject); - - yield break; } public override CppIEnumerator Animate() => WaitForFadeAndAnimate().WrapToIl2Cpp(); diff --git a/Submerged/Extensions/ComponentExtensions.cs b/Submerged/Extensions/ComponentExtensions.cs index 65993c67..3dd1014b 100644 --- a/Submerged/Extensions/ComponentExtensions.cs +++ b/Submerged/Extensions/ComponentExtensions.cs @@ -33,9 +33,11 @@ private static Dictionary RegisteredTypes } } - public static T EnsureComponent(this GameObject obj) where T : Component => obj.GetComponent() ?? obj.AddComponent(); + public static T EnsureComponent(this GameObject obj) where T : Component => + obj.TryGetComponent(out T comp) ? comp : obj.AddComponent(); - public static Component EnsureComponent(this GameObject obj, Type type) => obj.GetComponent(Il2CppType.From(type)) ?? obj.AddComponent(Il2CppType.From(type)); + public static Component EnsureComponent(this GameObject obj, Type type) + => obj.TryGetComponent(Il2CppType.From(type), out Component comp) ? comp : obj.AddComponent(Il2CppType.From(type)); public static Component AddInjectedComponentByName(this GameObject obj, string typeName) => obj.AddComponent(Il2CppType.From(RegisteredTypes[typeName])); } diff --git a/Submerged/Floors/FloorHandler.cs b/Submerged/Floors/FloorHandler.cs index 54293075..92d78171 100644 --- a/Submerged/Floors/FloorHandler.cs +++ b/Submerged/Floors/FloorHandler.cs @@ -1,9 +1,7 @@ using System; using System.Collections.Generic; -using System.Linq; -using HarmonyLib; -using Hazel; using Il2CppInterop.Runtime; +using Reactor.Networking.Attributes; using Reactor.Utilities.Attributes; using Submerged.Enums; using Submerged.Extensions; @@ -35,8 +33,6 @@ public sealed class FloorHandler(nint ptr) : MonoBehaviour(ptr) private PlayerControl _player; private Transform _transform; - public IEnumerable ints = new List(); - private PlayerControl Player { get => _player ? _player : _player = GetComponent(); @@ -169,19 +165,11 @@ public void RpcRequestChangeFloor(bool toUpper) return; } - if (!Player.AmOwner) Error("Trying to change the floor of another player will lead to an anticheat ban on official servers and is not supported."); - MessageWriter writer = AmongUsClient.Instance.StartRpc(PlayerControl.LocalPlayer.MyPhysics.NetId, CustomRpcCalls.RequestChangeFloor); - writer.Write(toUpper); - writer.Write(lastSid++); - writer.EndMessage(); - - ints.AddItem(lastSid); + RpcRequestChangeFloor(PlayerControl.LocalPlayer, toUpper, lastSid++); } public void UpdateFloor() { - if (ints.Any()) return; - SubmarinePlayerFloorSystem.Instance.playerFloorStates.TryGetValue(Player.PlayerId, out onUpper); if (Player.PlayerId == PlayerControl.LocalPlayer.PlayerId) @@ -239,4 +227,18 @@ private static void CleanCache() _hashCodeToFloorHandler.Remove(hashCodesToRemove[i]); } } + + [MethodRpc(CustomRpcCalls.RequestChangeFloor)] + public static void RpcRequestChangeFloor(PlayerControl player, bool toUpper, int sid) + { + if (!AmongUsClient.Instance.AmHost) return; + + SubmarinePlayerFloorSystem floorSystem = SubmarinePlayerFloorSystem.Instance; + + if (!floorSystem.playerFloorSids.ContainsKey(player.PlayerId) || floorSystem.playerFloorSids[player.PlayerId] <= sid) + { + floorSystem.playerFloorSids[player.PlayerId] = sid; + floorSystem!.ChangePlayerFloorState(player.PlayerId, toUpper); + } + } } diff --git a/Submerged/Floors/Objects/LongPlayerShadowRenderer.cs b/Submerged/Floors/Objects/LongPlayerShadowRenderer.cs index 204d06f1..5a18ecce 100644 --- a/Submerged/Floors/Objects/LongPlayerShadowRenderer.cs +++ b/Submerged/Floors/Objects/LongPlayerShadowRenderer.cs @@ -15,26 +15,29 @@ protected override void Start() body.gameObject.layer = LayerMask.NameToLayer("Players"); } + private SpriteRenderer _lastRenderer; + protected override void LateUpdate() { base.LateUpdate(); - if (targetRenderer) + if (!targetRenderer || _lastRenderer == targetRenderer) return; + + _lastRenderer = targetRenderer; + + switch (targetRenderer.name) { - switch (targetRenderer.name) - { - case "LongNeck": - shadowRenderer.size = new Vector2(targetRenderer.size.x, 1.1f); - break; - - case "ForegroundNeck": - shadowRenderer.size = new Vector2(targetRenderer.size.x, 1.7f); - break; - - case "LongHead": - shadowRenderer.transform.localPosition = new Vector3(shadowRenderer.transform.localPosition.x, body.neckSprite.transform.localPosition.y + 2.79f, shadowRenderer.transform.localPosition.z); - break; - } + case "LongNeck": + shadowRenderer.size = new Vector2(targetRenderer.size.x, 1.1f); + break; + + case "ForegroundNeck": + shadowRenderer.size = new Vector2(targetRenderer.size.x, 1.7f); + break; + + case "LongHead": + shadowRenderer.transform.localPosition = new Vector3(shadowRenderer.transform.localPosition.x, body.neckSprite.transform.localPosition.y + 2.79f, shadowRenderer.transform.localPosition.z); + break; } } } diff --git a/Submerged/Floors/Objects/RelativeShadowRenderer.cs b/Submerged/Floors/Objects/RelativeShadowRenderer.cs index 3702dbae..44022ceb 100644 --- a/Submerged/Floors/Objects/RelativeShadowRenderer.cs +++ b/Submerged/Floors/Objects/RelativeShadowRenderer.cs @@ -37,34 +37,35 @@ protected virtual void LateUpdate() { if (!ShipStatus.Instance) return; + Transform objTransform = transform; + if (isRoot) { - transform.localPosition = new Vector3(-0.04f, 0, 0); // slight offset in the shadow idk why - transform.localScale = Vector3.one; - transform.localRotation = Quaternion.identity; + objTransform.localPosition = new Vector3(-0.04f, 0, 0); // slight offset in the shadow idk why + objTransform.localScale = Vector3.one; + objTransform.localRotation = Quaternion.identity; } else { - transform.localPosition = target.transform.localPosition; - transform.localScale = target.transform.localScale; - transform.localRotation = target.transform.localRotation; + objTransform.localPosition = target.transform.localPosition; + objTransform.localScale = target.transform.localScale; + objTransform.localRotation = target.transform.localRotation; } - if (targetRenderer) - { - shadowRenderer.enabled = targetRenderer.enabled && targetRenderer.gameObject.activeInHierarchy && EnableShadow; - shadowRenderer.sprite = GetReplacementSprite(targetRenderer.sprite); - shadowRenderer.SetColorAlpha(targetRenderer.color.a); - shadowRenderer.flipX = targetRenderer.flipX; - shadowRenderer.flipY = targetRenderer.flipY; - shadowRenderer.size = targetRenderer.size; - shadowRenderer.drawMode = targetRenderer.drawMode; - shadowRenderer.tileMode = targetRenderer.tileMode; - shadowRenderer.adaptiveModeThreshold = targetRenderer.adaptiveModeThreshold; - } + if (!targetRenderer) return; + + shadowRenderer.enabled = targetRenderer.enabled && targetRenderer.gameObject.activeInHierarchy && EnableShadow; + shadowRenderer.sprite = GetReplacementSprite(targetRenderer.sprite); + shadowRenderer.SetColorAlpha(targetRenderer.color.a); + shadowRenderer.flipX = targetRenderer.flipX; + shadowRenderer.flipY = targetRenderer.flipY; + shadowRenderer.size = targetRenderer.size; + shadowRenderer.drawMode = targetRenderer.drawMode; + shadowRenderer.tileMode = targetRenderer.tileMode; + shadowRenderer.adaptiveModeThreshold = targetRenderer.adaptiveModeThreshold; } - protected virtual Sprite GetReplacementSprite(Sprite spriteToGet) + private Sprite GetReplacementSprite(Sprite spriteToGet) { if (!spriteToGet) return null; @@ -76,13 +77,7 @@ protected virtual Sprite GetReplacementSprite(Sprite spriteToGet) string spriteName = spriteToGet.name; Sprite newShadowSprite = replacementSprites.FirstOrDefault(s => s.name == spriteName); - if (newShadowSprite) - { - _cachedSprites[spriteToGet] = newShadowSprite; - return newShadowSprite; - } - - return spriteToGet; + return _cachedSprites[spriteToGet] = newShadowSprite ? newShadowSprite : spriteToGet; } [HideFromIl2Cpp] diff --git a/Submerged/Floors/Patches/RpcPatches.cs b/Submerged/Floors/Patches/RpcPatches.cs deleted file mode 100644 index 70c674e3..00000000 --- a/Submerged/Floors/Patches/RpcPatches.cs +++ /dev/null @@ -1,67 +0,0 @@ -using System.Collections.Generic; -using System.Linq; -using HarmonyLib; -using Hazel; -using InnerNet; -using Submerged.Enums; - -namespace Submerged.Floors.Patches; - -[HarmonyPatch] -public static class RpcPatches -{ - [HarmonyPatch(typeof(PlayerPhysics), nameof(PlayerPhysics.HandleRpc))] - [HarmonyPrefix] - [HarmonyPriority(Priority.First)] - public static bool HandleRequestChangeFloorPatch(PlayerPhysics __instance, [HarmonyArgument(0)] byte callId, [HarmonyArgument(1)] MessageReader reader) - { - switch (callId) - { - case CustomRpcCalls.RequestChangeFloor: // RpcCalls RequestChangeFloor // Bool - Upper Deck // PackedInt32 - Nonce - if (!AmongUsClient.Instance.AmHost) return false; - - SubmarinePlayerFloorSystem floorSystem = SubmarinePlayerFloorSystem.Instance; - bool state = reader.ReadBoolean(); - int sid = reader.ReadInt32(); - - if (!floorSystem.playerFloorSids.ContainsKey(__instance.myPlayer.PlayerId) || floorSystem.playerFloorSids[__instance.myPlayer.PlayerId] <= sid) - { - floorSystem.playerFloorSids[__instance.myPlayer.PlayerId] = sid; - floorSystem!.ChangePlayerFloorState(__instance.myPlayer.PlayerId, state); - } - - SubmarinePlayerFloorSystem.RespondToFloorChange(__instance, sid); - - return false; - - default: - return true; - } - } - - [HarmonyPatch(typeof(ShipStatus), nameof(ShipStatus.HandleRpc))] - [HarmonyPrefix] - [HarmonyPriority(Priority.First)] - public static bool HandleAcknowledgeChangeFloorPatch(ShipStatus __instance, [HarmonyArgument(0)] byte callId, [HarmonyArgument(1)] MessageReader reader) - { - switch (callId) - { - case CustomRpcCalls.AcknowledgeChangeFloor: - PlayerPhysics physics = reader.ReadNetObject(); - - if (!physics.AmOwner) return false; - - FloorHandler floorManager = FloorHandler.GetFloorHandler(physics); - - // TODO: Wth is this code doing - List newList = floorManager.ints.ToList(); - if (newList.Any()) newList.RemoveAt(0); - floorManager.ints = newList; - - return false; - - default: - return true; - } - } -} diff --git a/Submerged/Floors/SubmarinePlayerFloorSystem.cs b/Submerged/Floors/SubmarinePlayerFloorSystem.cs index a0e54ab6..d66383a2 100644 --- a/Submerged/Floors/SubmarinePlayerFloorSystem.cs +++ b/Submerged/Floors/SubmarinePlayerFloorSystem.cs @@ -1,9 +1,7 @@ using System.Collections.Generic; using Hazel; using Il2CppInterop.Runtime.Injection; -using InnerNet; using Reactor.Utilities.Attributes; -using Submerged.Enums; using Submerged.Extensions; using AU = Submerged.BaseGame.Interfaces.AU; @@ -48,6 +46,11 @@ public void Deserialize(MessageReader reader, bool initialState) } } + public void MarkClean() + { + IsDirty = false; + } + public void Serialize(MessageWriter writer, bool initialState) { writer.Write((byte) playerFloorStates.Count); @@ -68,12 +71,4 @@ public void ChangePlayerFloorState(byte playerId, bool state) IsDirty = true; playerFloorStates[playerId] = state; } - - public static void RespondToFloorChange(PlayerPhysics physics, int sid) - { - MessageWriter writer = AmongUsClient.Instance.StartRpc(ShipStatus.Instance.NetId, CustomRpcCalls.AcknowledgeChangeFloor); - writer.WriteNetObject(physics); - writer.Write(sid); - writer.EndMessage(); - } } diff --git a/Submerged/HudMap/Patches/AdminPatches.cs b/Submerged/HudMap/Patches/AdminPatches.cs index 08c1f753..e29ac363 100644 --- a/Submerged/HudMap/Patches/AdminPatches.cs +++ b/Submerged/HudMap/Patches/AdminPatches.cs @@ -21,6 +21,11 @@ public static void ReplacePlayerIconPatch(MapBehaviour __instance) [HarmonyPrefix] public static void AddAdminUseButtonPatch(UseButton __instance) { + if (__instance.UseSettings.Any(x => x.ButtonType == CustomImageNames.SubmergedAdminButton)) + { + return; + } + UseButtonSettings submergedAdminButton = ScriptableObject.CreateInstance(); submergedAdminButton.ButtonType = CustomImageNames.SubmergedAdminButton; submergedAdminButton.Image = ResourceManager.spriteCache["AdminButton"]; diff --git a/Submerged/KillAnimation/CustomKillAnimationPlayer.cs b/Submerged/KillAnimation/CustomKillAnimationPlayer.cs index e198f96e..6a090446 100644 --- a/Submerged/KillAnimation/CustomKillAnimationPlayer.cs +++ b/Submerged/KillAnimation/CustomKillAnimationPlayer.cs @@ -76,7 +76,6 @@ public void Update() if (playhead > ANIM_DURATION) { finished = true; - return; } diff --git a/Submerged/KillAnimation/OxygenDeathAnimation.cs b/Submerged/KillAnimation/OxygenDeathAnimation.cs new file mode 100644 index 00000000..56af7584 --- /dev/null +++ b/Submerged/KillAnimation/OxygenDeathAnimation.cs @@ -0,0 +1,72 @@ +using System; +using BepInEx.Unity.IL2CPP.Utils.Collections; +using Reactor.Utilities.Attributes; +using Submerged.BaseGame; +using Submerged.Enums; +using UnityEngine; + +namespace Submerged.KillAnimation; + +[RegisterInIl2Cpp] +public class OxygenDeathAnimation(nint ptr) : OverlayKillAnimation(ptr) +{ + public void CreateFrom(OverlayKillAnimation other) + { + // Disable unused + petObjects = new ICG.HashSet(); + other.killerParts.gameObject.SetActive(false); + other.transform.Find("killstabknife").gameObject.SetActive(false); + other.transform.Find("killstabknifehand").gameObject.SetActive(false); + + // Copy data + Sfx = other.Sfx; + Stinger = other.Stinger; + StingerVolume = other.StingerVolume; + victimHat = other.victimHat; + victimParts = other.victimParts; + VictimPetPosition = other.VictimPetPosition; + + // Modifications + victimParts.transform.localPosition = new Vector3(-1.5f, 0, 0); + KillType = CustomKillAnimTypes.Oxygen; + + // Components + Destroy(other); + gameObject.AddComponent(); + } + + [BaseGameCode(LastChecked.v17_0_1, "Entire method is copied because WaitForFinish is not virtual.")] + public override CppIEnumerator CoShow(KillOverlay parent) + { + return enumerator().WrapToIl2Cpp(); + + IEnumerator enumerator() + { + if (Constants.ShouldPlaySfx()) + { + SoundManager.Instance.PlaySound(Stinger, false, 1f, null).volume = StingerVolume; + } + + parent.background.enabled = true; + yield return Effects.Wait(0.083333336f); + parent.background.enabled = false; + parent.flameParent.SetActive(true); + parent.flameParent.transform.localScale = new Vector3(1f, 0.3f, 1f); + parent.flameParent.transform.localEulerAngles = new Vector3(0f, 0f, 25f); + yield return Effects.Wait(0.083333336f); + parent.flameParent.transform.localScale = new Vector3(1f, 0.5f, 1f); + parent.flameParent.transform.localEulerAngles = new Vector3(0f, 0f, -15f); + yield return Effects.Wait(0.083333336f); + parent.flameParent.transform.localScale = new Vector3(1f, 1f, 1f); + parent.flameParent.transform.localEulerAngles = new Vector3(0f, 0f, 0f); + gameObject.SetActive(true); + yield return GetComponent().WaitForFinish(); // Only changed line + gameObject.SetActive(false); + yield return new WaitForLerp(0.16666667f, new Action(t => + { + parent.flameParent.transform.localScale = new Vector3(1f, 1f - t, 1f); + })); + parent.flameParent.SetActive(false); + } + } +} diff --git a/Submerged/KillAnimation/Patches/KillCooldownPatches.cs b/Submerged/KillAnimation/Patches/KillCooldownPatches.cs new file mode 100644 index 00000000..a7c04bde --- /dev/null +++ b/Submerged/KillAnimation/Patches/KillCooldownPatches.cs @@ -0,0 +1,13 @@ +using HarmonyLib; + +namespace Submerged.KillAnimation.Patches; + +[HarmonyPatch] +public static class KillCooldownPatches +{ + public static bool PreventReset { get; set; } + + [HarmonyPatch(typeof(PlayerControl), nameof(PlayerControl.SetKillTimer))] + [HarmonyPrefix, HarmonyPriority(Priority.First)] + public static bool PreventResetIfOxygenDeathFailedPatch(PlayerControl __instance) => !PreventReset || !__instance.AmOwner; +} diff --git a/Submerged/KillAnimation/Patches/OxygenDeathAnimationPatches.cs b/Submerged/KillAnimation/Patches/OxygenDeathAnimationPatches.cs index 632f2369..0865c4cb 100644 --- a/Submerged/KillAnimation/Patches/OxygenDeathAnimationPatches.cs +++ b/Submerged/KillAnimation/Patches/OxygenDeathAnimationPatches.cs @@ -1,7 +1,5 @@ -using BepInEx.Unity.IL2CPP.Utils.Collections; using HarmonyLib; using Reactor.Utilities.Extensions; -using Submerged.Enums; using UnityEngine; namespace Submerged.KillAnimation.Patches; @@ -9,9 +7,7 @@ namespace Submerged.KillAnimation.Patches; [HarmonyPatch] public static class OxygenDeathAnimationPatches { - private static OverlayKillAnimation _oxygenDeath; - - private static OverlayKillAnimation OxygenDeath + private static OxygenDeathAnimation OxygenDeath { get { @@ -25,23 +21,17 @@ private static OverlayKillAnimation OxygenDeath // // - Alex - if (_oxygenDeath) return _oxygenDeath; + if (field) return field; Transform parent = new GameObject("Submerged OxygenDeathParent").DontUnload().DontDestroy().transform; parent.gameObject.SetActive(false); - _oxygenDeath = UnityObject.Instantiate(HudManager.Instance.KillOverlay.KillAnims[0], parent); - - _oxygenDeath.killerParts.gameObject.SetActive(false); - _oxygenDeath.killerParts = null; - _oxygenDeath.transform.Find("killstabknife").gameObject.SetActive(false); - _oxygenDeath.transform.Find("killstabknifehand").gameObject.SetActive(false); - - _oxygenDeath.victimParts.transform.localPosition = new Vector3(-1.5f, 0, 0); - _oxygenDeath.KillType = CustomKillAnimTypes.Oxygen; + OverlayKillAnimation original = UnityObject.Instantiate(HudManager.Instance.KillOverlay.KillAnims[0], parent); - _oxygenDeath.gameObject.AddComponent(); + OxygenDeathAnimation customAnimation = original.gameObject.AddComponent(); + customAnimation.CreateFrom(original); - return _oxygenDeath; + field = customAnimation; + return field; } } @@ -57,16 +47,4 @@ public static bool ShowOxygenKillAnimationPatch(KillOverlay __instance, [Harmony return false; } - - [HarmonyPatch(typeof(OverlayKillAnimation), nameof(OverlayKillAnimation.WaitForFinish))] - [HarmonyPrefix] - public static bool WaitForCustomAnimationFinishPatch(OverlayKillAnimation __instance, ref CppIEnumerator __result) - { - CustomKillAnimationPlayer customKillAnim = __instance.GetComponent(); - - if (!customKillAnim) return true; - __result = customKillAnim.WaitForFinish().WrapToIl2Cpp(); - - return false; - } } diff --git a/Submerged/KillAnimation/Patches/OxygenDeathRpcPatches.cs b/Submerged/KillAnimation/Patches/OxygenDeathRpcPatches.cs deleted file mode 100644 index 9231d47d..00000000 --- a/Submerged/KillAnimation/Patches/OxygenDeathRpcPatches.cs +++ /dev/null @@ -1,26 +0,0 @@ -using HarmonyLib; -using InnerNet; -using Submerged.Enums; - -namespace Submerged.KillAnimation.Patches; - -public static class OxygenDeathRpcPatches -{ - public static bool MurderPlayerAsOxygenDeath { get; set; } - - [HarmonyPatch(typeof(InnerNetClient), nameof(InnerNetClient.StartRpcImmediately))] - [HarmonyPrefix] - public static void SendOxygenRpcPatch([HarmonyArgument(1)] ref byte callId) - { - if (MurderPlayerAsOxygenDeath && callId == (byte) RpcCalls.MurderPlayer) callId = CustomRpcCalls.OxygenDeath; - MurderPlayerAsOxygenDeath = false; - } - - [HarmonyPatch(typeof(PlayerControl), nameof(PlayerControl.HandleRpc))] - [HarmonyPriority(Priority.First)] - [HarmonyPrefix] - public static void HandleOxygenRpcPatch([HarmonyArgument(0)] ref byte callId) - { - if (callId == CustomRpcCalls.OxygenDeath) callId = (byte) RpcCalls.MurderPlayer; - } -} diff --git a/Submerged/Loading/Patches/CustomPlayerDataPatches.cs b/Submerged/Loading/Patches/CustomPlayerDataPatches.cs index bd4a21e9..11c31c7a 100644 --- a/Submerged/Loading/Patches/CustomPlayerDataPatches.cs +++ b/Submerged/Loading/Patches/CustomPlayerDataPatches.cs @@ -1,6 +1,6 @@ using BepInEx.Unity.IL2CPP.Utils.Collections; using HarmonyLib; -using Hazel; +using Reactor.Networking.Attributes; using Submerged.Enums; using Submerged.Extensions; @@ -29,20 +29,13 @@ private static IEnumerator CoStartAndSendCustomData(PlayerControl playerControl, data.HasMap = mapLoaded; } - MessageWriter messageWriter = AmongUsClient.Instance.StartRpc(playerControl.NetId, CustomRpcCalls.SetCustomData); - messageWriter.Write(mapLoaded); - messageWriter.EndMessage(); + RpcSetCustomData(playerControl, mapLoaded); } - [HarmonyPatch(typeof(PlayerControl), nameof(PlayerControl.HandleRpc))] - [HarmonyPrefix] - public static bool HandleCustomDataPatch(PlayerControl __instance, [HarmonyArgument(0)] byte callId, [HarmonyArgument(1)] MessageReader reader) + [MethodRpc(CustomRpcCalls.SetCustomData)] + public static void RpcSetCustomData(PlayerControl player, bool mapLoaded) { - if (callId != CustomRpcCalls.SetCustomData) return true; - - CustomPlayerData data = __instance.gameObject.EnsureComponent(); - data.HasMap = reader.ReadBoolean(); - - return false; + CustomPlayerData data = player.gameObject.EnsureComponent(); + data.HasMap = mapLoaded; } } diff --git a/Submerged/Localization/Strings/General.Designer.cs b/Submerged/Localization/Strings/General.Designer.cs index 71102c29..f970363c 100644 --- a/Submerged/Localization/Strings/General.Designer.cs +++ b/Submerged/Localization/Strings/General.Designer.cs @@ -9,8 +9,8 @@ namespace Submerged.Localization.Strings { using System; - - + + /// /// A strongly-typed resource class, for looking up localized strings, etc. /// @@ -22,15 +22,15 @@ namespace Submerged.Localization.Strings { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class General { - + private static global::System.Resources.ResourceManager resourceMan; - + private static global::System.Globalization.CultureInfo resourceCulture; - + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] internal General() { } - + /// /// Returns the cached ResourceManager instance used by this class. /// @@ -44,7 +44,7 @@ internal General() { return resourceMan; } } - + /// /// Overrides the current thread's CurrentUICulture property for all /// resource lookups using this strongly typed resource class. @@ -58,7 +58,7 @@ internal General() { resourceCulture = value; } } - + /// /// Looks up a localized string similar to Additional Art. /// @@ -67,7 +67,7 @@ internal static string Credits_AdditionalArt { return ResourceManager.GetString("Credits.AdditionalArt", resourceCulture); } } - + /// /// Looks up a localized string similar to Artists. /// @@ -76,7 +76,16 @@ internal static string Credits_Artists { return ResourceManager.GetString("Credits.Artists", resourceCulture); } } - + + /// + /// Looks up a localized string similar to Contributors. + /// + internal static string Credits_Contributors { + get { + return ResourceManager.GetString("Credits.Contributors", resourceCulture); + } + } + /// /// Looks up a localized string similar to Developers. /// @@ -85,7 +94,7 @@ internal static string Credits_Developers { return ResourceManager.GetString("Credits.Developers", resourceCulture); } } - + /// /// Looks up a localized string similar to Map Design. /// @@ -94,7 +103,7 @@ internal static string Credits_MapDesign { return ResourceManager.GetString("Credits.MapDesign", resourceCulture); } } - + /// /// Looks up a localized string similar to Project Lead. /// @@ -103,16 +112,16 @@ internal static string Credits_ProjectLead { return ResourceManager.GetString("Credits.ProjectLead", resourceCulture); } } - + /// - /// Looks up a localized string similar to Technical Support. + /// Looks up a localized string similar to . /// internal static string Credits_TechnicalSupport { get { return ResourceManager.GetString("Credits.TechnicalSupport", resourceCulture); } } - + /// /// Looks up a localized string similar to Translators. /// @@ -121,7 +130,7 @@ internal static string Credits_Translators { return ResourceManager.GetString("Credits.Translators", resourceCulture); } } - + /// /// Looks up a localized string similar to Could not load Submerged assets. Please restart your game. ///If this problem persists, please reinstall Submerged or open an issue on GitHub.. @@ -131,7 +140,7 @@ internal static string Error_AssetsNotLoaded { return ResourceManager.GetString("Error.AssetsNotLoaded", resourceCulture); } } - + /// /// Looks up a localized string similar to Cannot start the game as the following players do not have Submerged:. /// @@ -140,5 +149,14 @@ internal static string Error_PlayersMissingSubmerged { return ResourceManager.GetString("Error.PlayersMissingSubmerged", resourceCulture); } } + + /// + /// Looks up a localized string similar to Submerged: An underwater map with a multi-floor system, elevators, new tasks and sabotages, and more!. + /// + internal static string SubmergedTooltip { + get { + return ResourceManager.GetString("SubmergedTooltip", resourceCulture); + } + } } } diff --git a/Submerged/Localization/Strings/General.pt-BR.resx b/Submerged/Localization/Strings/General.pt-BR.resx index 68ae87d9..c9f9972c 100644 --- a/Submerged/Localization/Strings/General.pt-BR.resx +++ b/Submerged/Localization/Strings/General.pt-BR.resx @@ -43,4 +43,7 @@ Não foi possível carregar Submerged. Por favor recarregue seu jogo. Se o problema persistir, reinstale Submerged ou crie um ticket no GitHub. + + Submerged: Um mapa sub-aquático com sistema multi-andar, elevadores, novas tarefas e sabotagens, e mais! + \ No newline at end of file diff --git a/Submerged/Localization/Strings/General.resx b/Submerged/Localization/Strings/General.resx index f0678792..ba6a1c2c 100644 --- a/Submerged/Localization/Strings/General.resx +++ b/Submerged/Localization/Strings/General.resx @@ -40,7 +40,7 @@ Project Lead - Technical Support + Translators @@ -52,4 +52,10 @@ Could not load Submerged assets. Please restart your game. If this problem persists, please reinstall Submerged or open an issue on GitHub. + + Submerged: An underwater map with a multi-floor system, elevators, new tasks and sabotages, and more! + + + Contributors + \ No newline at end of file diff --git a/Submerged/Map/Patches/SubmarineStatusPatches.cs b/Submerged/Map/Patches/SubmarineStatusPatches.cs index 47b1058d..9fa1be35 100644 --- a/Submerged/Map/Patches/SubmarineStatusPatches.cs +++ b/Submerged/Map/Patches/SubmarineStatusPatches.cs @@ -8,6 +8,7 @@ namespace Submerged.Map.Patches; [HarmonyPatch] public static class SubmarineStatusPatches { + // Could be inlined, find an alternate way [HarmonyPatch(typeof(ShipStatus), nameof(ShipStatus.CalculateLightRadius))] [HarmonyPrefix] [HarmonyPriority(Priority.First)] diff --git a/Submerged/Map/SubmarineStatus.cs b/Submerged/Map/SubmarineStatus.cs index 96b89bb2..bcff7fb7 100644 --- a/Submerged/Map/SubmarineStatus.cs +++ b/Submerged/Map/SubmarineStatus.cs @@ -23,6 +23,7 @@ using Submerged.Vents; using TMPro; using UnityEngine; +using UnityEngine.Events; namespace Submerged.Map; @@ -90,6 +91,7 @@ public void Awake() vitalsPanel = Instantiate(MapLoader.Airship.transform.Find("Medbay/panel_vitals").gameObject, transform); vitalsPanel.transform.position = new Vector3(4.9882f, 32.8877f, 0.0366f); vitalsPanel.SetActive(true); + FixMinigameClosing(vitalsPanel.GetComponent().MinigamePrefab); normalShip.EmergencyButton = transform.Find("TopFloor/Adm-Obsv-Loun-MR/TaskConsoles/console-mr-callmeeting").GetComponent(); @@ -129,6 +131,7 @@ public void Awake() SystemConsole taskPicker = Instantiate(MapLoader.Skeld.transform.GetComponentsInChildren().First(c => c.FreeplayOnly)); taskPicker.transform.position = new Vector3(5.2393f, -27.8891f, -0.002f); taskPicker.usableDistance = 1; + FixMinigameClosing(taskPicker.MinigamePrefab); } int num = 0; @@ -227,7 +230,7 @@ private static Il2CppReferenceArray GetActivatableSystems(ICG.Dict { IEnumerable enumerator() { - foreach (ISystemType system in systems.values ??= new ICG.Dictionary.ValueCollection(systems)) + foreach (ISystemType system in systems._values ??= new ICG.Dictionary.ValueCollection(systems)) { if (system is Il2CppObjectBase iObj && iObj.TryCast() is { } activatable) { @@ -382,7 +385,25 @@ private void ResolveBaseGameMinigame(TaskTypes taskType, ShipStatus from) IEnumerable ourTasks = GetAllTasks(normalShip); PlayerTask targetTask = GetAllTasks(from).First(t => t.TaskType == taskType); - foreach (PlayerTask task in ourTasks.Where(t => t.TaskType == taskType)) task.MinigamePrefab = targetTask.MinigamePrefab; + foreach (PlayerTask task in ourTasks.Where(t => t.TaskType == taskType)) + { + task.MinigamePrefab = targetTask.MinigamePrefab; + FixMinigameClosing(task.MinigamePrefab); // It's probably fine if we modify the prefab directly cuz this shouldn't interfere with base game + } + } + + private void FixMinigameClosing(Minigame minigame) + { + foreach (PassiveButton passiveButton in minigame.GetComponentsInChildren(true)) + { + foreach (PersistentCall call in passiveButton.OnClick.m_PersistentCalls.m_Calls) + { + if (call.methodName == nameof(Minigame.Close) && call.mode == PersistentListenerMode.Bool && call.target.TryCast()) + { + call.mode = PersistentListenerMode.Void; + } + } + } } private void ResolveHudMap() diff --git a/Submerged/Minigames/CustomMinigames/CleanGlass/CleanGlassMinigame.cs b/Submerged/Minigames/CustomMinigames/CleanGlass/CleanGlassMinigame.cs index fa014b8d..50a1784f 100644 --- a/Submerged/Minigames/CustomMinigames/CleanGlass/CleanGlassMinigame.cs +++ b/Submerged/Minigames/CustomMinigames/CleanGlass/CleanGlassMinigame.cs @@ -56,7 +56,10 @@ private void Update() [HideFromIl2Cpp] private IEnumerator Sparkle() { - MyNormTask!?.NextStep(); + if (MyNormTask != null) + { + MyNormTask.NextStep(); + } StartCoroutine(CoStartClose()); Animator anim = transform.Find("Sparkle").GetComponent(); diff --git a/Submerged/Minigames/CustomMinigames/ClearUrchins/ClearUrchinsMinigame.cs b/Submerged/Minigames/CustomMinigames/ClearUrchins/ClearUrchinsMinigame.cs index 8b60f6d7..f21ec749 100644 --- a/Submerged/Minigames/CustomMinigames/ClearUrchins/ClearUrchinsMinigame.cs +++ b/Submerged/Minigames/CustomMinigames/ClearUrchins/ClearUrchinsMinigame.cs @@ -82,7 +82,10 @@ private void Update() _finished = CheckFinished(); if (!_finished) return; - MyNormTask!?.NextStep(); + if (MyNormTask != null) + { + MyNormTask.NextStep(); + } StartCoroutine(CoStartClose()); } } diff --git a/Submerged/Minigames/CustomMinigames/DispenseWater/DispenseWaterMinigame.cs b/Submerged/Minigames/CustomMinigames/DispenseWater/DispenseWaterMinigame.cs index e0546f1f..066a34f2 100644 --- a/Submerged/Minigames/CustomMinigames/DispenseWater/DispenseWaterMinigame.cs +++ b/Submerged/Minigames/CustomMinigames/DispenseWater/DispenseWaterMinigame.cs @@ -74,19 +74,28 @@ private void Update() { if (_filling) { - _audioSource!?.UnPause(); + if (_audioSource != null) + { + _audioSource.UnPause(); + } _timer += Time.deltaTime; if (_timer > 5f) { button.onUp.Invoke(); - _audioSource!?.Stop(); + if (_audioSource != null) + { + _audioSource.Stop(); + } Destroy(button); } } else { - _audioSource!?.Pause(); + if (_audioSource != null) + { + _audioSource.Pause(); + } if (waterAnimation.GetCurrentStateName(0) != "EndWater") waterAnimation.Play("EndWater"); } @@ -97,7 +106,10 @@ private void Update() cap.position = capTarget.position; capDraggable.forceStop = true; SoundManager.Instance.PlaySound(minigameProperties.audioClips[1], false); - MyNormTask!?.NextStep(); + if (MyNormTask != null) + { + MyNormTask.NextStep(); + } StartCoroutine(CoStartClose()); } } diff --git a/Submerged/Minigames/CustomMinigames/DoorSabotage/OpenDoorsMinigame.cs b/Submerged/Minigames/CustomMinigames/DoorSabotage/OpenDoorsMinigame.cs index 3dc36516..f5199520 100644 --- a/Submerged/Minigames/CustomMinigames/DoorSabotage/OpenDoorsMinigame.cs +++ b/Submerged/Minigames/CustomMinigames/DoorSabotage/OpenDoorsMinigame.cs @@ -1,7 +1,8 @@ using System.ComponentModel; +using System.Linq; using Reactor.Utilities.Attributes; +using Reactor.Utilities.Extensions; using Submerged.BaseGame.Interfaces; -using Submerged.Extensions; using TMPro; using UnityEngine; @@ -17,7 +18,8 @@ public void SetDoor(OpenableDoor door) } [RegisterInIl2Cpp] -[Description("Yes, this is a bug with Unhollower. No, we are not going to report it as it would be hard to reproduce and we are busy people.")] +[Description("Unhollower previously had a bug where you couldn't register a class that both inherited from an IL2CPP class and an IL2CPP interface. " + + "This might have been fixed at some point but I'm not sure so just to be safe, I'm keeping it like this.")] public class OpenDoorsMinigameNoInterface(nint ptr) : Minigame(ptr) { public TextMeshPro character; @@ -30,7 +32,7 @@ public class OpenDoorsMinigameNoInterface(nint ptr) : Minigame(ptr) private Collider2D _handleCollider; private bool _letterSelected; - private char _targetLetter; + private KeyCode _targetKey; private float _timer; protected OpenableDoor myDoor; @@ -42,8 +44,8 @@ public void Start() errorScreen = transform.Find("Error Screen").gameObject; handle = transform.Find("Rotated/Handle").gameObject; - _targetLetter = SetRandomChar(); - character.text = _targetLetter.ToString(); + _targetKey = GetRandomKey(); + character.text = _targetKey.ToString()[^1..]; _handleCollider = handle.GetComponent(); } @@ -66,7 +68,7 @@ public void Update() _controller.Update(); - if (Input.GetKeyDown(_targetLetter.ToString().ToLower())) + if (Input.GetKeyDown(_targetKey)) { finishedScreen.SetActive(true); _letterSelected = true; @@ -75,11 +77,12 @@ public void Update() CheckHandle(); } - public char SetRandomChar() + private KeyCode GetRandomKey() { - char[] chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789".ToCharArray(); - - return chars.Random(); + return Enumerable.Range((int) KeyCode.A, 26) + .Concat(Enumerable.Range((int) KeyCode.Alpha0, 10)) + .Select(k => (KeyCode) k) + .Random(); } public void Finish() diff --git a/Submerged/Minigames/CustomMinigames/FeedPetFish/FeedFishMinigame.cs b/Submerged/Minigames/CustomMinigames/FeedPetFish/FeedFishMinigame.cs index b4685fdb..0cc2d863 100644 --- a/Submerged/Minigames/CustomMinigames/FeedPetFish/FeedFishMinigame.cs +++ b/Submerged/Minigames/CustomMinigames/FeedPetFish/FeedFishMinigame.cs @@ -74,7 +74,10 @@ public void UpdateCompletedStep(int index) if (_completedSpecies[0] && _completedSpecies[1] && amClosing == CloseState.None) { - MyNormTask!?.NextStep(); + if (MyNormTask != null) + { + MyNormTask.NextStep(); + } StartCoroutine(CoStartClose()); } } diff --git a/Submerged/Minigames/CustomMinigames/IdentifySpecimen/IdentifySpecimenMinigame.cs b/Submerged/Minigames/CustomMinigames/IdentifySpecimen/IdentifySpecimenMinigame.cs index 3e31de7e..d6a1b3f0 100644 --- a/Submerged/Minigames/CustomMinigames/IdentifySpecimen/IdentifySpecimenMinigame.cs +++ b/Submerged/Minigames/CustomMinigames/IdentifySpecimen/IdentifySpecimenMinigame.cs @@ -31,7 +31,10 @@ private void Start() private void CompleteTask() { if (amClosing != CloseState.None) return; - MyNormTask!?.NextStep(); + if (MyNormTask != null) + { + MyNormTask.NextStep(); + } StartCoroutine(CoStartClose()); } } diff --git a/Submerged/Minigames/CustomMinigames/LocateVolcanicActivity/LocateVolcanicActivityMinigame.cs b/Submerged/Minigames/CustomMinigames/LocateVolcanicActivity/LocateVolcanicActivityMinigame.cs index 3c7dfacc..e354f84a 100644 --- a/Submerged/Minigames/CustomMinigames/LocateVolcanicActivity/LocateVolcanicActivityMinigame.cs +++ b/Submerged/Minigames/CustomMinigames/LocateVolcanicActivity/LocateVolcanicActivityMinigame.cs @@ -154,7 +154,10 @@ public IEnumerator CoScaleInwards(Transform self, float source, float target, fl [HideFromIl2Cpp] public IEnumerator CoWipeScreen() { - MyNormTask!?.NextStep(); + if (MyNormTask != null) + { + MyNormTask.NextStep(); + } StartCoroutine(CoStartClose()); transform.Find("NewText/EnabledText").gameObject.SetActive(false); diff --git a/Submerged/Minigames/CustomMinigames/MicrowaveLunch/MicrowaveLunchMinigame.cs b/Submerged/Minigames/CustomMinigames/MicrowaveLunch/MicrowaveLunchMinigame.cs index 1df4ed7e..d0c6c018 100644 --- a/Submerged/Minigames/CustomMinigames/MicrowaveLunch/MicrowaveLunchMinigame.cs +++ b/Submerged/Minigames/CustomMinigames/MicrowaveLunch/MicrowaveLunchMinigame.cs @@ -18,8 +18,6 @@ public sealed class MicrowaveLunchMinigame(nint ptr) : Minigame(ptr) { private readonly List _enteredNumber = []; - private readonly ClickableSprite[] _numberButtons = new ClickableSprite[10]; - private AudioSource _audio; private GameObject _background; @@ -90,7 +88,6 @@ private void Start() switch (button.name.Length) { case 1: - _numberButtons[int.Parse(button.name)] = clickableSprite; clickableSprite.onDown += () => NumberButtonPress(int.Parse(button.name)); break; diff --git a/Submerged/Minigames/CustomMinigames/OxygenateSeaPlants/OxygenateCoralMinigame.cs b/Submerged/Minigames/CustomMinigames/OxygenateSeaPlants/OxygenateCoralMinigame.cs index d0c8765d..96804481 100644 --- a/Submerged/Minigames/CustomMinigames/OxygenateSeaPlants/OxygenateCoralMinigame.cs +++ b/Submerged/Minigames/CustomMinigames/OxygenateSeaPlants/OxygenateCoralMinigame.cs @@ -295,7 +295,10 @@ private IEnumerator PopBubble() public IEnumerator Oxygenate() { if (amClosing != CloseState.None) yield break; - MyNormTask!?.NextStep(); + if (MyNormTask != null) + { + MyNormTask.NextStep(); + } StartCoroutine(CoStartClose()); _bubbleTransform.gameObject.SetActive(false); diff --git a/Submerged/Minigames/CustomMinigames/PlugLeaks/PlugLeaksMinigame.cs b/Submerged/Minigames/CustomMinigames/PlugLeaks/PlugLeaksMinigame.cs index e9d36ea3..224c16b9 100644 --- a/Submerged/Minigames/CustomMinigames/PlugLeaks/PlugLeaksMinigame.cs +++ b/Submerged/Minigames/CustomMinigames/PlugLeaks/PlugLeaksMinigame.cs @@ -17,12 +17,12 @@ public sealed class PlugLeaksMinigame(nint ptr) : Minigame(ptr) public Color[] redColors = [ - new Color(0.3199982f, 0.4059609f, 0.4433962f, 1f), - new Color(0.4528302f, 0.4147556f, 0.3438946f, 1f), - new Color(0.3867925f, 0.3338603f, 0.2791474f, 1f), - new Color(0.5188679f, 0.5188679f, 0.5188679f, 1f), - new Color(0.3199982f, 0.4059609f, 0.4433962f, 1f), - new Color(0.4528302f, 0.4147556f, 0.3438946f, 1f) + new(0.3199982f, 0.4059609f, 0.4433962f, 1f), + new(0.4528302f, 0.4147556f, 0.3438946f, 1f), + new(0.3867925f, 0.3338603f, 0.2791474f, 1f), + new(0.5188679f, 0.5188679f, 0.5188679f, 1f), + new(0.3199982f, 0.4059609f, 0.4433962f, 1f), + new(0.4528302f, 0.4147556f, 0.3438946f, 1f) ]; public GameObject[] backgrounds; diff --git a/Submerged/Minigames/CustomMinigames/ReconnectPiping/ReconnectPipingMinigame.cs b/Submerged/Minigames/CustomMinigames/ReconnectPiping/ReconnectPipingMinigame.cs index db49d6a1..cecf8f85 100644 --- a/Submerged/Minigames/CustomMinigames/ReconnectPiping/ReconnectPipingMinigame.cs +++ b/Submerged/Minigames/CustomMinigames/ReconnectPiping/ReconnectPipingMinigame.cs @@ -124,7 +124,10 @@ public void Complete() needle.movementType = NeedleBehaviour.Movement.RandomBounce; Transform valve = transform.Find("Valve"); - MyNormTask!?.NextStep(); + if (MyNormTask != null) + { + MyNormTask.NextStep(); + } StartCoroutine(CoStartClose()); this.StartCoroutine(SpinItem(valve)); } diff --git a/Submerged/Minigames/CustomMinigames/ResetBreakers/MonoBehaviours/CircuitBreaker.cs b/Submerged/Minigames/CustomMinigames/ResetBreakers/MonoBehaviours/CircuitBreaker.cs index 90bbb056..c7d3b064 100644 --- a/Submerged/Minigames/CustomMinigames/ResetBreakers/MonoBehaviours/CircuitBreaker.cs +++ b/Submerged/Minigames/CustomMinigames/ResetBreakers/MonoBehaviours/CircuitBreaker.cs @@ -12,7 +12,7 @@ public sealed class CircuitBreaker(nint ptr) : MonoBehaviour(ptr) public AudioClip breakerClick; - public char targetChar; + public KeyCode targetKey; public bool complete; @@ -30,7 +30,7 @@ public void Awake() public void Update() { - if (Input.GetKeyDown(targetChar.ToString().ToLower())) + if (Input.GetKeyDown(targetKey)) { SoundManager.Instance.PlaySound(breakerClick, false); SetState(!complete); diff --git a/Submerged/Minigames/CustomMinigames/ResetBreakers/ResetBreakersMinigame.cs b/Submerged/Minigames/CustomMinigames/ResetBreakers/ResetBreakersMinigame.cs index 81a962b5..c76d95ee 100644 --- a/Submerged/Minigames/CustomMinigames/ResetBreakers/ResetBreakersMinigame.cs +++ b/Submerged/Minigames/CustomMinigames/ResetBreakers/ResetBreakersMinigame.cs @@ -40,7 +40,7 @@ private void Start() public void Update() { - if (amClosing != CloseState.None) return; + if (amClosing != CloseState.None || MyNormTask.IsComplete) return; if (CheckSwitches()) { @@ -48,21 +48,28 @@ public void Update() { circutBreaker.enabled = false; } - - MyNormTask!?.NextStep(); + if (MyNormTask != null) + { + MyNormTask.NextStep(); + } StartCoroutine(CoStartClose()); } } public void SetRandomChars() { - char[] chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789".ToCharArray(); - chars.Shuffle(); + KeyCode[] keys = Enumerable.Range((int) KeyCode.A, 26) + .Concat(Enumerable.Range((int) KeyCode.Alpha0, 10)) + .Select(k => (KeyCode) k) + .ToArray(); + keys.Shuffle(); + + Warning(string.Join(", ", keys)); for (int i = 0; i < circutBreakers.Count; i++) { - circutBreakers[i].targetChar = chars[i]; - circutBreakers[i].character.sprite = letters.FirstOrDefault(l => l.name.Contains($"_{chars[i].ToString().ToUpper()}")); + circutBreakers[i].targetKey = keys[i]; + circutBreakers[i].character.sprite = letters.FirstOrDefault(l => l.name.Contains($"_{keys[i].ToString()[^1..].ToUpper()}")); } } diff --git a/Submerged/Minigames/CustomMinigames/ReshelveBooks/ReshelvePart1.cs b/Submerged/Minigames/CustomMinigames/ReshelveBooks/ReshelvePart1.cs index 9b1e49ec..42fb376a 100644 --- a/Submerged/Minigames/CustomMinigames/ReshelveBooks/ReshelvePart1.cs +++ b/Submerged/Minigames/CustomMinigames/ReshelveBooks/ReshelvePart1.cs @@ -39,19 +39,22 @@ private void Start() this.StartCoroutine(CoOnMouseDown(clickableSprite.gameObject)); }; - transform.Find("Books/Benthic Beasts")?.GetComponentInChildren().SetText(Tasks.ReshelveBooks_Book02_Lounge); - transform.Find("Books/Ichthyologist Weekly")?.GetComponentInChildren().SetText(Tasks.ReshelveBooks_Book06_Lounge); - transform.Find("Books/Octopus Digest")?.GetComponentInChildren().SetText(Tasks.ReshelveBooks_Book11_Lounge); - transform.Find("Books/Kelper Worms")?.GetComponentInChildren().SetText(Tasks.ReshelveBooks_Book08_Medical); - transform.Find("Books/Nautical Nonsense")?.GetComponentInChildren().SetText(Tasks.ReshelveBooks_Book10_Medical); - transform.Find("Books/Sea Slugs & You!")?.GetComponentInChildren().SetText(Tasks.ReshelveBooks_Book13_Medical); + SetText("Books/Benthic Beasts", Tasks.ReshelveBooks_Book02_Lounge); + SetText("Books/Ichthyologist Weekly", Tasks.ReshelveBooks_Book06_Lounge); + SetText("Books/Octopus Digest", Tasks.ReshelveBooks_Book11_Lounge); + SetText("Books/Kelper Worms", Tasks.ReshelveBooks_Book08_Medical); + SetText("Books/Nautical Nonsense", Tasks.ReshelveBooks_Book10_Medical); + SetText("Books/Sea Slugs & You!", Tasks.ReshelveBooks_Book13_Medical); } [HideFromIl2Cpp] private IEnumerator CoOnMouseDown(GameObject obj) { minigame.Task.customData[minigame.ConsoleId + 2] = 1; - minigame.Task!?.NextStep(); + if (minigame.Task != null) + { + minigame.Task.NextStep(); + } SpriteRenderer rend = obj.GetComponent(); TextMeshPro text = obj.GetComponentInChildren(); @@ -65,4 +68,14 @@ private IEnumerator CoOnMouseDown(GameObject obj) minigame.minigameProperties.CloseTask(); } + + private void SetText(string objName, string targetText) + { + Transform targetTrans = transform.Find(objName); + if (targetTrans == null) + { + return; + } + targetTrans.GetComponentInChildren().SetText(targetText); + } } diff --git a/Submerged/Minigames/CustomMinigames/ReshelveBooks/ReshelvePart2.cs b/Submerged/Minigames/CustomMinigames/ReshelveBooks/ReshelvePart2.cs index 4a40665a..2a79dc44 100644 --- a/Submerged/Minigames/CustomMinigames/ReshelveBooks/ReshelvePart2.cs +++ b/Submerged/Minigames/CustomMinigames/ReshelveBooks/ReshelvePart2.cs @@ -50,37 +50,40 @@ private void Start() draggable.onUp += () => OnDragEnd(rend); } - books.Find("Benthic Beasts")?.GetComponentInChildren().SetText(Tasks.ReshelveBooks_Book02_Lounge); - books.Find("Ichthyologist Weekly")?.GetComponentInChildren().SetText(Tasks.ReshelveBooks_Book06_Lounge); - books.Find("Octopus Digest")?.GetComponentInChildren().SetText(Tasks.ReshelveBooks_Book11_Lounge); - books.Find("Kelper Worms")?.GetComponentInChildren().SetText(Tasks.ReshelveBooks_Book08_Medical); - books.Find("Nautical Nonsense")?.GetComponentInChildren().SetText(Tasks.ReshelveBooks_Book10_Medical); - books.Find("Sea Slugs & You!")?.GetComponentInChildren().SetText(Tasks.ReshelveBooks_Book13_Medical); + SetText(books, "Benthic Beasts", Tasks.ReshelveBooks_Book02_Lounge); + SetText(books, "Ichthyologist Weekly", Tasks.ReshelveBooks_Book06_Lounge); + SetText(books, "Octopus Digest", Tasks.ReshelveBooks_Book11_Lounge); + SetText(books, "Kelper Worms", Tasks.ReshelveBooks_Book08_Medical); + SetText(books, "Nautical Nonsense", Tasks.ReshelveBooks_Book10_Medical); + SetText(books, "Sea Slugs & You!", Tasks.ReshelveBooks_Book13_Medical); Transform drop = transform.Find("DropZoneIndicators"); - drop.Find("Benthic Beasts")?.GetComponentInChildren().SetText(Tasks.ReshelveBooks_Book02_Lounge); - drop.Find("Ichthyologist Weekly")?.GetComponentInChildren().SetText(Tasks.ReshelveBooks_Book06_Lounge); - drop.Find("Octopus Digest")?.GetComponentInChildren().SetText(Tasks.ReshelveBooks_Book11_Lounge); - drop.Find("Kelper Worms")?.GetComponentInChildren().SetText(Tasks.ReshelveBooks_Book08_Medical); - drop.Find("Nautical Nonsense")?.GetComponentInChildren().SetText(Tasks.ReshelveBooks_Book10_Medical); - drop.Find("Sea Slugs & You!")?.GetComponentInChildren().SetText(Tasks.ReshelveBooks_Book13_Medical); - - transform.Find("Background/A")?.GetComponentInChildren().SetText(Tasks.ReshelveBooks_Book01); - transform.Find("Background/C")?.GetComponentInChildren().SetText(Tasks.ReshelveBooks_Book03); - transform.Find("Background/E")?.GetComponentInChildren().SetText(Tasks.ReshelveBooks_Book04); - transform.Find("Background/F")?.GetComponentInChildren().SetText(Tasks.ReshelveBooks_Book05); - transform.Find("Background/J")?.GetComponentInChildren().SetText(Tasks.ReshelveBooks_Book07); - transform.Find("Background/M")?.GetComponentInChildren().SetText(Tasks.ReshelveBooks_Book09); - transform.Find("Background/P")?.GetComponentInChildren().SetText(Tasks.ReshelveBooks_Book12); - transform.Find("Background/V")?.GetComponentInChildren().SetText(Tasks.ReshelveBooks_Book14); - transform.Find("Background/W")?.GetComponentInChildren().SetText(Tasks.ReshelveBooks_Book15); + SetText(drop, "Benthic Beasts", Tasks.ReshelveBooks_Book02_Lounge); + SetText(drop, "Ichthyologist Weekly", Tasks.ReshelveBooks_Book06_Lounge); + SetText(drop, "Octopus Digest", Tasks.ReshelveBooks_Book11_Lounge); + SetText(drop, "Kelper Worms", Tasks.ReshelveBooks_Book08_Medical); + SetText(drop, "Nautical Nonsense", Tasks.ReshelveBooks_Book10_Medical); + SetText(drop, "Sea Slugs & You!", Tasks.ReshelveBooks_Book13_Medical); + + SetText(transform, "Background/A", Tasks.ReshelveBooks_Book01); + SetText(transform, "Background/C", Tasks.ReshelveBooks_Book03); + SetText(transform, "Background/E", Tasks.ReshelveBooks_Book04); + SetText(transform, "Background/F", Tasks.ReshelveBooks_Book05); + SetText(transform, "Background/J", Tasks.ReshelveBooks_Book07); + SetText(transform, "Background/M", Tasks.ReshelveBooks_Book09); + SetText(transform, "Background/P", Tasks.ReshelveBooks_Book12); + SetText(transform, "Background/V", Tasks.ReshelveBooks_Book14); + SetText(transform, "Background/W", Tasks.ReshelveBooks_Book15); } private void Update() { if (remainingBooks == 0) { - minigame.Task!?.NextStep(); + if (minigame.Task != null) + { + minigame.Task.NextStep(); + } minigame.StartCoroutine(minigame.CoStartClose()); remainingBooks = -1; } @@ -147,4 +150,14 @@ private void TryClose() if (_stopClose) return; minigame.minigameProperties.CloseTask(); } + + private void SetText(Transform search, string objName, string targetText) + { + Transform targetTrans = search.Find(objName); + if (targetTrans == null) + { + return; + } + targetTrans.GetComponentInChildren().SetText(targetText); + } } diff --git a/Submerged/Minigames/CustomMinigames/RetrieveOxygenMask/OxygenSabotageTask.cs b/Submerged/Minigames/CustomMinigames/RetrieveOxygenMask/OxygenSabotageTask.cs index 54bd116a..3256c3fe 100644 --- a/Submerged/Minigames/CustomMinigames/RetrieveOxygenMask/OxygenSabotageTask.cs +++ b/Submerged/Minigames/CustomMinigames/RetrieveOxygenMask/OxygenSabotageTask.cs @@ -95,7 +95,11 @@ public override void Complete() { isComplete = true; PlayerControl.LocalPlayer.RemoveTask(this); - FindObjectOfType()?.Close(); + OxygenSabotageMinigame minigame = FindObjectOfType(); + if (minigame != null) + { + minigame.Close(); + } } public override void OnRemove() { } diff --git a/Submerged/Minigames/CustomMinigames/SortScubaGear/SortScubaMinigame.cs b/Submerged/Minigames/CustomMinigames/SortScubaGear/SortScubaMinigame.cs index dc441ac3..131d183d 100644 --- a/Submerged/Minigames/CustomMinigames/SortScubaGear/SortScubaMinigame.cs +++ b/Submerged/Minigames/CustomMinigames/SortScubaGear/SortScubaMinigame.cs @@ -78,7 +78,10 @@ private void Start() if (CheckBoxes()) { _forceClose = true; - MyNormTask!?.NextStep(); + if (MyNormTask != null) + { + MyNormTask.NextStep(); + } StartCoroutine(CoStartClose()); } }; diff --git a/Submerged/Minigames/CustomMinigames/SpotWhaleShark/WhaleSharkMinigame.cs b/Submerged/Minigames/CustomMinigames/SpotWhaleShark/WhaleSharkMinigame.cs index e5a3dbf1..c168c9a0 100644 --- a/Submerged/Minigames/CustomMinigames/SpotWhaleShark/WhaleSharkMinigame.cs +++ b/Submerged/Minigames/CustomMinigames/SpotWhaleShark/WhaleSharkMinigame.cs @@ -32,7 +32,10 @@ private void Start() _button.onDown += () => { if (!_task.visible || _finished) return; - MyNormTask!?.NextStep(); + if (MyNormTask != null) + { + MyNormTask.NextStep(); + } StartCoroutine(CoStartClose(1f)); _finished = true; }; diff --git a/Submerged/Minigames/CustomMinigames/SpotWhaleShark/WhaleSharkTask.cs b/Submerged/Minigames/CustomMinigames/SpotWhaleShark/WhaleSharkTask.cs index 3434b64a..4e42418c 100644 --- a/Submerged/Minigames/CustomMinigames/SpotWhaleShark/WhaleSharkTask.cs +++ b/Submerged/Minigames/CustomMinigames/SpotWhaleShark/WhaleSharkTask.cs @@ -48,7 +48,7 @@ public override void FixedUpdate() } } - [BaseGameCode(LastChecked.v2024_8_13, "Part of this method comes from NormalPlayerTask.AppendTaskText")] + [BaseGameCode(LastChecked.v17_0_0, "Part of this method comes from NormalPlayerTask.AppendTaskText")] public override void AppendTaskText(StringBuilder sb) { bool canComplete = CanComplete(PlayerControl.LocalPlayer); diff --git a/Submerged/Minigames/CustomMinigames/StartSubmersible/StartSubmersibleMinigame.cs b/Submerged/Minigames/CustomMinigames/StartSubmersible/StartSubmersibleMinigame.cs index 69fe624c..fe988414 100644 --- a/Submerged/Minigames/CustomMinigames/StartSubmersible/StartSubmersibleMinigame.cs +++ b/Submerged/Minigames/CustomMinigames/StartSubmersible/StartSubmersibleMinigame.cs @@ -67,7 +67,10 @@ private void Update() { text.text = Tasks.StartSubmersible_Status_Active; _audio.Stop(); - MyNormTask!?.NextStep(); + if (MyNormTask != null) + { + MyNormTask.NextStep(); + } StartCoroutine(CoStartClose()); } } @@ -181,7 +184,10 @@ public void EnableEverything() for (int i = 0; i < 3; i++) { - switches.GetChild(i).Find("Off/OffSwitch").GetComponent()?.material.SetFloat("_Outline", 1); + if (switches.GetChild(i).Find("Off/OffSwitch").TryGetComponent(out SpriteRenderer rend)) + { + rend.material.SetFloat("_Outline", 1); + } } } diff --git a/Submerged/Minigames/CustomMinigames/SteadyHeartbeat/SteadyHeartbeatMinigame.cs b/Submerged/Minigames/CustomMinigames/SteadyHeartbeat/SteadyHeartbeatMinigame.cs index 3a38616a..66ef5bdb 100644 --- a/Submerged/Minigames/CustomMinigames/SteadyHeartbeat/SteadyHeartbeatMinigame.cs +++ b/Submerged/Minigames/CustomMinigames/SteadyHeartbeat/SteadyHeartbeatMinigame.cs @@ -12,7 +12,7 @@ namespace Submerged.Minigames.CustomMinigames.SteadyHeartbeat; public sealed class SteadyHeartbeatMinigame(nint ptr) : Minigame(ptr) { private const float IN_RANGE_TARGET = 5f; - private readonly Vector3[] _default = [new Vector3(-4.65f, 0, 0), new Vector3(4.65f, 0, 0)]; + private readonly Vector3[] _default = [new(-4.65f, 0, 0), new(4.65f, 0, 0)]; private Vector3[] _beat; private LineRenderer _beatLine; @@ -69,7 +69,10 @@ private void Update() { Color32 col = new(30, 150, 0, 255); _statusText.text = string.Format(Tasks.SteadyHeartbeat_Status, $"{Tasks.SteadyHeartbeat_Status_Stable}"); - MyNormTask!?.NextStep(); + if (MyNormTask != null) + { + MyNormTask.NextStep(); + } StartCoroutine(CoStartClose()); } diff --git a/Submerged/Minigames/CustomMinigames/TrackMantaRay/TrackMantaRay.cs b/Submerged/Minigames/CustomMinigames/TrackMantaRay/TrackMantaRay.cs index 7521de09..c759a950 100644 --- a/Submerged/Minigames/CustomMinigames/TrackMantaRay/TrackMantaRay.cs +++ b/Submerged/Minigames/CustomMinigames/TrackMantaRay/TrackMantaRay.cs @@ -79,7 +79,10 @@ private void Update() if (percent >= 100) { if (amClosing != CloseState.None) return; - MyNormTask!?.NextStep(); + if (MyNormTask != null) + { + MyNormTask.NextStep(); + } StartCoroutine(CoStartClose()); foreach (TextMeshPro t in _textMeshPros) diff --git a/Submerged/Minigames/Patches/ArrowPointToElevatorPatches.cs b/Submerged/Minigames/Patches/ArrowPointToElevatorPatches.cs index 78faec58..17716d01 100644 --- a/Submerged/Minigames/Patches/ArrowPointToElevatorPatches.cs +++ b/Submerged/Minigames/Patches/ArrowPointToElevatorPatches.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using System.Linq; using HarmonyLib; +using Submerged.BaseGame; using Submerged.Enums; using Submerged.Extensions; using Submerged.Floors; @@ -10,7 +11,8 @@ namespace Submerged.Minigames.Patches; -[HarmonyPatch(typeof(ArrowBehaviour), nameof(ArrowBehaviour.UpdatePosition))] +[BaseGameCode(LastChecked.v17_0_0, "UpdatePosition is inlined in IL2CPP, we must check to make sure it is still inlined across versions.")] +[HarmonyPatch(typeof(ArrowBehaviour), nameof(ArrowBehaviour.Update))] public static class ArrowBehaviourUpdatePositionPatch { private static List<(SubmarineElevator elevator, Vector3 position)> _lowerElevatorPositions; diff --git a/Submerged/Minigames/Patches/FixMissingLoggerPatches.cs b/Submerged/Minigames/Patches/FixMissingLoggerPatches.cs index 8f9e5350..c4736fa2 100644 --- a/Submerged/Minigames/Patches/FixMissingLoggerPatches.cs +++ b/Submerged/Minigames/Patches/FixMissingLoggerPatches.cs @@ -5,7 +5,7 @@ namespace Submerged.Minigames.Patches; [HarmonyPatch] public static class MinigameBeginPatch { - private static readonly Logger _logger = new("Minigame", Logger.Level.Info, Logger.Category.Gameplay); + private static readonly Logger _logger = new(Logger.Category.Gameplay, "Minigame"); [HarmonyPatch(typeof(Minigame), nameof(Minigame.Begin))] [HarmonyPrefix] diff --git a/Submerged/Resources/AssetBundles/submerged b/Submerged/Resources/AssetBundles/submerged index 3f1b9f1b..79315422 100644 Binary files a/Submerged/Resources/AssetBundles/submerged and b/Submerged/Resources/AssetBundles/submerged differ diff --git a/Submerged/SpawnIn/Patches/DisplayPrespawnStepPatches.cs b/Submerged/SpawnIn/Patches/DisplayPrespawnStepPatches.cs index f67e5ae2..a787d806 100644 --- a/Submerged/SpawnIn/Patches/DisplayPrespawnStepPatches.cs +++ b/Submerged/SpawnIn/Patches/DisplayPrespawnStepPatches.cs @@ -3,7 +3,7 @@ using Submerged.Extensions; using Submerged.Map; using UnityEngine; -using ShipStatus_PrespawnStep = ShipStatus._PrespawnStep_d__100; +using ShipStatus_PrespawnStep = ShipStatus._PrespawnStep_d__94; namespace Submerged.SpawnIn.Patches; diff --git a/Submerged/SpawnIn/SubmarineSelectSpawn.cs b/Submerged/SpawnIn/SubmarineSelectSpawn.cs index ce70720d..b44f6b8f 100644 --- a/Submerged/SpawnIn/SubmarineSelectSpawn.cs +++ b/Submerged/SpawnIn/SubmarineSelectSpawn.cs @@ -407,16 +407,21 @@ protected virtual IEnumerator DoPreAnimationLogicWhenFloorClicked() yield break; } - [BaseGameCode(LastChecked.v2024_8_13, "Part of this method is from ExileController.ReEnableGameplay")] + [BaseGameCode(LastChecked.v17_0_0, "Part of this method is from ExileController.ReEnableGameplay")] private void Cleanup(bool unfade = true) { - if (unfade) HudManager.Instance.StartCoroutine(HudManager.Instance.CoFadeFullScreen(Color.black, Color.clear)); + if (unfade) + { + HudManager.Instance.StartCoroutine(HudManager.Instance.CoFadeFullScreen(Color.black, Color.clear)); + } PlayerControl.LocalPlayer.moveable = true; PlayerControl.LocalPlayer.SetKillTimer(GameManager.Instance.LogicOptions.GetKillCooldown()); ShipStatus.Instance.EmergencyCooldown = GameManager.Instance.LogicOptions.GetEmergencyCooldown(); HudManager.Instance.PlayerCam.Locked = false; + HudManager.Instance.SetMapButtonEnabled(true); HudManager.Instance.SetHudActive(true); + ControllerManager.Instance.CloseAndResetAll(); int emergencyCooldown = GameManager.Instance.LogicOptions.GetEmergencyCooldown(); SetSabotageTimers(Math.Clamp(emergencyCooldown - 5, 0, 15)); diff --git a/Submerged/SpawnIn/SubmarineSpawnInSystem.cs b/Submerged/SpawnIn/SubmarineSpawnInSystem.cs index 9224cf69..8224eb12 100644 --- a/Submerged/SpawnIn/SubmarineSpawnInSystem.cs +++ b/Submerged/SpawnIn/SubmarineSpawnInSystem.cs @@ -55,6 +55,11 @@ public void Deserialize(MessageReader reader, bool initialState) timer = reader.ReadSingle(); } + public void MarkClean() + { + IsDirty = false; + } + public void Serialize(MessageWriter writer, bool initialState) { writer.Write((byte) currentState); diff --git a/Submerged/Submerged.csproj b/Submerged/Submerged.csproj index 43a8960f..a28b488e 100644 --- a/Submerged/Submerged.csproj +++ b/Submerged/Submerged.csproj @@ -1,7 +1,7 @@  - 2025.1.30 + 2025.10.22 dev Submerged Team git @@ -9,23 +9,26 @@ $(NoWarn);CS0436 - embedded - true net6.0 preview true + + embedded + true Debug;Release Submerged + true - - - + + + - + + diff --git a/Submerged/Systems/BoxCat/SubmarineBoxCatSystem.cs b/Submerged/Systems/BoxCat/SubmarineBoxCatSystem.cs index d803064b..f82b6a53 100644 --- a/Submerged/Systems/BoxCat/SubmarineBoxCatSystem.cs +++ b/Submerged/Systems/BoxCat/SubmarineBoxCatSystem.cs @@ -34,6 +34,11 @@ public void Deserialize(MessageReader reader, bool initialState) TriggerCatUpdate(); } + public void MarkClean() + { + IsDirty = false; + } + public void Serialize(MessageWriter writer, bool initialState) { writer.Write(_position); diff --git a/Submerged/Systems/Oxygen/SubmarineOxygenSystem.cs b/Submerged/Systems/Oxygen/SubmarineOxygenSystem.cs index 224a3f51..ced152e4 100644 --- a/Submerged/Systems/Oxygen/SubmarineOxygenSystem.cs +++ b/Submerged/Systems/Oxygen/SubmarineOxygenSystem.cs @@ -2,7 +2,9 @@ using System.Linq; using Hazel; using Il2CppInterop.Runtime.Injection; +using Reactor.Networking.Attributes; using Reactor.Utilities.Attributes; +using Submerged.Enums; using Submerged.KillAnimation.Patches; using UnityEngine; using AU = Submerged.BaseGame.Interfaces.AU; @@ -54,18 +56,16 @@ public void Deteriorate(float deltaTime) try { OxygenDeathAnimationPatches.IsOxygenDeath = true; - OxygenDeathRpcPatches.MurderPlayerAsOxygenDeath = true; if (localPlayer.inVent) { Vent.currentVent.SetButtons(false); localPlayer.MyPhysics.RpcExitVent(Vent.currentVent.Id); } - localPlayer.RpcMurderPlayer(localPlayer, true); + RpcOxygenDeath(localPlayer); } finally { - OxygenDeathRpcPatches.MurderPlayerAsOxygenDeath = false; OxygenDeathAnimationPatches.IsOxygenDeath = false; } } @@ -122,6 +122,11 @@ public void Deserialize(MessageReader reader, bool initialState) doKillCheck = reader.ReadBoolean(); } + public void MarkClean() + { + IsDirty = false; + } + public void Serialize(MessageWriter writer, bool initialState) { writer.Write(countdown); @@ -163,4 +168,18 @@ public void UpdateSystem(PlayerControl player, MessageReader msgReader) byte amount = msgReader.ReadByte(); RepairDamage(player, amount); } + + [MethodRpc(CustomRpcCalls.OxygenDeath)] + public static void RpcOxygenDeath(PlayerControl player) + { + try + { + if (player.AmOwner) KillCooldownPatches.PreventReset = true; + player.MurderPlayer(player, MurderResultFlags.Succeeded | MurderResultFlags.DecisionByHost); + } + finally + { + KillCooldownPatches.PreventReset = false; + } + } } diff --git a/Submerged/Systems/SecuritySabotage/SubmarineSecuritySabotageSystem.cs b/Submerged/Systems/SecuritySabotage/SubmarineSecuritySabotageSystem.cs index cbac4b23..c5011bb9 100644 --- a/Submerged/Systems/SecuritySabotage/SubmarineSecuritySabotageSystem.cs +++ b/Submerged/Systems/SecuritySabotage/SubmarineSecuritySabotageSystem.cs @@ -38,6 +38,11 @@ public void Deserialize(MessageReader reader, bool initialState) fixedCams = reader.ReadBytesAndSize().ToList(); } + public void MarkClean() + { + IsDirty = false; + } + public void Serialize(MessageWriter writer, bool initialState) { writer.WriteBytesAndSize(fixedCams.ToArray()); diff --git a/Submerged/UI/CreditsScreenManager.cs b/Submerged/UI/CreditsScreenManager.cs index e7edd6f9..bff02de9 100644 --- a/Submerged/UI/CreditsScreenManager.cs +++ b/Submerged/UI/CreditsScreenManager.cs @@ -29,8 +29,12 @@ public void OnEnable() textParent.Find("Map Design").GetComponent().text = General.Credits_MapDesign; textParent.Find("Developers").GetComponent().text = General.Credits_Developers; textParent.Find("Artists").GetComponent().text = General.Credits_Artists; - textParent.Find("Technical Support").GetComponent().text = General.Credits_TechnicalSupport; + textParent.Find("Technical Support").GetComponent().text = ContributorsCredit; textParent.Find("Additional Art").GetComponent().text = General.Credits_AdditionalArt; transform.Find("Translators/Text").GetComponent().text = $"{General.Credits_Translators}: {TRANSLATORS}"; } + + private static string ContributorsCredit => General.Credits_Contributors == "Contributors" && !string.IsNullOrWhiteSpace(General.Credits_TechnicalSupport) + ? General.Credits_TechnicalSupport + : General.Credits_Contributors; } diff --git a/Submerged/UI/Patches/DisableReactorWarningPatches.cs b/Submerged/UI/Patches/DisableReactorWarningPatches.cs index b964c1e3..75ce41d6 100644 --- a/Submerged/UI/Patches/DisableReactorWarningPatches.cs +++ b/Submerged/UI/Patches/DisableReactorWarningPatches.cs @@ -14,6 +14,7 @@ public static class DisableReactorWarningPatches "Submerged" ]; + // This is probably inlined, we should find another way [HarmonyPatch(typeof(DisconnectPopup), nameof(DisconnectPopup.ShowCustom))] [HarmonyPrefix] public static bool PreventReactorPopupPatch([HarmonyArgument(0)] string message) diff --git a/Submerged/UI/Patches/FindAGamePatches.cs b/Submerged/UI/Patches/FindAGamePatches.cs index aa742a4c..76afb119 100644 --- a/Submerged/UI/Patches/FindAGamePatches.cs +++ b/Submerged/UI/Patches/FindAGamePatches.cs @@ -2,6 +2,7 @@ using HarmonyLib; using Il2CppInterop.Runtime.InteropTypes.Arrays; using InnerNet; +using Submerged.Enums; using Submerged.Resources; using UnityEngine; @@ -27,4 +28,26 @@ private static SCG.IEnumerable UpdateMapIcons(Il2CppReferenceArray(__instance.mapLogoSprites) + { + ResourceManager.spriteCache["OptionsLogo"] + }.ToArray(); + + __instance.mapBackgroundSprites = new SCG.List(__instance.mapBackgroundSprites) + { + ResourceManager.spriteCache["OptionsBG"] + }.ToArray(); + } } diff --git a/Submerged/UI/Patches/MapOptionsButtonPatches.cs b/Submerged/UI/Patches/MapOptionsButtonPatches.cs index cb4c8932..7e060fec 100644 --- a/Submerged/UI/Patches/MapOptionsButtonPatches.cs +++ b/Submerged/UI/Patches/MapOptionsButtonPatches.cs @@ -1,4 +1,5 @@ -using System.Linq; +using System; +using System.Linq; using HarmonyLib; using Submerged.Enums; using Submerged.Resources; @@ -8,28 +9,34 @@ namespace Submerged.UI.Patches; [HarmonyPatch] public static class MapOptionsButtonPatches { - [HarmonyPatch(typeof(GameOptionsMapPicker), nameof(GameOptionsMapPicker.Initialize))] + private static readonly Lazy _optionsIcon = new(() => new MapIconByName + { + Name = CustomMapNames.Submerged, + MapIcon = ResourceManager.spriteCache["OptionsIcon"], + MapImage = ResourceManager.spriteCache["OptionsBG"], + NameImage = ResourceManager.spriteCache["OptionsLogo"] + }); + + private static readonly Lazy _gameIcon = new(() => new MapIconByName + { + Name = CustomMapNames.Submerged, + MapIcon = ResourceManager.spriteCache["Logo"] + }); + + [HarmonyPatch(typeof(GameOptionsMapPicker), nameof(GameOptionsMapPicker.SetupMapButtons))] [HarmonyPrefix] public static void AddToGameOptionsUI(GameOptionsMapPicker __instance) { - __instance.AllMapIcons.Insert(4, new MapIconByName - { - Name = CustomMapNames.Submerged, - MapIcon = ResourceManager.spriteCache["OptionsIcon"], - MapImage = ResourceManager.spriteCache["OptionsBG"], - NameImage = ResourceManager.spriteCache["OptionsLogo"] - }); + if (__instance.AllMapIcons.ToArray().Any(x => x.Name == CustomMapNames.Submerged)) return; + __instance.AllMapIcons.Insert(4, _optionsIcon.Value); } [HarmonyPatch(typeof(GameStartManager), nameof(GameStartManager.Start))] [HarmonyPrefix] public static void AddToOptionsDisplay(GameStartManager __instance) { - __instance.AllMapIcons.Insert(4, new MapIconByName - { - Name = CustomMapNames.Submerged, - MapIcon = ResourceManager.spriteCache["Logo"], - }); + if (__instance.AllMapIcons.ToArray().Any(x => x.Name == CustomMapNames.Submerged)) return; + __instance.AllMapIcons.Insert(4, _gameIcon.Value); } [HarmonyPatch(typeof(MapSelectionGameSetting), nameof(MapSelectionGameSetting.GetValueString))] @@ -42,3 +49,4 @@ public static void AddToActualOptions(MapSelectionGameSetting __instance) } } } + diff --git a/Submerged/UI/Patches/MapSelectButtonPatches.cs b/Submerged/UI/Patches/MapSelectButtonPatches.cs index 90e1ebe9..7202701a 100644 --- a/Submerged/UI/Patches/MapSelectButtonPatches.cs +++ b/Submerged/UI/Patches/MapSelectButtonPatches.cs @@ -14,6 +14,7 @@ public static class MapSelectButtonPatches { private static FreeplayPopover _lastInstance; + // this is probably inlined, find another way [HarmonyPatch(typeof(IGameOptionsExtensions), nameof(IGameOptionsExtensions.ToggleMapFilter))] [HarmonyPrefix] public static bool AllowSelectingSubmergedMapPatch([HarmonyArgument(0)] IGameOptions gameOptions, [HarmonyArgument(1)] byte newId) @@ -47,76 +48,27 @@ public static void AdjustFreeplayMenuPatch(FreeplayPopover __instance) __instance.buttons = new List(__instance.buttons) { submergedButton }.ToArray(); } - [HarmonyPatch(typeof(CreateOptionsPicker), nameof(CreateOptionsPicker.Awake))] + [HarmonyPatch(typeof(CreateGameOptions), nameof(CreateGameOptions.Start))] [HarmonyPrefix] - public static void AdjustCreateOptionsPatch(CreateOptionsPicker __instance) + public static void AddSubmergedToCreateGame(CreateGameOptions __instance) { - Transform mapPicker = __instance.transform.Find("MapPicker"); - MapPickerMenu mapPickerMenu = mapPicker.Find("Map Picker Menu").GetComponent(); - - if (__instance.mode == SettingsMode.Host) - { - mapPickerMenu.transform.localPosition = new Vector3(mapPickerMenu.transform.localPosition.x, 1, mapPickerMenu.transform.localPosition.z); - } - - Transform fungleButton = mapPickerMenu.transform.Find("Fungle"); - Transform submergedButton = UnityObject.Instantiate(fungleButton, fungleButton.parent); - submergedButton.name = "Submerged"; - submergedButton.position = new Vector3(fungleButton.position.x, - 2 * fungleButton.position.y - mapPickerMenu.transform.Find("Airship").transform.position.y, - fungleButton.position.z); - - SpriteRenderer submergedButtonRenderer = submergedButton.Find("Image").GetComponent(); - submergedButtonRenderer.sprite = ResourceManager.spriteCache["Logo"]; - - PassiveButton submergedPassiveButton = submergedButton.GetComponent(); - submergedPassiveButton.OnClick.m_PersistentCalls.m_Calls._items[0].arguments.intArgument = (int) CustomMapTypes.Submerged; - - MapFilterButton fungleIndicator = __instance.MapMenu.MapButtons[4]; - MapFilterButton submergedIndicator = UnityObject.Instantiate(fungleIndicator, fungleIndicator.transform.parent); - submergedIndicator.name = "Submerged"; - submergedIndicator.transform.localPosition = new Vector3(0.80f, fungleIndicator.transform.localPosition.y, fungleIndicator.transform.localPosition.z); - submergedIndicator.MapId = CustomMapNames.Submerged; - submergedIndicator.Button = submergedPassiveButton; - submergedIndicator.ButtonCheck = submergedButton.Find("selectedCheck").GetComponent(); - submergedIndicator.ButtonImage = submergedButtonRenderer; - submergedIndicator.ButtonOutline = submergedButtonRenderer.transform.parent.GetComponent(); - submergedIndicator.Icon.sprite = ResourceManager.spriteCache["FilterIcon"]; - __instance.MapMenu.MapButtons = __instance.MapMenu.MapButtons.AddItem(submergedIndicator).ToArray(); - - float pos = -1; - for (int i = 0; i < 6; i++) + __instance.mapTooltips = __instance.mapTooltips.AddItem(CustomStringNames.SubmergedTooltip).ToArray(); + __instance.mapBanners = new List(__instance.mapBanners) { - __instance.MapMenu.MapButtons[i].transform.SetLocalX(pos); - pos += 0.34f; - } + ResourceManager.spriteCache["OptionsLogo"] + }.ToArray(); - SwapPositionsTroll(fungleButton, submergedButton); - SwapPositionsTroll(fungleIndicator, submergedIndicator); + ConfirmCreatePopUp popUp = __instance.confirmPopUp.GetComponent(); - if (AssetLoader.Errored) + popUp.mapLogos = new List(popUp.mapLogos) { - submergedPassiveButton.enabled = false; - submergedButtonRenderer.color = Palette.DisabledGrey; - - IGameOptions targetOptions = __instance.GetTargetOptions(); + ResourceManager.spriteCache["OptionsLogo"] + }.ToArray(); - if (targetOptions.MapId == (byte) CustomMapTypes.Submerged) - { - targetOptions.SetByte(ByteOptionNames.MapId, 0); - __instance.SetTargetOptions(targetOptions); - __instance.MapMenu.UpdateMapButtons(0); - } - } - - if (__instance.mode == SettingsMode.Host) + popUp.mapBanners = new List(popUp.mapBanners) { - __instance.CrewArea.MapBackgrounds = new List(__instance.CrewArea.MapBackgrounds) { ResourceManager.spriteCache["CreateGameBG"] }.ToArray(); - - mapPicker.localScale = new Vector3(0.75f, 0.75f, 1); - } - - mapPickerMenu.transform.Find("Backdrop").localScale *= 4; + ResourceManager.spriteCache["OptionsBG"] + }.ToArray(); } private static void SwapPositionsTroll(Component one, Component two) diff --git a/Submerged/UI/Patches/StartGameErrorPatches.cs b/Submerged/UI/Patches/StartGameErrorPatches.cs index e3a93b0f..83707fd7 100644 --- a/Submerged/UI/Patches/StartGameErrorPatches.cs +++ b/Submerged/UI/Patches/StartGameErrorPatches.cs @@ -80,7 +80,7 @@ private static void UpdateErrorMessage(GameStartManager gameStartManager, string gameStartManager.StartButton.ChangeButtonText(text); } - [BaseGameCode(LastChecked.v2024_8_13, "This code is taken from GameStartManager.Update")] + [BaseGameCode(LastChecked.v17_0_0, "This code is taken from GameStartManager.Update")] private static void UpdateStartButtonBasedOnPlayerCount(GameStartManager gameStartManager) { gameStartManager.StartButton.SetButtonEnableState(gameStartManager.LastPlayerCount >= gameStartManager.MinPlayers); @@ -91,13 +91,13 @@ private static void UpdateStartButtonBasedOnPlayerCount(GameStartManager gameSta } if (gameStartManager.LastPlayerCount >= gameStartManager.MinPlayers) { - gameStartManager.StartButton.ChangeButtonText(TranslationController.Instance.GetString(StringNames.StartLabel)); - gameStartManager.GameStartTextClient.text = TranslationController.Instance.GetString(StringNames.WaitingForPlayers); + gameStartManager.StartButton.ChangeButtonText(TranslationController.Instance.GetString(StringNames.StartLabel, [])); + gameStartManager.GameStartTextClient.text = TranslationController.Instance.GetString(StringNames.WaitingForHost, []); } else { - gameStartManager.StartButton.ChangeButtonText(TranslationController.Instance.GetString(StringNames.WaitingForPlayers)); - gameStartManager.GameStartTextClient.text = TranslationController.Instance.GetString(StringNames.WaitingForHost); + gameStartManager.StartButton.ChangeButtonText(TranslationController.Instance.GetString(StringNames.WaitingForPlayers, [])); + gameStartManager.GameStartTextClient.text = TranslationController.Instance.GetString(StringNames.WaitingForPlayers, []); } } } diff --git a/Submerged/Vents/EngineVentMovement.cs b/Submerged/Vents/EngineVentMovement.cs index cb00c5ff..9db63974 100644 --- a/Submerged/Vents/EngineVentMovement.cs +++ b/Submerged/Vents/EngineVentMovement.cs @@ -1,6 +1,8 @@ -using Hazel; +using BepInEx.Unity.IL2CPP.Utils; using PowerTools; +using Reactor.Networking.Attributes; using Submerged.Enums; +using Submerged.Extensions; using Submerged.Floors; using UnityEngine; using static Submerged.Vents.VentPatchData; @@ -27,7 +29,7 @@ public static IEnumerator HandleMove(Vector2 targetPos) PlayerControl.LocalPlayer.NetTransform.RpcSnapTo(targetPos); floorHandler.RpcRequestChangeFloor(false); - RpcEngineVent(); + RpcEngineVent(PlayerControl.LocalPlayer); yield return PublicHandleMove(PlayerControl.LocalPlayer); @@ -56,9 +58,10 @@ public static IEnumerator PublicHandleMove(PlayerControl player) physics.Animations.Animator.Play(physics.Animations.group.IdleAnim); } - private static void RpcEngineVent() + [MethodRpc(CustomRpcCalls.EngineVent)] + public static void RpcEngineVent(PlayerControl player) { - MessageWriter rpc = AmongUsClient.Instance.StartRpcImmediately(PlayerControl.LocalPlayer.MyPhysics.NetId, CustomRpcCalls.EngineVent, SendOption.Reliable); - AmongUsClient.Instance.FinishRpcImmediately(rpc); + if (!ShipStatus.Instance.IsSubmerged()) return; + player.StartCoroutine(PublicHandleMove(player)); } } diff --git a/Submerged/Vents/Patches/CentralVentPatches.cs b/Submerged/Vents/Patches/CentralVentPatches.cs index 368b08b6..cf9aee87 100644 --- a/Submerged/Vents/Patches/CentralVentPatches.cs +++ b/Submerged/Vents/Patches/CentralVentPatches.cs @@ -2,7 +2,7 @@ using Submerged.Extensions; using UnityEngine; using static Submerged.Vents.VentPatchData; -using PlayerPhysics_CoExitVent = PlayerPhysics._CoExitVent_d__56; +using PlayerPhysics_CoExitVent = PlayerPhysics._CoExitVent_d__48; namespace Submerged.Vents.Patches; diff --git a/Submerged/Vents/Patches/EngineVentPatches.cs b/Submerged/Vents/Patches/EngineVentPatches.cs index 43b0a12d..b1862106 100644 --- a/Submerged/Vents/Patches/EngineVentPatches.cs +++ b/Submerged/Vents/Patches/EngineVentPatches.cs @@ -1,6 +1,4 @@ -using BepInEx.Unity.IL2CPP.Utils; using HarmonyLib; -using Submerged.Enums; using Submerged.Extensions; using Submerged.Floors; using UnityEngine; @@ -41,18 +39,6 @@ private static bool IsAlivePersonInsideVent(int targetVent) return false; } - [HarmonyPatch(typeof(PlayerPhysics), nameof(PlayerPhysics.HandleRpc))] - [HarmonyPrefix, HarmonyPriority(Priority.First + 100)] - public static bool HandleMovePatch(PlayerPhysics __instance, [HarmonyArgument(0)] byte callId) - { - if (!ShipStatus.Instance.IsSubmerged()) return true; - if (callId != CustomRpcCalls.EngineVent) return true; - - __instance.StartCoroutine(EngineVentMovement.PublicHandleMove(__instance.myPlayer)); - - return false; - } - [HarmonyPatch(typeof(PlayerPhysics), nameof(PlayerPhysics.RpcExitVent))] [HarmonyPrefix] public static void MovePlayerUpWhenExitingPatch(PlayerPhysics __instance, [HarmonyArgument(0)] int id) diff --git a/Submerged/packages.lock.json b/Submerged/packages.lock.json new file mode 100644 index 00000000..d12f102b --- /dev/null +++ b/Submerged/packages.lock.json @@ -0,0 +1,918 @@ +{ + "version": 1, + "dependencies": { + "net6.0": { + "AmongUs.GameLibs.Steam": { + "type": "Direct", + "requested": "[2025.10.14, )", + "resolved": "2025.10.14", + "contentHash": "QeeXYh9wDDFv5ZTKRBxLPdjiaRYpU0/L5iew9pRVv1AKWqxCGzSvyHpAKpDZhpJqEWcG7p18W2WLLYhRlgfdOg==" + }, + "BepInEx.AutoPlugin": { + "type": "Direct", + "requested": "[1.1.0, )", + "resolved": "1.1.0", + "contentHash": "/7Nmc1EA9lYlGBiyz6qPAaHvlcJHEjFZ1RFpGX+8EBj3GrgoX5kbpnZusuSHoOlLx0l+CnzKuQNE54B8UaGPyw==" + }, + "BepInEx.IL2CPP.MSBuild": { + "type": "Direct", + "requested": "[2.1.0-rc.1, )", + "resolved": "2.1.0-rc.1", + "contentHash": "WI/7TbJwWl5P4B6UXGtKI1VMe6fA6h3fcbp3ZjJKqOBQ5MJfDMmeVB4fb+RW1tUQdxnlSWV3Ul62PHFyTqp4PA==" + }, + "BepInEx.Unity.IL2CPP": { + "type": "Direct", + "requested": "[6.0.0-be.735, )", + "resolved": "6.0.0-be.735", + "contentHash": "2+eFJGKMR1GFPeU9wuF+TVrMANIaWIc/6N9e8x4b7b/fNiY9B6vicYNiMDb2deYQpWZtOei+2btnar5dDE5BPg==", + "dependencies": { + "BepInEx.Core": "6.0.0-be.735", + "BepInEx.Unity.Common": "6.0.0-be.735", + "HarmonyX": "2.10.2", + "Iced": "1.21.0", + "Il2CppInterop.Generator": "1.4.6-ci.426", + "Il2CppInterop.HarmonySupport": "1.4.6-ci.426", + "Il2CppInterop.Runtime": "1.4.6-ci.426", + "MonoMod.RuntimeDetour": "22.7.31.1", + "Samboy063.Cpp2IL.Core": "2022.1.0-pre-release.19" + } + }, + "JetBrains.Annotations": { + "type": "Direct", + "requested": "[2025.2.2, )", + "resolved": "2025.2.2", + "contentHash": "0X56ZRizuHdrnPpgXjWV7f2tQO1FlQg5O1967OGKnI/4ZRNOK642J8L7brM1nYvrxTTU5TP1yRyXLRLaXLPQ8A==" + }, + "Microsoft.Unity.Analyzers": { + "type": "Direct", + "requested": "[1.25.0, )", + "resolved": "1.25.0", + "contentHash": "jOclVb2PVoOdKafuzt3bJ3BHkbjsfuAx+60yqP4zCAhlNa1rwn1Jt05qrmqJgmBY42S08hXbps9KA6QR2Z7aOA==" + }, + "Reactor": { + "type": "Direct", + "requested": "[2.5.0-ci.371, )", + "resolved": "2.5.0-ci.371", + "contentHash": "LMKHi2CPACJJkBK117HT6zKS8mkv1c/RUZusYlnFExS2nGCD/haqf+YkTXyK561T5+BSg0m0R4ubSG30cdYDNg==", + "dependencies": { + "BepInEx.Unity.IL2CPP": "6.0.0-be.735" + } + }, + "Submerged.Resource.Embedder": { + "type": "Direct", + "requested": "[2.2.1.1, )", + "resolved": "2.2.1.1", + "contentHash": "yjvq4uDQkklMnflX0VSAXgPVtGUap9lR3aurDgzX89OHtEj6pJuPhqLRZaTN2s45OwS86QkwIf9d1YPt8eiPGg==" + }, + "AsmResolver": { + "type": "Transitive", + "resolved": "6.0.0-beta.1", + "contentHash": "M5btCR/rmrx32jZsoN6CLQ/VQk8lN8hvPb6lgojua7pjNoo7StAl92koMC8qz4vzZyH2CNqxLSDoswRvyyK/vA==" + }, + "AsmResolver.DotNet": { + "type": "Transitive", + "resolved": "6.0.0-beta.1", + "contentHash": "PTq8nNQvhgTxF1iARCknffCsu7Iq9B0kN7TVC8iMaU7uEYog3xvVqH/0+TreY8GW74/+MqhZt/yEFsvS4oAduQ==", + "dependencies": { + "AsmResolver.PE": "6.0.0-beta.1" + } + }, + "AsmResolver.PE": { + "type": "Transitive", + "resolved": "6.0.0-beta.1", + "contentHash": "KadLvx/zzFCJyF+E4jG6jPE1d0iJquzL6+hm8GBivBAs6nwHC8s6g4c857QwQCzXMWza6Vz5Q+3hFiNuOfKaWQ==", + "dependencies": { + "AsmResolver.PE.File": "6.0.0-beta.1" + } + }, + "AsmResolver.PE.File": { + "type": "Transitive", + "resolved": "6.0.0-beta.1", + "contentHash": "+lusB9UMHevI5aQsu73NQ1ctPMLFvyHAsEf8vjaJ/py+kX1DkU0JkbERtBRmaf58/hBZ7cyrE7gFnjoo7Bbg7A==", + "dependencies": { + "AsmResolver": "6.0.0-beta.1" + } + }, + "AssetRipper.CIL": { + "type": "Transitive", + "resolved": "1.1.2", + "contentHash": "BRPcHORadIzSFkrVOvGkSs54j19mQdXH8dmRTVM51mS8MZLSbTpi9CDPpnWN2IdDsILUrAqbPUFo3zJodYxErw==", + "dependencies": { + "AsmResolver.DotNet": "6.0.0-beta.1" + } + }, + "AssetRipper.Gee.External.Capstone": { + "type": "Transitive", + "resolved": "2.3.2", + "contentHash": "wOr5PQPL/2ZfD7+ebt6cpRbUhSzSY5nlHGHjjzuQRiU5zkQlqQNwWDLX0M3smrm5IkaDvONkmDjFMKTlZJmyuQ==" + }, + "AssetRipper.Primitives": { + "type": "Transitive", + "resolved": "3.1.3", + "contentHash": "djZbN/+EXmI+Oia9Pm0LyjZVCPLf60TPSL5rGb7mBEYM5F4CN3nPFXvl2yA5LanPZoHS1Yq7PghGUmkP7Pv9RQ==" + }, + "BepInEx.Core": { + "type": "Transitive", + "resolved": "6.0.0-be.735", + "contentHash": "FuHm9UCzjSKeiZJc3IF70Fiuqi+FynRn62PwBoOeZcHK3/qm+vl1YwbZyFlmUyf45g+UKxg2Td40iZGx88LVAQ==", + "dependencies": { + "HarmonyX": "2.10.2", + "MonoMod.Utils": "22.7.31.1", + "SemanticVersioning": "2.0.2" + } + }, + "BepInEx.Unity.Common": { + "type": "Transitive", + "resolved": "6.0.0-be.735", + "contentHash": "vmK//OBSr+jotqTk//HSdvHtMFTKu+NlQkiEsvr0dZApTVmQM2AgpVMhEAakQPmrSsM6LRJIHCBcLFO1ypfMPQ==", + "dependencies": { + "AssetRipper.Primitives": "3.1.3", + "MonoMod.Utils": "22.7.31.1" + } + }, + "Disarm": { + "type": "Transitive", + "resolved": "2022.1.0-master.57", + "contentHash": "/dkg7hg8iPBQN4bTV1lMQacarH6fMpgUXhJuo6iI7Wv7YpH7g5F9hJfje7dSMhqG0YlDacLuyWvcph5GzKUXog==" + }, + "HarmonyX": { + "type": "Transitive", + "resolved": "2.10.2", + "contentHash": "/5WwkxXX8mPsRuigQt957rJGx1f0dDQxk+bvk4yYITKFjXas9Em+O71zEP8X0ym8OFQQ2XH/2SxS4NC7vEC+Xg==", + "dependencies": { + "MonoMod.RuntimeDetour": "22.3.23.4", + "System.Reflection.Emit": "4.7.0" + } + }, + "Iced": { + "type": "Transitive", + "resolved": "1.21.0", + "contentHash": "dv5+81Q1TBQvVMSOOOmRcjJmvWcX3BZPZsIq31+RLc5cNft0IHAyNlkdb7ZarOWG913PyBoFDsDXoCIlKmLclg==" + }, + "Il2CppInterop.Common": { + "type": "Transitive", + "resolved": "1.4.6-ci.426", + "contentHash": "pI0kU0qqJKMP6z9eFz4+WJtGIwklfPxW2yWEY9vKnrN9bbYMusK3v5uFWV8al7S/HPSATV5jNWH1hyTvP7kglA==", + "dependencies": { + "Iced": "1.17.0", + "Microsoft.Extensions.Logging.Abstractions": "6.0.1", + "System.Net.Http": "4.3.4" + } + }, + "Il2CppInterop.Generator": { + "type": "Transitive", + "resolved": "1.4.6-ci.426", + "contentHash": "kecdx/vbNl0RtfzfYW592jU8PMyq1JbzpvoJSvqwO+tV6icp9SljXy6yG8bT/wt0gaPj9mFUNDTe2Wu6M6XGZQ==", + "dependencies": { + "Il2CppInterop.Common": "1.4.6-ci.426", + "Mono.Cecil": "0.11.3" + } + }, + "Il2CppInterop.HarmonySupport": { + "type": "Transitive", + "resolved": "1.4.6-ci.426", + "contentHash": "rd2T5o6SybIc12hmX3HktTF5n27hFb0w4mNSExq7h1YsmrNlt7x+Ac1MBnnB0JwPLIg7w8LjnKjoIX6Gf626ng==", + "dependencies": { + "HarmonyX": "2.10.0", + "Il2CppInterop.Runtime": "1.4.6-ci.426" + } + }, + "Il2CppInterop.Runtime": { + "type": "Transitive", + "resolved": "1.4.6-ci.426", + "contentHash": "0O0oI7gOqJixrsjvh1firhuGYK3Yr0uDLp6Q+t5CfcTMmeEX8Plk3pqAP9ZYyilBvh7uW0gv4Golqz08L1GXug==", + "dependencies": { + "Iced": "1.17.0", + "Il2CppInterop.Common": "1.4.6-ci.426" + } + }, + "Microsoft.Extensions.Logging.Abstractions": { + "type": "Transitive", + "resolved": "6.0.1", + "contentHash": "dzB2Cgg+JmrouhjkcQGzSFjjvpwlq353i8oBQO2GWNjCXSzhbtBRUf28HSauWe7eib3wYOdb3tItdjRwAdwCSg==" + }, + "Microsoft.NETCore.Platforms": { + "type": "Transitive", + "resolved": "1.1.1", + "contentHash": "TMBuzAHpTenGbGgk0SMTwyEkyijY/Eae4ZGsFNYJvAr/LDn1ku3Etp3FPxChmDp5HHF3kzJuoaa08N0xjqAJfQ==" + }, + "Microsoft.NETCore.Targets": { + "type": "Transitive", + "resolved": "1.1.0", + "contentHash": "aOZA3BWfz9RXjpzt0sRJJMjAscAUm3Hoa4UWAfceV9UTYxgwZ1lZt5nO2myFf+/jetYQo4uTP7zS8sJY67BBxg==" + }, + "Mono.Cecil": { + "type": "Transitive", + "resolved": "0.11.4", + "contentHash": "IC1h5g0NeJGHIUgzM1P82ld57knhP0IcQfrYITDPXlNpMYGUrsG5TxuaWTjaeqDNQMBDNZkB8L0rBnwsY6JHuQ==" + }, + "MonoMod.RuntimeDetour": { + "type": "Transitive", + "resolved": "22.7.31.1", + "contentHash": "nxVJTvQbWAujaogt5XX3eAy7d22t66Z88aWg9sirPLO9rR/6yNCHAyZpgxXrOsIobZVW0IEZPqNMOBhgke25/w==", + "dependencies": { + "Mono.Cecil": "0.11.4", + "MonoMod.Utils": "22.7.31.1", + "System.Collections.NonGeneric": "4.3.0", + "System.ComponentModel.TypeConverter": "4.3.0", + "System.IO.FileSystem.Primitives": "4.3.0", + "System.Reflection.Emit.ILGeneration": "4.7.0", + "System.Reflection.Emit.Lightweight": "4.7.0", + "System.Reflection.TypeExtensions": "4.7.0" + } + }, + "MonoMod.Utils": { + "type": "Transitive", + "resolved": "22.7.31.1", + "contentHash": "nI0E1oadXS1iMbfwfCzYF08C1jRQR9cnnHv66a4BSPd4sGu2p6g4BmctCWsdAB6oGKkSJUhcfHfxcfTsDyB94Q==", + "dependencies": { + "Mono.Cecil": "0.11.4", + "System.Collections.NonGeneric": "4.3.0", + "System.ComponentModel.TypeConverter": "4.3.0", + "System.IO.FileSystem.Primitives": "4.3.0", + "System.Reflection.Emit.ILGeneration": "4.7.0", + "System.Reflection.Emit.Lightweight": "4.7.0", + "System.Reflection.TypeExtensions": "4.7.0" + } + }, + "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.2", + "contentHash": "7VSGO0URRKoMEAq0Sc9cRz8mb6zbyx/BZDEWhgPdzzpmFhkam3fJ1DAGWFXBI4nGlma+uPKpfuMQP5LXRnOH5g==" + }, + "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.2", + "contentHash": "0oAaTAm6e2oVH+/Zttt0cuhGaePQYKII1dY8iaqP7CvOpVKgLybKRFvQjXR2LtxXOXTVPNv14j0ot8uV+HrUmw==" + }, + "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.2", + "contentHash": "G24ibsCNi5Kbz0oXWynBoRgtGvsw5ZSVEWjv13/KiCAM8C6wz9zzcCniMeQFIkJ2tasjo2kXlvlBZhplL51kGg==" + }, + "runtime.native.System": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "c/qWt2LieNZIj1jGnVNsE2Kl23Ya2aSTBuXMD6V7k9KWr6l16Tqdwq+hJScEpWER9753NWC8h96PaVNY5Ld7Jw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0" + } + }, + "runtime.native.System.Net.Http": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "ZVuZJqnnegJhd2k/PtAbbIcZ3aZeITq3sj06oKfMBSfphW3HDmk/t4ObvbOk/JA/swGR0LNqMksAh/f7gpTROg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0" + } + }, + "runtime.native.System.Security.Cryptography.Apple": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "DloMk88juo0OuOWr56QG7MNchmafTLYWvABy36izkrLI5VledI0rq28KGs1i9wbpeT9NPQrx/wTf8U2vazqQ3Q==", + "dependencies": { + "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple": "4.3.0" + } + }, + "runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.2", + "contentHash": "QR1OwtwehHxSeQvZKXe+iSd+d3XZNkEcuWMFYa2i0aG1l+lR739HPicKMlTbJst3spmeekDVBUS7SeS26s4U/g==", + "dependencies": { + "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", + "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", + "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", + "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", + "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", + "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", + "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", + "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", + "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", + "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2" + } + }, + "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.2", + "contentHash": "I+GNKGg2xCHueRd1m9PzeEW7WLbNNLznmTuEi8/vZX71HudUbx1UTwlGkiwMri7JLl8hGaIAWnA/GONhu+LOyQ==" + }, + "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.2", + "contentHash": "1Z3TAq1ytS1IBRtPXJvEUZdVsfWfeNEhBkbiOCGEl9wwAfsjP2lz3ZFDx5tq8p60/EqbS0HItG5piHuB71RjoA==" + }, + "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "kVXCuMTrTlxq4XOOMAysuNwsXWpYeboGddNGpIgNSZmv1b6r/s/DPk0fYMB7Q5Qo4bY68o48jt4T4y5BVecbCQ==" + }, + "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.2", + "contentHash": "6mU/cVmmHtQiDXhnzUImxIcDL48GbTk+TsptXyJA+MIOG9LRjPoAQC/qBFB7X+UNyK86bmvGwC8t+M66wsYC8w==" + }, + "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.2", + "contentHash": "vjwG0GGcTW/PPg6KVud8F9GLWYuAV1rrw1BKAqY0oh4jcUqg15oYF1+qkGR2x2ZHM4DQnWKQ7cJgYbfncz/lYg==" + }, + "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.2", + "contentHash": "7KMFpTkHC/zoExs+PwP8jDCWcrK9H6L7soowT80CUx3e+nxP/AFnq0AQAW5W76z2WYbLAYCRyPfwYFG6zkvQRw==" + }, + "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.2", + "contentHash": "xrlmRCnKZJLHxyyLIqkZjNXqgxnKdZxfItrPkjI+6pkRo5lHX8YvSZlWrSI5AVwLMi4HbNWP7064hcAWeZKp5w==" + }, + "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.2", + "contentHash": "leXiwfiIkW7Gmn7cgnNcdtNAU70SjmKW3jxGj1iKHOvdn0zRWsgv/l2OJUO5zdGdiv2VRFnAsxxhDgMzofPdWg==" + }, + "Samboy063.Cpp2IL.Core": { + "type": "Transitive", + "resolved": "2022.1.0-pre-release.19", + "contentHash": "mAYIrMo0VdOZzh1NS5bZeflg80gtYNY7kZo9q/blEYheUPyLXu5ozQOjX+Bq2yDh40pA+yiE2MXTnN2Is2hjgw==", + "dependencies": { + "AsmResolver.DotNet": "6.0.0-beta.1", + "AssetRipper.CIL": "1.1.2", + "AssetRipper.Gee.External.Capstone": "2.3.2", + "Disarm": "2022.1.0-master.57", + "Iced": "1.21.0", + "Samboy063.LibCpp2IL": "2022.1.0-pre-release.19", + "StableNameDotNet": "0.1.0-pre-release.19" + } + }, + "Samboy063.LibCpp2IL": { + "type": "Transitive", + "resolved": "2022.1.0-pre-release.19", + "contentHash": "/n8p81ltd38BeNNS2xUNPGMSzxk/UGXr9cRNqG1MaLogzANNNrvCAXqWmNMM3tZctjp7vqTxEA+e4J4ngul8Fg==", + "dependencies": { + "AssetRipper.Primitives": "3.1.3", + "Samboy063.WasmDisassembler": "2022.1.0-pre-release.19" + } + }, + "Samboy063.WasmDisassembler": { + "type": "Transitive", + "resolved": "2022.1.0-pre-release.19", + "contentHash": "uVQdYm/J6+jJ1xt6GJ3hNhXhciwlX+LmHTPITu9jjZ75T33YJuuTD7pLVYuMymr+4gSVisg7f1wterFSyqJBWA==" + }, + "SemanticVersioning": { + "type": "Transitive", + "resolved": "2.0.2", + "contentHash": "4EQgYdNZ92SyaO7YFk6olVnebF5V+jrHyMUjvPq89tLeMo8NSfgDF+6Zwq/lgh9j/0yfQp9Lkm0ZA0rUATCZFA==" + }, + "StableNameDotNet": { + "type": "Transitive", + "resolved": "0.1.0-pre-release.19", + "contentHash": "5BPWtntv3PXeFIg9CuGW6OM3f5GnwvdQJbzRpufPsistFwFyt1xYW1wSDr+QIdDO7vLndr7iNpWD3FyYp9LL4g==" + }, + "System.Collections": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "3Dcj85/TBdVpL5Zr+gEEBUuFe2icOnLalmEh9hfck1PTYbbyWuZgh4fmm2ysCLTrqLQw6t3TgTyJ+VLp+Qb+Lw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Collections.Concurrent": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "ztl69Xp0Y/UXCL+3v3tEU+lIy+bvjKNUmopn1wep/a291pVPK7dxBd6T7WnlQqRog+d1a/hSsgRsmFnIBKTPLQ==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Diagnostics.Tracing": "4.3.0", + "System.Globalization": "4.3.0", + "System.Reflection": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Threading": "4.3.0", + "System.Threading.Tasks": "4.3.0" + } + }, + "System.Collections.NonGeneric": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "prtjIEMhGUnQq6RnPEYLpFt8AtLbp9yq2zxOSrY7KJJZrw25Fi97IzBqY7iqssbM61Ek5b8f3MG/sG1N2sN5KA==", + "dependencies": { + "System.Diagnostics.Debug": "4.3.0", + "System.Globalization": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Threading": "4.3.0" + } + }, + "System.Collections.Specialized": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "Epx8PoVZR0iuOnJJDzp7pWvdfMMOAvpUo95pC4ScH2mJuXkKA2Y4aR3cG9qt2klHgSons1WFh4kcGW7cSXvrxg==", + "dependencies": { + "System.Collections.NonGeneric": "4.3.0", + "System.Globalization": "4.3.0", + "System.Globalization.Extensions": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Threading": "4.3.0" + } + }, + "System.ComponentModel": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "VyGn1jGRZVfxnh8EdvDCi71v3bMXrsu8aYJOwoV7SNDLVhiEqwP86pPMyRGsDsxhXAm2b3o9OIqeETfN5qfezw==", + "dependencies": { + "System.Runtime": "4.3.0" + } + }, + "System.ComponentModel.Primitives": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "j8GUkCpM8V4d4vhLIIoBLGey2Z5bCkMVNjEZseyAlm4n5arcsJOeI3zkUP+zvZgzsbLTYh4lYeP/ZD/gdIAPrw==", + "dependencies": { + "System.ComponentModel": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0" + } + }, + "System.ComponentModel.TypeConverter": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "16pQ6P+EdhcXzPiEK4kbA953Fu0MNG2ovxTZU81/qsCd1zPRsKc3uif5NgvllCY598k6bI0KUyKW8fanlfaDQg==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Collections.NonGeneric": "4.3.0", + "System.Collections.Specialized": "4.3.0", + "System.ComponentModel": "4.3.0", + "System.ComponentModel.Primitives": "4.3.0", + "System.Globalization": "4.3.0", + "System.Linq": "4.3.0", + "System.Reflection": "4.3.0", + "System.Reflection.Extensions": "4.3.0", + "System.Reflection.Primitives": "4.3.0", + "System.Reflection.TypeExtensions": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Threading": "4.3.0" + } + }, + "System.Diagnostics.Debug": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "ZUhUOdqmaG5Jk3Xdb8xi5kIyQYAA4PnTNlHx1mu9ZY3qv4ELIdKbnL/akbGaKi2RnNUWaZsAs31rvzFdewTj2g==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Diagnostics.DiagnosticSource": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "tD6kosZnTAGdrEa0tZSuFyunMbt/5KYDnHdndJYGqZoNy00XVXyACd5d6KnE1YgYv3ne2CjtAfNXo/fwEhnKUA==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Diagnostics.Tracing": "4.3.0", + "System.Reflection": "4.3.0", + "System.Runtime": "4.3.0", + "System.Threading": "4.3.0" + } + }, + "System.Diagnostics.Tracing": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "rswfv0f/Cqkh78rA5S8eN8Neocz234+emGCtTF3lxPY96F+mmmUen6tbn0glN6PMvlKQb9bPAY5e9u7fgPTkKw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Globalization": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "kYdVd2f2PAdFGblzFswE4hkNANJBKRmsfa2X5LG2AcWE1c7/4t0pYae1L8vfZ5xvE2nK/R9JprtToA61OSHWIg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Globalization.Calendars": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "GUlBtdOWT4LTV3I+9/PJW+56AnnChTaOqqTLFtdmype/L500M2LIyXgmtd9X2P2VOkmJd5c67H5SaC2QcL1bFA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Globalization": "4.3.0", + "System.Runtime": "4.3.0" + } + }, + "System.Globalization.Extensions": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "FhKmdR6MPG+pxow6wGtNAWdZh7noIOpdD5TwQ3CprzgIE1bBBoim0vbR1+AWsWjQmU7zXHgQo4TWSP6lCeiWcQ==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "System.Globalization": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.InteropServices": "4.3.0" + } + }, + "System.IO": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "3qjaHvxQPDpSOYICjUoTsmoq5u6QJAFRUITgeT/4gqkF1bajbSmb1kwSxEA8AHlofqgcKJcM8udgieRNhaJ5Cg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Threading.Tasks": "4.3.0" + } + }, + "System.IO.FileSystem": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "3wEMARTnuio+ulnvi+hkRNROYwa1kylvYahhcLk4HSoVdl+xxTFVeVlYOfLwrDPImGls0mDqbMhrza8qnWPTdA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.IO": "4.3.0", + "System.IO.FileSystem.Primitives": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Handles": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Threading.Tasks": "4.3.0" + } + }, + "System.IO.FileSystem.Primitives": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "6QOb2XFLch7bEc4lIcJH49nJN2HV+OC3fHDgsLVsBVBk3Y4hFAnOBGzJ2lUu7CyDDFo9IBWkSsnbkT6IBwwiMw==", + "dependencies": { + "System.Runtime": "4.3.0" + } + }, + "System.Linq": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "5DbqIUpsDp0dFftytzuMmc0oeMdQwjcP/EWxsksIz/w1TcFRkZ3yKKz0PqiYFMmEwPSWw+qNVqD7PJ889JzHbw==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0" + } + }, + "System.Net.Http": { + "type": "Transitive", + "resolved": "4.3.4", + "contentHash": "aOa2d51SEbmM+H+Csw7yJOuNZoHkrP2XnAurye5HWYgGVVU54YZDvsLUYRv6h18X3sPnjNCANmN7ZhIPiqMcjA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.1", + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Diagnostics.DiagnosticSource": "4.3.0", + "System.Diagnostics.Tracing": "4.3.0", + "System.Globalization": "4.3.0", + "System.Globalization.Extensions": "4.3.0", + "System.IO": "4.3.0", + "System.IO.FileSystem": "4.3.0", + "System.Net.Primitives": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.Handles": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Security.Cryptography.Algorithms": "4.3.0", + "System.Security.Cryptography.Encoding": "4.3.0", + "System.Security.Cryptography.OpenSsl": "4.3.0", + "System.Security.Cryptography.Primitives": "4.3.0", + "System.Security.Cryptography.X509Certificates": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Threading": "4.3.0", + "System.Threading.Tasks": "4.3.0", + "runtime.native.System": "4.3.0", + "runtime.native.System.Net.Http": "4.3.0", + "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2" + } + }, + "System.Net.Primitives": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "qOu+hDwFwoZPbzPvwut2qATe3ygjeQBDQj91xlsaqGFQUI5i4ZnZb8yyQuLGpDGivEPIt8EJkd1BVzVoP31FXA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0", + "System.Runtime.Handles": "4.3.0" + } + }, + "System.Reflection": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "KMiAFoW7MfJGa9nDFNcfu+FpEdiHpWgTcS2HdMpDvt9saK3y/G4GwprPyzqjFH9NTaGPQeWNHU+iDlDILj96aQ==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.IO": "4.3.0", + "System.Reflection.Primitives": "4.3.0", + "System.Runtime": "4.3.0" + } + }, + "System.Reflection.Emit": { + "type": "Transitive", + "resolved": "4.7.0", + "contentHash": "VR4kk8XLKebQ4MZuKuIni/7oh+QGFmZW3qORd1GvBq/8026OpW501SzT/oypwiQl4TvT8ErnReh/NzY9u+C6wQ==" + }, + "System.Reflection.Emit.ILGeneration": { + "type": "Transitive", + "resolved": "4.7.0", + "contentHash": "AucBYo3DSI0IDxdUjKksBcQJXPHyoPyrCXYURW1WDsLI4M65Ar/goSHjdnHOAY9MiYDNKqDlIgaYm+zL2hA1KA==" + }, + "System.Reflection.Emit.Lightweight": { + "type": "Transitive", + "resolved": "4.7.0", + "contentHash": "a4OLB4IITxAXJeV74MDx49Oq2+PsF6Sml54XAFv+2RyWwtDBcabzoxiiJRhdhx+gaohLh4hEGCLQyBozXoQPqA==" + }, + "System.Reflection.Extensions": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "rJkrJD3kBI5B712aRu4DpSIiHRtr6QlfZSQsb0hYHrDCZORXCFjQfoipo2LaMUHoT9i1B7j7MnfaEKWDFmFQNQ==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Reflection": "4.3.0", + "System.Runtime": "4.3.0" + } + }, + "System.Reflection.Primitives": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "5RXItQz5As4xN2/YUDxdpsEkMhvw3e6aNveFXUn4Hl/udNTCNhnKp8lT9fnc3MhvGKh1baak5CovpuQUXHAlIA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Reflection.TypeExtensions": { + "type": "Transitive", + "resolved": "4.7.0", + "contentHash": "VybpaOQQhqE6siHppMktjfGBw1GCwvCqiufqmP8F1nj7fTUNtW35LOEt3UZTEsECfo+ELAl/9o9nJx3U91i7vA==" + }, + "System.Resources.ResourceManager": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "/zrcPkkWdZmI4F92gL/TPumP98AVDu/Wxr3CSJGQQ+XN6wbRZcyfSKVoPo17ilb3iOr0cCRqJInGwNMolqhS8A==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Globalization": "4.3.0", + "System.Reflection": "4.3.0", + "System.Runtime": "4.3.0" + } + }, + "System.Runtime": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "JufQi0vPQ0xGnAczR13AUFglDyVYt4Kqnz1AZaiKZ5+GICq0/1MH/mO/eAJHt/mHW1zjKBJd7kV26SrxddAhiw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0" + } + }, + "System.Runtime.Extensions": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "guW0uK0fn5fcJJ1tJVXYd7/1h5F+pea1r7FLSOz/f8vPEqbR2ZAknuRDvTQ8PzAilDveOxNjSfr0CHfIQfFk8g==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Runtime.Handles": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "OKiSUN7DmTWeYb3l51A7EYaeNMnvxwE249YtZz7yooT4gOZhmTjIn48KgSsw2k2lYdLgTKNJw/ZIfSElwDRVgg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Runtime.InteropServices": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "uv1ynXqiMK8mp1GM3jDqPCFN66eJ5w5XNomaK2XD+TuCroNTLFGeZ+WCmBMcBDyTFKou3P6cR6J/QsaqDp7fGQ==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Reflection": "4.3.0", + "System.Reflection.Primitives": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Handles": "4.3.0" + } + }, + "System.Runtime.Numerics": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "yMH+MfdzHjy17l2KESnPiF2dwq7T+xLnSJar7slyimAkUh/gTrS9/UQOtv7xarskJ2/XDSNvfLGOBQPjL7PaHQ==", + "dependencies": { + "System.Globalization": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0" + } + }, + "System.Security.Cryptography.Algorithms": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "W1kd2Y8mYSCgc3ULTAZ0hOP2dSdG5YauTb1089T0/kRcN2MpSAW1izOFROrJgxSlMn3ArsgHXagigyi+ibhevg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "System.Collections": "4.3.0", + "System.IO": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.Handles": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Runtime.Numerics": "4.3.0", + "System.Security.Cryptography.Encoding": "4.3.0", + "System.Security.Cryptography.Primitives": "4.3.0", + "System.Text.Encoding": "4.3.0", + "runtime.native.System.Security.Cryptography.Apple": "4.3.0", + "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" + } + }, + "System.Security.Cryptography.Cng": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "03idZOqFlsKRL4W+LuCpJ6dBYDUWReug6lZjBa3uJWnk5sPCUXckocevTaUA8iT/MFSrY/2HXkOt753xQ/cf8g==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "System.IO": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.Handles": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Security.Cryptography.Algorithms": "4.3.0", + "System.Security.Cryptography.Encoding": "4.3.0", + "System.Security.Cryptography.Primitives": "4.3.0", + "System.Text.Encoding": "4.3.0" + } + }, + "System.Security.Cryptography.Csp": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "X4s/FCkEUnRGnwR3aSfVIkldBmtURMhmexALNTwpjklzxWU7yjMk7GHLKOZTNkgnWnE0q7+BCf9N2LVRWxewaA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "System.IO": "4.3.0", + "System.Reflection": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.Handles": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Security.Cryptography.Algorithms": "4.3.0", + "System.Security.Cryptography.Encoding": "4.3.0", + "System.Security.Cryptography.Primitives": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Threading": "4.3.0" + } + }, + "System.Security.Cryptography.Encoding": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "1DEWjZZly9ae9C79vFwqaO5kaOlI5q+3/55ohmq/7dpDyDfc8lYe7YVxJUZ5MF/NtbkRjwFRo14yM4OEo9EmDw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "System.Collections": "4.3.0", + "System.Collections.Concurrent": "4.3.0", + "System.Linq": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.Handles": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Security.Cryptography.Primitives": "4.3.0", + "System.Text.Encoding": "4.3.0", + "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" + } + }, + "System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "h4CEgOgv5PKVF/HwaHzJRiVboL2THYCou97zpmhjghx5frc7fIvlkY1jL+lnIQyChrJDMNEXS6r7byGif8Cy4w==", + "dependencies": { + "System.Collections": "4.3.0", + "System.IO": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.Handles": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Runtime.Numerics": "4.3.0", + "System.Security.Cryptography.Algorithms": "4.3.0", + "System.Security.Cryptography.Encoding": "4.3.0", + "System.Security.Cryptography.Primitives": "4.3.0", + "System.Text.Encoding": "4.3.0", + "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" + } + }, + "System.Security.Cryptography.Primitives": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "7bDIyVFNL/xKeFHjhobUAQqSpJq9YTOpbEs6mR233Et01STBMXNAc/V+BM6dwYGc95gVh/Zf+iVXWzj3mE8DWg==", + "dependencies": { + "System.Diagnostics.Debug": "4.3.0", + "System.Globalization": "4.3.0", + "System.IO": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Threading": "4.3.0", + "System.Threading.Tasks": "4.3.0" + } + }, + "System.Security.Cryptography.X509Certificates": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "t2Tmu6Y2NtJ2um0RtcuhP7ZdNNxXEgUm2JeoA/0NvlMjAhKCnM1NX07TDl3244mVp3QU6LPEhT3HTtH1uF7IYw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Globalization": "4.3.0", + "System.Globalization.Calendars": "4.3.0", + "System.IO": "4.3.0", + "System.IO.FileSystem": "4.3.0", + "System.IO.FileSystem.Primitives": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.Handles": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Runtime.Numerics": "4.3.0", + "System.Security.Cryptography.Algorithms": "4.3.0", + "System.Security.Cryptography.Cng": "4.3.0", + "System.Security.Cryptography.Csp": "4.3.0", + "System.Security.Cryptography.Encoding": "4.3.0", + "System.Security.Cryptography.OpenSsl": "4.3.0", + "System.Security.Cryptography.Primitives": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Threading": "4.3.0", + "runtime.native.System": "4.3.0", + "runtime.native.System.Net.Http": "4.3.0", + "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" + } + }, + "System.Text.Encoding": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "BiIg+KWaSDOITze6jGQynxg64naAPtqGHBwDrLaCtixsa5bKiR8dpPOHA7ge3C0JJQizJE+sfkz1wV+BAKAYZw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Threading": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "VkUS0kOBcUf3Wwm0TSbrevDDZ6BlM+b/HRiapRFWjM5O0NS0LviG0glKmFK+hhPDd1XFeSdU1GmlLhb2CoVpIw==", + "dependencies": { + "System.Runtime": "4.3.0", + "System.Threading.Tasks": "4.3.0" + } + }, + "System.Threading.Tasks": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "LbSxKEdOUhVe8BezB/9uOGGppt+nZf6e1VFyw6v3DN6lqitm0OSn2uXMOdtP0M3W4iMcqcivm2J6UgqiwwnXiA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + } + } + } +} \ No newline at end of file diff --git a/SubmergedUnity/Assets/Among Us/Sprites/VentCleaning.png.meta b/SubmergedUnity/Assets/Among Us/Sprites/VentCleaning.png.meta index 57f245f9..52dc13b8 100644 --- a/SubmergedUnity/Assets/Among Us/Sprites/VentCleaning.png.meta +++ b/SubmergedUnity/Assets/Among Us/Sprites/VentCleaning.png.meta @@ -6,7 +6,7 @@ TextureImporter: 213: 8015474186141965525 second: VentCleaning_0 externalObjects: {} - serializedVersion: 12 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -23,10 +23,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -65,6 +67,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 cookieLightType: 0 platformSettings: - serializedVersion: 3 @@ -77,6 +80,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -89,6 +93,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -125,9 +130,10 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: + VentCleaning_0: 8015474186141965525 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/SubmergedUnity/Assets/csc.rsp.meta b/SubmergedUnity/Assets/Editor Default Resources/Stylesheets.meta similarity index 67% rename from SubmergedUnity/Assets/csc.rsp.meta rename to SubmergedUnity/Assets/Editor Default Resources/Stylesheets.meta index debdbfa0..68ae6e0e 100644 --- a/SubmergedUnity/Assets/csc.rsp.meta +++ b/SubmergedUnity/Assets/Editor Default Resources/Stylesheets.meta @@ -1,5 +1,6 @@ fileFormatVersion: 2 -guid: 14ed7f541c1c50a44a70d4310f5c0ed1 +guid: 1271c88799b3c1145b64b2bda3a45cb9 +folderAsset: yes DefaultImporter: externalObjects: {} userData: diff --git a/SubmergedUnity/Assets/Editor Default Resources/Stylesheets/Header.uss b/SubmergedUnity/Assets/Editor Default Resources/Stylesheets/Header.uss new file mode 100644 index 00000000..3c37393f --- /dev/null +++ b/SubmergedUnity/Assets/Editor Default Resources/Stylesheets/Header.uss @@ -0,0 +1,59 @@ +.header-wrapped { + transition: all 0.3s; + + margin-right: 20px; + margin-bottom: 8px; + margin-top: 20px; + -unity-font-style: bold; + font-size: 14px; + -unity-text-align: upper-center; + margin-left: 20px; + border-top-left-radius: 4px; + border-bottom-left-radius: 4px; + border-top-right-radius: 4px; + border-bottom-right-radius: 4px; + padding-left: 8px; + padding-right: 8px; + padding-top: 8px; + padding-bottom: 8px; + border-left-width: 1px; + border-right-width: 1px; + border-top-width: 1px; + border-bottom-width: 1px; + border-left-color: rgb(255, 255, 255); + border-right-color: rgb(255, 255, 255); + border-top-color: rgb(255, 255, 255); + border-bottom-color: rgb(255, 255, 255); +} + +.header-wrapped:hover { + border-width: 1px; + border-color: transparent; + background-color: darkgray; +} + +.header-1 { + margin-right: 20px; + margin-bottom: 4px; + margin-top: 10px; + -unity-font-style: bold; + font-size: 15px; + margin-left: 4px; + padding-left: 8px; + padding-right: 8px; + padding-top: 8px; + padding-bottom: 8px; +} + +.header-2 { + margin-right: 20px; + margin-bottom: 4px; + margin-top: 10px; + -unity-font-style: bold; + font-size: 13px; + margin-left: 4px; + padding-left: 8px; + padding-right: 8px; + padding-top: 8px; + padding-bottom: 8px; +} \ No newline at end of file diff --git a/SubmergedUnity/Assets/Editor Default Resources/Stylesheets/Header.uss.meta b/SubmergedUnity/Assets/Editor Default Resources/Stylesheets/Header.uss.meta new file mode 100644 index 00000000..626950b0 --- /dev/null +++ b/SubmergedUnity/Assets/Editor Default Resources/Stylesheets/Header.uss.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a5a14ce6fb6140aa8f7bf936e0e6957f +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0} + disableValidation: 1 diff --git a/SubmergedUnity/Assets/Editor Default Resources/Stylesheets/IndexWizard.uss b/SubmergedUnity/Assets/Editor Default Resources/Stylesheets/IndexWizard.uss new file mode 100644 index 00000000..2a2946d1 --- /dev/null +++ b/SubmergedUnity/Assets/Editor Default Resources/Stylesheets/IndexWizard.uss @@ -0,0 +1,99 @@ +/* +컴포넌트 별 세팅 + */ + +.label-title { + padding-left: 12px; + padding-right: 12px; + -unity-font-style: bold; + font-size: 14px; + color: rgb(238, 69, 15); + flex-wrap: nowrap; + align-items: center; + justify-content: flex-start; +} + +.content-container { + margin-top: 20px; + margin-bottom: 20px; + flex-wrap: wrap; + justify-content: center; +} + +.button-container { + flex-wrap: wrap; + flex-direction: row; +} + +.root { + transition: all 1s; + width: 660px; + height: 460px; + background-color: rgb(221, 160, 160); + border-radius: 8px; + margin: 10px; +} + +.top-bar { + padding-top: 10px; + padding-left: 10px; + padding-right: 10px; +} + +/* +블렌딩 + */ + +.blending { + transition: all 1s; + opacity: 1; +} + +.blending:disabled { + opacity: 0; +} + +.unity-label { + color: rgb(75, 69, 83); +} + +.unity-toggle { + justify-content: space-between; + margin-top: 4px; + margin-bottom: 4px; +} + +.unity-toggle .unity-toggle__input { + max-width: 20px; +} + +.unity-text-field { + margin-top: 4px; + margin-bottom: 4px; +} + +#right .unity-button { + min-width: 80px; + min-height: 24px; +} + +#column-header .unity-label { + font-size: 13px; + -unity-font-style: bold; +} + +#title { + padding-bottom: 0; +} + +@supports (transition: all 1s) { + .root { + transition: all 1s; + } +} + +@supports (transition: all 1s) { + .blending { + transition: all 1s; + } +} diff --git a/SubmergedUnity/Assets/Editor Default Resources/Stylesheets/IndexWizard.uss.meta b/SubmergedUnity/Assets/Editor Default Resources/Stylesheets/IndexWizard.uss.meta new file mode 100644 index 00000000..1ae40215 --- /dev/null +++ b/SubmergedUnity/Assets/Editor Default Resources/Stylesheets/IndexWizard.uss.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 65c895781d3e4cb88dbaa294d6665ac1 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0} + disableValidation: 1 diff --git a/SubmergedUnity/Assets/Editor Default Resources/Stylesheets/RoundButton.uss b/SubmergedUnity/Assets/Editor Default Resources/Stylesheets/RoundButton.uss new file mode 100644 index 00000000..ab42794a --- /dev/null +++ b/SubmergedUnity/Assets/Editor Default Resources/Stylesheets/RoundButton.uss @@ -0,0 +1,34 @@ +.btn-round { + transition: all 0.2s; + + border-radius: 8px; + width: 120px; + height: 40px; +} + +.btn-round:hover { + background-color: darkgray; + + border-radius: 22px; +} + +.btn-round:active { + color: white; + background-color: dimgray; +} + +.btn-primary { + transition: all 0.2s; + + background-color: dodgerblue; + color: white; +} + +.btn-primary:hover { + + background-color: royalblue; +} + +.btn-primary:active { + background-color: darkblue; +} \ No newline at end of file diff --git a/SubmergedUnity/Assets/Editor Default Resources/Stylesheets/RoundButton.uss.meta b/SubmergedUnity/Assets/Editor Default Resources/Stylesheets/RoundButton.uss.meta new file mode 100644 index 00000000..b0011b77 --- /dev/null +++ b/SubmergedUnity/Assets/Editor Default Resources/Stylesheets/RoundButton.uss.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 06349489dd2644dcbbe4a6c8733233fc +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0} + disableValidation: 1 diff --git a/SubmergedUnity/Assets/Editor Default Resources/Stylesheets/RoundSquareButton.uss b/SubmergedUnity/Assets/Editor Default Resources/Stylesheets/RoundSquareButton.uss new file mode 100644 index 00000000..1c4d6b93 --- /dev/null +++ b/SubmergedUnity/Assets/Editor Default Resources/Stylesheets/RoundSquareButton.uss @@ -0,0 +1,62 @@ +.unity-button { + transition: all 0.2s; + border-radius: 4px; + border-width: 0; + margin: 2px; + scale: 1 1; +} + +.unity-button:hover { + scale: 1.05 1.05; +} + +.unity-button:active { + scale: 0.98 0.98; +} + +.unity-button:inactive { +} + +.unity-button:disabled { + scale: 1 1; +} + +.btn-primary { + background-color: royalblue; +} + +.btn-primary:hover { + background-color: rgb(65, 121, 241); +} + +.btn-primary:active { + background-color: royalblue; +} + +.btn-warning { + background-color: darkgoldenrod; +} + +.btn-warning:hover { + background-color: rgb(189, 150, 11); +} + +.btn-warning:active { + background-color: darkgoldenrod; +} + +.btn-danger { + background-color: indianred; +} + +.btn-danger:hover { + background-color: rgb(221, 108, 108); +} + +.btn-danger:active { + background-color: indianred; +} + +.btn-thick { + height: 32px; +} diff --git a/SubmergedUnity/Assets/Editor Default Resources/Stylesheets/RoundSquareButton.uss.meta b/SubmergedUnity/Assets/Editor Default Resources/Stylesheets/RoundSquareButton.uss.meta new file mode 100644 index 00000000..8051d126 --- /dev/null +++ b/SubmergedUnity/Assets/Editor Default Resources/Stylesheets/RoundSquareButton.uss.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 37e63878bb3e44a083d215949c77313b +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0} + disableValidation: 1 diff --git a/SubmergedUnity/Assets/Editor Default Resources/Stylesheets/RoundSwitchToggle.uss b/SubmergedUnity/Assets/Editor Default Resources/Stylesheets/RoundSwitchToggle.uss new file mode 100644 index 00000000..286f589a --- /dev/null +++ b/SubmergedUnity/Assets/Editor Default Resources/Stylesheets/RoundSwitchToggle.uss @@ -0,0 +1,38 @@ +.unity-toggle { + justify-content: space-between; + margin: 2px 12px; +} + +.unity-toggle .unity-toggle__input { + transition: all 0.6s; + width: 40px; + height: 20px; + min-width: 40px; + max-width: 40px; + background-color: dimgray; + border-radius: 10px; + padding: 0; + margin: 0; +} + +.unity-toggle:checked .unity-toggle__input { + background-color: royalblue; +} + +.unity-toggle .unity-toggle__checkmark { + transition: all 0.6s; + width: 16px; + max-width: 16px; + min-width: 16px; + height: 16px; + margin: 2px; + border-radius: 8px; + background-color: antiquewhite; + background-image: none; + translate: 0 0; + transition-timing-function: ease-out-bounce; +} + +.unity-toggle:checked .unity-toggle__checkmark { + translate: 20px 0; +} diff --git a/SubmergedUnity/Assets/Editor Default Resources/Stylesheets/RoundSwitchToggle.uss.meta b/SubmergedUnity/Assets/Editor Default Resources/Stylesheets/RoundSwitchToggle.uss.meta new file mode 100644 index 00000000..25ded5e9 --- /dev/null +++ b/SubmergedUnity/Assets/Editor Default Resources/Stylesheets/RoundSwitchToggle.uss.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: e529fb8aa2b5449fb73e81fd54afb5f4 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0} + disableValidation: 1 diff --git a/SubmergedUnity/Assets/Editor Default Resources/Stylesheets/SettingInspector.uss b/SubmergedUnity/Assets/Editor Default Resources/Stylesheets/SettingInspector.uss new file mode 100644 index 00000000..63836769 --- /dev/null +++ b/SubmergedUnity/Assets/Editor Default Resources/Stylesheets/SettingInspector.uss @@ -0,0 +1,31 @@ +.unity-popup-field { + margin: 2px 12px; + justify-content: space-between; +} + +.unity-popup-field__input { + width: 160px; + max-width: 160px; + min-width: 160px; +} + +.unity-enum-field { + margin: 2px 12px; + justify-content: space-between; +} + +.unity-enum-field__input { + width: 160px; + max-width: 160px; + min-width: 160px; +} + +.group { + transition: all 0.2s; +} + +.group:disabled { +} + +.group .unity-toggle__input { +} \ No newline at end of file diff --git a/SubmergedUnity/Assets/Editor Default Resources/Stylesheets/SettingInspector.uss.meta b/SubmergedUnity/Assets/Editor Default Resources/Stylesheets/SettingInspector.uss.meta new file mode 100644 index 00000000..114412cc --- /dev/null +++ b/SubmergedUnity/Assets/Editor Default Resources/Stylesheets/SettingInspector.uss.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 65001696e0814a548994e813dec9a917 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0} + disableValidation: 1 diff --git a/SubmergedUnity/Assets/Editor Default Resources/Stylesheets/SwitchToggle.uss b/SubmergedUnity/Assets/Editor Default Resources/Stylesheets/SwitchToggle.uss new file mode 100644 index 00000000..6380b8db --- /dev/null +++ b/SubmergedUnity/Assets/Editor Default Resources/Stylesheets/SwitchToggle.uss @@ -0,0 +1,45 @@ +.unity-toggle { + justify-content: space-between; + margin: 2px 12px; +} + +.unity-toggle .unity-toggle__input { + transition: all 0.6s; + width: 40px; + height: 20px; + min-width: 40px; + max-width: 40px; + background-color: dimgray; + border-radius: 2px; + padding: 0; + margin: 0; +} + +.unity-toggle:checked .unity-toggle__input { + background-color: royalblue; + + /* ~2020.3 */ + /*flex-direction: column-reverse;*/ +} + +.unity-toggle .unity-toggle__checkmark { + transition: all 0.6s; + width: 16px; + max-width: 16px; + min-width: 16px; + height: 16px; + margin: 2px; + border-radius: 2px; + background-color: antiquewhite; + background-image: none; + translate: 0 0; + transition-timing-function: ease-out-bounce; +} + +.unity-toggle:checked .unity-toggle__checkmark { + translate: 20px 0; +} + +.unity-toggle:checked { + +} \ No newline at end of file diff --git a/SubmergedUnity/Assets/Editor Default Resources/Stylesheets/SwitchToggle.uss.meta b/SubmergedUnity/Assets/Editor Default Resources/Stylesheets/SwitchToggle.uss.meta new file mode 100644 index 00000000..40dc0f92 --- /dev/null +++ b/SubmergedUnity/Assets/Editor Default Resources/Stylesheets/SwitchToggle.uss.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 63de5cb0475341c0b6af13ea7b414305 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0} + disableValidation: 1 diff --git a/SubmergedUnity/Assets/Submerged/Credits/CreditsScreen.prefab b/SubmergedUnity/Assets/Submerged/Credits/CreditsScreen.prefab index df66221e..b71bfbec 100644 --- a/SubmergedUnity/Assets/Submerged/Credits/CreditsScreen.prefab +++ b/SubmergedUnity/Assets/Submerged/Credits/CreditsScreen.prefab @@ -28,9 +28,9 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -1} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8102256026475258202} - m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -48,6 +48,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 0 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -167,12 +168,12 @@ MonoBehaviour: m_margin: {x: 0, y: 0.0007812977, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 1920839299} - m_maskType: 0 _SortingLayer: 0 _SortingLayerID: 0 _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 1920839299} + m_maskType: 0 --- !u!1 &1736769904352308189 GameObject: m_ObjectHideFlags: 0 @@ -201,9 +202,9 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3589913878484081225} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -221,6 +222,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 0 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -275,7 +277,9 @@ MonoBehaviour: js6pak - Sanae6' + Sanae6 + + XtraCube' m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 978a5647ae677d04fa04daa6f54236d6, type: 2} m_sharedMaterial: {fileID: 2100000, guid: c985344c7a831254ca6674f051c41d48, type: 2} @@ -341,12 +345,12 @@ MonoBehaviour: m_margin: {x: 0, y: 0.0007812977, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 1096869682448749523} - m_maskType: 0 _SortingLayer: 0 _SortingLayerID: 0 _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 1096869682448749523} + m_maskType: 0 --- !u!1 &1811661418343302546 GameObject: m_ObjectHideFlags: 0 @@ -375,9 +379,9 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7676251864806721827} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -395,6 +399,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 0 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -521,12 +526,12 @@ MonoBehaviour: m_margin: {x: 0, y: 0.0007812977, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 2729388808899633938} - m_maskType: 0 _SortingLayer: 0 _SortingLayerID: 0 _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 2729388808899633938} + m_maskType: 0 --- !u!1 &2579461505422609098 GameObject: m_ObjectHideFlags: 0 @@ -555,14 +560,14 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -1} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 3820202110492031201} m_Father: {fileID: 8102256026475258202} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -0.95, y: 2.05} + m_AnchoredPosition: {x: -0.95, y: 2.16} m_SizeDelta: {x: 1.7939, y: 0.3163} m_Pivot: {x: 0.5, y: 0.5} --- !u!23 &4535753697004811002 @@ -576,6 +581,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 0 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -626,7 +632,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Technical Support + m_text: Contributors m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 978a5647ae677d04fa04daa6f54236d6, type: 2} m_sharedMaterial: {fileID: 2100000, guid: c985344c7a831254ca6674f051c41d48, type: 2} @@ -692,12 +698,12 @@ MonoBehaviour: m_margin: {x: 0, y: 0.0007812977, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 4535753697004811002} - m_maskType: 0 _SortingLayer: 0 _SortingLayerID: 0 _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 4535753697004811002} + m_maskType: 0 --- !u!1 &2913380416240871576 GameObject: m_ObjectHideFlags: 0 @@ -726,14 +732,14 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -1} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 3536389636173753734} m_Father: {fileID: 8102256026475258202} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0.95, y: 2.05} + m_AnchoredPosition: {x: 0.95, y: 2.16} m_SizeDelta: {x: 1.6584, y: 0.3163} m_Pivot: {x: 0.5, y: 0.5} --- !u!23 &6844165934073558728 @@ -747,6 +753,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 0 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -863,12 +870,12 @@ MonoBehaviour: m_margin: {x: 0, y: 0.0007812977, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 6844165934073558728} - m_maskType: 0 _SortingLayer: 0 _SortingLayerID: 0 _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 6844165934073558728} + m_maskType: 0 --- !u!1 &5461458590422526033 GameObject: m_ObjectHideFlags: 0 @@ -897,14 +904,14 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -1} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 313740245832707040} m_Father: {fileID: 8102256026475258202} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -1.5, y: 3.52} + m_AnchoredPosition: {x: -1.5, y: 3.63} m_SizeDelta: {x: 1.3027, y: 0.3163} m_Pivot: {x: 0.5, y: 0.5} --- !u!23 &3459118738196583707 @@ -918,6 +925,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 0 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1034,12 +1042,12 @@ MonoBehaviour: m_margin: {x: 0, y: 0.0007812977, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 3459118738196583707} - m_maskType: 0 _SortingLayer: 0 _SortingLayerID: 0 _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 3459118738196583707} + m_maskType: 0 --- !u!1 &6172071805641950769 GameObject: m_ObjectHideFlags: 0 @@ -1068,14 +1076,14 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -1} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 9176646196528343478} m_Father: {fileID: 8102256026475258202} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -1.5, y: 2.937} + m_AnchoredPosition: {x: -1.5, y: 3.0470002} m_SizeDelta: {x: 1.3366, y: 0.3163} m_Pivot: {x: 0.5, y: 0.5} --- !u!23 &5812064442304184955 @@ -1089,6 +1097,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 0 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1205,12 +1214,12 @@ MonoBehaviour: m_margin: {x: 0, y: 0.0007812977, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 5812064442304184955} - m_maskType: 0 _SortingLayer: 0 _SortingLayerID: 0 _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 5812064442304184955} + m_maskType: 0 --- !u!1 &6207928970523247188 GameObject: m_ObjectHideFlags: 0 @@ -1239,14 +1248,14 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -1} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6854961759216527584} m_Father: {fileID: 8102256026475258202} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 1.5, y: 3.52} + m_AnchoredPosition: {x: 1.5, y: 3.63} m_SizeDelta: {x: 1.2818, y: 0.3163} m_Pivot: {x: 0.5, y: 0.5} --- !u!23 &7570335828885791876 @@ -1260,6 +1269,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 0 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1376,12 +1386,12 @@ MonoBehaviour: m_margin: {x: 0, y: 0.0007812977, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 7570335828885791876} - m_maskType: 0 _SortingLayer: 0 _SortingLayerID: 0 _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 7570335828885791876} + m_maskType: 0 --- !u!1 &6364921875523572818 GameObject: m_ObjectHideFlags: 0 @@ -1410,9 +1420,9 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2179237634964107054} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1430,6 +1440,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 0 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1548,12 +1559,12 @@ MonoBehaviour: m_margin: {x: 0, y: 0.0007812977, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 8673421375295956244} - m_maskType: 0 _SortingLayer: 0 _SortingLayerID: 0 _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 8673421375295956244} + m_maskType: 0 --- !u!1 &7781277054155232297 GameObject: m_ObjectHideFlags: 0 @@ -1582,9 +1593,9 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2537839291253043142} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1602,6 +1613,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 0 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1718,12 +1730,12 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 7987783843019914683} - m_maskType: 0 _SortingLayer: 0 _SortingLayerID: 0 _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 7987783843019914683} + m_maskType: 0 --- !u!1 &8102256026475257953 GameObject: m_ObjectHideFlags: 0 @@ -1752,14 +1764,14 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -1} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8102256026475260535} m_Father: {fileID: 8102256026475258202} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 3.52} + m_AnchoredPosition: {x: 0, y: 3.63} m_SizeDelta: {x: 1.4552, y: 0.3163} m_Pivot: {x: 0.5, y: 0.5} --- !u!23 &8102256026475259852 @@ -1773,6 +1785,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 0 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1889,12 +1902,12 @@ MonoBehaviour: m_margin: {x: 0, y: 0.0007812977, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 8102256026475259852} - m_maskType: 0 _SortingLayer: 0 _SortingLayerID: 0 _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 8102256026475259852} + m_maskType: 0 --- !u!1 &8102256026475257981 GameObject: m_ObjectHideFlags: 0 @@ -1918,9 +1931,11 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8102256026475257981} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: -1.8391098, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8102256026475258119} - {fileID: 2537839291253043142} @@ -1931,7 +1946,6 @@ Transform: - {fileID: 6191396885724295691} - {fileID: 1920839297} m_Father: {fileID: 8102256026475258121} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &8102256026475258027 GameObject: @@ -1957,12 +1971,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8102256026475258027} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.231, y: 0.597, z: 6} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8102256026475258121} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &8102256026475259201 SpriteRenderer: @@ -1975,6 +1990,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2039,12 +2055,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8102256026475258044} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.15, y: -0.58420026, z: -1} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8102256026475258112} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &8102256026475259150 SpriteRenderer: @@ -2057,6 +2074,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2120,14 +2138,15 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8102256026475258368} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.14, y: -1.03, z: -1} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8102256026475260579} - {fileID: 8102256026475259606} m_Father: {fileID: 8102256026475258121} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &8102256026475258374 GameObject: @@ -2153,12 +2172,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8102256026475258374} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 4.407, z: -1} m_LocalScale: {x: 0.4, y: 0.4, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8102256026475258202} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &8102256026475259369 SpriteRenderer: @@ -2171,6 +2191,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2236,9 +2257,11 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8102256026475258375} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: -0.6, z: -25} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8102256026475258207} - {fileID: 8102256026475258120} @@ -2247,7 +2270,6 @@ Transform: - {fileID: 8102256026475258112} - {fileID: 8102256026475258202} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &8102256026475260322 MonoBehaviour: @@ -2315,12 +2337,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8102256026475258393} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -0.01} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8102256026475258120} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &8102256026475260329 MonoBehaviour: @@ -2360,6 +2383,25 @@ BoxCollider2D: m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 @@ -2402,12 +2444,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8102256026475258394} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -2.94, y: 2.91, z: -1} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8102256026475258121} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &8102256026475259286 SpriteRenderer: @@ -2420,6 +2463,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2511,6 +2555,25 @@ CircleCollider2D: m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 m_IsTrigger: 1 m_UsedByEffector: 0 m_UsedByComposite: 0 @@ -2543,13 +2606,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8102256026475258395} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 1.0683, z: 5} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8102256026475258126} m_Father: {fileID: 8102256026475258121} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0} --- !u!212 &8102256026475259284 SpriteRenderer: @@ -2562,6 +2626,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2653,6 +2718,25 @@ BoxCollider2D: m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 @@ -2693,12 +2777,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8102256026475258462} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.0047, y: 1.0412, z: 7} m_LocalScale: {x: 4.683918, y: 4.019412, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8102256026475258121} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!331 &588245973840890195 SpriteMask: @@ -2711,6 +2796,7 @@ SpriteMask: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2778,9 +2864,9 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -1} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8102256026475258112} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -2798,6 +2884,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 0 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2914,12 +3001,12 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 8102256026475259060} - m_maskType: 0 _SortingLayer: 0 _SortingLayerID: 0 _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 8102256026475259060} + m_maskType: 0 --- !u!1 &8102256026475258874 GameObject: m_ObjectHideFlags: 0 @@ -2948,9 +3035,9 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8102256026475260452} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -2968,6 +3055,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 0 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -3088,12 +3176,12 @@ MonoBehaviour: m_margin: {x: 0, y: 0.0007812977, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 8102256026475259769} - m_maskType: 0 _SortingLayer: 0 _SortingLayerID: 0 _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 8102256026475259769} + m_maskType: 0 --- !u!1 &8175312906112179670 GameObject: m_ObjectHideFlags: 0 @@ -3122,9 +3210,9 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6191396885724295691} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -3142,6 +3230,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 0 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -3194,7 +3283,7 @@ MonoBehaviour: m_Calls: [] m_text: 'acronmd - pb' + QueenPb' m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 978a5647ae677d04fa04daa6f54236d6, type: 2} m_sharedMaterial: {fileID: 2100000, guid: c985344c7a831254ca6674f051c41d48, type: 2} @@ -3260,9 +3349,9 @@ MonoBehaviour: m_margin: {x: 0, y: 0.0007812977, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 7421363239016222383} - m_maskType: 0 _SortingLayer: 0 _SortingLayerID: 0 _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 7421363239016222383} + m_maskType: 0 diff --git a/SubmergedUnity/Assets/Submerged/ExileCutscene/Textures/Decorations/Bubbles/BubbleSpriteSheet-adjusted.png.meta b/SubmergedUnity/Assets/Submerged/ExileCutscene/Textures/Decorations/Bubbles/BubbleSpriteSheet-adjusted.png.meta index 984876c1..096db01a 100644 --- a/SubmergedUnity/Assets/Submerged/ExileCutscene/Textures/Decorations/Bubbles/BubbleSpriteSheet-adjusted.png.meta +++ b/SubmergedUnity/Assets/Submerged/ExileCutscene/Textures/Decorations/Bubbles/BubbleSpriteSheet-adjusted.png.meta @@ -1,254 +1,270 @@ -fileFormatVersion: 2 -guid: b6bfc5afb9ea6ee45961c791069e76fd -TextureImporter: - internalIDToNameTable: - - first: - 213: 1900423489600672286 - second: BubbleSpriteSheet-adjusted_0 - - first: - 213: -6042388886377276415 - second: BubbleSpriteSheet-adjusted_1 - - first: - 213: 5675699605152649838 - second: BubbleSpriteSheet-adjusted_2 - - first: - 213: 7801738931791168352 - second: BubbleSpriteSheet-adjusted_3 - - first: - 213: -1469802816186902519 - second: BubbleSpriteSheet-adjusted_4 - - first: - 213: 1555243680428889112 - second: BubbleSpriteSheet-adjusted_5 - - first: - 213: 5728579292700757003 - second: BubbleSpriteSheet-adjusted_6 - - first: - 213: 402958975934537934 - second: BubbleSpriteSheet-adjusted_3 - externalObjects: {} - serializedVersion: 11 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 2 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 374 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: - - serializedVersion: 2 - name: BubbleSpriteSheet-adjusted_0 - rect: - serializedVersion: 2 - x: 17 - y: 107 - width: 86 - height: 84 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: e12d47c4819af5a10800000000000000 - internalID: 1900423489600672286 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: BubbleSpriteSheet-adjusted_1 - rect: - serializedVersion: 2 - x: 175 - y: 139 - width: 39 - height: 38 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 10cd6b0625f152ca0800000000000000 - internalID: -6042388886377276415 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: BubbleSpriteSheet-adjusted_2 - rect: - serializedVersion: 2 - x: 301 - y: 104 - width: 76 - height: 75 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: e62d2f048b224ce40800000000000000 - internalID: 5675699605152649838 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: BubbleSpriteSheet-adjusted_4 - rect: - serializedVersion: 2 - x: 174 - y: 22 - width: 56 - height: 72 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 9089f4340263a9be0800000000000000 - internalID: -1469802816186902519 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: BubbleSpriteSheet-adjusted_5 - rect: - serializedVersion: 2 - x: 304 - y: 22 - width: 56 - height: 55 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 814922723e5559510800000000000000 - internalID: 1555243680428889112 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: BubbleSpriteSheet-adjusted_3 - rect: - serializedVersion: 2 - x: 25 - y: 14 - width: 86 - height: 84 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: ec022abbd09979500800000000000000 - internalID: 402958975934537934 - vertices: [] - indices: - edges: [] - weights: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: b6bfc5afb9ea6ee45961c791069e76fd +TextureImporter: + internalIDToNameTable: + - first: + 213: 1900423489600672286 + second: BubbleSpriteSheet-adjusted_0 + - first: + 213: -6042388886377276415 + second: BubbleSpriteSheet-adjusted_1 + - first: + 213: 5675699605152649838 + second: BubbleSpriteSheet-adjusted_2 + - first: + 213: 7801738931791168352 + second: BubbleSpriteSheet-adjusted_3 + - first: + 213: -1469802816186902519 + second: BubbleSpriteSheet-adjusted_4 + - first: + 213: 1555243680428889112 + second: BubbleSpriteSheet-adjusted_5 + - first: + 213: 5728579292700757003 + second: BubbleSpriteSheet-adjusted_6 + - first: + 213: 402958975934537934 + second: BubbleSpriteSheet-adjusted_3 + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 374 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 1 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: BubbleSpriteSheet-adjusted_0 + rect: + serializedVersion: 2 + x: 17 + y: 107 + width: 86 + height: 84 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: e12d47c4819af5a10800000000000000 + internalID: 1900423489600672286 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: BubbleSpriteSheet-adjusted_1 + rect: + serializedVersion: 2 + x: 175 + y: 139 + width: 39 + height: 38 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 10cd6b0625f152ca0800000000000000 + internalID: -6042388886377276415 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: BubbleSpriteSheet-adjusted_2 + rect: + serializedVersion: 2 + x: 301 + y: 104 + width: 76 + height: 75 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: e62d2f048b224ce40800000000000000 + internalID: 5675699605152649838 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: BubbleSpriteSheet-adjusted_4 + rect: + serializedVersion: 2 + x: 174 + y: 22 + width: 56 + height: 72 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 9089f4340263a9be0800000000000000 + internalID: -1469802816186902519 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: BubbleSpriteSheet-adjusted_5 + rect: + serializedVersion: 2 + x: 304 + y: 22 + width: 56 + height: 55 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 814922723e5559510800000000000000 + internalID: 1555243680428889112 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: BubbleSpriteSheet-adjusted_3 + rect: + serializedVersion: 2 + x: 25 + y: 14 + width: 86 + height: 84 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: ec022abbd09979500800000000000000 + internalID: 7801738931791168352 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: + BubbleSpriteSheet-adjusted_0: 1900423489600672286 + BubbleSpriteSheet-adjusted_1: -6042388886377276415 + BubbleSpriteSheet-adjusted_2: 5675699605152649838 + BubbleSpriteSheet-adjusted_3: 7801738931791168352 + BubbleSpriteSheet-adjusted_4: -1469802816186902519 + BubbleSpriteSheet-adjusted_5: 1555243680428889112 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/SubmergedUnity/Assets/Submerged/ExileCutscene/Textures/Decorations/Cliff.png.meta b/SubmergedUnity/Assets/Submerged/ExileCutscene/Textures/Decorations/Cliff.png.meta index ab0e86e3..d2070879 100644 --- a/SubmergedUnity/Assets/Submerged/ExileCutscene/Textures/Decorations/Cliff.png.meta +++ b/SubmergedUnity/Assets/Submerged/ExileCutscene/Textures/Decorations/Cliff.png.meta @@ -1,152 +1,164 @@ -fileFormatVersion: 2 -guid: 8813f3c153f872f4a812852ac7df0782 -TextureImporter: - internalIDToNameTable: - - first: - 213: 6689793761368241967 - second: Cliff_0 - - first: - 213: -3884767449530326932 - second: Cliff_1 - externalObjects: {} - serializedVersion: 11 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 2 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 374 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: - - serializedVersion: 2 - name: Cliff_0 - rect: - serializedVersion: 2 - x: 0 - y: 0 - width: 846 - height: 3998 - alignment: 1 - pivot: {x: 0, y: 1} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: f277afe5bfbe6dc50800000000000000 - internalID: 6689793761368241967 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: Cliff_1 - rect: - serializedVersion: 2 - x: 3122 - y: 0 - width: 876 - height: 3998 - alignment: 3 - pivot: {x: 1, y: 1} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: c60aeb74698861ac0800000000000000 - internalID: -3884767449530326932 - vertices: [] - indices: - edges: [] - weights: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 8813f3c153f872f4a812852ac7df0782 +TextureImporter: + internalIDToNameTable: + - first: + 213: 6689793761368241967 + second: Cliff_0 + - first: + 213: -3884767449530326932 + second: Cliff_1 + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 374 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 1 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: Cliff_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 846 + height: 3998 + alignment: 1 + pivot: {x: 0, y: 1} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: f277afe5bfbe6dc50800000000000000 + internalID: 6689793761368241967 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Cliff_1 + rect: + serializedVersion: 2 + x: 3122 + y: 0 + width: 876 + height: 3998 + alignment: 3 + pivot: {x: 1, y: 1} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: c60aeb74698861ac0800000000000000 + internalID: -3884767449530326932 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: + Cliff_0: 6689793761368241967 + Cliff_1: -3884767449530326932 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/SubmergedUnity/Assets/Submerged/ExileCutscene/Textures/Decorations/Trench.png.meta b/SubmergedUnity/Assets/Submerged/ExileCutscene/Textures/Decorations/Trench.png.meta index f4ea66d5..07b504dd 100644 --- a/SubmergedUnity/Assets/Submerged/ExileCutscene/Textures/Decorations/Trench.png.meta +++ b/SubmergedUnity/Assets/Submerged/ExileCutscene/Textures/Decorations/Trench.png.meta @@ -9,7 +9,7 @@ TextureImporter: 213: -3806548336860364385 second: RightTrench externalObjects: {} - serializedVersion: 11 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -26,10 +26,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -38,9 +40,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -68,6 +70,8 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -79,6 +83,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -91,6 +96,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -103,6 +109,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -160,9 +167,11 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: + LeftTrench: 1002656069659627618 + RightTrench: -3806548336860364385 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/SubmergedUnity/Assets/Submerged/ExileCutscene/Textures/FishBite.png.meta b/SubmergedUnity/Assets/Submerged/ExileCutscene/Textures/FishBite.png.meta index 74353ad9..5afd32ae 100644 --- a/SubmergedUnity/Assets/Submerged/ExileCutscene/Textures/FishBite.png.meta +++ b/SubmergedUnity/Assets/Submerged/ExileCutscene/Textures/FishBite.png.meta @@ -78,7 +78,7 @@ TextureImporter: 213: -395372025143443954 second: fish_bite24 externalObjects: {} - serializedVersion: 11 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -95,10 +95,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -108,8 +110,8 @@ TextureImporter: textureSettings: serializedVersion: 2 filterMode: 2 - aniso: -1 - mipBias: -100 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -137,6 +139,8 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -148,6 +152,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -160,6 +165,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -172,6 +178,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -712,9 +719,34 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: + fish_bite00: 7870176885551464523 + fish_bite01: -4910861486082298717 + fish_bite02: -7184200756423682751 + fish_bite03: 3331618483270206483 + fish_bite04: 3797991566726678326 + fish_bite05: 4494372517012197893 + fish_bite06: -3409020086068193880 + fish_bite07: -2059281886592160826 + fish_bite08: 1850367177218200460 + fish_bite09: 7117413787548183272 + fish_bite10: -6495166076239437024 + fish_bite11: -4458011014392876542 + fish_bite12: 2628665664914896405 + fish_bite13: -880684601342614463 + fish_bite14: -7734713052919843148 + fish_bite15: -7434972119693255999 + fish_bite16: 3479356769408465745 + fish_bite17: -6545509836424310199 + fish_bite18: 6172830872309052624 + fish_bite19: 4270690407597807268 + fish_bite20: -3023199855981781112 + fish_bite21: -7604903771776609449 + fish_bite22: -6666937302314367078 + fish_bite23: 3587261011181955451 + fish_bite24: -395372025143443954 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/SubmergedUnity/Assets/Submerged/ExileCutscene/Textures/unused_FishSwim.png.meta b/SubmergedUnity/Assets/Submerged/ExileCutscene/Textures/unused_FishSwim.png.meta index e31bb796..209b2f9f 100644 --- a/SubmergedUnity/Assets/Submerged/ExileCutscene/Textures/unused_FishSwim.png.meta +++ b/SubmergedUnity/Assets/Submerged/ExileCutscene/Textures/unused_FishSwim.png.meta @@ -147,7 +147,7 @@ TextureImporter: 213: 4146571914251465951 second: fish_swim_anim47 externalObjects: {} - serializedVersion: 11 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -164,10 +164,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -177,8 +179,8 @@ TextureImporter: textureSettings: serializedVersion: 2 filterMode: 1 - aniso: -1 - mipBias: -100 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -206,6 +208,8 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -217,6 +221,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -229,6 +234,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -241,6 +247,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -1264,9 +1271,57 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: + fish_swim_anim00: -4862669876553623482 + fish_swim_anim01: -3357812390284082481 + fish_swim_anim02: -8221370380591703909 + fish_swim_anim03: -6156507875060194459 + fish_swim_anim04: -5346126561920191588 + fish_swim_anim05: 692848535278326788 + fish_swim_anim06: 3294641486988876012 + fish_swim_anim07: 4893271299589068498 + fish_swim_anim08: 3954997740039072084 + fish_swim_anim09: 2001717492896073337 + fish_swim_anim10: 5010124288334701138 + fish_swim_anim11: 4902063911980633878 + fish_swim_anim12: 7453448303759859326 + fish_swim_anim13: -4931248310246335426 + fish_swim_anim14: 1941185749481550303 + fish_swim_anim15: -5950563097333903866 + fish_swim_anim16: 3606123086696935462 + fish_swim_anim17: 5235212948696533163 + fish_swim_anim18: -2072246231149227611 + fish_swim_anim19: -3772224528812068260 + fish_swim_anim20: -2468949935761083808 + fish_swim_anim21: -6970593960748323009 + fish_swim_anim22: -2302441457259389358 + fish_swim_anim23: 5350817666956071837 + fish_swim_anim24: -8579018597702609601 + fish_swim_anim25: -4621259456494048014 + fish_swim_anim26: 8237349758411008443 + fish_swim_anim27: -3542340342787516019 + fish_swim_anim28: 1870676134713184306 + fish_swim_anim29: -2458955432110185790 + fish_swim_anim30: -952764444850948106 + fish_swim_anim31: 8248072736552381762 + fish_swim_anim32: 4282192248361885472 + fish_swim_anim33: -3091614973580979418 + fish_swim_anim34: -5100124198048119711 + fish_swim_anim35: 8660413921548219003 + fish_swim_anim36: 3232478601848207820 + fish_swim_anim37: 1637371896291131011 + fish_swim_anim38: 447087867871079745 + fish_swim_anim39: 2745830966636721830 + fish_swim_anim40: -3878461462816859736 + fish_swim_anim41: 6715437049626968404 + fish_swim_anim42: 8481530625273388774 + fish_swim_anim43: -3053716475870980070 + fish_swim_anim44: -7609193594480463088 + fish_swim_anim45: -7105405459973056475 + fish_swim_anim46: 7537173422947977661 + fish_swim_anim47: 4146571914251465951 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/SubmergedUnity/Assets/Submerged/HudMap/Textures/HowToPlay.png.meta b/SubmergedUnity/Assets/Submerged/HudMap/Textures/HowToPlay.png.meta index 8609ee43..c7b185d7 100644 --- a/SubmergedUnity/Assets/Submerged/HudMap/Textures/HowToPlay.png.meta +++ b/SubmergedUnity/Assets/Submerged/HudMap/Textures/HowToPlay.png.meta @@ -102,7 +102,7 @@ TextureImporter: 213: 21300064 second: htp_host_bottom externalObjects: {} - serializedVersion: 11 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -119,10 +119,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -161,6 +163,8 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -172,6 +176,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -184,6 +189,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -2516,9 +2522,42 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: + CrewBottom: 21300058 + CrewImage: 21300008 + CrewTitle: 21300002 + CrewTop: 21300004 + ImpBottom: 21300006 + ImpTop: 21300010 + htp_PC_arrowKeys: 21300048 + htp_PC_arrowKeysSelected: 21300050 + htp_PC_mouseCursor: 21300046 + htp_arrows: 21300016 + htp_controlModeBg: 21300014 + htp_couchBase5People: 21300018 + htp_host_bottom: 21300064 + htp_host_left: 21300056 + htp_host_lower: 21300062 + htp_host_right: 21300000 + htp_host_top: 21300060 + htp_map: 21300040 + htp_panel1: 21300034 + htp_panel5.png: 21300038 + htp_panel6Discussion: 21300042 + htp_panel6DiscussionChat: 21300044 + htp_panel7: 21300036 + htp_panel8: 21300052 + htp_player1: 21300020 + htp_player2: 21300022 + htp_player3: 21300024 + htp_player4: 21300026 + htp_player5: 21300028 + impImage: 21300054 + impTitle: 21300012 + tutorial_hand: 21300030 + tutorial_touchPoint: 21300032 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/SubmergedUnity/Assets/Submerged/HudMap/Textures/VotingScreen.png.meta b/SubmergedUnity/Assets/Submerged/HudMap/Textures/VotingScreen.png.meta index 30f42681..0018e14f 100644 --- a/SubmergedUnity/Assets/Submerged/HudMap/Textures/VotingScreen.png.meta +++ b/SubmergedUnity/Assets/Submerged/HudMap/Textures/VotingScreen.png.meta @@ -66,7 +66,7 @@ TextureImporter: 213: 21300040 second: chatTextBubble externalObjects: {} - serializedVersion: 12 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -83,10 +83,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -125,6 +127,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 cookieLightType: 1 platformSettings: - serializedVersion: 3 @@ -137,6 +140,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -149,6 +153,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -195,9 +200,10 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: + playerVoteResults: 21300012 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/SubmergedUnity/Assets/Submerged/Map/Centrals/Player.png.meta b/SubmergedUnity/Assets/Submerged/Map/Centrals/Player.png.meta index 8fb36768..ac4f558d 100644 --- a/SubmergedUnity/Assets/Submerged/Map/Centrals/Player.png.meta +++ b/SubmergedUnity/Assets/Submerged/Map/Centrals/Player.png.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: 06ccf812d2c63f246bdaa2630abdeb72 -timeCreated: 1611501646 -licenseType: Free TextureImporter: internalIDToNameTable: - first: @@ -545,8 +543,7 @@ TextureImporter: 213: 21300358 second: ghostbob0005 externalObjects: {} - usedFileIDs: [] - serializedVersion: 11 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -563,9 +560,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -597,10 +597,15 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -612,6 +617,20 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -732,7 +751,7 @@ TextureImporter: spriteID: 462758b1c40f49c5b74e183011cc2f2d internalID: 21300000 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -843,7 +862,7 @@ TextureImporter: spriteID: 9d164906fdf0462a8d7ae2b2d93b3c38 internalID: 21300002 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -981,7 +1000,7 @@ TextureImporter: spriteID: 74b41d441bc24da5b9131f8dd76856e4 internalID: 21300004 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -1101,7 +1120,7 @@ TextureImporter: spriteID: 956a81c41511413da4feb20cfe76aa67 internalID: 21300006 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -1202,7 +1221,7 @@ TextureImporter: spriteID: afa204e7b0f043c4ae269e94900bb23e internalID: 21300008 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -1304,7 +1323,7 @@ TextureImporter: spriteID: f7974562377d425286981232d82e7f7f internalID: 21300010 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -1430,7 +1449,7 @@ TextureImporter: spriteID: 4f14e00ccb1349e3b591dca53e5e629f internalID: 21300012 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -1479,7 +1498,7 @@ TextureImporter: spriteID: 5fc9200cc9e242c587430566a07e1384 internalID: 21300014 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -1559,7 +1578,7 @@ TextureImporter: spriteID: 074843c01371403c8a4ed866140339eb internalID: 21300016 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -1664,7 +1683,7 @@ TextureImporter: spriteID: eeb5d075b499460abf6e465db2bc9211 internalID: 21300018 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -1789,7 +1808,7 @@ TextureImporter: spriteID: a6657d4587fd4304a3bfce6c4c30e9d8 internalID: 21300020 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -1869,7 +1888,7 @@ TextureImporter: spriteID: 3c8c62369b4d407fbb0271ad660fb389 internalID: 21300022 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -1981,7 +2000,7 @@ TextureImporter: spriteID: 21446a90b84f44b89b0d26b11442fa73 internalID: 21300024 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -2099,7 +2118,7 @@ TextureImporter: spriteID: 54e80a0f6709414581fe323283304a7c internalID: 21300026 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -2246,7 +2265,7 @@ TextureImporter: spriteID: 7a4ddd666a8f46cf9463e2d382e2b27c internalID: 21300028 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -2376,7 +2395,7 @@ TextureImporter: spriteID: 0ecec9a74ffd4a5aadb129972bbccab3 internalID: 21300030 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -2479,7 +2498,7 @@ TextureImporter: spriteID: b6cbd0fa84ca4590ba754bce687217fe internalID: 21300032 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -2619,7 +2638,7 @@ TextureImporter: spriteID: 6a43e2bbf3ad43c0b31c776790afaa45 internalID: 21300034 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -2682,7 +2701,7 @@ TextureImporter: spriteID: 3fe56b990e7044ba9f4c9f84a88ca9a8 internalID: 21300036 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -2767,7 +2786,7 @@ TextureImporter: spriteID: 688ada8f5fba4007aa7987823ca57c72 internalID: 21300038 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -2915,7 +2934,7 @@ TextureImporter: spriteID: d5f21ad42df447de8a3f14b43ac19d01 internalID: 21300040 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -3062,7 +3081,7 @@ TextureImporter: spriteID: dac7dca4276648c0a42e3f4b99dc274c internalID: 21300042 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -3200,7 +3219,7 @@ TextureImporter: spriteID: 2d67f2bf710b4b21b6a20e6a0ecdb6e4 internalID: 21300044 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -3306,7 +3325,7 @@ TextureImporter: spriteID: 2f5e9308b0a94a899b34d2653db9daf3 internalID: 21300046 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -3376,7 +3395,7 @@ TextureImporter: spriteID: 91532e918c4d4433860824526ff3022a internalID: 21300048 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -3501,7 +3520,7 @@ TextureImporter: spriteID: 2f3f17dac1fb447fbb4ad71bb906d8b5 internalID: 21300050 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -3611,7 +3630,7 @@ TextureImporter: spriteID: c0cf2ff76a714a6bb195ba1eaba4a58f internalID: 21300052 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -3744,7 +3763,7 @@ TextureImporter: spriteID: b69e2d510b57416b9b394d4e050556c5 internalID: 21300054 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -3776,7 +3795,7 @@ TextureImporter: spriteID: 0c115d49674d40eab4f36ce5b6394fd8 internalID: 21300056 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -3823,7 +3842,7 @@ TextureImporter: spriteID: 3696b29eeb994649a821c689b1b59f50 internalID: 21300058 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -3888,7 +3907,7 @@ TextureImporter: spriteID: c183803351de47da8ed1b548a317fcff internalID: 21300060 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -3927,7 +3946,7 @@ TextureImporter: spriteID: 8dfa108752ec4c1aacfcbb77d02ffe73 internalID: 21300062 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -3991,7 +4010,7 @@ TextureImporter: spriteID: f3b806f4615f4a40adc32d43b5d94c25 internalID: 21300064 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -4032,7 +4051,7 @@ TextureImporter: spriteID: 707ddc3b527940a08325f1b04e7c1742 internalID: 21300066 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -4093,7 +4112,7 @@ TextureImporter: spriteID: 7bb11313c7de42c0a3115ce41dca7e70 internalID: 21300068 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -4152,7 +4171,7 @@ TextureImporter: spriteID: a033b41ff3024fa3bc5e3a677bdd0bac internalID: 21300070 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -4203,7 +4222,7 @@ TextureImporter: spriteID: 4b84d4c06c784fe8adac4c6c00d9dfb2 internalID: 21300072 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -4251,7 +4270,7 @@ TextureImporter: spriteID: 4f974ac8b4c74609b8126c04afd1f285 internalID: 21300074 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -4296,7 +4315,7 @@ TextureImporter: spriteID: edd8234937b444009f15254b08225f21 internalID: 21300076 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -4346,7 +4365,7 @@ TextureImporter: spriteID: 25819805558f4cc09ad7f784fc9fe65b internalID: 21300078 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -4396,7 +4415,7 @@ TextureImporter: spriteID: b17f79e0ec1140c0b520f301e429ec61 internalID: 21300080 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -4443,7 +4462,7 @@ TextureImporter: spriteID: 50a2ebb47ff5400e8648a9d5d051aa75 internalID: 21300082 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -4491,7 +4510,7 @@ TextureImporter: spriteID: 9501cf1dffa7488e9e00ecf09b9a503b internalID: 21300084 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -4541,7 +4560,7 @@ TextureImporter: spriteID: 04410daf30794ac8b66124982e55328c internalID: 21300086 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -4591,7 +4610,7 @@ TextureImporter: spriteID: 40f612bd6b98429ea4d2097b9844cc12 internalID: 21300088 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -4639,7 +4658,7 @@ TextureImporter: spriteID: 61b1678b374a41d6aaa6897a72caf5c6 internalID: 21300090 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -4686,7 +4705,7 @@ TextureImporter: spriteID: 8260ab0c7fc2409684240d2bd7453ae6 internalID: 21300092 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -4734,7 +4753,7 @@ TextureImporter: spriteID: 04f65e11dc124a7eb7968e823e2d473b internalID: 21300094 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -4783,7 +4802,7 @@ TextureImporter: spriteID: 247087fb4570416a81eddb26ef262375 internalID: 21300096 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -4830,7 +4849,7 @@ TextureImporter: spriteID: b574121a9be145ec9395da17c8626669 internalID: 21300098 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -4880,7 +4899,7 @@ TextureImporter: spriteID: 85cf5a3314cc40c9ae8c8e080f68191e internalID: 21300100 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -4929,7 +4948,7 @@ TextureImporter: spriteID: 741efe95f57f42b1b85db982c0f2872d internalID: 21300102 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -4979,7 +4998,7 @@ TextureImporter: spriteID: 665644406dd84745bddfbe8648df4aa2 internalID: 21300104 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -5023,7 +5042,7 @@ TextureImporter: spriteID: 361436bdd46944b1bc80e94472aed610 internalID: 21300106 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -5068,7 +5087,7 @@ TextureImporter: spriteID: e67ca33514874661bc49195c40093a47 internalID: 21300108 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -5111,7 +5130,7 @@ TextureImporter: spriteID: 9fe71e3596364ba6b33bb38888aec9ac internalID: 21300110 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -5155,7 +5174,7 @@ TextureImporter: spriteID: 7ffde4744d624ca7bfa49ad686133ea2 internalID: 21300112 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -5200,7 +5219,7 @@ TextureImporter: spriteID: f41750efddae4e2983ab7ecf8c7fe93f internalID: 21300114 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -5246,7 +5265,7 @@ TextureImporter: spriteID: 7b090f84d13147a0b3eabed66fc073ce internalID: 21300116 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -5290,7 +5309,7 @@ TextureImporter: spriteID: 66afe8aa2157439dbca181a186905ae6 internalID: 21300118 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -5332,7 +5351,7 @@ TextureImporter: spriteID: 3213c1735d6c4f989c583f08d54a57ea internalID: 21300120 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -5380,7 +5399,7 @@ TextureImporter: spriteID: cee735c19d664d45a66102383cdfa49c internalID: 21300122 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -5430,7 +5449,7 @@ TextureImporter: spriteID: 1d709f2403644917a19330a9652ec41b internalID: 21300124 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -5479,7 +5498,7 @@ TextureImporter: spriteID: 697cdb8dd7414e4a812fb3fec3596556 internalID: 21300126 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -5532,7 +5551,7 @@ TextureImporter: spriteID: 865fbbd5597c4fe1ba58c4273caf32e8 internalID: 21300128 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -5581,7 +5600,7 @@ TextureImporter: spriteID: 8805ba7345514b7c84dd1e1d7546403d internalID: 21300130 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -5631,7 +5650,7 @@ TextureImporter: spriteID: 7bcdebcb4194424b81f989fc96bfb8eb internalID: 21300132 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -5678,7 +5697,7 @@ TextureImporter: spriteID: 68c48358260640eaba68b33827cde8e4 internalID: 21300134 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -5719,7 +5738,7 @@ TextureImporter: spriteID: 2e914e2430ef44a09765d95d6676787c internalID: 21300136 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -5758,7 +5777,7 @@ TextureImporter: spriteID: 15a83c28c17a4aa4a8a6b460428b5235 internalID: 21300138 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -5802,7 +5821,7 @@ TextureImporter: spriteID: bedd99371a2a4718a42e2deed9ad796c internalID: 21300140 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -5846,7 +5865,7 @@ TextureImporter: spriteID: edb07cf8eb9b480f98df5b042d0880c1 internalID: 21300142 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -5890,7 +5909,7 @@ TextureImporter: spriteID: 2023449cff374813bf90ba523420dae2 internalID: 21300144 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -5934,7 +5953,7 @@ TextureImporter: spriteID: 11f17c58d87a477cbc21baad26bc3dd3 internalID: 21300146 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -5978,7 +5997,7 @@ TextureImporter: spriteID: b231cbe710a441cc90f3ea27cc85edf4 internalID: 21300148 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -6022,7 +6041,7 @@ TextureImporter: spriteID: 6dd0974d1ee04fb087460a6e1bb3ce84 internalID: 21300150 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -6066,7 +6085,7 @@ TextureImporter: spriteID: 2f0aac898505480ca39db12225dfd4c4 internalID: 21300152 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -6110,7 +6129,7 @@ TextureImporter: spriteID: e0f1099ec361410d837ecb518ce1cb36 internalID: 21300154 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -6151,7 +6170,7 @@ TextureImporter: spriteID: c07a59c241c2437897bbd39eaabae55c internalID: 21300156 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -6195,7 +6214,7 @@ TextureImporter: spriteID: 359f93642a94468fbd76021d23dd7e04 internalID: 21300158 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -6239,7 +6258,7 @@ TextureImporter: spriteID: d4a6602209114d0c8fabe0605d07e89d internalID: 21300160 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -6283,7 +6302,7 @@ TextureImporter: spriteID: df1e87de2340461bb998644264e3cc7a internalID: 21300162 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -6323,7 +6342,7 @@ TextureImporter: spriteID: 5d4518cb51fb4a56833402ccf5163404 internalID: 21300164 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -6377,7 +6396,7 @@ TextureImporter: spriteID: ca2d29f1cf534601a2c933b2d805783a internalID: 21300166 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -6418,7 +6437,7 @@ TextureImporter: spriteID: 453f4ea677d845e29780997ee73c684c internalID: 21300168 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -6446,7 +6465,7 @@ TextureImporter: spriteID: cf602cfacb1b4a9d93d723f71a51b656 internalID: 21300170 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -6474,7 +6493,7 @@ TextureImporter: spriteID: 1b5d624f6a244720a7751bf961334977 internalID: 21300172 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -6520,7 +6539,7 @@ TextureImporter: spriteID: 54a470da587a48b59053cc1b7bbb8acd internalID: 21300174 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -6566,7 +6585,7 @@ TextureImporter: spriteID: a12599cb3c75426dbd6b038d1fd35466 internalID: 21300176 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -6612,7 +6631,7 @@ TextureImporter: spriteID: 02daaa3207ff4bc4aa22317caae3fd71 internalID: 21300178 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -6658,7 +6677,7 @@ TextureImporter: spriteID: f4d7ed87a93b4907b1f8484f624d5fbf internalID: 21300180 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -6704,7 +6723,7 @@ TextureImporter: spriteID: 27696c6dbfb74d0aa16bd8a753da1ad4 internalID: 21300182 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -6750,7 +6769,7 @@ TextureImporter: spriteID: 70d14e17310742d5b9b0e155dda35175 internalID: 21300184 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -6796,7 +6815,7 @@ TextureImporter: spriteID: 77a97a08a9804f3e86932be0acf494f2 internalID: 21300186 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -6842,7 +6861,7 @@ TextureImporter: spriteID: 0f008a6300624f15b1505c86aea49173 internalID: 21300188 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -6888,7 +6907,7 @@ TextureImporter: spriteID: 8ce65b93a4ec437c946275e694eb6367 internalID: 21300190 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -6934,7 +6953,7 @@ TextureImporter: spriteID: 007b7ac3c40f479d955cf5aa2f9d0e4f internalID: 21300192 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -6980,7 +6999,7 @@ TextureImporter: spriteID: 74246ec0b4d847a6bb412e294b96660e internalID: 21300194 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -7026,7 +7045,7 @@ TextureImporter: spriteID: 027d7b1922244d5aa8155d483a74fa89 internalID: 21300196 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -7072,7 +7091,7 @@ TextureImporter: spriteID: 6d480343249d42588c13c4bef0b4973f internalID: 21300198 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -7118,7 +7137,7 @@ TextureImporter: spriteID: 4d2a6e45fad4430dbcdd5915ee10761c internalID: 21300200 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -7164,7 +7183,7 @@ TextureImporter: spriteID: 872ee16bd92f48b8835244f2b3f8acad internalID: 21300202 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -7210,7 +7229,7 @@ TextureImporter: spriteID: eca7a955bcb641b7807c811941901247 internalID: 21300204 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -7261,7 +7280,7 @@ TextureImporter: spriteID: dedb8c431b3e4d1f84e019bfd901d847 internalID: 21300206 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -7312,7 +7331,7 @@ TextureImporter: spriteID: de7cd0f5fa164beba175234465e4ed7d internalID: 21300208 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -7363,7 +7382,7 @@ TextureImporter: spriteID: c44cb3e70d044c09a38ea75f5ac75abf internalID: 21300210 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -7414,7 +7433,7 @@ TextureImporter: spriteID: 44651a6377204adbb37a9bb69a35c7f6 internalID: 21300212 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -7465,7 +7484,7 @@ TextureImporter: spriteID: 252b788f30d6452dac4e9d1a424c963c internalID: 21300214 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -7516,7 +7535,7 @@ TextureImporter: spriteID: 68a6d3d8b76c48f9acbccfd58ce0a823 internalID: 21300216 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -7567,7 +7586,7 @@ TextureImporter: spriteID: a8b7ed0a753a47f6ad6a3caa47b9010b internalID: 21300218 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -7618,7 +7637,7 @@ TextureImporter: spriteID: 4e3fe57da8734e3bab287b1ac0e86cf8 internalID: 21300220 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -7669,7 +7688,7 @@ TextureImporter: spriteID: fa1c906d0dcb4cd0aa6772cc5bedfa36 internalID: 21300222 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -7720,7 +7739,7 @@ TextureImporter: spriteID: 8fd937a6dfcc4a928bac8bfc73b49e6c internalID: 21300224 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -7771,7 +7790,7 @@ TextureImporter: spriteID: 64c564d2064b4680be8f1e09d1151dee internalID: 21300226 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -7827,7 +7846,7 @@ TextureImporter: spriteID: bc95838b371e453d96847a67a0ce35a7 internalID: 21300228 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -7883,7 +7902,7 @@ TextureImporter: spriteID: c4ff131f562a450cbb8a51abf03b5a0f internalID: 21300230 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -7939,7 +7958,7 @@ TextureImporter: spriteID: b73724318bc040d7bed56895e12a8882 internalID: 21300232 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -7995,7 +8014,7 @@ TextureImporter: spriteID: ab2be257608d4f5eab05366cf06e043e internalID: 21300234 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -8046,7 +8065,7 @@ TextureImporter: spriteID: cb8cd2ca9b56420e803243bb2a85c12a internalID: 21300236 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -8097,7 +8116,7 @@ TextureImporter: spriteID: 56c402a1b1bd402f8be7be1eceea64a2 internalID: 21300238 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -8150,7 +8169,7 @@ TextureImporter: spriteID: a8127d9072ed4049b32daa990c31b303 internalID: 21300240 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -8203,7 +8222,7 @@ TextureImporter: spriteID: 0279c1f09554491683d3f3f77deaf4f5 internalID: 21300242 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -8246,7 +8265,7 @@ TextureImporter: spriteID: 7b1b9b05b0b7490ebf98fc6770a73ccc internalID: 21300244 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -8289,7 +8308,7 @@ TextureImporter: spriteID: 3741da1a971f41198ade9787ca187823 internalID: 21300246 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -8340,7 +8359,7 @@ TextureImporter: spriteID: dcb6dcd1edff44ff9279d5939234a8e0 internalID: 21300248 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -8391,7 +8410,7 @@ TextureImporter: spriteID: bd1e1e90179f48e9b08da77a25496d23 internalID: 21300250 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -8442,7 +8461,7 @@ TextureImporter: spriteID: e5538585fd9349488c1de8c461861589 internalID: 21300252 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -8495,7 +8514,7 @@ TextureImporter: spriteID: 0ae2457469a146ff8f3cdbdea2e470d1 internalID: 21300254 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -8548,7 +8567,7 @@ TextureImporter: spriteID: e62e1dff64514427b2bb91e58d441126 internalID: 21300256 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -8608,7 +8627,7 @@ TextureImporter: spriteID: 19f170b633db4586968b90673bb589a0 internalID: 21300258 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -8649,7 +8668,7 @@ TextureImporter: spriteID: 1f987eb860a54a6eb8280ea05a73a323 internalID: 21300260 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -8690,7 +8709,7 @@ TextureImporter: spriteID: a4d864b7018840989c0cce1b24035266 internalID: 21300262 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -8729,7 +8748,7 @@ TextureImporter: spriteID: 9773357f96234786bb964b8330a428c2 internalID: 21300264 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -8776,7 +8795,7 @@ TextureImporter: spriteID: 38e3a65ae8484de89767c5386b5aa58a internalID: 21300266 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -8834,7 +8853,7 @@ TextureImporter: spriteID: c106e5f37ead4efe98419122c7a41d18 internalID: 21300268 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -8889,7 +8908,7 @@ TextureImporter: spriteID: 6ad85798a7c14c53ba42e043d1e80e78 internalID: 21300270 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -8946,7 +8965,7 @@ TextureImporter: spriteID: d703ccbacf444f39ac09d694a61eb89a internalID: 21300272 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -9008,7 +9027,7 @@ TextureImporter: spriteID: 2519c0b2e83e42fe9e9e3b3ea687095c internalID: 21300274 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -9054,7 +9073,7 @@ TextureImporter: spriteID: 629b26c9c1564093b470cf6b5c217c0b internalID: 21300276 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -9101,7 +9120,7 @@ TextureImporter: spriteID: 3e2897f7225b4e9b941abfe268cf8052 internalID: 21300278 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -9157,7 +9176,7 @@ TextureImporter: spriteID: 5162cc22e86441baa27ac53e4b30b092 internalID: 21300280 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -9216,7 +9235,7 @@ TextureImporter: spriteID: ceb21795d7e04645b3e4c2ad474271f8 internalID: 21300282 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -9268,7 +9287,7 @@ TextureImporter: spriteID: 3605c31d75904c108c7af14d3d805989 internalID: 21300284 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -9323,7 +9342,7 @@ TextureImporter: spriteID: cb248ea294da43b489a7a47f2ca2c908 internalID: 21300286 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -9371,7 +9390,7 @@ TextureImporter: spriteID: 4859ccdf71ba429c9b357f0ef467e3d9 internalID: 21300288 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -9420,7 +9439,7 @@ TextureImporter: spriteID: 904f3acfe1bb49409d69077ed77e5905 internalID: 21300290 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -9492,7 +9511,7 @@ TextureImporter: spriteID: da0cb6420fbc4e5a93905f439491487b internalID: 21300292 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -9595,7 +9614,7 @@ TextureImporter: spriteID: 9145e4531010442ca2d18f0f5293641d internalID: 21300294 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -9660,7 +9679,7 @@ TextureImporter: spriteID: 0864041581ea4722918e5f0de1fd2ffc internalID: 21300296 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -9765,7 +9784,7 @@ TextureImporter: spriteID: 2f7bc64a1ba64b8691fde1a7f878674b internalID: 21300298 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -9889,7 +9908,7 @@ TextureImporter: spriteID: e6a2690f90ff4ecc94d042f791ad5284 internalID: 21300300 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -9945,7 +9964,7 @@ TextureImporter: spriteID: 9e624f9cef5b44328a3bc9eb0c33711b internalID: 21300302 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -10086,7 +10105,7 @@ TextureImporter: spriteID: c98e9c45aaf8440ba05651be3c2d6bc6 internalID: 21300304 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -10222,7 +10241,7 @@ TextureImporter: spriteID: 2b9275cfbe3845dfa3a54db5dd175456 internalID: 21300306 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -10348,7 +10367,7 @@ TextureImporter: spriteID: 500527f9b79b4e229bda67b1721057d1 internalID: 21300308 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -10404,7 +10423,7 @@ TextureImporter: spriteID: 5d062b0735d843878331aaf0d8d2dc91 internalID: 21300310 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -10529,7 +10548,7 @@ TextureImporter: spriteID: 89ee6204f2ce406daca2d606556bbab3 internalID: 21300312 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -10662,7 +10681,7 @@ TextureImporter: spriteID: 6cda329d91b74519aac377adfa07bf84 internalID: 21300314 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -10768,7 +10787,7 @@ TextureImporter: spriteID: ade0d3b51bd14fd4a1fa5c1705eca132 internalID: 21300316 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -10892,7 +10911,7 @@ TextureImporter: spriteID: 4b8bb01f51c9413aa000152b73d5d843 internalID: 21300318 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -11018,7 +11037,7 @@ TextureImporter: spriteID: e158f7524eca4258863ee1cb6bb8a0ed internalID: 21300320 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -11078,7 +11097,7 @@ TextureImporter: spriteID: 50e4a78c4c984b619483530249a34480 internalID: 21300322 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -11196,7 +11215,7 @@ TextureImporter: spriteID: c251879a80a948d099f3c0885c5cd76f internalID: 21300324 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -11253,7 +11272,7 @@ TextureImporter: spriteID: ba4335d6ad534aa1bf4387983346eda6 internalID: 21300326 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -11370,7 +11389,7 @@ TextureImporter: spriteID: 6f65a09e5c7e4e58b8d1c467acebaecd internalID: 21300328 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -11504,7 +11523,7 @@ TextureImporter: spriteID: 2db2c5fa0fa4466e8356cfc608975504 internalID: 21300330 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -11626,7 +11645,7 @@ TextureImporter: spriteID: 1f1af5f9d12b4584b699064d4b5b37c8 internalID: 21300332 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -11767,7 +11786,7 @@ TextureImporter: spriteID: cc9643fd02854d1bb32a62572fa42903 internalID: 21300334 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -11872,7 +11891,7 @@ TextureImporter: spriteID: 540588ff5d714023956dba7bedc0b3bf internalID: 21300336 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -12019,7 +12038,7 @@ TextureImporter: spriteID: 819a947f5bd54543817f740bd28c2948 internalID: 21300338 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -12143,7 +12162,7 @@ TextureImporter: spriteID: 0e465895c5144213a1c9862266eaf9cf internalID: 21300340 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -12283,7 +12302,7 @@ TextureImporter: spriteID: 90909b6a976f4e53b39b241dd77caadb internalID: 21300342 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -12409,7 +12428,7 @@ TextureImporter: spriteID: 5b85cf7b16f0423ba5b737d6e446ae04 internalID: 21300344 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -12532,7 +12551,7 @@ TextureImporter: spriteID: 91703a0c4dd14fed830c9c1b1dfdd4e1 internalID: 21300346 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -12680,7 +12699,7 @@ TextureImporter: spriteID: 01901830c10c4d3fb3f42b189dade818 internalID: 21300348 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -12814,7 +12833,7 @@ TextureImporter: spriteID: fe3228bc9c32447a9ff1a7602cff5b6c internalID: 21300350 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -12877,7 +12896,7 @@ TextureImporter: spriteID: 9470c51579624a87958b894bb1c0c408 internalID: 21300352 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -13023,7 +13042,7 @@ TextureImporter: spriteID: 80262b3cd3bd4b66aca595fec786daa4 internalID: 21300354 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -13079,7 +13098,7 @@ TextureImporter: spriteID: 39cae73e95fc4146b454ae209ec31ee1 internalID: 21300356 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -13205,22 +13224,202 @@ TextureImporter: spriteID: 7cbcfaf0787f416fbc1c68d68e7202bb internalID: 21300358 vertices: [] - indices: + indices: edges: [] weights: [] outline: [] physicsShape: [] bones: [] - spriteID: + spriteID: internalID: 0 vertices: [] - indices: + indices: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: + Dead0001: 21300076 + Dead0002: 21300078 + Dead0003: 21300080 + Dead0004: 21300082 + Dead0005: 21300084 + Dead0006: 21300086 + Dead0007: 21300088 + Dead0008: 21300090 + Dead0009: 21300092 + Dead0010: 21300094 + Dead0011: 21300096 + Dead0012: 21300098 + Dead0013: 21300100 + Dead0014: 21300102 + Dead0015: 21300104 + Dead0016: 21300106 + Dead0017: 21300108 + Dead0018: 21300110 + Dead0019: 21300112 + Dead0020: 21300114 + Dead0021: 21300116 + Dead0022: 21300118 + Dead0023: 21300120 + Dead0024: 21300122 + Dead0025: 21300124 + Dead0026: 21300126 + Dead0027: 21300128 + Dead0028: 21300130 + Dead0029: 21300132 + Dead0030: 21300134 + Dead0031: 21300136 + Dead0032: 21300138 + Dead0033: 21300140 + Dead0034: 21300142 + Dead0035: 21300144 + Dead0036: 21300146 + Dead0037: 21300148 + Dead0038: 21300150 + Dead0039: 21300152 + Dead0040: 21300154 + SpacemanLarge: 21300060 + bloodSplatter0001: 21300066 + bloodSplatter0002: 21300068 + bloodSplatter0003: 21300070 + bloodSplatter0004: 21300072 + bloodSplatter0005: 21300074 + climbDown: 21300014 + climbUp0001: 21300016 + climbUp0002: 21300022 + climbUp0003: 21300038 + climbUp0004: 21300048 + climbUp0005: 21300302 + climbUp0006: 21300036 + climbUp0007: 21300322 + climbUp0008: 21300356 + climbUp0009: 21300310 + climbUp0010: 21300326 + climbUp0011: 21300292 + climbUp0012: 21300296 + climbUp0013: 21300352 + ejected: 21300062 + getinVent0001: 21300156 + getinVent0002: 21300158 + getinVent0003: 21300160 + getinVent0004: 21300162 + getinVent0005: 21300164 + getinVent0006: 21300166 + getinVent0007: 21300168 + ghostbob0001: 21300314 + ghostbob0002: 21300054 + ghostbob0003: 21300004 + ghostbob0004: 21300044 + ghostbob0005: 21300358 + ghostbob0006: 21300354 + ghostbob0007: 21300300 + ghostbob0008: 21300024 + ghostbob0009: 21300306 + ghostbob0010: 21300006 + ghostbob0011: 21300028 + ghostbob0012: 21300034 + ghostbob0013: 21300020 + ghostbob0014: 21300030 + ghostbob0015: 21300046 + ghostbob0016: 21300308 + ghostbob0017: 21300032 + ghostbob0018: 21300008 + ghostbob0019: 21300334 + ghostbob0020: 21300350 + ghostbob0021: 21300316 + ghostbob0022: 21300000 + ghostbob0023: 21300052 + ghostbob0024: 21300318 + ghostbob0025: 21300010 + ghostbob0026: 21300324 + ghostbob0027: 21300330 + ghostbob0028: 21300304 + ghostbob0029: 21300340 + ghostbob0030: 21300002 + ghostbob0031: 21300320 + ghostbob0032: 21300294 + ghostbob0033: 21300328 + ghostbob0034: 21300298 + ghostbob0035: 21300338 + ghostbob0036: 21300342 + ghostbob0037: 21300346 + ghostbob0038: 21300348 + ghostbob0039: 21300336 + ghostbob0040: 21300012 + ghostbob0041: 21300312 + ghostbob0042: 21300026 + ghostbob0043: 21300040 + ghostbob0044: 21300042 + ghostbob0045: 21300344 + ghostbob0046: 21300332 + ghostbob0047: 21300018 + ghostbob0048: 21300050 + idle: 21300058 + motionblur: 21300064 + shadow: 21300056 + spawn0001: 21300170 + spawn0003: 21300172 + spawn0006: 21300174 + spawn0007: 21300176 + spawn0008: 21300178 + spawn0009: 21300180 + spawn0010: 21300182 + spawn0011: 21300184 + spawn0012: 21300186 + spawn0013: 21300188 + spawn0014: 21300190 + spawn0015: 21300192 + spawn0016: 21300194 + spawn0017: 21300196 + spawn0018: 21300198 + spawn0019: 21300200 + spawn0020: 21300202 + spawn0021: 21300204 + spawn0022: 21300206 + spawn0023: 21300208 + spawn0024: 21300210 + spawn0025: 21300212 + spawn0026: 21300214 + spawn0027: 21300216 + spawn0028: 21300218 + spawn0029: 21300220 + spawn0030: 21300222 + spawn0031: 21300224 + spawn0032: 21300226 + spawn0033: 21300228 + spawn0034: 21300230 + spawn0035: 21300232 + spawn0036: 21300234 + spawn0037: 21300236 + spawn0038: 21300238 + spawn0039: 21300240 + spawn0040: 21300242 + spawn0041: 21300244 + spawn0042: 21300246 + spawn0043: 21300248 + spawn0044: 21300250 + spawn0045: 21300252 + spawn0046: 21300254 + spawn0047: 21300256 + spawn0048: 21300258 + spawn0049: 21300260 + spawn0050: 21300262 + spawn0051: 21300264 + spawn0052: 21300266 + walkcolor0001: 21300268 + walkcolor0002: 21300270 + walkcolor0003: 21300272 + walkcolor0004: 21300274 + walkcolor0005: 21300276 + walkcolor0006: 21300278 + walkcolor0007: 21300280 + walkcolor0008: 21300282 + walkcolor0009: 21300284 + walkcolor0010: 21300286 + walkcolor0011: 21300288 + walkcolor0012: 21300290 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: + userData: + assetBundleName: + assetBundleVariant: diff --git a/SubmergedUnity/Assets/Submerged/Map/Textures/Background/Extras.png.meta b/SubmergedUnity/Assets/Submerged/Map/Textures/Background/Extras.png.meta index 211cfb69..505c4b0b 100644 --- a/SubmergedUnity/Assets/Submerged/Map/Textures/Background/Extras.png.meta +++ b/SubmergedUnity/Assets/Submerged/Map/Textures/Background/Extras.png.meta @@ -21,7 +21,7 @@ TextureImporter: 213: -1529653491947009405 second: _0005_RM externalObjects: {} - serializedVersion: 11 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -38,10 +38,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -51,8 +53,8 @@ TextureImporter: textureSettings: serializedVersion: 2 filterMode: 0 - aniso: -1 - mipBias: -100 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -80,6 +82,8 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -91,6 +95,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -103,6 +108,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -244,9 +250,15 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: + _0000_BR: 2589262021940448510 + _0001_MR: -3254209255785133366 + _0002_TM: 1966956916339079114 + _0003_LM: 1353510358760294719 + _0004_MM: -1154089258591743273 + _0005_RM: -1529653491947009405 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/SubmergedUnity/Assets/Submerged/Map/Textures/Decontamination/DeconDoorH.png.meta b/SubmergedUnity/Assets/Submerged/Map/Textures/Decontamination/DeconDoorH.png.meta index 32e778bd..d253a9b6 100644 --- a/SubmergedUnity/Assets/Submerged/Map/Textures/Decontamination/DeconDoorH.png.meta +++ b/SubmergedUnity/Assets/Submerged/Map/Textures/Decontamination/DeconDoorH.png.meta @@ -36,7 +36,7 @@ TextureImporter: 213: -3859010618388897817 second: DeconDoorH_20 externalObjects: {} - serializedVersion: 11 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -53,10 +53,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 1 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -65,9 +67,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -95,6 +97,8 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -106,6 +110,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -118,6 +123,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -364,9 +370,20 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: + DeconDoorH_0: 1270031434223233105 + DeconDoorH_10: 424047443138855139 + DeconDoorH_12: 1702908248371461039 + DeconDoorH_14: 3404652477504601200 + DeconDoorH_16: 2545985337933895982 + DeconDoorH_18: 3033459206771981908 + DeconDoorH_2: 4419154868235249022 + DeconDoorH_20: -3859010618388897817 + DeconDoorH_4: 308666372535959277 + DeconDoorH_6: -4877853990238221985 + DeconDoorH_8: -1355668814713759305 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/SubmergedUnity/Assets/Submerged/Map/Textures/Decontamination/DeconDoorV.png.meta b/SubmergedUnity/Assets/Submerged/Map/Textures/Decontamination/DeconDoorV.png.meta index 02765e5d..089d0468 100644 --- a/SubmergedUnity/Assets/Submerged/Map/Textures/Decontamination/DeconDoorV.png.meta +++ b/SubmergedUnity/Assets/Submerged/Map/Textures/Decontamination/DeconDoorV.png.meta @@ -24,7 +24,7 @@ TextureImporter: 213: -5621935166587816425 second: DeconDoorV_6 externalObjects: {} - serializedVersion: 11 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -41,10 +41,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 1 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -53,9 +55,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -83,6 +85,8 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -94,6 +98,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -106,6 +111,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -268,9 +274,16 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: + DeconDoorV_0: -6777967691892100517 + DeconDoorV_1: -2238020829294647090 + DeconDoorV_2: 61919363482875674 + DeconDoorV_3: 801643802987991804 + DeconDoorV_4: 9013386897420079988 + DeconDoorV_5: -1252040914283436513 + DeconDoorV_6: -5621935166587816425 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/SubmergedUnity/Assets/Submerged/Map/Textures/LowerCentral/LowerCentralVent.png.meta b/SubmergedUnity/Assets/Submerged/Map/Textures/LowerCentral/LowerCentralVent.png.meta index e6f820be..38fc1196 100644 --- a/SubmergedUnity/Assets/Submerged/Map/Textures/LowerCentral/LowerCentralVent.png.meta +++ b/SubmergedUnity/Assets/Submerged/Map/Textures/LowerCentral/LowerCentralVent.png.meta @@ -24,7 +24,7 @@ TextureImporter: 213: 6216204390056447806 second: LowerCentralVent_6 externalObjects: {} - serializedVersion: 11 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -41,10 +41,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 1 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -53,9 +55,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -83,6 +85,8 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -94,6 +98,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -106,6 +111,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -118,6 +124,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -280,9 +287,16 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: + LowerCentralVent_0: 2769924519144770012 + LowerCentralVent_1: -2152960626027028783 + LowerCentralVent_2: 1440189480091477904 + LowerCentralVent_3: 8866885771224040551 + LowerCentralVent_4: 8787718128429675114 + LowerCentralVent_5: 1594539068708457464 + LowerCentralVent_6: 6216204390056447806 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/SubmergedUnity/Assets/Submerged/Map/Textures/LowerCentral/Shadows/Dead.png.meta b/SubmergedUnity/Assets/Submerged/Map/Textures/LowerCentral/Shadows/Dead.png.meta index be3964d9..b8bd4604 100644 --- a/SubmergedUnity/Assets/Submerged/Map/Textures/LowerCentral/Shadows/Dead.png.meta +++ b/SubmergedUnity/Assets/Submerged/Map/Textures/LowerCentral/Shadows/Dead.png.meta @@ -288,7 +288,7 @@ TextureImporter: 213: 21300188 second: ghost0047 externalObjects: {} - serializedVersion: 12 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -305,10 +305,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -347,6 +349,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 cookieLightType: 0 platformSettings: - serializedVersion: 3 @@ -359,6 +362,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -371,6 +375,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -3421,9 +3426,51 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: + Dead0001: 21300132 + Dead0002: 21300002 + Dead0003: 21300092 + Dead0004: 21300164 + Dead0005: 21300120 + Dead0006: 21300012 + Dead0007: 21300008 + Dead0008: 21300090 + Dead0009: 21300168 + Dead0010: 21300134 + Dead0011: 21300160 + Dead0012: 21300100 + Dead0013: 21300154 + Dead0014: 21300006 + Dead0015: 21300014 + Dead0016: 21300178 + Dead0017: 21300054 + Dead0018: 21300146 + Dead0019: 21300140 + Dead0020: 21300136 + Dead0021: 21300020 + Dead0022: 21300102 + Dead0023: 21300030 + Dead0024: 21300066 + Dead0025: 21300126 + Dead0026: 21300170 + Dead0027: 21300046 + Dead0028: 21300028 + Dead0029: 21300098 + Dead0030: 21300128 + Dead0031: 21300024 + Dead0032: 21300124 + Dead0033: 21300088 + Dead0034: 21300040 + Dead0035: 21300116 + Dead0036: 21300070 + Dead0037: 21300144 + Dead0038: 21300082 + Dead0039: 21300034 + Dead0040: 21300138 + Dead0041: 21300080 + Dead0042: 21300000 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/SubmergedUnity/Assets/Submerged/Map/Textures/LowerCentral/Shadows/LongHorse.png.meta b/SubmergedUnity/Assets/Submerged/Map/Textures/LowerCentral/Shadows/LongHorse.png.meta index b78a7812..8de3802f 100644 --- a/SubmergedUnity/Assets/Submerged/Map/Textures/LowerCentral/Shadows/LongHorse.png.meta +++ b/SubmergedUnity/Assets/Submerged/Map/Textures/LowerCentral/Shadows/LongHorse.png.meta @@ -267,7 +267,7 @@ TextureImporter: 213: 21300174 second: hors_idleBody0037 externalObjects: {} - serializedVersion: 12 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -284,10 +284,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -326,6 +328,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 cookieLightType: 0 platformSettings: - serializedVersion: 3 @@ -338,6 +341,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -350,6 +354,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -12435,9 +12440,95 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: + hors_idleBody0001: 21300060 + hors_idleBody0002: 21300108 + hors_idleBody0003: 21300120 + hors_idleBody0004: 21300148 + hors_idleBody0005: 21300118 + hors_idleBody0006: 21300066 + hors_idleBody0007: 21300110 + hors_idleBody0008: 21300018 + hors_idleBody0009: 21300014 + hors_idleBody0010: 21300086 + hors_idleBody0011: 21300094 + hors_idleBody0012: 21300124 + hors_idleBody0013: 21300000 + hors_idleBody0014: 21300020 + hors_idleBody0015: 21300012 + hors_idleBody0016: 21300098 + hors_idleBody0017: 21300028 + hors_idleBody0018: 21300152 + hors_idleBody0019: 21300032 + hors_idleBody0020: 21300132 + hors_idleBody0021: 21300160 + hors_idleBody0022: 21300146 + hors_idleBody0023: 21300010 + hors_idleBody0024: 21300114 + hors_idleBody0025: 21300158 + hors_idleBody0026: 21300140 + hors_idleBody0027: 21300144 + hors_idleBody0028: 21300104 + hors_idleBody0029: 21300024 + hors_idleBody0030: 21300074 + hors_idleBody0031: 21300088 + hors_idleBody0032: 21300116 + hors_idleBody0033: 21300030 + hors_idleBody0034: 21300102 + hors_idleBody0035: 21300022 + hors_idleBody0036: 21300162 + hors_idleBody0037: 21300174 + hors_idleBody0038: 21300090 + hors_idleBody0039: 21300076 + hors_idleBody0040: 21300048 + hors_idleBody0041: 21300170 + hors_idleBody0042: 21300154 + hors_idleBody0043: 21300150 + hors_idleBody0044: 21300072 + hors_idleBody0045: 21300050 + hors_idleBody0046: 21300078 + hors_idleBody0047: 21300130 + hors_idleBody0048: 21300040 + hors_idleBody0049: 21300036 + hors_idleBody0050: 21300134 + hors_idleBody0051: 21300122 + hors_idleBody0052: 21300136 + hors_idleBody0053: 21300128 + hors_idleBody0054: 21300044 + hors_idleBody0055: 21300058 + hors_idleBody0056: 21300002 + hors_idleBody0057: 21300068 + hors_idleBody0058: 21300168 + hors_idleBody0059: 21300142 + hors_idleBody0060: 21300004 + hors_idleBody0061: 21300052 + hors_idleBody0062: 21300166 + hors_idleBody0063: 21300046 + hors_idleBody0064: 21300082 + hors_idleBody0065: 21300126 + hors_idleBody0066: 21300164 + hors_idleBody0067: 21300112 + hors_idleBody0068: 21300006 + hors_idleBody0069: 21300056 + hors_idleBody0070: 21300034 + hors_idleBody0071: 21300038 + hors_idleBody0072: 21300026 + hors_idleBody0073: 21300054 + hors_idleBody0074: 21300042 + hors_idleBody0075: 21300138 + hors_idleBody0076: 21300092 + hors_idleBody0077: 21300096 + hors_idleBody0078: 21300064 + hors_idleBody0079: 21300172 + hors_idleBody0080: 21300106 + hors_runBody0001: 21300100 + hors_runBody0002: 21300080 + hors_runBody0003: 21300008 + hors_runBody0004: 21300156 + hors_runBody0005: 21300084 + hors_runBody0006: 21300062 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/SubmergedUnity/Assets/Submerged/Map/Textures/LowerCentral/Shadows/LongboiHeadBody_0.png.meta b/SubmergedUnity/Assets/Submerged/Map/Textures/LowerCentral/Shadows/LongboiHeadBody_0.png.meta index 4224ebe1..0cdc8eaf 100644 --- a/SubmergedUnity/Assets/Submerged/Map/Textures/LowerCentral/Shadows/LongboiHeadBody_0.png.meta +++ b/SubmergedUnity/Assets/Submerged/Map/Textures/LowerCentral/Shadows/LongboiHeadBody_0.png.meta @@ -270,7 +270,7 @@ TextureImporter: 213: 21300176 second: ClimbUpHands0003 externalObjects: {} - serializedVersion: 12 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -287,10 +287,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -329,6 +331,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 cookieLightType: 0 platformSettings: - serializedVersion: 3 @@ -341,6 +344,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -353,6 +357,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -1542,9 +1547,22 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: + WalkBody0001: 21300008 + WalkBody0002: 21300022 + WalkBody0003: 21300110 + WalkBody0004: 21300024 + WalkBody0005: 21300058 + WalkBody0006: 21300124 + WalkBody0007: 21300046 + WalkBody0008: 21300136 + WalkBody0009: 21300098 + WalkBody0010: 21300166 + WalkBody0011: 21300010 + WalkBody0012: 21300000 + idle: 21300040 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/SubmergedUnity/Assets/Submerged/Map/Textures/LowerCentral/Shadows/PlayerAnimations_0.png.meta b/SubmergedUnity/Assets/Submerged/Map/Textures/LowerCentral/Shadows/PlayerAnimations_0.png.meta index 19f0d8e8..97cfe607 100644 --- a/SubmergedUnity/Assets/Submerged/Map/Textures/LowerCentral/Shadows/PlayerAnimations_0.png.meta +++ b/SubmergedUnity/Assets/Submerged/Map/Textures/LowerCentral/Shadows/PlayerAnimations_0.png.meta @@ -372,7 +372,7 @@ TextureImporter: 213: 21300244 second: Spawn0028 externalObjects: {} - serializedVersion: 12 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -389,10 +389,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -431,6 +433,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 cookieLightType: 0 platformSettings: - serializedVersion: 3 @@ -443,6 +446,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -455,6 +459,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -1568,9 +1573,22 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: + Walk0001: 21300052 + Walk0002: 21300012 + Walk0003: 21300234 + Walk0004: 21300152 + Walk0005: 21300068 + Walk0006: 21300100 + Walk0007: 21300146 + Walk0008: 21300048 + Walk0009: 21300220 + Walk0010: 21300140 + Walk0011: 21300018 + Walk0012: 21300002 + idle: 21300136 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/SubmergedUnity/Assets/Submerged/Map/Textures/LowerCentral/Shadows/SeekerAnimations.png.meta b/SubmergedUnity/Assets/Submerged/Map/Textures/LowerCentral/Shadows/SeekerAnimations.png.meta index 9949ae9b..9eff8a91 100644 --- a/SubmergedUnity/Assets/Submerged/Map/Textures/LowerCentral/Shadows/SeekerAnimations.png.meta +++ b/SubmergedUnity/Assets/Submerged/Map/Textures/LowerCentral/Shadows/SeekerAnimations.png.meta @@ -156,7 +156,7 @@ TextureImporter: 213: 21300100 second: Seeker_Walk0010 externalObjects: {} - serializedVersion: 12 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -173,10 +173,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -215,6 +217,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 cookieLightType: 0 platformSettings: - serializedVersion: 3 @@ -227,6 +230,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -239,6 +243,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -3068,9 +3073,37 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: + Seeker_Walk0001: 21300008 + Seeker_Walk0002: 21300036 + Seeker_Walk0003: 21300040 + Seeker_Walk0004: 21300046 + Seeker_Walk0005: 21300030 + Seeker_Walk0006: 21300074 + Seeker_Walk0007: 21300042 + Seeker_Walk0008: 21300048 + Seeker_Walk0009: 21300000 + Seeker_Walk0010: 21300100 + Seeker_Walk0011: 21300050 + Seeker_Walk0012: 21300078 + Seeker_idle0001: 21300080 + Seeker_idle0002: 21300090 + Seeker_idle0003: 21300026 + Seeker_idle0004: 21300044 + Seeker_idle0005: 21300020 + Seeker_idle0006: 21300022 + Seeker_idle0007: 21300088 + Seeker_idle0008: 21300052 + Seeker_idle0009: 21300016 + Seeker_idle0010: 21300002 + Seeker_idle0011: 21300018 + Seeker_idle0012: 21300058 + Seeker_idle0013: 21300096 + Seeker_idle0014: 21300076 + Seeker_idle0015: 21300094 + Seeker_idle0016: 21300014 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/SubmergedUnity/Assets/Submerged/Map/Textures/SpriteSheets/TexturePack1.png.meta b/SubmergedUnity/Assets/Submerged/Map/Textures/SpriteSheets/TexturePack1.png.meta index cfe99236..11fca120 100644 --- a/SubmergedUnity/Assets/Submerged/Map/Textures/SpriteSheets/TexturePack1.png.meta +++ b/SubmergedUnity/Assets/Submerged/Map/Textures/SpriteSheets/TexturePack1.png.meta @@ -1377,7 +1377,7 @@ TextureImporter: 213: 8708705709775472104 second: DK_Easter_Egg externalObjects: {} - serializedVersion: 11 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -1394,10 +1394,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -1407,8 +1409,8 @@ TextureImporter: textureSettings: serializedVersion: 2 filterMode: 1 - aniso: -1 - mipBias: -100 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -1436,6 +1438,8 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -1447,6 +1451,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -1459,6 +1464,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -9664,9 +9670,399 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: + AdminAndLounge_0000_LoungeReshelveBooks: 3543522409334862513 + AdminAndLounge_0001_AdminLoungeFloor: 3727783459613296593 + AdminAndLounge_0002_TrackMantaRayTelescope: -7868504336689464251 + AdminAndLounge_0003_FeedFish: -106980617049697146 + AdminAndLounge_0004_AdminMap: 8570115870018403599 + AdminAndLounge_0005_EmergencyButton: -8061783263911654275 + AdminAndLounge_0006_EmergencyButtonText: 2553165960237432767 + AdminAndLounge_0007_MeetingRoomSetNavBeacon: 7933755668569291266 + AdminAndLounge_0008_AdminConsole: -5405553642534039148 + AdminAndLounge_0009_MeetingTable: -2387324887581923499 + AdminAndLounge_0010_MeetingGrass: -8270688576814857885 + AdminAndLounge_0011_MeetingWaterDispenser: 6904311943894173577 + AdminAndLounge_0012_MeetingRailing: 6482577971376126544 + AdminAndLounge_0013_LocateVolcanicActivity: -7973491741971485899 + AdminAndLounge_0014_ObservatoryFishFence: 8236104576049161909 + AdminAndLounge_0015_AlignTelescope: 6742890085132622658 + AdminAndLounge_0016_WhaleShark: 9078343770395003667 + AdminAndLounge_0017_DownoadDataFlat: 7993072815952706064 + Ballast Pipe F1: 6404598799745367112 + Ballast Pipe F10: 6352778220207948699 + Ballast Pipe F11: 6649603932030211578 + Ballast Pipe F12: 8730726438415380417 + Ballast Pipe F13: -3607899068820952222 + Ballast Pipe F14: 4194060785700395714 + Ballast Pipe F15: 563714290464308083 + Ballast Pipe F2: 8889288068563111159 + Ballast Pipe F3: -4751342436265254589 + Ballast Pipe F4: 2624060633075943245 + Ballast Pipe F5: -240634066992383362 + Ballast Pipe F6: 907411835506867 + Ballast Pipe F7: -7165170178452507655 + Ballast Pipe F8: 4113548865550571244 + Ballast Pipe F9: -8625009161312009897 + Ballast Pipe Glass Cover: -4850213718077416997 + Ballast Pool F1: 5672779407041973864 + Ballast Pool F2: 1377755046614226864 + Ballast Pool F3: -4392039115837091846 + Ballast Pool F4: -241015842072847722 + Ballast Pool F5: -9116045338281531376 + Ballast Sink F1: 1928805358757262499 + Ballast Sink F2: -226959761453871559 + Ballast Sink F3: 4824251189970136498 + Ballast Tub F1: -3179644310335983930 + Ballast Tub F2: -2002836317695468493 + Ballast Tub F3: -8985079635173636696 + Ballast Tub F4: -6666053380150657569 + Ballast Tub F5: -337171208874833009 + BallastLobbyHallPipe 00: 7752174550945909417 + BallastLobbyHallPipe 01: 7626496614325881445 + BallastLobbyHallPipe 02: 413644885583362863 + BallastLobbyHallPipe 03: 1083595056967090051 + BallastLobbyHallPipe 04: 8325330971457938302 + BallastLobbyHallPipe 05: -1705500484248044000 + BallastLobbyHallPipe 06: 2892969211473253871 + BallastLobbyHallPipe 07: 1629027408303474214 + BallastLobbyHallPipe 08: -1443248913373144281 + BallastLobbyHallPipe 09: -6928996268956145618 + BallastLobbyHallPipe 10: 8398910595969998595 + BallastLobbyHallPipe 11: 2011254572127048755 + BallastLobbyHallPipe 12: 4795165646668688545 + BallastLobbyHallPipe 13: 8918910215901102666 + BallastLobbyHallPipe 14: 1515903663147892669 + BallastLobbyHallPipeBack: -4000170036659246782 + BallastLobbyHallPipeCover: -3156978210364255887 + BallastLobby_0000_WallPipe-F1: 792853320997141776 + BallastLobby_0001_WallPipe-F2: -8059906379842351896 + Ballast_0001_BallastRailingFloor: -2589465855524765572 + Ballast_0002_BallastRailing: 9130358074467071616 + Ballast_0003_BallastRailingDoor: -2821118088986270605 + Ballast_0004_BallastWallPipe: 6616491676386300279 + Ballast_0005_StartSubmersible: -1105320671513429877 + Ballast_0006_RightBallastSabotage: -1079539844227631110 + Ballast_0007_BallastSabotageLeft: 6549698660899531811 + Ballast_0008_BallastFanBox: -4039775545678794762 + Ballast_0009_RustedWires: -3250423618066340930 + CafeteriaAndResearch_0000_CafeteriaResearchFloor: -2494685696818307120 + CafeteriaAndResearch_0001_ToastBoard: 3820327267932467397 + CafeteriaAndResearch_0002_TectonePoster: 396806287231614655 + CafeteriaAndResearch_0003_FlipsPoster: -379806078968431995 + CafeteriaAndResearch_0004_PeenerPoster: 8708660379038619851 + CafeteriaAndResearch_0005_IDKWhosPoster: 7721102998159621596 + CafeteriaAndResearch_0005_SetNavBeaconResearch: 795770527161985744 + CafeteriaAndResearch_0006_ResearchWindow: -516330092744977405 + CafeteriaAndResearch_0007_IdentifySpecimen: 846617097473319755 + CafeteriaAndResearch_0008_ResearchMainTable: -6798763389646349468 + CafeteriaAndResearch_0009_ResearchFishTank: -7468141897705311550 + CafeteriaAndResearch_0010_Medscanner: 8978910075652253392 + CafeteriaAndResearch_0011_MedicalReshelveBooks: 7421263344112587682 + CafeteriaAndResearch_0012_MedicalBeds: 5690051008504742234 + CafeteriaAndResearch_0013_PurchaseBreakfast: -2405544285625357700 + CafeteriaAndResearch_0014_RightCafeteriaTable: -5661650317151220343 + CafeteriaAndResearch_0015_LeftCafeteriaTable: -1131670282369029801 + CafeteriaAndResearch_0016_CornerCafeteriaTable: -4407901099708752806 + CafeteriaAndResearch_0017_SteadyHeartbeat: -8034504541815281127 + CafeteriaAndResearch_0018_CafeteriaCups: -4679792745893832596 + CafeteriaAndResearch_0019_ResearchCornerBench: -822652401291408065 + CafeteriaAndResearch_0020_Microwave: 1351638192004193990 + Cams_0000_FrontCamOff: 3281573814502803490 + Cams_0001_FrontCamOn: 8016733192486985834 + Cams_0002_SideCamOff: 8086476803747665602 + Cams_0003_SideCamOn: 2502340281160536701 + CentralAndFiltration_Pipe A F1: -6367476541337370004 + CentralAndFiltration_Pipe A F2: 8893378420543269691 + CentralAndFiltration_Pipe B F1: 8456648634041747733 + CentralAndFiltration_Pipe B F2: -9056095511773678157 + Central_0000_UpperCentralGlass: -2978924860248125633 + Central_0002_LowerCentralTank: -7870435736861493644 + Central_0003_OxygenateSeaPlants: -9060063465335042689 + Central_0004_LowerCentralVentBack: -3434009206970582144 + Central_0005_LowerCentralVentFront: 4489458184771057214 + Central_0006_UpperCentralTank: -4637850402399930333 + Central_0007_OxygenSabotage: 2383070991732031242 + Central_0008_CleanGlass: 8581462213864756018 + Central_0010_WiresConsoleClean: -5696524047570975447 + Central_1001_FiltratonHallway: 6531853603896783644 + Cup Steam F1: 1259174026479824849 + Cup Steam F2: 2544367479244784094 + Cup Steam F3: -6118138655717089639 + Cup Steam F4: 2327271722216828775 + Cup Steam F5: -5440190960693415097 + Cup Steam F6: 4433978348412249362 + Cup Steam F7: -6714673395755546379 + DK_Easter_Egg: 8708705709775472104 + EnginesAndSecurityHall_0001_Security: 8734510801490849090 + EnginesAndSecurity_0001_SubmarineSurveillance: -3813314697122305357 + EnginesAndSecurity_0002_ShootDepthCharges: 5432431997615632157 + EnginesAndSecurity_0003_UnlockManifolds: -2717829495417112543 + EnginesAndSecurity_0004_ClearUrchins: -5789006202928913246 + EnginesAndSecurity_0005_CycleReactor: 1770270163891527481 + EnginesAndSecurity_0006_OpenVent: 7713646406827138331 + EnginesAndSecurity_0007_RustyDiagnoseElevators: 6372868364178909683 + EnginesAndSecurity_0008_Falcone Egg: 7961773856009469687 + EnginesCentralHallPipe F01: 1746728570950281060 + EnginesCentralHallPipe F02: -7756783951051374847 + EnginesCentralHallPipe F03: 1906232325275353555 + EnginesCentralHallPipe F04: 136626482657216394 + EnginesCentralHallPipe F05: 5137277156083276206 + EnginesCentralHallPipe F06: -4648927200327964163 + EnginesCentralHallPipe F07: 2089280119573816661 + EnginesCentralHallPipe F08: 8019622696564181355 + EnginesCentralHallPipe F09: -8464810246904459282 + EnginesCentralHallPipe F10: 5271344147761590266 + EnginesCentralHallPipe F11: 117545153911061032 + EnginesCentralHallPipe F12: 8414549786218650985 + EnginesCentralHallPipe F13: -3301614701323913696 + EnginesCentralHallPipe F14: -6228920018088451787 + EnginesCentralHallPipe F15: 6794065757754288987 + EnginesCentralHallPipeBack: 7325137497008848198 + EnginesCentralHallPipeGague: 699664532717031671 + EnginesCentralHallPipeGagueNeedle: -4317822282939477117 + EnginesCentralHallPipeGlassCover: 797012281356242011 + Falcone Egg: 3094867646739493783 + FiltrationAndElectrical_0000_ElectricalFiltrationFloor: 6058132720645589345 + FiltrationAndElectrical_0001_LightsSabotage: 8888227151543935528 + FiltrationAndElectrical_0002_DispenseWater: 9168677756207004460 + FiltrationAndElectrical_0003_ReconnectPiping: -74178617778773999 + FiltrationAndElectrical_0004_ResetBreakers: -2014245884342151031 + FiltrationAndElectrical_0005_PlugLeaks: 8276778119059507579 + FiltrationAndElectrical_0006_MopPuddles: -412610582432901711 + FiltrationAndElectrical_0007_OliveWires: 1464781531857946001 + FiltrationCams_0000_RightFacingCamOn: -5690251458134389869 + FiltrationCams_0001_RightFacingCamOff: -3212703070320038703 + FiltrationCams_0002_FixCamsConsoleSide: -6016771403068576490 + FiltrationHallwayPipeBack: 9078188489169133296 + FiltrationHallwayPipeCover: -6970740252426270258 + FiltrationHallwayPipeH F01: 7801946850339933132 + FiltrationHallwayPipeH F02: -708152479979560454 + FiltrationHallwayPipeH F03: 1070445090226454523 + FiltrationHallwayPipeH F04: 5829491527627159682 + FiltrationHallwayPipeH F05: -6585274273849499927 + FiltrationHallwayPipeH F06: -6884399453427288190 + FiltrationHallwayPipeH F07: 5408324554431449088 + FiltrationHallwayPipeH F08: 8420622775999304737 + FiltrationHallwayPipeH F09: -207563267420457702 + FiltrationHallwayPipeH F10: 3973303280504169071 + FiltrationHallwayPipeH F11: 7365514735024917000 + FiltrationHallwayPipeH F12: -5850542088359254524 + FiltrationHallwayPipeH F13: 868979218090506391 + FiltrationHallwayPipeH F14: 3961632195314138220 + FiltrationHallwayPipeH F15: -2303163956800233113 + FiltrationHallwayPipeV F01: -2126051720498987026 + FiltrationHallwayPipeV F02: 4346844282981498075 + FiltrationHallwayPipeV F03: 7997272739175024317 + FiltrationHallwayPipeV F04: -6728520842458742794 + FiltrationHallwayPipeV F05: -4496668299060620296 + FiltrationHallwayPipeV F06: 4388778658971002931 + FiltrationHallwayPipeV F07: -3604477039808668578 + FiltrationHallwayPipeV F08: 7527898318530781007 + FiltrationHallwayPipeV F09: 2173093898048178730 + FiltrationHallwayPipeV F10: -2495800287964870857 + FiltrationHallwayPipeV F11: -1017869917047489994 + FiltrationHallwayPipeV F12: 7601129179089479442 + FiltrationHallwayPipeV F13: -4661108586853585543 + FiltrationHallwayPipeV F14: 5581279899850307293 + FiltrationHallwayPipeV F15: -4905405644779466679 + FiltrationHallwayPipeVBack: 1562210539873845782 + FiltrationHallwayPipeVCover: -39810013704620049 + FiltrationMainTanks F1: -8014405707340751167 + FiltrationMainTanks F2: 876623076379280722 + FiltrationTankPipe Back: 989316060599105298 + FiltrationTankPipe F01: -7406908368650461332 + FiltrationTankPipe F02: -484823088195908885 + FiltrationTankPipe F03: -9198528593619080993 + FiltrationTankPipe F04: -8001060768724767389 + FiltrationTankPipe F05: -7843347648645299931 + FiltrationTankPipe F06: -3063112096457977156 + FiltrationTankPipe F07: -7965916813037090718 + FiltrationTankPipe F08: 1239082244008445037 + FiltrationTankPipe F09: -369963086361115394 + FiltrationTankPipe F10: 3345862427029254195 + FiltrationTankPipe F11: -7258525134195883194 + FiltrationTankPipe F12: 2548132253972841924 + FiltrationTankPipe F13: 6234977871784367864 + FiltrationTankPipe F14: 3502585795198338264 + FiltrationTankPipe F15: -6169744002345740963 + FiltrationTankPipe Front: 8935131822352783154 + FiltrationWallPipeThicc F1: 327228461795353014 + FiltrationWallPipeThicc F2: -3390655128638582590 + FixCamsConsoleLong: 3392681513988345415 + FixCamsConsoleMedium: -2884239436887166209 + FixCamsConsoleShort: -2337337611658886115 + GeneralDoor_0000_HozDoorOpen0008: 9139115041975581582 + GeneralDoor_0001_HozDoorOpen0007: -439363577931309512 + GeneralDoor_0002_HozDoorOpen0006: 8529226860791859893 + GeneralDoor_0003_HozDoorOpen0005: -4189372452900883182 + GeneralDoor_0004_HozDoorOpen0004: -8272852212832487074 + GeneralDoor_0005_HozDoorOpen0003: -6922120861399479178 + GeneralDoor_0006_HozDoorOpen0002: -3857094845151986399 + GeneralDoor_0007_HozDoorOpen0001: -8237262796459107336 + LobbyAndComms_0000_CommsLobbyFloor: 458928412382456371 + LobbyAndComms_0001_LeftLobbyCouch: -5719915104961227282 + LobbyAndComms_0002_Bookcase: -1045085597097768191 + LobbyAndComms_0003_RightLobbyCouch: -3923128908903653374 + LobbyAndComms_0004_CommsConsole: 16841059146758291 + LobbyAndComms_0005_CommsComputer: 6787151569824719508 + LobbyAndComms_0006_CommsComputerBack: 8240844512633093937 + LobbyAndComms_0007_DiagnoseElevatorsClean: 4309907393744012847 + Main Turbine F1: -1616752300753904238 + Main Turbine F2: 6710245542128135612 + Main Turbine F3: -5984391020515254796 + Main Turbine F4: -6851273089296441517 + Mimi F1: -8858235078434895339 + Mimi F2: -8049706783262865094 + Mimi F3: 7232271361509739120 + Mimi F4: -4086973910891088455 + Plug Leak F1: 6165129974966445212 + Plug Leak F2: 3960049653235952555 + Server 1 F1: -427632734777208037 + Server 1 F2: 2529182618603850203 + Server 1 F3: 5860293687567158860 + Server 1 F4: 1718013507556661510 + Server 2 F1: 4422703998836734435 + Server 2 F2: 302513813094379808 + Server 2 F3: -8467335938617031896 + Spider F1: -4139803648468320006 + Spider F10: 631913154154291002 + Spider F11: 4927143024843364163 + Spider F2: 3037714469283513623 + Spider F3: 3006987086412823 + Spider F4: -6778419047251027487 + Spider F5: -5953930146705978410 + Spider F6: 7607476859385371315 + Spider F7: 4625382818465351293 + Spider F8: 2452986861131097367 + Spider F9: -6904232146657528348 + StorageAndLobby_0000_StorageLobbyFloor: 1841350569502101616 + StorageAndLobby_0001_RightStorageShelfFront: -3148444114722884539 + StorageAndLobby_0002_LeftStorageShelfFront: -4202533352103261940 + StorageAndLobby_0003_RightStorageShelfBack: 535891236979886882 + StorageAndLobby_0004_LeftStorageShelfBack: -1021385085863096797 + StorageAndLobby_0005_StorageChairs: 7080186782592098698 + StorageAndLobby_0006_SortScubaGear: 3607821993497128033 + StorageAndLobby_0007_FrontStorageBoxesSmall: 324719168584815259 + StorageAndLobby_0008_TrollyAndSuch: 5341073000033374745 + StorageAndLobby_0009_HatBox: -532623285889271379 + StorageAndLobby_0010_PolusArtifactBox: -7418449324510689495 + StorageAndLobby_0011_BaseTradeStorageBoxes: -1798672069088983063 + StorageAndLobby_0012_DarkRustedWires: -910428712781834491 + StorageAndLobby_0013_DownloadDataDiagonal: -7228328155395555656 + Twin Turbine Frame 1: -4609697647824437076 + Twin Turbine Frame 2: 8694216750453493251 + Yeti 1 - cropped: 3723636170651532566 + Yeti 2 - cropped: -2817009477109214000 + catEarFrames-Cat00: 954744793052027814 + catEarFrames-Cat01: 3787837096726804358 + catEarFrames-Cat02: -5811703259427907424 + catEarFrames-Cat03: 8031069555590978251 + catEarFrames-Cat04: -3747558048041717807 + catEarFrames-Cat05: 7465336549599031883 + catEarFrames-Cat06: 1868018290038752929 + catEarFrames-Cat07: 495147623456719779 + catEarFrames-Cat08: 7369867280464523769 + catEarFrames-Cat09: 7888718570860061073 + catEarFrames-Cat10: -9159453955227657861 + catEarFrames-Cat11: -6081169659535098939 + catEarFrames-Cat12: 3534279841757022706 + catEarFrames-Cat13: -341211701326071563 + catEarFrames-Cat14: 311856833663716875 + catEarFrames-Cat15: 6729055040653542021 + catEarFrames-Cat16: -7388959032515134277 + catEarFrames-Cat17: -1460962321266659319 + catEarFrames-Cat18: 5931076532450641170 + catEarFrames-Cat19: 854838996702717708 + catEarFrames-Cat20: 6482841637582904253 + catEarFrames-Cat21: -7555479469402091731 + catEarFrames-Cat22: -3795181288090975439 + catEarFrames-Cat23: 3996568984387169818 + catEarFrames-Cat24: -7946676006234658211 + catEarFrames-Cat25: -1023860343267674459 + catEarFrames-Cat26: 8027172202688138950 + catEarFrames-Cat27: -2535636008076544604 + catEarFrames-Cat28: -8747555336385336561 + catEarFrames-Cat29: 3427104756762203533 + catEarFrames-Cat30: -6622158169892265602 + catEarFrames-Cat31: -7104188605083356234 + catEarFrames-Cat32: -6233709702653180413 + catEarFrames-Cat33: 1914751115097185442 + catEarFrames-Cat34: 5275123131099799280 + catEarFrames-Cat35: 6691688714994086908 + catEarFrames-Cat36: -439877384261742272 + catEarFrames-Cat37: 2704960724872605852 + catEarFrames-Cat38: 8316849317365020724 + catEarFrames-Cat39: -8106919162604643699 + catEarFrames-Cat40: -937813397083125632 + catEarFrames-Cat41: -4988653371623804541 + catEarFrames-Cat42: 149089460083173107 + catEarFrames-Cat43: -3712480276890069415 + catEarFrames-Cat44: 8633958452231819132 + catEarFrames-Cat45: -895842642276805678 + catEarFrames-Cat46: -3091510537955722806 + catEarFrames-Cat47: 7384429503239818035 + catEarFrames-Cat48: -5908117157950877673 + catTailFrames-Cat00: 5332779924227888505 + catTailFrames-Cat01: -3845549010620186392 + catTailFrames-Cat02: 5429230617478108273 + catTailFrames-Cat03: 439686224857630918 + catTailFrames-Cat04: 2658650898438100363 + catTailFrames-Cat05: -3312881243112552770 + catTailFrames-Cat06: -297315793389709720 + catTailFrames-Cat07: 1823250848094148423 + catTailFrames-Cat08: -4252828070096216506 + catTailFrames-Cat09: -4936957484199381743 + catTailFrames-Cat10: -6288327296693908186 + catTailFrames-Cat11: -1724079301477496262 + catTailFrames-Cat12: 6256269620225939720 + catTailFrames-Cat13: -5332446588996028261 + catTailFrames-Cat14: -2315928366845697696 + catTailFrames-Cat15: 9161562907882230325 + catTailFrames-Cat16: 7003961626055026509 + catTailFrames-Cat17: 5375772594922168999 + catTailFrames-Cat18: 2907080639444361682 + catTailFrames-Cat19: -9028914635759341834 + catTailFrames-Cat20: 6633603726217024847 + catTailFrames-Cat21: -612958994827009074 + catTailFrames-Cat22: -8863409139652813963 + catTailFrames-Cat23: 4467778373362521334 + catTailFrames-Cat24: -8521535456517409408 + catTailFrames-Cat25: -4019718351641364623 + catTailFrames-Cat26: 9215923996087195850 + catTailFrames-Cat27: 2828333816900347846 + catTailFrames-Cat28: 1925199689088022376 + catTailFrames-Cat29: 5770647614302535647 + catTailFrames-Cat30: 4726383939317610651 + catTailFrames-Cat31: 4015289712555966875 + catTailFrames-Cat32: -2462105755195731913 + catTailFrames-Cat33: -5756422544836846859 + catTailFrames-Cat34: 5732246900811459009 + catTailFrames-Cat35: 4757364999018399670 + catTailFrames-Cat36: -1064882216138475341 + catTailFrames-Cat37: -1984035422202283608 + catTailFrames-Cat38: -7643053339530978951 + catTailFrames-Cat39: -5595251244269003881 + catTailFrames-Cat40: 488090722811300931 + catTailFrames-Cat41: 8540823841001824210 + catTailFrames-Cat42: -4402190365797396484 + catTailFrames-Cat43: 2601284861512803127 + catTailFrames-Cat44: -6403339947676740635 + catTailFrames-Cat45: 6463975048727127767 + catTailFrames-Cat46: 8702639888653798749 + catTailFrames-Cat47: 628614836744730991 + catTailFrames-Cat48: 4511839654609985888 + dk_trashcan: 898445376270864510 + plug Leak F3: 8323133080014479588 + plug Leak F4: 10189823288581081 + plug Leak F5: -9119236555719370731 + plug Leak F6: 8299694604096991304 + plug Leak F7: -596837869579524603 + plug Leak F8: -6022013540150418537 + rat_run_1: -978901381638648924 + rat_run_2: 3573629568932373604 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/SubmergedUnity/Assets/Submerged/Map/Textures/SpriteSheets/TexturePack2.png.meta b/SubmergedUnity/Assets/Submerged/Map/Textures/SpriteSheets/TexturePack2.png.meta index 9de5730d..03321a7a 100644 --- a/SubmergedUnity/Assets/Submerged/Map/Textures/SpriteSheets/TexturePack2.png.meta +++ b/SubmergedUnity/Assets/Submerged/Map/Textures/SpriteSheets/TexturePack2.png.meta @@ -300,7 +300,7 @@ TextureImporter: 213: 1204632474144746718 second: Cat_body externalObjects: {} - serializedVersion: 11 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -317,10 +317,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -329,9 +331,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -359,6 +361,8 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -370,6 +374,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -382,6 +387,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -2476,9 +2482,108 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: + BallastLights_0000_Open: -6405091228157470277 + BallastLights_0001_Closed: 3942928154286592805 + Ballast_0000_BallastFloor: -9115283423704387869 + C-Vent Frame 01: -5565553956869476983 + C-Vent Frame 02: -8679025160136781793 + C-Vent Frame 03: 8910510464208769903 + C-Vent Frame 04: 8309499034091738747 + C-Vent Frame 05: 5363072510838931417 + C-Vent Frame 06: 809672767495819709 + C-Vent Frame 07: 2989584579055090753 + C-Vent Frame 08: -1198044565637034582 + C-Vent Frame 09: 3132675025755480221 + CatBox: -8658205064191480193 + Cat_body: 1204632474144746718 + Central_1000_LowerCentral: -8678152047205594732 + Central_Vent_Overlay: -4320964394121123144 + Central_Vent_Overlay_2: 2347447591226521794 + Diagonse_Elevator_UD_Lobby: 6808396693443108838 + ElevatorDoorsInside_0000_Door8: 284334890709750349 + ElevatorDoorsInside_0001_Door7: -4090343435662082077 + ElevatorDoorsInside_0002_Door6: -708355348423683940 + ElevatorDoorsInside_0003_Door5: 1923429182064113018 + ElevatorDoorsInside_0004_Door4: 7554179788937733629 + ElevatorDoorsInside_0005_Door3: -3779859592766745092 + ElevatorDoorsInside_0006_Door2: -5820348468101169102 + ElevatorDoorsInside_0007_Door1: 1898450445236784900 + ElevatorDoorsOutside_0000_Door0008: 8475945375164894894 + ElevatorDoorsOutside_0001_Door0007: -5336792470322366024 + ElevatorDoorsOutside_0002_Door0006: 8236627270553917350 + ElevatorDoorsOutside_0003_Door0005: 5773278147916048817 + ElevatorDoorsOutside_0004_Door0004: 2065486253572166245 + ElevatorDoorsOutside_0005_Door0003: -8596387699239500991 + ElevatorDoorsOutside_0006_Door0002: -5744942130405309948 + ElevatorDoorsOutside_0007_Door0001: -7464228544104086868 + ElevatorLight_0000_UpLightOn: -4679123077698588587 + ElevatorLight_0001_UpLightOff: 8859213537862326561 + ElevatorLight_0002_FrontLightOn: 4731651044463736449 + ElevatorLight_0003_FrontLightOff: -2259264484523263549 + EnginesAndSecurityHall_0000_Engines: -3949894384718801443 + Engines_Vent_Overlay: -8958656705291922699 + Engines_Vent_Overlay_2: -827599029937021552 + FullElevator: -6501362305123712135 + GeneralDoor_0000_HozDoorOpen0008: 9139115041975581582 + GeneralDoor_0001_HozDoorOpen0007: -439363577931309512 + GeneralDoor_0002_HozDoorOpen0006: 8529226860791859893 + GeneralDoor_0003_HozDoorOpen0005: -4189372452900883182 + GeneralDoor_0004_HozDoorOpen0004: -8272852212832487074 + GeneralDoor_0005_HozDoorOpen0003: -6922120861399479178 + GeneralDoor_0006_HozDoorOpen0002: -3857094845151986399 + GeneralDoor_0007_HozDoorOpen0001: -8237262796459107336 + Observatory_Frame_1: 1516955617110600875 + Observatory_Frame_2: -571962269947817462 + Observatory_Frame_3: 4730131550802710527 + Observatory_Frame_4: 3522681846077334518 + Observatory_Frame_5: -280923562488565476 + Observatory_Frame_6: 8527990420048026995 + SubmarineDoorH_0: -5991502796376062997 + SubmarineDoorH_10: -145729699322703373 + SubmarineDoorH_12: -949103756141807094 + SubmarineDoorH_14: 2214575412585867040 + SubmarineDoorH_16: 1654573479798327108 + SubmarineDoorH_18: 7603348762882163396 + SubmarineDoorH_19: 4741881669601266643 + SubmarineDoorH_2: 3085595817340646321 + SubmarineDoorH_20: 7269432408912673823 + SubmarineDoorH_4: -8171710481324902435 + SubmarineDoorH_6: -8106843808364111243 + SubmarineDoorH_8: -2322035661782848767 + SubmarineDoorV_0: 7244389525789728775 + SubmarineDoorV_1: -7888782089109913717 + SubmarineDoorV_2: 6773259908116149047 + SubmarineDoorV_3: 2647339886535139003 + SubmarineDoorV_4: 7689418208536129768 + SubmarineDoorV_5: 7163604232165625528 + SubmarineDoorV_6: -5260687261948477600 + UpperVentBG: -2970021773458124217 + Vent Frame 1: -241254796486619852 + Vent Frame 10: -7955563771421327746 + Vent Frame 11: 2510814130568203000 + Vent Frame 2: -6173924911553203006 + Vent Frame 3: 8559958797506759823 + Vent Frame 4: -994618872007427518 + Vent Frame 5: -866247742035034873 + Vent Frame 6: -6355533261083067039 + Vent Frame 7: 1806808069700347009 + Vent Frame 8: 2296222095080588286 + Vent Frame 9: 4587129904996866662 + VerticalDoor_0000_DoorOpen08: -3752151865033084052 + VerticalDoor_0001_DoorOpen07: -6428833713851140185 + VerticalDoor_0002_DoorOpen06: 6650858818598746538 + VerticalDoor_0003_DoorOpen05: -7102972631387322761 + VerticalDoor_0004_DoorOpen04: -7953342643540699523 + VerticalDoor_0005_DoorOpen03: 7580145400278915 + VerticalDoor_0006_DoorOpen02: 820753753795828634 + VerticalDoor_0007_DoorOpen01: 7315685629176500549 + WestHallway_0000_RightPart: -325697137877594973 + WestHallway_0001_SecurityHallway: -1424170813119082716 + WestHallway_0002_LeftHallway: -8556147132495918629 + acorn3: 3491150386883928107 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/SubmergedUnity/Assets/Submerged/Minigames/AlignTelescope/Textures/AlignTelescopeSpriteSheet.png.meta b/SubmergedUnity/Assets/Submerged/Minigames/AlignTelescope/Textures/AlignTelescopeSpriteSheet.png.meta index 40ec2fe4..440dd433 100644 --- a/SubmergedUnity/Assets/Submerged/Minigames/AlignTelescope/Textures/AlignTelescopeSpriteSheet.png.meta +++ b/SubmergedUnity/Assets/Submerged/Minigames/AlignTelescope/Textures/AlignTelescopeSpriteSheet.png.meta @@ -177,7 +177,7 @@ TextureImporter: 213: 3194782757838505180 second: merged_bubbles_43 externalObjects: {} - serializedVersion: 11 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -194,10 +194,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -206,9 +208,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -236,6 +238,8 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -247,6 +251,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -259,6 +264,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -271,6 +277,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -1441,9 +1448,64 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: + Reticle: -6776817779631042170 + Target: 2865870748345947649 + align_telescope: 5746186521494623499 + align_telescope_active_vent: 2620168497237725838 + align_telescope_bones: -1513115343639873599 + align_telescope_crystal: -5937736546632067289 + align_telescope_dormant_vent: 6791958158741680899 + align_telescope_fossil: 487812304301792297 + align_telescope_mug: -4712053457605823372 + align_telescope_seaweed: -1085696731962921756 + merged_bubbles_0: 989586375613908341 + merged_bubbles_1: 2339346337270258330 + merged_bubbles_10: -6420438993396168218 + merged_bubbles_11: 4249300751263845249 + merged_bubbles_12: 2971679782092587890 + merged_bubbles_13: -3253610028327167598 + merged_bubbles_14: 1130322155887673808 + merged_bubbles_15: -2291813779929983263 + merged_bubbles_16: -2271326704719493077 + merged_bubbles_17: 8596581801365718322 + merged_bubbles_18: -1438165301138806192 + merged_bubbles_19: -8176330040498012003 + merged_bubbles_2: 7125964934325514692 + merged_bubbles_20: -2380236732349941112 + merged_bubbles_21: 3190572435751321151 + merged_bubbles_22: -2215627461022531852 + merged_bubbles_23: 8948228704734903216 + merged_bubbles_24: -812150973538464185 + merged_bubbles_25: 7758123088985960232 + merged_bubbles_26: 4618414973646706749 + merged_bubbles_27: 4642203197574969396 + merged_bubbles_28: -6589670985594367339 + merged_bubbles_29: -4276400911275974721 + merged_bubbles_3: 7405403921300917983 + merged_bubbles_30: -744344631555223148 + merged_bubbles_31: 6523925393538697956 + merged_bubbles_32: 2470000859386256485 + merged_bubbles_33: 4597389370789623757 + merged_bubbles_34: -6588827225406199922 + merged_bubbles_35: -8835024631624960859 + merged_bubbles_36: 2450107861932479259 + merged_bubbles_37: -479245815465734307 + merged_bubbles_38: -1136810672641068528 + merged_bubbles_39: -4825365304802923012 + merged_bubbles_4: 2113468762949209401 + merged_bubbles_40: 9023266565263621147 + merged_bubbles_41: -7309434049115314197 + merged_bubbles_42: 3806408721388531034 + merged_bubbles_43: 3194782757838505180 + merged_bubbles_5: -5261983888436689670 + merged_bubbles_6: -3531956835503728512 + merged_bubbles_7: -8239362062694764933 + merged_bubbles_8: -8461393376890153661 + merged_bubbles_9: -8370838090843118386 + telescope_mask: -2444369143521968972 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/SubmergedUnity/Assets/Submerged/Minigames/BallastSabotage/Textures/BallastSabotageSpriteSheet.png.meta b/SubmergedUnity/Assets/Submerged/Minigames/BallastSabotage/Textures/BallastSabotageSpriteSheet.png.meta index 665274f9..8a60eb1c 100644 --- a/SubmergedUnity/Assets/Submerged/Minigames/BallastSabotage/Textures/BallastSabotageSpriteSheet.png.meta +++ b/SubmergedUnity/Assets/Submerged/Minigames/BallastSabotage/Textures/BallastSabotageSpriteSheet.png.meta @@ -30,7 +30,7 @@ TextureImporter: 213: -6186293244006965078 second: Up_Button externalObjects: {} - serializedVersion: 11 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -47,10 +47,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -59,9 +61,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -89,6 +91,8 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -100,6 +104,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -112,6 +117,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -316,9 +322,18 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: + Background: 2504170125896549414 + Bar_Lines: -8141407305535123508 + Blank_Bar: -4397111944667401460 + Blank_Bar+Lines: 7497130265081580285 + Blank_Bar2: -45987598856036630 + Blue_Bar: 3753491680628763912 + Down_Button: 3120425123844490332 + Highlighted_Bar_(Lighten Mode): 7944845075434221998 + Up_Button: -6186293244006965078 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/SubmergedUnity/Assets/Submerged/Minigames/CamsSabotage/Textures/CamsSabotageSpriteSheet.png.meta b/SubmergedUnity/Assets/Submerged/Minigames/CamsSabotage/Textures/CamsSabotageSpriteSheet.png.meta index 75b8e1bf..61118d5d 100644 --- a/SubmergedUnity/Assets/Submerged/Minigames/CamsSabotage/Textures/CamsSabotageSpriteSheet.png.meta +++ b/SubmergedUnity/Assets/Submerged/Minigames/CamsSabotage/Textures/CamsSabotageSpriteSheet.png.meta @@ -24,7 +24,7 @@ TextureImporter: 213: -4373715934217891380 second: Screen2 externalObjects: {} - serializedVersion: 11 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -41,10 +41,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -53,9 +55,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -83,6 +85,8 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -94,6 +98,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -106,6 +111,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -247,9 +253,15 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: + Back: -8137581963233685907 + On_Off_Button: 4988875199955456872 + Screen2: -4373715934217891380 + Slide: 1344797536127862686 + Slide_Switch: -180486496167727009 + Tube: -2634447172577902771 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/SubmergedUnity/Assets/Submerged/Minigames/CleanGlass/Textures/CleanGlassSpriteSheet.png.meta b/SubmergedUnity/Assets/Submerged/Minigames/CleanGlass/Textures/CleanGlassSpriteSheet.png.meta index 5a6abdd9..1fe77642 100644 --- a/SubmergedUnity/Assets/Submerged/Minigames/CleanGlass/Textures/CleanGlassSpriteSheet.png.meta +++ b/SubmergedUnity/Assets/Submerged/Minigames/CleanGlass/Textures/CleanGlassSpriteSheet.png.meta @@ -78,7 +78,7 @@ TextureImporter: 213: -1068678752406259797 second: Stain5_0 externalObjects: {} - serializedVersion: 11 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -95,10 +95,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -107,9 +109,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -137,6 +139,8 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -148,6 +152,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -160,6 +165,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -595,9 +601,29 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: + Background2: 3585075094346165510 + Border: -4095400071365676399 + Cloth: -8156673925844777607 + Stain1: -5159151613712771947 + Stain2: 8376325004759897596 + Stain3: -8635609086559005891 + Stain4: -2154746395134500023 + Stain5: 2767036777377281617 + animated-ruby_sparkle0001: -268480552333197661 + animated-ruby_sparkle0002: -975748568325775735 + animated-ruby_sparkle0003: 4632275834067673094 + animated-ruby_sparkle0004: 9040219373186783447 + animated-ruby_sparkle0005: 1723848395785938919 + animated-ruby_sparkle0006: -6942391397441351108 + animated-ruby_sparkle0007: 6520054924881894740 + animated-ruby_sparkle0008: -1551319244248397133 + animated-ruby_sparkle0009: 2479019740241603784 + animated-ruby_sparkle0010: -5869640958435759060 + animated-ruby_sparkle0011: -9132028556791094773 + animated-ruby_sparkle0012: 988546402864236648 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/SubmergedUnity/Assets/Submerged/Minigames/ClearUrchins/Textures/ClearUrchinsSpriteSheet.png.meta b/SubmergedUnity/Assets/Submerged/Minigames/ClearUrchins/Textures/ClearUrchinsSpriteSheet.png.meta index 76f702c5..5fc92364 100644 --- a/SubmergedUnity/Assets/Submerged/Minigames/ClearUrchins/Textures/ClearUrchinsSpriteSheet.png.meta +++ b/SubmergedUnity/Assets/Submerged/Minigames/ClearUrchins/Textures/ClearUrchinsSpriteSheet.png.meta @@ -51,7 +51,7 @@ TextureImporter: 213: -4832919141642818935 second: U_11 externalObjects: {} - serializedVersion: 11 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -68,10 +68,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -80,9 +82,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -110,6 +112,8 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -121,6 +125,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -133,6 +138,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -484,9 +490,25 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: + U_1: -2025972371982694430 + U_10: 346347767044520599 + U_11: -4832919141642818935 + U_2: -6384129593544478740 + U_3: -1680792986009665421 + U_4: -7748865169494307589 + U_5: 3052615473315302792 + U_6: -4447765762548091032 + U_7: -4849929026070216577 + U_8: -4087086230288157383 + U_9: -141020761844520143 + bar: -8568005151626139212 + base: 5280109439331579606 + pellet: -2834712627868119333 + shoot_base: -1315810525094876226 + shoot_rocket: -4838394514176739600 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/SubmergedUnity/Assets/Submerged/Minigames/CommsSabotage/Textures/CommsSabotageSpriteSheet.png.meta b/SubmergedUnity/Assets/Submerged/Minigames/CommsSabotage/Textures/CommsSabotageSpriteSheet.png.meta index 44980d23..249518a5 100644 --- a/SubmergedUnity/Assets/Submerged/Minigames/CommsSabotage/Textures/CommsSabotageSpriteSheet.png.meta +++ b/SubmergedUnity/Assets/Submerged/Minigames/CommsSabotage/Textures/CommsSabotageSpriteSheet.png.meta @@ -21,7 +21,7 @@ TextureImporter: 213: -1722502989187939081 second: comms_screen externalObjects: {} - serializedVersion: 11 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -38,10 +38,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -50,9 +52,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -80,6 +82,8 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -91,6 +95,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -103,6 +108,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -244,9 +250,15 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: + comms_dial: -5508232270269952508 + comms_light_green: -4171294389892937006 + comms_light_red: 2748191870597364059 + comms_panel: -7859427531180017450 + comms_reflection: 5044270562019501079 + comms_screen: -1722502989187939081 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/SubmergedUnity/Assets/Submerged/Minigames/CycleReactor/Textures/CycleReactorSpriteSheet.png.meta b/SubmergedUnity/Assets/Submerged/Minigames/CycleReactor/Textures/CycleReactorSpriteSheet.png.meta index b9a1a738..4602c619 100644 --- a/SubmergedUnity/Assets/Submerged/Minigames/CycleReactor/Textures/CycleReactorSpriteSheet.png.meta +++ b/SubmergedUnity/Assets/Submerged/Minigames/CycleReactor/Textures/CycleReactorSpriteSheet.png.meta @@ -27,7 +27,7 @@ TextureImporter: 213: -4072674430978728918 second: out_ring_highlight_shadow externalObjects: {} - serializedVersion: 11 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -44,10 +44,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -56,9 +58,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -86,6 +88,8 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -97,6 +101,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -109,6 +114,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -292,9 +298,17 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: + bar: -8568005151626139212 + bolts: 3479998388286868954 + cyclereactor_fullbar: 1428192632310400388 + dial: -4998690010817512396 + handle 1: 6806459649046229578 + inner ring: 6565020959317433364 + out_ring_flat: -8467484130404442509 + out_ring_highlight_shadow: -4072674430978728918 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/SubmergedUnity/Assets/Submerged/Minigames/DiagnoseElevators/Textures/DiagnoseElevatorsSpriteSheet.png.meta b/SubmergedUnity/Assets/Submerged/Minigames/DiagnoseElevators/Textures/DiagnoseElevatorsSpriteSheet.png.meta index f4dabc2e..3adbaf4e 100644 --- a/SubmergedUnity/Assets/Submerged/Minigames/DiagnoseElevators/Textures/DiagnoseElevatorsSpriteSheet.png.meta +++ b/SubmergedUnity/Assets/Submerged/Minigames/DiagnoseElevators/Textures/DiagnoseElevatorsSpriteSheet.png.meta @@ -99,7 +99,7 @@ TextureImporter: 213: 3585165839111352652 second: Ticket2 externalObjects: {} - serializedVersion: 11 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -116,10 +116,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -128,9 +130,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -158,6 +160,8 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -169,6 +173,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -181,6 +186,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -868,9 +874,41 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: + Base_Back: -4543555419946760460 + DiagnoseDoor2_01: 8101081864173048521 + DiagnoseDoor2_02: -1237119960684186650 + DiagnoseDoor2_03: -8933867527636504673 + DiagnoseDoor2_04: 3643000672816917428 + DiagnoseDoor2_05: -6860136125316798982 + DiagnoseDoor2_06: 1557701800019165973 + DiagnoseDoor2_07: -8271536535329424495 + DiagnoseDoor2_08: -6744465332097982303 + DiagnoseDoor2_09: 7576007203764538748 + DiagnoseDoor2_10: -89160517342632371 + DiagnoseDoor2_11: -3249262981152306627 + DiagnoseDoor2_12: -6930802295987255841 + DiagnoseDoor2_13: -3540080886079928731 + DiagnoseDoor2_14: 5220557380606002932 + DiagnoseDoor2_15: -4340823639768324049 + DiagnoseDoor2_16: -402550754799429388 + DiagnoseDoor2_17: 3961944066089558918 + DiagnoseDoor2_18: -8302150726190437095 + DiagnoseDoor2_19: -894428126473288738 + DiagnoseDoor2_20: -561673461812886985 + DiagnoseDoor2_21: -1132087515271113597 + DiagnoseDoor2_22: -5765024022301969386 + DiagnoseDoor2_23: 6228903259599779420 + DiagnoseDoor2_24: -5042681047787128211 + DiagnoseDoor2_25: 6582869869735435282 + DiagnoseDoor2_26: -1093913881135308090 + Diagnose_Button: 8973528545786387743 + Ticket: -4936889353348742911 + Ticket2: 3585165839111352652 + Ticket_dispenser_Full: -7323354658855041726 + Ticket_dispenser_Top: 3861960490497601522 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/SubmergedUnity/Assets/Submerged/Minigames/DispenseWater/Textures/DispenseWaterSpriteSheet.png.meta b/SubmergedUnity/Assets/Submerged/Minigames/DispenseWater/Textures/DispenseWaterSpriteSheet.png.meta index 550aa794..dbe49d2a 100644 --- a/SubmergedUnity/Assets/Submerged/Minigames/DispenseWater/Textures/DispenseWaterSpriteSheet.png.meta +++ b/SubmergedUnity/Assets/Submerged/Minigames/DispenseWater/Textures/DispenseWaterSpriteSheet.png.meta @@ -72,7 +72,7 @@ TextureImporter: 213: -337480500739870530 second: Dispenser externalObjects: {} - serializedVersion: 11 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -89,10 +89,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -101,9 +103,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -131,6 +133,8 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -142,6 +146,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -154,6 +159,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -631,9 +637,31 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: + Dispense Water Background: 8253991993545854664 + Dispense Water F1: 9168342557160216783 + Dispense Water F10: 3473410793954541567 + Dispense Water F11: 3360612119891053315 + Dispense Water F12: -4428875223126142312 + Dispense Water F13: -5925002283204181685 + Dispense Water F2: -8503173303653004132 + Dispense Water F3: 7943492988416038808 + Dispense Water F4: -912755471213662675 + Dispense Water F5: 8548394577676694280 + Dispense Water F6: -7862267500943128293 + Dispense Water F7: 8490581442140254107 + Dispense Water F8x: -4509417311905647326 + Dispense Water F9x: -3113161118448539320 + Dispenser: -337480500739870530 + bottle: 6587758831544789272 + button: 8636877481111216802 + cap: 289380581595770655 + green_button: 3496921770934414464 + polusnode: -3577706003054347015 + sub1: -4837718387389563259 + sub2: -6083887856592087137 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/SubmergedUnity/Assets/Submerged/Minigames/DoorSabotage/Textures/DoorSabotageSpriteSheet.png.meta b/SubmergedUnity/Assets/Submerged/Minigames/DoorSabotage/Textures/DoorSabotageSpriteSheet.png.meta index dc04044c..942321ae 100644 --- a/SubmergedUnity/Assets/Submerged/Minigames/DoorSabotage/Textures/DoorSabotageSpriteSheet.png.meta +++ b/SubmergedUnity/Assets/Submerged/Minigames/DoorSabotage/Textures/DoorSabotageSpriteSheet.png.meta @@ -15,7 +15,7 @@ TextureImporter: 213: -4746564685177126027 second: Handle externalObjects: {} - serializedVersion: 11 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -32,10 +32,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -44,9 +46,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -74,6 +76,8 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -85,6 +89,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -97,6 +102,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -196,9 +202,13 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: + Background2: 3585075094346165510 + Error Screen: 978867258798672692 + Finished Screen: -1512829098130029707 + Handle: -4746564685177126027 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/SubmergedUnity/Assets/Submerged/Minigames/Emergency/Textures/EmergencySpriteSheet.png.meta b/SubmergedUnity/Assets/Submerged/Minigames/Emergency/Textures/EmergencySpriteSheet.png.meta index 21704cac..35969bd8 100644 --- a/SubmergedUnity/Assets/Submerged/Minigames/Emergency/Textures/EmergencySpriteSheet.png.meta +++ b/SubmergedUnity/Assets/Submerged/Minigames/Emergency/Textures/EmergencySpriteSheet.png.meta @@ -21,7 +21,7 @@ TextureImporter: 213: 21300010 second: meeting_textBubble externalObjects: {} - serializedVersion: 11 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -38,10 +38,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -80,6 +82,8 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -91,6 +95,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -103,6 +108,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -375,9 +381,15 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: + meeting_base: 21300000 + meeting_baseFront: 21300002 + meeting_button: 21300004 + meeting_closed: 21300006 + meeting_open: 21300008 + meeting_textBubble: 21300010 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/SubmergedUnity/Assets/Submerged/Minigames/FeedPetFish/Textures/FeedPetFishSpriteSheet.png.meta b/SubmergedUnity/Assets/Submerged/Minigames/FeedPetFish/Textures/FeedPetFishSpriteSheet.png.meta index 9569df68..7b8f4402 100644 --- a/SubmergedUnity/Assets/Submerged/Minigames/FeedPetFish/Textures/FeedPetFishSpriteSheet.png.meta +++ b/SubmergedUnity/Assets/Submerged/Minigames/FeedPetFish/Textures/FeedPetFishSpriteSheet.png.meta @@ -87,7 +87,7 @@ TextureImporter: 213: -7916417403202975446 second: pellets_7 externalObjects: {} - serializedVersion: 11 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -104,10 +104,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -116,9 +118,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -146,6 +148,8 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -157,6 +161,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -169,6 +174,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -772,9 +778,37 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: + Background: 2504170125896549414 + Coral1: -2899643205691146210 + Coral2: -7252777416408589876 + Coral3: -343216023190630068 + Coral4: 3625887988084286973 + Coral5: -2564246992603645817 + Coral6: -7898340051818262967 + Coral7: 2918791816090377115 + Fish_Tank_Border: -3824077676791309801 + food_adorabilis: -2922959606744580417 + food_alien: 1697847577519342747 + food_cuttlefish: 7177831271013337256 + food_puffer: 7484117282818981389 + food_seahorse: 4190482606033771521 + pellets_0: 6420217812981636162 + pellets_1: -1216135137466171601 + pellets_2: -696812247203677383 + pellets_3: -132293140373863899 + pellets_4: 8390847624714261377 + pellets_5: 8411219054850860440 + pellets_6: -7395648560644144910 + pellets_7: -7916417403202975446 + pet_adorabilis: -3109591011376492478 + pet_alien: 3533539831494831376 + pet_cuttlefish1: -3625744003804793667 + pet_cuttlefish2: 815932580072638991 + pet_puffer: 1286808096194613562 + pet_seahorse: 6320777637106954402 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/SubmergedUnity/Assets/Submerged/Minigames/FixWiring/Textures/FixWiringSpriteSheet4.png.meta b/SubmergedUnity/Assets/Submerged/Minigames/FixWiring/Textures/FixWiringSpriteSheet4.png.meta index 7459752a..abac29e8 100644 --- a/SubmergedUnity/Assets/Submerged/Minigames/FixWiring/Textures/FixWiringSpriteSheet4.png.meta +++ b/SubmergedUnity/Assets/Submerged/Minigames/FixWiring/Textures/FixWiringSpriteSheet4.png.meta @@ -39,7 +39,7 @@ TextureImporter: 213: 21300022 second: wireicons0002 externalObjects: {} - serializedVersion: 11 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -56,10 +56,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -98,6 +100,8 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -109,6 +113,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -121,6 +126,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -512,9 +518,21 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: + electricity_wires1: 21300006 + electricity_wires2: 21300008 + electricity_wires3: 21300010 + electricity_wiresBase: 21300020 + electricity_wiresBase1: 21300012 + electricity_wiresBase2: 21300014 + electricity_wiresBase3: 21300016 + electricity_wiresBaseBack: 21300018 + wireicons0001: 21300004 + wireicons0002: 21300022 + wireicons0003: 21300000 + wireicons0004: 21300002 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/SubmergedUnity/Assets/Submerged/Minigames/FixWiring/Textures/FixWiringSpriteSheet8.png.meta b/SubmergedUnity/Assets/Submerged/Minigames/FixWiring/Textures/FixWiringSpriteSheet8.png.meta index 748c63db..911118f5 100644 --- a/SubmergedUnity/Assets/Submerged/Minigames/FixWiring/Textures/FixWiringSpriteSheet8.png.meta +++ b/SubmergedUnity/Assets/Submerged/Minigames/FixWiring/Textures/FixWiringSpriteSheet8.png.meta @@ -42,7 +42,7 @@ TextureImporter: 213: -4346436968287310895 second: Wires_Star externalObjects: {} - serializedVersion: 11 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -59,10 +59,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -71,9 +73,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -101,6 +103,8 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -112,6 +116,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -124,6 +129,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -412,9 +418,22 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: + WiresCross: 7296756716682382038 + WiresExtremeBase: -4486726923595638901 + WiresExtreme_8: -368725636635804991 + WiresExtreme_Copper1: 4678678039724262510 + WiresExtreme_Copper2: 4670762118221190951 + WiresExtreme_Copper3: 3484374167629911476 + Wires_Circle: 2810419720939875217 + Wires_Clover: 8655994672405443970 + Wires_Heart: -5608680710446089031 + Wires_Rhobmus: -6150522392839181525 + Wires_Spade: 4684950980906108963 + Wires_Star: -4346436968287310895 + Wires_Triangle: 1509470306981239324 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/SubmergedUnity/Assets/Submerged/Minigames/Generic/Textures/Buttons2.png.meta b/SubmergedUnity/Assets/Submerged/Minigames/Generic/Textures/Buttons2.png.meta index 2bbca446..7c8ac0f8 100644 --- a/SubmergedUnity/Assets/Submerged/Minigames/Generic/Textures/Buttons2.png.meta +++ b/SubmergedUnity/Assets/Submerged/Minigames/Generic/Textures/Buttons2.png.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: 8ad37d0898ae7ee419ec25e31026e56f -timeCreated: 1614007712 -licenseType: Free TextureImporter: internalIDToNameTable: - first: @@ -98,8 +96,7 @@ TextureImporter: 213: 21300060 second: quit externalObjects: {} - usedFileIDs: [] - serializedVersion: 11 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -116,9 +113,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -150,10 +150,15 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -165,6 +170,20 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -216,7 +235,7 @@ TextureImporter: spriteID: 7e51aa0640254eebacd36e1b64e7a67a internalID: 21300000 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -261,7 +280,7 @@ TextureImporter: spriteID: 6a0dec53449e495aa4ac7b47223bd3af internalID: 21300002 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -307,7 +326,7 @@ TextureImporter: spriteID: 0c31ad86c39f4a5b813e446614352bc6 internalID: 21300004 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -341,7 +360,7 @@ TextureImporter: spriteID: 09e20692dc554f739fdda98730a6a709 internalID: 21300006 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -375,7 +394,7 @@ TextureImporter: spriteID: 42c11896396349afb5d35d8a7ff8b74b internalID: 21300008 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -409,7 +428,7 @@ TextureImporter: spriteID: cefc509fcbd5472e81b99b4f91b1c185 internalID: 21300010 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -443,7 +462,7 @@ TextureImporter: spriteID: a15f311f9622449daf528fd144065dbf internalID: 21300012 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -477,7 +496,7 @@ TextureImporter: spriteID: 3cf6900ef35f40829367d5105d4db413 internalID: 21300014 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -511,7 +530,7 @@ TextureImporter: spriteID: 81a5be82a1e94baca06d08312721ce32 internalID: 21300016 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -563,7 +582,7 @@ TextureImporter: spriteID: 53685c6d4e4944d8899ab24796c5ad19 internalID: 21300018 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -610,7 +629,7 @@ TextureImporter: spriteID: fe9106ff2a794994ac5660dc055cded1 internalID: 21300020 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -652,7 +671,7 @@ TextureImporter: spriteID: 7a2d97d839f74bd48e651853b9bec848 internalID: 21300022 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -691,7 +710,7 @@ TextureImporter: spriteID: 2e7562fb448142daa44b9ce595965f6d internalID: 21300024 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -720,7 +739,7 @@ TextureImporter: spriteID: 2d1efedc2e634325a3ba74785af553a4 internalID: 21300026 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -751,7 +770,7 @@ TextureImporter: spriteID: 438ce7dff9204b9fa721b0f34456d82e internalID: 21300028 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -785,7 +804,7 @@ TextureImporter: spriteID: 3a7759b152f34db992df7987439533d8 internalID: 21300030 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -818,7 +837,7 @@ TextureImporter: spriteID: a0836693eeab4dc9bbfd73821c6598c5 internalID: 21300032 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -862,7 +881,7 @@ TextureImporter: spriteID: 0d9c95765d22447c85e6033197950449 internalID: 21300034 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -896,7 +915,7 @@ TextureImporter: spriteID: 04196dba2601473da878d9d773194859 internalID: 21300036 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -954,7 +973,7 @@ TextureImporter: spriteID: d942a68c9f644d378be4cc4e0d279e13 internalID: 21300038 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -998,7 +1017,7 @@ TextureImporter: spriteID: 0146f0250e754741bdd1d978a1d30e9d internalID: 21300040 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -1032,7 +1051,7 @@ TextureImporter: spriteID: 85e0ff4965ec48dda0b2ad26fdae88bf internalID: 21300042 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -1099,7 +1118,7 @@ TextureImporter: spriteID: f7ddee5ee4de41269051adb89cdff345 internalID: 21300044 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -1133,7 +1152,7 @@ TextureImporter: spriteID: 8651af51e98b4bd8a187a7a48f35806f internalID: 21300046 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -1175,7 +1194,7 @@ TextureImporter: spriteID: 3ffa782afe1c4cc68988164909b72a6d internalID: 21300048 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -1206,7 +1225,7 @@ TextureImporter: spriteID: 387ef8c8b6c841509bff053639b376a2 internalID: 21300050 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -1237,7 +1256,7 @@ TextureImporter: spriteID: bf339ba222f941e3af9500c12110aa94 internalID: 21300052 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -1266,7 +1285,7 @@ TextureImporter: spriteID: 3609efeb38d74915a1a1d85f17b16ca9 internalID: 21300054 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -1300,7 +1319,7 @@ TextureImporter: spriteID: 153a234df4d543a79357747ac569b1e8 internalID: 21300056 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -1368,7 +1387,7 @@ TextureImporter: spriteID: 45b356fe038f408b8f0f610e7536d79e internalID: 21300058 vertices: [] - indices: + indices: edges: [] weights: [] - serializedVersion: 2 @@ -1440,22 +1459,53 @@ TextureImporter: spriteID: 89e7eae1c2e946c9a5f29f46e38f1fc5 internalID: 21300060 vertices: [] - indices: + indices: edges: [] weights: [] outline: [] physicsShape: [] bones: [] - spriteID: + spriteID: internalID: 0 vertices: [] - indices: + indices: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: + buttonClick: 21300026 + buttonEnterText: 21300028 + closeButton: 21300006 + customize: 21300024 + doorlogMIRA: 21300000 + help: 21300056 + killButton: 21300034 + mapAdmin: 21300020 + mapAdminMIRA: 21300002 + mapAdminPolus: 21300004 + mapButtonDark: 21300036 + playAgain: 21300058 + privateGame: 21300050 + progress_bar: 21300054 + publicGame: 21300052 + quit: 21300060 + reportButton: 21300038 + sabotage: 21300040 + sabotage_Doors: 21300010 + sabotage_O2: 21300014 + sabotage_comms: 21300008 + sabotage_electricity: 21300012 + sabotage_reactor: 21300016 + security: 21300022 + settingsButton: 21300042 + startButton: 21300044 + statsButton: 21300030 + task: 21300018 + useButton: 21300046 + vent: 21300048 + vitalsPolus: 21300032 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: + userData: + assetBundleName: + assetBundleVariant: diff --git a/SubmergedUnity/Assets/Submerged/Minigames/Generic/Textures/ButtonsSpriteSheet.png.meta b/SubmergedUnity/Assets/Submerged/Minigames/Generic/Textures/ButtonsSpriteSheet.png.meta index 1920fe21..4003cfaf 100644 --- a/SubmergedUnity/Assets/Submerged/Minigames/Generic/Textures/ButtonsSpriteSheet.png.meta +++ b/SubmergedUnity/Assets/Submerged/Minigames/Generic/Textures/ButtonsSpriteSheet.png.meta @@ -96,7 +96,7 @@ TextureImporter: 213: 21300060 second: quit externalObjects: {} - serializedVersion: 11 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -113,10 +113,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -155,6 +157,8 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -166,6 +170,20 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -1454,9 +1472,40 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: + buttonClick: 21300026 + buttonEnterText: 21300028 + closeButton: 21300006 + customize: 21300024 + doorlogMIRA: 21300000 + help: 21300056 + killButton: 21300034 + mapAdmin: 21300020 + mapAdminMIRA: 21300002 + mapAdminPolus: 21300004 + mapButtonDark: 21300036 + playAgain: 21300058 + privateGame: 21300050 + progress_bar: 21300054 + publicGame: 21300052 + quit: 21300060 + reportButton: 21300038 + sabotage: 21300040 + sabotage_Doors: 21300010 + sabotage_O2: 21300014 + sabotage_comms: 21300008 + sabotage_electricity: 21300012 + sabotage_reactor: 21300016 + security: 21300022 + settingsButton: 21300042 + startButton: 21300044 + statsButton: 21300030 + task: 21300018 + useButton: 21300046 + vent: 21300048 + vitalsPolus: 21300032 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/SubmergedUnity/Assets/Submerged/Minigames/IdentifySpecimen/Textures/IdentifySpecimenSpriteSheet.png.meta b/SubmergedUnity/Assets/Submerged/Minigames/IdentifySpecimen/Textures/IdentifySpecimenSpriteSheet.png.meta index 541b46b3..14258c7b 100644 --- a/SubmergedUnity/Assets/Submerged/Minigames/IdentifySpecimen/Textures/IdentifySpecimenSpriteSheet.png.meta +++ b/SubmergedUnity/Assets/Submerged/Minigames/IdentifySpecimen/Textures/IdentifySpecimenSpriteSheet.png.meta @@ -51,7 +51,7 @@ TextureImporter: 213: 8132272295465562854 second: Squid externalObjects: {} - serializedVersion: 11 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -68,10 +68,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -80,9 +82,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -110,6 +112,8 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -121,6 +125,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -133,6 +138,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -484,9 +490,25 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: + Adorabilis: 2800095543024830292 + Clipboard_Blank: 350688425205415953 + Cuttlefish_clipboard: -6003806029119341572 + Eel: 4353530699513520699 + Eel_clipboard: -1078832268928138792 + Jellyfish: 7458148105255658039 + NewBackground: -1445924745908804321 + Octopus: -4085504982912277256 + Puffer_Urchin: -6831546850801438773 + Sea_Cucumber_thing: -2526030202549907469 + Seacucumber_clipboard: -6535967726246633289 + Squid: 8132272295465562854 + adorabilis_clipboard: -5170173403294790541 + jellyfish_clipboard: 1381310551970725062 + octopus_clipboard: -1298618930966669848 + puffer_clipboard: -3150148568284958815 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/SubmergedUnity/Assets/Submerged/Minigames/LocateVolcanicActivity/Textures/LocateVolcanicActivitySpriteSheet.png.meta b/SubmergedUnity/Assets/Submerged/Minigames/LocateVolcanicActivity/Textures/LocateVolcanicActivitySpriteSheet.png.meta index 7a2bbce0..0ade2d30 100644 --- a/SubmergedUnity/Assets/Submerged/Minigames/LocateVolcanicActivity/Textures/LocateVolcanicActivitySpriteSheet.png.meta +++ b/SubmergedUnity/Assets/Submerged/Minigames/LocateVolcanicActivity/Textures/LocateVolcanicActivitySpriteSheet.png.meta @@ -30,7 +30,7 @@ TextureImporter: 213: 4982491731180491307 second: Seismic_Volcano Overlay externalObjects: {} - serializedVersion: 11 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -47,10 +47,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -59,9 +61,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -89,6 +91,8 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -100,6 +104,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -112,6 +117,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -295,9 +301,17 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: + Seismic_Frame: -4481603066149591591 + Seismic_Lava: 4212884957037177903 + Seismic_Lineart_On: 4327931496171104996 + Seismic_Overlay: -4853138122553668193 + Seismic_Target: 8945749697819543335 + Seismic_Text_Off: -6673891225312091035 + Seismic_Text_On: 4744317355138237201 + Seismic_Volcano: -1755439789366368543 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/SubmergedUnity/Assets/Submerged/Minigames/MicrowaveLunch/Textures/MicrowaveLunchSpriteSheet.png.meta b/SubmergedUnity/Assets/Submerged/Minigames/MicrowaveLunch/Textures/MicrowaveLunchSpriteSheet.png.meta index ba1b518d..08df00de 100644 --- a/SubmergedUnity/Assets/Submerged/Minigames/MicrowaveLunch/Textures/MicrowaveLunchSpriteSheet.png.meta +++ b/SubmergedUnity/Assets/Submerged/Minigames/MicrowaveLunch/Textures/MicrowaveLunchSpriteSheet.png.meta @@ -72,7 +72,7 @@ TextureImporter: 213: 754840452542730952 second: screen_overlay externalObjects: {} - serializedVersion: 12 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -89,10 +89,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -131,6 +133,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 cookieLightType: 1 platformSettings: - serializedVersion: 3 @@ -143,6 +146,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -155,6 +159,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -653,9 +658,32 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: + MicrowaveLight: 2330403076606801535 + OpenDoor: 6547299590817294874 + food1_egg: 1359453621712661944 + food2_fish: 5292281210610355178 + food3_quiche: -1987506512888402790 + food4_sandwhich: -4797833381070574131 + food5_pizza: 2069280361065480784 + microwave_base: -3990605353784605719 + notes_with_shadow: -8487744055056290006 + numpad_0: 1883278411930941159 + numpad_1: -1917747596969493677 + numpad_2: 6540325066721126549 + numpad_3: 8003209083917769180 + numpad_4: 422971247930945588 + numpad_5: 4379296231024758635 + numpad_6: -2432242856874169634 + numpad_7: 5198890010214433452 + numpad_8: 4543346232417244258 + numpad_9: -1740938177792246743 + numpad_clear: 1376690927559897554 + numpad_cook: 1834388824180171532 + plate: 586189491108521247 + screen_overlay: 754840452542730952 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/SubmergedUnity/Assets/Submerged/Minigames/MopPuddles/Textures/MopPuddlesSpriteSheet.png.meta b/SubmergedUnity/Assets/Submerged/Minigames/MopPuddles/Textures/MopPuddlesSpriteSheet.png.meta index 0d6f731d..dc5e8552 100644 --- a/SubmergedUnity/Assets/Submerged/Minigames/MopPuddles/Textures/MopPuddlesSpriteSheet.png.meta +++ b/SubmergedUnity/Assets/Submerged/Minigames/MopPuddles/Textures/MopPuddlesSpriteSheet.png.meta @@ -69,7 +69,7 @@ TextureImporter: 213: -1101192720393940257 second: puddle7 externalObjects: {} - serializedVersion: 11 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -86,10 +86,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -98,9 +100,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -128,6 +130,8 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -139,6 +143,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -151,6 +156,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -628,9 +634,31 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: + 1: -2374222918679686493 + 2: -761933863725385812 + 3: -5906598218874874896 + 4: -1816755548282093316 + Bucket_1: 949185140388405158 + Bucket_2: -6256017313231689475 + Bucket_water_sorryugottamask: -581647557964234878 + Mop Puddle LD Filtration: -1752381820872662760 + Mop Puddle LD Halls: 8025427438337525227 + Mop Puddle LD Storage: 3642733526074406515 + Mop Puddle UD Admin: -8100960167944144491 + Mop Puddle UD Comms: 3529356234137455610 + bucket shadow: 2122068693196875397 + mop: 4246452032700133501 + mop_soaked: 5559365761576847822 + puddle1: 5232941047700551359 + puddle2: -972795382094903561 + puddle3: -1633790777925783273 + puddle4: 2938264369100021353 + puddle5: -8462323282813097764 + puddle6: -4776148068956320770 + puddle7: -1101192720393940257 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/SubmergedUnity/Assets/Submerged/Minigames/OxygenSabotage/Textures/OxygenSabotageSpriteSheet.png.meta b/SubmergedUnity/Assets/Submerged/Minigames/OxygenSabotage/Textures/OxygenSabotageSpriteSheet.png.meta index 6c54df2f..955b25ae 100644 --- a/SubmergedUnity/Assets/Submerged/Minigames/OxygenSabotage/Textures/OxygenSabotageSpriteSheet.png.meta +++ b/SubmergedUnity/Assets/Submerged/Minigames/OxygenSabotage/Textures/OxygenSabotageSpriteSheet.png.meta @@ -21,7 +21,7 @@ TextureImporter: 213: -1077204897836241716 second: OxygenWindow externalObjects: {} - serializedVersion: 11 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -38,10 +38,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -50,9 +52,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -80,6 +82,8 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -91,6 +95,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -103,6 +108,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -244,9 +250,15 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: + OxygenBorder: -1049025427561787 + OxygenBox: 2713261539646714166 + OxygenDrawing: 3182267969326919888 + OxygenHook: 6492039697305254711 + OxygenMask: 2000207512990251199 + OxygenWindow: -1077204897836241716 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/SubmergedUnity/Assets/Submerged/Minigames/OxygenateSeaPlants/Textures/OxygenateSeaPlantsSpriteSheet.png.meta b/SubmergedUnity/Assets/Submerged/Minigames/OxygenateSeaPlants/Textures/OxygenateSeaPlantsSpriteSheet.png.meta index be3ab615..e95ca851 100644 --- a/SubmergedUnity/Assets/Submerged/Minigames/OxygenateSeaPlants/Textures/OxygenateSeaPlantsSpriteSheet.png.meta +++ b/SubmergedUnity/Assets/Submerged/Minigames/OxygenateSeaPlants/Textures/OxygenateSeaPlantsSpriteSheet.png.meta @@ -180,7 +180,7 @@ TextureImporter: 213: 3379440171204741469 second: leaves-blue-fourty externalObjects: {} - serializedVersion: 11 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -197,10 +197,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -209,9 +211,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -239,6 +241,8 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -250,6 +254,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -262,6 +267,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -1243,9 +1249,55 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: + 3: -5906598218874874896 + Mask: 7577328287588368852 + large bubble: 5317198810508956700 + leaves-blue-30: -4976781088351940102 + leaves-blue-31: 5508728442367249747 + leaves-blue-33: -1016672183516259596 + leaves-blue-34: -7734120828906648591 + leaves-blue-35: 4268719932210616541 + leaves-blue-36: 613056519741406207 + leaves-blue-38: -5443816861360658961 + leaves-blue-39: -7885396918762293290 + leaves-blue-40: 5981823102217710604 + leaves-blue-41: 6384549027398600181 + leaves-blue-42: -6741031469402078177 + leaves-blue-43: 5583495545414882964 + leaves-blue-44: -4288968980279944777 + leaves-blue-45: 5651277298994296907 + leaves-orange (coral)-29: 4909685460786868887 + leaves-pink-0: 6060896873289210561 + leaves-pink-1: -5805833966463038899 + leaves-pink-3: 8230534248635012929 + leaves-pink-4: -776827408951699301 + leaves-pink-5: 1496430503208331175 + leaves-pink-6: 2679942889745755296 + leaves-pink-7: -2876653300991915314 + leaves-pink-8: -1740824974707560542 + leaves-red-10: 4303074128139079139 + leaves-red-12: -3068914884961358220 + leaves-red-13: -3585588636109899944 + leaves-red-14: -8668793934346031120 + leaves-red-15: -5442449174220472797 + leaves-red-16: 935042434882190446 + leaves-red-17: -2866105519452246384 + leaves-rocks-20: 8618176085021092083 + leaves-rocks-22: -8610775606724886917 + leaves-rocks-23: -2660784063603235896 + leaves-rocks-24: -5121040252478310317 + leaves-rocks-25: -7068986478211825606 + leaves-rocks-26: 681566262939242351 + slugs-1: -3458164701437699323 + slugs-2: 6287282234902807395 + slugs-3: -8782756088585641992 + slugs-4: 3160919888767973480 + slugs-5: -953587664869449038 + slugs-6: -3372607870414496874 + tank: 7102320439997365052 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/SubmergedUnity/Assets/Submerged/Minigames/PlugLeaks/Textures/PlugLeaksSpriteSheet.png.meta b/SubmergedUnity/Assets/Submerged/Minigames/PlugLeaks/Textures/PlugLeaksSpriteSheet.png.meta index b1ebcca4..65fc19f4 100644 --- a/SubmergedUnity/Assets/Submerged/Minigames/PlugLeaks/Textures/PlugLeaksSpriteSheet.png.meta +++ b/SubmergedUnity/Assets/Submerged/Minigames/PlugLeaks/Textures/PlugLeaksSpriteSheet.png.meta @@ -63,7 +63,7 @@ TextureImporter: 213: -1090456798525440410 second: side water2 externalObjects: {} - serializedVersion: 11 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -80,10 +80,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -92,9 +94,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -122,6 +124,8 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -133,6 +137,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -145,6 +150,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -580,9 +586,29 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: + Background-JUSTBorder: -8486776931064369311 + Ballast: -1669156557132070265 + Electrical: -4470525988378299583 + Engines: -6897654208278604644 + LD South Hallway: -4103351566956501863 + Research: 1220062032025483318 + Ripped_Wallpaper: 7108897272497411001 + Tape: 4684778295006514797 + Tape_strip2: -2916854021560296640 + The_Crack: -3313281168457070402 + The_Leak_Itself: 3031728488696427385 + UpperLobby: -5885106487477733295 + Wallpaper_Shading: -6310003752929285919 + isthiswhatumeanbytopcrack: 5426812559106013986 + nose water: -797182689435518436 + nose water2: 9137607433057736077 + nose water3: -6133640425006083553 + othersidewater: 119485140497193659 + side water1: -7792869140584401967 + side water2: -1090456798525440410 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/SubmergedUnity/Assets/Submerged/Minigames/PurchaseBreakfast/Textures/Numbers.png.meta b/SubmergedUnity/Assets/Submerged/Minigames/PurchaseBreakfast/Textures/Numbers.png.meta index d05cfe30..f2f823ed 100644 --- a/SubmergedUnity/Assets/Submerged/Minigames/PurchaseBreakfast/Textures/Numbers.png.meta +++ b/SubmergedUnity/Assets/Submerged/Minigames/PurchaseBreakfast/Textures/Numbers.png.meta @@ -33,7 +33,7 @@ TextureImporter: 213: 849386610096671516 second: 9 externalObjects: {} - serializedVersion: 11 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -50,10 +50,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -62,9 +64,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -92,6 +94,8 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -103,6 +107,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -115,6 +120,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -241,7 +247,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: bf56f720d86fb1a00800000000000000 - internalID: 728446850243192315 + internalID: 6967745887157389618 vertices: [] indices: edges: [] @@ -262,7 +268,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 35ae272d56393e640800000000000000 - internalID: 5108088467900000851 + internalID: 728446850243192315 vertices: [] indices: edges: [] @@ -340,9 +346,19 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: + 0: -6629531029891648246 + 1: -4217592887472625829 + 2: -4412911677491635961 + 3: -6395529614303463221 + 4: -4417143251372694878 + 5: 728446850243192315 + 6: 6967745887157389618 + 7: -519400735672398794 + 8: -1344653293438560547 + 9: 849386610096671516 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/SubmergedUnity/Assets/Submerged/Minigames/PurchaseBreakfast/Textures/PurchaseBreakfastSpriteSheet.png.meta b/SubmergedUnity/Assets/Submerged/Minigames/PurchaseBreakfast/Textures/PurchaseBreakfastSpriteSheet.png.meta index ade98aca..5759eb0b 100644 --- a/SubmergedUnity/Assets/Submerged/Minigames/PurchaseBreakfast/Textures/PurchaseBreakfastSpriteSheet.png.meta +++ b/SubmergedUnity/Assets/Submerged/Minigames/PurchaseBreakfast/Textures/PurchaseBreakfastSpriteSheet.png.meta @@ -105,7 +105,7 @@ TextureImporter: 213: -4156861092360618709 second: Trays_front externalObjects: {} - serializedVersion: 11 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -122,10 +122,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -134,9 +136,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -164,6 +166,8 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -175,6 +179,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -187,6 +192,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -916,9 +922,43 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: + 3 cards: 4259662049211489943 + 3 holders: -2362804172835250619 + Background-no cards: 878604302108316537 + Bill_1: -6647930735968547094 + Bill_10: -7316159446545449961 + Bill_20: -7192196318835403891 + Bill_5: -8242738594451165317 + Leafling-1-fork: 2098569757100432506 + Leafling-2: -6569444433886026930 + Leafling-3: 4331361383796175435 + Leafling-4: -2599829655396062324 + Minus: 5049892332096998598 + Money_sign: 5018245044114003449 + Pastries-Bagel: 2889116143424084155 + Pastries-Bagels: -4373340367274576989 + Pastries-Danish: 9161776533378679986 + Pastries-Danishes: 3363016107901244212 + Pastries-Muffin: -7909916158107125996 + Pastries-Muffins: -5481807000225736389 + Pastries-Tarts: 6288661627603470976 + Pastries-chococroissant: -3740776717818392997 + Pastries-chococroissants: -3340978534305921950 + Pastries-cinnamon: 1303813914404328665 + Pastries-cinnamons: 2405804406452409521 + Pastries-crabbread: 1366251386277777930 + Pastries-crabbreads: 2647971044766211029 + Pastries-rollcake: -6327827296612195106 + Pastries-rollcakes: -8347381244276217438 + Pastries-tart: 6544436694207873127 + Screen: 7873598928253601160 + Trays: -17618783700799211 + Trays_front: -4156861092360618709 + specials card+shadow: -2033128496776165338 + specials holder: -5847163875439050953 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/SubmergedUnity/Assets/Submerged/Minigames/ReconnectPiping/Textures/ReconnectPipingSpriteSheet.png.meta b/SubmergedUnity/Assets/Submerged/Minigames/ReconnectPiping/Textures/ReconnectPipingSpriteSheet.png.meta index 19a766dc..312abaaf 100644 --- a/SubmergedUnity/Assets/Submerged/Minigames/ReconnectPiping/Textures/ReconnectPipingSpriteSheet.png.meta +++ b/SubmergedUnity/Assets/Submerged/Minigames/ReconnectPiping/Textures/ReconnectPipingSpriteSheet.png.meta @@ -18,7 +18,7 @@ TextureImporter: 213: -3933006741878524770 second: valve externalObjects: {} - serializedVersion: 11 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -35,10 +35,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -47,9 +49,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -77,6 +79,8 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -88,6 +92,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -100,6 +105,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -220,9 +226,14 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: + needle: -2885745162627447082 + pipe_elbow: -3688579079893159757 + pipe_straight: 5794214217946894795 + reconnect_piping_background: -6880061198194489038 + valve: -3933006741878524770 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/SubmergedUnity/Assets/Submerged/Minigames/ResetBreakers/Textures/ResetBreakersSpriteSheet.png.meta b/SubmergedUnity/Assets/Submerged/Minigames/ResetBreakers/Textures/ResetBreakersSpriteSheet.png.meta index cfbcfb03..20f1a65c 100644 --- a/SubmergedUnity/Assets/Submerged/Minigames/ResetBreakers/Textures/ResetBreakersSpriteSheet.png.meta +++ b/SubmergedUnity/Assets/Submerged/Minigames/ResetBreakers/Textures/ResetBreakersSpriteSheet.png.meta @@ -120,7 +120,7 @@ TextureImporter: 213: 2261861439786629593 second: Numerics_9 externalObjects: {} - serializedVersion: 11 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -137,10 +137,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -149,9 +151,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -179,6 +181,8 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -190,6 +194,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -202,6 +207,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -1036,9 +1042,48 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: + Alphabet_A: 1436257492963854593 + Alphabet_B: 7090254869336543421 + Alphabet_C: -961134702702882796 + Alphabet_D: 7401378962522552950 + Alphabet_E: 7639694025435774109 + Alphabet_F: 8498252264533710309 + Alphabet_G: -1824711354384918746 + Alphabet_H: 4318496237948587906 + Alphabet_I: -7619223600206397044 + Alphabet_J: -3089087821736039375 + Alphabet_K: 2103090359077008927 + Alphabet_L: -1758964796699454595 + Alphabet_M: -3321684509537479571 + Alphabet_N: 4654545418180118971 + Alphabet_O: -5283012189605682436 + Alphabet_P: -5028200748246998498 + Alphabet_Q: -774197663890800287 + Alphabet_R: -9189113202205365230 + Alphabet_S: 3909179532137086022 + Alphabet_T: 3046750949132728539 + Alphabet_U: -2123181943228866784 + Alphabet_V: -3011487546740019000 + Alphabet_W: -3438165978943944257 + Alphabet_X: -3413250858302694606 + Alphabet_Y: 166512522392948126 + Alphabet_Z: -699071324918184698 + Circuit Breaker: 3247574082852552417 + Circuit-Breaker-Switch_OFF: 7531292786945903219 + Circuit-Breaker-Switch_ON: 4039590925586684930 + Numerics_0: 949596039761129043 + Numerics_1: 4709021591416514729 + Numerics_2: -5829026820719573456 + Numerics_3: -4510844502509349724 + Numerics_4: -8392088176087304576 + Numerics_5: 5032373578287086970 + Numerics_6: 8318414034146138955 + Numerics_7: -1214362200822241391 + Numerics_8: -3185559605715944297 + Numerics_9: 2261861439786629593 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/SubmergedUnity/Assets/Submerged/Minigames/ReshelveBooks/Textures/ReshelveBooksSpriteSheet.png.meta b/SubmergedUnity/Assets/Submerged/Minigames/ReshelveBooks/Textures/ReshelveBooksSpriteSheet.png.meta index e3a8e136..3986f264 100644 --- a/SubmergedUnity/Assets/Submerged/Minigames/ReshelveBooks/Textures/ReshelveBooksSpriteSheet.png.meta +++ b/SubmergedUnity/Assets/Submerged/Minigames/ReshelveBooks/Textures/ReshelveBooksSpriteSheet.png.meta @@ -54,7 +54,7 @@ TextureImporter: 213: -1779572522790044833 second: table externalObjects: {} - serializedVersion: 11 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -71,10 +71,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -83,9 +85,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -113,6 +115,8 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -124,6 +128,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -136,6 +141,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -508,9 +514,26 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: + BB (b2): -1475217080110034401 + IW (b3): 8949759254071620935 + KW (b1): -7870557921473065445 + NN (b3): -346663897251480613 + OD (b1): 7586277213143569934 + SS&U (b2): 7632501428435422212 + background: 118122005513370663 + benthic_beasts: 6354619415515976590 + ichthyologist_weekly: 4052034619865970767 + kelper_worms: -14230228636386438 + nautical_nonsense: -1277204224837708462 + octopus_digest: -565236158815204801 + paper: -8615202382627692436 + reshelve_books_p2_shelf: -571824944287832636 + sea_slugs_and_you: 7858890755792140816 + stack: 6050513584568908935 + table: -1779572522790044833 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/SubmergedUnity/Assets/Submerged/Minigames/SetNavigationBeacon/Textures/SetNavigationBeaconSpriteSheet.png.meta b/SubmergedUnity/Assets/Submerged/Minigames/SetNavigationBeacon/Textures/SetNavigationBeaconSpriteSheet.png.meta index 79daba92..b80e1516 100644 --- a/SubmergedUnity/Assets/Submerged/Minigames/SetNavigationBeacon/Textures/SetNavigationBeaconSpriteSheet.png.meta +++ b/SubmergedUnity/Assets/Submerged/Minigames/SetNavigationBeacon/Textures/SetNavigationBeaconSpriteSheet.png.meta @@ -33,7 +33,7 @@ TextureImporter: 213: 5837843366777011650 second: screen externalObjects: {} - serializedVersion: 11 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -50,10 +50,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -62,9 +64,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -92,6 +94,8 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -103,6 +107,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -115,6 +120,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -340,9 +346,19 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: + 1_background: -6583339734637797494 + 1_bottomspeech: 1894556092418318577 + 1_bottomtext (optional): 5226816704236515855 + 1_navbeacon: 851225456443596015 + 1_screen: 4563469214123123886 + 1_topspeech: 2297849387135782830 + background: 118122005513370663 + blinking_bar: 4790999074171822323 + input_boxes: -5401162370976841185 + screen: 5837843366777011650 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/SubmergedUnity/Assets/Submerged/Minigames/ShootDepthCharges/Textures/ShootDepthChargesSpriteSheet.png.meta b/SubmergedUnity/Assets/Submerged/Minigames/ShootDepthCharges/Textures/ShootDepthChargesSpriteSheet.png.meta index 72dd3a45..672509f8 100644 --- a/SubmergedUnity/Assets/Submerged/Minigames/ShootDepthCharges/Textures/ShootDepthChargesSpriteSheet.png.meta +++ b/SubmergedUnity/Assets/Submerged/Minigames/ShootDepthCharges/Textures/ShootDepthChargesSpriteSheet.png.meta @@ -39,7 +39,7 @@ TextureImporter: 213: 7347210790889060441 second: shoot_depth_charges_frame externalObjects: {} - serializedVersion: 11 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -56,10 +56,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -68,9 +70,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -98,6 +100,8 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -109,6 +113,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -121,6 +126,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -388,9 +394,21 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: + bomb_1: -8469204400738329757 + bomb_1_explode: -8473030879600491941 + bomb_2: 8114985772114671235 + bomb_2_explode: -6930748378351952690 + bomb_3: -4975520578640395922 + bomb_3_explode: 1841706412604498413 + bomb_4: 1843372830317561357 + bomb_4_explode: -5440765731622900249 + shoot_deoth_charges_screen: 7300683173602600807 + shoot_depth_charges_crosshair: 5412998741472576095 + shoot_depth_charges_explosion: -778573862820947965 + shoot_depth_charges_frame: 7347210790889060441 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/SubmergedUnity/Assets/Submerged/Minigames/SortScubaGear/Textures/SortScubaGearSpriteSheet.png.meta b/SubmergedUnity/Assets/Submerged/Minigames/SortScubaGear/Textures/SortScubaGearSpriteSheet.png.meta index 13ed04c2..09809b16 100644 --- a/SubmergedUnity/Assets/Submerged/Minigames/SortScubaGear/Textures/SortScubaGearSpriteSheet.png.meta +++ b/SubmergedUnity/Assets/Submerged/Minigames/SortScubaGear/Textures/SortScubaGearSpriteSheet.png.meta @@ -33,7 +33,7 @@ TextureImporter: 213: -240830441881277121 second: Wetsuit externalObjects: {} - serializedVersion: 11 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -50,10 +50,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -62,9 +64,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -92,6 +94,8 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -103,6 +107,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -115,6 +120,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -340,9 +346,19 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: + Background: 2504170125896549414 + Boxes: -5497048124762190385 + Flippers: -9030465465696017327 + FrontBox_flippers: 5909792758099300141 + FrontBox_mask: 8372912305488865789 + FrontBox_tank: 4810979688197693250 + FrontBox_wetsuit: -7786752099850022059 + Mask: 7577328287588368852 + Tank: 5612364612687388212 + Wetsuit: -240830441881277121 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/SubmergedUnity/Assets/Submerged/Minigames/SpawnIn/Textures/SpawnInSpriteSheet.png.meta b/SubmergedUnity/Assets/Submerged/Minigames/SpawnIn/Textures/SpawnInSpriteSheet.png.meta index fa3832b2..e40965cc 100644 --- a/SubmergedUnity/Assets/Submerged/Minigames/SpawnIn/Textures/SpawnInSpriteSheet.png.meta +++ b/SubmergedUnity/Assets/Submerged/Minigames/SpawnIn/Textures/SpawnInSpriteSheet.png.meta @@ -24,7 +24,7 @@ TextureImporter: 213: 1692108365972551564 second: Upper-Words externalObjects: {} - serializedVersion: 11 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -41,10 +41,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -53,9 +55,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -83,6 +85,8 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -94,6 +98,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -106,6 +111,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -226,9 +232,14 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: + Lower Sub F1: -6347808683680968284 + Lower Sub F2: -3713181128713483885 + Lower-Background: -5703883867246614394 + Upper-Background: 1809749720647204364 + Upper-Telescope: -1484786894347968731 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/SubmergedUnity/Assets/Submerged/Minigames/SpotWhaleShark/Textures/SpotWhaleSharkSpriteSheet.png.meta b/SubmergedUnity/Assets/Submerged/Minigames/SpotWhaleShark/Textures/SpotWhaleSharkSpriteSheet.png.meta index 7459b76b..78dd755a 100644 --- a/SubmergedUnity/Assets/Submerged/Minigames/SpotWhaleShark/Textures/SpotWhaleSharkSpriteSheet.png.meta +++ b/SubmergedUnity/Assets/Submerged/Minigames/SpotWhaleShark/Textures/SpotWhaleSharkSpriteSheet.png.meta @@ -249,7 +249,7 @@ TextureImporter: 213: 2297548251440133554 second: Whale_Shark_FG externalObjects: {} - serializedVersion: 11 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -266,10 +266,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -278,9 +280,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -308,6 +310,8 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -319,6 +323,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -331,6 +336,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -2068,9 +2074,91 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: + Whale_Shark100: 602186801318038514 + Whale_Shark101: 4785485274542528703 + Whale_Shark102: 5854910114630229779 + Whale_Shark103: -1816580248527202776 + Whale_Shark104: -1026017552510389738 + Whale_Shark105: 1030270055730183913 + Whale_Shark106: -3794891096487024156 + Whale_Shark107: 2328919231549007008 + Whale_Shark108: 1759751023597102548 + Whale_Shark109: -4038648354711554642 + Whale_Shark110: 4893337911556568971 + Whale_Shark111: -5796160726730356467 + Whale_Shark112: -2654654661688874569 + Whale_Shark113: 2882358299681959755 + Whale_Shark114: 4116310874317212654 + Whale_Shark115: -5220956017614385428 + Whale_Shark116: -3183278202117402270 + Whale_Shark117: 650161875815784785 + Whale_Shark118: -6164867964257170264 + Whale_Shark119: -6548148903132122594 + Whale_Shark120: 7235860190934425682 + Whale_Shark121: -6633398905425896047 + Whale_Shark122: -8004347987863971423 + Whale_Shark123: -6156008675527747079 + Whale_Shark124: -6229918818923573502 + Whale_Shark125: -5949060236820403105 + Whale_Shark126: 8480549272168929017 + Whale_Shark127: -10015792402654520 + Whale_Shark128: 8935406043807557058 + Whale_Shark129: 6713199162787086839 + Whale_Shark130: -2101164008950248391 + Whale_Shark131: -4021922119373519458 + Whale_Shark_FG: 2297548251440133554 + fg_kelp00: 5529005188688555329 + fg_kelp01: -7335661932239116195 + fg_kelp02: 3865468161485274849 + fg_kelp03: 9115480164847922346 + fg_kelp04: -9048828635923914856 + fg_kelp05: 6159370509013567851 + fg_kelp06: -1481257572962721657 + fg_kelp07: -164701362144016984 + fg_kelp08: -7921403273562634836 + fg_kelp09: -5796124839482508021 + fg_kelp10: -6841741109617215829 + fg_kelp11: -4245233869312495292 + fg_kelp12: 646720547921743222 + fg_kelp13: -5902607140487666791 + fg_kelp14: -6966109890485953455 + fg_kelp15: -1909535622509300423 + fg_kelp16: 427467461565527772 + fg_kelp17: -6710693352327551366 + fg_kelp18: 2161511095919718798 + fg_kelp19: -9173599225288266764 + fg_kelp20: -4516172574088550540 + fg_kelp21: -7534567512408792973 + fg_kelp22: 3579063979847380877 + fg_kelp23: -8214468133855372691 + fg_kelp24: 360514819273798784 + fg_kelp25: 2794604983656057106 + fg_kelp26: 4627546972231018264 + fg_kelp27: -2827460158443052723 + fg_kelp28: 2892788942097434787 + fg_kelp29: -8150284214542151110 + fg_kelp30: 1906614857722307503 + fg_kelp31: -1077160493190418685 + fg_kelp32: -1991614659639772595 + fg_kelp33: -1226396280292411994 + fg_kelp34: 8587248246000350082 + fg_kelp35: 9083447579009001349 + fg_kelp36: 976537139413535315 + fg_kelp37: 4220625963879615623 + fg_kelp38: -3045560684128481517 + fg_kelp39: 3198311549020857844 + fg_kelp40: 2003662423675440559 + fg_kelp41: -6922325929785389939 + fg_kelp42: -4820023901109519334 + fg_kelp43: -4783781363933578184 + fg_kelp44: 1252229274789851618 + fg_kelp45: -5849230608539841613 + fg_kelp46: -6721222695622502558 + fg_kelp47: 7451745022114837739 + whale_shark_background: 5152631908324570036 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/SubmergedUnity/Assets/Submerged/Minigames/StartSubmersible/Textures/StartSubmersibleSpriteSheet.png.meta b/SubmergedUnity/Assets/Submerged/Minigames/StartSubmersible/Textures/StartSubmersibleSpriteSheet.png.meta index 96377bd0..d4005645 100644 --- a/SubmergedUnity/Assets/Submerged/Minigames/StartSubmersible/Textures/StartSubmersibleSpriteSheet.png.meta +++ b/SubmergedUnity/Assets/Submerged/Minigames/StartSubmersible/Textures/StartSubmersibleSpriteSheet.png.meta @@ -60,7 +60,7 @@ TextureImporter: 213: 5418457852541175948 second: modified_bg externalObjects: {} - serializedVersion: 11 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -77,10 +77,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -89,9 +91,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -119,6 +121,8 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -130,6 +134,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -142,6 +147,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -154,6 +160,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -547,9 +554,27 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: + Dial_pointer: 5874314683907977096 + Full_Wheel: 2227783724632387922 + HighlightBackground: -3196857380016991960 + Key: 9198678579800050646 + Key_Green_Light: -8908889174907225979 + Key_Hole: -8752444242541456192 + Key_Red_Light: -1381780030183193139 + Submarine_Outline: 1509551986078764235 + Switch_Light_Green: 2014073544603233025 + Switch_Light_Red: -6540937284625143322 + Switch_Off: -3617276167927408384 + Switch_On: -8985936486114544999 + VerticalDial_Bar: -6634051554928762064 + VerticalDial_Fill: 2384553229086466037 + VerticalDial_Slider: 2647286427753634454 + VerticalDial_WhiteBar: -5500478010636356401 + Wheel_shadow: 7946369693787772444 + modified_bg: 5418457852541175948 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/SubmergedUnity/Assets/Submerged/Minigames/SteadyHeartbeat/Textures/SteadyHeartbeatSpriteSheet.png.meta b/SubmergedUnity/Assets/Submerged/Minigames/SteadyHeartbeat/Textures/SteadyHeartbeatSpriteSheet.png.meta index 65311108..0659e1ab 100644 --- a/SubmergedUnity/Assets/Submerged/Minigames/SteadyHeartbeat/Textures/SteadyHeartbeatSpriteSheet.png.meta +++ b/SubmergedUnity/Assets/Submerged/Minigames/SteadyHeartbeat/Textures/SteadyHeartbeatSpriteSheet.png.meta @@ -12,7 +12,7 @@ TextureImporter: 213: 6900989801539488846 second: panels externalObjects: {} - serializedVersion: 11 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -29,10 +29,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -41,9 +43,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -71,6 +73,8 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -82,6 +86,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -94,6 +99,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -172,9 +178,12 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: + HeartButton: 5533634885441492977 + board: 8528553128873044056 + panels: 6900989801539488846 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/SubmergedUnity/Assets/Submerged/Minigames/Surveillance/Textures/SurveillanceSpriteSheet.png.meta b/SubmergedUnity/Assets/Submerged/Minigames/Surveillance/Textures/SurveillanceSpriteSheet.png.meta index 9f5b86cf..accc8361 100644 --- a/SubmergedUnity/Assets/Submerged/Minigames/Surveillance/Textures/SurveillanceSpriteSheet.png.meta +++ b/SubmergedUnity/Assets/Submerged/Minigames/Surveillance/Textures/SurveillanceSpriteSheet.png.meta @@ -27,7 +27,7 @@ TextureImporter: 213: -6419608006996955627 second: UD_Y.Hallway externalObjects: {} - serializedVersion: 11 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -44,10 +44,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -56,9 +58,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -86,6 +88,8 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -97,6 +101,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -109,6 +114,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -292,9 +298,17 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: + Background2: 3585075094346165510 + LD_Electric: 1654089991033180574 + LD_Lobby: -521089763272369829 + LD_W.Hallway: 5284976997286282283 + UD_Comms: -3089268043527858058 + UD_Lobby: -2757855470863294179 + UD_W.Hallway: 7267216348191904588 + UD_Y.Hallway: -6419608006996955627 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/SubmergedUnity/Assets/Submerged/Minigames/TrackMantaRay/Textures/TrackMantaRaySpriteSheet.png.meta b/SubmergedUnity/Assets/Submerged/Minigames/TrackMantaRay/Textures/TrackMantaRaySpriteSheet.png.meta index ad973b79..15fadc04 100644 --- a/SubmergedUnity/Assets/Submerged/Minigames/TrackMantaRay/Textures/TrackMantaRaySpriteSheet.png.meta +++ b/SubmergedUnity/Assets/Submerged/Minigames/TrackMantaRay/Textures/TrackMantaRaySpriteSheet.png.meta @@ -213,7 +213,7 @@ TextureImporter: 213: 568444412337348473 second: background1 externalObjects: {} - serializedVersion: 11 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -230,10 +230,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -242,9 +244,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -272,6 +274,8 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -283,6 +287,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -295,6 +300,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -1780,9 +1786,79 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: + background1: 568444412337348473 + cliff: 9138734998784888664 + coral: 7065981543880154126 + coral2: -3395484740664569501 + mantaray00: -6656399485861357518 + mantaray01: 7513537372266410224 + mantaray02: -4927654452589378532 + mantaray03: -4033921132725026004 + mantaray04: 3576297951091937126 + mantaray05: -3912190792710844824 + mantaray06: 1996385184646451948 + mantaray07: 1223890478592822779 + mantaray08: -2001558840866048021 + mantaray09: 5093951324680783314 + mantaray10: 3483928158430788564 + mantaray11: -8643938053228685342 + mantaray12: -8193709935820129132 + mantaray13: -1090556797388655461 + mantaray14: -6125229477949209519 + mantaray15: 2177243473245752379 + mantaray16: -8778601889995227598 + mantaray17: -2869727326583918341 + mantaray18: -206523911591709308 + mantaray19: -4362435018504204753 + mantaray20: 2842128865755531092 + mantaray21: -6742001794135635641 + mantaray22: 6013491729575627504 + mantaray23: -2130840176442101525 + mantaray24: -2001967922183110295 + mantaray25: 5566851081897838791 + mantaray26: -8542491480641166245 + mantaray27: 4066964427868389178 + mantaray28: 5733003025422048989 + mantaray29: -4468977229838413942 + mantaray30: -8698846546955778625 + mantaray31: -6747760937558743558 + mantaray32: -5176242721415581376 + mantaray33: 5453382022557777187 + mantaray34: -4741791036522035684 + mantaray35: 2042266434404974454 + mantaray36: 2866689250139771229 + mantaray37: 9179957730282712684 + mantaray38: -7651328455969362250 + mantaray39: 4086917472122932627 + mantaray40: 6993323749264088642 + mantaray41: -3827515259644231389 + mantaray42: -3756248061000625488 + mantaray43: -6533278042392897873 + mantaray44: 3123801497746039048 + mantaray45: 4082399317866784292 + mantaray46: -6304763275656103021 + mantaray47: 6633843552886104479 + mantaray48: -5370426956264657862 + mantaray49: -8649007863007751352 + mantaray50: 764536186460953220 + mantaray51: -8934344484660098863 + mantaray52: -5733472727981305874 + mantaray53: -617089820706076627 + mantaray54: 5138879267642615423 + mantaray55: 2639274204261710231 + mantaray56: 3585873799015234286 + mantaray57: -2475890181961918058 + mantaray58: -4526106669811593736 + mantaray59: -1260953900861879462 + mantaray60: 5722273103388049256 + mantaray61: 3757502889456977922 + seaweed1: 7974025486862566620 + seaweed2: -3925131752087648364 + seaweed3: 201314548720837722 + seaweed4: -4943500877959812476 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/SubmergedUnity/Assets/Submerged/Minigames/UnlockManifolds/Textures/UnlockManifoldsSpriteSheet.png.meta b/SubmergedUnity/Assets/Submerged/Minigames/UnlockManifolds/Textures/UnlockManifoldsSpriteSheet.png.meta index 3919023b..c12541bf 100644 --- a/SubmergedUnity/Assets/Submerged/Minigames/UnlockManifolds/Textures/UnlockManifoldsSpriteSheet.png.meta +++ b/SubmergedUnity/Assets/Submerged/Minigames/UnlockManifolds/Textures/UnlockManifoldsSpriteSheet.png.meta @@ -45,7 +45,7 @@ TextureImporter: 213: -607066901554057578 second: top bar externalObjects: {} - serializedVersion: 11 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -62,10 +62,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -74,9 +76,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -104,6 +106,8 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -115,6 +119,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -127,6 +132,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -436,9 +442,23 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: + 1: -2374222918679686493 + 10: -8655818156195654838 + 2: -761933863725385812 + 3: -5906598218874874896 + 4: -1816755548282093316 + 5: 2008176328888099268 + 6: 6967745887157389618 + 7: 6501298950303736333 + 8: -3181606171480048652 + 9: -7010260848350730462 + board: 8528553128873044056 + bottom bar: -8681824267915311083 + screen: 5837843366777011650 + top bar: -607066901554057578 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/SubmergedUnity/Packages/manifest.json b/SubmergedUnity/Packages/manifest.json index 285ece3c..a3efff8e 100644 --- a/SubmergedUnity/Packages/manifest.json +++ b/SubmergedUnity/Packages/manifest.json @@ -4,9 +4,9 @@ "com.malee.reorderablelist": "https://github.com/cfoulston/Unity-Reorderable-List.git", "com.unity.2d.sprite": "1.0.0", "com.unity.assetbundlebrowser": "https://github.com/Unity-Technologies/AssetBundles-Browser.git", - "com.unity.ide.rider": "3.0.28", - "com.unity.ide.visualstudio": "2.0.22", - "com.unity.textmeshpro": "3.0.8", + "com.unity.ide.rider": "3.0.38", + "com.unity.ide.visualstudio": "2.0.25", + "com.unity.textmeshpro": "3.0.9", "com.unity.modules.animation": "1.0.0", "com.unity.modules.assetbundle": "1.0.0", "com.unity.modules.audio": "1.0.0", diff --git a/SubmergedUnity/Packages/packages-lock.json b/SubmergedUnity/Packages/packages-lock.json index 1f392ad6..dfd1fb6f 100644 --- a/SubmergedUnity/Packages/packages-lock.json +++ b/SubmergedUnity/Packages/packages-lock.json @@ -25,7 +25,7 @@ "depth": 0, "source": "git", "dependencies": {}, - "hash": "b7c279278d1a343c6957c9f15b45173d3211f01c" + "hash": "ad2a81ec3068eafd48753df1825a8dd7201ce60c" }, "com.unity.ext.nunit": { "version": "1.0.6", @@ -35,7 +35,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "3.0.28", + "version": "3.0.38", "depth": 0, "source": "registry", "dependencies": { @@ -44,11 +44,11 @@ "url": "https://packages.unity.com" }, "com.unity.ide.visualstudio": { - "version": "2.0.22", + "version": "2.0.25", "depth": 0, "source": "registry", "dependencies": { - "com.unity.test-framework": "1.1.9" + "com.unity.test-framework": "1.1.31" }, "url": "https://packages.unity.com" }, @@ -64,7 +64,7 @@ "url": "https://packages.unity.com" }, "com.unity.textmeshpro": { - "version": "3.0.8", + "version": "3.0.9", "depth": 0, "source": "registry", "dependencies": { diff --git a/SubmergedUnity/ProjectSettings/MemorySettings.asset b/SubmergedUnity/ProjectSettings/MemorySettings.asset new file mode 100644 index 00000000..5b5facec --- /dev/null +++ b/SubmergedUnity/ProjectSettings/MemorySettings.asset @@ -0,0 +1,35 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!387306366 &1 +MemorySettings: + m_ObjectHideFlags: 0 + m_EditorMemorySettings: + m_MainAllocatorBlockSize: -1 + m_ThreadAllocatorBlockSize: -1 + m_MainGfxBlockSize: -1 + m_ThreadGfxBlockSize: -1 + m_CacheBlockSize: -1 + m_TypetreeBlockSize: -1 + m_ProfilerBlockSize: -1 + m_ProfilerEditorBlockSize: -1 + m_BucketAllocatorGranularity: -1 + m_BucketAllocatorBucketsCount: -1 + m_BucketAllocatorBlockSize: -1 + m_BucketAllocatorBlockCount: -1 + m_ProfilerBucketAllocatorGranularity: -1 + m_ProfilerBucketAllocatorBucketsCount: -1 + m_ProfilerBucketAllocatorBlockSize: -1 + m_ProfilerBucketAllocatorBlockCount: -1 + m_TempAllocatorSizeMain: -1 + m_JobTempAllocatorBlockSize: -1 + m_BackgroundJobTempAllocatorBlockSize: -1 + m_JobTempAllocatorReducedBlockSize: -1 + m_TempAllocatorSizeGIBakingWorker: -1 + m_TempAllocatorSizeNavMeshWorker: -1 + m_TempAllocatorSizeAudioWorker: -1 + m_TempAllocatorSizeCloudWorker: -1 + m_TempAllocatorSizeGfx: -1 + m_TempAllocatorSizeJobWorker: -1 + m_TempAllocatorSizeBackgroundWorker: -1 + m_TempAllocatorSizePreloadManager: -1 + m_PlatformMemorySettings: {} diff --git a/SubmergedUnity/ProjectSettings/ProjectVersion.txt b/SubmergedUnity/ProjectSettings/ProjectVersion.txt index 44822a76..b8523623 100644 --- a/SubmergedUnity/ProjectSettings/ProjectVersion.txt +++ b/SubmergedUnity/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2020.3.45f1 -m_EditorVersionWithRevision: 2020.3.45f1 (660cd1701bd5) +m_EditorVersion: 2022.3.62f2 +m_EditorVersionWithRevision: 2022.3.62f2 (7670c08855a9) diff --git a/SubmergedUnity/SubmergedUnity.slnx b/SubmergedUnity/SubmergedUnity.slnx new file mode 100644 index 00000000..9ae5a3d1 --- /dev/null +++ b/SubmergedUnity/SubmergedUnity.slnx @@ -0,0 +1,6 @@ + + + + + + diff --git a/nuget.config b/nuget.config index 1af36ff0..54cf6e6a 100644 --- a/nuget.config +++ b/nuget.config @@ -5,6 +5,5 @@ -