Commit e3ec5543 authored by 杨泽宇's avatar 杨泽宇

更新

parent 7bee7646
fileFormatVersion: 2
guid: 904b8d75bf59a48419b7b6645e1b2951
guid: 3b4379fc0534a85409b95222a2ce99f0
DefaultImporter:
externalObjects: {}
userData:
......
This diff is collapsed.
This diff is collapsed.
using System;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.InputSystem;
using UnityEngine.XR.Interaction.Toolkit;
/// <summary>
/// 触发抓取(SelectEnter 事件触发)和取消抓取(SelectExit 事件)的时候去控制相关的 InputAction 是否能开启。
/// 用于在抓取物体的时候,移动摇杆,不会触发其他InputAction
/// </summary>
public class GrabRayController : MonoBehaviour
{
public XRRayInteractor grabRayInteractor;
public XRDirectInteractor grabDirectInteractor;
public InputActionReference rotateAnchorReference;
public InputActionReference translateAnchorReference;
public InputActionReference teleportActivateReference;
public InputActionReference moveReference;
public InputActionReference turnReference;
private void Start()
{
grabRayInteractor.selectEntered.AddListener(OnEnterGrab);
grabRayInteractor.selectExited.AddListener(OnExitGrab);
}
private void OnDestroy()
{
grabRayInteractor.selectEntered.RemoveListener(OnEnterGrab);
grabRayInteractor.selectExited.RemoveListener(OnExitGrab);
}
private void OnEnterGrab(SelectEnterEventArgs arg)
{
DisableAction(teleportActivateReference);
DisableAction(moveReference);
DisableAction(turnReference);
EnableAction(rotateAnchorReference);
EnableAction(translateAnchorReference);
}
private void OnExitGrab(SelectExitEventArgs arg)
{
EnableAction(teleportActivateReference);
EnableAction(moveReference);
EnableAction(turnReference);
DisableAction(rotateAnchorReference);
DisableAction(translateAnchorReference);
}
private void EnableAction(InputActionReference actionReference)
{
var action = GetInputAction(actionReference);
if (action != null && !action.enabled)
action.Enable();
}
private void DisableAction(InputActionReference actionReference)
{
var action = GetInputAction(actionReference);
if (action != null && action.enabled)
action.Disable();
}
private InputAction GetInputAction(InputActionReference actionReference)
{
return actionReference != null ? actionReference.action : null;
}
}
fileFormatVersion: 2
guid: 621cdd693711f78469082dca25a10094
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
using UnityEngine;
using UnityEngine.SceneManagement;
/// <summary>
/// 跳转场景(需要把跳转场景添加到Scences In Build)
/// </summary>
public class SceneLoader : MonoBehaviour
{
public void LoadScene(string sceneName)
{
SceneManager.LoadScene(sceneName);
}
}
fileFormatVersion: 2
guid: c20ccd8994bac4d4eb12329d4ddbd664
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.XR.Interaction.Toolkit;
/// <summary>
/// 当抓取的物体切换左右手的时候,抓取点不一样
/// </summary>
public class XRGrabInteractableTwoAttach : XRGrabInteractable
{
public Transform leftAttachTransform;
public Transform rightAttachTransform;
protected override void OnSelectEntered(SelectEnterEventArgs args)
{
if (args.interactorObject.transform.CompareTag("Left Hand"))
{
attachTransform = leftAttachTransform;
}
else if (args.interactorObject.transform.CompareTag("Right Hand"))
{
attachTransform = rightAttachTransform;
}
base.OnSelectEntered(args);
}
}
fileFormatVersion: 2
guid: 8b4aed89b4f6c944185c57a6f4eff7ad
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
This diff is collapsed.
......@@ -18,7 +18,7 @@ PhysicsManager:
m_ClothInterCollisionDistance: 0.1
m_ClothInterCollisionStiffness: 0.2
m_ContactsGeneration: 1
m_LayerCollisionMatrix: ffffff6fffffff4fffffff4fffffffffffffff4fffffff4fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc8ffff7fc9ffff7fffffff7fc8ffff0f
m_LayerCollisionMatrix: ffffff6fffffff4fffffff4fbfffffffffffff4fffffff4ff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc8ffff7fc9ffff7fffffff7fc8ffff0f
m_AutoSimulation: 1
m_AutoSyncTransforms: 0
m_ReuseCollisionCallbacks: 1
......@@ -33,5 +33,6 @@ PhysicsManager:
m_FrictionType: 0
m_EnableEnhancedDeterminism: 0
m_EnableUnifiedHeightmaps: 1
m_ImprovedPatchFriction: 0
m_SolverType: 0
m_DefaultMaxAngularSpeed: 7
......@@ -5,13 +5,16 @@ EditorBuildSettings:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Scenes:
- enabled: 1
path: Assets/XRIExamples/Scenes/XRI_Examples_Main.unity
- enabled: 0
path: Assets/XRI_Examples/Scenes/XRI_Examples_Main.unity
guid: ba755f5a181505a4799b21685d4c7576
- enabled: 1
path: "Assets/_Scenes/0_\u521D\u59CB\u754C\u9762.unity"
guid: 3b4379fc0534a85409b95222a2ce99f0
- enabled: 1
path: Assets/_Scenes/1_Maze1.unity
guid: 9fc0d4010bbf28b4594072e72b8655ab
m_configObjects:
Unity.XR.Oculus.Settings: {fileID: 11400000, guid: e7b6cf70c80d6634799bd6c8ea8a47ff,
type: 2}
com.unity.xr.management.loader_settings: {fileID: 11400000, guid: fba6072275013e6448e381f83d131b7f,
type: 2}
com.unity.xr.openxr.settings4: {fileID: 11400000, guid: e60ad326389e9b14e9f7ae2c33703862,
type: 2}
Unity.XR.Oculus.Settings: {fileID: 11400000, guid: e7b6cf70c80d6634799bd6c8ea8a47ff, type: 2}
com.unity.xr.management.loader_settings: {fileID: 11400000, guid: fba6072275013e6448e381f83d131b7f, type: 2}
com.unity.xr.openxr.settings4: {fileID: 11400000, guid: e60ad326389e9b14e9f7ae2c33703862, type: 2}
......@@ -13,10 +13,10 @@ TagManager:
- Default
- TransparentFX
- Ignore Raycast
-
- Player
- Water
- UI
-
- Interactable
-
-
-
......
......@@ -13,3 +13,4 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
assetDefaultFramerate: 60
m_DefaultFrameRate: 60
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment