Merge pull request #405 from hiroj/fix_package_export

asmdef をpackageに同梱するように変更
vrm-c · May 21, 2020 · 582461e · 582461e
2 parents 8a3921e + c83a748
commit 582461e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 25 deletions.
diff --git a/Assets/VRM/UniVRM/DevOnly/Editor/VRMExportUnityPackage.cs b/Assets/VRM/UniVRM/DevOnly/Editor/VRMExportUnityPackage.cs
@@ -180,30 +180,7 @@ public static void CreateUnityPackage(
             string[] fileNames
         )
         {
-            CreateUnityPackageWithoutAsmDefs(outputDir, name, containsPath, basePath, fileNames);
-            CreateUnityPackageOnlyWithAsmDefs(outputDir, name, containsPath, basePath, fileNames);
-        }
-
-        public static void CreateUnityPackageWithoutAsmDefs(
-            string outputDir,
-            string name,
-            string[] containsPath,
-            string basePath,
-            string[] fileNames
-        )
-        {
-            CreateUnityPackageStandalone(outputDir, name, containsPath, basePath, fileNames, null, new string[] {".asmdef"});
-        }
-
-        public static void CreateUnityPackageOnlyWithAsmDefs(
-            string outputDir,
-            string name,
-            string[] containsPath,
-            string basePath,
-            string[] fileNames
-        )
-        {
-            CreateUnityPackageStandalone(outputDir, name + ".asmdef", containsPath, basePath, fileNames, new string[] {".asmdef"}, null);
+            CreateUnityPackageStandalone(outputDir, name, containsPath, basePath, fileNames, null, null);
         }
 
         public static void CreateUnityPackageStandalone(

diff --git a/Assets/VRM/UniVRM/Scripts/Format/VRMExportSettings.cs b/Assets/VRM/UniVRM/Scripts/Format/VRMExportSettings.cs
@@ -465,6 +465,7 @@ void Export(string path, List<GameObject> destroy)
                 AssetDatabase.ImportAsset(path.ToUnityRelativePath());
             }
         }
+#endif
 
         //ここで重複ボーン名のチェックをする
         bool DuplicateBoneNameExists()
@@ -477,6 +478,5 @@ bool DuplicateBoneNameExists()
 
             return (duplicates.Any());
         }
-#endif
     }
 }