Merge pull request #62 from VirtueSky/dev

Dev

Author: VirtueSky

README.md

@@ -23,9 +23,9 @@
 ### 1: Download the repository and drop it into folder `Assets`
 ### 2: Add the line below to `Packages/manifest.json`
 
-for version `3.3.9`
+for version `3.4.0`
 ```json
-"com.virtuesky.sunflower":"https://github.com/VirtueSky/sunflower.git#3.3.9",
+"com.virtuesky.sunflower":"https://github.com/VirtueSky/sunflower.git#3.4.0",
 ```
 
 ## Includes modules

VirtueSky/ATT_IOS/Editor/PostBuildStep.cs

@@ -10,16 +10,24 @@ public static class PostBuildStep
     public static void OnPostProcessBuild(BuildTarget buildTarget, string pathToXcode)
     {
         if (buildTarget != BuildTarget.iOS) return;
+        ModifyInfoPlist(pathToXcode);
+        CopyGoogleServiceInfoPlist(pathToXcode);
+        AddCapability(pathToXcode);
+    }
 
-        // === 1. Modify Info.plist ===
+    static void ModifyInfoPlist(string pathToXcode)
+    {
         string plistPath = Path.Combine(pathToXcode, "Info.plist");
         PlistDocument plistObj = new PlistDocument();
         plistObj.ReadFromString(File.ReadAllText(plistPath));
         PlistElementDict plistRoot = plistObj.root;
-        plistRoot.SetString("NSUserTrackingUsageDescription", "Your data will be used to provide you a better and personalized ad experience.");
+        plistRoot.SetString("NSUserTrackingUsageDescription",
+            "Your data will be used to provide you a better and personalized ad experience.");
         File.WriteAllText(plistPath, plistObj.WriteToString());
+    }
 
-        // === 2. Copy GoogleService-Info.plist ===
+    static void CopyGoogleServiceInfoPlist(string pathToXcode)
+    {
         string sourceSplitPath = Path.Combine("Assets", "GoogleService-Info.plist");
         string destSplitPath = Path.Combine(pathToXcode, "GoogleService-Info.plist");
         if (File.Exists(sourceSplitPath))
@@ -31,29 +39,42 @@ public static void OnPostProcessBuild(BuildTarget buildTarget, string pathToXcod
         {
             UnityEngine.Debug.LogWarning("[PostBuildStep] GoogleService-Info.plist not found in Assets.");
         }
+    }
 
-        // === 3. Setup Push Notification Capability ===
+    static void AddCapability(string pathToXcode)
+    {
         string projPath = PBXProject.GetPBXProjectPath(pathToXcode);
         PBXProject proj = new PBXProject();
         proj.ReadFromFile(projPath);
 
         string targetGuid = proj.GetUnityMainTargetGuid();
+        string frameworkTargetGuid = proj.GetUnityFrameworkTargetGuid();
 
-        // Determine environment type (Debug or Release)
         string apsEnvironment = EditorUserBuildSettings.development ? "development" : "production";
 
-        // Create Entitlements.entitlements
-        string entitlementsFileName = "Entitlements.entitlements";
-        string entitlementsPath = Path.Combine(pathToXcode, entitlementsFileName);
+        // Use a safe path
+        string entitlementsFileName = "Unity-iPhone/Entitlements.entitlements";
+        string entitlementsFullPath = Path.Combine(pathToXcode, entitlementsFileName);
+
+        // Create Entitlements file
         PlistDocument entitlements = new PlistDocument();
         entitlements.root.SetString("aps-environment", apsEnvironment);
-        File.WriteAllText(entitlementsPath, entitlements.WriteToString());
+        File.WriteAllText(entitlementsFullPath, entitlements.WriteToString());
+
+        // Capability manager
+        var projCapability = new ProjectCapabilityManager(projPath, entitlementsFileName, "Unity-iPhone");
+
+        projCapability.AddPushNotifications(false);
+
+#if VIRTUESKY_APPLE_AUTH
+        projCapability.AddSignInWithApple();
+#endif
 
-        // Add Push Notification capability and entitlements
-        proj.AddCapability(targetGuid, PBXCapabilityType.PushNotifications, entitlementsFileName);
+        projCapability.WriteToFile();
 
-        // Use SetBuildProperty to avoid duplicate CODE_SIGN_ENTITLEMENTS
+        // update build property for target
         proj.SetBuildProperty(targetGuid, "CODE_SIGN_ENTITLEMENTS", entitlementsFileName);
+        proj.SetBuildProperty(frameworkTargetGuid, "CODE_SIGN_ENTITLEMENTS", entitlementsFileName);
 
         proj.WriteToFile(projPath);
     }
@@ -66,7 +87,8 @@ public static void OnPostProcessBuildAddFirebaseFile(BuildTarget buildTarget, st
         string projPath = PBXProject.GetPBXProjectPath(pathToBuiltProject);
         PBXProject proj = new PBXProject();
         proj.ReadFromFile(projPath);
-        proj.AddFileToBuild(proj.GetUnityMainTargetGuid(), proj.AddFile("GoogleService-Info.plist", "GoogleService-Info.plist"));
+        proj.AddFileToBuild(proj.GetUnityMainTargetGuid(),
+            proj.AddFile("GoogleService-Info.plist", "GoogleService-Info.plist"));
         proj.WriteToFile(projPath);
     }
 }

VirtueSky/Component/FollowTargetComponent.cs

@@ -13,7 +13,11 @@ public class FollowTargetComponent : BaseMono
         private Transform currentTrans;
 
         [Space, SerializeField] private Transform targetTrans;
-        [ReadOnly, SerializeField] private Vector3 offsetTrans;
+        [SerializeField] private bool useOffsetTrans = true;
+
+        [ShowIf(nameof(useOffsetTrans), true), ReadOnly, SerializeField]
+        private Vector3 offsetTrans;
+
         [Space, SerializeField] private DirectionFollowTarget directionFollowTarget;
         [Space, SerializeField] private TypeFollowTarget typeFollowTarget;
 
@@ -89,7 +93,7 @@ private void Awake()
                 currentTrans = gameObject.transform;
             }
 
-            offsetTrans = currentTrans.position - targetTrans.position;
+            offsetTrans = useOffsetTrans ? currentTrans.position - targetTrans.position : Vector3.zero;
         }
 
         public void SetTarget(Transform t)

VirtueSky/ControlPanel/ConstantPackage.cs

@@ -2,7 +2,7 @@
 {
     public class ConstantPackage
     {
-        public const string VersionSunflower = "3.3.9";
+        public const string VersionSunflower = "3.4.0";
         public const string PackageNameInAppPurchase = "com.unity.purchasing";
         public const string MaxVersionInAppPurchase = "4.12.2";
         public const string PackageNameNewtonsoftJson = "com.unity.nuget.newtonsoft-json";
@@ -15,12 +15,12 @@ public class ConstantPackage
         public const string MaxVersionAddressables = "1.21.21";
 
         public const string PackageNameLevelPlay = "com.unity.services.levelplay";
-        public const string MaxVersionLevelPlay = "8.8.1";
+        public const string MaxVersionLevelPlay = "8.10.0";
 
         public const string PackageNameAdmob = "com.google.ads.mobile";
 
         public const string VersionAdmob =
-            "https://github.com/googleads/googleads-mobile-unity.git?path=packages/com.google.ads.mobile#v10.2.0";
+            "https://github.com/googleads/googleads-mobile-unity.git?path=packages/com.google.ads.mobile#v10.3.0";
 
         #region Google Unity
 
@@ -52,37 +52,37 @@ public class ConstantPackage
         public const string PackageNameFirebaseApp = "com.google.firebase.app";
 
         public const string MaxVersionFirebaseApp =
-            "https://github.com/RageAgainstThePixel/com.google.firebase.app.git#12.9.0";
+            "https://github.com/RageAgainstThePixel/com.google.firebase.app.git#12.10.1";
 
         public const string PackageNameFirebaseRemoteConfig = "com.google.firebase.remote-config";
 
         public const string MaxVersionFirebaseRemoteConfig =
-            "https://github.com/RageAgainstThePixel/com.google.firebase.remote-config.git#12.9.0";
+            "https://github.com/RageAgainstThePixel/com.google.firebase.remote-config.git#12.10.1";
 
         public const string PackageNameFirebaseAnalytics = "com.google.firebase.analytics";
 
         public const string MaxVersionFirebaseAnalytics =
-            "https://github.com/RageAgainstThePixel/com.google.firebase.analytics.git#12.9.0";
+            "https://github.com/RageAgainstThePixel/com.google.firebase.analytics.git#12.10.1";
 
         public const string PackageNameFirebaseDatabase = "com.google.firebase.database";
 
         public const string MaxVersionFirebaseDatabase =
-            "https://github.com/RageAgainstThePixel/com.google.firebase.database.git#12.9.0";
+            "https://github.com/RageAgainstThePixel/com.google.firebase.database.git#12.10.1";
 
         public const string PackageNameFirebaseAuth = "com.google.firebase.auth";
 
         public const string MaxVersionFirebaseAuth =
-            "https://github.com/RageAgainstThePixel/com.google.firebase.auth.git#12.9.0";
+            "https://github.com/RageAgainstThePixel/com.google.firebase.auth.git#12.10.1";
 
         public const string PackageNameFirebaseCrashlytics = "com.google.firebase.crashlytics";
 
         public const string MaxVersionFirebaseCrashlytics =
-            "https://github.com/RageAgainstThePixel/com.google.firebase.crashlytics.git#12.9.0";
+            "https://github.com/RageAgainstThePixel/com.google.firebase.crashlytics.git#12.10.1";
 
         #endregion
 
         public const string PackageNameAdjust = "com.adjust.sdk";
-        public const string MaxVersionAdjust = "https://github.com/adjust/unity_sdk.git?path=Assets/Adjust#v5.4.0";
+        public const string MaxVersionAdjust = "https://github.com/adjust/unity_sdk.git?path=Assets/Adjust#v5.4.1";
         public const string PackageNamePlayFab = "com.pancake.playfab";
 
         public const string MaxVersionPlayFab =
@@ -91,12 +91,12 @@ public class ConstantPackage
         public const string PackageNameAppFlyer = "appsflyer-unity-plugin";
 
         public const string MaxVersionAppFlyer =
-            "https://github.com/AppsFlyerSDK/appsflyer-unity-plugin.git?path=Assets/AppsFlyer#v6.16.21";
+            "https://github.com/AppsFlyerSDK/appsflyer-unity-plugin.git?path=Assets/AppsFlyer#v6.17.1";
 
         public const string PackageNameCoffeeUIEffect = "com.coffee.ui-effect";
 
         public const string MaxVersionCoffeeUIEffect =
-            "https://github.com/mob-sakai/UIEffect.git?path=Packages/src#5.9.2";
+            "https://github.com/mob-sakai/UIEffect.git?path=Packages/src#5.9.5";
 
         public const string PackageNameCoffeeUIParticle = "com.coffee.ui-particle";
 
@@ -105,7 +105,8 @@ public class ConstantPackage
 
         public const string PackageNameAppleSignIn = "com.lupidan.apple-signin-unity";
 
-        public const string MaxVersionAppleSignIn = "https://github.com/lupidan/apple-signin-unity.git#v1.5.0";
+        public const string MaxVersionAppleSignIn =
+            "https://github.com/lupidan/apple-signin-unity.git?path=Source#1.5.0";
 
         #region Spine
 

VirtueSky/GameService/Editor.meta

@@ -1,5 +1,6 @@
 using System.Text;
 using UnityEngine;
+using VirtueSky.Events;
 using VirtueSky.Inspector;
 using VirtueSky.Variables;
 
@@ -20,6 +21,7 @@ public class AppleAuthentication : ServiceAuthentication
     {
         [SerializeField] private StringVariable authorizationCodeVariable;
         [SerializeField] private StringVariable userIdVariable;
+        [SerializeField] private EventNoParam tryLoginEvent;
 
 #if UNITY_IOS && VIRTUESKY_APPLE_AUTH
         private IAppleAuthManager _iAppleAuthManager;
@@ -39,6 +41,7 @@ protected override void Init()
                 // Creates an Apple Authentication manager with the deserializer
                 this._iAppleAuthManager = new AppleAuthManager(deserializer);
                 loginEvent.AddListener(Login);
+                tryLoginEvent.AddListener(TryLogin);
             }
 #endif
         }
@@ -108,10 +111,36 @@ protected override void Login()
                 {
                     // Something went wrong
                     var authorizationErrorCode = error.GetAuthorizationErrorCode();
-                    serverCode.Value = "";
-                    userIdVariable.Value = "";
                     status.SetFailed();
                 });
+#endif
+        }
+
+        /// <summary>
+        /// Login when Apple credential still valid.
+        /// </summary>
+        private void TryLogin()
+        {
+#if UNITY_IOS && VIRTUESKY_APPLE_AUTH
+            if (string.IsNullOrEmpty(userIdVariable.Value)) return;
+            this._iAppleAuthManager.GetCredentialState(userIdVariable.Value, state =>
+            {
+                switch (state)
+                {
+                    case CredentialState.Revoked:
+                        break;
+                    case CredentialState.Authorized:
+                        Debug.Log($"Apple credential still valid. Auto-login with userId: {userIdVariable.Value}");
+                        Login();
+                        break;
+                    case CredentialState.NotFound:
+                        Debug.LogWarning("Apple credential invalid or revoked.");
+                        userIdVariable.Value = "";
+                        break;
+                    case CredentialState.Transferred:
+                        break;
+                }
+            }, error => { Debug.LogError("CredentialState check failed: " + error.ToString()); });
 #endif
         }
     }