gg.easy.airship 0.1.2104 → 0.1.2106

package/Editor/Accessories/AccessoryEditorWindow.cs

@@ -34,8 +34,8 @@ namespace Editor.Accessories {
         private AccessoryPrefabEditor prefabEditor;
         private GameObject characterGO;
         List<AccessoryComponent> allAccessories = new List<AccessoryComponent>();
-        private AccessoryComponent _editingAccessoryComponent;
-        private AccessoryComponent _referenceAccessoryComponent;
+        private AccessoryComponent editingAccessoryComponent;
+        private AccessoryComponent referenceAccessoryComponent;
         private ListView _listPane;
 
         private Label _selectedItemLabel;
@@ -46,7 +46,7 @@ namespace Editor.Accessories {
 
         private static void Log(string message){
             #if AIRSHIP_INTERNAL
-            Debug.Log("AccEditor: " + message);
+            // Debug.Log("AccEditor: " + message);
             #endif
         }
 
@@ -57,8 +57,8 @@ namespace Editor.Accessories {
             }
 
             _prefabStage = null;
-            _editingAccessoryComponent = null;
-            _referenceAccessoryComponent = null;
+            editingAccessoryComponent = null;
+            referenceAccessoryComponent = null;
             
             if (characterGO) {
                 DestroyImmediate(characterGO);
@@ -130,7 +130,7 @@ namespace Editor.Accessories {
             saveBtn.text = "Save";
             buttonPanel.Add(saveBtn);
             saveBtn.clickable.clicked += () => {
-                if (_editingAccessoryComponent == null || _referenceAccessoryComponent == null) return;
+                if (editingAccessoryComponent == null || referenceAccessoryComponent == null) return;
                 SaveCurrentAccessory();
             };
 
@@ -139,7 +139,7 @@ namespace Editor.Accessories {
             resetBtn.text = "Reset";
             buttonPanel.Add(resetBtn);
             resetBtn.clickable.clicked += () => {
-                if (_editingAccessoryComponent == null || _referenceAccessoryComponent == null) return;
+                if (editingAccessoryComponent == null || referenceAccessoryComponent == null) return;
                 ResetCurrentAccessory();
             };
 
@@ -219,9 +219,9 @@ namespace Editor.Accessories {
 
         private void ClearCurrentAccessory() {
             Log("ClearCurrentAccessory");
-            if (_editingAccessoryComponent) {
-                DestroyImmediate(_editingAccessoryComponent.gameObject);
-                _editingAccessoryComponent = null;
+            if (editingAccessoryComponent) {
+                DestroyImmediate(editingAccessoryComponent.gameObject);
+                editingAccessoryComponent = null;
             }
 
             if (_selectedItemLabel != null) {
@@ -229,9 +229,11 @@ namespace Editor.Accessories {
             }
         }
 
+
+        private bool hasFramedView = false;
         private void BuildScene(AccessoryComponent accessoryComponent, bool forceRedraw = false) {
-            var newItem = accessoryComponent != _referenceAccessoryComponent;
-            Log("Building Scene. New Item: " + newItem + " acc: " + accessoryComponent?.gameObject.name + " oldAcc: " + _referenceAccessoryComponent?.gameObject.name);
+            var newItem = accessoryComponent != referenceAccessoryComponent;
+            Log("Building Scene. New Item: " + newItem + " acc: " + accessoryComponent?.gameObject.name + " oldAcc: " + referenceAccessoryComponent?.gameObject.name);
             if (_prefabStage == null || characterGO == null) {
                 CreateStage();
             }
@@ -252,17 +254,24 @@ namespace Editor.Accessories {
                     return;
                 }
 
-                
                 var go = (GameObject)PrefabUtility.InstantiatePrefab(accessoryComponent.gameObject, parent);
                 if (go != null) {
-                    _editingAccessoryComponent = go.GetComponent<AccessoryComponent>();
-                    _referenceAccessoryComponent = accessoryComponent;
+                    this.editingAccessoryComponent = go.GetComponent<AccessoryComponent>();
+                    this.referenceAccessoryComponent = accessoryComponent;
                     //accessoryComponent.gameObject.hideFlags = HideFlags.DontSave;
                     Selection.activeObject = go;
                     Selection.activeGameObject = go;
-                    SceneView.FrameLastActiveSceneView();
+                    // SceneView.FrameLastActiveSceneView();
 
                     _selectedItemLabel.text = accessoryComponent.name;
+
+                    if (this.editingAccessoryComponent.skinnedToCharacter) {
+                        var skinnedMeshRenderers = go.GetComponentsInChildren<SkinnedMeshRenderer>();
+                        foreach (var skinnedMeshRenderer in skinnedMeshRenderers) {
+                            skinnedMeshRenderer.rootBone = rig.bodyMesh.rootBone;
+                            skinnedMeshRenderer.bones = rig.bodyMesh.bones;
+                        }
+                    }
                 }
             }
         }
@@ -366,30 +375,30 @@ namespace Editor.Accessories {
         }
 
         private void SaveCurrentAccessory() {
-            if (!_referenceAccessoryComponent) {
+            if (!referenceAccessoryComponent) {
                 Debug.LogError("Trying to save with an empty accessory component");
                 return;
             }
 
-            Log("Saving acc: " + _referenceAccessoryComponent.gameObject.name);
-            Undo.RecordObject(_referenceAccessoryComponent, "Save Accessory");
-            _referenceAccessoryComponent.Copy(_editingAccessoryComponent);
-            PrefabUtility.RecordPrefabInstancePropertyModifications(_referenceAccessoryComponent);
-            EditorUtility.SetDirty(_referenceAccessoryComponent);
-            PrefabUtility.ApplyPrefabInstance(_editingAccessoryComponent.gameObject, InteractionMode.UserAction);
+            Log("Saving acc: " + referenceAccessoryComponent.gameObject.name);
+            Undo.RecordObject(referenceAccessoryComponent, "Save Accessory");
+            referenceAccessoryComponent.Copy(editingAccessoryComponent);
+            PrefabUtility.RecordPrefabInstancePropertyModifications(referenceAccessoryComponent);
+            EditorUtility.SetDirty(referenceAccessoryComponent);
+            PrefabUtility.ApplyPrefabInstance(editingAccessoryComponent.gameObject, InteractionMode.UserAction);
             AssetDatabase.SaveAssets();
         }
 
         private void ResetCurrentAccessory() {
-            if(!_referenceAccessoryComponent){
+            if(!referenceAccessoryComponent){
                 Debug.LogError("Trying to reset an empty accessory component");
                 return;
             }
-            Log("Resetting acc: " + _referenceAccessoryComponent.gameObject.name);
-            Undo.RecordObject(_editingAccessoryComponent.transform, "ResetTransform");
-            _editingAccessoryComponent.transform.SetLocalPositionAndRotation(_referenceAccessoryComponent.localPosition, _referenceAccessoryComponent.localRotation);
-            _editingAccessoryComponent.localScale = _referenceAccessoryComponent.localScale;
-            PrefabUtility.RevertPrefabInstance(_editingAccessoryComponent.gameObject, InteractionMode.UserAction);
+            Log("Resetting acc: " + referenceAccessoryComponent.gameObject.name);
+            Undo.RecordObject(editingAccessoryComponent.transform, "ResetTransform");
+            editingAccessoryComponent.transform.SetLocalPositionAndRotation(referenceAccessoryComponent.localPosition, referenceAccessoryComponent.localRotation);
+            editingAccessoryComponent.localScale = referenceAccessoryComponent.localScale;
+            PrefabUtility.RevertPrefabInstance(editingAccessoryComponent.gameObject, InteractionMode.UserAction);
         }
 
         private void SetPose(PoseType poseType){

package/Editor/Accessories/Clothing/PlatformGearBundleManifestEditor.cs

@@ -123,7 +123,15 @@ namespace Editor.Accessories.Clothing {
                 req.SetRequestHeader("Authorization", "Bearer " + InternalHttpManager.editorAuthToken);
                 req.SetRequestHeader("x-airship-ignore-rate-limit", "true");
                 await req.SendWebRequest();
+                if (req.result != UnityWebRequest.Result.Success) {
+                    Debug.LogError("Failed to update air asset: " + req.downloadHandler.text);
+                    return;
+                }
                 Debug.Log("Create classId response: " + req.downloadHandler.text);
+                var createResponse = JsonUtility.FromJson<GearCreateResponse>(req.downloadHandler.text);
+                gear.classId = createResponse.classId;
+                EditorUtility.SetDirty(gear);
+                AssetDatabase.SaveAssets();
             }
 
             string airId = manifest.airId;
@@ -224,7 +232,8 @@ namespace Editor.Accessories.Clothing {
                     category = category,
                     subcategory = subcategory,
                 };
-                var req = UnityWebRequest.Put($"{AirshipPlatformUrl.contentService}/gear/class-id/{gear.classId}",
+                var url = $"{AirshipPlatformUrl.contentService}/gear/class-id/{gear.classId}";
+                var req = UnityWebRequest.Put(url,
                     JsonUtility.ToJson(data));
                 req.method = "PATCH";
                 req.SetRequestHeader("Content-Type","application/json");
@@ -232,7 +241,7 @@ namespace Editor.Accessories.Clothing {
                 req.SetRequestHeader("x-airship-ignore-rate-limit", "true");
                 await req.SendWebRequest();
                 if (req.result != UnityWebRequest.Result.Success) {
-                    Debug.LogError("patch classId response: " + req.downloadHandler.text);
+                    Debug.LogError($"patch classId. url: {url}, response: {req.downloadHandler.text}, authToken: {InternalHttpManager.editorAuthToken}");
                     return;
                 }
             }

package/Editor/AirAsset/AirAssetBundleEditor.cs

@@ -4,7 +4,7 @@ using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using Code.Accessories.Clothing;
-using Code.AirAsset;
+using Code.AirAssetBundle;
 using Code.Bootstrap;
 using Code.Http.Internal;
 using Code.Platform.Shared;
@@ -174,7 +174,7 @@ namespace Editor.AirAsset {
             var addressableNames = assetPaths
                 .Select((p) => p.ToLower())
                 .Select((p) => {
-                    if (p.Contains(target.name + ".asset")) {
+                    if (p.Contains(target.name.ToLower() + ".asset")) {
                         // custom name so it's easier to find when loading
                         return "_AirAssetBundle";
                     }

package/Editor/AirshipComponentEditor.cs

@@ -31,7 +31,7 @@ public class ScriptBindingEditor : UnityEditor.Editor {
 
     public void OnEnable() {
         var comp = (Component)serializedObject.targetObject;
-        var metadata = serializedObject.FindProperty("m_metadata");
+        var metadata = serializedObject.FindProperty("metadata");
         var metadataProperties = metadata.FindPropertyRelative("properties");
         for (var i = 0; i < metadataProperties.arraySize; i++) {
             var serializedProperty = metadataProperties.GetArrayElementAtIndex(i);
@@ -49,18 +49,18 @@ public class ScriptBindingEditor : UnityEditor.Editor {
 
         AirshipComponent binding = (AirshipComponent)target;
 
-        if (binding.scriptFile == null && !string.IsNullOrEmpty(binding.m_fileFullPath)) {
-            // Debug.Log("Setting Script File from Path: " + binding.m_fileFullPath);
-            // binding.SetScriptFromPath(binding.m_fileFullPath, LuauContext.Game);
-            if (binding.scriptFile == null) {
-                Debug.LogWarning($"Failed to load script asset: {binding.m_fileFullPath}");
-                EditorGUILayout.HelpBox("Missing reference. This is likely from renaming a script.\n\nOld path: " + binding.m_fileFullPath.Replace("Assets/Bundles/", ""), MessageType.Warning);
+        if (binding.script == null && !string.IsNullOrEmpty(binding.scriptPath)) {
+            // Debug.Log("Setting Script File from Path: " + binding.scriptPath);
+            // binding.SetScriptFromPath(binding.scriptPath, LuauContext.Game);
+            if (binding.script == null) {
+                Debug.LogWarning($"Failed to load script asset: {binding.scriptPath}");
+                EditorGUILayout.HelpBox("Missing reference. This is likely from renaming a script.\n\nOld path: " + binding.scriptPath.Replace("Assets/Bundles/", ""), MessageType.Warning);
             }
         }
 
         DrawScriptBindingProperties(binding);
 
-        if (binding.scriptFile != null && binding.scriptFile.m_metadata != null) {
+        if (binding.script != null && binding.script.m_metadata != null) {
             if (ShouldReconcile(binding)) {
                 binding.ReconcileMetadata();
                 serializedObject.ApplyModifiedProperties();
@@ -70,8 +70,8 @@ public class ScriptBindingEditor : UnityEditor.Editor {
             CheckDefaults(binding);
         }
 
-        if (binding.scriptFile != null) {
-            var metadata = serializedObject.FindProperty("m_metadata");
+        if (binding.script != null) {
+            var metadata = serializedObject.FindProperty("metadata");
             var metadataName = metadata.FindPropertyRelative("name");
             if (!string.IsNullOrEmpty(metadataName.stringValue)) {
                 DrawBinaryFileMetadata(binding, metadata);
@@ -87,6 +87,10 @@ public class ScriptBindingEditor : UnityEditor.Editor {
                 EditorGUILayout.LabelField("Component Id", binding.GetAirshipComponentId().ToString());
             }
             EditorGUILayout.EndHorizontal();
+            
+            EditorGUILayout.BeginHorizontal();
+            EditorGUILayout.LabelField("Context", binding.context.ToString());
+            EditorGUILayout.EndHorizontal();
         }        
 #endif
         
@@ -155,10 +159,10 @@ public class ScriptBindingEditor : UnityEditor.Editor {
     }
 
     private void CheckDefaults(AirshipComponent binding) {
-        var metadata = serializedObject.FindProperty("m_metadata");
+        var metadata = serializedObject.FindProperty("metadata");
         
         var metadataProperties = metadata.FindPropertyRelative("properties");
-        var originalMetadataProperties = binding.scriptFile.m_metadata.properties;
+        var originalMetadataProperties = binding.script.m_metadata.properties;
 
         var setDefault = false;
 
@@ -201,12 +205,12 @@ public class ScriptBindingEditor : UnityEditor.Editor {
     }
 
     private bool ShouldReconcile(AirshipComponent binding) {
-        if (binding.m_metadata == null || binding.scriptFile.m_metadata == null) return false;
+        if (binding.metadata == null || binding.script.m_metadata == null) return false;
 
-        var metadata = serializedObject.FindProperty("m_metadata");
+        var metadata = serializedObject.FindProperty("metadata");
         
         var metadataProperties = metadata.FindPropertyRelative("properties");
-        var originalMetadataProperties = binding.scriptFile.m_metadata?.properties;
+        var originalMetadataProperties = binding.script.m_metadata?.properties;
 
         if (metadataProperties.arraySize != originalMetadataProperties.Count) {
             return true;
@@ -282,27 +286,27 @@ public class ScriptBindingEditor : UnityEditor.Editor {
     private void DrawScriptBindingProperties(AirshipComponent binding) {
         EditorGUILayout.Space(5);
 
-        var script = binding.scriptFile;
-        var scriptPath = serializedObject.FindProperty("m_fileFullPath");
+        var script = binding.script;
+        var scriptPath = serializedObject.FindProperty("scriptPath");
         var content = new GUIContent {
             text = "Script",
             tooltip = scriptPath.stringValue,
         };
 
-        if (binding.scriptFile != null && (binding.m_metadata != null || Application.isPlaying)) {
+        if (script != null && (binding.metadata != null || Application.isPlaying)) {
             GUI.enabled = false;
         }
         
         var newScript = EditorGUILayout.ObjectField(content, script, typeof(AirshipScript), true);
         if (newScript != script) {
-            binding.scriptFile = (AirshipScript)newScript;
-            scriptPath.stringValue = newScript == null ? "" : ((AirshipScript)newScript).assetPath;
+            binding.script = (AirshipScript)newScript;
+            scriptPath.stringValue = newScript == null ? "" : binding.script.m_path;
             serializedObject.ApplyModifiedProperties();
         }
 
         GUI.enabled = true;
         
-        if (newScript == null) {
+        if (newScript == null && !Application.isPlaying) {
             EditorGUILayout.Space(5);
             
             var rect = GUILayoutUtility.GetLastRect();
@@ -312,8 +316,9 @@ public class ScriptBindingEditor : UnityEditor.Editor {
 
             EditorGUILayout.BeginHorizontal();
             if (GUILayout.Button("Select Airship Component", style)) {
-                AirshipComponentDropdown dd = new AirshipComponentDropdown(new AdvancedDropdownState(), (binaryFile) => {
-                    binding.SetScript(binaryFile, Application.isPlaying);
+                AirshipComponentDropdown dd = new AirshipComponentDropdown(new AdvancedDropdownState(), (airshipScript) => {
+                    binding.script = airshipScript;
+                    binding.scriptPath = airshipScript.m_path;
                     serializedObject.ApplyModifiedProperties();
                     EditorUtility.SetDirty(serializedObject.targetObject);
                 });
@@ -333,11 +338,11 @@ public class ScriptBindingEditor : UnityEditor.Editor {
         var propertyList = new List<SerializedProperty>();
         var indexDictionary = new Dictionary<string, int>();
 
-        if (binding.scriptFile.m_metadata != null) {
+        if (binding.script.m_metadata != null) {
             for (var i = 0; i < metadataProperties.arraySize; i++) {
                 var property = metadataProperties.GetArrayElementAtIndex(i);
                 propertyList.Add(property);
-                indexDictionary.Add(binding.scriptFile.m_metadata.properties[i].name, i);
+                indexDictionary.Add(binding.script.m_metadata.properties[i].name, i);
             }
         }
 
@@ -348,7 +353,7 @@ public class ScriptBindingEditor : UnityEditor.Editor {
         );
         
         foreach (var prop in propertyList) {
-            DrawCustomProperty(binding.GetInstanceID(), binding.scriptFile.m_metadata, prop);   
+            DrawCustomProperty(binding.GetInstanceID(), binding.script.m_metadata, prop);   
         }
     }
 
@@ -532,13 +537,13 @@ public class ScriptBindingEditor : UnityEditor.Editor {
                                     var scriptPath = buildInfo.GetScriptPathByTypeName(typeName);
                                     
                                     switch (draggedObject) {
-                                        case AirshipComponent component when scriptPath != null && buildInfo.Inherits(component.scriptFile, scriptPath):
+                                        case AirshipComponent component when scriptPath != null && buildInfo.Inherits(component.script, scriptPath):
                                             objRef = component;
                                             break;
                                         case AirshipComponent:
                                             continue;
                                         case GameObject go: {
-                                            var firstMatchingComponent = go.GetComponents<AirshipComponent>().FirstOrDefault(f => buildInfo.Inherits(f.scriptFile, scriptPath));
+                                            var firstMatchingComponent = go.GetComponents<AirshipComponent>().FirstOrDefault(f => buildInfo.Inherits(f.script, scriptPath));
                                             if (firstMatchingComponent != null) {
                                                 objRef = firstMatchingComponent;
                                             }

package/Editor/AirshipComponents/AirshipComponentHeaderHandler.cs

@@ -21,8 +21,7 @@ public class AirshipComponentHeaderHandler {
             if (inspectorMode == InspectorMode.Debug) return;
    
             var component = editorAndHeader.editor.target as Component;
-            if (component is not AirshipComponent binding || binding.scriptFile == null ||
-                !binding.scriptFile.airshipBehaviour) continue;
+            if (component is not AirshipComponent binding || binding.script == null || !binding.script.airshipBehaviour) continue;
             
             if(onGUIHandler.Method is { Name: "DrawWrappedHeaderGUI" }) continue;
                 

package/Editor/AirshipComponents/AirshipComponentHeaderWrapper.cs

@@ -15,7 +15,7 @@ internal static class AirshipComponentHeader {
     private static readonly GUIContent label = new GUIContent("");
     
     internal static float AfterComponentHeader(AirshipComponent component, Rect headerRect, bool isHeaderSelected) {
-        var scriptFile = component.scriptFile;
+        var scriptFile = component.script;
         var metadata = scriptFile.m_metadata;
 
         if (metadata == null) return 0f;
@@ -69,25 +69,23 @@ internal class AirshipComponentHeaderWrapper {
     }
 
     public void DrawWrappedHeaderGUI() {
-        if (component == null || component.scriptFile == null || !component.scriptFile.airshipBehaviour) {
+        if (component == null || component.script == null || !component.script.airshipBehaviour) {
             RemoveOverrideHeader();
             return;
         }
         
         Rect headerRect = headerElement.contentRect;
-        bool HeaderIsSelected = headerElement.focusController.focusedElement == headerElement;
+        bool headerIsSelected = headerElement.focusController.focusedElement == headerElement;
         
         unityOnGUIHandler.Invoke();
 
-        if (component.m_metadata.name != "") {
-            AirshipComponentHeader.AfterComponentHeader(component, headerRect, HeaderIsSelected);
+        if (component.metadata.name != "") {
+            AirshipComponentHeader.AfterComponentHeader(component, headerRect, headerIsSelected);
         }
     }
     
-    private void RemoveOverrideHeader()
-    {
-        if(headerElement is null)
-        {
+    private void RemoveOverrideHeader() {
+        if (headerElement is null) {
             return;
         }
 

package/Editor/AirshipScriptGUI.cs

@@ -10,6 +10,10 @@ using Object = UnityEngine.Object;
 namespace Code.Luau {
     public static class AirshipScriptGUI {
         internal delegate Object AirshipBehaviourValidator(Object[] references, SerializedProperty property);
+        
+        private static bool IsBindableAsComponent(AirshipComponent component, AirshipScript file) {
+            return file.assetPath == component.script.assetPath;
+        }
 
         private static Object Validate(Object[] references, AirshipScript script, AirshipComponent binding) {
             if (references.Length <= 0) return null;
@@ -21,13 +25,13 @@ namespace Code.Luau {
                 references = gameObject.GetComponents(typeof(AirshipComponent));
                 foreach (var reference in references) {
                     if (reference != null && reference is AirshipComponent bindingComponent &&
-                        (bindingComponent.IsBindableAsComponent(script) ||
+                        (IsBindableAsComponent(bindingComponent, script) ||
                          buildInfo.ComponentIsValidInheritance(bindingComponent, script))) {
                         return reference;
                     }
                 }
             }
-            else if (objectReference is AirshipComponent otherBinding && (otherBinding.IsBindableAsComponent(script) || buildInfo.ComponentIsValidInheritance(otherBinding, script))) {
+            else if (objectReference is AirshipComponent otherBinding && (IsBindableAsComponent(otherBinding, script) || buildInfo.ComponentIsValidInheritance(otherBinding, script))) {
                 return otherBinding;
             }
             
@@ -130,8 +134,7 @@ namespace Code.Luau {
                                 },
                                 item => {
                                     var itemScriptBinding = item.ToObject<AirshipComponent>();
-                                    return itemScriptBinding != null &&
-                                           itemScriptBinding.IsBindableAsComponent(script);
+                                    return itemScriptBinding != null && IsBindableAsComponent(itemScriptBinding, script);
                                 }, null, script.m_metadata?.displayName ?? "AirshipBehaviour");
                             view.SetSearchText($"h:t:ScriptBinding"); // #m_fileFullPath={script.m_path}
 
@@ -168,7 +171,7 @@ namespace Code.Luau {
                 case EventType.Repaint: {
                     var temp = EditorGUIUtility.ObjectContent(obj, typeof(AirshipComponent));
 
-                    var scriptInfo = airshipComponent && airshipComponent.scriptFile ? airshipComponent.scriptFile : script;
+                    var scriptInfo = airshipComponent && airshipComponent.script ? airshipComponent.script : script;
                     
                     var displayName = scriptInfo.m_metadata != null && !string.IsNullOrEmpty(scriptInfo.m_metadata.displayName)
                         ? scriptInfo.m_metadata.displayName