diff --git a/Alternative Animations/E_Hand_ImLeXz.anim b/Alternative Animations/E_Hand_ImLeXz.anim index 7992637..a217af0 100644 --- a/Alternative Animations/E_Hand_ImLeXz.anim +++ b/Alternative Animations/E_Hand_ImLeXz.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: E Hand + m_Name: E_Hand_ImLeXz serializedVersion: 6 m_Legacy: 0 m_Compressed: 0 diff --git a/Alternative Animations/R hand_Alt2.anim b/Alternative Animations/R hand_Alt2.anim index b0baee7..cecaed7 100644 --- a/Alternative Animations/R hand_Alt2.anim +++ b/Alternative Animations/R hand_Alt2.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: R hand + m_Name: R hand_Alt2 serializedVersion: 6 m_Legacy: 0 m_Compressed: 0 diff --git a/GeneralVR/Without/ASLGestures_GeneralVR_LeftHandDominant.controller b/GeneralVR/Without/ASLGestures_GeneralVR_LeftHandDominant.controller index cd60a8f..3058fa0 100644 --- a/GeneralVR/Without/ASLGestures_GeneralVR_LeftHandDominant.controller +++ b/GeneralVR/Without/ASLGestures_GeneralVR_LeftHandDominant.controller @@ -780,7 +780,7 @@ AnimatorStateTransition: m_ConditionEvent: GestureLeft m_EventTreshold: 4 - m_ConditionMode: 2 - m_ConditionEvent: Disable Signs + m_ConditionEvent: SignsDisabled m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 1102721518656945930} @@ -1096,7 +1096,7 @@ AnimatorStateTransition: m_ConditionEvent: GestureLeft m_EventTreshold: 0 - m_ConditionMode: 2 - m_ConditionEvent: Disable Signs + m_ConditionEvent: SignsDisabled m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: -3219616285860105227} @@ -1258,7 +1258,7 @@ AnimatorStateTransition: m_ConditionEvent: GestureRightWeight m_EventTreshold: 0.99 - m_ConditionMode: 2 - m_ConditionEvent: Disable Signs + m_ConditionEvent: SignsDisabled m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 1102766715558962252} @@ -1722,42 +1722,42 @@ AnimatorController: m_Name: ASLGestures_GeneralVR_LeftHandDominant serializedVersion: 5 m_AnimatorParameters: - - m_Name: GestureLeft + - m_Name: GestureRight m_Type: 3 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} - - m_Name: GestureRight + m_Controller: {fileID: 9100000} + - m_Name: GestureLeft m_Type: 3 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} - - m_Name: GestureLeftWeight + m_Controller: {fileID: 9100000} + - m_Name: GestureRightWeight m_Type: 1 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} - - m_Name: GestureRightWeight + m_Controller: {fileID: 9100000} + - m_Name: GestureLeftWeight m_Type: 1 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} - - m_Name: ComboSignIndex - m_Type: 3 + m_Controller: {fileID: 9100000} + - m_Name: SignsDisabled + m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} - - m_Name: Disable Signs - m_Type: 4 + m_Controller: {fileID: 9100000} + - m_Name: ComboSignIndex + m_Type: 3 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: AllParts @@ -3278,7 +3278,7 @@ AnimatorStateTransition: m_ConditionEvent: GestureLeft m_EventTreshold: 6 - m_ConditionMode: 2 - m_ConditionEvent: Disable Signs + m_ConditionEvent: SignsDisabled m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 1102759187657161886} @@ -5477,7 +5477,7 @@ AnimatorStateTransition: m_ConditionEvent: GestureLeft m_EventTreshold: 2 - m_ConditionMode: 2 - m_ConditionEvent: Disable Signs + m_ConditionEvent: SignsDisabled m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 1102216745446540684} @@ -5631,7 +5631,7 @@ AnimatorStateTransition: m_ConditionEvent: GestureLeft m_EventTreshold: 7 - m_ConditionMode: 2 - m_ConditionEvent: Disable Signs + m_ConditionEvent: SignsDisabled m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 1102793691554635598} @@ -6019,7 +6019,7 @@ AnimatorStateTransition: m_ConditionEvent: GestureLeft m_EventTreshold: 1 - m_ConditionMode: 2 - m_ConditionEvent: Disable Signs + m_ConditionEvent: SignsDisabled m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 1102295850850822420} @@ -6575,7 +6575,7 @@ AnimatorStateTransition: m_ConditionEvent: GestureLeft m_EventTreshold: 3 - m_ConditionMode: 2 - m_ConditionEvent: Disable Signs + m_ConditionEvent: SignsDisabled m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 1102151203558476982} diff --git a/GeneralVR/Without/ASLGestures_GeneralVR_RightHandDominant.controller b/GeneralVR/Without/ASLGestures_GeneralVR_RightHandDominant.controller index b3ed69c..72c1fcc 100644 --- a/GeneralVR/Without/ASLGestures_GeneralVR_RightHandDominant.controller +++ b/GeneralVR/Without/ASLGestures_GeneralVR_RightHandDominant.controller @@ -15,7 +15,7 @@ AnimatorTransition: m_ConditionEvent: GestureLeftWeight m_EventTreshold: 0.99 - m_ConditionMode: 6 - m_ConditionEvent: Disable Signs + m_ConditionEvent: ComboSignIndex m_EventTreshold: 15 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 1102559959667834710} @@ -149,7 +149,7 @@ AnimatorTransition: m_ConditionEvent: GestureLeftWeight m_EventTreshold: 0.99 - m_ConditionMode: 6 - m_ConditionEvent: Disable Signs + m_ConditionEvent: ComboSignIndex m_EventTreshold: 14 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 1102069462340593210} @@ -236,7 +236,7 @@ AnimatorTransition: m_ConditionEvent: GestureLeft m_EventTreshold: 5 - m_ConditionMode: 6 - m_ConditionEvent: Disable Signs + m_ConditionEvent: ComboSignIndex m_EventTreshold: 1 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 7825636375382634230} @@ -390,7 +390,7 @@ AnimatorStateTransition: m_Name: m_Conditions: - m_ConditionMode: 7 - m_ConditionEvent: Disable Signs + m_ConditionEvent: ComboSignIndex m_EventTreshold: 11 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 0} @@ -495,7 +495,7 @@ AnimatorStateTransition: m_Name: m_Conditions: - m_ConditionMode: 7 - m_ConditionEvent: Disable Signs + m_ConditionEvent: ComboSignIndex m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 0} @@ -520,7 +520,7 @@ AnimatorStateTransition: m_Name: m_Conditions: - m_ConditionMode: 7 - m_ConditionEvent: Disable Signs + m_ConditionEvent: ComboSignIndex m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 0} @@ -587,7 +587,7 @@ AnimatorTransition: m_ConditionEvent: GestureLeft m_EventTreshold: 5 - m_ConditionMode: 6 - m_ConditionEvent: Disable Signs + m_ConditionEvent: ComboSignIndex m_EventTreshold: 6 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 1102206801987528532} @@ -604,7 +604,7 @@ AnimatorStateTransition: m_Name: m_Conditions: - m_ConditionMode: 7 - m_ConditionEvent: Disable Signs + m_ConditionEvent: ComboSignIndex m_EventTreshold: 4 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 0} @@ -659,7 +659,7 @@ AnimatorTransition: m_ConditionEvent: GestureLeft m_EventTreshold: 5 - m_ConditionMode: 6 - m_ConditionEvent: Disable Signs + m_ConditionEvent: ComboSignIndex m_EventTreshold: 4 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 1102773295092061210} @@ -707,7 +707,7 @@ AnimatorTransition: m_ConditionEvent: GestureLeftWeight m_EventTreshold: 0.99 - m_ConditionMode: 6 - m_ConditionEvent: Disable Signs + m_ConditionEvent: ComboSignIndex m_EventTreshold: 9 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 2248576940643016808} @@ -724,7 +724,7 @@ AnimatorStateTransition: m_Name: m_Conditions: - m_ConditionMode: 7 - m_ConditionEvent: Disable Signs + m_ConditionEvent: ComboSignIndex m_EventTreshold: 5 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 0} @@ -780,7 +780,7 @@ AnimatorStateTransition: m_ConditionEvent: GestureRight m_EventTreshold: 4 - m_ConditionMode: 2 - m_ConditionEvent: ComboSignDisabled + m_ConditionEvent: SignsDisabled m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 1102721518656945930} @@ -961,7 +961,7 @@ AnimatorStateTransition: m_Name: m_Conditions: - m_ConditionMode: 7 - m_ConditionEvent: Disable Signs + m_ConditionEvent: ComboSignIndex m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 0} @@ -1096,7 +1096,7 @@ AnimatorStateTransition: m_ConditionEvent: GestureRight m_EventTreshold: 0 - m_ConditionMode: 2 - m_ConditionEvent: ComboSignDisabled + m_ConditionEvent: SignsDisabled m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: -3219616285860105227} @@ -1121,7 +1121,7 @@ AnimatorStateTransition: m_Name: m_Conditions: - m_ConditionMode: 7 - m_ConditionEvent: Disable Signs + m_ConditionEvent: ComboSignIndex m_EventTreshold: 10 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 0} @@ -1227,7 +1227,7 @@ AnimatorStateTransition: m_Name: m_Conditions: - m_ConditionMode: 7 - m_ConditionEvent: Disable Signs + m_ConditionEvent: ComboSignIndex m_EventTreshold: 12 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 0} @@ -1258,7 +1258,7 @@ AnimatorStateTransition: m_ConditionEvent: GestureLeftWeight m_EventTreshold: 0.99 - m_ConditionMode: 2 - m_ConditionEvent: ComboSignDisabled + m_ConditionEvent: SignsDisabled m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 1102766715558962252} @@ -1353,7 +1353,7 @@ AnimatorTransition: m_ConditionEvent: GestureLeftWeight m_EventTreshold: 0.99 - m_ConditionMode: 6 - m_ConditionEvent: Disable Signs + m_ConditionEvent: ComboSignIndex m_EventTreshold: 8 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: -6773007569020634667} @@ -1460,7 +1460,7 @@ AnimatorTransition: m_ConditionEvent: GestureLeftWeight m_EventTreshold: 0.99 - m_ConditionMode: 6 - m_ConditionEvent: Disable Signs + m_ConditionEvent: ComboSignIndex m_EventTreshold: 10 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 1102839052289514810} @@ -1502,7 +1502,7 @@ AnimatorStateTransition: m_Name: m_Conditions: - m_ConditionMode: 7 - m_ConditionEvent: Disable Signs + m_ConditionEvent: ComboSignIndex m_EventTreshold: 1 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 0} @@ -1580,7 +1580,7 @@ AnimatorTransition: m_ConditionEvent: GestureLeft m_EventTreshold: 5 - m_ConditionMode: 6 - m_ConditionEvent: Disable Signs + m_ConditionEvent: ComboSignIndex m_EventTreshold: 7 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 1102961518682305970} @@ -1619,7 +1619,7 @@ AnimatorStateTransition: m_Name: m_Conditions: - m_ConditionMode: 7 - m_ConditionEvent: Disable Signs + m_ConditionEvent: ComboSignIndex m_EventTreshold: 9 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 0} @@ -1746,13 +1746,13 @@ AnimatorController: m_DefaultInt: 0 m_DefaultBool: 0 m_Controller: {fileID: 0} - - m_Name: ComboSignDisabled + - m_Name: SignsDisabled m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 m_Controller: {fileID: 0} - - m_Name: Disable Signs + - m_Name: ComboSignIndex m_Type: 3 m_DefaultFloat: 0 m_DefaultInt: 0 @@ -3278,7 +3278,7 @@ AnimatorStateTransition: m_ConditionEvent: GestureRight m_EventTreshold: 6 - m_ConditionMode: 2 - m_ConditionEvent: ComboSignDisabled + m_ConditionEvent: SignsDisabled m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 1102759187657161886} @@ -3306,7 +3306,7 @@ AnimatorTransition: m_ConditionEvent: GestureLeft m_EventTreshold: 5 - m_ConditionMode: 6 - m_ConditionEvent: Disable Signs + m_ConditionEvent: ComboSignIndex m_EventTreshold: 5 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 1102971303449907880} @@ -3348,7 +3348,7 @@ AnimatorStateTransition: m_Name: m_Conditions: - m_ConditionMode: 7 - m_ConditionEvent: Disable Signs + m_ConditionEvent: ComboSignIndex m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 0} @@ -3373,7 +3373,7 @@ AnimatorStateTransition: m_Name: m_Conditions: - m_ConditionMode: 7 - m_ConditionEvent: Disable Signs + m_ConditionEvent: ComboSignIndex m_EventTreshold: 13 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 0} @@ -3398,7 +3398,7 @@ AnimatorStateTransition: m_Name: m_Conditions: - m_ConditionMode: 7 - m_ConditionEvent: Disable Signs + m_ConditionEvent: ComboSignIndex m_EventTreshold: 2 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 0} @@ -3426,7 +3426,7 @@ AnimatorTransition: m_ConditionEvent: GestureLeft m_EventTreshold: 5 - m_ConditionMode: 6 - m_ConditionEvent: Disable Signs + m_ConditionEvent: ComboSignIndex m_EventTreshold: 2 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 1102472811866488948} @@ -5221,7 +5221,7 @@ AnimatorStateTransition: m_Name: m_Conditions: - m_ConditionMode: 7 - m_ConditionEvent: Disable Signs + m_ConditionEvent: ComboSignIndex m_EventTreshold: 7 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 0} @@ -5477,7 +5477,7 @@ AnimatorStateTransition: m_ConditionEvent: GestureRight m_EventTreshold: 2 - m_ConditionMode: 2 - m_ConditionEvent: ComboSignDisabled + m_ConditionEvent: SignsDisabled m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 1102216745446540684} @@ -5505,7 +5505,7 @@ AnimatorTransition: m_ConditionEvent: GestureLeft m_EventTreshold: 5 - m_ConditionMode: 6 - m_ConditionEvent: Disable Signs + m_ConditionEvent: ComboSignIndex m_EventTreshold: 3 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 1102224574226870890} @@ -5522,7 +5522,7 @@ AnimatorStateTransition: m_Name: m_Conditions: - m_ConditionMode: 7 - m_ConditionEvent: Disable Signs + m_ConditionEvent: ComboSignIndex m_EventTreshold: 3 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 0} @@ -5600,7 +5600,7 @@ AnimatorStateTransition: m_Name: m_Conditions: - m_ConditionMode: 7 - m_ConditionEvent: Disable Signs + m_ConditionEvent: ComboSignIndex m_EventTreshold: 6 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 0} @@ -5631,7 +5631,7 @@ AnimatorStateTransition: m_ConditionEvent: GestureRight m_EventTreshold: 7 - m_ConditionMode: 2 - m_ConditionEvent: ComboSignDisabled + m_ConditionEvent: SignsDisabled m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 1102793691554635598} @@ -5662,7 +5662,7 @@ AnimatorTransition: m_ConditionEvent: GestureLeftWeight m_EventTreshold: 0.99 - m_ConditionMode: 6 - m_ConditionEvent: Disable Signs + m_ConditionEvent: ComboSignIndex m_EventTreshold: 13 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 1102712918967198156} @@ -5718,7 +5718,7 @@ AnimatorStateTransition: m_Name: m_Conditions: - m_ConditionMode: 7 - m_ConditionEvent: Disable Signs + m_ConditionEvent: ComboSignIndex m_EventTreshold: 14 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 0} @@ -5815,7 +5815,7 @@ AnimatorTransition: m_ConditionEvent: GestureLeftWeight m_EventTreshold: 0.99 - m_ConditionMode: 6 - m_ConditionEvent: Disable Signs + m_ConditionEvent: ComboSignIndex m_EventTreshold: 12 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 1102910455220012622} @@ -5882,7 +5882,7 @@ AnimatorStateTransition: m_Name: m_Conditions: - m_ConditionMode: 7 - m_ConditionEvent: Disable Signs + m_ConditionEvent: ComboSignIndex m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 0} @@ -6019,7 +6019,7 @@ AnimatorStateTransition: m_ConditionEvent: GestureRight m_EventTreshold: 1 - m_ConditionMode: 2 - m_ConditionEvent: ComboSignDisabled + m_ConditionEvent: SignsDisabled m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 1102295850850822420} @@ -6326,7 +6326,7 @@ AnimatorStateTransition: m_Name: m_Conditions: - m_ConditionMode: 7 - m_ConditionEvent: Disable Signs + m_ConditionEvent: ComboSignIndex m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 0} @@ -6575,7 +6575,7 @@ AnimatorStateTransition: m_ConditionEvent: GestureRight m_EventTreshold: 3 - m_ConditionMode: 2 - m_ConditionEvent: ComboSignDisabled + m_ConditionEvent: SignsDisabled m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 1102151203558476982} @@ -6600,7 +6600,7 @@ AnimatorStateTransition: m_Name: m_Conditions: - m_ConditionMode: 7 - m_ConditionEvent: Disable Signs + m_ConditionEvent: ComboSignIndex m_EventTreshold: 15 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 0} @@ -6625,7 +6625,7 @@ AnimatorStateTransition: m_Name: m_Conditions: - m_ConditionMode: 7 - m_ConditionEvent: Disable Signs + m_ConditionEvent: ComboSignIndex m_EventTreshold: 8 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 0} @@ -6650,7 +6650,7 @@ AnimatorStateTransition: m_Name: m_Conditions: - m_ConditionMode: 7 - m_ConditionEvent: Disable Signs + m_ConditionEvent: ComboSignIndex m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 0} @@ -6703,7 +6703,7 @@ AnimatorStateTransition: m_Name: m_Conditions: - m_ConditionMode: 7 - m_ConditionEvent: Disable Signs + m_ConditionEvent: ComboSignIndex m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 0} @@ -6854,7 +6854,7 @@ AnimatorTransition: m_ConditionEvent: GestureLeftWeight m_EventTreshold: 0.99 - m_ConditionMode: 6 - m_ConditionEvent: Disable Signs + m_ConditionEvent: ComboSignIndex m_EventTreshold: 11 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 1102711767551534732} diff --git a/GeneralVR/Without/Menu_GeneralVR.asset b/GeneralVR/Without/Menu_GeneralVR.asset index ae5d1b3..31a9f13 100644 --- a/GeneralVR/Without/Menu_GeneralVR.asset +++ b/GeneralVR/Without/Menu_GeneralVR.asset @@ -17,7 +17,7 @@ MonoBehaviour: icon: {fileID: 2800000, guid: b4a615d4b1248c9499b06aa6ea7adaf3, type: 3} type: 102 parameter: - name: ComboSignDisabled + name: SignsDisabled value: 1 style: 0 subMenu: {fileID: 0} diff --git a/VRC-ASL-Gestures_Installer.cs b/VRC-ASL-Gestures_Installer.cs index 5e1eeb9..f457c57 100644 --- a/VRC-ASL-Gestures_Installer.cs +++ b/VRC-ASL-Gestures_Installer.cs @@ -293,10 +293,16 @@ private void MergeMenus(VRCAvatarDescriptor descriptor, VRCExpressionsMenu menuT private void MergeController(VRCAvatarDescriptor descriptor, AnimatorController controllerToAdd) { AnimatorController controllerOriginal = (AnimatorController)descriptor.baseAnimationLayers[2].animatorController; + + AvatarMask lefthandmask = AssetDatabase.LoadAssetAtPath("Assets/VRCSDK/Examples3/Animation/Masks/vrc_Hand Left.mask", typeof(AvatarMask)) as AvatarMask; + AvatarMask righthandmask = AssetDatabase.LoadAssetAtPath("Assets/VRCSDK/Examples3/Animation/Masks/vrc_Hand Right.mask", typeof(AvatarMask)) as AvatarMask; for (int i = 1; i < controllerOriginal.layers.Length; i++) - if (controllerToAdd.layers[i].avatarMask.name.Contains("Hand")) + if (controllerOriginal.layers[i].avatarMask.Equals(lefthandmask) || controllerOriginal.layers[i].avatarMask.Equals(righthandmask)) + { controllerOriginal.RemoveLayer(i); + i--; + } AnimatorCloner.MergeControllers(controllerOriginal, controllerToAdd); }