From 6c91a2ef9a69e8dc1a59152d2ca40d4e057a6f2e Mon Sep 17 00:00:00 2001 From: CroakFang <1605296300@qq.com> Date: Thu, 10 Nov 2022 12:50:20 +0800 Subject: [PATCH] Optimize physics (prevent breast from penetrating the body) --- .../umamusume/Gallop/CySpringDataContainer.cs | 15 +++++++++------ .../umamusume/Gallop/FaceDrivenKeyTarget.cs | 1 - 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Assets/Scripts/umamusume/Gallop/CySpringDataContainer.cs b/Assets/Scripts/umamusume/Gallop/CySpringDataContainer.cs index b2e8f45..92a97ab 100644 --- a/Assets/Scripts/umamusume/Gallop/CySpringDataContainer.cs +++ b/Assets/Scripts/umamusume/Gallop/CySpringDataContainer.cs @@ -95,7 +95,7 @@ namespace Gallop if (bone) { bool isTail = gameObject.name.Contains("tail");//The tail needs less traction - var dynamic = gameObject.AddComponent(); + var dynamic = bone.gameObject.AddComponent(); dynamic.m_Root = bone; dynamic.m_UpdateMode = DynamicBone.UpdateMode.Normal; dynamic.m_Gravity = new Vector3(0, Mathf.Clamp01(-30 / spring._gravity), 0); @@ -115,7 +115,8 @@ namespace Gallop } dynamic.m_Radius = spring._collisionRadius; - dynamic.m_Friction = 0.5f; + dynamic.m_Friction = 0.5f; + dynamic.m_Inert = spring.MoveSpringApplyRate / 3; dynamic.SetupParticles(); DynamicBones.Add(dynamic); @@ -129,22 +130,24 @@ namespace Gallop } foreach (CySpringParamDataChildElement Childcollision in spring._childElements) { + var tempParticle = dynamic.Particles.Find(a => { return a.m_Transform.gameObject.name == Childcollision._boneName; }); if (tempParticle != null) { if (isTail) { tempParticle.m_Damping = 0.1f; - tempParticle.m_Stiffness = Mathf.Clamp01(10 / spring._stiffnessForce); - tempParticle.m_Elasticity = Mathf.Clamp01(10 / spring._dragForce); + tempParticle.m_Stiffness = Mathf.Clamp01(10 / Childcollision._stiffnessForce); + tempParticle.m_Elasticity = Mathf.Clamp01(10 / Childcollision._dragForce); } else { tempParticle.m_Damping = 0.2f; - tempParticle.m_Stiffness = Mathf.Clamp01(45 / spring._stiffnessForce); - tempParticle.m_Elasticity = Mathf.Clamp01(45 / spring._dragForce); + tempParticle.m_Stiffness = Mathf.Clamp01(45 / Childcollision._stiffnessForce); + tempParticle.m_Elasticity = Mathf.Clamp01(45 / Childcollision._dragForce); } tempParticle.m_Friction = 0.5f; + tempParticle.m_Inert = Childcollision.MoveSpringApplyRate / 3; tempParticle.m_Radius = Childcollision._collisionRadius; tempParticle.m_LimitAngel_Min = Childcollision._limitAngleMin; tempParticle.m_LimitAngel_Max = Childcollision._limitAngleMax; diff --git a/Assets/Scripts/umamusume/Gallop/FaceDrivenKeyTarget.cs b/Assets/Scripts/umamusume/Gallop/FaceDrivenKeyTarget.cs index 3374a8b..6c9316d 100644 --- a/Assets/Scripts/umamusume/Gallop/FaceDrivenKeyTarget.cs +++ b/Assets/Scripts/umamusume/Gallop/FaceDrivenKeyTarget.cs @@ -319,7 +319,6 @@ namespace Gallop foreach (var trs in RotationRecorder) { trs.Key.transform.localRotation = RotationConvert.fromMaya(trs.Value); - var tmp = trs.Key.transform.localEulerAngles; } if (Container.EnablePhysics) {