Some changes to motion list for l2d models

- Motion list is now sorted - Motions divided into groups (each motion is a separate group) - Motion names are used as group names
gartia · Aug 26, 2023 · c8a2183 · c8a2183
1 parent cf67815
commit c8a2183
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/AssetStudioUtility/CubismLive2DExtractor/Live2DExtractor.cs b/AssetStudioUtility/CubismLive2DExtractor/Live2DExtractor.cs
@@ -99,7 +99,7 @@ public static void ExtractLive2D(IGrouping<string, AssetStudio.Object> assets, s
             }
 
             //motion
-            var motions = new JArray();
+            var motions = new SortedDictionary<string, JArray>();
 
             if (gameObjects.Count > 0)
             {
@@ -205,11 +205,8 @@ public static void ExtractLive2D(IGrouping<string, AssetStudio.Object> assets, s
                     }
                     json.Meta.TotalUserDataSize = totalUserDataSize;
 
-                    motions.Add(new JObject
-                    {
-                        { "Name", animation.Name },
-                        { "File", $"motions/{animation.Name}.motion3.json" }
-                    });
+                    var motionPath = new JObject(new JProperty("File", $"motions/{animation.Name}.motion3.json"));
+                    motions.Add(animation.Name, new JArray(motionPath));
                     File.WriteAllText($"{destMotionPath}{animation.Name}.motion3.json", JsonConvert.SerializeObject(json, Formatting.Indented, new MyJsonConverter()));
                 }
             }
@@ -307,7 +304,7 @@ public static void ExtractLive2D(IGrouping<string, AssetStudio.Object> assets, s
                 {
                     Moc = $"{modelName}.moc3",
                     Textures = textures.ToArray(),
-                    Motions = new JObject { { "", motions } },
+                    Motions = JObject.FromObject(motions),
                     Expressions = expressions,
                 },
                 Groups = groups.ToArray()