diff --git a/Editor/Core.cs b/Editor/Core.cs index 0c4ce1d..1b9076a 100644 --- a/Editor/Core.cs +++ b/Editor/Core.cs @@ -18,7 +18,7 @@ namespace gay.lilyy.SoldAvatarBootstrap { public AacFlBase aac; public GameObject root; - public AnimatorController fx; + public AacFlController fx; public AacFlClip emptyClip; public bool experimentalEnabled; public bool isPC; @@ -210,15 +210,12 @@ namespace gay.lilyy.SoldAvatarBootstrap return; } - AvatarAssets assets = new() - { - root = root, + AvatarAssets assets = new(); + assets.root = root; - isPC = EditorUserBuildSettings.activeBuildTarget == BuildTarget.StandaloneWindows - || EditorUserBuildSettings.activeBuildTarget == BuildTarget.StandaloneWindows64, + assets.isPC = EditorUserBuildSettings.activeBuildTarget == BuildTarget.StandaloneWindows + || EditorUserBuildSettings.activeBuildTarget == BuildTarget.StandaloneWindows64; - fx = GetController(definition) - }; // Time AAC initialization @@ -230,12 +227,13 @@ namespace gay.lilyy.SoldAvatarBootstrap AnimatorRoot = root.transform, DefaultValueRoot = root.transform, AssetKey = GUID.Generate().ToString(), - AssetContainer = assets.fx, + AssetContainer = GetController(definition), ContainerMode = AacConfiguration.Container.Everything, DefaultsProvider = new AacDefaultsProvider(true) }); assets.emptyClip = assets.aac.NewClip(); + assets.fx = assets.aac.NewAnimatorController(); initStopwatch.Stop(); AvatarLogger.LogInfo($"AAC initialization completed in {initStopwatch.ElapsedMilliseconds}ms"); diff --git a/Template/Template.asmdef b/Template/Template.asmdef index 8f90ce7..0c8459a 100644 --- a/Template/Template.asmdef +++ b/Template/Template.asmdef @@ -2,9 +2,7 @@ "name": "Template", "rootNamespace": "", "references": [ - "GUID:16dfbe6f38dd98d4aa89b7eaac50e6c8", - "GUID:d689052aa981bf8459346a530f6e6678", - "GUID:71d9dcc7d30ab1c45866d01afa59b6cf" + "GUID:16dfbe6f38dd98d4aa89b7eaac50e6c8" ], "includePlatforms": [ "Editor"