Merge pull request #12 from VirtueSky/dev

Dev
VirtueSky · Aug 22, 2024 · 4f26072 · 4f26072
2 parents 9188a16 + 0882398
commit 4f26072
Show file tree

Hide file tree

Showing 386 changed files with 2,347 additions and 71,702 deletions.
diff --git a/README.md b/README.md
@@ -23,9 +23,9 @@
 ### 1: Download the repo and drop it into folder `Assets`
 ### 2: Add the line below to `Packages/manifest.json`
 
-for version `2.9.6`
+for version `2.9.7`
 ```csharp
-"com.virtuesky.sunflower":"https://github.com/VirtueSky/sunflower.git#2.9.6",
+"com.virtuesky.sunflower":"https://github.com/VirtueSky/sunflower.git#2.9.7",
 ```
 
 ## Includes modules

diff --git a/VirtueSky/Advertising/Editor/AdSettingEditor.cs b/VirtueSky/Advertising/Editor/AdSettingEditor.cs
@@ -84,7 +84,7 @@ void Draw()
             serializedObject.Update();
             Initialize();
             // EditorGUILayout.LabelField("ADS SETTING", EditorStyles.boldLabel);
-            GuiLine(2);
+            //GuiLine(2);
             GUILayout.Space(10);
             EditorGUILayout.PropertyField(_adCheckingInterval);
             EditorGUILayout.PropertyField(_adLoadingInterval);
@@ -122,8 +122,8 @@ public override void OnInspectorGUI()
 
         void SetupMax()
         {
-            EditorGUILayout.LabelField("MAX", EditorStyles.boldLabel);
-            GuiLine(2);
+            EditorGUILayout.LabelField("Applovin - Max", EditorStyles.boldLabel);
+            GuiLine(1);
             GUILayout.Space(10);
             EditorGUILayout.PropertyField(_sdkKey);
             EditorGUILayout.PropertyField(_applovinEnableAgeRestrictedUser);
@@ -196,8 +196,8 @@ void SetupMax()
 
         void SetupAdmob()
         {
-            EditorGUILayout.LabelField("ADMOB", EditorStyles.boldLabel);
-            GuiLine(2);
+            EditorGUILayout.LabelField("Google - Admob", EditorStyles.boldLabel);
+            GuiLine(1);
             GUILayout.Space(10);
             EditorGUILayout.BeginHorizontal();
             EditorGUILayout.PropertyField(_admobBannerVariable);
@@ -279,8 +279,8 @@ void SetupAdmob()
 
         void SetupIronSource()
         {
-            EditorGUILayout.LabelField("IRON-SOURCE", EditorStyles.boldLabel);
-            GuiLine(2);
+            EditorGUILayout.LabelField("LevelPlay - IronSource", EditorStyles.boldLabel);
+            GuiLine(1);
             GUILayout.Space(10);
             EditorGUILayout.PropertyField(_androidAppKey);
             EditorGUILayout.PropertyField(_iOSAppKey);

diff --git a/VirtueSky/AssetFinder/Editor/AssetFinderWindowAll.cs b/VirtueSky/AssetFinder/Editor/AssetFinderWindowAll.cs
@@ -732,10 +732,10 @@ protected void OnGUI2()
                 return;
             }
 
-            EditorGUI.DrawRect(new Rect(0, 0, position.width, position.height),
-                GameDataEditor.ColorBackgroundRectWindowSunflower.ToColor());
-            GUI.contentColor = GameDataEditor.ColorTextContentWindowSunflower.ToColor();
-            GUI.backgroundColor = GameDataEditor.ColorContentWindowSunflower.ToColor();
+            // EditorGUI.DrawRect(new Rect(0, 0, position.width, position.height),
+            //     GameDataEditor.ColorBackgroundRectWindowSunflower.ToColor());
+            // GUI.contentColor = GameDataEditor.ColorTextContentWindowSunflower.ToColor();
+            // GUI.backgroundColor = GameDataEditor.ColorContentWindowSunflower.ToColor();
             if (sp1 == null) InitPanes();
 
             DrawHeader();

diff --git a/VirtueSky/ControlPanel/CPAboutDrawer.cs b/VirtueSky/ControlPanel/CPAboutDrawer.cs
@@ -1,6 +1,7 @@
 using System;
 using UnityEditor;
 using UnityEngine;
+using VirtueSky.UtilsEditor;
 
 namespace VirtueSky.ControlPanel.Editor
 {
@@ -10,7 +11,9 @@ public static void OnDrawAbout(Rect position, Action drawSetting = null)
         {
             GUILayout.Space(10);
             GUILayout.BeginVertical();
-            GUILayout.Label("ABOUT", EditorStyles.boldLabel);
+            GUILayout.BeginHorizontal();
+            GUILayout.BeginVertical();
+            CPUtility.DrawHeaderIcon(StatePanelControl.About, "About");
             GUILayout.Space(10);
             GUILayout.TextArea("Name: Sunflower", EditorStyles.boldLabel);
             GUILayout.TextArea(
@@ -30,12 +33,16 @@ public static void OnDrawAbout(Rect position, Action drawSetting = null)
                 Application.OpenURL("https://github.com/VirtueSky/sunflower/wiki");
             }
 
+            GUILayout.Space(10);
+
+            GUILayout.EndVertical();
+            GUILayout.Box(EditorResources.IconVirtueSky, GUIStyle.none,
+                GUILayout.Width(180), GUILayout.Height(180));
+            GUILayout.EndHorizontal();
+
+
             GUILayout.Space(10);
             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/CPAdjustDrawer.cs b/VirtueSky/ControlPanel/CPAdjustDrawer.cs
@@ -27,24 +27,25 @@ public static void OnDrawAdjust()
         {
             GUILayout.Space(10);
             GUILayout.BeginVertical();
-            GUILayout.Label("ADJUST", EditorStyles.boldLabel);
+            CPUtility.DrawHeaderIcon(StatePanelControl.Adjust, "Adjust");
             GUILayout.Space(10);
             CPUtility.DrawButtonInstallPackage("Install Adjust", "Remove Adjust",
                 ConstantPackage.PackageNameAdjust, ConstantPackage.MaxVersionAdjust);
             GUILayout.Space(10);
             CPUtility.GuiLine(2);
             GUILayout.Space(10);
+            CPUtility.DrawHeader("Add define symbols");
+            GUILayout.Space(10);
 #if !VIRTUESKY_ADJUST
             EditorGUILayout.HelpBox(
                 $"Add scripting define symbols: {ConstantDefineSymbols.VIRTUESKY_ADJUST} for Adjust to use",
                 MessageType.Info);
 #endif
             GUILayout.Space(10);
-            GUILayout.Label("ADD DEFINE SYMBOLS", EditorStyles.boldLabel);
             CPUtility.DrawButtonAddDefineSymbols(ConstantDefineSymbols.VIRTUESKY_ADJUST);
             GUILayout.Space(10);
             CPUtility.GuiLine(2);
-            GUILayout.Label("ADJUST SETTINGS", EditorStyles.boldLabel);
+            CPUtility.DrawHeader("Adjust Settings");
             GUILayout.Space(10);
             if (_setting == null)
             {
@@ -73,7 +74,7 @@ public static void OnDrawAdjust()
             GUILayout.Space(10);
             CPUtility.GuiLine(2);
             GUILayout.Space(10);
-            GUILayout.Label("ADJUST TRACKING", EditorStyles.boldLabel);
+            CPUtility.DrawHeader("Adjust Tracking");
             GUILayout.Space(10);
             if (GUILayout.Button("Create Scriptable Tracking Adjust"))
             {

diff --git a/VirtueSky/ControlPanel/CPAdvertisingDrawer.cs b/VirtueSky/ControlPanel/CPAdvertisingDrawer.cs
@@ -33,7 +33,7 @@ public static void OnDrawAdvertising(Rect position)
         {
             GUILayout.Space(10);
             GUILayout.BeginVertical();
-            GUILayout.Label("ADVERTISING", EditorStyles.boldLabel);
+            CPUtility.DrawHeaderIcon(StatePanelControl.Advertising, "Advertising");
             GUILayout.Space(10);
             scroll = EditorGUILayout.BeginScrollView(scroll);
             if (_adSetting == null)
@@ -77,7 +77,7 @@ public static void OnDrawAdvertising(Rect position)
             GUILayout.Space(10);
             CPUtility.GuiLine(2);
             GUILayout.Space(10);
-            GUILayout.Label("PING ADS SETTING", EditorStyles.boldLabel);
+            CPUtility.DrawHeader("Ping Ads Settings");
             GUILayout.Space(10);
             if (GUILayout.Button("Ping"))
             {
@@ -103,7 +103,7 @@ static void DrawMaxField(Rect position)
             GUILayout.Space(10);
             CPUtility.GuiLine(2);
             GUILayout.Space(10);
-            GUILayout.Label("INSTALL MAX SDK", EditorStyles.boldLabel);
+            CPUtility.DrawHeader("Install Max Sdk");
             GUILayout.Space(10);
             if (GUILayout.Button("Install Max Sdk Plugin"))
             {
@@ -115,7 +115,7 @@ static void DrawMaxField(Rect position)
             GUILayout.Space(10);
             CPUtility.GuiLine(2);
             GUILayout.Space(10);
-            GUILayout.Label("ADD SYMBOLS", EditorStyles.boldLabel);
+            CPUtility.DrawHeader("Define Symbols");
             GUILayout.Space(10);
 #if !VIRTUESKY_ADS || !VIRTUESKY_APPLOVIN
             EditorGUILayout.HelpBox(
@@ -132,7 +132,7 @@ static void DrawAdmobField(Rect position)
             GUILayout.Space(10);
             CPUtility.GuiLine(2);
             GUILayout.Space(10);
-            GUILayout.Label("INSTALL ADMOB SDK", EditorStyles.boldLabel);
+            CPUtility.DrawHeader("Install Admob Sdk");
             GUILayout.Space(10);
             if (GUILayout.Button("Install Admob Sdk Plugin"))
             {
@@ -144,7 +144,7 @@ static void DrawAdmobField(Rect position)
             GUILayout.Space(10);
             CPUtility.GuiLine(2);
             GUILayout.Space(10);
-            GUILayout.Label("ADD SYMBOLS", EditorStyles.boldLabel);
+            CPUtility.DrawHeader("Define Symbols");
             GUILayout.Space(10);
 #if !VIRTUESKY_ADS || !VIRTUESKY_ADMOB
             EditorGUILayout.HelpBox(
@@ -161,7 +161,7 @@ static void DrawIronSource(Rect position)
             GUILayout.Space(10);
             CPUtility.GuiLine(2);
             GUILayout.Space(10);
-            GUILayout.Label("INSTALL IRON-SOURCE SDK", EditorStyles.boldLabel);
+            CPUtility.DrawHeader("Install IronSource Sdk");
             GUILayout.Space(10);
             if (GUILayout.Button("Install IronSource Sdk Plugin"))
             {
@@ -173,7 +173,7 @@ static void DrawIronSource(Rect position)
             GUILayout.Space(10);
             CPUtility.GuiLine(2);
             GUILayout.Space(10);
-            GUILayout.Label("ADD SYMBOLS", EditorStyles.boldLabel);
+            CPUtility.DrawHeader("Define Symbols");
             GUILayout.Space(10);
 #if !VIRTUESKY_ADS || !VIRTUESKY_IRONSOURCE
             EditorGUILayout.HelpBox(

diff --git a/VirtueSky/ControlPanel/CPAppsFlyerDrawer.cs b/VirtueSky/ControlPanel/CPAppsFlyerDrawer.cs
@@ -27,7 +27,7 @@ public static void OnDrawAppsFlyer()
         {
             GUILayout.Space(10);
             GUILayout.BeginVertical();
-            GUILayout.Label("APPSFLYER", EditorStyles.boldLabel);
+            CPUtility.DrawHeaderIcon(StatePanelControl.AppsFlyer, "AppsFlyer");
             GUILayout.Space(10);
             scroll = EditorGUILayout.BeginScrollView(scroll);
             CPUtility.DrawButtonInstallPackage("Install AppsFlyer", "Remove AppsFlyer",
@@ -43,11 +43,12 @@ public static void OnDrawAppsFlyer()
                 MessageType.Info);
 #endif
             GUILayout.Space(10);
-            GUILayout.Label("ADD DEFINE SYMBOLS", EditorStyles.boldLabel);
+            CPUtility.DrawHeader("Define Symbols");
+            GUILayout.Space(10);
             CPUtility.DrawButtonAddDefineSymbols(ConstantDefineSymbols.VIRTUESKY_APPSFLYER);
             GUILayout.Space(10);
             CPUtility.GuiLine(2);
-            GUILayout.Label("APPSFLYER SETTINGS", EditorStyles.boldLabel);
+            CPUtility.DrawHeader("AppsFlyer Settings");
             GUILayout.Space(10);
             if (_setting == null)
             {
@@ -78,7 +79,7 @@ public static void OnDrawAppsFlyer()
 
             GUILayout.Space(10);
             CPUtility.GuiLine(2);
-            GUILayout.Label("APPSFLYER TRACKING", EditorStyles.boldLabel);
+            CPUtility.DrawHeader("AppsFlyer Tracking");
             GUILayout.Space(10);
 
             if (GUILayout.Button("Create Scriptable Tracking AppsFlyer No Param"))

diff --git a/VirtueSky/ControlPanel/CPAssetFinderDrawer.cs b/VirtueSky/ControlPanel/CPAssetFinderDrawer.cs
@@ -10,7 +10,7 @@ public static void OnDrawAssetUsageDetector()
         {
             GUILayout.Space(10);
             GUILayout.BeginVertical();
-            GUILayout.Label("ASSET FINDER", EditorStyles.boldLabel);
+            CPUtility.DrawHeaderIcon(StatePanelControl.AssetsFinder, "Asset Finder");
             GUILayout.Space(10);
             if (GUILayout.Button("Open Asset Finder Window (Ctrl+Shift+K / Command+Shift+K)"))
             {

diff --git a/VirtueSky/ControlPanel/CPAudioDrawer.cs b/VirtueSky/ControlPanel/CPAudioDrawer.cs
@@ -10,7 +10,7 @@ public static void OnDrawAudio(Rect position)
         {
             GUILayout.Space(10);
             GUILayout.BeginVertical();
-            GUILayout.Label("AUDIO", EditorStyles.boldLabel);
+            CPUtility.DrawHeaderIcon(StatePanelControl.Audio, "Audio");
             GUILayout.Space(10);
             if (GUILayout.Button("Create Sound Data"))
             {
@@ -20,7 +20,7 @@ public static void OnDrawAudio(Rect position)
             GUILayout.Space(10);
             CPUtility.DrawLineLastRectY(3, ConstantControlPanel.POSITION_X_START_CONTENT, position.width);
             GUILayout.Space(10);
-            GUILayout.Label("MUSIC EVENT", EditorStyles.boldLabel);
+            CPUtility.DrawHeader("Music Event");
             GUILayout.Space(10);
             if (GUILayout.Button("Create Play Music Event"))
             {
@@ -45,7 +45,7 @@ public static void OnDrawAudio(Rect position)
             GUILayout.Space(10);
             CPUtility.DrawLineLastRectY(3, ConstantControlPanel.POSITION_X_START_CONTENT, position.width);
             GUILayout.Space(10);
-            GUILayout.Label("SFX EVENT", EditorStyles.boldLabel);
+            CPUtility.DrawHeader("Sfx Event");
             GUILayout.Space(10);
             if (GUILayout.Button("Create Play Sfx Event"))
             {
@@ -80,7 +80,7 @@ public static void OnDrawAudio(Rect position)
             GUILayout.Space(10);
             CPUtility.DrawLineLastRectY(3, ConstantControlPanel.POSITION_X_START_CONTENT, position.width);
             GUILayout.Space(10);
-            GUILayout.Label("VOLUME CHANGE", EditorStyles.boldLabel);
+            CPUtility.DrawHeader("Volume Changed Variable");
             GUILayout.Space(10);
             if (GUILayout.Button("Create Music Volume Variable"))
             {

diff --git a/VirtueSky/ControlPanel/CPExtensionsDrawer.cs b/VirtueSky/ControlPanel/CPExtensionsDrawer.cs
@@ -15,7 +15,7 @@ public static void OnDrawExtensions(Rect position)
             GUILayout.Space(10);
             GUILayout.BeginVertical();
 #if UNITY_ANDROID
-            GUILayout.Label("ANDROID EXTERNAL TOOLS", EditorStyles.boldLabel);
+            CPUtility.DrawHeaderIcon(StatePanelControl.Extensions, "Android External Tools");
             GUILayout.Space(10);
             if (GUILayout.Button("Open Sdk"))
             {