Compare commits

..

No commits in common. "65f7206b46f6291f9f57ca0f47de989d18732ff8" and "accf7e787f4230e0cc30e87b58ac1226871a28bd" have entirely different histories.

2 changed files with 8 additions and 12 deletions

View file

@ -18,7 +18,7 @@ namespace gay.lilyy.SoldAvatarBootstrap
{ {
public AacFlBase aac; public AacFlBase aac;
public GameObject root; public GameObject root;
public AnimatorController fx; public AacFlController fx;
public AacFlClip emptyClip; public AacFlClip emptyClip;
public bool experimentalEnabled; public bool experimentalEnabled;
public bool isPC; public bool isPC;
@ -210,15 +210,12 @@ namespace gay.lilyy.SoldAvatarBootstrap
return; return;
} }
AvatarAssets assets = new() AvatarAssets assets = new();
{ assets.root = root;
root = root,
isPC = EditorUserBuildSettings.activeBuildTarget == BuildTarget.StandaloneWindows assets.isPC = EditorUserBuildSettings.activeBuildTarget == BuildTarget.StandaloneWindows
|| EditorUserBuildSettings.activeBuildTarget == BuildTarget.StandaloneWindows64, || EditorUserBuildSettings.activeBuildTarget == BuildTarget.StandaloneWindows64;
fx = GetController(definition)
};
// Time AAC initialization // Time AAC initialization
@ -230,12 +227,13 @@ namespace gay.lilyy.SoldAvatarBootstrap
AnimatorRoot = root.transform, AnimatorRoot = root.transform,
DefaultValueRoot = root.transform, DefaultValueRoot = root.transform,
AssetKey = GUID.Generate().ToString(), AssetKey = GUID.Generate().ToString(),
AssetContainer = assets.fx, AssetContainer = GetController(definition),
ContainerMode = AacConfiguration.Container.Everything, ContainerMode = AacConfiguration.Container.Everything,
DefaultsProvider = new AacDefaultsProvider(true) DefaultsProvider = new AacDefaultsProvider(true)
}); });
assets.emptyClip = assets.aac.NewClip(); assets.emptyClip = assets.aac.NewClip();
assets.fx = assets.aac.NewAnimatorController();
initStopwatch.Stop(); initStopwatch.Stop();
AvatarLogger.LogInfo($"AAC initialization completed in {initStopwatch.ElapsedMilliseconds}ms"); AvatarLogger.LogInfo($"AAC initialization completed in {initStopwatch.ElapsedMilliseconds}ms");

View file

@ -2,9 +2,7 @@
"name": "Template", "name": "Template",
"rootNamespace": "", "rootNamespace": "",
"references": [ "references": [
"GUID:16dfbe6f38dd98d4aa89b7eaac50e6c8", "GUID:16dfbe6f38dd98d4aa89b7eaac50e6c8"
"GUID:d689052aa981bf8459346a530f6e6678",
"GUID:71d9dcc7d30ab1c45866d01afa59b6cf"
], ],
"includePlatforms": [ "includePlatforms": [
"Editor" "Editor"