Gremlinsoft
/
KitchenChaos
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge

master
Sascha 2023-02-16 09:12:42 +07:00
parent 8c4ac1d043 6f7e15fc9b
commit bcfc07688a
10 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Library/ScriptAssemblies/.fuse_hidden0000c80d0000006c
View File

Binary file not shown.

BIN
Library/ScriptAssemblies/.fuse_hidden0000c8100000006d
View File

Binary file not shown.

4
Library/StateCache/MainStageHierarchy/4d/4d2a36d9faf65734f0bbefb3ee623532.json
Unescape Escape View File

@ -2,6 +2,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
{"m_ScrollY":0.0,"m_ExpandedSceneGameObjectInstanceIDs":[],"m_LastClickedInstanceID":0,"m_OpenSceneGUIDs":[]}
=======
{"m_ScrollY":0.0,"m_ExpandedSceneGameObjectInstanceIDs":[-1514],"m_LastClickedInstanceID":0,"m_OpenSceneGUIDs":["99c9720ab356a0642a771bea13969a05"]}
@ -26,3 +27,6 @@
=======
{"m_ScrollY":0.0,"m_ExpandedSceneGameObjectInstanceIDs":[],"m_LastClickedInstanceID":0,"m_OpenSceneGUIDs":[]}
>>>>>>> 5ab89b887 (successfull build with vulkan on linux)
=======
{"m_ScrollY":0.0,"m_ExpandedSceneGameObjectInstanceIDs":[],"m_LastClickedInstanceID":0,"m_OpenSceneGUIDs":[]}
>>>>>>> origin/Polish

6
Logs/shadercompiler-AssetImportWorker0-0.log
Unescape Escape View File

@ -0,0 +1,6 @@
Base path: '/home/sascha/Unity/Hub/Editor/2023.1.0a26/Editor/Data', plugins path '/home/sascha/Unity/Hub/Editor/2023.1.0a26/Editor/Data/PlaybackEngines'
Cmd: initializeCompiler
Unhandled exception: Protocol error - failed to read magic number (error -2147483644, transferred 0/4)
Quitting shader compiler process

0
Temp/.fuse_hidden0000730f00000077
Unescape Escape View File

0
Temp/.fuse_hidden0000b61400000078
Unescape Escape View File

0
Temp/.fuse_hidden0000b63700000079
Unescape Escape View File

0
Temp/.fuse_hidden0000b64e0000007a
Unescape Escape View File

0
Temp/.fuse_hidden0000c6370000007b
Unescape Escape View File

24
UserSettings/Layouts/default-2023.dwlt
Unescape Escape View File

@ -121,6 +121,7 @@ MonoBehaviour:
m_MaxSize: {x: 32384, y: 16192}
vertical: 0
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
controlID: 250
=======
@ -129,6 +130,9 @@ MonoBehaviour:
=======
controlID: 250
>>>>>>> 3f6d86405 (successfull build with vulkan on linux)
=======
controlID: 18
>>>>>>> origin/Polish
--- !u!114 &6
MonoBehaviour:
m_ObjectHideFlags: 52
@ -208,6 +212,7 @@ MonoBehaviour:
m_MaxSize: {x: 16192, y: 8096}
vertical: 0
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
controlID: 220
=======
@ -216,6 +221,9 @@ MonoBehaviour:
=======
controlID: 220
>>>>>>> 3f6d86405 (successfull build with vulkan on linux)
=======
controlID: 73
>>>>>>> origin/Polish
--- !u!114 &9
MonoBehaviour:
m_ObjectHideFlags: 52
@ -885,6 +893,7 @@ MonoBehaviour:
m_Target: {x: -0.33396086, y: 0.0053889933, z: -0.0019092448, w: -0.94256943}
speed: 2
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
m_Value: {x: -0.33396086, y: 0.0053889933, z: -0.0019092448, w: -0.94256943}
=======
@ -893,6 +902,9 @@ MonoBehaviour:
=======
m_Value: {x: -0.33396086, y: 0.0053889933, z: -0.0019092448, w: -0.94256943}
>>>>>>> 3f6d86405 (successfull build with vulkan on linux)
=======
m_Value: {x: -0.33396092, y: 0.0053889942, z: -0.0019092452, w: -0.9425696}
>>>>>>> origin/Polish
m_Size:
m_Target: 10
speed: 2
@ -1073,6 +1085,7 @@ MonoBehaviour:
m_SelectedIDs:
m_LastClickedID: 0
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
m_ExpandedIDs: 32e4ffffc0e4ffff20eeffff30eeffff56efffff00fbffff
=======
@ -1081,6 +1094,9 @@ MonoBehaviour:
=======
m_ExpandedIDs: 32e4ffffc0e4ffff20eeffff30eeffff56efffff00fbffff
>>>>>>> 3f6d86405 (successfull build with vulkan on linux)
=======
m_ExpandedIDs: e2e1ffff70e2ffffd0ebffffe0ebffff06edffff16faffff
>>>>>>> origin/Polish
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@ -1429,6 +1445,7 @@ MonoBehaviour:
m_SelectedIDs: 3e430000
m_LastClickedID: 17214
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
m_ExpandedIDs: 00000000da5d000074670000ec6e0000ee6e0000f06e0000f26e0000f46e0000f66e0000f86e0000fa6e0000fc6e0000fe6e0000006f0000026f0000046f0000066f0000086f00000a6f00000c6f00000e6f0000106f0000126f0000146f0000166f0000
=======
@ -1437,6 +1454,9 @@ MonoBehaviour:
=======
m_ExpandedIDs: 00000000da5d000074670000ec6e0000ee6e0000f06e0000f26e0000f46e0000f66e0000f86e0000fa6e0000fc6e0000fe6e0000006f0000026f0000046f0000066f0000086f00000a6f00000c6f00000e6f0000106f0000126f0000146f0000166f0000
>>>>>>> 3f6d86405 (successfull build with vulkan on linux)
=======
m_ExpandedIDs: 00000000be5d0000006800004c6f00004e6f0000506f0000526f0000546f0000566f0000586f00005a6f00005c6f00005e6f0000606f0000626f0000646f0000666f0000686f00006a6f00006c6f00006e6f0000706f0000726f0000746f0000766f0000
>>>>>>> origin/Polish
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@ -1465,6 +1485,7 @@ MonoBehaviour:
m_SelectedIDs:
m_LastClickedID: 0
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
m_ExpandedIDs: ffffffff00000000da5d000074670000ec6e0000ee6e0000f06e0000f26e0000f46e0000f66e0000f86e0000fa6e0000fc6e0000fe6e0000006f0000026f0000046f0000066f0000086f00000a6f00000c6f00000e6f0000106f0000126f0000146f0000166f0000
=======
@ -1473,6 +1494,9 @@ MonoBehaviour:
=======
m_ExpandedIDs: ffffffff00000000da5d000074670000ec6e0000ee6e0000f06e0000f26e0000f46e0000f66e0000f86e0000fa6e0000fc6e0000fe6e0000006f0000026f0000046f0000066f0000086f00000a6f00000c6f00000e6f0000106f0000126f0000146f0000166f0000
>>>>>>> 3f6d86405 (successfull build with vulkan on linux)
=======
m_ExpandedIDs: ffffffff00000000be5d0000006800004c6f00004e6f0000506f0000526f0000546f0000566f0000586f00005a6f00005c6f00005e6f0000606f0000626f0000646f0000666f0000686f00006a6f00006c6f00006e6f0000706f0000726f0000746f0000766f0000
>>>>>>> origin/Polish
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name: