gg.easy.airship 0.1.2158 → 0.1.2160

package/Editor/Accessories/AccessoryCollectionEditorTools.cs

@@ -132,6 +132,7 @@ public class AccessoryCollectionTools {
     // }
 
 
+#if AIRSHIP_INTERNAL
     [MenuItem("Airship/Avatar/Create Outfit Accessories from Mesh %f8", true)]
     [MenuItem("Assets/Create/Airship/Accessories/Create Outfit Accessories from Mesh", true)]
     private static bool ValidateCreateAccFromMesh(){
@@ -159,14 +160,16 @@ public class AccessoryCollectionTools {
         return Selection.GetFiltered<GameObject>(AssetModeMask).Length == 1;
     }
 
-    [MenuItem("Airship/Avatar/Create Accessory from Mesh %f8")]
-    [MenuItem("Assets/Create/Airship/Accessories/Create Accessory from Mesh")]
+    [MenuItem("Airship/Avatar/Create Accessory from Mesh %f8", false, 100)]
+    [MenuItem("Assets/Create/Airship/Accessories/Create Accessory from Mesh", false, 100)]
     static void CreateSingleAccFromMesh() {
         processedPaths.Clear();
         // defaultMat = AssetDatabase.LoadAssetAtPath<Material>("Assets/AirshipPackages/@Easy/CoreMaterials//MaterialLibrary/Organic/Clay.mat");
         UnpackSingleObject(Selection.GetFiltered<GameObject>(AssetModeMask)[0]);
     }
 
+#endif
+
     private static void UnpackSingleObject(GameObject rootGo){
         string rootPath = AssetDatabase.GetAssetPath(rootGo.GetInstanceID());
         string fileName = Path.GetFileNameWithoutExtension(rootPath);

package/Editor/BuildMenu.cs

@@ -67,6 +67,8 @@ namespace Editor {
 
             FileUtil.DeleteFileOrDirectory("build/StandaloneLinux64");
 
+            // This should probably be NamedBuildTarget.Server (rather than Standalone), but that does cause some issues.
+            // We will want to review this again in the future as a possible optimization.
             PlayerSettings.SetScriptingBackend(NamedBuildTarget.Standalone, ScriptingImplementation.IL2CPP);
             PlayerSettings.dedicatedServerOptimizations = true;
             PlayerSettings.insecureHttpOption = InsecureHttpOption.AlwaysAllowed;
@@ -194,7 +196,7 @@ namespace Editor {
 
             UserBuildSettings.architecture = OSArchitecture.x64ARM64;
             PlayerSettings.SplashScreen.show = false;
-            PlayerSettings.SetScriptingBackend(NamedBuildTarget.Standalone, ScriptingImplementation.IL2CPP);
+            PlayerSettings.SetScriptingBackend(NamedBuildTarget.iOS, ScriptingImplementation.IL2CPP);
             var options = new BuildPlayerOptions();
             options.scenes = scenes;
             options.locationPathName = "build/client_ios";

package/Editor/Packages/AirshipPackagesWindow.cs

@@ -238,7 +238,7 @@ namespace Editor.Packages {
                 var style = new GUIStyle(EditorStyles.textField);
                 
                 this.addPackageId = EditorGUILayout.TextField("Package ID", this.addPackageId);
-                EditorGUILayout.LabelField("Example: @Easy/Survival");
+                EditorGUILayout.LabelField("Example: @Easy/VoxelWorld");
                 EditorGUILayout.Space(4);
 
                 var addPackagePressed = GUILayout.Button("Add Package", GUILayout.Width(150));
@@ -288,7 +288,7 @@ namespace Editor.Packages {
                 EditorGUILayout.Space(12);
                 EditorGUILayout.BeginVertical();
                 this.createPackageId = EditorGUILayout.TextField("Package ID", this.createPackageId);
-                EditorGUILayout.LabelField("Example: @Easy/Survival");
+                EditorGUILayout.LabelField("Example: @Easy/VoxelWorld");
                 EditorGUILayout.Space(4);
                 if (GUILayout.Button("Create Package", GUILayout.Width(150))) {
                     EditorCoroutineUtility.StartCoroutineOwnerless(CreateNewLocalSourcePackage(this.createPackageId));

package/Editor/Tools/Characters/AirshipCharacterEditor.cs

@@ -18,7 +18,7 @@ public class AirshipCharacterEditor : MonoBehaviour {
         }
     }
 
-    [MenuItem("Assets/Create/Airship/Viewmodel Variant", false, 1)]
+    [MenuItem("Assets/Create/Airship/Viewmodel Variant", false, -104)]
     static void CreateViewmodelVariant() {
         GameObject source =
             AssetDatabase.LoadAssetAtPath<GameObject>(
@@ -29,7 +29,7 @@ public class AirshipCharacterEditor : MonoBehaviour {
         Selection.activeObject = prefab;
     }
 
-    [MenuItem("Assets/Create/Airship/Character Variant", false, 1)]
+    [MenuItem("Assets/Create/Airship/Character Variant", false, -105)]
     static void CreateCharacterVariant() {
         GameObject source =
             AssetDatabase.LoadAssetAtPath<GameObject>(

package/Editor/TypescriptServices/Editor/AirshipScriptEditorIntegrations.cs

@@ -11,7 +11,7 @@ namespace Airship.Editor {
         internal static string AirshipComponentTemplate => PosixPath.Join(TemplatePath, "AirshipComponent.ts.txt");
         internal static string AirshipModuleTemplate => PosixPath.Join(TemplatePath, "AirshipModule.ts.txt");
 
-        [MenuItem("Assets/Create/Airship/TypeScript File", false, 2)]
+        [MenuItem("Assets/Create/Airship/TypeScript File", false, 50)]
         private static void CreateNewComponentFile()
         {
             ProjectWindowUtil.CreateScriptAssetFromTemplateFile(AirshipComponentTemplate, "AirshipComponent.ts");

package/Runtime/Code/Authentication/EasyAuthenticator.cs

@@ -20,6 +20,8 @@ namespace Code.Authentication {
         public string editorUserId;
         public string editorUsername;
         public string editorProfileImageId;
+
+        public string passkey;
     }
     public struct LoginResponseMessage : NetworkMessage
     {
@@ -33,10 +35,19 @@ namespace Code.Authentication {
     }
 
     public class EasyAuthenticator : NetworkAuthenticator {
+        private string passkey = "empty";
+        
         readonly HashSet<NetworkConnection> connectionsPendingDisconnect = new HashSet<NetworkConnection>();
 
         public int connectionCounter = 0;
 
+        private void Awake() {
+            TextAsset passkeyTextFile = Resources.Load<TextAsset>("ConnectPassKey");
+            if (passkeyTextFile) {
+                this.passkey = passkeyTextFile.text;
+            }
+        }
+
         public override void OnStartServer() {
             this.connectionCounter = 0;
 
@@ -72,6 +83,7 @@ namespace Code.Authentication {
                         editorUserId = EditorAuthManager.localUser.uid,
                         editorUsername = EditorAuthManager.localUser.username,
                         editorProfileImageId = EditorAuthManager.localUser.profileImageId,
+                        passkey = this.passkey,
                     });
                     return;
                 }
@@ -91,6 +103,7 @@ namespace Code.Authentication {
                         NetworkClient.Send(new LoginMessage {
                             authToken = authToken,
                             playerVersion = AirshipConst.playerVersion,
+                            passkey = this.passkey,
                         });
                         return;
                     }
@@ -100,6 +113,7 @@ namespace Code.Authentication {
             NetworkClient.Send(new LoginMessage {
                 authToken = authToken,
                 playerVersion = AirshipConst.playerVersion,
+                passkey = this.passkey,
             });
         }
 
@@ -115,6 +129,11 @@ namespace Code.Authentication {
         private async void Server_OnLoginMessage(NetworkConnectionToClient conn, LoginMessage loginData) {
             if (connectionsPendingDisconnect.Contains(conn)) return;
 
+            if (loginData.passkey != this.passkey) {
+                this.RejectConnection(conn, "Invalid passkey.",  true);
+                return;
+            }
+
 #if UNITY_SERVER
             Debug.Log("Authenticating " + conn);
 #endif
@@ -171,10 +190,11 @@ namespace Code.Authentication {
             if (Application.isEditor && CrossSceneState.IsLocalServer()) {
                 this.connectionCounter++;
                 if (this.connectionCounter == 1 && loginMessage.editorUserId != null) {
+                    string userId = InternalHttpManager.editorUserId ?? (this.connectionCounter + "");
                     tcs.SetResult(new UserData() {
-                        uid = InternalHttpManager.editorUserId,
+                        uid = userId,
                         username = loginMessage.editorUsername,
-                        orgRoleName = "Dev",
+                        orgRoleName = "Owner",
                         profileImageId = loginMessage.editorProfileImageId,
                     });
                     return await tcs.Task;
@@ -182,7 +202,7 @@ namespace Code.Authentication {
                 tcs.SetResult(new UserData() {
                     uid = this.connectionCounter + "",
                     username = "Player" + this.connectionCounter,
-                    orgRoleName = "Dev",
+                    orgRoleName = "Owner",
                     profileImageId = string.Empty,
                     fullTransferPacket = "{}"
                 });

package/Runtime/Code/Bootstrap/ServerBootstrap.cs

@@ -286,6 +286,7 @@ public class ServerBootstrap : MonoBehaviour
 			}
 			this.airshipJWT = annotations["JWT"];
 			UnityWebRequestProxyHelper.ProxyAuthCredentials = this.airshipJWT;
+			InternalHttpManager.authTokenSetTaskCompletionSource.SetResult(true);
 			// Debug.Log("Airship JWT:");
 			// Debug.Log(airshipJWT);
 

package/Runtime/Code/CoreUI/Login/LoginApp.cs

@@ -274,7 +274,12 @@ public class LoginApp : MonoBehaviour {
         }
         
         // Different login route is required for the playtest app.
-        var prodApp = SteamUtils.GetAppID().m_AppId == 2381730;
+        var prodApp = true;
+#if STEAMWORKS_NET
+        prodApp = SteamUtils.GetAppID().m_AppId == 2381730;
+#else
+        print("Pressed login with steam but STEAMWORKS_NET is not enabled.");
+#endif
         RestClient.Get(new RequestHelper() {
             Uri = AirshipPlatformUrl.gameCoordinator + (prodApp ? "/auth/steam/in-game" : "/auth/steam/in-game-playtest"),
             Headers = new Dictionary<string, string>() {

package/Runtime/Code/Http/Internal/InternalHttpManager.cs

@@ -13,10 +13,13 @@ namespace Code.Http.Internal {
         public static string editorUserId;
         public static string editorAuthToken = "";
         public static string authToken = "";
-        private static TaskCompletionSource<bool> authTokenSetTaskCompletionSource = new();
+        public static TaskCompletionSource<bool> authTokenSetTaskCompletionSource = new();
 
-        static InternalHttpManager() {
-            if (RunCore.IsServer()) {
+        // This handles the case when we are a server in editor dedicated mode.
+        // In this case, we immediately resolve the task because we will not have any auth token.
+        [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.SubsystemRegistration)]
+        public static void OnLoad() {
+            if (RunCore.IsServer() && !RunCore.IsClient() && RunCore.IsEditor()) {
                 authTokenSetTaskCompletionSource.TrySetResult(true);
             }
         }
@@ -27,7 +30,7 @@ namespace Code.Http.Internal {
                 return HttpManager.GetAsync(url, GetHeaders());
             }
 #endif
-            
+
             return authTokenSetTaskCompletionSource.Task.ContinueWith(_ => {
                 return HttpManager.GetAsync(url, GetHeaders());
             }, TaskScheduler.FromCurrentSynchronizationContext()).Unwrap();

package/Runtime/Code/Player/PlayerInfo.cs

@@ -11,6 +11,7 @@ public class PlayerInfoDto {
 	public string username;
 	public string profileImageId;
 	public string orgRoleName;
+	public string transferPacket;
 	public GameObject gameObject;
 }
 
@@ -21,6 +22,7 @@ public class PlayerInfo : NetworkBehaviour {
 	[SyncVar] public int connectionId;
 	[SyncVar] public string profileImageId;
 	[SyncVar] public string orgRoleName;
+	public string transferPacket;
 	public AudioSource voiceChatAudioSource;
 
 	private void Start() {
@@ -28,13 +30,14 @@ public class PlayerInfo : NetworkBehaviour {
 		PlayerManagerBridge.Instance.AddPlayer(this);
 	}
 
-	public void Init(int connectionId, string userId, string username, string profileImageId, string orgRoleName) {
+	public void Init(int connectionId, string userId, string username, string profileImageId, string orgRoleName, string transferPacket) {
 		this.gameObject.name = "Player_" + username;
 		this.connectionId = connectionId;
 		this.userId = userId;
 		this.username = username;
 		this.profileImageId = profileImageId;
 		this.orgRoleName = orgRoleName;
+		this.transferPacket = transferPacket;
 		
 		this.InitVoiceChat();
 	}
@@ -82,6 +85,7 @@ public class PlayerInfo : NetworkBehaviour {
 			username = this.username,
 			profileImageId = this.profileImageId,
 			orgRoleName = this.orgRoleName,
+			transferPacket = this.transferPacket,
 			gameObject = this.gameObject,
 		};
 	}

package/Runtime/Code/Player/PlayerManagerBridge.cs

@@ -176,7 +176,7 @@ namespace Code.Player {
 			var go = Instantiate(this.playerPrefab, Instance.transform.parent);
 
 			var playerInfo = go.GetComponent<PlayerInfo>();
-			playerInfo.Init(connectionId, userId, username, profilePictureId, string.Empty);
+			playerInfo.Init(connectionId, userId, username, profilePictureId, string.Empty, string.Empty);
 
 			// var identity = go.GetComponent<NetworkIdentity>();
 			NetworkServer.Spawn(go);
@@ -217,7 +217,7 @@ namespace Code.Player {
 // #if UNITY_SERVER || true
 // 				Debug.Log($"Initializing Player as {userData.username} owned by " + conn);
 // #endif
-				playerInfo.Init(conn.connectionId, userData.uid, userData.username, userData.profileImageId, userData.orgRoleName);
+				playerInfo.Init(conn.connectionId, userData.uid, userData.username, userData.profileImageId, userData.orgRoleName, userData.fullTransferPacket);
 			} else {
 #if UNITY_SERVER || true
 				Debug.Log("Missing UserData for " + conn);

package/Runtime/Code/Util/Singleton.cs

@@ -34,8 +34,7 @@ public abstract class Singleton<T> : MonoBehaviour where T : MonoBehaviour
 					go.name = typeof(T).ToString();
 					
 					var coreScene = SceneManager.GetSceneByName("CoreScene");
-					// if (!coreScene.isLoaded) return null;
-					if (coreScene.IsValid()) {
+					if (coreScene.IsValid() && coreScene.isLoaded) {
 						SceneManager.MoveGameObjectToScene(go, coreScene);
 					}
 

package/Runtime/Code/VoxelWorld/Editor/VoxelBuilderEditorWindow.cs

@@ -131,7 +131,6 @@ namespace Code.Airship.Resources.VoxelRenderer.Editor {
                 //Select this
                 selection.gameObject.SetActive(true);
                 Selection.activeGameObject = selection.gameObject;
-                Debug.Log("select.1");
             }
 
             if (VoxelWorldEditorToolBase.buttonActive) {
@@ -141,7 +140,6 @@ namespace Code.Airship.Resources.VoxelRenderer.Editor {
                 if (selection) {
                     //Select the world
                     Selection.activeGameObject = world.gameObject;
-                    Debug.Log("select.2");
                     //disable it
                     selection.gameObject.SetActive(false);
 

package/ThirdParty/Mirror/Core/NetworkManager.cs

@@ -1537,7 +1537,18 @@ namespace Mirror
         public virtual void OnClientSceneChanged()
         {
             // always become ready.
-            if (!NetworkClient.connection.isAuthenticated) Debug.LogWarning("Not sending client ready: not authenticated");
+            if (!NetworkClient.connection.isAuthenticated) {
+#if AIRSHIP_PLAYER
+                Debug.LogWarning("Not sending client ready: not authenticated");
+#endif
+            }
+
+            if (NetworkClient.ready) {
+#if AIRSHIP_PLAYER
+                Debug.LogWarning("Not sending client ready: already ready");
+#endif
+            }
+
             if (NetworkClient.connection.isAuthenticated && !NetworkClient.ready) NetworkClient.Ready();
 
             // Only call AddPlayer for normal scene changes, not additive load/unload

package/package.json

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