diff --git a/Assets/External/OptiTrack Unity Plugin/OptiTrack/Prefabs/BaseAvatar - OptiTrack.prefab b/Assets/External/OptiTrack Unity Plugin/OptiTrack/Prefabs/BaseAvatar - OptiTrack.prefab index bc70f85d..404dd70f 100644 --- a/Assets/External/OptiTrack Unity Plugin/OptiTrack/Prefabs/BaseAvatar - OptiTrack.prefab +++ b/Assets/External/OptiTrack Unity Plugin/OptiTrack/Prefabs/BaseAvatar - OptiTrack.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f0dc57aeea55029e01785c49e483d99b32addf4a0f20d8eb04b0ca61ed12c0b2 -size 98952 +oid sha256:f070bbfbee67158e61dc2695f4761236be01512afa989978efd863c2ec6687ba +size 102557 diff --git a/Assets/External/OptiTrack Unity Plugin/OptiTrack/Scripts/OptitrackSkeletonAnimator_Mingle.cs b/Assets/External/OptiTrack Unity Plugin/OptiTrack/Scripts/OptitrackSkeletonAnimator_Mingle.cs index 3fa264e7..e8778eff 100644 --- a/Assets/External/OptiTrack Unity Plugin/OptiTrack/Scripts/OptitrackSkeletonAnimator_Mingle.cs +++ b/Assets/External/OptiTrack Unity Plugin/OptiTrack/Scripts/OptitrackSkeletonAnimator_Mingle.cs @@ -12,6 +12,7 @@ public enum MotionApplicationScope ExcludeHandsAndFingers // 손목 + 손가락 제외 } +[DefaultExecutionOrder(1)] public class OptitrackSkeletonAnimator_Mingle : MonoBehaviour { [Header("OptiTrack 설정")] diff --git a/Assets/External/Rokoko/Scripts/Mono/Inputs/Actor.cs b/Assets/External/Rokoko/Scripts/Mono/Inputs/Actor.cs index edb4510e..7ebeceb9 100644 --- a/Assets/External/Rokoko/Scripts/Mono/Inputs/Actor.cs +++ b/Assets/External/Rokoko/Scripts/Mono/Inputs/Actor.cs @@ -8,7 +8,6 @@ using UnityEngine; namespace Rokoko.Inputs { - [DefaultExecutionOrder(-1)] public class Actor : MonoBehaviour { [System.Serializable] diff --git a/Assets/External/Rokoko/Scripts/Mono/Inputs/Actor.cs.meta b/Assets/External/Rokoko/Scripts/Mono/Inputs/Actor.cs.meta index ce11fe37..c13834b6 100644 --- a/Assets/External/Rokoko/Scripts/Mono/Inputs/Actor.cs.meta +++ b/Assets/External/Rokoko/Scripts/Mono/Inputs/Actor.cs.meta @@ -4,7 +4,7 @@ MonoImporter: externalObjects: {} serializedVersion: 2 defaultReferences: [] - executionOrder: 0 + executionOrder: -10 icon: {instanceID: 0} userData: assetBundleName: diff --git a/Assets/External/RootMotion/FinalIK/IK Components/FullBodyInverseKinematics_RND.cs b/Assets/External/RootMotion/FinalIK/IK Components/FullBodyInverseKinematics_RND.cs index bff8c869..fd143ddd 100644 --- a/Assets/External/RootMotion/FinalIK/IK Components/FullBodyInverseKinematics_RND.cs +++ b/Assets/External/RootMotion/FinalIK/IK Components/FullBodyInverseKinematics_RND.cs @@ -10,7 +10,7 @@ namespace RootMotion.FinalIK /// A full-body IK solver designed specifically for a VR HMD and hand controllers. /// //[HelpURL("http://www.root-motion.com/finalikdox/html/page16.html")] - [DefaultExecutionOrder(4)] + [DefaultExecutionOrder(5)] public class FullBodyInverseKinematics_RND : IK { diff --git a/Assets/Scripts/KindRetargeting/CustomRetargetingScript.cs b/Assets/Scripts/KindRetargeting/CustomRetargetingScript.cs index 9b2a5afb..ddd0a1d5 100644 --- a/Assets/Scripts/KindRetargeting/CustomRetargetingScript.cs +++ b/Assets/Scripts/KindRetargeting/CustomRetargetingScript.cs @@ -16,6 +16,7 @@ namespace KindRetargeting [RequireComponent(typeof(FullBodyInverseKinematics_RND))] [RequireComponent(typeof(PropLocationController))] [RequireComponent(typeof(FingerShapedController))] + [DefaultExecutionOrder(1)] public class CustomRetargetingScript : MonoBehaviour { #region 필드 diff --git a/Assets/Scripts/KindRetargeting/FingerShapedController.cs b/Assets/Scripts/KindRetargeting/FingerShapedController.cs index 8b4f5046..1613d711 100644 --- a/Assets/Scripts/KindRetargeting/FingerShapedController.cs +++ b/Assets/Scripts/KindRetargeting/FingerShapedController.cs @@ -1,6 +1,6 @@ using UnityEngine; -[DefaultExecutionOrder(1)] +[DefaultExecutionOrder(2)] public class FingerShapedController : MonoBehaviour { private Animator animator; diff --git a/Assets/Scripts/KindRetargeting/LimbWeightController.cs b/Assets/Scripts/KindRetargeting/LimbWeightController.cs index 38fd686c..6ea13eb4 100644 --- a/Assets/Scripts/KindRetargeting/LimbWeightController.cs +++ b/Assets/Scripts/KindRetargeting/LimbWeightController.cs @@ -6,7 +6,7 @@ using RootMotion.FinalIK; namespace KindRetargeting { - [DefaultExecutionOrder(3)] + [DefaultExecutionOrder(4)] public class LimbWeightController : MonoBehaviour { [Header("거리 기반 가중치 설정")] diff --git a/Assets/Scripts/KindRetargeting/ShoulderCorrectionFunction.cs b/Assets/Scripts/KindRetargeting/ShoulderCorrectionFunction.cs index a188db3a..7fda08a2 100644 --- a/Assets/Scripts/KindRetargeting/ShoulderCorrectionFunction.cs +++ b/Assets/Scripts/KindRetargeting/ShoulderCorrectionFunction.cs @@ -6,7 +6,7 @@ using System.Linq; namespace KindRetargeting { - [DefaultExecutionOrder(2)] + [DefaultExecutionOrder(3)] public class ShoulderCorrectionFunction : MonoBehaviour { private CustomRetargetingScript retargetingScript; // 소스 데이터를 가져올 리타게팅 스크립트