Merge pull request #11 from VirtueSky/dev

Dev

Author: VirtueSky

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.5`
+for version `2.9.6`
 ```csharp
-"com.virtuesky.sunflower":"https://github.com/VirtueSky/sunflower.git#2.9.5",
+"com.virtuesky.sunflower":"https://github.com/VirtueSky/sunflower.git#2.9.6",
 ```
 
 ## Includes modules

VirtueSky/ControlPanel/CPAppsFlyerDrawer.cs

@@ -9,6 +9,7 @@ public class CPAppsFlyerDrawer
     {
         private static AppsFlyerSetting _setting;
         private static UnityEditor.Editor _editor;
+        private static Vector2 scroll = Vector2.zero;
 
         public static void OnEnable()
         {
@@ -28,6 +29,7 @@ public static void OnDrawAppsFlyer()
             GUILayout.BeginVertical();
             GUILayout.Label("APPSFLYER", EditorStyles.boldLabel);
             GUILayout.Space(10);
+            scroll = EditorGUILayout.BeginScrollView(scroll);
             CPUtility.DrawButtonInstallPackage("Install AppsFlyer", "Remove AppsFlyer",
                 ConstantPackage.PackageNameAppFlyer, ConstantPackage.MaxVersionAppFlyer);
             CPUtility.DrawButtonInstallPackage("Install AppsFlyer Revenue Generic", "Remove AppsFlyer Revenue Generic",
@@ -115,6 +117,7 @@ public static void OnDrawAppsFlyer()
             }
 
             GUILayout.Space(10);
+            EditorGUILayout.EndScrollView();
             GUILayout.EndVertical();
         }
     }

VirtueSky/ControlPanel/ConstantControlPanel.cs

@@ -3,6 +3,6 @@ namespace VirtueSky.ControlPanel.Editor
     public class ConstantControlPanel
     {
         public static int WIDTH_CONTENT_BUTTON_STATE_CONTROL_PANEL = 210;
-        public static int POSITION_X_START_CONTENT = WIDTH_CONTENT_BUTTON_STATE_CONTROL_PANEL + 10;
+        public static int POSITION_X_START_CONTENT = WIDTH_CONTENT_BUTTON_STATE_CONTROL_PANEL + 5;
     }
 }

VirtueSky/ControlPanel/ConstantPackage.cs

@@ -2,7 +2,7 @@
 {
     public class ConstantPackage
     {
-        public const string VersionSunflower = "2.9.5";
+        public const string VersionSunflower = "2.9.6";
         public const string PackageNameInAppPurchase = "com.unity.purchasing";
         public const string MaxVersionInAppPurchase = "4.12.2";
         public const string PackageNameNewtonsoftJson = "com.unity.nuget.newtonsoft-json";
@@ -108,7 +108,7 @@ public class ConstantPackage
         public const string PackageNameCoffeeUIParticle = "com.coffee.ui-particle";
 
         public const string MaxVersionCoffeeUIParticle =
-            "https://github.com/mob-sakai/ParticleEffectForUGUI.git#4.6.2";
+            "https://github.com/mob-sakai/ParticleEffectForUGUI.git#4.9.1";
 
         public const string PackageNameAppleSignIn = "com.lupidan.apple-signin-unity";
 

VirtueSky/ControlPanel/ControlPanelWindowEditor.cs

@@ -60,7 +60,8 @@ private void OnGUI()
             DrawButton();
             EditorGUILayout.EndScrollView();
             Handles.DrawAAPolyLine(4, new Vector3(ConstantControlPanel.POSITION_X_START_CONTENT, 0),
-                new Vector3(210, position.height));
+                new Vector3(ConstantControlPanel.POSITION_X_START_CONTENT, position.height));
+
             GUILayout.EndVertical();
             DrawContent();
             GUILayout.EndHorizontal();

VirtueSky/GameService/Runtime/AppleAuthentication.cs

@@ -9,6 +9,7 @@
 using AppleAuth.Extensions;
 using AppleAuth.Interfaces;
 using AppleAuth.Native;
+
 #endif
 
 
@@ -93,17 +94,22 @@ protected override void Login()
                         serverCode.Value = identityToken;
                         authorizationCodeVariable.Value = authorizationCode;
                         userIdVariable.Value = userId;
+                        nameVariable.Value = $"{fullName.GivenName} {fullName.FamilyName}";
                         status.SetSuccessful();
                     }
                     else
                     {
+                        serverCode.Value = "";
+                        userIdVariable.Value = "";
                         status.SetFailed();
                     }
                 },
                 error =>
                 {
                     // Something went wrong
                     var authorizationErrorCode = error.GetAuthorizationErrorCode();
+                    serverCode.Value = "";
+                    userIdVariable.Value = "";
                     status.SetFailed();
                 });
 #endif

VirtueSky/GameService/Runtime/GooglePlayGamesAuthentication.cs

@@ -3,24 +3,44 @@
 using GooglePlayGames.BasicApi;
 #endif
 
+using System.Threading.Tasks;
 using UnityEngine;
+using VirtueSky.Events;
 using VirtueSky.Inspector;
 
 namespace VirtueSky.GameService
 {
     [EditorIcon("icon_authentication")]
     public class GooglePlayGamesAuthentication : ServiceAuthentication
     {
+        [SerializeField] private EventNoParam getNewServerCodeEvent;
+
         protected override void Init()
         {
 #if UNITY_ANDROID && VIRTUESKY_GPGS
             serverCode.Value = "";
             status.SetNotLoggedIn();
             PlayGamesPlatform.Activate();
             loginEvent.AddListener(Login);
+            getNewServerCodeEvent.AddListener(OnGetNewServerCode);
 #endif
         }
+#if UNITY_ANDROID && VIRTUESKY_GPGS
+        private async void OnGetNewServerCode()
+        {
+            if (!PlayGamesPlatform.Instance.IsAuthenticated()) return;
+            (serverCode.Value, status.Value) = await GetNewServerCode();
+        }
 
+        private Task<(string, StatusLogin)> GetNewServerCode()
+        {
+            var taskSource = new TaskCompletionSource<(string, StatusLogin)>();
+
+            PlayGamesPlatform.Instance.RequestServerSideAccess(true,
+                code => taskSource.SetResult((code, StatusLogin.Successful)));
+            return taskSource.Task;
+        }
+#endif
         protected override void Login()
         {
 #if UNITY_ANDROID && VIRTUESKY_GPGS
@@ -34,6 +54,7 @@ protected override void Login()
                         {
                             Debug.Log("Authorization code: " + code);
                             serverCode.Value = code;
+                            nameVariable.Value = PlayGamesPlatform.Instance.GetUserDisplayName();
                             status.SetSuccessful();
                         });
                 }
@@ -48,6 +69,7 @@ protected override void Login()
                                 {
                                     Debug.Log("Authorization code: " + code);
                                     serverCode.Value = code;
+                                    nameVariable.Value = PlayGamesPlatform.Instance.GetUserDisplayName();
                                     status.SetSuccessful();
                                 });
                         }

VirtueSky/GameService/Runtime/ServiceAuthentication.cs

@@ -12,13 +12,9 @@ public abstract class ServiceAuthentication : MonoBehaviour
         [SerializeField] private bool dontDestroyOnLoad;
         [SerializeField] protected StatusLoginVariable status;
         [SerializeField] protected StringVariable serverCode;
+        [SerializeField] protected StringVariable nameVariable;
         [SerializeField] protected EventNoParam loginEvent;
 
-        private void Start()
-        {
-            Init();
-        }
-
         protected virtual void Awake()
         {
             if (dontDestroyOnLoad)
@@ -27,6 +23,11 @@ protected virtual void Awake()
             }
         }
 
+        private void Start()
+        {
+            Init();
+        }
+
         protected abstract void Init();
         protected abstract void Login();
 #if UNITY_EDITOR