update control panel

VirtueSky · Feb 8, 2024 · 826fe1a · 826fe1a
1 parent 114aef7
commit 826fe1a
Show file tree

Hide file tree

Showing 10 changed files with 36 additions and 20 deletions.
diff --git a/README.md b/README.md
@@ -4,13 +4,13 @@
 
 ### Add the line below to `Packages/manifest.json`
 
-for version `2.4.3`
+for version `2.4.4`
 ```csharp
-"com.virtuesky.sunflower":"https://github.com/VirtueSky/sunflower.git#2.4.3",
+"com.virtuesky.sunflower":"https://github.com/VirtueSky/sunflower.git#2.4.4",
 ```
 
 #### Note:
 
 - [See Document](https://github.com/VirtueSky/sunflower/wiki)
 
-  (Reference: https://github.com/pancake-llc/foundation)
+  (Reference: https://github.com/pancake-llc/foundation/tree/main/Assets/Heart)
diff --git a/VirtueSky/ControlPanel/CPAboutDrawer.cs b/VirtueSky/ControlPanel/CPAboutDrawer.cs
@@ -6,7 +6,7 @@ namespace VirtueSky.ControlPanel.Editor
 {
     public class CPAboutDrawer
     {
-        public static void OnDrawAbout(Rect position, Action drawSetting)
+        public static void OnDrawAbout(Rect position, Action drawSetting = null)
         {
             GUILayout.Space(10);
             GUILayout.BeginVertical();
@@ -30,12 +30,12 @@ public static void OnDrawAbout(Rect position, Action drawSetting)
                 Application.OpenURL("https://github.com/VirtueSky/sunflower/wiki");
             }
 
-            Handles.DrawAAPolyLine(3, new Vector3(ConstantControlPanel.POSITION_X_START_CONTENT, 195),
-                new Vector3(position.width, 195));
-            GUILayout.Space(20);
-            GUILayout.Label("SETUP THEME", EditorStyles.boldLabel);
             GUILayout.Space(10);
-            drawSetting?.Invoke();
+            CPUtility.DrawLineLastRectY(3, ConstantControlPanel.POSITION_X_START_CONTENT, position.width);
+            // GUILayout.Space(20);
+            // GUILayout.Label("SETUP THEME", EditorStyles.boldLabel);
+            // GUILayout.Space(10);
+            // drawSetting?.Invoke();
             GUILayout.EndVertical();
         }
     }

diff --git a/VirtueSky/ControlPanel/CPInAppReviewDrawer.cs b/VirtueSky/ControlPanel/CPInAppReviewDrawer.cs
@@ -13,7 +13,7 @@ public static void OnDrawInAppReview(Rect position)
             GUILayout.BeginVertical();
             GUILayout.Label("IN APP REVIEW", EditorStyles.boldLabel);
             GUILayout.Space(10);
-            if (GUILayout.Button("Create In App Review"))
+            if (GUILayout.Button("Create Scriptable In App Review"))
             {
                 RatingWindowEditor.CreateInAppReview();
             }

diff --git a/VirtueSky/ControlPanel/CPUtility.cs b/VirtueSky/ControlPanel/CPUtility.cs
@@ -14,6 +14,7 @@ public static void DrawButtonInstallPackage(string labelInstall, string labelRem
             bool isInstall = RegistryManager.IsInstalledPackage(packageName);
             if (isInstall)
             {
+                GUI.backgroundColor = CustomColor.Red.ToColor();
                 if (GUILayout.Button(labelRemove, GUILayout.Width(withButton)))
                 {
                     RegistryManager.Remove(packageName);
@@ -22,13 +23,16 @@ public static void DrawButtonInstallPackage(string labelInstall, string labelRem
             }
             else
             {
+                GUI.backgroundColor = CustomColor.Green.ToColor();
                 if (GUILayout.Button(labelInstall, GUILayout.Width(withButton)))
                 {
                     RegistryManager.AddOverrideVersion(packageName,
                         packageVersion);
                 }
             }
 
+            GUI.backgroundColor = GameDataEditor.ColorContentWindowSunflower.ToColor();
+
             GUILayout.Space(10);
             GUILayout.Toggle(isInstall, TextIsInstallPackage(isInstall));
             EditorGUILayout.EndHorizontal();
@@ -38,12 +42,23 @@ public static void DrawButtonAddDefineSymbols(string flagSymbols, float withButt
         {
             GUILayout.BeginHorizontal();
             bool isAddSymbols = EditorScriptDefineSymbols.IsFlagEnabled(flagSymbols);
-            string labelButton = isAddSymbols ? "Remove Symbols ---> " : "Add Symbols ---> ";
+            string labelButton = isAddSymbols ? "Remove ---> " : "Add ---> ";
+            if (isAddSymbols)
+            {
+                GUI.backgroundColor = CustomColor.Red.ToColor();
+            }
+            else
+            {
+                GUI.backgroundColor = CustomColor.Green.ToColor();
+            }
+
             if (GUILayout.Button(labelButton + flagSymbols, GUILayout.Width(withButton)))
             {
                 EditorScriptDefineSymbols.SwitchFlag(flagSymbols);
             }
 
+            GUI.backgroundColor = GameDataEditor.ColorContentWindowSunflower.ToColor();
+
             GUILayout.Space(10);
             GUILayout.Toggle(isAddSymbols, TextIsEnable(isAddSymbols));
             GUILayout.EndHorizontal();

diff --git a/VirtueSky/ControlPanel/ConstantPackage.cs b/VirtueSky/ControlPanel/ConstantPackage.cs
@@ -2,7 +2,7 @@
 {
     public class ConstantPackage
     {
-        public const string VersionSunflower = "2.4.3";
+        public const string VersionSunflower = "2.4.4";
         public const string PackageNameInAppPurchase = "com.unity.purchasing";
         public const string MaxVersionInAppPurchase = "4.10.0";
         public const string PackageNameNewtonsoftJson = "com.unity.nuget.newtonsoft-json";

diff --git a/VirtueSky/ControlPanel/ControlPanelWindowEditor.cs b/VirtueSky/ControlPanel/ControlPanelWindowEditor.cs
@@ -70,8 +70,8 @@ void DrawButton()
         {
             DrawButtonChooseState("Advertising", StatePanelControl.Advertising);
             DrawButtonChooseState("In App Purchase", StatePanelControl.InAppPurchase);
-            DrawButtonChooseState("ScriptableObject Event", StatePanelControl.SO_Event);
-            DrawButtonChooseState("ScriptableObject Variable", StatePanelControl.SO_Variable);
+            DrawButtonChooseState("Scriptable Event", StatePanelControl.SO_Event);
+            DrawButtonChooseState("Scriptable Variable", StatePanelControl.SO_Variable);
             DrawButtonChooseState("Audio", StatePanelControl.Audio);
             DrawButtonChooseState("Pools", StatePanelControl.Pools);
             DrawButtonChooseState("Firebase", StatePanelControl.Firebase);
@@ -136,7 +136,7 @@ void DrawContent()
                     CPGameServiceDrawer.OnDrawGameService();
                     break;
                 case StatePanelControl.About:
-                    CPAboutDrawer.OnDrawAbout(position, () => { OnSettingColorTheme(); });
+                    CPAboutDrawer.OnDrawAbout(position);
                     break;
             }
         }

diff --git a/VirtueSky/DataStorage/Editor/DataWindowEditor.cs b/VirtueSky/DataStorage/Editor/DataWindowEditor.cs
@@ -8,7 +8,7 @@ public class DataWindowEditor : EditorWindow
     {
         #region Data
 
-        [MenuItem("GameBase/Clear Data")]
+        [MenuItem("Sunflower/Game Data/Clear Data")]
         public static void ClearAllData()
         {
             GameData.DelDataInStorage();
@@ -17,10 +17,11 @@ public static void ClearAllData()
             Debug.Log($"<color=Green>Clear data succeed</color>");
         }
 
-        [MenuItem("GameBase/Save Data")]
+        [MenuItem("Sunflower/Game Data/Save Data")]
         public static void SaveData()
         {
             GameData.Save();
+            Debug.Log($"<color=Green>Save data succeed</color>");
         }
 
         #endregion

diff --git a/VirtueSky/Events/Editor/EventWindowEditor.cs b/VirtueSky/Events/Editor/EventWindowEditor.cs
@@ -11,7 +11,7 @@ public class EventWindowEditor : EditorWindow
         #region Create ScriptableObject Event
 
         private const string pathEvent = "/Event";
-        private const string menuEvent = "Sunflower/Create Event/";
+        private const string menuEvent = "Sunflower/Scriptable/Create Event/";
 
         [MenuItem(menuEvent + "EventNoParam")]
         public static void CreateEventNoParam()

diff --git a/VirtueSky/Variables/Editor/VariableWindowEditor.cs b/VirtueSky/Variables/Editor/VariableWindowEditor.cs
@@ -9,7 +9,7 @@ public class VariableWindowEditor : EditorWindow
         #region Create ScriptableObject Variable
 
         private const string pathVariable = "/Variable";
-        private const string menuVariable = "Sunflower/Create Variable/";
+        private const string menuVariable = "Sunflower/Scriptable/Create Variable/";
 
         [MenuItem(menuVariable + "Transform Variable")]
         public static void CreateVariableTransform()

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "com.virtuesky.sunflower",
   "displayName": "Sunflower",
   "description": "Core ScriptableObject Architecture for building Unity games",
-  "version": "2.4.3",
+  "version": "2.4.4",
   "unity": "2022.3",
   "category": "virtuesky",
   "keywords": [