diff --git a/Assets/Plugins/IK/Plugins.asmdef b/Assets/Plugins/IK/Plugins.asmdef new file mode 100644 index 0000000..73171e1 --- /dev/null +++ b/Assets/Plugins/IK/Plugins.asmdef @@ -0,0 +1,14 @@ +{ + "name": "Plugins", + "rootNamespace": "", + "references": [], + "includePlatforms": [], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": false, + "precompiledReferences": [], + "autoReferenced": true, + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false +} \ No newline at end of file diff --git a/Assets/Plugins/IK/Plugins.asmdef.meta b/Assets/Plugins/IK/Plugins.asmdef.meta new file mode 100644 index 0000000..39328c7 --- /dev/null +++ b/Assets/Plugins/IK/Plugins.asmdef.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: fd1d627189c561043911a07470238b9c +AssemblyDefinitionImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UmaContainer.cs b/Assets/Scripts/UmaContainer.cs index 2563acf..5b1f178 100644 --- a/Assets/Scripts/UmaContainer.cs +++ b/Assets/Scripts/UmaContainer.cs @@ -286,7 +286,6 @@ public class UmaContainer : MonoBehaviour } } - public void SetNextAnimationCut(string cutName) { var asset = UmaViewerMain.Instance.AbMotions.FirstOrDefault(a => a.Name.Equals(cutName)); diff --git a/Assets/Scripts/UmaViewerBuilder.cs b/Assets/Scripts/UmaViewerBuilder.cs index 80b25f6..44e59c8 100644 --- a/Assets/Scripts/UmaViewerBuilder.cs +++ b/Assets/Scripts/UmaViewerBuilder.cs @@ -1398,10 +1398,14 @@ public class UmaViewerBuilder : MonoBehaviour } //shader effect - CurrentUMAContainer.ShaderEffectData = head.GetComponent()._assetTable["chara_shader_effect"] as CharaShaderEffectData; - if (CurrentUMAContainer.ShaderEffectData) + var assetholder = head.GetComponent(); + if (assetholder) { - CurrentUMAContainer.ShaderEffectData.Initialize(); + CurrentUMAContainer.ShaderEffectData = assetholder._assetTable["chara_shader_effect"] as CharaShaderEffectData; + if (CurrentUMAContainer.ShaderEffectData) + { + CurrentUMAContainer.ShaderEffectData.Initialize(); + } } } diff --git a/Assets/Scripts/umamusume.asmdef b/Assets/Scripts/umamusume.asmdef index bb8172b..2d6c8c0 100644 --- a/Assets/Scripts/umamusume.asmdef +++ b/Assets/Scripts/umamusume.asmdef @@ -5,7 +5,8 @@ "GUID:6055be8ebefd69e48b49212b09b47b2f", "GUID:800597811bcc5d848b15e12807d6de45", "GUID:d60799ab2a985554ea1a39cd38695018", - "GUID:145e2572884581c48a08acf566c1a1d6" + "GUID:145e2572884581c48a08acf566c1a1d6", + "GUID:fd1d627189c561043911a07470238b9c" ], "includePlatforms": [], "excludePlatforms": [], diff --git a/Assets/Scripts/umamusume/Gallop/FaceDrivenKeyTarget.cs b/Assets/Scripts/umamusume/Gallop/FaceDrivenKeyTarget.cs index 4bac739..9edf8d2 100644 --- a/Assets/Scripts/umamusume/Gallop/FaceDrivenKeyTarget.cs +++ b/Assets/Scripts/umamusume/Gallop/FaceDrivenKeyTarget.cs @@ -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)