Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
55ed2bcc7e
@ -28,22 +28,22 @@
|
||||
"layout": [
|
||||
{"matrix": [0, 0], "x": 0, "y": 0},
|
||||
|
||||
{"matrix": [0, 1], "x": 2, "y": 0},
|
||||
{"matrix": [0, 2], "x": 3, "y": 0},
|
||||
{"matrix": [0, 3], "x": 4, "y": 0},
|
||||
{"matrix": [0, 4], "x": 5, "y": 0},
|
||||
{"matrix": [0, 1], "x": 1.25, "y": 0},
|
||||
{"matrix": [0, 2], "x": 2.25, "y": 0},
|
||||
{"matrix": [0, 3], "x": 3.25, "y": 0},
|
||||
{"matrix": [0, 4], "x": 4.25, "y": 0},
|
||||
|
||||
{"matrix": [0, 5], "x": 6.5, "y": 0},
|
||||
{"matrix": [0, 6], "x": 7.5, "y": 0},
|
||||
{"matrix": [0, 7], "x": 8.5, "y": 0},
|
||||
{"matrix": [0, 8], "x": 9.5, "y": 0},
|
||||
{"matrix": [0, 5], "x": 5.5, "y": 0},
|
||||
{"matrix": [0, 6], "x": 6.5, "y": 0},
|
||||
{"matrix": [0, 7], "x": 7.5, "y": 0},
|
||||
{"matrix": [0, 8], "x": 8.5, "y": 0},
|
||||
|
||||
{"matrix": [0, 9], "x": 11, "y": 0},
|
||||
{"matrix": [0, 10], "x": 12, "y": 0},
|
||||
{"matrix": [0, 11], "x": 13, "y": 0},
|
||||
{"matrix": [0, 12], "x": 14, "y": 0},
|
||||
{"matrix": [0, 9], "x": 9.75, "y": 0},
|
||||
{"matrix": [0, 10], "x": 10.75, "y": 0},
|
||||
{"matrix": [0, 11], "x": 11.75, "y": 0},
|
||||
{"matrix": [0, 12], "x": 12.75, "y": 0},
|
||||
|
||||
{"matrix": [0, 13], "x": 15.25, "y": 0},
|
||||
{"matrix": [0, 13], "x": 14, "y": 0},
|
||||
{"matrix": [0, 15], "x": 15.25, "y": 0},
|
||||
|
||||
{"matrix": [1, 0], "x": 0, "y": 1.25},
|
||||
@ -59,7 +59,7 @@
|
||||
{"matrix": [1, 10], "x": 10, "y": 1.25},
|
||||
{"matrix": [1, 11], "x": 11, "y": 1.25},
|
||||
{"matrix": [1, 12], "x": 12, "y": 1.25},
|
||||
{"matrix": [1, 13], "x": 14, "y": 1.25},
|
||||
{"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
|
||||
|
||||
{"matrix": [1, 15], "x": 15.25, "y": 1.25},
|
||||
|
||||
@ -92,11 +92,11 @@
|
||||
{"matrix": [3, 9], "x": 9.75, "y": 3.25},
|
||||
{"matrix": [3, 10], "x": 10.75, "y": 3.25},
|
||||
{"matrix": [3, 11], "x": 11.75, "y": 3.25},
|
||||
{"matrix": [3, 13], "x": 13.75, "y": 3.25, "w": 1.25},
|
||||
{"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
|
||||
|
||||
{"matrix": [3, 15], "x": 16.25, "y": 2.25},
|
||||
{"matrix": [3, 15], "x": 15.25, "y": 3.25},
|
||||
|
||||
{"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
|
||||
{"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
|
||||
{"matrix": [4, 1], "x": 2.25, "y": 4.25},
|
||||
{"matrix": [4, 2], "x": 3.25, "y": 4.25},
|
||||
{"matrix": [4, 3], "x": 4.25, "y": 4.25},
|
||||
@ -109,20 +109,21 @@
|
||||
{"matrix": [4, 10], "x": 11.25, "y": 4.25},
|
||||
{"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
|
||||
|
||||
{"matrix": [4, 14], "x": 16.25, "y": 4.25},
|
||||
{"matrix": [4, 15], "x": 16.25, "y": 4.25},
|
||||
{"matrix": [4, 14], "x": 14.125, "y": 4.375},
|
||||
|
||||
{"matrix": [4, 15], "x": 15.25, "y": 4.25},
|
||||
|
||||
{"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
|
||||
{"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
|
||||
{"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
|
||||
{"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
|
||||
{"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
|
||||
{"matrix": [5, 10], "x": 12.5, "y": 5.25, "w": 1.25},
|
||||
{"matrix": [5, 11], "x": 13.75, "y": 5.25, "w": 1.25},
|
||||
{"matrix": [5, 9], "x": 10, "y": 5.25},
|
||||
{"matrix": [5, 10], "x": 11, "y": 5.25},
|
||||
{"matrix": [5, 11], "x": 12, "y": 5.25},
|
||||
|
||||
{"matrix": [5, 13], "x": 15.25, "y": 5.25},
|
||||
{"matrix": [5, 14], "x": 16.25, "y": 5.25},
|
||||
{"matrix": [5, 15], "x": 17.25, "y": 5.25}
|
||||
{"matrix": [5, 13], "x": 13.125, "y": 5.375},
|
||||
{"matrix": [5, 14], "x": 14.125, "y": 5.375},
|
||||
{"matrix": [5, 15], "x": 15.125, "y": 5.375}
|
||||
]
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user