From 44f72bed204ec0fc5aed065b3c6992f7b648fa50 Mon Sep 17 00:00:00 2001 From: "1605296300@qq.com" Date: Tue, 23 Aug 2022 01:40:49 +0800 Subject: [PATCH] big fix --- Assets/Scripts/UmaViewerBuilder.cs | 1 + .../umamusume/CySpringDataContainer.cs | 4 +- .../Scripts/umamusume/FaceDrivenKeyTarget.cs | 264 +++++++----------- Assets/Scripts/umamusume/FacialMorph.cs | 24 +- 4 files changed, 122 insertions(+), 171 deletions(-) diff --git a/Assets/Scripts/UmaViewerBuilder.cs b/Assets/Scripts/UmaViewerBuilder.cs index 583631c..4f30a1d 100644 --- a/Assets/Scripts/UmaViewerBuilder.cs +++ b/Assets/Scripts/UmaViewerBuilder.cs @@ -401,6 +401,7 @@ public class UmaViewerBuilder : MonoBehaviour AnimationClip bbb = asset as AnimationClip; bbb.wrapMode = WrapMode.Loop; CurrentContainer.OverrideController["clip"] = bbb; + CurrentContainer.UmaAnimator.Play("clip", 0, 0); UnloadBundle(bundle, false); } diff --git a/Assets/Scripts/umamusume/CySpringDataContainer.cs b/Assets/Scripts/umamusume/CySpringDataContainer.cs index 473f9ec..9b303d6 100644 --- a/Assets/Scripts/umamusume/CySpringDataContainer.cs +++ b/Assets/Scripts/umamusume/CySpringDataContainer.cs @@ -95,7 +95,7 @@ namespace Gallop dynamic.SetupParticles(); dynamic.m_Gravity = new Vector3(0, -spring._gravity / 80000, 0); dynamic.m_Damping = 0.2f; - dynamic.m_Stiffness = spring._stiffnessForce / 8000; + dynamic.m_Stiffness = spring._stiffnessForce / 1000; dynamic.m_Elasticity = spring._dragForce / 4000; dynamic.m_Radius = spring._collisionRadius; foreach (string collisionName in spring._collisionNameList) @@ -111,7 +111,7 @@ namespace Gallop if (tempParticle != null) { tempParticle.m_Damping = 0.2f; - tempParticle.m_Stiffness = Childcollision._stiffnessForce / 8000; + tempParticle.m_Stiffness = Childcollision._stiffnessForce / 1000; tempParticle.m_Elasticity = Childcollision._dragForce / 4000; tempParticle.m_Radius = Childcollision._collisionRadius; foreach (string collisionName in Childcollision._collisionNameList) diff --git a/Assets/Scripts/umamusume/FaceDrivenKeyTarget.cs b/Assets/Scripts/umamusume/FaceDrivenKeyTarget.cs index 545fc5b..79d55d8 100644 --- a/Assets/Scripts/umamusume/FaceDrivenKeyTarget.cs +++ b/Assets/Scripts/umamusume/FaceDrivenKeyTarget.cs @@ -5,16 +5,16 @@ using UnityEngine; namespace Gallop { - public class FaceDrivenKeyTarget : MonoBehaviour + public class FaceDrivenKeyTarget : MonoBehaviour { public List _eyeTarget; public List _eyebrowTarget; public List _mouthTarget; public List Objs = new List(); - private List OriTrans = new List(); - private List OriRots = new List(); - private List OriScal = new List(); + private FacialMorph BaseLEyeBrowMorph, BaseREyeBrowMorph; + private FacialMorph BaseLEyeMorph, BaseREyeMorph; + private FacialMorph BaseMouthMorph; public List EyeBrowMorphs = new List(); public List EyeMorphs = new List(); @@ -25,26 +25,29 @@ namespace Gallop { Objs.AddRange(GetComponentsInChildren()); - foreach (Transform g in Objs) - { - OriTrans.Add(g.localPosition); - OriRots.Add(g.localRotation); - OriScal.Add(g.localScale); - } for (int i = 0; i < _eyebrowTarget.Count; i++) { for (int j = 0; j < _eyebrowTarget[i]._faceGroupInfo.Count; j++) { FacialMorph morph = new FacialMorph(); - morph.SetFace(this); - morph.name = "EyeBrow_" + i + "_" + (j > 0 ? "R" : "L"); + morph.target = this; + morph.direction = j > 0; + morph.name = "EyeBrow_" + i + "_" + (morph.direction ? "R" : "L"); morph.trsArray = _eyebrowTarget[i]._faceGroupInfo[j]._trsArray; - foreach(TrsArray trs in morph.trsArray) + foreach (TrsArray trs in morph.trsArray) { trs.transform = Objs.Find(ani => ani.name.Equals(trs._path)); } - EyeBrowMorphs.Add(morph); + if (i == 0) + { + if (morph.direction) BaseREyeBrowMorph = morph; + else BaseLEyeBrowMorph = morph; + } + else + { + EyeBrowMorphs.Add(morph); + } } } @@ -53,14 +56,23 @@ namespace Gallop for (int j = 0; j < _eyeTarget[i]._faceGroupInfo.Count; j++) { FacialMorph morph = new FacialMorph(); - morph.SetFace(this); - morph.name = "Eye_" + i + "_" + (j > 0 ? "R" : "L"); + morph.target = this; + morph.direction = j > 0; + morph.name = "Eye_" + i + "_" + (morph.direction ? "R" : "L"); morph.trsArray = _eyeTarget[i]._faceGroupInfo[j]._trsArray; foreach (TrsArray trs in morph.trsArray) { trs.transform = Objs.Find(ani => ani.name.Equals(trs._path)); } - EyeMorphs.Add(morph); + if (i == 0) + { + if (morph.direction) BaseREyeMorph = morph; + else BaseLEyeMorph = morph; + } + else + { + EyeMorphs.Add(morph); + } } } @@ -69,186 +81,118 @@ namespace Gallop for (int j = 0; j < _mouthTarget[i]._faceGroupInfo.Count; j++) { FacialMorph morph = new FacialMorph(); - morph.SetFace(this); + morph.target = this; + morph.direction = j > 0; morph.name = "Mouth_" + i + "_" + j; morph.trsArray = _mouthTarget[i]._faceGroupInfo[j]._trsArray; foreach (TrsArray trs in morph.trsArray) { trs.transform = Objs.Find(ani => ani.name.Equals(trs._path)); } - MouthMorphs.Add(morph); + if (i == 0) + { + BaseMouthMorph = morph; + } + else + { + MouthMorphs.Add(morph); + } } } - - MouthMorphs[4].Weight = 1; + FacialReset(); + MouthMorphs[3].Weight = 1; if (callBack != null) { callBack.CallBack(this); } } - - - private void FixedUpdate() - { - bool changed = false; - for (int i = 0; i < EyeBrowMorphs.Count; i++) - { - if(EyeBrowMorphs[i].LastWeight!= EyeBrowMorphs[i].Weight) - { - changed = true; - } - } - for (int i = 0; i < EyeMorphs.Count; i++) - { - if (EyeMorphs[i].LastWeight != EyeMorphs[i].Weight) - { - changed = true; - } - } - for (int i = 0; i < MouthMorphs.Count; i++) - { - if (MouthMorphs[i].LastWeight != MouthMorphs[i].Weight) - { - changed = true; - } - } - - if (changed)ChangeMorph(); - } - + public void ChangeMorph() { FacialReset(); + foreach (FacialMorph morph in EyeBrowMorphs) { - if(morph.LastWeight!=morph.Weight || morph.Weight > 0) - foreach(TrsArray trs in morph.trsArray) - { - if (trs.transform) - { - if (!trs.IsOverrideTarget) - { - var tmp = trs.transform.localRotation.eulerAngles; - tmp += (trs._rotation * morph.Weight); - trs.transform.localRotation = Quaternion.Euler(trs.transform.localRotation.eulerAngles + (trs._rotation * morph.Weight)); - trs.transform.localPosition += trs._position * morph.Weight; - trs.transform.localScale += trs._scale * morph.Weight; - } - }; - } + ProcessMorph(morph); } foreach (FacialMorph morph in EyeMorphs) { - if(morph.LastWeight!=morph.Weight || morph.Weight > 0) - foreach (TrsArray trs in morph.trsArray) - { - if (trs.transform) - { - if (!trs.IsOverrideTarget) - { - var tmp = trs.transform.localRotation.eulerAngles; - tmp += (trs._rotation * morph.Weight); - trs.transform.localRotation = Quaternion.Euler(trs.transform.localRotation.eulerAngles + (trs._rotation * morph.Weight)); - trs.transform.localPosition += trs._position * morph.Weight; - trs.transform.localScale += trs._scale * morph.Weight; - } - }; - } + ProcessMorph(morph); } foreach (FacialMorph morph in MouthMorphs) { - if(morph.LastWeight!=morph.Weight || morph.Weight > 0) - foreach (TrsArray trs in morph.trsArray) - { - if (trs.transform) - { - if (!trs.IsOverrideTarget) - { - var tmp = trs.transform.localRotation.eulerAngles; - tmp += (trs._rotation * morph.Weight); - trs.transform.localRotation = Quaternion.Euler(trs.transform.localRotation.eulerAngles + (trs._rotation * morph.Weight)); - trs.transform.localPosition += trs._position * morph.Weight; - trs.transform.localScale += trs._scale * morph.Weight; - } - }; - } + ProcessMorph(morph); } - - - foreach (FacialMorph morph in EyeBrowMorphs)//´¦Àí¸²¸Ç±íÇé + } + private void ProcessMorph(FacialMorph morph) + { + foreach (TrsArray trs in morph.trsArray) { - if (morph.LastWeight != morph.Weight || morph.Weight > 0) + if (trs.transform) { - foreach (TrsArray trs in morph.trsArray) - { - if (trs.transform) - { - if (trs.IsOverrideTarget) - { - trs.transform.localRotation = Quaternion.Euler(Vector3.Lerp(trs.transform.localRotation.eulerAngles, trs._rotation, morph.Weight)); - trs.transform.localPosition = Vector3.Lerp(trs.transform.localPosition, trs._position, morph.Weight); - trs.transform.localScale = Vector3.Lerp(trs.transform.localScale, trs._scale, morph.Weight); - } - }; - } - morph.LastWeight = morph.Weight; - } - } - - foreach (FacialMorph morph in EyeMorphs) - { - if (morph.LastWeight != morph.Weight || morph.Weight > 0) - { - foreach (TrsArray trs in morph.trsArray) - { - if (trs.transform) - { - if (trs.IsOverrideTarget) - { - trs.transform.localRotation = Quaternion.Euler(Vector3.Lerp(trs.transform.localRotation.eulerAngles, trs._rotation, morph.Weight)); - trs.transform.localPosition = Vector3.Lerp(trs.transform.localPosition, trs._position, morph.Weight); - trs.transform.localScale = Vector3.Lerp(trs.transform.localScale, trs._scale, morph.Weight); - } - }; - } - morph.LastWeight = morph.Weight; - } - } - - foreach (FacialMorph morph in MouthMorphs) - { - if (morph.LastWeight != morph.Weight || morph.Weight > 0) - { - foreach (TrsArray trs in morph.trsArray) - { - if (trs.transform) - { - if (trs.IsOverrideTarget) - { - trs.transform.localRotation = Quaternion.Euler(Vector3.Lerp(trs.transform.localRotation.eulerAngles, trs._rotation, morph.Weight)); - trs.transform.localPosition = Vector3.Lerp(trs.transform.localPosition, trs._position, morph.Weight); - trs.transform.localScale = Vector3.Lerp(trs.transform.localScale, trs._scale, morph.Weight); - } - }; - } - morph.LastWeight = morph.Weight; - } + trs.transform.localRotation = Quaternion.Euler(trs.transform.localRotation.eulerAngles + (trs._rotation * morph.Weight)); + trs.transform.localPosition += trs._position * morph.Weight; + trs.transform.localScale += trs._scale * morph.Weight; + }; } } public void FacialReset() { - for (int i = 0; i < Objs.Count; i++) + foreach (TrsArray trs in BaseLEyeBrowMorph.trsArray) { - Objs[i].localPosition = OriTrans[i]; - Objs[i].localRotation = OriRots[i]; - Objs[i].localScale = OriScal[i]; + if (trs.transform) + { + trs.transform.localRotation = Quaternion.Euler(trs._rotation); + trs.transform.localPosition = trs._position; + trs.transform.localScale = trs._scale; + }; + } + + foreach (TrsArray trs in BaseREyeBrowMorph.trsArray) + { + if (trs.transform) + { + trs.transform.localRotation = Quaternion.Euler(trs._rotation); + trs.transform.localPosition = trs._position; + trs.transform.localScale = trs._scale; + }; + } + + foreach (TrsArray trs in BaseLEyeMorph.trsArray) + { + if (trs.transform) + { + trs.transform.localRotation = Quaternion.Euler(trs._rotation); + trs.transform.localPosition = trs._position; + trs.transform.localScale = trs._scale; + }; + } + + foreach (TrsArray trs in BaseREyeMorph.trsArray) + { + if (trs.transform) + { + trs.transform.localRotation = Quaternion.Euler(trs._rotation); + trs.transform.localPosition = trs._position; + trs.transform.localScale = trs._scale; + }; + } + + foreach (TrsArray trs in BaseMouthMorph.trsArray) + { + if (trs.transform) + { + trs.transform.localRotation = Quaternion.Euler(trs._rotation); + trs.transform.localPosition = trs._position; + trs.transform.localScale = trs._scale; + }; } } - + } - + } diff --git a/Assets/Scripts/umamusume/FacialMorph.cs b/Assets/Scripts/umamusume/FacialMorph.cs index 4fd3c8b..2c31d8e 100644 --- a/Assets/Scripts/umamusume/FacialMorph.cs +++ b/Assets/Scripts/umamusume/FacialMorph.cs @@ -11,15 +11,21 @@ namespace Gallop public class FacialMorph { public string name; - private FaceDrivenKeyTarget face; - [Range(0, 1)] - public float Weight; - [HideInInspector]public float LastWeight; - [HideInInspector] public List trsArray; - - public void SetFace(FaceDrivenKeyTarget faceTarget) + public bool direction; + public FaceDrivenKeyTarget target; + private float _weight; + public float Weight { - face = faceTarget; - } + get + { + return _weight; + } + set + { + _weight = value; + target.ChangeMorph(); + } + } + [HideInInspector] public List trsArray; } }