version 1.1.0, create toggle on pnlmenu is much more easier

MDMods · Feb 12, 2023 · 1edab08 · 1edab08
1 parent 9cf8aa5
commit 1edab08
Show file tree

Hide file tree

Showing 6 changed files with 367 additions and 45 deletions.
diff --git a/README.md b/README.md
@@ -127,7 +127,7 @@ public override void OnSceneWasLoaded(int buildIndex, string sceneName)
             {
                 YourMethod();
             }
-		}
+        }
 
 // New way to do
 // Same with patching events, in the OnInitializeMelon method

diff --git a/src/Main.cs b/src/Main.cs
@@ -1,5 +1,6 @@
 global using HarmonyLib;
 using MelonLoader;
+using MuseDashMirror.UICreate;
 using static MuseDashMirror.SceneInfo;
 
 namespace MuseDashMirror
@@ -40,6 +41,7 @@ public override void OnSceneWasUnloaded(int buildIndex, string sceneName)
             {
                 isGameScene = false;
                 ExitGameSceneInvoke();
+                ToggleCreate.Reset();
             }
 
             if (sceneName == "UISystem_PC")

diff --git a/src/MelonBuildInfo.cs b/src/MelonBuildInfo.cs
@@ -8,6 +8,6 @@ internal static class MelonBuildInfo
 
         public const string Author = "lxy";
 
-        public const string Version = "1.0.2";
+        public const string Version = "1.1.0";
     }
 }
diff --git a/src/UICreate/CanvasCreate.cs b/src/UICreate/CanvasCreate.cs
@@ -5,20 +5,18 @@ namespace MuseDashMirror.UICreate
 {
     public static class CanvasCreate
     {
-        // 去掉最后，parent设置两个重载，名字和gameobject
-
         /// <summary>
         /// Create a screenspace overlay canvas
         /// </summary>
-
-        public static void CreateCanvas(string canvasName)
+        public static GameObject CreateCanvas(string canvasName)
         {
             var canvas = new GameObject();
             canvas.name = canvasName;
             canvas.AddComponent<Canvas>();
             canvas.AddComponent<CanvasScaler>();
             canvas.AddComponent<GraphicRaycaster>();
             canvas.GetComponent<Canvas>().renderMode = RenderMode.ScreenSpaceOverlay;
+            return canvas;
         }
 
         /// <summary>
@@ -40,12 +38,24 @@ public static GameObject CreateCanvas(string canvasName, string cameraName)
         }
 
         /// <summary>
-        /// Create a screenspace camera canvas with specified reference resolution
+        /// Create a screenspace camera canvas with specified parent using name
         /// </summary>
-        public static void CreateCanvas(string canvasName, string cameraName, Vector2 referenceResolution)
+        public static GameObject CreateCanvas(string canvasName, string cameraName, string parentName)
         {
             var canvas = CreateCanvas(canvasName, cameraName);
-            canvas.GetComponent<CanvasScaler>().referenceResolution = referenceResolution;
+            var parent = GameObject.Find(parentName);
+            canvas.transform.SetParent(parent.transform);
+            return canvas;
+        }
+
+        /// <summary>
+        /// Create a screenspace camera canvas with specified parent
+        /// </summary>
+        public static GameObject CreateCanvas(string canvasName, string cameraName, GameObject parent)
+        {
+            var canvas = CreateCanvas(canvasName, cameraName);
+            canvas.transform.SetParent(parent.transform);
+            return canvas;
         }
     }
 }
diff --git a/src/UICreate/TextGameObjectCreate.cs b/src/UICreate/TextGameObjectCreate.cs
@@ -5,16 +5,74 @@ namespace MuseDashMirror.UICreate
 {
     public static class TextGameObjectCreate
     {
-        // 去掉最后，parent设置两个重载，名字和gameobject
+        /// <summary>
+        /// Create GameObject with specified parent using name, with normal and white font and custom fontsize
+        /// </summary>
+        public static GameObject CreateTextGameObject(string parentName, string gameObjectName, string text, TextAnchor alignment, bool isLocalPosition, Vector3 position, Vector2 sizeDelta, int fontSize)
+        {
+            var parent = GameObject.Find(parentName);
+            var gameobject = new GameObject(gameObjectName);
+            gameobject.transform.SetParent(parent.transform);
+            Text gameobject_text = gameobject.AddComponent<Text>();
+            gameobject_text.text = text;
+            gameobject_text.alignment = alignment;
+            gameobject_text.font = Fonts.NormalFont;
+            gameobject_text.fontSize = fontSize;
+            gameobject_text.color = Color.white;
+            if (isLocalPosition)
+            {
+                gameobject_text.transform.localPosition = position;
+            }
+            else
+            {
+                gameobject_text.transform.position = position;
+            }
+            RectTransform rectTransform = gameobject_text.GetComponent<RectTransform>();
+            rectTransform.sizeDelta = sizeDelta;
+            rectTransform.localScale = new Vector3(1, 1, 1);
+            return gameobject;
+        }
+
+        /// <summary>
+        /// Create GameObject with specified parent using name, with white font, custom fontsize and font
+        /// </summary>
+        public static GameObject CreateTextGameObject(string parentName, string gameObjectName, string text, TextAnchor alignment, bool isLocalPosition, Vector3 position, Vector2 sizeDelta, int fontSize, Font font)
+        {
+            var gameobject = CreateTextGameObject(parentName, gameObjectName, text, alignment, isLocalPosition, position, sizeDelta, fontSize);
+            Text gameobject_text = gameobject.GetComponent<Text>();
+            gameobject_text.font = font;
+            return gameobject;
+        }
+
+        /// <summary>
+        /// Create GameObject with specified parent using name, with custom fontsize, font and color
+        /// </summary>
+        public static GameObject CreateTextGameObject(string parentName, string gameObjectName, string text, TextAnchor alignment, bool isLocalPosition, Vector3 position, Vector2 sizeDelta, int fontSize, Font font, Color color)
+        {
+            var gameobject = CreateTextGameObject(parentName, gameObjectName, text, alignment, isLocalPosition, position, sizeDelta, fontSize, font);
+            Text gameobject_text = gameobject.GetComponent<Text>();
+            gameobject_text.color = color;
+            return gameobject;
+        }
+
+        /// <summary>
+        /// Create GameObject with specified parent using name, with custom font, fontsize and color, custom local scale
+        /// </summary>
+        public static GameObject CreateTextGameObject(string parentName, string gameObjectName, string text, TextAnchor alignment, bool isLocalPosition, Vector3 position, Vector2 sizeDelta, int fontSize, Font font, Color color, Vector3 localScale)
+        {
+            var gameobject = CreateTextGameObject(parentName, gameObjectName, text, alignment, isLocalPosition, position, sizeDelta, fontSize, font, color);
+            RectTransform rectTransform = gameobject.GetComponent<Text>().GetComponent<RectTransform>();
+            rectTransform.localScale = localScale;
+            return gameobject;
+        }
 
         /// <summary>
-        /// Create GameObject with specified canvas, with normal and white font and custom fontsize
+        /// Create GameObject with specified parent, with normal and white font and custom fontsize
         /// </summary>
-        public static GameObject CreateTextGameObject(string canvasName, string gameObjectName, string text, TextAnchor alignment, bool isLocalPosition, Vector3 position, Vector2 sizeDelta, int fontSize)
+        public static GameObject CreateTextGameObject(GameObject parent, string gameObjectName, string text, TextAnchor alignment, bool isLocalPosition, Vector3 position, Vector2 sizeDelta, int fontSize)
         {
-            var canvas = GameObject.Find(canvasName);
             var gameobject = new GameObject(gameObjectName);
-            gameobject.transform.SetParent(canvas.transform);
+            gameobject.transform.SetParent(parent.transform);
             Text gameobject_text = gameobject.AddComponent<Text>();
             gameobject_text.text = text;
             gameobject_text.alignment = alignment;
@@ -36,33 +94,33 @@ public static GameObject CreateTextGameObject(string canvasName, string gameObje
         }
 
         /// <summary>
-        /// Create GameObject with specified canvas, with white font and custom fontsize
+        /// Create GameObject with specified parent, with white font, custom fontsize and font
         /// </summary>
-        public static GameObject CreateTextGameObject(string canvasName, string gameObjectName, string text, TextAnchor alignment, bool isLocalPosition, Vector3 position, Vector2 sizeDelta, int fontSize, Font font)
+        public static GameObject CreateTextGameObject(GameObject parent, string gameObjectName, string text, TextAnchor alignment, bool isLocalPosition, Vector3 position, Vector2 sizeDelta, int fontSize, Font font)
         {
-            var gameobject = CreateTextGameObject(canvasName, gameObjectName, text, alignment, isLocalPosition, position, sizeDelta, fontSize);
+            var gameobject = CreateTextGameObject(parent, gameObjectName, text, alignment, isLocalPosition, position, sizeDelta, fontSize);
             Text gameobject_text = gameobject.GetComponent<Text>();
             gameobject_text.font = font;
             return gameobject;
         }
 
         /// <summary>
-        /// Create GameObject with specified canvas, with custom font, fontsize and color
+        /// Create GameObject with specified parent, with custom fontsize, font and color
         /// </summary>
-        public static GameObject CreateTextGameObject(string canvasName, string gameObjectName, string text, TextAnchor alignment, bool isLocalPosition, Vector3 position, Vector2 sizeDelta, int fontSize, Font font, Color color)
+        public static GameObject CreateTextGameObject(GameObject parent, string gameObjectName, string text, TextAnchor alignment, bool isLocalPosition, Vector3 position, Vector2 sizeDelta, int fontSize, Font font, Color color)
         {
-            var gameobject = CreateTextGameObject(canvasName, gameObjectName, text, alignment, isLocalPosition, position, sizeDelta, fontSize, font);
+            var gameobject = CreateTextGameObject(parent, gameObjectName, text, alignment, isLocalPosition, position, sizeDelta, fontSize, font);
             Text gameobject_text = gameobject.GetComponent<Text>();
             gameobject_text.color = color;
             return gameobject;
         }
 
         /// <summary>
-        /// Create GameObject with specified canvas, with custom font, fontsize and color, custom local scale
+        /// Create GameObject with specified parent, with custom font, fontsize and color, custom local scale
         /// </summary>
-        public static GameObject CreateTextGameObject(string canvasName, string gameObjectName, string text, TextAnchor alignment, bool isLocalPosition, Vector3 position, Vector2 sizeDelta, int fontSize, Font font, Color color, Vector3 localScale)
+        public static GameObject CreateTextGameObject(GameObject parent, string gameObjectName, string text, TextAnchor alignment, bool isLocalPosition, Vector3 position, Vector2 sizeDelta, int fontSize, Font font, Color color, Vector3 localScale)
         {
-            var gameobject = CreateTextGameObject(canvasName, gameObjectName, text, alignment, isLocalPosition, position, sizeDelta, fontSize, font, color);
+            var gameobject = CreateTextGameObject(parent, gameObjectName, text, alignment, isLocalPosition, position, sizeDelta, fontSize, font, color);
             RectTransform rectTransform = gameobject.GetComponent<Text>().GetComponent<RectTransform>();
             rectTransform.localScale = localScale;
             return gameobject;
-Original file line number
+Diff line change
@@ Expand Up @@
                 {
                     YourMethod();
                 }
-    		}
+            }
     // New way to do
     // Same with patching events, in the OnInitializeMelon method
@@ Expand Down @@