fix asset loading error

Rounds-Modding · Mar 1, 2023 · 232f132 · 232f132
1 parent f4189b1
commit 232f132
Showing 1 changed file with 12 additions and 15 deletions.
diff --git a/UnboundLib/Unbound.cs b/UnboundLib/Unbound.cs
@@ -25,7 +25,7 @@ public class Unbound : BaseUnityPlugin
     {
         private const string ModId = "com.willis.rounds.unbound";
         private const string ModName = "Rounds Unbound";
-        public const string Version = "3.2.7";
+        public const string Version = "3.2.8";
 
         public static Unbound Instance { get; private set; }
         public static readonly ConfigFile config = new ConfigFile(Path.Combine(Paths.ConfigPath, "UnboundLib.cfg"), true);
@@ -163,20 +163,6 @@ IEnumerator ArmsRaceStartCoroutine(On.GM_ArmsRace.orig_Start orig, GM_ArmsRace s
             // hook for closing ongoing lobbies
             GameModeManager.AddHook(GameModeHooks.HookGameStart, CloseLobby);
 
-            // Load toggleUI asset bundle
-            toggleUI = AssetUtils.LoadAssetBundleFromResources("togglemenuui", typeof(ToggleLevelMenuHandler).Assembly);
-
-            // Load toggleUI asset bundle
-            linkAssets = AssetUtils.LoadAssetBundleFromResources("unboundlinks", typeof(Unbound).Assembly);
-
-            // Add managers
-            gameObject.AddComponent<LevelManager>();
-            gameObject.AddComponent<CardManager>();
-
-            // Add menu handlers
-            gameObject.AddComponent<ToggleLevelMenuHandler>();
-            gameObject.AddComponent<ToggleCardsMenuHandler>();
-
             On.CardChoice.Start += (orig, self) =>
             {
                 for (int i = 0; i < self.cards.Length; i++)
@@ -242,6 +228,14 @@ private void Awake()
             var harmony = new Harmony(ModId);
             harmony.PatchAll();
 
+            // Add managers
+            gameObject.AddComponent<LevelManager>();
+            gameObject.AddComponent<CardManager>();
+
+            // Add menu handlers
+            gameObject.AddComponent<ToggleLevelMenuHandler>();
+            gameObject.AddComponent<ToggleCardsMenuHandler>();
+
             LoadAssets();
             GameModeManager.Init();
 
@@ -365,7 +359,10 @@ private void OnGUI()
 
         private static void LoadAssets()
         {
+            toggleUI = AssetUtils.LoadAssetBundleFromResources("togglemenuui", typeof(ToggleLevelMenuHandler).Assembly);
+            linkAssets = AssetUtils.LoadAssetBundleFromResources("unboundlinks", typeof(Unbound).Assembly);
             UIAssets = AssetUtils.LoadAssetBundleFromResources("unboundui", typeof(Unbound).Assembly);
+
             if (UIAssets != null)
             {
                 modalPrefab = UIAssets.LoadAsset<GameObject>("Modal");