From f5573496eedf205a3f6ef6ebfbdd96d60b809e70 Mon Sep 17 00:00:00 2001 From: CroakFang <1605296300@qq.com> Date: Thu, 6 Jul 2023 21:26:58 +0800 Subject: [PATCH] improve emotion control --- ... Jobs (Unity 2018.2.4f1).unitypackage.meta | 7 ++++++ .../IK Jobs (Unity 2019.3).unitypackage.meta | 7 ++++++ ...culus Integration v1.37).unitypackage.meta | 7 ++++++ ...4.28f1, PlayMaker 1.9.0).unitypackage.meta | 7 ++++++ ..., SteamVR Plugin v2.2.0).unitypackage.meta | 7 ++++++ ... 2017.4.28f1, UMA 2.8.1).unitypackage.meta | 7 ++++++ .../Animations/SceneTransition_e.anim | 22 +++++++++---------- .../Animations/SceneTransition_s.anim | 22 +++++++++---------- Assets/Scripts/UmaDatabase/UmaDataTypes.cs | 22 ++----------------- Assets/Scripts/UmaViewerBuilder.cs | 2 +- Assets/Scripts/UmaViewerUI.cs | 2 +- .../umamusume/Gallop/FaceDrivenKeyTarget.cs | 6 +---- .../umamusume/Gallop/FaceEmotionKeyTarget.cs | 13 ++++++----- 13 files changed, 76 insertions(+), 55 deletions(-) create mode 100644 Assets/Plugins/RootMotion/FinalIK/_Integration/IK Jobs (Unity 2018.2.4f1).unitypackage.meta create mode 100644 Assets/Plugins/RootMotion/FinalIK/_Integration/IK Jobs (Unity 2019.3).unitypackage.meta create mode 100644 Assets/Plugins/RootMotion/FinalIK/_Integration/Oculus (Unity 2017.4.28f1, Oculus Integration v1.37).unitypackage.meta create mode 100644 Assets/Plugins/RootMotion/FinalIK/_Integration/Playmaker (Unity 2017.4.28f1, PlayMaker 1.9.0).unitypackage.meta create mode 100644 Assets/Plugins/RootMotion/FinalIK/_Integration/Steam VR (Unity 2017.4.28f1, SteamVR Plugin v2.2.0).unitypackage.meta create mode 100644 Assets/Plugins/RootMotion/FinalIK/_Integration/UMA (Unity 2017.4.28f1, UMA 2.8.1).unitypackage.meta diff --git a/Assets/Plugins/RootMotion/FinalIK/_Integration/IK Jobs (Unity 2018.2.4f1).unitypackage.meta b/Assets/Plugins/RootMotion/FinalIK/_Integration/IK Jobs (Unity 2018.2.4f1).unitypackage.meta new file mode 100644 index 0000000..fd115b1 --- /dev/null +++ b/Assets/Plugins/RootMotion/FinalIK/_Integration/IK Jobs (Unity 2018.2.4f1).unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: b3e58808cb15120468eafdef64280407 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/RootMotion/FinalIK/_Integration/IK Jobs (Unity 2019.3).unitypackage.meta b/Assets/Plugins/RootMotion/FinalIK/_Integration/IK Jobs (Unity 2019.3).unitypackage.meta new file mode 100644 index 0000000..00a91fc --- /dev/null +++ b/Assets/Plugins/RootMotion/FinalIK/_Integration/IK Jobs (Unity 2019.3).unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 59d63bcae2fecff42be7b4fc8b1df10f +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/RootMotion/FinalIK/_Integration/Oculus (Unity 2017.4.28f1, Oculus Integration v1.37).unitypackage.meta b/Assets/Plugins/RootMotion/FinalIK/_Integration/Oculus (Unity 2017.4.28f1, Oculus Integration v1.37).unitypackage.meta new file mode 100644 index 0000000..d9fcdc9 --- /dev/null +++ b/Assets/Plugins/RootMotion/FinalIK/_Integration/Oculus (Unity 2017.4.28f1, Oculus Integration v1.37).unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 7d1083877b3838042b9e91b249731b89 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/RootMotion/FinalIK/_Integration/Playmaker (Unity 2017.4.28f1, PlayMaker 1.9.0).unitypackage.meta b/Assets/Plugins/RootMotion/FinalIK/_Integration/Playmaker (Unity 2017.4.28f1, PlayMaker 1.9.0).unitypackage.meta new file mode 100644 index 0000000..7ce27d6 --- /dev/null +++ b/Assets/Plugins/RootMotion/FinalIK/_Integration/Playmaker (Unity 2017.4.28f1, PlayMaker 1.9.0).unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 0512c18ad5403428db876010796c1cda +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/RootMotion/FinalIK/_Integration/Steam VR (Unity 2017.4.28f1, SteamVR Plugin v2.2.0).unitypackage.meta b/Assets/Plugins/RootMotion/FinalIK/_Integration/Steam VR (Unity 2017.4.28f1, SteamVR Plugin v2.2.0).unitypackage.meta new file mode 100644 index 0000000..839abdf --- /dev/null +++ b/Assets/Plugins/RootMotion/FinalIK/_Integration/Steam VR (Unity 2017.4.28f1, SteamVR Plugin v2.2.0).unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 57ddc43ace113674392034825a54600a +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/RootMotion/FinalIK/_Integration/UMA (Unity 2017.4.28f1, UMA 2.8.1).unitypackage.meta b/Assets/Plugins/RootMotion/FinalIK/_Integration/UMA (Unity 2017.4.28f1, UMA 2.8.1).unitypackage.meta new file mode 100644 index 0000000..21cc026 --- /dev/null +++ b/Assets/Plugins/RootMotion/FinalIK/_Integration/UMA (Unity 2017.4.28f1, UMA 2.8.1).unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d00cc5f8e672c264d856aa10ed20df7e +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Animations/SceneTransition_e.anim b/Assets/Resources/Animations/SceneTransition_e.anim index d77e9b8..8b40bce 100644 --- a/Assets/Resources/Animations/SceneTransition_e.anim +++ b/Assets/Resources/Animations/SceneTransition_e.anim @@ -87,7 +87,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5833333 + time: 1 value: 0 inSlope: 0 outSlope: 0 @@ -115,7 +115,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5833333 + time: 1 value: 0.3018868 inSlope: 0 outSlope: 0 @@ -143,7 +143,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5833333 + time: 1 value: 0.3018868 inSlope: 0 outSlope: 0 @@ -171,7 +171,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5833333 + time: 1 value: 0.3018868 inSlope: 0 outSlope: 0 @@ -199,7 +199,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5833333 + time: 1 value: 0 inSlope: 0 outSlope: 0 @@ -228,7 +228,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.5833333 + m_StopTime: 1 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -314,7 +314,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5833333 + time: 1 value: 0 inSlope: 0 outSlope: 0 @@ -342,7 +342,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5833333 + time: 1 value: 0.3018868 inSlope: 0 outSlope: 0 @@ -370,7 +370,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5833333 + time: 1 value: 0.3018868 inSlope: 0 outSlope: 0 @@ -398,7 +398,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5833333 + time: 1 value: 0.3018868 inSlope: 0 outSlope: 0 @@ -426,7 +426,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5833333 + time: 1 value: 0 inSlope: 0 outSlope: 0 diff --git a/Assets/Resources/Animations/SceneTransition_s.anim b/Assets/Resources/Animations/SceneTransition_s.anim index e5698f7..21a15e7 100644 --- a/Assets/Resources/Animations/SceneTransition_s.anim +++ b/Assets/Resources/Animations/SceneTransition_s.anim @@ -87,7 +87,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5833333 + time: 1 value: 1 inSlope: 0 outSlope: 0 @@ -115,7 +115,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5833333 + time: 1 value: 0.3018868 inSlope: 0 outSlope: 0 @@ -143,7 +143,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5833333 + time: 1 value: 0.3018868 inSlope: 0 outSlope: 0 @@ -171,7 +171,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5833333 + time: 1 value: 0.3018868 inSlope: 0 outSlope: 0 @@ -199,7 +199,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5833333 + time: 1 value: 1 inSlope: 0 outSlope: 0 @@ -228,7 +228,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.5833333 + m_StopTime: 1 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -314,7 +314,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5833333 + time: 1 value: 1 inSlope: 0 outSlope: 0 @@ -342,7 +342,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5833333 + time: 1 value: 0.3018868 inSlope: 0 outSlope: 0 @@ -370,7 +370,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5833333 + time: 1 value: 0.3018868 inSlope: 0 outSlope: 0 @@ -398,7 +398,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5833333 + time: 1 value: 0.3018868 inSlope: 0 outSlope: 0 @@ -426,7 +426,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5833333 + time: 1 value: 1 inSlope: 0 outSlope: 0 diff --git a/Assets/Scripts/UmaDatabase/UmaDataTypes.cs b/Assets/Scripts/UmaDatabase/UmaDataTypes.cs index a337abf..c4f80f2 100644 --- a/Assets/Scripts/UmaDatabase/UmaDataTypes.cs +++ b/Assets/Scripts/UmaDatabase/UmaDataTypes.cs @@ -1,11 +1,8 @@ -using System.Collections; -using System.Collections.Generic; +using System.Collections.Generic; using UnityEngine; using Gallop; using System.IO; using static UmaViewerUI; -using System.Xml.Linq; -using System.Windows.Markup; using System; public class UmaDatabaseEntry @@ -72,24 +69,9 @@ public class FaceTypeData { public string label, eyebrow_l, eyebrow_r, eye_l, eye_r, mouth, inverce_face_type; public int mouth_shape_type, set_face_group; - public FaceEmotionKeyTarget target; - public List emotionKeys; - - private float _weight; - public float Weight - { - get - { - return _weight; - } - set - { - _weight = value; - target.UpdateAllFacialKeyTargets(); - } - } + public float weight; } [System.Serializable] diff --git a/Assets/Scripts/UmaViewerBuilder.cs b/Assets/Scripts/UmaViewerBuilder.cs index 36ba084..bc217e5 100644 --- a/Assets/Scripts/UmaViewerBuilder.cs +++ b/Assets/Scripts/UmaViewerBuilder.cs @@ -2015,7 +2015,7 @@ public class UmaViewerBuilder : MonoBehaviour } if (CurrentUMAContainer.FaceDrivenKeyTarget) { - CurrentUMAContainer.FaceDrivenKeyTarget.ClearMorph(); + CurrentUMAContainer.FaceDrivenKeyTarget.ClearAllWeights(); CurrentUMAContainer.FaceDrivenKeyTarget.ChangeMorph(); } } diff --git a/Assets/Scripts/UmaViewerUI.cs b/Assets/Scripts/UmaViewerUI.cs index ec75c66..05a9b37 100644 --- a/Assets/Scripts/UmaViewerUI.cs +++ b/Assets/Scripts/UmaViewerUI.cs @@ -495,7 +495,7 @@ public class UmaViewerUI : MonoBehaviour } var container = Instantiate(UmaContainerSliderPrefab, EmotionList.content).GetComponent(); container.Name = emotion.label; - container.Slider.value = emotion.Weight; + container.Slider.value = emotion.weight; container.Slider.maxValue = 1; container.Slider.minValue = 0; container.Slider.onValueChanged.AddListener((a) => { target.ChangeEmotionWeight(emotion, a); }); diff --git a/Assets/Scripts/umamusume/Gallop/FaceDrivenKeyTarget.cs b/Assets/Scripts/umamusume/Gallop/FaceDrivenKeyTarget.cs index 7c7a0fe..651aa74 100644 --- a/Assets/Scripts/umamusume/Gallop/FaceDrivenKeyTarget.cs +++ b/Assets/Scripts/umamusume/Gallop/FaceDrivenKeyTarget.cs @@ -402,7 +402,7 @@ namespace Gallop ApplyRotationEar(); } - public void ClearMorph() + public void ClearAllWeights() { EarMorphs.ForEach(morph => morph.weight = 0); EyeBrowMorphs.ForEach(morph => morph.weight = 0); @@ -520,7 +520,6 @@ namespace Gallop } FacialReset(BaseLEyeMorph.trsArray); FacialReset(BaseREyeMorph.trsArray); - //ApplyRotationEye(); } public void FacialResetMouth() @@ -530,7 +529,6 @@ namespace Gallop OverrideFace(Container.FaceOverrideData); } FacialReset(BaseMouthMorph.trsArray); - //ApplyRotationMouth(); } public void FacialResetEyebrow() @@ -541,7 +539,6 @@ namespace Gallop } FacialReset(BaseLEyeBrowMorph.trsArray); FacialReset(BaseREyeBrowMorph.trsArray); - //ApplyRotationEyebrow(); } public void FacialResetEar() @@ -552,7 +549,6 @@ namespace Gallop } FacialReset(BaseLEarMorph.trsArray); FacialReset(BaseREarMorph.trsArray); - //ApplyRotationEyebrow(); } public void FacialReset(List trsArrays) diff --git a/Assets/Scripts/umamusume/Gallop/FaceEmotionKeyTarget.cs b/Assets/Scripts/umamusume/Gallop/FaceEmotionKeyTarget.cs index 45c490f..e3fe98b 100644 --- a/Assets/Scripts/umamusume/Gallop/FaceEmotionKeyTarget.cs +++ b/Assets/Scripts/umamusume/Gallop/FaceEmotionKeyTarget.cs @@ -44,7 +44,7 @@ public class FaceEmotionKeyTarget : ScriptableObject } else { - newValue.morph = morphs.Where(a => a.tag == splitArray[0] && a.direction == direction).First(); + newValue.morph = morphs.FirstOrDefault(a => a.tag == splitArray[0] && a.direction == direction); } newValue.weight = Convert.ToInt32(splitArray[1]); faceTypeData.emotionKeys.Add(newValue); @@ -58,7 +58,7 @@ public class FaceEmotionKeyTarget : ScriptableObject } else { - newValue.morph = morphs.Where(a => a.tag == morphName && a.direction == direction).First(); + newValue.morph = morphs.FirstOrDefault(a => a.tag == morphName && a.direction == direction); } newValue.weight = 100; faceTypeData.emotionKeys.Add(newValue); @@ -70,14 +70,15 @@ public class FaceEmotionKeyTarget : ScriptableObject public void ChangeEmotionWeight(FaceTypeData emotion, float val) { FaceDrivenKeyTarget.Container.isAnimatorControl = false; - emotion.Weight = val; + emotion.weight = val; + FaceDrivenKeyTarget.ClearAllWeights(); + UpdateAllTargetWeight(); FaceDrivenKeyTarget.ChangeMorph(); } - public void UpdateAllFacialKeyTargets() + public void UpdateAllTargetWeight() { if (FaceDrivenKeyTarget == null) return; - FaceDrivenKeyTarget.ClearMorph(); foreach (var emotion in FaceEmotionKey) { @@ -85,7 +86,7 @@ public class FaceEmotionKeyTarget : ScriptableObject { foreach (var key in emotion.emotionKeys) { - key.morph.weight += key.weight / 100 * emotion.Weight; + key.morph.weight += key.weight / 100 * emotion.weight; } } }