Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c

dev_chengFeng
ZhangBiao 2021-05-20 10:55:48 +08:00
commit e416d30107
6 changed files with 496 additions and 496 deletions

View File

@ -1,307 +1,307 @@
c_0029.png c_0029.png
size: 1024,1024 size: 2048,2048
format: RGBA8888 format: RGBA8888
filter: Linear,Linear filter: Linear,Linear
repeat: none repeat: none
bao_biyan_33 bao_biyan_33
rotate: false rotate: true
xy: 126, 2 xy: 1976, 1492
size: 47, 21 size: 109, 49
orig: 47, 21 orig: 109, 49
offset: 0, 0 offset: 0, 0
index: -1 index: -1
bao_erduo_35 bao_erduo_35
rotate: true rotate: false
xy: 194, 2 xy: 1703, 715
size: 31, 40 size: 72, 92
orig: 31, 40 orig: 72, 92
offset: 0, 0 offset: 0, 0
index: -1 index: -1
bao_erduo_36 bao_erduo_36
rotate: false rotate: true
xy: 325, 712 xy: 226, 2
size: 29, 42 size: 69, 99
orig: 29, 42 orig: 69, 99
offset: 0, 0 offset: 0, 0
index: -1 index: -1
bao_houtui_40 bao_houtui_40
rotate: false rotate: true
xy: 658, 489 xy: 800, 144
size: 86, 215 size: 200, 501
orig: 86, 215 orig: 200, 501
offset: 0, 0 offset: 0, 0
index: -1 index: -1
bao_houtui_46 bao_houtui_46
rotate: false rotate: true
xy: 2, 6 xy: 1653, 1760
size: 122, 166 size: 286, 386
orig: 122, 166 orig: 286, 386
offset: 0, 0 offset: 0, 0
index: -1 index: -1
bao_huzi_30 bao_huzi_30
rotate: false rotate: false
xy: 472, 499 xy: 990, 81
size: 29, 26 size: 68, 61
orig: 29, 26 orig: 68, 61
offset: 0, 0 offset: 0, 0
index: -1 index: -1
bao_meimao_31 bao_meimao_31
rotate: false rotate: true
xy: 650, 766 xy: 754, 870
size: 37, 13 size: 85, 29
orig: 37, 13 orig: 85, 29
offset: 0, 0 offset: 0, 0
index: -1 index: -1
bao_meimao_32 bao_meimao_32
rotate: false rotate: false
xy: 236, 4 xy: 842, 75
size: 29, 29 size: 67, 67
orig: 29, 29 orig: 67, 67
offset: 0, 0 offset: 0, 0
index: -1 index: -1
bao_qiantui_37 bao_qiantui_37
rotate: false rotate: false
xy: 569, 501 xy: 1405, 840
size: 87, 203 size: 202, 473
orig: 87, 203 orig: 202, 473
offset: 0, 0 offset: 0, 0
index: -1 index: -1
bao_qiantui_44 bao_qiantui_44
rotate: true rotate: true
xy: 194, 35 xy: 1689, 1286
size: 71, 110 size: 165, 258
orig: 71, 110 orig: 165, 258
offset: 0, 0 offset: 0, 0
index: -1 index: -1
bao_qiantui_45 bao_qiantui_45
rotate: false rotate: true
xy: 126, 25 xy: 1701, 1603
size: 66, 147 size: 155, 342
orig: 66, 147 orig: 155, 342
offset: 0, 0 offset: 0, 0
index: -1 index: -1
bao_shenti_39 bao_shenti_39
rotate: false rotate: false
xy: 325, 527 xy: 800, 543
size: 242, 177 size: 564, 412
orig: 242, 177 orig: 564, 412
offset: 0, 0 offset: 0, 0
index: -1 index: -1
bao_shenti_42 bao_shenti_42
rotate: false rotate: false
xy: 2, 485 xy: 2, 796
size: 321, 269 size: 750, 627
orig: 321, 269 orig: 750, 627
offset: 0, 0 offset: 0, 0
index: -1 index: -1
bao_shenti_48 bao_shenti_48
rotate: true rotate: true
xy: 733, 723 xy: 754, 1337
size: 37, 23 size: 86, 55
orig: 37, 23 orig: 86, 55
offset: 0, 0 offset: 0, 0
index: -1 index: -1
bao_tou_34 bao_tou_34
rotate: false rotate: true
xy: 194, 108 xy: 1366, 562
size: 118, 95 size: 276, 221
orig: 118, 95 orig: 276, 221
offset: 0, 0 offset: 0, 0
index: -1 index: -1
bao_weiba_43 bao_weiba_43
rotate: false rotate: true
xy: 191, 205 xy: 754, 957
size: 153, 278 size: 356, 649
orig: 153, 278 orig: 356, 649
offset: 0, 0 offset: 0, 0
index: -1 index: -1
biyan_17 biyan_17
rotate: false rotate: false
xy: 424, 398 xy: 754, 1315
size: 26, 8 size: 61, 20
orig: 26, 8 orig: 61, 20
offset: 0, 0 offset: 0, 0
index: -1 index: -1
erduo_15 erduo_15
rotate: false rotate: true
xy: 424, 408 xy: 911, 87
size: 23, 33 size: 55, 77
orig: 23, 33 orig: 55, 77
offset: 0, 0 offset: 0, 0
index: -1 index: -1
erduo_16 erduo_16
rotate: false rotate: false
xy: 994, 898 xy: 1060, 80
size: 28, 27 size: 64, 62
orig: 28, 27 orig: 64, 62
offset: 0, 0 offset: 0, 0
index: -1 index: -1
jianjia_1 jianjia_1
rotate: false rotate: false
xy: 650, 781 xy: 1609, 1081
size: 60, 87 size: 139, 203
orig: 60, 87 orig: 139, 203
offset: 0, 0 offset: 0, 0
index: -1 index: -1
jianjia_27 jianjia_27
rotate: true rotate: true
xy: 712, 762 xy: 1609, 809
size: 40, 57 size: 92, 132
orig: 40, 57 orig: 92, 132
offset: 0, 0 offset: 0, 0
index: -1 index: -1
jiao_21 jiao_21
rotate: true rotate: true
xy: 771, 755 xy: 612, 31
size: 47, 63 size: 109, 147
orig: 47, 63 orig: 109, 147
offset: 0, 0 offset: 0, 0
index: -1 index: -1
jiao_22 jiao_22
rotate: false rotate: true
xy: 409, 493 xy: 1589, 550
size: 61, 32 size: 142, 76
orig: 61, 32 orig: 142, 76
offset: 0, 0 offset: 0, 0
index: -1 index: -1
qunbai_13 qunbai_13
rotate: true rotate: true
xy: 357, 706 xy: 827, 1563
size: 54, 374 size: 127, 872
orig: 54, 374 orig: 127, 872
offset: 0, 0 offset: 0, 0
index: -1 index: -1
qunbai_20 qunbai_20
rotate: false rotate: false
xy: 2, 174 xy: 2, 73
size: 187, 309 size: 437, 721
orig: 187, 309 orig: 437, 721
offset: 0, 0 offset: 0, 0
index: -1 index: -1
qunbai_23 qunbai_23
rotate: true rotate: true
xy: 357, 762 xy: 827, 1315
size: 106, 291 size: 246, 680
orig: 106, 291 orig: 246, 680
offset: 0, 0 offset: 0, 0
index: -1 index: -1
shenti_19 shenti_19
rotate: true rotate: true
xy: 357, 870 xy: 827, 1692
size: 152, 353 size: 354, 824
orig: 152, 353 orig: 354, 824
offset: 0, 0 offset: 0, 0
index: -1 index: -1
tou_18 tou_18
rotate: true rotate: true
xy: 831, 825 xy: 800, 346
size: 42, 115 size: 195, 536
orig: 42, 115 orig: 195, 536
offset: 0, 0 offset: 0, 0
index: -1 index: -1
toufa_26 toufa_26
rotate: true rotate: true
xy: 712, 804 xy: 1701, 1453
size: 63, 117 size: 148, 273
orig: 63, 117 orig: 148, 273
offset: 0, 0 offset: 0, 0
index: -1 index: -1
wuqi_28 wuqi_28
rotate: true rotate: false
xy: 712, 869 xy: 441, 142
size: 153, 280 size: 357, 652
orig: 153, 280 orig: 357, 652
offset: 0, 0 offset: 0, 0
index: -1 index: -1
wuqi_3 wuqi_3
rotate: false rotate: false
xy: 2, 756 xy: 2, 1425
size: 353, 266 size: 823, 621
orig: 353, 266 orig: 823, 621
offset: 0, 0 offset: 0, 0
index: -1 index: -1
wuqi_4 wuqi_4
rotate: false rotate: false
xy: 346, 398 xy: 1509, 1360
size: 76, 86 size: 178, 201
orig: 76, 86 orig: 178, 201
offset: 0, 0 offset: 0, 0
index: -1 index: -1
yaodai_10 yaodai_10
rotate: false rotate: true
xy: 994, 927 xy: 2, 19
size: 22, 95 size: 52, 222
orig: 22, 95 orig: 52, 222
offset: 0, 0 offset: 0, 0
index: -1 index: -1
yaodai_11 yaodai_11
rotate: false rotate: true
xy: 391, 323 xy: 441, 22
size: 50, 73 size: 118, 169
orig: 50, 73 orig: 118, 169
offset: 0, 0 offset: 0, 0
index: -1 index: -1
yaodai_14 yaodai_14
rotate: false rotate: false
xy: 424, 443 xy: 1589, 694
size: 48, 48 size: 112, 113
orig: 48, 48 orig: 112, 113
offset: 0, 0 offset: 0, 0
index: -1 index: -1
yaodai_8 yaodai_8
rotate: false rotate: false
xy: 346, 313 xy: 1750, 1091
size: 43, 83 size: 100, 193
orig: 43, 83 orig: 100, 193
offset: 0, 0 offset: 0, 0
index: -1 index: -1
yaodai_9 yaodai_9
rotate: true rotate: false
xy: 831, 813 xy: 1366, 887
size: 10, 29 size: 23, 68
orig: 10, 29 orig: 23, 68
offset: 0, 0 offset: 0, 0
index: -1 index: -1
youshou_24 youshou_24
rotate: false rotate: false
xy: 314, 126 xy: 1303, 165
size: 25, 77 size: 57, 179
orig: 25, 77 orig: 57, 179
offset: 0, 0 offset: 0, 0
index: -1 index: -1
youshou_25 youshou_25
rotate: false rotate: true
xy: 948, 833 xy: 761, 55
size: 37, 34 size: 85, 79
orig: 37, 34 orig: 85, 79
offset: 0, 0 offset: 0, 0
index: -1 index: -1
zuoshou_2 zuoshou_2
rotate: false rotate: true
xy: 758, 728 xy: 612, 2
size: 11, 32 size: 27, 74
orig: 11, 32 orig: 27, 74
offset: 0, 0 offset: 0, 0
index: -1 index: -1
zuoshou_5 zuoshou_5
rotate: false rotate: false
xy: 346, 236 xy: 1609, 903
size: 51, 75 size: 119, 176
orig: 51, 75 orig: 119, 176
offset: 0, 0 offset: 0, 0
index: -1 index: -1
zuoshou_6 zuoshou_6
rotate: true rotate: true
xy: 346, 214 xy: 327, 25
size: 20, 41 size: 46, 95
orig: 20, 41 orig: 46, 95
offset: 0, 0 offset: 0, 0
index: -1 index: -1
zuoshou_7 zuoshou_7
rotate: true rotate: false
xy: 325, 486 xy: 1852, 1092
size: 39, 82 size: 90, 192
orig: 39, 82 orig: 90, 192
offset: 0, 0 offset: 0, 0
index: -1 index: -1

Binary file not shown.

Before

Width:  |  Height:  |  Size: 474 KiB

After

Width:  |  Height:  |  Size: 2.0 MiB

File diff suppressed because it is too large Load Diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 474 KiB

After

Width:  |  Height:  |  Size: 1.8 MiB