gg.easy.airship 0.1.2107 → 0.1.2108

package/Editor/Accessories/Clothing/PlatformGearBundleManifestEditor.cs

@@ -26,6 +26,30 @@ namespace Editor.Accessories.Clothing {
         private static string easyOrgId = "6b62d6e3-9d74-449c-aeac-b4feed2012b1";
         private bool skipBuild = false;
 
+        [MenuItem("Airship/Internal/Publish All Platform Gear")]
+        public static async void PublishAllPlatformGearBundles() {
+            List<PlatformGearBundleManifest> gearBundles = new();
+
+            // Get all asset GUIDs
+            string[] guids = AssetDatabase.FindAssets("t:PlatformGearBundleManifest");
+            foreach (string guid in guids) {
+                string path = AssetDatabase.GUIDToAssetPath(guid);
+                var obj = AssetDatabase.LoadAssetAtPath<PlatformGearBundleManifest>(path);
+                if (obj != null) {
+                    gearBundles.Add(obj);
+                }
+            }
+
+            int counter = 0;
+            foreach (var gearBundle in gearBundles) {
+                var editor = CreateEditor(gearBundle) as PlatformGearBundleManifestEditor;
+                await editor.BuildAllPlatforms();
+                counter++;
+                Debug.Log($"Gear publish progress: {counter}/{guids.Length}");
+                await Awaitable.WaitForSecondsAsync(0.1f);
+            }
+        }
+
         private void OnEnable() {
             skipBuild = false;
         }
@@ -45,7 +69,7 @@ namespace Editor.Accessories.Clothing {
             this.skipBuild = EditorGUILayout.Toggle("Skip Build", this.skipBuild);
         }
 
-        private async void BuildAllPlatforms() {
+        public async Task BuildAllPlatforms() {
             var st = Stopwatch.StartNew();
             bool success = true;
 

package/Editor/BuildMenu.cs

@@ -41,6 +41,8 @@ namespace Editor {
 
         private static void OnBuild() {
             PhysicsSetup.Setup(null);
+
+
         }
 
         public static void BuildLinuxServerStaging() {

package/Editor/CreateAssetBundles.cs

@@ -10,6 +10,7 @@ using UnityEditor.Build.Pipeline;
 using UnityEditor.Build.Pipeline.Interfaces;
 using UnityEditor.Build.Pipeline.Tasks;
 using UnityEngine;
+using UnityEngine.Rendering;
 #if UNITY_EDITOR
 using UnityEditor;
 #endif
@@ -356,8 +357,18 @@ public static class CreateAssetBundles {
 				});
 			}
 		}
+
 		// var tasks = DefaultBuildTasks.Create(DefaultBuildTasks.Preset.AssetBundleBuiltInShaderExtraction);
 		var buildTarget = AirshipPlatformUtil.ToBuildTarget(platform);
+
+		if (platform == AirshipPlatform.Android) {
+			PlayerSettings.SetUseDefaultGraphicsAPIs(buildTarget, false);
+			PlayerSettings.SetGraphicsAPIs(buildTarget, new GraphicsDeviceType[]
+			{
+				GraphicsDeviceType.OpenGLES3
+			});
+		}
+
 		var buildTargetGroup = BuildPipeline.GetBuildTargetGroup(buildTarget);
 		if (platform is AirshipPlatform.Windows or AirshipPlatform.Mac or AirshipPlatform.Linux) {
 			buildTargetGroup = BuildTargetGroup.Standalone;

package/Editor/Packages/AirshipPackagesWindow.cs

@@ -24,6 +24,7 @@ using UnityEditor;
 using UnityEditor.Build.Pipeline;
 using UnityEngine;
 using UnityEngine.Networking;
+using UnityEngine.Rendering;
 using Debug = UnityEngine.Debug;
 using Object = UnityEngine.Object;
 using ZipFile = Unity.VisualScripting.IonicZip.ZipFile;
@@ -423,6 +424,13 @@ namespace Editor.Packages {
                     if (platform is AirshipPlatform.Windows or AirshipPlatform.Mac or AirshipPlatform.Linux) {
                         buildTargetGroup = BuildTargetGroup.Standalone;
                     }
+                    if (platform == AirshipPlatform.Android) {
+                        PlayerSettings.SetUseDefaultGraphicsAPIs(buildTarget, false);
+                        PlayerSettings.SetGraphicsAPIs(buildTarget, new GraphicsDeviceType[]
+                        {
+                            GraphicsDeviceType.OpenGLES3
+                        });
+                    }
 
                     var buildParams = new BundleBuildParameters(
                         buildTarget,

package/Editor/Publish/API/CreateGameDeploymentDto.cs

@@ -8,6 +8,7 @@ public class CreateGameDeploymentDto {
     public bool deployCode;
     public bool deployAssets;
     public string[] packageSlugs;
+    public string[] platforms;
 }
 
 [Serializable]

package/Editor/Publish/Deploy.cs

@@ -150,6 +150,13 @@ public class Deploy {
 		DeploymentDto deploymentDto = null;
 		string devKey = null;
 		{
+			List<string> platformStrings = new();
+			platformStrings.Add("Mac");
+			platformStrings.Add("Windows");
+			if (gameConfig.supportsMobile) {
+				platformStrings.Add("iOS");
+				platformStrings.Add("Android");
+			}
 			var packageSlugs = gameConfig.packages.Select((p) => p.id);
 			for (int i = 0; i < possibleKeys.Count; i++) {
 				devKey = possibleKeys[i];
@@ -161,7 +168,8 @@ public class Deploy {
 							defaultScene = gameConfig.startingScene.name,
 							deployCode = true,
 							deployAssets = platforms.Length > 0,
-							packageSlugs = packageSlugs.ToArray()
+							packageSlugs = packageSlugs.ToArray(),
+							platforms = platformStrings.ToArray(),
 						}), "application/json");
 				req.SetRequestHeader("Authorization", "Bearer " + devKey);
 				yield return req.SendWebRequest();

package/Runtime/Code/Bundles/AirshipPlatform.cs

@@ -19,7 +19,8 @@ namespace Code.Bootstrap {
             AirshipPlatform.iOS,
             AirshipPlatform.Mac,
             AirshipPlatform.Windows,
-            AirshipPlatform.Linux
+            AirshipPlatform.Linux,
+            AirshipPlatform.Android,
         };
 
         public static string GetStringName(AirshipPlatform platform) {

package/Runtime/Code/CoreUI/CoreLoadingScreen.prefab

@@ -464,7 +464,7 @@ GameObject:
   - component: {fileID: 6904609107978231724}
   - component: {fileID: 7072641826937089519}
   m_Layer: 5
-  m_Name: Image
+  m_Name: BottomCard
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -480,8 +480,10 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 0.92927, y: 0.92927, z: 0.92927}
-  m_ConstrainProportionsScale: 0
+  m_ConstrainProportionsScale: 1
   m_Children:
+  - {fileID: 4779218538534976006}
+  - {fileID: 1580868800969815117}
   - {fileID: 501496119120443493}
   - {fileID: 4779218537312054114}
   - {fileID: 7042672436343788158}
@@ -942,9 +944,7 @@ RectTransform:
   m_Children:
   - {fileID: 4779218538547314202}
   - {fileID: 6709306793874349174}
-  - {fileID: 1580868800969815117}
   - {fileID: 6349396839246893691}
-  - {fileID: 4779218538534976006}
   - {fileID: 2046571341396879633}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1034,6 +1034,7 @@ MonoBehaviour:
   spinner: {fileID: 4779218537929143458}
   gameImage: {fileID: 5080459163667922316}
   editorGameImageColor: {r: 0.14509805, g: 0.14509805, b: 0.14509805, a: 1}
+  bottomCard: {fileID: 2046571341396879633}
   voiceChatCard: {fileID: 6349396839246893691}
   voiceChatToggle: {fileID: 2165061502823066488}
   updatedByGame: 0
@@ -1078,17 +1079,17 @@ RectTransform:
   m_GameObject: {fileID: 4779218538534976007}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0.92927, y: 0.92927, z: 0.92927}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 1
   m_Children:
   - {fileID: 4779218536769478307}
-  m_Father: {fileID: 4779218538432630284}
+  m_Father: {fileID: 2046571341396879633}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 0, y: 116}
+  m_AnchoredPosition: {x: 0, y: -36.94728}
   m_SizeDelta: {x: 129.32092, y: 39.91571}
-  m_Pivot: {x: 0.5, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4779218538534976003
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -1846,7 +1847,7 @@ PrefabInstance:
   serializedVersion: 2
   m_Modification:
     serializedVersion: 3
-    m_TransformParent: {fileID: 4779218538432630284}
+    m_TransformParent: {fileID: 2046571341396879633}
     m_Modifications:
     - target: {fileID: 2203551379012122545, guid: f4a774ea871d94897b410c2210fd5105, type: 3}
       propertyPath: m_Name
@@ -1882,7 +1883,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6131290041883517747, guid: f4a774ea871d94897b410c2210fd5105, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0.5
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 6131290041883517747, guid: f4a774ea871d94897b410c2210fd5105, type: 3}
       propertyPath: m_AnchorMin.x
@@ -1890,7 +1891,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6131290041883517747, guid: f4a774ea871d94897b410c2210fd5105, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0.5
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 6131290041883517747, guid: f4a774ea871d94897b410c2210fd5105, type: 3}
       propertyPath: m_SizeDelta.x
@@ -1900,6 +1901,18 @@ PrefabInstance:
       propertyPath: m_SizeDelta.y
       value: 49.7565
       objectReference: {fileID: 0}
+    - target: {fileID: 6131290041883517747, guid: f4a774ea871d94897b410c2210fd5105, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 1.0761135
+      objectReference: {fileID: 0}
+    - target: {fileID: 6131290041883517747, guid: f4a774ea871d94897b410c2210fd5105, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 1.0761135
+      objectReference: {fileID: 0}
+    - target: {fileID: 6131290041883517747, guid: f4a774ea871d94897b410c2210fd5105, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 1.0761135
+      objectReference: {fileID: 0}
     - target: {fileID: 6131290041883517747, guid: f4a774ea871d94897b410c2210fd5105, type: 3}
       propertyPath: m_LocalPosition.x
       value: 0
@@ -1934,7 +1947,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6131290041883517747, guid: f4a774ea871d94897b410c2210fd5105, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -261
+      value: 47
       objectReference: {fileID: 0}
     - target: {fileID: 6131290041883517747, guid: f4a774ea871d94897b410c2210fd5105, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x

package/Runtime/Code/CoreUI/Loading/CoreLoadingScreen.cs

@@ -26,6 +26,7 @@ public class CoreLoadingScreen : BundleLoadingScreen
     public GameObject spinner;
     public RawImage gameImage;
     public Color editorGameImageColor;
+    public RectTransform bottomCard;
 
     [NonSerialized] private float startTime = 0f;
     [NonSerialized] private bool showedVoiceChatCard = false;
@@ -59,6 +60,10 @@ public class CoreLoadingScreen : BundleLoadingScreen
         if (Application.isEditor) {
             this.gameImage.enabled = false;
         }
+#endif
+
+#if UNITY_IOS || UNITY_ANDROID
+
 #endif
 
         this.startTime = 0f;
@@ -68,9 +73,8 @@ public class CoreLoadingScreen : BundleLoadingScreen
 
         var deviceInfo = DeviceBridge.GetDeviceType();
         if (deviceInfo is AirshipDeviceType.Phone or AirshipDeviceType.Tablet) {
-            var t = this.disconnectButton.transform as RectTransform;
-            t.anchoredPosition = new Vector2(-50, 50);
-            t.localScale = new Vector3(0.5f, 0.5f, 0.5f);
+            this.bottomCard.localScale = Vector3.one * 1.1f;
+            this.bottomCard.anchoredPosition = new Vector2(0, 185);
         }
 
         _canvas.enabled = true;
@@ -83,7 +87,7 @@ public class CoreLoadingScreen : BundleLoadingScreen
         this.voiceChatToggle.onValueChanged += VoiceChatToggle_OnValueChanged;
 
         if (Application.isMobilePlatform) {
-            this.disconnectButton.transform.localScale = new Vector3(1.2f, 1.2f, 1.2f);
+            this.disconnectButton.transform.localScale = new Vector3(1.3f, 1.2f, 1.2f);
         }
     }
 

package/Runtime/Code/Player/Accessories/AccessoryBuilder.cs

@@ -89,8 +89,8 @@ public class AccessoryBuilder : MonoBehaviour {
         //print("AccessoryBuilder OnEnable: " + this.gameObject.name);
         meshCombiner.OnCombineComplete += OnMeshCombineCompleted;
 
-        if (Application.isPlaying && this.rig.faceMesh.material.mainTexture == null) {
-            this.rig.faceMesh.gameObject.SetActive(false);
+        if (Application.isPlaying && rig.faceMesh.material.mainTexture == null) {
+            rig.faceMesh.gameObject.SetActive(false);
         }
 
         // update list of accessories
@@ -257,12 +257,12 @@ public class AccessoryBuilder : MonoBehaviour {
 
     [HideFromTS]
     public ActiveAccessory[] LoadOutfit(AccessoryOutfit outfit) {
-        this.currentOutfit = outfit;
+        currentOutfit = outfit;
 
-        this.SetSkinColor(outfit.skinColor);
+        SetSkinColor(outfit.skinColor);
 
         if (outfit.faceDecal && outfit.faceDecal.decalTexture) {
-            this.SetFaceTexture(outfit.faceDecal.decalTexture);
+            SetFaceTexture(outfit.faceDecal.decalTexture);
         }
 
         return AddRange(outfit.accessories);
@@ -290,7 +290,7 @@ public class AccessoryBuilder : MonoBehaviour {
                 }
             }
 
-            this.RemoveBySlot(accessoryTemplate.accessorySlot);
+            RemoveBySlot(accessoryTemplate.accessorySlot);
 
             var lods = new List<ActiveAccessory>();
             for (var lodLevel = 0; lodLevel < lodCount; lodLevel++) {
@@ -434,6 +434,7 @@ public class AccessoryBuilder : MonoBehaviour {
         propertyBlock.SetTexture(FaceBaseMapTexture, texture);
         rig.faceMesh.SetPropertyBlock(propertyBlock);
         rig.faceMesh.gameObject.SetActive(true);
+        rig.faceMesh.enabled = true;
     }
 
     public void UpdateCombinedMesh() {
@@ -528,7 +529,7 @@ public class AccessoryBuilder : MonoBehaviour {
             }
 
             // print("AccessoryBuilder MeshCombine: " + this.gameObject.name);
-            meshCombiner.CombineMeshes(this.skinColor);
+            meshCombiner.CombineMeshes(skinColor);
         } else {
             // print("AccessoryBuilder Manual Rig Mapping: " + this.gameObject.name);
             MapAccessoriesToRig();

package/Runtime/Code/Util/Singleton.cs

@@ -1,3 +1,4 @@
+using UnityEditor;
 using UnityEngine;
 using UnityEngine.SceneManagement;
 
@@ -27,30 +28,17 @@ public abstract class Singleton<T> : MonoBehaviour where T : MonoBehaviour
 	public static T Instance {
 		get {
 			if (_instance == null) {
-				_instance = (T)FindObjectOfType (typeof(T));
+				_instance = (T) FindAnyObjectByType(typeof(T));
 				if (_instance == null) {
-
-					string goName = typeof(T).ToString ();
+					var go = new GameObject();
+					go.name = typeof(T).ToString();
 					
-					GameObject go = GameObject.Find(goName);
-					if (go == null) 
-					{
-						// var core = GameObject.Find("AirshipCore");
-						// if (!core) {
-						// 	core = new GameObject("AirshipCore");
-						// }
-						go = new GameObject();
-						go.name = goName;
-						go.hideFlags = HideFlags.HideAndDontSave;
-
-						var coreScene = SceneManager.GetSceneByName("CoreScene");
-						if (coreScene.IsValid()) {
-							SceneManager.MoveGameObjectToScene(go, coreScene);
-						}
+					var coreScene = SceneManager.GetSceneByName("CoreScene");
+					if (coreScene.IsValid()) {
+						SceneManager.MoveGameObjectToScene(go, coreScene);
 					}
 
-					_instance = go.AddComponent<T> ();
-					// print("added component " + _instance.name);
+					_instance = go.AddComponent<T>();
 				}
 			}
 			return _instance;
@@ -87,4 +75,10 @@ public abstract class Singleton<T> : MonoBehaviour where T : MonoBehaviour
 			this.transform.parent = parentGO.transform;
 		}
 	}
+	
+	[RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.SubsystemRegistration)]
+	private static void ResetStaticFields()
+	{
+		_instance = null;
+	}
 }

package/Runtime/Code/VoxelWorld/VoxelBlocks.cs

@@ -4,6 +4,7 @@ using System.Linq;
 using Assets.Airship.VoxelRenderer;
 using System.Collections.Generic;
 using System.IO;
+using System.Threading.Tasks;
 using System.Xml;
 using JetBrains.Annotations;
 using UnityEngine;
@@ -314,6 +315,7 @@ public class VoxelBlocks : MonoBehaviour {
     [NonSerialized] public List<string> m_bundlePaths = null;
 
     [SerializeField] public List<VoxelBlockDefinionList> blockDefinionLists = new();
+    private TaskCompletionSource<bool> loadedTask = new TaskCompletionSource<bool>(false);
 
     public BlockDefinition GetBlock(BlockId index) {
         
@@ -478,6 +480,11 @@ public class VoxelBlocks : MonoBehaviour {
         }
                 
     }
+    
+    public async Task WaitForLoaded() {
+        if (loadedTask.Task.IsCompleted) return;
+        await loadedTask.Task;
+    }
 
     private void ParseQuarterBlock(BlockDefinition block) {
 
@@ -594,7 +601,6 @@ public class VoxelBlocks : MonoBehaviour {
         }
     }
     public void Load(bool loadTexturesDirectlyFromDisk = false) {
-
         //clear everything
         Clear();
                 
@@ -1099,6 +1105,7 @@ public class VoxelBlocks : MonoBehaviour {
             }*/
         }
         // Profiler.EndSample();
+        loadedTask.TrySetResult(true);
     }
 
     //Fix a voxel value up with its solid mask bit

package/ThirdParty/UiRoundedCorners/ImageWithIndependentRoundedCorners.cs

@@ -61,6 +61,7 @@ namespace Nobi.UiRoundedCorners {
 			if (Application.isPlaying && !RunCore.IsClient()) return;
 
             image.material = null;      //This makes so that when the component is removed, the UI material returns to null
+            // EditorUtility.ClearDirty(image);
 
             DestroyHelper.Destroy(material);
 			image = null;
@@ -69,7 +70,9 @@ namespace Nobi.UiRoundedCorners {
 
 		public void Validate() {
 			if (material == null) {
-				material = new Material(Shader.Find("UI/RoundedCorners/IndependentRoundedCorners"));
+				material = new Material(Shader.Find("UI/RoundedCorners/IndependentRoundedCorners")) {
+					hideFlags = HideFlags.DontSave
+				};
 			}
 
 			if (image == null) {

package/ThirdParty/UiRoundedCorners/ImageWithRoundedCorners.cs

@@ -1,4 +1,5 @@
 using System;
+using UnityEditor;
 using UnityEngine;
 using UnityEngine.UI;
 
@@ -28,6 +29,7 @@ namespace Nobi.UiRoundedCorners {
 
 			if (image != null) {
 				image.material = null;      //This makes so that when the component is removed, the UI material returns to null
+				// EditorUtility.ClearDirty(image);
 			}
 
 			DestroyHelper.Destroy(material);
@@ -64,7 +66,9 @@ namespace Nobi.UiRoundedCorners {
 				var shader = Shader.Find("UI/RoundedCorners/RoundedCorners");
 				if (shader == null) return;
 				
-				material = new Material(shader);
+				material = new Material(shader) {
+					hideFlags = HideFlags.DontSave
+				};
 			}
 
 			if (image == null) {

package/package.json

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