Max/xiaopeng12138_WACVR
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

should fix #2 #3

Browse Source
This commit is contained in:
xpeng
2022-05-17 17:28:53 +02:00
parent cfc2455e84
commit 0842b5024b
5 changed files with 113 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Scenes/WACVR.unity
+23 -3
View File
@@ -8133,6 +8133,26 @@ PrefabInstance:
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: -7918335002988649766, guid: fe556f8bee4726d418b982f1094ca7d3,
type: 3}
propertyPath: m_Enabled
value: 1
objectReference: {fileID: 0}
- target: {fileID: -7918335002988649766, guid: fe556f8bee4726d418b982f1094ca7d3,
type: 3}
propertyPath: m_CastShadows
value: 0
objectReference: {fileID: 0}
- target: {fileID: -7918335002988649766, guid: fe556f8bee4726d418b982f1094ca7d3,
type: 3}
propertyPath: m_DynamicOccludee
value: 0
objectReference: {fileID: 0}
- target: {fileID: -7918335002988649766, guid: fe556f8bee4726d418b982f1094ca7d3,
type: 3}
propertyPath: m_LightProbeUsage
value: 0
objectReference: {fileID: 0}
- target: {fileID: -7918335002988649766, guid: fe556f8bee4726d418b982f1094ca7d3,
type: 3}
propertyPath: m_Materials.Array.data[0]
@@ -9296,7 +9316,7 @@ GameObject:
type: 3}
m_PrefabInstance: {fileID: 1908947385}
m_PrefabAsset: {fileID: 0}
--- !u!114 &1908947387
--- !u!114 &1908947391
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -9310,11 +9330,11 @@ MonoBehaviour:
m_EditorClassIdentifier:
searchTiming_: 0
type_: 0
altTabWindow_: 0
altTabWindow_: 1
createChildWindows_: 0
childWindowPrefab: {fileID: 0}
childWindowZDistance: 0.02
partialWindowTitle_: Mercury
partialWindowTitle_: 'Mercury (64-bit, PCD3D_SM5) '
desktopIndex_: 0
captureMode: 1
capturePriority: 0
Packages/manifest.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"dependencies": {
"com.unity.collab-proxy": "1.15.16",
"com.unity.collab-proxy": "1.15.17",
"com.unity.ide.rider": "3.0.13",
"com.unity.ide.visualstudio": "2.0.15",
"com.unity.ide.vscode": "1.2.5",
Packages/packages-lock.json
+1 -1
View File
@@ -10,7 +10,7 @@
"url": "https://packages.unity.com"
},
"com.unity.collab-proxy": {
"version": "1.15.16",
"version": "1.15.17",
"depth": 0,
"source": "registry",
"dependencies": {
ProjectSettings/ProjectSettings.asset
+1 -1
View File
@@ -85,7 +85,7 @@ PlayerSettings:
hideHomeButton: 0
submitAnalytics: 1
usePlayerLog: 1
bakeCollisionMeshes: 0
bakeCollisionMeshes: 1
forceSingleInstance: 1
useFlipModelSwapchain: 1
resizableWindow: 1
UserSettings/Layouts/default-2021.dwlt
+87 -87
View File
@@ -14,10 +14,10 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_PixelRect:
serializedVersion: 2
x: 263.2
y: 145.6
x: -6.4
y: 151.2
width: 864
height: 575.2
height: 569.60004
m_ShowMode: 0
m_Title: Project Settings
m_RootView: {fileID: 6}
@@ -38,10 +38,10 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_PixelRect:
serializedVersion: 2
x: 1529.6
y: 296
x: -6.4
y: 301.6
width: 864
height: 379.2
height: 373.6
m_ShowMode: 0
m_Title: Console
m_RootView: {fileID: 8}
@@ -62,10 +62,10 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_PixelRect:
serializedVersion: 2
x: 1616.8
y: 646.4
x: 88.8
y: 652
width: 768.8
height: 606.4
height: 600.8
m_ShowMode: 0
m_Title: Build Settings
m_RootView: {fileID: 10}
@@ -86,12 +86,12 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_PixelRect:
serializedVersion: 2
x: 0
y: 43.2
x: -1536
y: 244
width: 1536
height: 820.8
m_ShowMode: 4
m_Title: Game
m_Title: Inspector
m_RootView: {fileID: 11}
m_MinSize: {x: 875, y: 300}
m_MaxSize: {x: 10000, y: 10000}
@@ -114,9 +114,9 @@ MonoBehaviour:
x: 0
y: 0
width: 864
height: 575.2
m_MinSize: {x: 310, y: 221}
m_MaxSize: {x: 4000, y: 4021}
height: 569.6
m_MinSize: {x: 310, y: 200}
m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 20}
m_Panes:
- {fileID: 20}
@@ -141,11 +141,11 @@ MonoBehaviour:
x: 0
y: 0
width: 864
height: 575.2
height: 569.6
m_MinSize: {x: 310, y: 221}
m_MaxSize: {x: 4000, y: 4021}
vertical: 0
controlID: 915
controlID: 162
--- !u!114 &7
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -164,9 +164,9 @@ MonoBehaviour:
x: 0
y: 0
width: 864
height: 379.2
m_MinSize: {x: 100, y: 100}
m_MaxSize: {x: 4000, y: 4000}
height: 373.6
m_MinSize: {x: 100, y: 121}
m_MaxSize: {x: 4000, y: 4021}
m_ActualView: {fileID: 21}
m_Panes:
- {fileID: 21}
@@ -191,11 +191,11 @@ MonoBehaviour:
x: 0
y: 0
width: 864
height: 379.2
height: 373.6
m_MinSize: {x: 100, y: 121}
m_MaxSize: {x: 4000, y: 4021}
vertical: 0
controlID: 80
controlID: 21
--- !u!114 &9
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -214,7 +214,7 @@ MonoBehaviour:
x: 0
y: 0
width: 768.8
height: 606.4
height: 600.8
m_MinSize: {x: 640, y: 580}
m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 22}
@@ -241,11 +241,11 @@ MonoBehaviour:
x: 0
y: 0
width: 768.8
height: 606.4
height: 600.8
m_MinSize: {x: 640, y: 601}
m_MaxSize: {x: 4000, y: 4021}
vertical: 0
controlID: 117
controlID: 58
--- !u!114 &11
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -321,7 +321,7 @@ MonoBehaviour:
m_MinSize: {x: 300, y: 200}
m_MaxSize: {x: 24288, y: 16192}
vertical: 0
controlID: 17
controlID: 292
--- !u!114 &14
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -353,23 +353,23 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 1
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
m_Name: GameView
m_Name: SceneView
m_EditorClassIdentifier:
m_Children: []
m_Position:
serializedVersion: 2
x: 0
y: 0
width: 983.2
width: 904
height: 770.8
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 25}
m_MinSize: {x: 201, y: 221}
m_MaxSize: {x: 4001, y: 4021}
m_ActualView: {fileID: 26}
m_Panes:
- {fileID: 26}
- {fileID: 25}
m_Selected: 1
m_LastSelected: 0
m_Selected: 0
m_LastSelected: 1
--- !u!114 &16
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -387,14 +387,14 @@ MonoBehaviour:
- {fileID: 19}
m_Position:
serializedVersion: 2
x: 983.2
x: 904
y: 0
width: 259.99994
width: 281.59998
height: 770.8
m_MinSize: {x: 100, y: 200}
m_MaxSize: {x: 8096, y: 16192}
vertical: 1
controlID: 242
controlID: 223
--- !u!114 &17
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -410,12 +410,12 @@ MonoBehaviour:
m_Children: []
m_Position:
serializedVersion: 2
x: 1243.2
x: 1185.6
y: 0
width: 292.80005
width: 350.40002
height: 770.8
m_MinSize: {x: 275, y: 50}
m_MaxSize: {x: 4000, y: 4000}
m_MinSize: {x: 276, y: 71}
m_MaxSize: {x: 4001, y: 4021}
m_ActualView: {fileID: 23}
m_Panes:
- {fileID: 23}
@@ -438,7 +438,7 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
width: 259.99994
width: 281.59998
height: 339.2
m_MinSize: {x: 202, y: 221}
m_MaxSize: {x: 4002, y: 4021}
@@ -464,7 +464,7 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 339.2
width: 259.99994
width: 281.59998
height: 431.59998
m_MinSize: {x: 232, y: 271}
m_MaxSize: {x: 10002, y: 10021}
@@ -494,23 +494,23 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 263.2
y: 145.6
x: -6.4
y: 151.2
width: 864
height: 554.2
height: 548.6
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
m_SaveData: []
m_PosLeft: {x: 0, y: 0}
m_PosRight: {x: 0, y: 0}
m_PosRight: {x: 0, y: 1558}
m_Scope: 1
m_SplitterFlex: 0.2
m_SearchText:
m_TreeViewState:
scrollPos: {x: 0, y: 0}
m_SelectedIDs: 23e57dba
m_LastClickedID: -1166154461
m_SelectedIDs: 4dcf9b58
m_LastClickedID: 1486606157
m_ExpandedIDs: a01a5fa653336be2000000004f0a7f2e
m_RenameOverlay:
m_UserAcceptedRename: 0
@@ -550,10 +550,10 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 1529.6
y: 296
x: -6.4000244
y: 301.6
width: 864
height: 358.2
height: 352.6
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@@ -578,10 +578,10 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 1616.8
y: 646.4
x: 88.8
y: 652
width: 768.8
height: 585.4
height: 579.8
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@@ -629,9 +629,9 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 1243.2001
y: 73.6
width: 291.80005
x: -350.40002
y: 274.4
width: 349.40002
height: 749.8
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
@@ -671,9 +671,9 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 983.2
y: 412.80002
width: 257.99994
x: -632
y: 613.60004
width: 279.59998
height: 410.59998
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
@@ -705,9 +705,9 @@ MonoBehaviour:
m_IsLocked: 0
m_FolderTreeState:
scrollPos: {x: 0, y: 0}
m_SelectedIDs: aa800000
m_LastClickedID: 32938
m_ExpandedIDs: 000000000a7f00000c7f00000e7f000000ca9a3bffffff7f
m_SelectedIDs: ca800000
m_LastClickedID: 32970
m_ExpandedIDs: 00000000127f0000147f0000167f000000ca9a3bffffff7f
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -735,7 +735,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: 000000000a7f00000c7f00000e7f0000
m_ExpandedIDs: 00000000127f0000147f0000167f0000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -762,7 +762,7 @@ MonoBehaviour:
m_ListAreaState:
m_SelectedInstanceIDs:
m_LastClickedInstanceID: 0
m_HadKeyboardFocusLastEvent: 1
m_HadKeyboardFocusLastEvent: 0
m_ExpandedInstanceIDs: c6230000f4790000
m_RenameOverlay:
m_UserAcceptedRename: 0
@@ -790,7 +790,7 @@ MonoBehaviour:
m_ScrollPosition: {x: 0, y: 0}
m_GridSize: 64
m_SkipHiddenPackages: 0
m_DirectoriesAreaWidth: 172.80005
m_DirectoriesAreaWidth: 94.400024
--- !u!114 &25
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -812,9 +812,9 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 0
y: 73.6
width: 982.2
x: -1536
y: 274.4
width: 903
height: 749.8
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
@@ -862,10 +862,10 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 21
width: 982.2
width: 903
height: 728.8
m_Scale: {x: 0.6394531, y: 0.6394531}
m_Translation: {x: 491.09998, y: 364.4}
m_Scale: {x: 0.5878906, y: 0.5878906}
m_Translation: {x: 451.5, y: 364.4}
m_MarginLeft: 0
m_MarginRight: 0
m_MarginTop: 0
@@ -873,12 +873,12 @@ MonoBehaviour:
m_LastShownAreaInsideMargins:
serializedVersion: 2
x: -768
y: -569.86194
y: -619.8432
width: 1536
height: 1139.7239
height: 1239.6864
m_MinimalGUI: 1
m_defaultScale: 0.6394531
m_LastWindowPixelSize: {x: 1227.75, y: 937.25}
m_defaultScale: 0.5878906
m_LastWindowPixelSize: {x: 1128.75, y: 937.25}
m_ClearInEditMode: 1
m_NoCameraWarning: 1
m_LowResolutionForAspectRatios: 01000000000000000000
@@ -905,9 +905,9 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 0
y: 73.6
width: 982.2
x: -1536
y: 274.4
width: 903
height: 749.8
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
@@ -1110,9 +1110,9 @@ MonoBehaviour:
m_PlayAudio: 0
m_AudioPlay: 0
m_Position:
m_Target: {x: 6.9281726, y: 0.8853637, z: 4.00187}
m_Target: {x: 4.916017, y: 0.9746597, z: 6.1836433}
speed: 2
m_Value: {x: 6.9281726, y: 0.8853637, z: 4.00187}
m_Value: {x: 4.916017, y: 0.9746597, z: 6.1836433}
m_RenderMode: 0
m_CameraMode:
drawMode: 0
@@ -1159,9 +1159,9 @@ MonoBehaviour:
m_GridAxis: 1
m_gridOpacity: 0.5
m_Rotation:
m_Target: {x: 0.0120739555, y: 0.51820403, z: -0.007300036, w: 0.8551462}
m_Target: {x: 0.016269831, y: 0.31006452, z: -0.00529216, w: 0.95056665}
speed: 2
m_Value: {x: 0.012073898, y: 0.5182016, z: -0.007300001, w: 0.8551422}
m_Value: {x: 0.016261796, y: 0.31148854, z: -0.0053165336, w: 0.95009595}
m_Size:
m_Target: 4.48803
speed: 2
@@ -1211,9 +1211,9 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 983.2
y: 73.6
width: 257.99994
x: -632
y: 274.4
width: 279.59998
height: 318.2
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
@@ -1224,7 +1224,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: daabffffb4acfffff4b4ffffe4beffffbebfffff8ac5ffff04c8ffffdec8ffffaaceffffd6d4ffffaed5fffff2ddffff00e3ffffd8e3ffff1cecffff32fbffff
m_ExpandedIDs: d8b8ffffdeb9ffff1ec2ffff30fbffff32fbffff
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name: