Merge branch 'main' of ssh://n.samien.cn:10022/Zxp/PICO_VR

Assets/Scenes/Main.unity

@@ -5961,7 +5961,7 @@ PrefabInstance:
         \u5F53\u5979\u5E73\u9759\u4E0B\u6765\u65F6\uFF0C\u4E0E\u4E24\u4E2A\u5B66\u751F\u4EA4\u8C08\u4E86\u89E3\u53D1\u751F\u4E86\u4EC0\u4E48\u4E8B\u60C5\u3002
         \u63D0\u9192\u4ED6\u4EEC\u8981\u76F8\u4E92\u5C0A\u91CD\u7684\u89C4\u5219\u3002\r\nB.
         \u63D0\u9192\u5B66\u751F\u8981\u9075\u5B88\u8BFE\u5802\u89C4\u5219\u3002
-        \u544A\u8BC9\u5B66\u751F\u53BB\u628A\u5F52\u8FD8\uFF0C\u5E76\u5B89\u9759\u5730\u7B49\u5F85\uFF0C\u4ED6\u4E0D\u5F52\u8FD8\u7B14\uFF0C\u518D\u6B21\u63D0\u9192\u3002\r\nC.
+        \u544A\u8BC9\u5B66\u751F\u53BB\u628A\u7B14\u5F52\u8FD8\uFF0C\u5E76\u5B89\u9759\u5730\u7B49\u5F85\uFF0C\u4ED6\u4E0D\u5F52\u8FD8\u7B14\uFF0C\u518D\u6B21\u63D0\u9192\u3002\r\nC.
         \u8D70\u5230\u5B66\u751F\u8EAB\u8FB9\uFF0C\u5750\u5728\u4ED6\u4EEC\u65C1\u8FB9\u3002
         \u63D0\u9192\u4ED6\u4EEC\u8BE5\u6295\u5165\u5C0F\u7EC4\u6D3B\u52A8\uFF0C\u4ED6\u4EEC\u8FD8\u662F\u4E0D\u53C2\u4E0E\u6D3B\u52A8\u7684\u8BDD\uFF0C\u544A\u8BC9\u4ED6\u4EEC\u91CD\u65B0\u53C2\u52A0\u6D3B\u52A8\u6216\u5C06\u4ED6\u4EEC\u5206\u5F00\u3002"
       objectReference: {fileID: 0}
@@ -17493,7 +17493,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6226915618609829444, guid: 8bb392810f1e01a4aadca760ceadab8e, type: 3}
       propertyPath: m_IsActive
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 6710823521395821822, guid: 8bb392810f1e01a4aadca760ceadab8e, type: 3}
       propertyPath: m_RootOrder
@@ -20325,7 +20325,7 @@ PrefabInstance:
         \u5F53\u5979\u5E73\u9759\u4E0B\u6765\u65F6\uFF0C\u4E0E\u4E24\u4E2A\u5B66\u751F\u4EA4\u8C08\u4E86\u89E3\u53D1\u751F\u4E86\u4EC0\u4E48\u4E8B\u60C5\u3002
         \u63D0\u9192\u4ED6\u4EEC\u8981\u76F8\u4E92\u5C0A\u91CD\u7684\u89C4\u5219\u3002\r\nB.
         \u63D0\u9192\u5B66\u751F\u8981\u9075\u5B88\u8BFE\u5802\u89C4\u5219\u3002
-        \u544A\u8BC9\u5B66\u751F\u53BB\u628A\u5F52\u8FD8\uFF0C\u5E76\u5B89\u9759\u5730\u7B49\u5F85\uFF0C\u4ED6\u4E0D\u5F52\u8FD8\u7B14\uFF0C\u518D\u6B21\u63D0\u9192\u3002\r\nC.
+        \u544A\u8BC9\u5B66\u751F\u53BB\u628A\u7B14\u5F52\u8FD8\uFF0C\u5E76\u5B89\u9759\u5730\u7B49\u5F85\uFF0C\u4ED6\u4E0D\u5F52\u8FD8\u7B14\uFF0C\u518D\u6B21\u63D0\u9192\u3002\r\nC.
         \u8D70\u5230\u5B66\u751F\u8EAB\u8FB9\uFF0C\u5750\u5728\u4ED6\u4EEC\u65C1\u8FB9\u3002
         \u63D0\u9192\u4ED6\u4EEC\u8BE5\u6295\u5165\u5C0F\u7EC4\u6D3B\u52A8\uFF0C\u4ED6\u4EEC\u8FD8\u662F\u4E0D\u53C2\u4E0E\u6D3B\u52A8\u7684\u8BDD\uFF0C\u544A\u8BC9\u4ED6\u4EEC\u91CD\u65B0\u53C2\u52A0\u6D3B\u52A8\u6216\u5C06\u4ED6\u4EEC\u5206\u5F00\u3002"
       objectReference: {fileID: 0}
@@ -23210,7 +23210,7 @@ PrefabInstance:
         \u5F53\u5979\u5E73\u9759\u4E0B\u6765\u65F6\uFF0C\u4E0E\u4E24\u4E2A\u5B66\u751F\u4EA4\u8C08\u4E86\u89E3\u53D1\u751F\u4E86\u4EC0\u4E48\u4E8B\u60C5\u3002
         \u63D0\u9192\u4ED6\u4EEC\u8981\u76F8\u4E92\u5C0A\u91CD\u7684\u89C4\u5219\u3002\r\nB.
         \u63D0\u9192\u5B66\u751F\u8981\u9075\u5B88\u8BFE\u5802\u89C4\u5219\u3002
-        \u544A\u8BC9\u5B66\u751F\u53BB\u628A\u5F52\u8FD8\uFF0C\u5E76\u5B89\u9759\u5730\u7B49\u5F85\uFF0C\u4ED6\u4E0D\u5F52\u8FD8\u7B14\uFF0C\u518D\u6B21\u63D0\u9192\u3002\r\nC.
+        \u544A\u8BC9\u5B66\u751F\u53BB\u628A\u7B14\u5F52\u8FD8\uFF0C\u5E76\u5B89\u9759\u5730\u7B49\u5F85\uFF0C\u4ED6\u4E0D\u5F52\u8FD8\u7B14\uFF0C\u518D\u6B21\u63D0\u9192\u3002\r\nC.
         \u8D70\u5230\u5B66\u751F\u8EAB\u8FB9\uFF0C\u5750\u5728\u4ED6\u4EEC\u65C1\u8FB9\u3002
         \u63D0\u9192\u4ED6\u4EEC\u8BE5\u6295\u5165\u5C0F\u7EC4\u6D3B\u52A8\uFF0C\u4ED6\u4EEC\u8FD8\u662F\u4E0D\u53C2\u4E0E\u6D3B\u52A8\u7684\u8BDD\uFF0C\u544A\u8BC9\u4ED6\u4EEC\u91CD\u65B0\u53C2\u52A0\u6D3B\u52A8\u6216\u5C06\u4ED6\u4EEC\u5206\u5F00\u3002"
       objectReference: {fileID: 0}
@@ -28550,7 +28550,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   cameraSet: {fileID: 6026058372778631164}
   animator: {fileID: 521937606}
-  startCamera: 1
+  startCamera: 0
   endCamera: 1
 --- !u!222 &3105819156793047186
 CanvasRenderer:
@@ -29357,7 +29357,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   cameraSet: {fileID: 6026058372778631164}
   animator: {fileID: 150723427}
-  startCamera: 1
+  startCamera: 0
   endCamera: 1
 --- !u!224 &4367197408934411149
 RectTransform:
@@ -31376,7 +31376,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   cameraSet: {fileID: 6026058372778631164}
   animator: {fileID: 307356499}
-  startCamera: 1
+  startCamera: 0
   endCamera: 1
 --- !u!224 &5872900380671705745
 RectTransform:
@@ -33381,7 +33381,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   cameraSet: {fileID: 6026058372778631164}
   animator: {fileID: 521937606}
-  startCamera: 1
+  startCamera: 0
   endCamera: 1
 --- !u!114 &6376507194986200788
 MonoBehaviour:
@@ -33989,7 +33989,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   cameraSet: {fileID: 6026058372778631164}
   animator: {fileID: 156663362}
-  startCamera: 1
+  startCamera: 0
   endCamera: 1
 --- !u!1001 &7945765277870136795
 PrefabInstance:

PICOSDK/Assets/Resources/Controller/Neo 3 L.prefab

@@ -70,6 +70,26 @@ PrefabInstance:
       propertyPath: m_Name
       value: "\u624B\u67C4\u786E\u8BA4"
       objectReference: {fileID: 0}
+    - target: {fileID: 5456357013912504454, guid: dec6730fe30794a41b61ea9838c2d30b, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.39609176
+      objectReference: {fileID: 0}
+    - target: {fileID: 5456357013912504454, guid: dec6730fe30794a41b61ea9838c2d30b, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0.918211
+      objectReference: {fileID: 0}
+    - target: {fileID: 5456357013912504454, guid: dec6730fe30794a41b61ea9838c2d30b, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -1.4851059e-33
+      objectReference: {fileID: 0}
+    - target: {fileID: 5456357013912504454, guid: dec6730fe30794a41b61ea9838c2d30b, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -3.4427416e-33
+      objectReference: {fileID: 0}
+    - target: {fileID: 5456357013912504454, guid: dec6730fe30794a41b61ea9838c2d30b, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 133.332
+      objectReference: {fileID: 0}
     - target: {fileID: 6195122472419804717, guid: dec6730fe30794a41b61ea9838c2d30b, type: 3}
       propertyPath: m_RootOrder
       value: 0
@@ -116,6 +136,63 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: dec6730fe30794a41b61ea9838c2d30b, type: 3}
+--- !u!1001 &3785346901890683336
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 8643909349379187302}
+    m_Modifications:
+    - target: {fileID: 2788630802714958218, guid: 01262db7d765e5e4192ca17fce5888db, type: 3}
+      propertyPath: m_Name
+      value: "\u624B\u67C4\u79FB\u52A8"
+      objectReference: {fileID: 0}
+    - target: {fileID: 6195122472419804717, guid: 01262db7d765e5e4192ca17fce5888db, type: 3}
+      propertyPath: m_RootOrder
+      value: 7
+      objectReference: {fileID: 0}
+    - target: {fileID: 6195122472419804717, guid: 01262db7d765e5e4192ca17fce5888db, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -0.0352
+      objectReference: {fileID: 0}
+    - target: {fileID: 6195122472419804717, guid: 01262db7d765e5e4192ca17fce5888db, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0.004808467
+      objectReference: {fileID: 0}
+    - target: {fileID: 6195122472419804717, guid: 01262db7d765e5e4192ca17fce5888db, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0.011795007
+      objectReference: {fileID: 0}
+    - target: {fileID: 6195122472419804717, guid: 01262db7d765e5e4192ca17fce5888db, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.8102866
+      objectReference: {fileID: 0}
+    - target: {fileID: 6195122472419804717, guid: 01262db7d765e5e4192ca17fce5888db, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0.5860338
+      objectReference: {fileID: 0}
+    - target: {fileID: 6195122472419804717, guid: 01262db7d765e5e4192ca17fce5888db, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6195122472419804717, guid: 01262db7d765e5e4192ca17fce5888db, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6195122472419804717, guid: 01262db7d765e5e4192ca17fce5888db, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 71.752
+      objectReference: {fileID: 0}
+    - target: {fileID: 6195122472419804717, guid: 01262db7d765e5e4192ca17fce5888db, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6195122472419804717, guid: 01262db7d765e5e4192ca17fce5888db, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 01262db7d765e5e4192ca17fce5888db, type: 3}
 --- !u!1001 &3842097607210915607
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -196,6 +273,11 @@ GameObject:
   m_CorrespondingSourceObject: {fileID: 8245864472737768373, guid: fe8d9fd131b04ed4a8be3355cb9d4aa9, type: 3}
   m_PrefabInstance: {fileID: 3842097607210915607}
   m_PrefabAsset: {fileID: 0}
+--- !u!4 &8643909349379187302 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 4802115571309344113, guid: fe8d9fd131b04ed4a8be3355cb9d4aa9, type: 3}
+  m_PrefabInstance: {fileID: 3842097607210915607}
+  m_PrefabAsset: {fileID: 0}
 --- !u!4 &3572223861192634285 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 343058374925023418, guid: fe8d9fd131b04ed4a8be3355cb9d4aa9, type: 3}

PICOSDK/Assets/Resources/Controller/Neo 3 R.prefab

@@ -31,6 +31,95 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &1822863152318741957
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 1576926719048221535}
+    m_Modifications:
+    - target: {fileID: 1079706852983217437, guid: 01262db7d765e5e4192ca17fce5888db, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: -0.5082448
+      objectReference: {fileID: 0}
+    - target: {fileID: 1079706852983217437, guid: 01262db7d765e5e4192ca17fce5888db, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0.8612126
+      objectReference: {fileID: 0}
+    - target: {fileID: 1079706852983217437, guid: 01262db7d765e5e4192ca17fce5888db, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1079706852983217437, guid: 01262db7d765e5e4192ca17fce5888db, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1079706852983217437, guid: 01262db7d765e5e4192ca17fce5888db, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: -0.0833
+      objectReference: {fileID: 0}
+    - target: {fileID: 1079706852983217437, guid: 01262db7d765e5e4192ca17fce5888db, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 241.094
+      objectReference: {fileID: 0}
+    - target: {fileID: 1079706852983217437, guid: 01262db7d765e5e4192ca17fce5888db, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1079706852983217437, guid: 01262db7d765e5e4192ca17fce5888db, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2788630802714958218, guid: 01262db7d765e5e4192ca17fce5888db, type: 3}
+      propertyPath: m_Name
+      value: "\u624B\u67C4\u79FB\u52A8"
+      objectReference: {fileID: 0}
+    - target: {fileID: 6195122472419804717, guid: 01262db7d765e5e4192ca17fce5888db, type: 3}
+      propertyPath: m_RootOrder
+      value: 7
+      objectReference: {fileID: 0}
+    - target: {fileID: 6195122472419804717, guid: 01262db7d765e5e4192ca17fce5888db, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0.0315
+      objectReference: {fileID: 0}
+    - target: {fileID: 6195122472419804717, guid: 01262db7d765e5e4192ca17fce5888db, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0.0094
+      objectReference: {fileID: 0}
+    - target: {fileID: 6195122472419804717, guid: 01262db7d765e5e4192ca17fce5888db, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -0.0016
+      objectReference: {fileID: 0}
+    - target: {fileID: 6195122472419804717, guid: 01262db7d765e5e4192ca17fce5888db, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6195122472419804717, guid: 01262db7d765e5e4192ca17fce5888db, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6195122472419804717, guid: 01262db7d765e5e4192ca17fce5888db, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6195122472419804717, guid: 01262db7d765e5e4192ca17fce5888db, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6195122472419804717, guid: 01262db7d765e5e4192ca17fce5888db, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6195122472419804717, guid: 01262db7d765e5e4192ca17fce5888db, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 180
+      objectReference: {fileID: 0}
+    - target: {fileID: 6195122472419804717, guid: 01262db7d765e5e4192ca17fce5888db, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 01262db7d765e5e4192ca17fce5888db, type: 3}
 --- !u!1001 &6288947943713207854
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -111,6 +200,11 @@ GameObject:
   m_CorrespondingSourceObject: {fileID: 8245864472737768373, guid: 98595991fd68c5e419d1d37fed8658ff, type: 3}
   m_PrefabInstance: {fileID: 6288947943713207854}
   m_PrefabAsset: {fileID: 0}
+--- !u!4 &1576926719048221535 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 4802115571309344113, guid: 98595991fd68c5e419d1d37fed8658ff, type: 3}
+  m_PrefabInstance: {fileID: 6288947943713207854}
+  m_PrefabAsset: {fileID: 0}
 --- !u!4 &2840689723880156062 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: -1140821836707635792, guid: 98595991fd68c5e419d1d37fed8658ff, type: 3}

ProjectSettings/ProjectSettings.asset

@@ -140,7 +140,10 @@ PlayerSettings:
     16:9: 1
     Others: 1
   bundleVersion: 0.1
-  preloadedAssets: []
+  preloadedAssets:
+  - {fileID: 11400000, guid: 9953094977e9c214abbe81577a8ebb24, type: 2}
+  - {fileID: 11400000, guid: 71609cae5115a9c48a55d69900e47fa4, type: 2}
+  - {fileID: 1029437730009618294, guid: 46af8c7be485534469cb459b30031684, type: 2}
   metroInputSource: 0
   wsaTransparentSwapchain: 0
   m_HolographicPauseOnTrackingLoss: 1