浏览代码

Merge branch 'latest-preview' into Multi-image

/4.1
Shan Jiang 4 年前
当前提交
f5baff45
共有 5 个文件被更改,包括 9 次插入18 次删除
  1. 11
      Assets/Scripts/PlaceOnPlane.cs
  2. 2
      Assets/XR/Settings/AR Kit Settings.asset
  3. 8
      Packages/manifest.json
  4. 2
      ProjectSettings/ProjectSettings.asset
  5. 4
      ProjectSettings/ProjectVersion.txt

11
Assets/Scripts/PlaceOnPlane.cs


bool TryGetTouchPosition(out Vector2 touchPosition)
{
#if UNITY_EDITOR
if (Input.GetMouseButton(0))
{
var mousePosition = Input.mousePosition;
touchPosition = new Vector2(mousePosition.x, mousePosition.y);
return true;
}
#else
#endif
touchPosition = default;
return false;

ARRaycastManager m_RaycastManager;
}
}
}

2
Assets/XR/Settings/AR Kit Settings.asset


m_Name: AR Kit Settings
m_EditorClassIdentifier:
m_Requirement: 0
m_FaceTracking: 0
m_FaceTracking: 1

8
Packages/manifest.json


"com.unity.test-framework": "1.1.14",
"com.unity.textmeshpro": "2.0.1",
"com.unity.ugui": "1.0.0",
"com.unity.xr.arcore": "4.1.0-preview.3",
"com.unity.xr.arfoundation": "4.1.0-preview.3",
"com.unity.xr.arkit": "4.1.0-preview.3",
"com.unity.xr.arkit-face-tracking": "4.1.0-preview.3",
"com.unity.xr.arcore": "4.1.0-preview.5",
"com.unity.xr.arfoundation": "4.1.0-preview.5",
"com.unity.xr.arkit": "4.1.0-preview.5",
"com.unity.xr.arkit-face-tracking": "4.1.0-preview.5",
"com.unity.xr.interaction.toolkit": "0.9.4-preview",
"com.unity.modules.ai": "1.0.0",
"com.unity.modules.androidjni": "1.0.0",

2
ProjectSettings/ProjectSettings.asset


webGLWasmStreaming: 0
scriptingDefineSymbols:
1: UNITY_POST_PROCESSING_STACK_V2
4: UNITY_POST_PROCESSING_STACK_V2
4: UNITY_POST_PROCESSING_STACK_V2;UNITY_XR_ARKIT_LOADER_ENABLED;UNITY_XR_ARKIT_FACE_TRACKING_ENABLED
7: UNITY_POST_PROCESSING_STACK_V2
13: UNITY_POST_PROCESSING_STACK_V2
17: UNITY_POST_PROCESSING_STACK_V2

4
ProjectSettings/ProjectVersion.txt


m_EditorVersion: 2019.4.1f1
m_EditorVersionWithRevision: 2019.4.1f1 (e6c045e14e4e)
m_EditorVersion: 2019.4.4f1
m_EditorVersionWithRevision: 2019.4.4f1 (1f1dac67805b)
正在加载...
取消
保存