bug fix
This commit is contained in:
@@ -0,0 +1,14 @@
|
||||
{
|
||||
"name": "Plugins",
|
||||
"rootNamespace": "",
|
||||
"references": [],
|
||||
"includePlatforms": [],
|
||||
"excludePlatforms": [],
|
||||
"allowUnsafeCode": false,
|
||||
"overrideReferences": false,
|
||||
"precompiledReferences": [],
|
||||
"autoReferenced": true,
|
||||
"defineConstraints": [],
|
||||
"versionDefines": [],
|
||||
"noEngineReferences": false
|
||||
}
|
||||
@@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: fd1d627189c561043911a07470238b9c
|
||||
AssemblyDefinitionImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -286,7 +286,6 @@ public class UmaContainer : MonoBehaviour
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public void SetNextAnimationCut(string cutName)
|
||||
{
|
||||
var asset = UmaViewerMain.Instance.AbMotions.FirstOrDefault(a => a.Name.Equals(cutName));
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user