gg.easy.airship 0.1.2109 → 0.1.2111

package/Editor/BuildMenu.cs

@@ -1,7 +1,9 @@
 #if UNITY_EDITOR
 using System;
+using System.Collections.Generic;
 using UnityEditor;
 using UnityEditor.Build;
+using UnityEditor.Build.Profile;
 using UnityEditor.Build.Reporting;
 using UnityEngine;
 #if UNITY_EDITOR_OSX
@@ -226,11 +228,24 @@ namespace Editor {
 
             PlayerSettings.SplashScreen.show = false;
             PlayerSettings.SetScriptingBackend(NamedBuildTarget.Android, ScriptingImplementation.IL2CPP);
-            var options = new BuildPlayerOptions();
-            options.scenes = scenes;
-            options.locationPathName = $"build/client_android/{ClientExecutableName}.apk";
-            options.target = BuildTarget.Android;
-            if (development == true) {
+            PlayerSettings.Android.splitApplicationBinary = !development;
+
+            BuildProfile buildProfile;
+            if (development) {
+                buildProfile = AssetDatabase.LoadAssetAtPath<BuildProfile>("Assets/Settings/Build Profiles/Android Debug.asset");
+            } else {
+                buildProfile = AssetDatabase.LoadAssetAtPath<BuildProfile>("Assets/Settings/Build Profiles/Android Google Play.asset");
+            }
+            var options = new BuildPlayerWithProfileOptions();
+            var editorBuildScenes = new List<EditorBuildSettingsScene>();
+            foreach (var sceneName in scenes) {
+                editorBuildScenes.Add(new EditorBuildSettingsScene(sceneName, true));
+            }
+            buildProfile.overrideGlobalScenes = true;
+            buildProfile.scenes = editorBuildScenes.ToArray();
+            options.buildProfile = buildProfile;
+            options.locationPathName = $"build/client_android/{ClientExecutableName}.{(development ? "apk" : "aab")}";
+            if (development) {
                 options.options = BuildOptions.Development;
             }
 

package/Editor/CreateAssetBundles.cs

@@ -237,7 +237,7 @@ public static class CreateAssetBundles {
 	}
 #endif
 
-	private static GameConfig BuildGameConfig(){
+	public static GameConfig BuildGameConfig() {
 		GameConfig gameConfig = GameConfig.Load();
 
 		// Update tags
@@ -264,7 +264,7 @@ public static class CreateAssetBundles {
 		return gameConfig;
 	}
 
-	private static bool BuildGameAssetBundles(AirshipPlatform platform, bool useCache = true) {
+	public static bool BuildGameAssetBundles(AirshipPlatform platform, bool useCache = true) {
 		ResetScenes();
 
 		if (!PrePublishChecks()) {
@@ -277,7 +277,7 @@ public static class CreateAssetBundles {
 		}
 
 		var sw = Stopwatch.StartNew();
-		var gameConfig = BuildGameConfig();
+		var gameConfig = GameConfig.Load();
 		if(!gameConfig){
 			return false;
 		}

package/Editor/Publish/Deploy.cs

@@ -42,7 +42,7 @@ public class Deploy {
 		// NetworkPrefabManager.WriteAllCollections();
 		// Sort the current platform first to speed up build time
 		List<AirshipPlatform> platforms = new();
-		var gameConfig = GameConfig.Load();
+		var gameConfig = CreateAssetBundles.BuildGameConfig();
 		if (gameConfig.supportsMobile) {
 			platforms.Add(AirshipPlatform.iOS);
 			platforms.Add(AirshipPlatform.Android);
@@ -122,8 +122,7 @@ public class Deploy {
 		}
 
 		// Rebuild Typescript
-		var skipRecompileOnCodeDeploy = skipBuild && TypescriptServicesLocalConfig.instance.skipCompileOnCodeDeploy;
-		var shouldRecompile = !skipBuild || !skipRecompileOnCodeDeploy;
+		var shouldRecompile = !skipBuild;
 		var shouldResumeTypescriptWatch = shouldRecompile && TypescriptCompilationService.IsWatchModeRunning;
 		
 		// We want to do a full publish
@@ -303,15 +302,17 @@ public class Deploy {
 				// UploadSingleGameFile(urls.Windows_client_scenes, $"{AirshipPlatform.Windows}/client/scenes", AirshipPlatform.Windows),
 				UploadSingleGameFile(urls.Windows_shared_resources, $"{AirshipPlatform.Windows}/shared/resources", AirshipPlatform.Windows),
 				UploadSingleGameFile(urls.Windows_shared_scenes, $"{AirshipPlatform.Windows}/shared/scenes", AirshipPlatform.Windows),
+			});
 
-				// UploadSingleGameFile(urls.iOS_client_resources, $"{AirshipPlatform.iOS}/client/resources", AirshipPlatform.iOS),
-				// UploadSingleGameFile(urls.iOS_client_scenes, $"{AirshipPlatform.iOS}/client/scenes", AirshipPlatform.iOS),
-				UploadSingleGameFile(urls.iOS_shared_resources, $"{AirshipPlatform.iOS}/shared/resources", AirshipPlatform.iOS),
-				UploadSingleGameFile(urls.iOS_shared_scenes, $"{AirshipPlatform.iOS}/shared/scenes", AirshipPlatform.iOS),
+			if (gameConfig.supportsMobile) {
+				uploadList.AddRange(new List<IEnumerator>() {
+					UploadSingleGameFile(urls.iOS_shared_resources, $"{AirshipPlatform.iOS}/shared/resources", AirshipPlatform.iOS),
+					UploadSingleGameFile(urls.iOS_shared_scenes, $"{AirshipPlatform.iOS}/shared/scenes", AirshipPlatform.iOS),
 
-				UploadSingleGameFile(urls.Android_shared_resources, $"{AirshipPlatform.Android}/shared/resources", AirshipPlatform.Android),
-				UploadSingleGameFile(urls.Android_shared_scenes, $"{AirshipPlatform.Android}/shared/scenes", AirshipPlatform.Android),
-			});
+					UploadSingleGameFile(urls.Android_shared_resources, $"{AirshipPlatform.Android}/shared/resources", AirshipPlatform.Android),
+					UploadSingleGameFile(urls.Android_shared_scenes, $"{AirshipPlatform.Android}/shared/scenes", AirshipPlatform.Android),
+				});
+			}
 		}
 
 		// wait for all

package/Editor/TypescriptServices/Editor/TypescriptOptions.cs

@@ -143,13 +143,6 @@ namespace Airship.Editor {
                     EditorGUILayout.ToggleLeft(new GUIContent("Automatically Run on Editor Startup", "Compilation of TypeScript files will be handled by the editor"), projectSettings.typescriptAutostartCompiler);
                 projectSettings.typescriptPreventPlayOnError =
                     EditorGUILayout.ToggleLeft(new GUIContent("Prevent Play Mode With Errors", "Stop being able to go into play mode if there are active compiler errors"), projectSettings.typescriptPreventPlayOnError);
-                
-                localSettings.skipCompileOnCodeDeploy =
-                    EditorGUILayout.ToggleLeft(new GUIContent("Skip Compile on Code Publish *", "This will skip compilation on code publish"), localSettings.skipCompileOnCodeDeploy);
-
-                if (localSettings.skipCompileOnCodeDeploy) {
-                    EditorGUILayout.HelpBox("Skipping compilation on code deploy may speed up the deploy, but it has a very small chance of publishing broken code if the watch state is incorrect.", MessageType.Warning);
-                }
             }
             AirshipEditorGUI.EndSettingGroup();
             
@@ -169,8 +162,6 @@ namespace Airship.Editor {
             
 
                 projectSettings.typescriptVerbose = EditorGUILayout.ToggleLeft(new GUIContent("Verbose Output", "Will display much more verbose information when compiling a TypeScript project"),  projectSettings.typescriptVerbose );
-
-            
                 
                 #if AIRSHIP_INTERNAL
                 projectSettings.typescriptWriteOnlyChanged = EditorGUILayout.ToggleLeft(new GUIContent("Write Only Changed", "Will write only changed files (this shouldn't be enabled unless there's a good reason for it)"), projectSettings.typescriptWriteOnlyChanged);
@@ -178,8 +169,8 @@ namespace Airship.Editor {
             }
             AirshipEditorGUI.EndSettingGroup();
             
-            EditorGUILayout.Space(10);
-            EditorGUILayout.LabelField("* This property only applies to your instance of the project");
+            // EditorGUILayout.Space(10);
+            // EditorGUILayout.LabelField("* This property only applies to your instance of the project");
             
             if (GUI.changed) {
                 projectSettings.Modify();
@@ -266,13 +257,17 @@ namespace Airship.Editor {
             }
         }
 
+        private static GUIContent projectSettingsIcon;
+        private static GUIContent userSettingsIcon;
+        
         private static TypescriptOptionsTab selectedTab;
         internal static void RenderSettings() {
-  
+            projectSettingsIcon ??= EditorGUIUtility.IconContent("Project");
+            userSettingsIcon ??= EditorGUIUtility.IconContent("BuildSettings.Standalone.Small");
 
             selectedTab = (TypescriptOptionsTab) AirshipEditorGUI.BeginTabs((int) selectedTab, new[] {
-                "Project Settings", 
-                "Local Settings"
+                new GUIContent(" Project Settings", projectSettingsIcon.image), 
+                new GUIContent(" User Settings", userSettingsIcon.image)
             });
             {
                 if (selectedTab == TypescriptOptionsTab.ProjectSettings) {

package/Editor/TypescriptServices/TypescriptServices.cs

@@ -16,7 +16,6 @@ namespace Airship.Editor {
     internal class TypescriptServicesLocalConfig : ScriptableSingleton<TypescriptServicesLocalConfig> {
         [SerializeField]
         internal bool hasInitialized = false;
-        [SerializeField] internal bool skipCompileOnCodeDeploy = false;
         
         public void Modify() {
             Save(true);

package/Editor/Util/AirshipEditorGUI.cs

@@ -1,4 +1,6 @@
 using System;
+using System.Collections.Generic;
+using System.Linq;
 using Editor.EditorInternal;
 using UnityEditor;
 using UnityEngine;
@@ -66,8 +68,8 @@ public class AirshipEditorGUI {
         int right = Mathf.RoundToInt((tabIndex + 1) * tabWidth);
         return new Rect(rect.x + left, rect.y, right - left,  /* kTabButtonHeight */ TabButtonHeight);
     }
-    
-    internal static int BeginTabs(int selectedIndex, string[] tabs) {
+
+    internal static int BeginTabs(int selectedIndex, GUIContent[] tabs) {
         var rect = EditorGUILayout.BeginVertical(new GUIStyle("FrameBox"));
         GUILayoutUtility.GetRect(10, TabButtonHeight);
         

package/Runtime/Code/Accessories/Clothing/PlatformGear.cs

@@ -8,6 +8,16 @@ using UnityEngine.Networking;
 using UnityEngine.Serialization;
 
 namespace Code.Accessories.Clothing {
+    public class PlatformGearBundleInfo {
+        public AssetBundle assetBundle;
+        public PlatformGearBundleManifest manifest;
+
+        public PlatformGearBundleInfo(AssetBundle assetBundle, PlatformGearBundleManifest manifest) {
+            this.assetBundle = assetBundle;
+            this.manifest = manifest;
+        }
+    }
+
     /**
      * Clothing exists on the backend and consists of one or many accessories.
      * Usually it's just one accessory (ie: a hat)
@@ -21,10 +31,15 @@ namespace Code.Accessories.Clothing {
         public AccessoryFace face;
 
         public static Dictionary<string, Task<bool>> inProgressDownloads = new();
+        /// <summary>
+        /// AirId to asset bundle
+        /// </summary>
+        public static Dictionary<string, PlatformGearBundleInfo> loadedPlatformGearBundles = new();
 
         [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.SubsystemRegistration)]
         public static void OnReload() {
             inProgressDownloads.Clear();
+            loadedPlatformGearBundles.Clear();
         }
 
         public static async Task<PlatformGear> DownloadYielding(string classId, string airId) {
@@ -38,7 +53,7 @@ namespace Code.Accessories.Clothing {
             }
 
             // Check if we already loaded an asset bundle that contains this clothing piece.
-            if (PlatformGearManager.Instance.loadedPlatformGearBundles.TryGetValue(airId, out var loadedBundleInfo)) {
+            if (loadedPlatformGearBundles.TryGetValue(airId, out var loadedBundleInfo)) {
                 foreach (var clothing in loadedBundleInfo.manifest.gearList) {
                     if (clothing.classId == classId) {
                         return clothing;
@@ -83,7 +98,7 @@ namespace Code.Accessories.Clothing {
 
             await manifestReq;
             var manifest = (PlatformGearBundleManifest) manifestReq.asset;
-            PlatformGearManager.Instance.loadedPlatformGearBundles[airId] = new PlatformGearBundleInfo(bundle, manifest);
+            loadedPlatformGearBundles[airId] = new PlatformGearBundleInfo(bundle, manifest);
             foreach (var clothing in manifest.gearList) {
                 if (clothing.classId == classId) {
                     inProgressTask.SetResult(true);

package/Runtime/Code/Auth/AuthManager.cs

@@ -15,71 +15,71 @@ using UnityEngine.Networking;
 public class AuthManager {
     public static Action authed;
 
-   private static string GetAccountJSONPath() {
+	private static string GetAccountJSONPath() {
        var stagingExtension = "";
 #if AIRSHIP_STAGING
        stagingExtension = "_staging"; 
 #endif
 #if DEVELOPMENT_BUILD
-    return Path.Combine(Application.persistentDataPath, $"account_devbuild{stagingExtension}.json");
+		return Path.Combine(Application.persistentDataPath, $"account_devbuild{stagingExtension}.json");
 #endif
 #if UNITY_EDITOR
-      return Path.Combine(Application.persistentDataPath, $"account_editor{stagingExtension}.json");
+		return Path.Combine(Application.persistentDataPath, $"account_editor{stagingExtension}.json");
 #endif
-      return Path.Combine(Application.persistentDataPath, $"account{stagingExtension}.json");
-   }
+		return Path.Combine(Application.persistentDataPath, $"account{stagingExtension}.json");
+	}
 
-   [CanBeNull]
-   public static AuthSave GetSavedAccount() {
-      var path = GetAccountJSONPath();
-      if (!File.Exists(path)) {
-         return null;
-      }
+	[CanBeNull]
+	public static AuthSave GetSavedAccount() {
+		var path = GetAccountJSONPath();
+		if (!File.Exists(path)) {
+			return null;
+		}
 
-      try {
-         var authSave = JsonUtility.FromJson<AuthSave>(File.ReadAllText(path));
-         return authSave;
-      } catch (Exception e) {
-         Debug.LogError(e);
-      }
-      return null;
-   }
+		try {
+			var authSave = JsonUtility.FromJson<AuthSave>(File.ReadAllText(path));
+			return authSave;
+		} catch (Exception e) {
+			Debug.LogError(e);
+		}
+		return null;
+	}
    
-   public static void SaveAuthAccount(string refreshToken) {
-      var authSave = new AuthSave {
-         refreshToken = refreshToken,
-         time = DateTimeOffset.Now.ToUnixTimeSeconds()
-      };
-      var path = GetAccountJSONPath();
-      File.WriteAllText(path, JsonUtility.ToJson(authSave));
-   }
+	public static void SaveAuthAccount(string refreshToken) {
+		var authSave = new AuthSave {
+			refreshToken = refreshToken,
+			time = DateTimeOffset.Now.ToUnixTimeSeconds()
+		};
+		var path = GetAccountJSONPath();
+		File.WriteAllText(path, JsonUtility.ToJson(authSave));
+	}
 
-   public static async Task<FirebaseTokenResponse> LoginWithRefreshToken(string refreshToken) {
-      var body = $"grantType=refresh_token&refresh_token={refreshToken}";
-      var req = UnityWebRequest.PostWwwForm("https://securetoken.googleapis.com/v1/token?key=" + AirshipApp.firebaseApiKey + "&" + body, "");
-      req.SetRequestHeader("Content-Type", "application/x-www-form-urlencoded");
-      await req.SendWebRequest();
-      if (req.result == UnityWebRequest.Result.ProtocolError) {
-         Debug.LogError(req.error);
-         return null;
-      }
-      return JsonUtility.FromJson<FirebaseTokenResponse>(req.downloadHandler.text);
-   }
+	public static async Task<FirebaseTokenResponse> LoginWithRefreshToken(string refreshToken) {
+		var body = $"grantType=refresh_token&refresh_token={refreshToken}";
+		var req = UnityWebRequest.PostWwwForm("https://securetoken.googleapis.com/v1/token?key=" + AirshipApp.firebaseApiKey + "&" + body, "");
+		req.SetRequestHeader("Content-Type", "application/x-www-form-urlencoded");
+		await req.SendWebRequest();
+		if (req.result == UnityWebRequest.Result.ProtocolError) {
+			Debug.LogError(req.error);
+			return null;
+		}
+		return JsonUtility.FromJson<FirebaseTokenResponse>(req.downloadHandler.text);
+	}
 
-   public static void ClearSavedAccount() {
+	public static void ClearSavedAccount() {
 #if UNITY_EDITOR
-      InternalHttpManager.editorAuthToken = "";
-      InternalHttpManager.editorUserId = "";
+		InternalHttpManager.editorAuthToken = "";
+		InternalHttpManager.editorUserId = "";
 #else
-      InternalHttpManager.authToken = "";
+		InternalHttpManager.authToken = "";
 #endif
-      var path = GetAccountJSONPath();
-      if (File.Exists(path)) {
-         File.Delete(path);
-      }
-   }
+		var path = GetAccountJSONPath();
+		if (File.Exists(path)) {
+			File.Delete(path);
+		}
+	}
    
-   public static async Task<(bool success, string error)> AuthWithGoogle() {
+	public static async Task<(bool success, string error)> AuthWithGoogle() {
 #if AIRSHIP_STAGING
         string clientId = "987279961241-0mjidme48us0fis0vtqk4jqrsmk7ar0n.apps.googleusercontent.com";
         string clientSecret = "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";
@@ -99,6 +99,16 @@ public class AuthManager {
         clientSecret = null;
         redirectUri = "gg.easy.airship:/oauth2";
 #endif
+#endif
+	   
+#if UNITY_ANDROID && !UNITY_EDITOR
+#if AIRSHIP_STAGING
+		// TODO
+#else
+		clientId = "457451560440-htottasd1788to2boc7lg08jrkduotg1.apps.googleusercontent.com";
+		clientSecret = null;
+	    redirectUri = "https://airship.gg/oauth2";
+#endif
 #endif
 
         var auth = new GoogleAuth(new AuthorizationCodeFlow.Configuration() {
@@ -110,6 +120,8 @@ public class AuthManager {
             redirectUri = redirectUri,
             scope = "openid email profile",
         });
+        
+        Debug.Log($"Redirect URI: {redirectUri}");
 
         var crossPlatformBrowser = new CrossPlatformBrowser();
         var standaloneBrowser = new StandaloneBrowser();
@@ -121,8 +133,8 @@ public class AuthManager {
         crossPlatformBrowser.platformBrowsers.Add(RuntimePlatform.OSXEditor, standaloneBrowser);
         crossPlatformBrowser.platformBrowsers.Add(RuntimePlatform.OSXPlayer, standaloneBrowser);
         crossPlatformBrowser.platformBrowsers.Add(RuntimePlatform.IPhonePlayer, new ASWebAuthenticationSessionBrowser());
-        // crossPlatformBrowser.platformBrowsers.Add(RuntimePlatform.Android, new DeepLinkBrowser());
-        crossPlatformBrowser.platformBrowsers.Add(RuntimePlatform.Android, new AndroidBrowser("http://*:8080"));
+        crossPlatformBrowser.platformBrowsers.Add(RuntimePlatform.Android, new DeepLinkBrowser());
+        // crossPlatformBrowser.platformBrowsers.Add(RuntimePlatform.Android, new AndroidBrowser("http://*:8080"));
 
         using var authenticationSession = new AuthenticationSession(auth, crossPlatformBrowser);
 
@@ -166,4 +178,4 @@ public class AuthManager {
             return (false, ""); // Don't return a display error
         }
     }
-}
+}

package/Runtime/Code/UI/ManageFullscreenSwitch.cs

@@ -10,26 +10,25 @@ public class ManageFullscreenSwitch : MonoBehaviour
 
     private bool _fullscreen = false;
 
-    private void Start()
-    {
+    private void Start() {
+#if !UNITY_IOS && !UNITY_ANDROID
         _fullscreen = Screen.fullScreen;
         SetFullScreenValues();
+#endif
     }
-    private void Update()
-    {
-        if (_fullscreen != Screen.fullScreen)
-        {
-            if (Screen.fullScreen)
-            {
+    private void Update() {
+#if !UNITY_IOS && !UNITY_ANDROID
+        if (_fullscreen != Screen.fullScreen) {
+            if (Screen.fullScreen) {
                 RestoreFullscreenResolution();
             }
 
             _fullscreen = Screen.fullScreen;
         }
+#endif
     }
 
-    private void RestoreFullscreenResolution()
-    {
+    private void RestoreFullscreenResolution() {
         SetFullScreenValues();
         Screen.SetResolution(_fullscreenWidth, _fullscreenHeight, true, _fullscreenAspectRatio);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gg.easy.airship",
-  "version": "0.1.2109",
+  "version": "0.1.2111",
   "displayName": "Airship",
   "unity": "2021.3",
   "unityRelease": "12f1",

package/Runtime/Code/Accessories/Clothing/PlatformGearManager.cs

@@ -1,22 +0,0 @@
-using System.Collections.Generic;
-using UnityEngine;
-using UnityEngine.Serialization;
-
-namespace Code.Accessories.Clothing {
-    public class PlatformGearBundleInfo {
-        public AssetBundle assetBundle;
-        public PlatformGearBundleManifest manifest;
-
-        public PlatformGearBundleInfo(AssetBundle assetBundle, PlatformGearBundleManifest manifest) {
-            this.assetBundle = assetBundle;
-            this.manifest = manifest;
-        }
-    }
-
-    public class PlatformGearManager : Singleton<PlatformGearManager> {
-        /// <summary>
-        /// AirId to asset bundle
-        /// </summary>
-        public Dictionary<string, PlatformGearBundleInfo> loadedPlatformGearBundles = new();
-    }
-}

package/Runtime/Code/Accessories/Clothing/PlatformGearManager.cs.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 9136398281fe4ea6b7e827eb658af255
-timeCreated: 1739814504