Skip to content

A
ar_volunteer
Commit b15bdb27 authored by 陈创杰's avatar 陈创杰
Browse files
Options

更新

parent 62b49475
Hide whitespace changes
Inline Side-by-side
Showing with 125 additions and 126 deletions
ar_game1/Library/CurrentLayout.dwlt
View file @ b15bdb27
...@@ -13,14 +13,14 @@ MonoBehaviour: ...@@ -13,14 +13,14 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_PixelRect: m_PixelRect:
serializedVersion: 2 serializedVersion: 2
x: 8 x: 1366
y: 51 y: 43
width: 1520 width: 1920
height: 765 height: 997
m_ShowMode: 4 m_ShowMode: 4
m_Title: m_Title:
m_RootView: {fileID: 2} m_RootView: {fileID: 2}
m_MinSize: {x: 950, y: 392} m_MinSize: {x: 950, y: 492}
m_MaxSize: {x: 10000, y: 10000} m_MaxSize: {x: 10000, y: 10000}
--- !u!114 &2 --- !u!114 &2
MonoBehaviour: MonoBehaviour:
...@@ -41,9 +41,9 @@ MonoBehaviour: ...@@ -41,9 +41,9 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 0 y: 0
width: 1520 width: 1920
height: 765 height: 997
m_MinSize: {x: 950, y: 392} m_MinSize: {x: 950, y: 492}
m_MaxSize: {x: 10000, y: 10000} m_MaxSize: {x: 10000, y: 10000}
--- !u!114 &3 --- !u!114 &3
MonoBehaviour: MonoBehaviour:
...@@ -61,7 +61,7 @@ MonoBehaviour: ...@@ -61,7 +61,7 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 0 y: 0
width: 1520 width: 1920
height: 30 height: 30
m_MinSize: {x: 0, y: 0} m_MinSize: {x: 0, y: 0}
m_MaxSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0}
...@@ -81,8 +81,8 @@ MonoBehaviour: ...@@ -81,8 +81,8 @@ MonoBehaviour:
m_Position: m_Position:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 745 y: 977
width: 1520 width: 1920
height: 20 height: 20
m_MinSize: {x: 0, y: 0} m_MinSize: {x: 0, y: 0}
m_MaxSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0}
...@@ -106,12 +106,12 @@ MonoBehaviour: ...@@ -106,12 +106,12 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 30 y: 30
width: 1520 width: 1920
height: 715 height: 947
m_MinSize: {x: 911, y: 342} m_MinSize: {x: 1517, y: 442}
m_MaxSize: {x: 22006, y: 10021} m_MaxSize: {x: 22012, y: 10021}
vertical: 0 vertical: 0
controlID: 97 controlID: 50
--- !u!114 &6 --- !u!114 &6
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
...@@ -130,12 +130,12 @@ MonoBehaviour: ...@@ -130,12 +130,12 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 0 y: 0
width: 751 width: 897
height: 715 height: 947
m_MinSize: {x: 202, y: 342} m_MinSize: {x: 802, y: 442}
m_MaxSize: {x: 4002, y: 8042} m_MaxSize: {x: 4002, y: 8042}
vertical: 1 vertical: 1
controlID: 35 controlID: 51
--- !u!114 &7 --- !u!114 &7
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
...@@ -152,10 +152,10 @@ MonoBehaviour: ...@@ -152,10 +152,10 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 0 y: 0
width: 751 width: 897
height: 386 height: 297
m_MinSize: {x: 200, y: 200} m_MinSize: {x: 202, y: 221}
m_MaxSize: {x: 4000, y: 4000} m_MaxSize: {x: 4002, y: 4021}
m_ActualView: {fileID: 16} m_ActualView: {fileID: 16}
m_Panes: m_Panes:
- {fileID: 16} - {fileID: 16}
...@@ -178,19 +178,19 @@ MonoBehaviour: ...@@ -178,19 +178,19 @@ MonoBehaviour:
m_Position: m_Position:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 386 y: 297
width: 751 width: 897
height: 329 height: 650
m_MinSize: {x: 100, y: 100} m_MinSize: {x: 802, y: 221}
m_MaxSize: {x: 4000, y: 4000} m_MaxSize: {x: 4002, y: 4021}
m_ActualView: {fileID: 14} m_ActualView: {fileID: 13}
m_Panes: m_Panes:
- {fileID: 20} - {fileID: 20}
- {fileID: 18} - {fileID: 18}
- {fileID: 14} - {fileID: 14}
- {fileID: 13} - {fileID: 13}
m_Selected: 2 m_Selected: 3
m_LastSelected: 3 m_LastSelected: 2
--- !u!114 &9 --- !u!114 &9
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
...@@ -205,12 +205,12 @@ MonoBehaviour: ...@@ -205,12 +205,12 @@ MonoBehaviour:
m_Children: [] m_Children: []
m_Position: m_Position:
serializedVersion: 2 serializedVersion: 2
x: 751 x: 897
y: 0 y: 0
width: 204 width: 290
height: 715 height: 947
m_MinSize: {x: 200, y: 200} m_MinSize: {x: 204, y: 221}
m_MaxSize: {x: 4000, y: 4000} m_MaxSize: {x: 4004, y: 4021}
m_ActualView: {fileID: 21} m_ActualView: {fileID: 21}
m_Panes: m_Panes:
- {fileID: 21} - {fileID: 21}
...@@ -230,10 +230,10 @@ MonoBehaviour: ...@@ -230,10 +230,10 @@ MonoBehaviour:
m_Children: [] m_Children: []
m_Position: m_Position:
serializedVersion: 2 serializedVersion: 2
x: 955 x: 1187
y: 0 y: 0
width: 249 width: 333
height: 715 height: 947
m_MinSize: {x: 234, y: 271} m_MinSize: {x: 234, y: 271}
m_MaxSize: {x: 10004, y: 10021} m_MaxSize: {x: 10004, y: 10021}
m_ActualView: {fileID: 22} m_ActualView: {fileID: 22}
...@@ -255,12 +255,12 @@ MonoBehaviour: ...@@ -255,12 +255,12 @@ MonoBehaviour:
m_Children: [] m_Children: []
m_Position: m_Position:
serializedVersion: 2 serializedVersion: 2
x: 1204 x: 1520
y: 0 y: 0
width: 316 width: 400
height: 715 height: 947
m_MinSize: {x: 275, y: 50} m_MinSize: {x: 277, y: 71}
m_MaxSize: {x: 4000, y: 4000} m_MaxSize: {x: 4002, y: 4021}
m_ActualView: {fileID: 23} m_ActualView: {fileID: 23}
m_Panes: m_Panes:
- {fileID: 23} - {fileID: 23}
...@@ -283,7 +283,7 @@ MonoBehaviour: ...@@ -283,7 +283,7 @@ MonoBehaviour:
m_MinSize: {x: 200, y: 200} m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4000, y: 4000} m_MaxSize: {x: 4000, y: 4000}
m_TitleContent: m_TitleContent:
m_Text: Actions m_Text: "\u52A8\u4F5C"
m_Image: {fileID: 0} m_Image: {fileID: 0}
m_Tooltip: m_Tooltip:
m_DepthBufferBits: 0 m_DepthBufferBits: 0
...@@ -315,13 +315,13 @@ MonoBehaviour: ...@@ -315,13 +315,13 @@ MonoBehaviour:
m_DepthBufferBits: 0 m_DepthBufferBits: 0
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 1366
y: 604 y: 389
width: 960 width: 895
height: 404 height: 629
Initialized: 1 Initialized: 1
fsmEditor: fsmEditor:
Initialized: 0 Initialized: 1
initializedOnce: 1 initializedOnce: 1
fsmSelection: fsmSelection:
fsmComponentID: 0 fsmComponentID: 0
...@@ -333,21 +333,20 @@ MonoBehaviour: ...@@ -333,21 +333,20 @@ MonoBehaviour:
zoom: 1 zoom: 1
selectionHistory: selectionHistory:
backList: backList:
- fsmComponentID: 28214 - fsmComponentID: 29492
fsmComponent: {fileID: 0} fsmComponent: {fileID: 0}
fsmTemplate: {fileID: 0} fsmTemplate: {fileID: 0}
forwardList: [] forwardList: []
selectionCache: selectionCache:
- fsmComponentID: 28214 - fsmComponentID: 29492
fsmTemplate: {fileID: 0} fsmTemplate: {fileID: 0}
stateName: State 2 stateName: State 1
stateNames: stateNames: []
- State 2 transitionIndex: 0
transitionIndex: -1 scrollPosition: {x: 192.1048, y: -36.40387}
scrollPosition: {x: 0, y: 16}
zoom: 1 zoom: 1
recentlySelectedList: recentlySelectedList:
- fsmComponentID: 28214 - fsmComponentID: 29492
fsmComponent: {fileID: 0} fsmComponent: {fileID: 0}
fsmTemplate: {fileID: 0} fsmTemplate: {fileID: 0}
debugger: debugger:
...@@ -386,10 +385,10 @@ MonoBehaviour: ...@@ -386,10 +385,10 @@ MonoBehaviour:
m_DepthBufferBits: 0 m_DepthBufferBits: 0
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 8 x: 1366
y: 486 y: 389
width: 749 width: 895
height: 308 height: 629
m_MaximizeOnPlay: 0 m_MaximizeOnPlay: 0
m_Gizmos: 0 m_Gizmos: 0
m_Stats: 0 m_Stats: 0
...@@ -398,10 +397,10 @@ MonoBehaviour: ...@@ -398,10 +397,10 @@ MonoBehaviour:
m_ZoomArea: m_ZoomArea:
m_HRangeLocked: 0 m_HRangeLocked: 0
m_VRangeLocked: 0 m_VRangeLocked: 0
m_HBaseRangeMin: -374.5 m_HBaseRangeMin: -447.5
m_HBaseRangeMax: 374.5 m_HBaseRangeMax: 447.5
m_VBaseRangeMin: -145.5 m_VBaseRangeMin: -306
m_VBaseRangeMax: 145.5 m_VBaseRangeMax: 306
m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMin: 1
m_HAllowExceedBaseRangeMax: 1 m_HAllowExceedBaseRangeMax: 1
m_VAllowExceedBaseRangeMin: 1 m_VAllowExceedBaseRangeMin: 1
...@@ -418,25 +417,25 @@ MonoBehaviour: ...@@ -418,25 +417,25 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 17 y: 17
width: 749 width: 895
height: 291 height: 612
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Translation: {x: 374.5, y: 145.5} m_Translation: {x: 447.5, y: 306}
m_MarginLeft: 0 m_MarginLeft: 0
m_MarginRight: 0 m_MarginRight: 0
m_MarginTop: 0 m_MarginTop: 0
m_MarginBottom: 0 m_MarginBottom: 0
m_LastShownAreaInsideMargins: m_LastShownAreaInsideMargins:
serializedVersion: 2 serializedVersion: 2
x: -374.5 x: -447.5
y: -145.5 y: -306
width: 749 width: 895
height: 291 height: 612
m_MinimalGUI: 1 m_MinimalGUI: 1
m_defaultScale: 1 m_defaultScale: 1
m_TargetTexture: {fileID: 0} m_TargetTexture: {fileID: 0}
m_CurrentColorSpace: 0 m_CurrentColorSpace: 0
m_LastWindowPixelSize: {x: 749, y: 308} m_LastWindowPixelSize: {x: 895, y: 629}
m_ClearInEditMode: 1 m_ClearInEditMode: 1
m_NoCameraWarning: 1 m_NoCameraWarning: 1
m_LowResolutionForAspectRatios: 01000000000100000100 m_LowResolutionForAspectRatios: 01000000000100000100
...@@ -488,19 +487,19 @@ MonoBehaviour: ...@@ -488,19 +487,19 @@ MonoBehaviour:
m_DepthBufferBits: 32 m_DepthBufferBits: 32
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 8 x: 1366
y: 100 y: 92
width: 749 width: 895
height: 365 height: 276
m_SceneLighting: 1 m_SceneLighting: 1
lastFramingTime: 417.3843546927626 lastFramingTime: 6623.332676457402
m_2DMode: 0 m_2DMode: 0
m_isRotationLocked: 0 m_isRotationLocked: 0
m_AudioPlay: 0 m_AudioPlay: 0
m_Position: m_Position:
m_Target: {x: 3.1376953, y: 15.450195, z: 10.611328} m_Target: {x: -20, y: 420.00006, z: 0.000061035156}
speed: 2 speed: 2
m_Value: {x: 3.1376953, y: 15.450195, z: 10.611328} m_Value: {x: -20, y: 420.00006, z: 0.000061035156}
m_RenderMode: 0 m_RenderMode: 0
m_ValidateTrueMetals: 0 m_ValidateTrueMetals: 0
m_SceneViewState: m_SceneViewState:
...@@ -523,13 +522,13 @@ MonoBehaviour: ...@@ -523,13 +522,13 @@ MonoBehaviour:
speed: 2 speed: 2
m_Value: 0 m_Value: 0
m_Rotation: m_Rotation:
m_Target: {x: -0.12452839, y: -0.13323359, z: 0.016876763, w: -0.98308754} m_Target: {x: -0.76595837, y: -0.01811983, z: 0.021609824, w: -0.64227784}
speed: 2 speed: 2
m_Value: {x: -0.12452839, y: -0.13323359, z: 0.016876763, w: -0.98308754} m_Value: {x: -0.76595515, y: -0.018119754, z: 0.021609735, w: -0.64227515}
m_Size: m_Size:
m_Target: 57.523308 m_Target: 1413.0154
speed: 2 speed: 2
m_Value: 57.523308 m_Value: 1413.0154
m_Ortho: m_Ortho:
m_Target: 1 m_Target: 1
speed: 2 speed: 2
...@@ -589,10 +588,10 @@ MonoBehaviour: ...@@ -589,10 +588,10 @@ MonoBehaviour:
m_DepthBufferBits: 0 m_DepthBufferBits: 0
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 1366
y: 467 y: 389
width: 960 width: 895
height: 541 height: 629
m_ViewPositions: m_ViewPositions:
m_KeySerializationHelper: m_KeySerializationHelper:
- {fileID: 1107658866638017318, guid: bd11976fa77efe74f8968f8b1436ea4d, type: 2} - {fileID: 1107658866638017318, guid: bd11976fa77efe74f8968f8b1436ea4d, type: 2}
...@@ -689,10 +688,10 @@ MonoBehaviour: ...@@ -689,10 +688,10 @@ MonoBehaviour:
m_DepthBufferBits: 0 m_DepthBufferBits: 0
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 1366
y: 604 y: 389
width: 960 width: 895
height: 404 height: 629
m_AnimEditor: {fileID: 0} m_AnimEditor: {fileID: 0}
m_Locked: 0 m_Locked: 0
--- !u!114 &21 --- !u!114 &21
...@@ -717,15 +716,15 @@ MonoBehaviour: ...@@ -717,15 +716,15 @@ MonoBehaviour:
m_DepthBufferBits: 0 m_DepthBufferBits: 0
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 761 x: 2265
y: 100 y: 92
width: 200 width: 286
height: 694 height: 926
m_TreeViewState: m_TreeViewState:
scrollPos: {x: 0, y: 0} scrollPos: {x: 0, y: 0}
m_SelectedIDs: 106b0000 m_SelectedIDs: 547b0000
m_LastClickedID: 27408 m_LastClickedID: 31572
m_ExpandedIDs: a4f3ffff00000000 m_ExpandedIDs: b4cbffff3afbffff000000007e6b0000ea6d000094730000547b0000247c00008e7c0000e27c0000
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
...@@ -744,7 +743,7 @@ MonoBehaviour: ...@@ -744,7 +743,7 @@ MonoBehaviour:
m_ClientGUIView: {fileID: 9} m_ClientGUIView: {fileID: 9}
m_SearchString: m_SearchString:
m_ExpandedScenes: m_ExpandedScenes:
- ARvolunteer - New_Year_Dog
m_CurrenRootInstanceID: 0 m_CurrenRootInstanceID: 0
m_Locked: 0 m_Locked: 0
m_CurrentSortingName: TransformSorting m_CurrentSortingName: TransformSorting
...@@ -770,10 +769,10 @@ MonoBehaviour: ...@@ -770,10 +769,10 @@ MonoBehaviour:
m_DepthBufferBits: 0 m_DepthBufferBits: 0
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: -31043 x: 2555
y: -31951 y: 92
width: 245 width: 329
height: 694 height: 926
m_SearchFilter: m_SearchFilter:
m_NameFilter: m_NameFilter:
m_ClassNames: [] m_ClassNames: []
...@@ -786,19 +785,19 @@ MonoBehaviour: ...@@ -786,19 +785,19 @@ MonoBehaviour:
m_ShowAllHits: 0 m_ShowAllHits: 0
m_SearchArea: 0 m_SearchArea: 0
m_Folders: m_Folders:
- Assets - Assets/texture/UI
m_ViewMode: 1 m_ViewMode: 0
m_StartGridSize: 91 m_StartGridSize: 91
m_LastFolders: m_LastFolders:
- Assets - Assets/Scenes
m_LastFoldersGridSize: 91 m_LastFoldersGridSize: 91
m_LastProjectPath: "E:\\2018\u5DE5\u4F5C\\\u65B0\u5E74\u52A8\u753B\\AR_New_Year\\ar_game1" m_LastProjectPath: E:\unity project\ARVR\shunde_volunteer\ar_game1
m_IsLocked: 0 m_IsLocked: 0
m_FolderTreeState: m_FolderTreeState:
scrollPos: {x: 0, y: 0} scrollPos: {x: 0, y: 0}
m_SelectedIDs: 26490000 m_SelectedIDs:
m_LastClickedID: 18726 m_LastClickedID: 0
m_ExpandedIDs: 00000000564a0000c84b0000964c0000b24d0000c64d0000f84d00002a4f00005c4f0000145100008c51000094510000b252000024560000b2560000747f0000767f0000787f00007a7f00007c7f00007e7f0000807f0000827f0000ffffff7f m_ExpandedIDs: 000000005231000096320000503400003635000092360000c63600002c38000068380000763a00001a3b0000243b0000ac40000052410000fc6a0000fe6a0000006b0000026b0000046b0000066b0000086b00000a6b000000ca9a3bffffff7f
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
...@@ -826,23 +825,23 @@ MonoBehaviour: ...@@ -826,23 +825,23 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0} scrollPos: {x: 0, y: 0}
m_SelectedIDs: m_SelectedIDs:
m_LastClickedID: 0 m_LastClickedID: 0
m_ExpandedIDs: 0000000026490000564a0000c84b0000964c0000b24d0000c64d0000f84d00002a4f00005c4f0000145100008c51000094510000b252000024560000b2560000747f0000767f0000787f00007a7f00007c7f00007e7f0000807f0000827f0000 m_ExpandedIDs: 000000005231000096320000f2330000503400003635000092360000c63600002c38000068380000763a00001a3b0000243b0000563b00004c3c0000943c0000ac40000052410000fc6a0000fe6a0000006b0000026b0000046b0000066b0000086b00000a6b0000
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name: New_Year_Dog
m_OriginalName: m_OriginalName: New_Year_Dog
m_EditFieldRect: m_EditFieldRect:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 0 y: 0
width: 0 width: 0
height: 0 height: 0
m_UserData: 0 m_UserData: 27424
m_IsWaitingForDelay: 0 m_IsWaitingForDelay: 0
m_IsRenaming: 0 m_IsRenaming: 0
m_OriginalEventType: 11 m_OriginalEventType: 0
m_IsRenamingFilename: 1 m_IsRenamingFilename: 1
m_ClientGUIView: {fileID: 0} m_ClientGUIView: {fileID: 10}
m_SearchString: m_SearchString:
m_CreateAssetUtility: m_CreateAssetUtility:
m_EndAction: {fileID: 0} m_EndAction: {fileID: 0}
...@@ -878,9 +877,9 @@ MonoBehaviour: ...@@ -878,9 +877,9 @@ MonoBehaviour:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_ResourceFile: m_ResourceFile:
m_NewAssetIndexInList: -1 m_NewAssetIndexInList: -1
m_ScrollPosition: {x: 0, y: 2520} m_ScrollPosition: {x: 0, y: 0}
m_GridSize: 91 m_GridSize: 91
m_DirectoriesAreaWidth: 125 m_DirectoriesAreaWidth: 209
--- !u!114 &23 --- !u!114 &23
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
...@@ -903,10 +902,10 @@ MonoBehaviour: ...@@ -903,10 +902,10 @@ MonoBehaviour:
m_DepthBufferBits: 0 m_DepthBufferBits: 0
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 1214 x: 2888
y: 100 y: 92
width: 314 width: 398
height: 694 height: 926
m_ScrollPosition: {x: 0, y: 0} m_ScrollPosition: {x: 0, y: 0}
m_InspectorMode: 0 m_InspectorMode: 0
m_PreviewResizer: m_PreviewResizer:
......
ar_game1/Library/LastSceneManagerSetup.txt
View file @ b15bdb27
sceneSetups: sceneSetups:
- path: Assets/HelloAR/Scenes/ARvolunteer.unity - path: Assets/HelloAR/Scenes/New_Year_Dog.unity
isLoaded: 1 isLoaded: 1
isActive: 1 isActive: 1
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