From ce90d4fed6aaca6d8d22efa7f72c0997f6bf0054 Mon Sep 17 00:00:00 2001 From: Stefan Richter <o-s-r1993@web.de> Date: Fri, 29 Oct 2021 14:21:41 +0200 Subject: [PATCH] buildable stages --- Assets/Scripts/StageStatic.cs | 17 +++++++++-------- UserSettings/EditorUserSettings.asset | 6 +++--- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/Assets/Scripts/StageStatic.cs b/Assets/Scripts/StageStatic.cs index 33a4f1b2..7a13a8f1 100644 --- a/Assets/Scripts/StageStatic.cs +++ b/Assets/Scripts/StageStatic.cs @@ -1,4 +1,4 @@ -using System; + using System.Collections; using System.Collections.Generic; using System.Linq; @@ -6,7 +6,8 @@ public static class StageStatic -{ +{ + public static Dictionary<string, Stage> StageOfficial; public static Dictionary<string, Stage> StageLocal; public static Dictionary<string, int> Category = new Dictionary<string, int> { @@ -73,7 +74,7 @@ private static List<string> GenerateWorldList() } #else _Worlds = new List<string> {"TreeWorld", "RiverWorld"}; - //UnityEditor.Debug.Log("WorldList might be incomplete!"); + Debug.Log("WorldList might be incomplete!"); #endif return _Worlds; } @@ -119,9 +120,9 @@ public StageErrorStruct(bool category, bool id, bool name, bool description, boo } } - public static void SetMode(Mode mode, UnityEngine.GameObject gameObject = null) + public static void SetMode(Mode mode, GameObject gameObject = null) { - gameObject ??= new UnityEngine.GameObject(); + gameObject ??= new GameObject(); // handle StageStatic.mode switch (StageStatic.mode = mode) @@ -228,7 +229,7 @@ public static void Delete(Stage stage) (!stage.use_install_folder ? StageLocal : StageOfficial).Remove(stage.name); } - public static bool LoadInitStage(string name, bool local = false, bool restore_session = true, UnityEngine.GameObject gameObject = null) + public static bool LoadInitStage(string name, bool local = false, bool restore_session = true, GameObject gameObject = null) { if (!ContainsKey(name, local)) return false; @@ -247,12 +248,12 @@ public static bool LoadInitStage(string name, bool local = false, bool restore_s return true; } - public static bool LoadInitStage(bool restore_session, UnityEngine.GameObject gameObject = null) + public static bool LoadInitStage(bool restore_session, GameObject gameObject = null) { if (current_name == null || current_name.Length == 0 || !stage.DeepLoad()) return false; - gameObject ??= new UnityEngine.GameObject(); + gameObject ??= new GameObject(); if (restore_session) { diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index f9f1e1cb..3174b527 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -27,13 +27,13 @@ EditorUserSettings: value: 22424703114646680e0b0227036c721518021d39631b32313f3d2e30f0e53136acf238e0f323 flags: 0 RecentlyUsedScenePath-7: - value: 22424703114646680e0b0227036c6b150503570b222c340f1e3d1c21f6ae2136ebf32f + value: 22424703114646680e0b0227036c6b150503570b222c340f193b1836d5ef2634e6a923e7ee2e26 flags: 0 RecentlyUsedScenePath-8: - value: 22424703114646680e0b0227036c6b150503570b222c340f193b1836d5ef2634e6a923e7ee2e26 + value: 22424703114646680e0b0227036c721518021d39630527392304183df7e57a2decee22f0 flags: 0 RecentlyUsedScenePath-9: - value: 22424703114646680e0b0227036c721518021d39630527392304183df7e57a2decee22f0 + value: 22424703114646680e0b0227036c6b150503570b222c340f1e3d1c21f6ae2136ebf32f flags: 0 vcSharedLogLevel: value: 0d5e400f0650 -- GitLab