Merge remote-tracking branch 'origin/master' into develop
commit
40a073b140
|
@ -77,10 +77,10 @@
|
|||
{"matrix": [1, 10], "x": 10, "y": 0},
|
||||
{"matrix": [1, 11], "x": 11, "y": 0},
|
||||
{"matrix": [1, 12], "x": 12, "y": 0},
|
||||
{"matrix": [1, 13], "w": 2, "x": 13, "y": 0},
|
||||
{"matrix": [4, 15], "x": 16, "y": 0},
|
||||
{"matrix": [1, 13], "x": 13, "y": 0, "w": 2},
|
||||
{"matrix": [4, 15], "x": 15.25, "y": 0},
|
||||
|
||||
{"matrix": [2, 0], "w": 1.5, "x": 0, "y": 1},
|
||||
{"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
|
||||
{"matrix": [2, 1], "x": 1.5, "y": 1},
|
||||
{"matrix": [2, 2], "x": 2.5, "y": 1},
|
||||
{"matrix": [2, 3], "x": 3.5, "y": 1},
|
||||
|
@ -93,10 +93,10 @@
|
|||
{"matrix": [2, 10], "x": 10.5, "y": 1},
|
||||
{"matrix": [2, 11], "x": 11.5, "y": 1},
|
||||
{"matrix": [2, 12], "x": 12.5, "y": 1},
|
||||
{"matrix": [2, 13], "w": 1.5, "x": 13.5, "y": 1},
|
||||
{"matrix": [3, 14], "x": 16, "y": 1},
|
||||
{"matrix": [2, 13], "x": 13.5, "y": 1, "w": 1.5},
|
||||
{"matrix": [3, 14], "x": 15.25, "y": 1.25},
|
||||
|
||||
{"matrix": [3, 0], "w": 1.75, "x": 0, "y": 2},
|
||||
{"matrix": [3, 0], "x": 0, "y": 2, "w": 1.75},
|
||||
{"matrix": [3, 1], "x": 1.75, "y": 2},
|
||||
{"matrix": [3, 2], "x": 2.75, "y": 2},
|
||||
{"matrix": [3, 3], "x": 3.75, "y": 2},
|
||||
|
@ -108,10 +108,10 @@
|
|||
{"matrix": [3, 9], "x": 9.75, "y": 2},
|
||||
{"matrix": [3, 10], "x": 10.75, "y": 2},
|
||||
{"matrix": [3, 11], "x": 11.75, "y": 2},
|
||||
{"matrix": [3, 13], "w": 2.25, "x": 12.75, "y": 2},
|
||||
{"matrix": [3, 15], "x": 16, "y": 2},
|
||||
{"matrix": [3, 13], "x": 12.75, "y": 2, "w": 2.25},
|
||||
{"matrix": [3, 15], "x": 15.25, "y": 2.25},
|
||||
|
||||
{"matrix": [4, 0], "w": 2.25, "x": 0, "y": 3},
|
||||
{"matrix": [4, 0], "x": 0, "y": 3, "w": 2.25},
|
||||
{"matrix": [4, 2], "x": 2.25, "y": 3},
|
||||
{"matrix": [4, 3], "x": 3.25, "y": 3},
|
||||
{"matrix": [4, 4], "x": 4.25, "y": 3},
|
||||
|
@ -122,19 +122,19 @@
|
|||
{"matrix": [4, 9], "x": 9.25, "y": 3},
|
||||
{"matrix": [4, 10], "x": 10.25, "y": 3},
|
||||
{"matrix": [4, 11], "x": 11.25, "y": 3},
|
||||
{"matrix": [4, 13], "w": 1.75, "x": 12.25, "y": 3},
|
||||
{"matrix": [4, 14], "x": 15.25, "y": 3},
|
||||
{"matrix": [4, 13], "x": 12.25, "y": 3, "w": 1.75},
|
||||
{"matrix": [4, 14], "x": 14.25, "y": 3.25},
|
||||
|
||||
{"matrix": [5, 0], "w": 1.25, "x": 0, "y": 4},
|
||||
{"matrix": [5, 1], "w": 1.25, "x": 1.25, "y": 4},
|
||||
{"matrix": [5, 2], "w": 1.25, "x": 2.5, "y": 4},
|
||||
{"matrix": [5, 6], "w": 6.25, "x": 3.75, "y": 4},
|
||||
{"matrix": [5, 0], "x": 0, "y": 4, "w": 1.25},
|
||||
{"matrix": [5, 1], "x": 1.25, "y": 4, "w": 1.25},
|
||||
{"matrix": [5, 2], "x": 2.5, "y": 4, "w": 1.25},
|
||||
{"matrix": [5, 6], "x": 3.75, "y": 4, "w": 6.25},
|
||||
{"matrix": [5, 9], "x": 10, "y": 4},
|
||||
{"matrix": [5, 10], "x": 11, "y": 4},
|
||||
{"matrix": [5, 12], "x": 12, "y": 4},
|
||||
{"matrix": [5, 13], "x": 14.25, "y": 4},
|
||||
{"matrix": [5, 14], "x": 15.25, "y": 4},
|
||||
{"matrix": [5, 15], "x": 16.25, "y": 4}
|
||||
{"matrix": [5, 13], "x": 13.25, "y": 4.25},
|
||||
{"matrix": [5, 14], "x": 14.25, "y": 4.25},
|
||||
{"matrix": [5, 15], "x": 15.25, "y": 4.25}
|
||||
]
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue