Skip to content
Snippets Groups Projects
Commit d82a7f30 authored by Stefan Richter's avatar Stefan Richter
Browse files

bypass pointer bug at StageRestart with Resetting Bypass in ToolModeSelector/Start()

parent 9ee6fb51
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 88 additions and 50 deletions
Assets/Stages/ValidationSets.meta → Assets/StreamingAssets/StreamToDataPath_withHandler/Stages/ValidationSets.meta
+ 1
− 1
View file @ d82a7f30
fileFormatVersion: 2
guid: 63b411c1287cd9e4d891bf68fb264216
guid: 8d41222b6b5b06f4983088c0bdf1b4c1
folderAsset: yes
DefaultImporter:
externalObjects: {}
......
Assets/StreamingAssets/StreamToPersistentDataPath.meta 0 → 100644
+ 8
− 0
View file @ d82a7f30
fileFormatVersion: 2
guid: 3520941a910c21e4ea26b432d9cfb6ff
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/StreamingAssets/StreamToPersistentDataPath/Config.meta 0 → 100644
+ 8
− 0
View file @ d82a7f30
fileFormatVersion: 2
guid: f96ea8acaa559a74492a29de4098ca6d
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/StreamingAssets/StreamToPersistentDataPath/Config/Network.JSON.meta 0 → 100644
+ 7
− 0
View file @ d82a7f30
fileFormatVersion: 2
guid: 3bc646e1ef5710c4983df86be28c8881
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/StreamingAssets/StreamToPersistentDataPath/cookie_persistentDataPath.txt.meta 0 → 100644
+ 7
− 0
View file @ d82a7f30
fileFormatVersion: 2
guid: 387038d9b729e4240bb2a1b25db9262d
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/StreamingAssets/StreamToPersistentDataPath/scrolls.json.meta 0 → 100644
+ 7
− 0
View file @ d82a7f30
fileFormatVersion: 2
guid: 3fd389b6980cdc4468de6666706c2ba9
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/cookie_dataPath.txt 0 → 100644
+ 1
− 0
View file @ d82a7f30
1
\ No newline at end of file
Assets/Stages/TechDemo A.JSON.meta → Assets/cookie_dataPath.txt.meta
+ 1
− 1
View file @ d82a7f30
fileFormatVersion: 2
guid: 218d2a96656c0084bbe511b0b0338d01
guid: cf70b3394e7e5f34c9bf1f66e039c9fe
TextScriptImporter:
externalObjects: {}
userData:
......
UserSettings/Layouts/default-2021.dwlt
+ 48
− 48
View file @ d82a7f30
......@@ -67,8 +67,8 @@ MonoBehaviour:
y: 0
width: 640
height: 661
m_MinSize: {x: 640, y: 580}
m_MaxSize: {x: 4000, y: 4000}
m_MinSize: {x: 640, y: 601}
m_MaxSize: {x: 4000, y: 4021}
m_ActualView: {fileID: 15}
m_Panes:
- {fileID: 15}
......@@ -97,7 +97,7 @@ MonoBehaviour:
m_MinSize: {x: 640, y: 601}
m_MaxSize: {x: 4000, y: 4021}
vertical: 0
controlID: 15
controlID: 52
--- !u!114 &5
MonoBehaviour:
m_ObjectHideFlags: 52
......@@ -122,7 +122,7 @@ MonoBehaviour:
m_MinSize: {x: 300, y: 200}
m_MaxSize: {x: 24288, y: 16192}
vertical: 0
controlID: 136
controlID: 223
--- !u!114 &6
MonoBehaviour:
m_ObjectHideFlags: 52
......@@ -138,9 +138,9 @@ MonoBehaviour:
m_Children: []
m_Position:
serializedVersion: 2
x: 1640
x: 1484
y: 0
width: 280
width: 436
height: 987
m_MinSize: {x: 275, y: 50}
m_MaxSize: {x: 4000, y: 4000}
......@@ -166,8 +166,8 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
width: 623
height: 342
width: 561
height: 588
m_MinSize: {x: 201, y: 221}
m_MaxSize: {x: 4001, y: 4021}
m_ActualView: {fileID: 18}
......@@ -191,11 +191,11 @@ MonoBehaviour:
m_Position:
serializedVersion: 2
x: 0
y: 342
width: 1640
height: 645
m_MinSize: {x: 101, y: 121}
m_MaxSize: {x: 4001, y: 4021}
y: 588
width: 1484
height: 399
m_MinSize: {x: 100, y: 100}
m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 21}
m_Panes:
- {fileID: 16}
......@@ -292,12 +292,12 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
width: 1640
width: 1484
height: 987
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 16192, y: 16192}
vertical: 1
controlID: 203
controlID: 166
--- !u!114 &13
MonoBehaviour:
m_ObjectHideFlags: 52
......@@ -317,12 +317,12 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
width: 1640
height: 342
width: 1484
height: 588
m_MinSize: {x: 200, y: 100}
m_MaxSize: {x: 16192, y: 8096}
vertical: 0
controlID: 204
controlID: 167
--- !u!114 &14
MonoBehaviour:
m_ObjectHideFlags: 52
......@@ -338,12 +338,12 @@ MonoBehaviour:
m_Children: []
m_Position:
serializedVersion: 2
x: 623
x: 561
y: 0
width: 1017
height: 342
m_MinSize: {x: 202, y: 221}
m_MaxSize: {x: 4002, y: 4021}
width: 923
height: 588
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 20}
m_Panes:
- {fileID: 19}
......@@ -457,7 +457,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 573}
m_SelectedIDs: 4c720100
m_LastClickedID: 94796
m_ExpandedIDs: 00000000a67d0000a87d0000aa7d0000ac7d0000ae7d0000b07d0000b27d0000b47d0000b67d0000b87d0000ba7d0000bc7d0000be7d0000c07d0000c27d0000c47d0000c67d0000c87d0000ca7d0000cc7d0000ce7d0000d07d0000d27d0000
m_ExpandedIDs: 00000000cc7e0000ce7e0000d07e0000d27e0000d47e0000d67e0000d87e0000da7e0000dc7e0000de7e0000e07e0000e27e0000e47e0000e67e0000e87e0000ea7e0000ec7e0000ee7e0000f07e0000f27e0000f47e0000f67e0000f87e0000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
......@@ -485,7 +485,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: 00000000a67d0000a87d0000aa7d0000ac7d0000ae7d0000b07d0000b27d0000b47d0000b67d0000b87d0000ba7d0000bc7d0000be7d0000c07d0000c27d0000c47d0000c67d0000c87d0000ca7d0000cc7d0000ce7d0000d07d0000d27d0000
m_ExpandedIDs: 00000000cc7e0000ce7e0000d07e0000d27e0000d47e0000d67e0000d87e0000da7e0000dc7e0000de7e0000e07e0000e27e0000e47e0000e67e0000e87e0000ea7e0000ec7e0000ee7e0000f07e0000f27e0000f47e0000f67e0000f87e0000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
......@@ -562,9 +562,9 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: -280
x: -436
y: 73
width: 279
width: 435
height: 966
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
......@@ -606,8 +606,8 @@ MonoBehaviour:
serializedVersion: 2
x: -1920
y: 73
width: 622
height: 321
width: 560
height: 567
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
......@@ -615,9 +615,9 @@ MonoBehaviour:
m_SceneHierarchy:
m_TreeViewState:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_SelectedIDs: f8d8fbff
m_LastClickedID: 0
m_ExpandedIDs: 02fbffff
m_ExpandedIDs: c8c9fbff02cdfbff08cdfbff0ad9fbff14d9fbff26d9fbff2cd9fbff34d9fbff7edafbff88dafbff8edafbff92dafbff040cfcff8cdafcff90dafcff96dafcfff4dbfcff34dffcffaaecfcffb4ecfcffbaecfcffbeecfcffd00cfdff301efdfff429fffffa29ffff8437fffff668ffff6473ffff6a73fffff480ffff66b2ffff9afaffffccfaffffa6630000d8980100
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
......@@ -990,10 +990,10 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: -1297
x: -1359
y: 73
width: 1015
height: 321
width: 921
height: 567
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
......@@ -1028,7 +1028,7 @@ MonoBehaviour:
m_VAllowExceedBaseRangeMin: 1
m_VAllowExceedBaseRangeMax: 1
m_ScaleWithWindow: 0
m_HSlider: 0
m_HSlider: 1
m_VSlider: 0
m_IgnoreScrollWheelUntilClicked: 0
m_EnableMouseInput: 1
......@@ -1040,23 +1040,23 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 21
width: 1015
height: 300
m_Scale: {x: 0.2777778, y: 0.2777778}
m_Translation: {x: 507.5, y: 150}
width: 921
height: 546
m_Scale: {x: 0.47968754, y: 0.47968754}
m_Translation: {x: 460.5, y: 273}
m_MarginLeft: 0
m_MarginRight: 0
m_MarginTop: 0
m_MarginBottom: 0
m_LastShownAreaInsideMargins:
serializedVersion: 2
x: -1826.9999
y: -540
width: 3653.9998
height: 1080
x: -959.99994
y: -569.1205
width: 1919.9999
height: 1138.241
m_MinimalGUI: 1
m_defaultScale: 0.2777778
m_LastWindowPixelSize: {x: 1015, y: 321}
m_defaultScale: 0.4796875
m_LastWindowPixelSize: {x: 921, y: 567}
m_ClearInEditMode: 1
m_NoCameraWarning: 1
m_LowResolutionForAspectRatios: 01000000000000000000
......@@ -1084,9 +1084,9 @@ MonoBehaviour:
m_Pos:
serializedVersion: 2
x: -1920
y: 415
width: 1639
height: 624
y: 661
width: 1483
height: 378
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment