Merge pull request #43 from tou-tou/update-to-v0.42.1

Update to VCI v0.42.1

Assets/Effekseer/package.json

@@ -1,8 +1,8 @@
 {
   "name": "com.thirdparty.effekseer",
   "displayName": "Effekseer",
-  "version": "0.41.1",
-  "unity": "2022.1",
+  "version": "0.42.1",
+  "unity": "2022.3",
   "description": "",
   "dependencies": {}
 }

Assets/NAudio/package.json

@@ -1,8 +1,8 @@
 {
   "name": "com.thirdparty.naudio",
   "displayName": "NAudio",
-  "version": "0.41.1",
-  "unity": "2022.1",
+  "version": "0.42.1",
+  "unity": "2022.3",
   "description": "",
   "dependencies": {}
 }

Assets/VCI/UniVCI/Editor/IO/ComponentImporters/EditorEffekseerImporter.cs

@@ -137,6 +137,9 @@ public void SetupAfterEditorDelayCall()
                     System.IO.Path.ChangeExtension(effectFilePath.Value, "asset"));
                 effects.Add(effectIdx, effectAsset);
 
+                // Scale
+                effectAsset.Scale = effect.scale;
+
                 // find assets
                 // textures
                 for (int t = 0; t < effectAsset.textureResources.Count(); t++)
@@ -150,7 +153,7 @@ public void SetupAfterEditorDelayCall()
                     effectAsset.textureResources[t].texture = texture;
 
                     // texture Importer settings
-                    var textureImporter = (TextureImporter) TextureImporter.GetAtPath(textureFilePath.Value);
+                    var textureImporter = (TextureImporter)TextureImporter.GetAtPath(textureFilePath.Value);
                     if (textureImporter != null)
                     {
                         textureImporter.isReadable = true;
@@ -187,7 +190,7 @@ public void SetupAfterEditorDelayCall()
                 foreach (var emitter in effekseerEmitterExtension.emitters)
                 {
                     var effectIndex = emitter.effectIndex;
-                    var emitterComponent = gameObject.GetOrAddComponent<Effekseer.EffekseerEmitter>();
+                    var emitterComponent = gameObject.AddComponent<EffekseerEmitter>();
                     emitterComponent.effectAsset = effects[effectIndex];
                     emitterComponent.playOnStart = emitter.isPlayOnStart;
                     emitterComponent.isLooping = emitter.isLoop;
@@ -203,4 +206,4 @@ public void SetupAfterEditorDelayCall()
             }
         }
     }
-}
+}

Assets/VCI/UniVCI/Editor/IO/VCIExporterMenu.cs

@@ -22,7 +22,7 @@ public static void ExportObject()
             try
             {
                 rootGameObject = GameObjectSelectionService.GetSingleSelectedObject();
-                VciValidator.ValidateVciRequirements(rootGameObject);
+                EditorVciValidator.ValidateVciRequirements(rootGameObject);
             }
             catch (VciValidatorException e)
             {

Assets/VCI/UniVCI/Editor/IO/Validators/VCIValidator.cs → Assets/VCI/UniVCI/Editor/IO/Validators/EditorVciValidator.cs

@@ -2,16 +2,17 @@
 
 namespace VCI
 {
-    public static class VciValidator
+    public static class EditorVciValidator
     {
         public static void ValidateVciRequirements(GameObject gameObject)
         {
+            RuntimeVciValidator.ValidateVciRequirements(gameObject);
+
             VciVciObjectValidator.Validate(gameObject);
             VciSubItemValidator.Validate(gameObject);
             VciMetaValidator.Validate(gameObject);
             VciScriptValidator.Validate(gameObject);
 
-            VciPhysicsValidator.Validate(gameObject);
             VciRendererValidator.Validate(gameObject);
             VciAnimationValidator.Validate(gameObject);
             VciAudioValidator.Validate(gameObject);

Assets/VCI/UniVCI/Editor/IO/WebSocketFilesImpoter.cs

@@ -18,4 +18,14 @@ public override void OnImportAsset(AssetImportContext ctx)
             ctx.SetMainObject(textAsset);
         }
     }
+    [ScriptedImporter(1, "js")]
+    public sealed class JsImporter : ScriptedImporter
+    {
+        public override void OnImportAsset(AssetImportContext ctx)
+        {
+            var textAsset = new TextAsset(File.ReadAllText(ctx.assetPath));
+            ctx.AddObjectToAsset("main obj", textAsset);
+            ctx.SetMainObject(textAsset);
+        }
+    }
 }

Assets/VCI/UniVCI/Editor/Inspectors/VCIObjectEditor.cs

@@ -129,7 +129,7 @@ public override void OnInspectorGUI()
                 try
                 {
                     var rootGameObject = GameObjectSelectionService.GetSingleSelectedObject();
-                    VciValidator.ValidateVciRequirements(rootGameObject);
+                    EditorVciValidator.ValidateVciRequirements(rootGameObject);
                     EditorUtility.DisplayDialog("Result", VCIConfig.GetText("no_error"), "OK");
                 }
                 catch (VciValidatorException e)