This commit is contained in:
CroakFang
2023-02-26 15:32:42 +08:00
parent 02a9e09620
commit 1e8fb2076c
6 changed files with 34 additions and 9 deletions
+14
View File
@@ -0,0 +1,14 @@
{
"name": "Plugins",
"rootNamespace": "",
"references": [],
"includePlatforms": [],
"excludePlatforms": [],
"allowUnsafeCode": false,
"overrideReferences": false,
"precompiledReferences": [],
"autoReferenced": true,
"defineConstraints": [],
"versionDefines": [],
"noEngineReferences": false
}
+7
View File
@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: fd1d627189c561043911a07470238b9c
AssemblyDefinitionImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
-1
View File
@@ -286,7 +286,6 @@ public class UmaContainer : MonoBehaviour
}
}
public void SetNextAnimationCut(string cutName)
{
var asset = UmaViewerMain.Instance.AbMotions.FirstOrDefault(a => a.Name.Equals(cutName));
+7 -3
View File
@@ -1398,10 +1398,14 @@ public class UmaViewerBuilder : MonoBehaviour
}
//shader effect
CurrentUMAContainer.ShaderEffectData = head.GetComponent<AssetHolder>()._assetTable["chara_shader_effect"] as CharaShaderEffectData;
if (CurrentUMAContainer.ShaderEffectData)
var assetholder = head.GetComponent<AssetHolder>();
if (assetholder)
{
CurrentUMAContainer.ShaderEffectData.Initialize();
CurrentUMAContainer.ShaderEffectData = assetholder._assetTable["chara_shader_effect"] as CharaShaderEffectData;
if (CurrentUMAContainer.ShaderEffectData)
{
CurrentUMAContainer.ShaderEffectData.Initialize();
}
}
}
+2 -1
View File
@@ -5,7 +5,8 @@
"GUID:6055be8ebefd69e48b49212b09b47b2f",
"GUID:800597811bcc5d848b15e12807d6de45",
"GUID:d60799ab2a985554ea1a39cd38695018",
"GUID:145e2572884581c48a08acf566c1a1d6"
"GUID:145e2572884581c48a08acf566c1a1d6",
"GUID:fd1d627189c561043911a07470238b9c"
],
"includePlatforms": [],
"excludePlatforms": [],
@@ -589,14 +589,14 @@ namespace Gallop
{
if (data.IsOnlyBaseReplace)
{
if (morphs.Find(m => m.weight > 0) == null)
var morph = morphs.Find(m => m.weight > 0);
if (morph == null)
{
GetMorphByType(morphs, data.BaseReplaceFaceType).weight = 1;
Debug.LogError(morph.tag);
}
else
{
GetMorphByType(morphs, data.BaseReplaceFaceType).weight = 0;
}
Debug.LogError(morph.tag);
}
foreach (var arr in data.DataArray)