适配联想眼镜

Assets/InputSystem.inputsettings.asset

@@ -0,0 +1,36 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c46f07b5ed07e4e92aa78254188d3d10, type: 3}
+  m_Name: InputSystem.inputsettings
+  m_EditorClassIdentifier: 
+  m_SupportedDevices: []
+  m_UpdateMode: 1
+  m_MaxEventBytesPerUpdate: 5242880
+  m_MaxQueuedEventsPerUpdate: 1000
+  m_CompensateForScreenOrientation: 1
+  m_BackgroundBehavior: 0
+  m_EditorInputBehaviorInPlayMode: 0
+  m_DefaultDeadzoneMin: 0.125
+  m_DefaultDeadzoneMax: 0.925
+  m_DefaultButtonPressPoint: 0.5
+  m_ButtonReleaseThreshold: 0.75
+  m_DefaultTapTime: 0.2
+  m_DefaultSlowTapTime: 0.5
+  m_DefaultHoldTime: 0.4
+  m_TapRadius: 5
+  m_MultiTapDelayTime: 0.75
+  m_DisableRedundantEventsMerging: 0
+  m_ShortcutKeysConsumeInputs: 0
+  m_iOSSettings:
+    m_MotionUsage:
+      m_Enabled: 0
+      m_Description: 

Assets/InputSystem.inputsettings.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8cfc4b2ca50477f438d705a8fcd79070
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/VuforiaConfiguration.asset

@@ -49,4 +49,4 @@ MonoBehaviour:
   webcam:
     renderTextureLayer: 30
   packageInformation:
-    ARFoundationVersion: 
+    ARFoundationVersion: 4.2.8

Assets/StreamingAssets/build_info

@@ -1 +1 @@
-Build from YUNYUNGEGE at 2023/7/4 17:44:42
+Build from YUNYUNGEGE at 2023/7/12 18:19:48

Assets/Studio/Common/1_Material/Studio2_3DButtonIconFang.mat

@@ -2,15 +2,23 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Studio2_3DButtonIconFang
   m_Shader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
-  m_ShaderKeywords: _ALPHABLEND_ON _BORDER_LIGHT _BORDER_LIGHT_USES_HOVER_COLOR _DISABLE_ALBEDO_MAP
-    _HOVER_LIGHT _NEAR_LIGHT_FADE _NEAR_PLANE_FADE _PROXIMITY_LIGHT _PROXIMITY_LIGHT_TWO_SIDED
+  m_ValidKeywords:
+  - _ALPHABLEND_ON
+  - _BORDER_LIGHT
+  - _BORDER_LIGHT_USES_HOVER_COLOR
+  - _DISABLE_ALBEDO_MAP
+  - _HOVER_LIGHT
+  - _NEAR_LIGHT_FADE
+  - _NEAR_PLANE_FADE
+  - _PROXIMITY_LIGHT_TWO_SIDED
+  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 1
   m_DoubleSidedGI: 0
@@ -73,6 +81,7 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - _AlbedoAlphaMode: 0
     - _AlbedoAlphaSmoothness: 0
@@ -141,7 +150,7 @@ Material:
     - _NormalMapScale: 1
     - _OcclusionStrength: 1
     - _Parallax: 0.02
-    - _ProximityLight: 1
+    - _ProximityLight: 0
     - _ProximityLightSubtractive: 0
     - _ProximityLightTwoSided: 1
     - _Reflections: 0
@@ -191,3 +200,4 @@ Material:
     - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1}
     - _RimColor: {r: 1, g: 1, b: 1, a: 0.497}
     - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
+  m_BuildTextureStacks: []

Assets/Studio/MRTK_2.mat

@@ -2,16 +2,25 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: MRTK_2
   m_Shader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
-  m_ShaderKeywords: USE_GLOBAL_LEFT_INDEX_ON USE_GLOBAL_RIGHT_INDEX_ON _ALPHABLEND_ON
-    _BLOB_ENABLE_2__ON _BLOB_ENABLE__ON _BORDER_LIGHT _DISABLE_ALBEDO_MAP _ENABLE_FADE__ON
-    _NEAR_LIGHT_FADE _NEAR_PLANE_FADE _SMOOTH_ACTIVE_FACE__ON
+  m_ValidKeywords:
+  - _ALPHABLEND_ON
+  - _DISABLE_ALBEDO_MAP
+  - _NEAR_LIGHT_FADE
+  - _NEAR_PLANE_FADE
+  m_InvalidKeywords:
+  - USE_GLOBAL_LEFT_INDEX_ON
+  - USE_GLOBAL_RIGHT_INDEX_ON
+  - _BLOB_ENABLE_2__ON
+  - _BLOB_ENABLE__ON
+  - _ENABLE_FADE__ON
+  - _SMOOTH_ACTIVE_FACE__ON
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 1
   m_DoubleSidedGI: 0
@@ -38,12 +47,13 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - _AlbedoAlphaMode: 0
     - _AlbedoAssignedAtRuntime: 0
     - _BlendOp: 0
     - _BlendedClippingWidth: 0.0001
-    - _BorderLight: 1
+    - _BorderLight: 0
     - _BorderLightOpaque: 0
     - _BorderLightOpaqueAlpha: 1
     - _BorderLightReplacesAlbedo: 0
@@ -134,3 +144,4 @@ Material:
     - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1}
     - _RimColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
     - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
+  m_BuildTextureStacks: []

Assets/Studio/XRLib/Codes/TestMVC/LoginDlg.cs

@@ -26,6 +26,7 @@ namespace ShadowStudio.UI
         private SCInputField userInputField;
         private SCInputField passwordInputField;
         private Button loginBtn;
+        private Button loginBtn2;
         private Button setBtn;
         private Toggle remberToggle;
         private GameObject verifyObj;
@@ -49,6 +50,7 @@ namespace ShadowStudio.UI
             //dlg.GetBreadthChild<SCInputField>("UserInputField")
             passwordInputField = dlg.GetChild<SCInputField>("UIRoot/PasswordInputField");
             loginBtn = dlg.GetChild<Button>("FullUIRoot/LoginBtn");
+            loginBtn2 = dlg.GetChild<Button>("FullUIRoot/LoginBtn2");
             setBtn = dlg.GetChild<Button>("UIRoot/SetBtn");
             remberToggle = dlg.GetChild<Toggle>("UIRoot/RemberToggle_CheckBox");
             remberToggle.isOn = LoginProxy.Instance.IsRemberUserAndPass; ;
@@ -69,6 +71,7 @@ namespace ShadowStudio.UI
                 passwordInputField.text = "";
             }
             loginBtn.onClick.AddListener(OnClickLogin);
+            loginBtn2.onClick.AddListener(OnClickLogin2);
             setBtn.onClick.AddListener(OnClickSet);
             userInputField.onEndEdit.AddListener(InputUserEnd);
             userInputField.onValueChanged.AddListener(UserValueChanged);
@@ -176,12 +179,60 @@ namespace ShadowStudio.UI
         {
             LoginProxy.Instance.RemberUserAndPass(ison);
         }
+        private void OnClickLogin2()
+        {
+//#if UNITY_EDITOR
+            userInputField.text = "ycst0007";
+            passwordInputField.text = "yc123456";
+//#endif
+            if (userInputField.text == "" || passwordInputField.text == "")
+            {
+                if (userInputField.text == "")
+                {
+                    userRemind.gameObject.SetActive(true);
+                    userRemind.text = LanguageMgr.Instance.GetMessage("1011").Message;
+                }
+                else if (passwordInputField.text == "")
+                {
+                    passwordRemind.gameObject.SetActive(true);
+                    passwordRemind.text = LanguageMgr.Instance.GetMessage("1013").Message;
+                }
+            }
+            //else if (userRemind.gameObject.activeSelf == true || passwordRemind.gameObject.activeSelf == true)
+            //{
+            //    return;
+            //}
+            else
+            {
+                if (!verifyObj.activeSelf)
+                {
+                    loginBtn.enabled = false;
+                    Invoke("ReLoginBtn", 1f);
+                    LoginProxy.Instance.RequestAccountPasswordLogin(userInputField.text, passwordInputField.text);
+                }
+                else
+                {
+                    if (verifyInputField.text != "")
+                    {
+                        loginBtn.enabled = false;
+                        Invoke("ReLoginBtn", 1f);
+                        LoginProxy.Instance.RequestAccountPasswordLogin(userInputField.text, passwordInputField.text, verifyInputField.text);
+                    }
+                    else
+                    {
+                        vcodeRemind.gameObject.SetActive(true);
+                        vcodeRemind.text = LanguageMgr.Instance.GetMessage("1015").Message;
+                    }
+                }
+            }
+        }
+        
         private void OnClickLogin()
         {
-#if UNITY_EDITOR
-            userInputField.text = "ycst0003";
+//#if UNITY_EDITOR
+            userInputField.text = "ycst0006";
             passwordInputField.text = "yc123456";
-#endif
+//#endif
             if (userInputField.text == "" || passwordInputField.text == "")
             {
                 if (userInputField.text == "")

Assets/Studio/_3HomeScene/HomeSceneScripts_new/UI/MenuIcon.cs

@@ -32,7 +32,7 @@ public class MenuIcon : MonoBehaviour, IPointerDownHandler, IPointerClickHandler
     string _passWord;//房间密码
 
     bool isClick = false;//房间是否被点击
-    float _clickTime = 0.2f;//点击按下房间的间隔时间
+    float _clickTime = 1f;//点击按下房间的间隔时间
     float _lastTime = 0;//记录开始点击房间时所处的时间
     public bool _isDrag = false;//房间是否被拖拽
 

Assets/XR/Settings/HandTrackingSimulationEditorSettings.asset

@@ -0,0 +1,17 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: bbed3556823843aaa2be63124baa47e8, type: 3}
+  m_Name: HandTrackingSimulationEditorSettings
+  m_EditorClassIdentifier: 
+  enabled: 0
+  dataSource: 0
+  handScale: 1

Assets/XR/Settings/HandTrackingSimulationEditorSettings.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 821b6d05012f8354197026edf2d5aa05
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/XR/Settings/OpenXR Editor Settings.asset

@@ -12,5 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 975057b4fdcfb8142b3080d19a5cc712, type: 3}
   m_Name: OpenXR Editor Settings
   m_EditorClassIdentifier: 
-  Keys: 
-  Values: []
+  Keys: 07000000
+  Values:
+  - featureSets:
+    - com.qualcomm.snapdragon.spaces

Assets/XR/Settings/OpenXR Package Settings.asset

@@ -42,6 +42,35 @@ MonoBehaviour:
   company: Unity
   priority: 0
   required: 0
+--- !u!114 &-3748025777748101150
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a55e2f339a4744babb080d663cf37a2f, type: 3}
+  m_Name: BaseRuntimeFeature Android
+  m_EditorClassIdentifier: 
+  m_enabled: 1
+  nameUi: Base Runtime
+  version: 0.14.0
+  featureIdInternal: com.qualcomm.snapdragon.spaces.base
+  openxrExtensionStrings: XR_QCOM_component_versioning
+  company: Qualcomm
+  priority: 0
+  required: 1
+  CheckInstalledRuntime: 1
+  LaunchAppOnViewer: 1
+  PreventSleepMode: 1
+  ShowLaunchMessageOnHost: 0
+  LaunchControllerOnHost: 1
+  UseCustomController: 0
+  ExportHeadless: 0
+  AlternateStartActivity: 
+  SkipPermissionChecks: 0
 --- !u!114 &-2519709178184975144
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -84,6 +113,68 @@ MonoBehaviour:
   priority: 0
   required: 0
   ignoreValidationErrors: 0
+--- !u!114 &-1901787016055564468
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fd1a99ebd75e49d1bc4152cccc8e2550, type: 3}
+  m_Name: HitTestingFeature Android
+  m_EditorClassIdentifier: 
+  m_enabled: 1
+  nameUi: Hit Testing
+  version: 0.14.0
+  featureIdInternal: com.qualcomm.snapdragon.spaces.raycasting
+  openxrExtensionStrings: XR_QCOM_ray_casting
+  company: Qualcomm
+  priority: 0
+  required: 0
+--- !u!114 &-1730658624463092985
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 12ea98de581824d928181a8149a1e778, type: 3}
+  m_Name: HandTrackingFeature Android
+  m_EditorClassIdentifier: 
+  m_enabled: 1
+  nameUi: Hand Tracking (Deprecated)
+  version: 0.14.0
+  featureIdInternal: com.qualcomm.snapdragon.spaces.handtracking.deprecated
+  openxrExtensionStrings: XR_EXT_hand_tracking XR_QCOM_hand_tracking_gesture
+  company: Qualcomm
+  priority: 0
+  required: 0
+--- !u!114 &-1453151969644718570
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7eb03d48a4e23493fba7b405178b6b3d, type: 3}
+  m_Name: ImageTrackingFeature Android
+  m_EditorClassIdentifier: 
+  m_enabled: 1
+  nameUi: Image Tracking
+  version: 0.14.0
+  featureIdInternal: com.qualcomm.snapdragon.spaces.imagetracking
+  openxrExtensionStrings: XR_QCOM_image_tracking
+  company: Qualcomm
+  priority: 0
+  required: 0
+  ExtendedRangeMode: 0
+  LowPowerMode: 0
 --- !u!114 &-1394413374138913152
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -121,7 +212,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: feeef8d85de8db242bdda70cc7ff5acd, type: 3}
   m_Name: OculusTouchControllerProfile Android
   m_EditorClassIdentifier: 
-  m_enabled: 0
+  m_enabled: 1
   nameUi: Oculus Touch Controller Profile
   version: 0.0.1
   featureIdInternal: com.unity.openxr.feature.input.oculustouch
@@ -225,6 +316,36 @@ MonoBehaviour:
   company: Unity
   priority: 0
   required: 0
+--- !u!114 &1864628980438510982
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f647cc0545697264a9878224faada6d5, type: 3}
+  m_Name: MetaQuestFeature Android
+  m_EditorClassIdentifier: 
+  m_enabled: 0
+  nameUi: Meta Quest Support
+  version: 1.0.0
+  featureIdInternal: com.unity.openxr.feature.metaquest
+  openxrExtensionStrings: XR_OCULUS_android_initialize_loader
+  company: Unity
+  priority: 0
+  required: 0
+  targetDevices:
+  - visibleName: Quest
+    manifestName: quest
+    enabled: 1
+  - visibleName: Quest 2
+    manifestName: quest2
+    enabled: 1
+  - visibleName: Quest Pro
+    manifestName: cambria
+    enabled: 1
 --- !u!114 &2073351538913066438
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -245,6 +366,26 @@ MonoBehaviour:
   company: Unity
   priority: 0
   required: 0
+--- !u!114 &2794950230835461062
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d9f28604357aa423280cce3487eaa981, type: 3}
+  m_Name: SpatialAnchorsFeature Android
+  m_EditorClassIdentifier: 
+  m_enabled: 1
+  nameUi: Spatial Anchors
+  version: 0.14.0
+  featureIdInternal: com.qualcomm.snapdragon.spaces.spatialanchors
+  openxrExtensionStrings: XR_MSFT_spatial_anchor XR_MSFT_spatial_anchor_persistence
+  company: Qualcomm
+  priority: 0
+  required: 0
 --- !u!114 &3029791017464455970
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -280,16 +421,67 @@ MonoBehaviour:
   m_Name: Android
   m_EditorClassIdentifier: 
   features:
+  - {fileID: -3748025777748101150}
+  - {fileID: 3745469110301890134}
   - {fileID: 2073351538913066438}
   - {fileID: 1213452330308758700}
+  - {fileID: 3899838205436971292}
+  - {fileID: -1730658624463092985}
+  - {fileID: -1901787016055564468}
+  - {fileID: -1453151969644718570}
   - {fileID: 1187723233290059819}
+  - {fileID: 1864628980438510982}
   - {fileID: 957663357171507651}
   - {fileID: -2519709178184975144}
   - {fileID: -9216856183460823115}
   - {fileID: -740675438735204589}
+  - {fileID: 4141695539364082076}
   - {fileID: 3029791017464455970}
+  - {fileID: 8544567297271086372}
+  - {fileID: 2794950230835461062}
+  - {fileID: 7708821617756607484}
   m_renderMode: 1
   m_depthSubmissionMode: 0
+--- !u!114 &3745469110301890134
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 22ae41aadce15674187d35d57afdf758, type: 3}
+  m_Name: CameraAccessFeature Android
+  m_EditorClassIdentifier: 
+  m_enabled: 1
+  nameUi: Camera Access (Experimental)
+  version: 0.14.0
+  featureIdInternal: com.qualcomm.snapdragon.spaces.cameraaccess
+  openxrExtensionStrings: XR_QCOMX_camera_frame_access
+  company: Qualcomm
+  priority: 0
+  required: 0
+--- !u!114 &3899838205436971292
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: efa78685d2359408d9e46e52dd1291ba, type: 3}
+  m_Name: HandTrackingFeature Android
+  m_EditorClassIdentifier: 
+  m_enabled: 1
+  nameUi: Hand Tracking
+  version: 0.11.0
+  featureIdInternal: com.qualcomm.snapdragon.spaces.handtracking
+  openxrExtensionStrings: 
+  company: Qualcomm
+  priority: 0
+  required: 0
 --- !u!114 &4076629510333642186
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -310,6 +502,28 @@ MonoBehaviour:
   company: Unity
   priority: 0
   required: 0
+--- !u!114 &4141695539364082076
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 2dea66e4d7ae49b49f6af51ea3cf905e, type: 3}
+  m_Name: PlaneDetectionFeature Android
+  m_EditorClassIdentifier: 
+  m_enabled: 1
+  nameUi: Plane Detection
+  version: 0.14.0
+  featureIdInternal: com.qualcomm.snapdragon.spaces.planedetection
+  openxrExtensionStrings: XR_QCOM_plane_detection XR_MSFT_scene_understanding
+  company: Qualcomm
+  priority: 0
+  required: 0
+  UseSceneUnderstandingPlaneDetection: 0
+  ConvexHullEnabled: 1
 --- !u!114 &4848539242651518567
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -370,6 +584,26 @@ MonoBehaviour:
   company: Unity
   priority: 0
   required: 0
+--- !u!114 &7708821617756607484
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e2479fa37ffc4a3c947342fe19e48b14, type: 3}
+  m_Name: SpatialMeshingFeature Android
+  m_EditorClassIdentifier: 
+  m_enabled: 1
+  nameUi: Spatial Meshing (Experimental)
+  version: 0.14.0
+  featureIdInternal: com.qualcomm.snapdragon.spaces.sceneunderstanding
+  openxrExtensionStrings: XR_MSFT_scene_understanding
+  company: Qualcomm
+  priority: 0
+  required: 0
 --- !u!114 &8208355060350826712
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -390,6 +624,26 @@ MonoBehaviour:
   company: Unity
   priority: 0
   required: 0
+--- !u!114 &8544567297271086372
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b3d25b6c93e04925bb42da7f2fdf8027, type: 3}
+  m_Name: SpacesMicrosoftMixedRealityMotionControllerProfile Android
+  m_EditorClassIdentifier: 
+  m_enabled: 1
+  nameUi: Microsoft Mixed Reality Motion Controller Profile
+  version: 0.14.0
+  featureIdInternal: com.unity.openxr.feature.input.microsoftmotioncontroller
+  openxrExtensionStrings: 
+  company: Qualcomm
+  priority: 0
+  required: 0
 --- !u!114 &8914651401703830258
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/XR/XRGeneralSettings.asset

@@ -44,7 +44,7 @@ MonoBehaviour:
   m_AutomaticLoading: 0
   m_AutomaticRunning: 0
   m_Loaders:
-  - {fileID: 11400000, guid: 97a54d00d2333ae4ba370524d38b1b1d, type: 2}
+  - {fileID: 11400000, guid: 10fa588da2beb8441a9752c0802fced7, type: 2}
 --- !u!114 &11400000
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/XRI/Settings/Resources/XRDeviceSimulatorSettings.asset

@@ -0,0 +1,16 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 690929a59dc7a42da9030305190d391f, type: 3}
+  m_Name: XRDeviceSimulatorSettings
+  m_EditorClassIdentifier: 
+  m_AutomaticallyInstantiateSimulatorPrefab: 0
+  m_SimulatorPrefab: {fileID: 0}

Assets/XRI/Settings/Resources/XRDeviceSimulatorSettings.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b6c4c0be02f480341a082f67c7e5d74d
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Packages/manifest.json

@@ -1,6 +1,8 @@
 {
   "dependencies": {
     "com.ptc.vuforia.engine": "file:com.ptc.vuforia.engine-10.13.3.tgz",
+    "com.qualcomm.qcht.unity.interactions": "file:D:/JiHe/XRSDK/package/com.qualcomm.qcht.unity.interactions-4.0.0-pre.14.tgz",
+    "com.qualcomm.snapdragon.spaces": "file:D:/JiHe/XRSDK/package/com.qualcomm.snapdragon.spaces-0.14.0.tgz",
     "com.unity.ads": "3.7.5",
     "com.unity.analytics": "3.6.12",
     "com.unity.collab-proxy": "1.17.7",
@@ -15,7 +17,7 @@
     "com.unity.visualscripting": "1.7.8",
     "com.unity.xr.arcore": "4.2.8",
     "com.unity.xr.openxr": "1.5.3",
-    "com.ximmerse.xr": "file:C:/UnityProjects/XRSDK/package",
+    "jh.xr.engine": "file:D:/JiHe/XRSDK/package",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.androidjni": "1.0.0",
     "com.unity.modules.animation": "1.0.0",

Packages/packages-lock.json

@@ -8,6 +8,26 @@
         "com.unity.ugui": "1.0.0"
       }
     },
+    "com.qualcomm.qcht.unity.interactions": {
+      "version": "file:D:/JiHe/XRSDK/package/com.qualcomm.qcht.unity.interactions-4.0.0-pre.14.tgz",
+      "depth": 0,
+      "source": "local-tarball",
+      "dependencies": {
+        "com.unity.inputsystem": "1.0.2",
+        "com.unity.xr.interaction.toolkit": "2.3.0",
+        "com.unity.xr.management": "2.3.0-pre.1"
+      }
+    },
+    "com.qualcomm.snapdragon.spaces": {
+      "version": "file:D:/JiHe/XRSDK/package/com.qualcomm.snapdragon.spaces-0.14.0.tgz",
+      "depth": 0,
+      "source": "local-tarball",
+      "dependencies": {
+        "com.unity.xr.openxr": "1.6.0",
+        "com.unity.xr.arfoundation": "4.2.7",
+        "com.unity.xr.interaction.toolkit": "2.3.0"
+      }
+    },
     "com.unity.ads": {
       "version": "3.7.5",
       "depth": 0,
@@ -76,6 +96,13 @@
       },
       "url": "https://packages.unity.cn"
     },
+    "com.unity.mathematics": {
+      "version": "1.2.6",
+      "depth": 2,
+      "source": "registry",
+      "dependencies": {},
+      "url": "https://packages.unity.cn"
+    },
     "com.unity.nuget.newtonsoft-json": {
       "version": "3.0.2",
       "depth": 2,
@@ -191,6 +218,17 @@
       },
       "url": "https://packages.unity.cn"
     },
+    "com.unity.xr.arfoundation": {
+      "version": "4.2.8",
+      "depth": 1,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.xr.arsubsystems": "4.2.8",
+        "com.unity.xr.management": "4.0.1",
+        "com.unity.modules.particlesystem": "1.0.0"
+      },
+      "url": "https://packages.unity.cn"
+    },
     "com.unity.xr.arsubsystems": {
       "version": "4.2.8",
       "depth": 1,
@@ -202,7 +240,7 @@
       "url": "https://packages.unity.cn"
     },
     "com.unity.xr.core-utils": {
-      "version": "2.0.0",
+      "version": "2.2.0",
       "depth": 2,
       "source": "registry",
       "dependencies": {
@@ -211,14 +249,15 @@
       "url": "https://packages.unity.cn"
     },
     "com.unity.xr.interaction.toolkit": {
-      "version": "2.0.4",
+      "version": "2.3.0",
       "depth": 1,
       "source": "registry",
       "dependencies": {
-        "com.unity.inputsystem": "1.3.0",
+        "com.unity.inputsystem": "1.4.4",
+        "com.unity.mathematics": "1.2.6",
         "com.unity.ugui": "1.0.0",
-        "com.unity.xr.core-utils": "2.0.0",
-        "com.unity.xr.legacyinputhelpers": "2.1.8",
+        "com.unity.xr.core-utils": "2.2.0",
+        "com.unity.xr.legacyinputhelpers": "2.1.10",
         "com.unity.modules.audio": "1.0.0",
         "com.unity.modules.imgui": "1.0.0",
         "com.unity.modules.physics": "1.0.0"
@@ -249,26 +288,26 @@
       "url": "https://packages.unity.cn"
     },
     "com.unity.xr.openxr": {
-      "version": "1.5.3",
-      "depth": 0,
+      "version": "1.6.0",
+      "depth": 1,
       "source": "registry",
       "dependencies": {
         "com.unity.xr.management": "4.0.1",
         "com.unity.xr.legacyinputhelpers": "2.1.2",
-        "com.unity.inputsystem": "1.4.2"
+        "com.unity.inputsystem": "1.4.4"
       },
       "url": "https://packages.unity.cn"
     },
-    "com.ximmerse.xr": {
-      "version": "file:C:/UnityProjects/XRSDK/package",
+    "jh.xr.engine": {
+      "version": "file:D:/JiHe/XRSDK/package",
       "depth": 0,
       "source": "local",
       "dependencies": {
-        "com.unity.xr.management": "3.2.9",
-        "com.unity.xr.legacyinputhelpers": "2.1.4",
-        "com.unity.xr.arsubsystems": "4.1.9",
-        "com.unity.xr.interaction.toolkit": "2.0.0",
-        "com.unity.inputsystem": "1.3.0",
+        "com.unity.xr.management": "4.0.1",
+        "com.unity.xr.legacyinputhelpers": "2.1.2",
+        "com.unity.inputsystem": "1.4.2",
+        "com.unity.xr.arcore": "4.2.8",
+        "com.unity.xr.arfoundation": "4.2.8",
         "com.unity.xr.openxr": "1.5.3"
       }
     },

ProjectSettings/EditorBuildSettings.asset

@@ -21,13 +21,13 @@ EditorBuildSettings:
     path: Assets/TestVideo.unity
     guid: 0d6fbfc550a5d5443bc6b6631ef09172
   m_configObjects:
-    UnityEditor.XR.ARCore.ARCoreSettings: {fileID: 11400000, guid: cd3fd485a9dd8ec439ed81513ae35590,
+    UnityEditor.XR.ARCore.ARCoreSettings: {fileID: 11400000, guid: d024b25d37137f94890858d4b6a88af6,
       type: 2}
-    com.unity.input.settings: {fileID: 11400000, guid: 7ab1a90ab8c5b934aa1e26d54261b692,
+    com.unity.input.settings: {fileID: 11400000, guid: 8cfc4b2ca50477f438d705a8fcd79070,
       type: 2}
     com.unity.renderstreaming.settings: {fileID: 11400000, guid: eaaad242393318e4f85c45e69c8837f0,
       type: 2}
-    com.unity.xr.management.loader_settings: {fileID: 11400000, guid: 8f422df2931cba0478c1fe8ab232b9a3,
+    com.unity.xr.management.loader_settings: {fileID: 11400000, guid: bf1be7b556e14e44aadbe8ccbd6b4a1d,
       type: 2}
-    com.unity.xr.openxr.settings4: {fileID: 11400000, guid: 2d049ae1db0e2b74c8251022ae6dcb95,
+    com.unity.xr.openxr.settings4: {fileID: 11400000, guid: 93ed3b462c7c82d4594fa4d925b91911,
       type: 2}

ProjectSettings/GraphicsSettings.asset

@@ -3,7 +3,7 @@
 --- !u!30 &1
 GraphicsSettings:
   m_ObjectHideFlags: 0
-  serializedVersion: 12
+  serializedVersion: 14
   m_Deferred:
     m_Mode: 1
     m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0}
@@ -28,6 +28,7 @@ GraphicsSettings:
   m_LensFlare:
     m_Mode: 1
     m_Shader: {fileID: 102, guid: 0000000000000000f000000000000000, type: 0}
+  m_VideoShadersIncludeMode: 2
   m_AlwaysIncludedShaders:
   - {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 15104, guid: 0000000000000000f000000000000000, type: 0}
@@ -36,6 +37,7 @@ GraphicsSettings:
   - {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0}
   m_PreloadedShaders: []
+  m_PreloadShadersBatchTimeLimit: -1
   m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
     type: 0}
   m_CustomRenderPipeline: {fileID: 0}
@@ -59,3 +61,6 @@ GraphicsSettings:
   m_AlbedoSwatchInfos: []
   m_LightsUseLinearIntensity: 0
   m_LightsUseColorTemperature: 0
+  m_DefaultRenderingLayerMask: 1
+  m_LogWhenShaderIsCompiled: 0
+  m_SRPDefaultSettings: {}

ProjectSettings/InputManager.asset

@@ -709,4 +709,99 @@ InputManager:
     type: 0
     axis: 0
     joyNum: 0
-  m_UsePhysicalKeys: 0
+  - serializedVersion: 3
+    m_Name: 3th axis
+    descriptiveName: 
+    descriptiveNegativeName: 
+    negativeButton: 
+    positiveButton: 
+    altNegativeButton: 
+    altPositiveButton: 
+    gravity: 0
+    dead: 0.19
+    sensitivity: 1
+    snap: 0
+    invert: 0
+    type: 2
+    axis: 2
+    joyNum: 0
+  - serializedVersion: 3
+    m_Name: 4th axis
+    descriptiveName: 
+    descriptiveNegativeName: 
+    negativeButton: 
+    positiveButton: 
+    altNegativeButton: 
+    altPositiveButton: 
+    gravity: 0
+    dead: 0.19
+    sensitivity: 1
+    snap: 0
+    invert: 0
+    type: 2
+    axis: 3
+    joyNum: 0
+  - serializedVersion: 3
+    m_Name: 5th axis
+    descriptiveName: 
+    descriptiveNegativeName: 
+    negativeButton: 
+    positiveButton: 
+    altNegativeButton: 
+    altPositiveButton: 
+    gravity: 0
+    dead: 0.19
+    sensitivity: 1
+    snap: 0
+    invert: 0
+    type: 2
+    axis: 4
+    joyNum: 0
+  - serializedVersion: 3
+    m_Name: 6th axis
+    descriptiveName: 
+    descriptiveNegativeName: 
+    negativeButton: 
+    positiveButton: 
+    altNegativeButton: 
+    altPositiveButton: 
+    gravity: 0
+    dead: 0.19
+    sensitivity: 1
+    snap: 0
+    invert: 0
+    type: 2
+    axis: 5
+    joyNum: 0
+  - serializedVersion: 3
+    m_Name: joystick_Horizontal
+    descriptiveName: 
+    descriptiveNegativeName: 
+    negativeButton: 
+    positiveButton: 
+    altNegativeButton: 
+    altPositiveButton: 
+    gravity: 0
+    dead: 0.19
+    sensitivity: 1
+    snap: 0
+    invert: 0
+    type: 2
+    axis: 0
+    joyNum: 0
+  - serializedVersion: 3
+    m_Name: joystick_Vertical
+    descriptiveName: 
+    descriptiveNegativeName: 
+    negativeButton: 
+    positiveButton: 
+    altNegativeButton: 
+    altPositiveButton: 
+    gravity: 0
+    dead: 0.19
+    sensitivity: 1
+    snap: 0
+    invert: 0
+    type: 2
+    axis: 1
+    joyNum: 0

ProjectSettings/ProjectSettings.asset

@@ -54,7 +54,7 @@ PlayerSettings:
   defaultScreenWidthWeb: 960
   defaultScreenHeightWeb: 600
   m_StereoRenderingPath: 0
-  m_ActiveColorSpace: 0
+  m_ActiveColorSpace: 1
   m_MTRendering: 1
   mipStripping: 0
   numberOfMipsStripped: 0
@@ -74,7 +74,7 @@ PlayerSettings:
   androidStartInFullscreen: 1
   androidRenderOutsideSafeArea: 1
   androidUseSwappy: 0
-  androidBlitType: 0
+  androidBlitType: 1
   androidResizableWindow: 0
   androidDefaultWindowWidth: 1920
   androidDefaultWindowHeight: 1080
@@ -149,9 +149,9 @@ PlayerSettings:
   bundleVersion: 10.13.3
   preloadedAssets:
   - {fileID: 0}
-  - {fileID: 11400000, guid: 7ab1a90ab8c5b934aa1e26d54261b692, type: 2}
-  - {fileID: -6682207197718421661, guid: 8f422df2931cba0478c1fe8ab232b9a3, type: 2}
-  - {fileID: 3493090336618791480, guid: 2d049ae1db0e2b74c8251022ae6dcb95, type: 2}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
   metroInputSource: 0
   wsaTransparentSwapchain: 0
   m_HolographicPauseOnTrackingLoss: 1
@@ -171,7 +171,7 @@ PlayerSettings:
   androidSupportedAspectRatio: 1
   androidMaxAspectRatio: 2.1
   applicationIdentifier:
-    Android: com.vuforia.engine.VuforiaEngine
+    Android: com.ghz.xr
     Lumin: com.PTCInc.VuforiaEngine
     Standalone: com.PTCInc.VuforiaEngine
     iPhone: com.vuforia.engine.VuforiaEngine
@@ -181,7 +181,7 @@ PlayerSettings:
     tvOS: 0
   overrideDefaultApplicationIdentifier: 1
   AndroidBundleVersionCode: 10133
-  AndroidMinSdkVersion: 26
+  AndroidMinSdkVersion: 29
   AndroidTargetSdkVersion: 0
   AndroidPreferredInstallLocation: 1
   aotOptions: 
@@ -261,8 +261,8 @@ PlayerSettings:
   useCustomLauncherManifest: 0
   useCustomMainGradleTemplate: 0
   useCustomLauncherGradleManifest: 0
-  useCustomBaseGradleTemplate: 1
-  useCustomGradlePropertiesTemplate: 1
+  useCustomBaseGradleTemplate: 0
+  useCustomGradlePropertiesTemplate: 0
   useCustomProguardFile: 0
   AndroidTargetArchitectures: 2
   AndroidTargetDevices: 0
@@ -578,7 +578,7 @@ PlayerSettings:
   openGLRequireES32: 0
   m_TemplateCustomTags: {}
   mobileMTRendering:
-    Android: 1
+    Android: 0
     iPhone: 1
     tvOS: 1
   m_BuildTargetGroupLightmapEncodingQuality:
@@ -841,9 +841,9 @@ PlayerSettings:
   webGLDecompressionFallback: 0
   webGLPowerPreference: 2
   scriptingDefineSymbols:
-    Android: VUFORIA_ANDROID_SETTINGS;UNITY_CCU;CURVEDUI_TMP;TRILIB_USE_ZIP;BUILDTYPE_RELEASE;ASSETSTYPE_RESOURCE;BUILDTYPE_ANDROID;PLAYTYPE_ARGLASS
-    Standalone: UNITY_CCU;CURVEDUI_TMP
-    Windows Store Apps: VUFORIA_WSA_SETTINGS
+    Android: NIBIRU_AR;UNITY_CCU;CURVEDUI_TMP;USE_INPUT_SYSTEM_POSE_CONTROL
+    Standalone: UNITY_CCU;CURVEDUI_TMP;USE_INPUT_SYSTEM_POSE_CONTROL
+    Windows Store Apps: VUFORIA_WSA_SETTINGS;USE_INPUT_SYSTEM_POSE_CONTROL
     iPhone: VUFORIA_IOS_SETTINGS
   additionalCompilerArguments: {}
   platformArchitecture:
@@ -861,7 +861,7 @@ PlayerSettings:
   incrementalIl2cppBuild:
     iPhone: 1
   suppressCommonWarnings: 1
-  allowUnsafeCode: 0
+  allowUnsafeCode: 1
   useDeterministicCompilation: 1
   enableRoslynAnalyzers: 1
   selectedPlatform: 2
@@ -925,6 +925,7 @@ PlayerSettings:
   metroSplashScreenUseBackgroundColor: 1
   platformCapabilities:
     WindowsStoreApps:
+      CodeGeneration: False
       OfflineMapsManagement: False
       HumanInterfaceDevice: False
       Location: False
@@ -937,7 +938,6 @@ PlayerSettings:
       InternetClientServer: False
       VideosLibrary: False
       Objects3D: False
-      InternetClient: True
       RemoteSystem: False
       BlockedChatMessages: False
       PhoneCall: False
@@ -959,7 +959,7 @@ PlayerSettings:
       RecordedCallsFolder: False
       Contacts: False
       Proximity: False
-      CodeGeneration: False
+      InternetClient: True
       BackgroundMediaPlayback: False
       EnterpriseAuthentication: False
   metroTargetDeviceFamilies:

ProjectSettings/QualitySettings.asset

@@ -40,6 +40,7 @@ QualitySettings:
     asyncUploadBufferSize: 16
     asyncUploadPersistentBuffer: 1
     resolutionScalingFixedDPIFactor: 1
+    customRenderPipeline: {fileID: 0}
     excludedTargetPlatforms: []
   - serializedVersion: 2
     name: Low
@@ -75,6 +76,7 @@ QualitySettings:
     asyncUploadBufferSize: 16
     asyncUploadPersistentBuffer: 1
     resolutionScalingFixedDPIFactor: 1
+    customRenderPipeline: {fileID: 0}
     excludedTargetPlatforms: []
   - serializedVersion: 2
     name: Medium
@@ -110,6 +112,7 @@ QualitySettings:
     asyncUploadBufferSize: 16
     asyncUploadPersistentBuffer: 1
     resolutionScalingFixedDPIFactor: 1
+    customRenderPipeline: {fileID: 0}
     excludedTargetPlatforms: []
   - serializedVersion: 2
     name: High
@@ -145,6 +148,7 @@ QualitySettings:
     asyncUploadBufferSize: 16
     asyncUploadPersistentBuffer: 1
     resolutionScalingFixedDPIFactor: 1
+    customRenderPipeline: {fileID: 0}
     excludedTargetPlatforms: []
   - serializedVersion: 2
     name: Very High
@@ -180,12 +184,13 @@ QualitySettings:
     asyncUploadBufferSize: 16
     asyncUploadPersistentBuffer: 1
     resolutionScalingFixedDPIFactor: 1
+    customRenderPipeline: {fileID: 0}
     excludedTargetPlatforms: []
   - serializedVersion: 2
     name: Ultra
-    pixelLightCount: 4
-    shadows: 2
-    shadowResolution: 2
+    pixelLightCount: 1
+    shadows: 0
+    shadowResolution: 1
     shadowProjection: 1
     shadowCascades: 4
     shadowDistance: 150
@@ -196,12 +201,12 @@ QualitySettings:
     skinWeights: 4
     textureQuality: 0
     anisotropicTextures: 2
-    antiAliasing: 2
+    antiAliasing: 0
     softParticles: 1
     softVegetation: 1
     realtimeReflectionProbes: 1
     billboardsFaceCameraPosition: 1
-    vSyncCount: 1
+    vSyncCount: 0
     lodBias: 2
     maximumLODLevel: 0
     streamingMipmapsActive: 0
@@ -215,5 +220,6 @@ QualitySettings:
     asyncUploadBufferSize: 16
     asyncUploadPersistentBuffer: 1
     resolutionScalingFixedDPIFactor: 1
+    customRenderPipeline: {fileID: 0}
     excludedTargetPlatforms: []
   m_PerPlatformDefaultQuality: {}