Browse Source

Merge branch 'master' into XRSDK_A01

# Conflicts:
#	Samples~/SDK/Modules/Module_Interaction/ManipulationHandler/Scripts/ManipulationHandler.cs
胡佳骏 1 year ago
parent
commit
06336e8b02

+ 4 - 2
Samples~/SDK/Modules/Module_Interaction/ManipulationHandler/Scripts/ManipulationHandler.cs

@@ -23,8 +23,8 @@ namespace SC.XR.Unity.Module_InputSystem
         }
     }
 
-   // [RequireComponent(typeof(NearInterationGrabbable))]
-  //  [RequireComponent(typeof(BoxCollider))]
+    // [RequireComponent(typeof(NearInterationGrabbable))]
+    //  [RequireComponent(typeof(BoxCollider))]
     public class ManipulationHandler : PointerHandler
     {
 
@@ -61,6 +61,8 @@ namespace SC.XR.Unity.Module_InputSystem
         public float minScaleRatio = 0.8f;
         public float maxScaleRatio = 3f;
 
+
+        public bool isParentDrag;
         public virtual void Start()
         {
             targetStartScale = Target == null ? transform.localScale : Target.localScale;