Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
7d89dfe2dc
@ -5,46 +5,47 @@
|
||||
"layouts": {
|
||||
"LAYOUT_split_3x5_3": {
|
||||
"layout": [
|
||||
{"x":0, "y":1},
|
||||
{"x":1, "y":0.63},
|
||||
{"x":2, "y":0.5},
|
||||
{"x":3, "y":0.63},
|
||||
{"x":4, "y":0.75},
|
||||
{"x":7, "y":0.75},
|
||||
{"x":8, "y":0.63},
|
||||
{"x":9, "y":0.5},
|
||||
{"x":10, "y":0.63},
|
||||
{"x":11, "y":1},
|
||||
{"x":0, "y":0.5},
|
||||
{"x":1, "y":0.13},
|
||||
{"x":2, "y":0.0},
|
||||
{"x":3, "y":0.13},
|
||||
{"x":4, "y":0.25},
|
||||
{"x":7, "y":0.25},
|
||||
{"x":8, "y":0.13},
|
||||
{"x":9, "y":0.0},
|
||||
{"x":10, "y":0.13},
|
||||
{"x":11, "y":0.5},
|
||||
|
||||
{"x":0, "y":2},
|
||||
{"x":1, "y":1.63},
|
||||
{"x":2, "y":1.5},
|
||||
{"x":3, "y":1.63},
|
||||
{"x":4, "y":1.75},
|
||||
{"x":7, "y":1.75},
|
||||
{"x":8, "y":1.63},
|
||||
{"x":9, "y":1.5},
|
||||
{"x":10, "y":1.63},
|
||||
{"x":11, "y":2},
|
||||
{"x":0, "y":1.5},
|
||||
{"x":1, "y":1.13},
|
||||
{"x":2, "y":1.0},
|
||||
{"x":3, "y":1.13},
|
||||
{"x":4, "y":1.25},
|
||||
{"x":7, "y":1.25},
|
||||
{"x":8, "y":1.13},
|
||||
{"x":9, "y":1.0},
|
||||
{"x":10, "y":1.13},
|
||||
{"x":11, "y":1.5},
|
||||
|
||||
{"x":0, "y":3},
|
||||
{"x":1, "y":2.63},
|
||||
{"x":2, "y":2.5},
|
||||
{"x":3, "y":2.63},
|
||||
{"x":4, "y":2.75},
|
||||
{"x":7, "y":2.75},
|
||||
{"x":8, "y":2.63},
|
||||
{"x":9, "y":2.5},
|
||||
{"x":10, "y":2.63},
|
||||
{"x":11, "y":3},
|
||||
{"x":0, "y":2.5},
|
||||
{"x":1, "y":2.13},
|
||||
{"x":2, "y":2.0},
|
||||
{"x":3, "y":2.13},
|
||||
{"x":4, "y":2.25},
|
||||
{"x":7, "y":2.25},
|
||||
{"x":8, "y":2.13},
|
||||
{"x":9, "y":2.0},
|
||||
{"x":10, "y":2.13},
|
||||
{"x":11, "y":2.5},
|
||||
|
||||
{"x":2.5, "y":3.66},
|
||||
{"x":3.5, "y":4.0},
|
||||
{"x":4.5, "y":4.25},
|
||||
{"x":2.5, "y":3.16},
|
||||
{"x":3.5, "y":3.5},
|
||||
{"x":4.5, "y":3.75},
|
||||
|
||||
{"x":7.5, "y":4.0},
|
||||
{"x":6.5, "y":4.25},
|
||||
{"x":8.5, "y":3.66}]
|
||||
{"x":6.5, "y":3.75},
|
||||
{"x":7.5, "y":3.5},
|
||||
{"x":8.5, "y":3.16}
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user