Improve integration with Live2D assets

- Added container-independent method for searching AnimationClip assets
(However, it's not really universal, so it can't completely replace the container-dependent method)

Author: aelurum

AssetStudio/AssetsManager.cs

@@ -74,6 +74,11 @@ public void SetAssetFilter(params ClassIDType[] classIDTypes)
                 filteredAssetTypesList.Add(ClassIDType.Texture2D);
                 filteredAssetTypesList.Add(ClassIDType.SpriteAtlas);
             }
+            if (classIDTypes.Contains(ClassIDType.Animator))
+            {
+                filteredAssetTypesList.Add(ClassIDType.AnimatorController);
+                filteredAssetTypesList.Add(ClassIDType.AnimatorOverrideController);
+            }
 
             filteredAssetTypesList.UnionWith(classIDTypes);
         }

AssetStudio/CubismModel.cs

@@ -15,6 +15,7 @@ public class CubismModel
         public List<MonoBehaviour> ParamDisplayInfoList { get; set; }
         public List<MonoBehaviour> PartDisplayInfoList { get; set; }
         public List<MonoBehaviour> PosePartList { get; set; }
+        public List<AnimationClip> ClipMotionList { get; set; }
         public GameObject ModelGameObject { get; set; }
 
         public CubismModel(GameObject m_GameObject)
@@ -26,6 +27,7 @@ public CubismModel(GameObject m_GameObject)
             ParamDisplayInfoList = new List<MonoBehaviour>();
             PartDisplayInfoList = new List<MonoBehaviour>();
             PosePartList = new List<MonoBehaviour>();
+            ClipMotionList = new List<AnimationClip>();
         }
     }
 }

AssetStudioCLI/Options/CLIOptions.cs

@@ -586,6 +586,7 @@ public static void ParseArgs(string[] args)
                         o_exportAssetTypes.Value = new List<ClassIDType>
                         {
                             ClassIDType.AnimationClip,
+                            ClassIDType.Animator,
                             ClassIDType.MonoBehaviour,
                             ClassIDType.Texture2D,
                         };

AssetStudioCLI/Studio.cs

@@ -295,6 +295,7 @@ public static void ParseAssets()
                             if (m_GameObject.CubismModel != null && TryGetCubismMoc(m_GameObject.CubismModel.CubismModelMono, out var mocMono))
                             {
                                 l2dModelDict[mocMono] = m_GameObject.CubismModel;
+                                BindAnimationClips(m_GameObject);
                             }
                             break;
                         case Animator m_Animator:
@@ -940,6 +941,34 @@ private static void BindCubismPosePart(MonoBehaviour m_MonoBehaviour)
             }
         }
 
+        private static void BindAnimationClips(GameObject gameObject)
+        {
+            if (gameObject.m_Animator == null || gameObject.m_Animator.m_Controller.IsNull)
+                return;
+
+            if (!gameObject.m_Animator.m_Controller.TryGet(out var controller))
+                return;
+
+            AnimatorController animatorController;
+            if (controller is AnimatorOverrideController overrideController)
+            {
+                if (!overrideController.m_Controller.TryGet(out animatorController))
+                    return;
+            }
+            else
+            {
+                animatorController = (AnimatorController)controller;
+            }
+
+            foreach (var clipPptr in animatorController.m_AnimationClips)
+            {
+                if (clipPptr.TryGet(out var m_AnimationClip))
+                {
+                    gameObject.CubismModel.ClipMotionList.Add(m_AnimationClip);
+                }
+            }
+        }
+
         private static Transform GetRootTransform(Transform m_Transform)
         {
             if (m_Transform == null)

AssetStudioGUI/Studio.cs

@@ -236,6 +236,7 @@ public static (string, List<TreeNode>) BuildAssetData()
                             if (m_GameObject.CubismModel != null && TryGetCubismMoc(m_GameObject.CubismModel.CubismModelMono, out var mocMono))
                             {
                                 l2dModelDict[mocMono] = m_GameObject.CubismModel;
+                                BindAnimationClips(m_GameObject);
                             }
                             break;
                         case Texture2D m_Texture2D:
@@ -1075,6 +1076,34 @@ private static void BindCubismPosePart(MonoBehaviour m_MonoBehaviour)
             }
         }
 
+        private static void BindAnimationClips(GameObject gameObject)
+        {
+            if (gameObject.m_Animator == null || gameObject.m_Animator.m_Controller.IsNull)
+                return;
+
+            if (!gameObject.m_Animator.m_Controller.TryGet(out var controller)) 
+                return;
+
+            AnimatorController animatorController;
+            if (controller is AnimatorOverrideController overrideController)
+            {
+                if (!overrideController.m_Controller.TryGet(out animatorController))
+                    return;
+            }
+            else
+            {
+                animatorController = (AnimatorController)controller;
+            }
+
+            foreach (var clipPptr in animatorController.m_AnimationClips)
+            {
+                if (clipPptr.TryGet(out var m_AnimationClip))
+                {
+                    gameObject.CubismModel.ClipMotionList.Add(m_AnimationClip);
+                }
+            }
+        }
+
         private static Transform GetRootTransform(Transform m_Transform)
         {
             if (m_Transform == null)

AssetStudioUtility/CubismLive2DExtractor/Live2DExtractor.cs

@@ -75,7 +75,7 @@ public Live2DExtractor(KeyValuePair<MonoBehaviour, List<Object>> assetGroupKvp,
                 PhysicsMono = Model.PhysicsController;
                 if (searchFadeMotions && TryGetFadeList(Model.FadeController, out var fadeMono))
                 {
-                    FadeMotionLst = selFadeMotionLst = fadeMono;
+                    FadeMotionLst = fadeMono;
                 }
                 if (TryGetExpressionList(Model.ExpressionController, out var expressionMono))
                 {
@@ -107,6 +107,10 @@ public Live2DExtractor(KeyValuePair<MonoBehaviour, List<Object>> assetGroupKvp,
                     PoseParts = Model.PosePartList;
                     searchPoseParts = false;
                 }
+                if (Model.ClipMotionList.Count > 0 && selClipMotions == null)
+                {
+                    AnimationClips = Model.ClipMotionList;
+                }
             }
             foreach (var asset in assetGroupKvp.Value)
             {
@@ -205,6 +209,10 @@ public Live2DExtractor(KeyValuePair<MonoBehaviour, List<Object>> assetGroupKvp,
             {
                 Texture2Ds = renderTextureSet.ToList();
             }
+            if (AnimationClips.Count > 0)
+            {
+                AnimationClips = AnimationClips.Distinct().ToList();
+            }
         }
 
         public void ExtractCubismModel(string destPath, Live2DMotionMode motionMode, bool forceBezier = false, int parallelTaskCount = 1)