Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
53caeb7952
|
@ -25,9 +25,9 @@
|
|||
{"matrix":[0,11], "x":11.75, "y":0},
|
||||
{"matrix":[0,12], "x":12.75, "y":0},
|
||||
{"matrix":[0,13], "x":14, "y":0},
|
||||
{"matrix":[0,14], "x":15.75, "y":0},
|
||||
{"matrix":[0,15], "x":16.75, "y":0},
|
||||
{"matrix":[3,14], "x":17.75, "y":0},
|
||||
{"matrix":[0,14], "x":15.25, "y":0},
|
||||
{"matrix":[0,15], "x":16.25, "y":0},
|
||||
{"matrix":[3,14], "x":17.25, "y":0},
|
||||
|
||||
{"matrix":[1, 0], "x":0, "y":1.25},
|
||||
{"matrix":[1, 1], "x":1, "y":1.25},
|
||||
|
@ -43,9 +43,9 @@
|
|||
{"matrix":[1,11], "x":11, "y":1.25},
|
||||
{"matrix":[1,12], "x":12, "y":1.25},
|
||||
{"matrix":[1,13], "x":13, "y":1.25, "w":2},
|
||||
{"matrix":[1,14], "x":15.75, "y":1.25},
|
||||
{"matrix":[1,15], "x":16.75, "y":1.25},
|
||||
{"matrix":[3,15], "x":17.75, "y":1.25},
|
||||
{"matrix":[1,14], "x":15.25, "y":1.25},
|
||||
{"matrix":[1,15], "x":16.25, "y":1.25},
|
||||
{"matrix":[3,15], "x":17.25, "y":1.25},
|
||||
|
||||
{"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
|
||||
{"matrix":[2, 1], "x":1.5, "y":2.25},
|
||||
|
@ -61,9 +61,9 @@
|
|||
{"matrix":[2,11], "x":11.5, "y":2.25},
|
||||
{"matrix":[2,12], "x":12.5, "y":2.25},
|
||||
{"matrix":[2,13], "x":13.5, "y":2.25, "w":1.5},
|
||||
{"matrix":[2,14], "x":15.75, "y":2.25},
|
||||
{"matrix":[2,15], "x":16.75, "y":2.25},
|
||||
{"matrix":[3,12], "x":17.75, "y":2.25},
|
||||
{"matrix":[2,14], "x":15.25, "y":2.25},
|
||||
{"matrix":[2,15], "x":16.25, "y":2.25},
|
||||
{"matrix":[3,12], "x":17.25, "y":2.25},
|
||||
|
||||
{"matrix":[3, 0], "x":0, "y":3.25, "w":1.75},
|
||||
{"matrix":[3, 1], "x":1.75, "y":3.25},
|
||||
|
@ -91,7 +91,7 @@
|
|||
{"matrix":[4,10], "x":10.25, "y":4.25},
|
||||
{"matrix":[4,11], "x":11.25, "y":4.25},
|
||||
{"matrix":[4,13], "x":12.25, "y":4.25, "w":2.75},
|
||||
{"matrix":[4,15], "x":16.75, "y":4.25},
|
||||
{"matrix":[4,15], "x":16.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},
|
||||
|
@ -101,9 +101,9 @@
|
|||
{"matrix":[5,11], "x":11.25, "y":5.25, "w":1.25},
|
||||
{"matrix":[5,12], "x":12.5, "y":5.25, "w":1.25},
|
||||
{"matrix":[5,13], "x":13.75, "y":5.25, "w":1.25},
|
||||
{"matrix":[5,14], "x":15.75, "y":5.25},
|
||||
{"matrix":[5,15], "x":16.75, "y":5.25},
|
||||
{"matrix":[4,14], "x":17.75, "y":5.25}
|
||||
{"matrix":[5,14], "x":15.25, "y":5.25},
|
||||
{"matrix":[5,15], "x":16.25, "y":5.25},
|
||||
{"matrix":[4,14], "x":17.25, "y":5.25}
|
||||
]
|
||||
}
|
||||
}
|
||||
|
|
|
@ -25,9 +25,9 @@
|
|||
{"matrix":[0,11], "x":11.75, "y":0},
|
||||
{"matrix":[0,12], "x":12.75, "y":0},
|
||||
{"matrix":[0,13], "x":14, "y":0},
|
||||
{"matrix":[0,14], "x":15.75, "y":0},
|
||||
{"matrix":[0,15], "x":16.75, "y":0},
|
||||
{"matrix":[3,14], "x":17.75, "y":0},
|
||||
{"matrix":[0,14], "x":15.25, "y":0},
|
||||
{"matrix":[0,15], "x":16.25, "y":0},
|
||||
{"matrix":[3,14], "x":17.25, "y":0},
|
||||
|
||||
{"matrix":[1, 0], "x":0, "y":1.25},
|
||||
{"matrix":[1, 1], "x":1, "y":1.25},
|
||||
|
|
Loading…
Reference in New Issue