From b0f4f3d30af9563352f75375ce3c268a99b51e79 Mon Sep 17 00:00:00 2001 From: JLChnToZ Date: Wed, 13 Nov 2024 22:48:42 +0800 Subject: [PATCH] Fix assert fail --- .../WorldFixedObjectTest/WorldFixedObjectTest.cs | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/UnitTests~/WorldFixedObjectTest/WorldFixedObjectTest.cs b/UnitTests~/WorldFixedObjectTest/WorldFixedObjectTest.cs index 02eb15f2..2338db10 100644 --- a/UnitTests~/WorldFixedObjectTest/WorldFixedObjectTest.cs +++ b/UnitTests~/WorldFixedObjectTest/WorldFixedObjectTest.cs @@ -27,11 +27,13 @@ public class WorldFixedObjectTest : TestBase // fixed root is created Assert.That(fixedRoot, Is.Not.Null); bool isVrcAvatar = false; - #if MA_VRCSDK3_AVATARS_3_7_0_OR_NEWER + System.Type vrcParentConstraintType = null; + #if MA_VRCSDK3_AVATARS isVrcAvatar = avatar.TryGetComponent(out VRC.SDKBase.VRC_AvatarDescriptor _); + vrcParentConstraintType = System.Type.GetType("VRC.SDK3.Dynamics.Constraint.Components.VRCParentConstraint, VRC.SDK3.Dynamics.Constraint"); #endif - Component constraint = isVrcAvatar ? - fixedRoot.GetComponent(System.Type.GetType("VRC.SDK3.Dynamics.Constraint.Components.VRCParentConstraint, VRC.SDK3.Dynamics.Constraint")) : + Component constraint = isVrcAvatar && vrcParentConstraintType != null ? + fixedRoot.GetComponent(vrcParentConstraintType) : fixedRoot.GetComponent(); Assert.That(constraint, Is.Not.Null); @@ -61,11 +63,13 @@ public class WorldFixedObjectTest : TestBase // fixed root is created Assert.That(fixedRoot, Is.Not.Null); bool isVrcAvatar = false; - #if MA_VRCSDK3_AVATARS_3_7_0_OR_NEWER + System.Type vrcParentConstraintType = null; + #if MA_VRCSDK3_AVATARS isVrcAvatar = avatar.TryGetComponent(out VRC.SDKBase.VRC_AvatarDescriptor _); + vrcParentConstraintType = System.Type.GetType("VRC.SDK3.Dynamics.Constraint.Components.VRCParentConstraint, VRC.SDK3.Dynamics.Constraint"); #endif - Component constraint = isVrcAvatar ? - fixedRoot.GetComponent(System.Type.GetType("VRC.SDK3.Dynamics.Constraint.Components.VRCParentConstraint, VRC.SDK3.Dynamics.Constraint")) : + Component constraint = isVrcAvatar && vrcParentConstraintType != null ? + fixedRoot.GetComponent(vrcParentConstraintType) : fixedRoot.GetComponent(); Assert.That(constraint, Is.Not.Null);