Merge pull request #32 from unity-package/dev

Dev
unity-package · Jan 14, 2025 · 939685f · 939685f
2 parents 4bf4550 + a318039
commit 939685f
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 20 deletions.
diff --git a/Module/Button/Runtime/ButtonCustom.cs b/Module/Button/Runtime/ButtonCustom.cs
@@ -13,7 +13,7 @@
 namespace VirtueSky.UIButton
 {
     [EditorIcon("icon_button")]
-    public class ButtonCustom : Button
+    public abstract class ButtonCustom : Button
     {
         [HeaderLine("Motion", false, CustomColor.Aquamarine, CustomColor.Bright)] [SerializeField]
         private bool invokeClickButton = true;

diff --git a/Module/ControlPanel/CPLevelEditorDrawer.cs b/Module/ControlPanel/CPLevelEditorDrawer.cs
@@ -111,10 +111,14 @@ public static void ClearPreviews()
 
         public static void ClearPreview(GameObject go)
         {
-            if (previewDict?.TryGetValue(go, out var tex) ?? false)
+            if (previewDict != null)
             {
-                UnityEngine.Object.DestroyImmediate(tex);
-                previewDict.Remove(go);
+                foreach (var kvp in previewDict.ToList())
+                {
+                    previewDict[kvp.Key] = null;
+                }
+
+                previewDict.Clear();
             }
         }
 

diff --git a/Module/ControlPanel/ConstantPackage.cs b/Module/ControlPanel/ConstantPackage.cs
@@ -2,7 +2,7 @@
 {
     public class ConstantPackage
     {
-        public const string VersionUnityCommon = "1.4.9";
+        public const string VersionUnityCommon = "1.5.0";
         public const string PackageNameInAppPurchase = "com.unity.purchasing";
         public const string MaxVersionInAppPurchase = "4.12.2";
         public const string PackageNameNewtonsoftJson = "com.unity.nuget.newtonsoft-json";
@@ -44,35 +44,35 @@ public class ConstantPackage
         public const string PackageNameFirebaseApp = "com.google.firebase.app";
 
         public const string MaxVersionFirebaseApp =
-            "https://github.com/firebase-unity/firebase-app.git#12.4.1";
+            "https://github.com/firebase-unity/firebase-app.git#12.5.0";
 
         public const string PackageNameFirebaseRemoteConfig = "com.google.firebase.remote-config";
 
         public const string MaxVersionFirebaseRemoteConfig =
-            "https://github.com/firebase-unity/firebase-remote-config.git#12.4.1";
+            "https://github.com/firebase-unity/firebase-remote-config.git#12.5.0";
 
         public const string PackageNameFirebaseAnalytics = "com.google.firebase.analytics";
 
         public const string MaxVersionFirebaseAnalytics =
-            "https://github.com/firebase-unity/firebase-analytics.git#12.4.1";
+            "https://github.com/firebase-unity/firebase-analytics.git#12.5.0";
 
         public const string PackageNameFirebaseDatabase = "com.google.firebase.database";
 
         public const string MaxVersionFirebaseDatabase =
-            "https://github.com/firebase-unity/firebase-database.git#12.4.1";
+            "https://github.com/firebase-unity/firebase-database.git#12.5.0";
 
         public const string PackageNameFirebaseAuth = "com.google.firebase.auth";
-        public const string MaxVersionFirebaseAuth = "https://github.com/firebase-unity/firebase-auth.git#12.4.1";
+        public const string MaxVersionFirebaseAuth = "https://github.com/firebase-unity/firebase-auth.git#12.5.0";
 
         public const string PackageNameFirebaseCrashlytics = "com.google.firebase.crashlytics";
 
         public const string MaxVersionFirebaseCrashlytics =
-            "https://github.com/firebase-unity/firebase-crashlytics.git#12.4.1";
+            "https://github.com/firebase-unity/firebase-crashlytics.git#12.5.0";
 
         public const string PackageNameFirebaseSupportIos = "com.google.firebase.support-ios";
 
         public const string MaxVersionFirebaseSupportIos =
-            "https://github.com/firebase-unity/firebase-support-ios.git#12.4.1";
+            "https://github.com/firebase-unity/firebase-support-ios.git#12.5.0";
 
         #endregion
 
@@ -97,16 +97,16 @@ public class ConstantPackage
         public const string PackageNameCoffeeUIEffect = "com.coffee.ui-effect";
 
         public const string MaxVersionCoffeeUIEffect =
-            "https://github.com/mob-sakai/UIEffect.git?path=Packages/src#5.0.2";
+            "https://github.com/mob-sakai/UIEffect.git?path=Packages/src#5.2.0";
 
         public const string PackageNameCoffeeUIParticle = "com.coffee.ui-particle";
 
         public const string MaxVersionCoffeeUIParticle =
-            "https://github.com/mob-sakai/ParticleEffectForUGUI.git#4.10.5";
+            "https://github.com/mob-sakai/ParticleEffectForUGUI.git#4.10.6";
 
         public const string PackageNameAppleSignIn = "com.lupidan.apple-signin-unity";
 
-        public const string MaxVersionAppleSignIn = "https://github.com/lupidan/apple-signin-unity.git#v1.4.3";
+        public const string MaxVersionAppleSignIn = "https://github.com/lupidan/apple-signin-unity.git#v1.4.4";
         //public const string PackageNameAnimancer = "com.virtuesky.animancer";
         //public const string MaxVersionAnimancer = "https://github.com/VirtueSky/animancer-unity.git#7.0.0";
 

diff --git a/Module/Utils/Editor/UnityPackage/Note_Package.txt b/Module/Utils/Editor/UnityPackage/Note_Package.txt
@@ -1,4 +1,4 @@
 - Version Max Sdk: 8.0.0
 - Version Admob Sdk: v9.5.0
-- Version IronSource Sdk: v8.4.0
-- Version Google Game Play Service: v11.01
+- Version IronSource Sdk: v8.5.1
+- Version Google Game Play Service: v2.0.0
diff --git a/Module/Utils/Editor/UnityPackage/google-play-game.unitypackage b/Module/Utils/Editor/UnityPackage/google-play-game.unitypackage
diff --git a/Module/Utils/Editor/UnityPackage/is-sdk.unitypackage b/Module/Utils/Editor/UnityPackage/is-sdk.unitypackage
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 `1.4.9`
+for version `1.5.0`
 ```csharp
-"com.wolf-org.sunflower2":"https://github.com/unity-package/sunflower_2.git#1.4.9",
+"com.wolf-org.sunflower2":"https://github.com/unity-package/sunflower_2.git#1.5.0",
 ```
 
 ## Includes modules

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "com.wolf-org.sunflower2",
   "displayName": "Sunflower2",
   "description": "Core singleton for building Unity games ",
-  "version": "1.4.9",
+  "version": "1.5.0",
   "unity": "2022.3",
   "category": "virtuesky",
   "license": "MIT",