Merge pull request #1 from weisswolfi/dev

test: ScriptedImporter aseprite extensions
dunward · May 3, 2020 · 9253121 · 9253121
2 parents 84d17d6 + 041a5b4
commit 9253121
Show file tree

Hide file tree

Showing 11 changed files with 76 additions and 4 deletions.
diff --git a/Assets/AsepriteAnimator/Scripts/Ase.meta b/Assets/AsepriteAnimator/Scripts/Ase.meta
diff --git a/Assets/AsepriteAnimator/Scripts/AsepriteImporter.cs b/Assets/AsepriteAnimator/Scripts/AsepriteImporter.cs
@@ -0,0 +1,13 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEditor.Experimental.AssetImporters;
+using UnityEngine;
+
+[ScriptedImporter(1, new string[] { "ase", "aseprite" })]
+public class AsepriteImporter : ScriptedImporter
+{
+    public override void OnImportAsset(AssetImportContext ctx)
+    {
+
+    }
+}
diff --git a/Assets/AsepriteAnimator/Scripts/AsepriteImporter.cs.meta b/Assets/AsepriteAnimator/Scripts/AsepriteImporter.cs.meta
diff --git a/Assets/AsepriteAnimator/Scripts/Editor/AsepriteImporterEditor.cs b/Assets/AsepriteAnimator/Scripts/Editor/AsepriteImporterEditor.cs
@@ -0,0 +1,15 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEditor;
+using UnityEditor.Experimental.AssetImporters;
+using UnityEngine;
+
+[CustomEditor(typeof(AsepriteImporter))]
+public class AsepriteImporterEditor : ScriptedImporterEditor
+{
+    public override void OnInspectorGUI()
+    {
+        EditorGUILayout.LabelField("TEST");
+        base.OnInspectorGUI();
+    }
+}
diff --git a/Assets/AsepriteAnimator/Scripts/Editor/AsepriteImporterEditor.cs.meta b/Assets/AsepriteAnimator/Scripts/Editor/AsepriteImporterEditor.cs.meta
diff --git a/Assets/AsepriteAnimator/adventurer.ase b/Assets/AsepriteAnimator/adventurer.ase
diff --git a/Assets/AsepriteAnimator/adventurer.ase.meta b/Assets/AsepriteAnimator/adventurer.ase.meta
diff --git a/Assets/AsepriteAnimator/adventurer.aseprite b/Assets/AsepriteAnimator/adventurer.aseprite
diff --git a/Assets/AsepriteAnimator/adventurer.aseprite.meta b/Assets/AsepriteAnimator/adventurer.aseprite.meta
diff --git a/Packages/manifest.json b/Packages/manifest.json
@@ -6,9 +6,9 @@
     "com.unity.ext.nunit": "1.0.0",
     "com.unity.ide.rider": "1.1.4",
     "com.unity.ide.vscode": "1.1.4",
-    "com.unity.test-framework": "1.1.9",
+    "com.unity.test-framework": "1.1.11",
     "com.unity.textmeshpro": "2.0.1",
-    "com.unity.timeline": "1.2.10",
+    "com.unity.timeline": "1.2.12",
     "com.unity.ugui": "1.0.0",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.androidjni": "1.0.0",

diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 2019.3.0f6
-m_EditorVersionWithRevision: 2019.3.0f6 (27ab2135bccf)
+m_EditorVersion: 2019.3.3f1
+m_EditorVersionWithRevision: 2019.3.3f1 (7ceaae5f7503)