Compare commits
15 Commits
b34c37a4b7
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
57540add70
|
|||
|
2be5efbe70
|
|||
|
3ee3ab51f4
|
|||
|
1c849e292e
|
|||
|
ffa1917b22
|
|||
|
e1396627d9
|
|||
|
2fbc6586df
|
|||
|
602311b8c5
|
|||
|
0d1c936541
|
|||
|
6581511e1a
|
|||
|
c562913778
|
|||
|
95148d2548
|
|||
|
44605f42cd
|
|||
|
fdc50c77a5
|
|||
|
15ebf70681
|
|
Before Width: | Height: | Size: 7.1 KiB After Width: | Height: | Size: 6.2 KiB |
|
After Width: | Height: | Size: 5.0 KiB |
|
After Width: | Height: | Size: 6.1 KiB |
|
After Width: | Height: | Size: 5.3 KiB |
|
After Width: | Height: | Size: 5.7 KiB |
|
After Width: | Height: | Size: 6.6 KiB |
|
After Width: | Height: | Size: 4.6 KiB |
|
After Width: | Height: | Size: 5.5 KiB |
|
After Width: | Height: | Size: 6.2 KiB |
|
After Width: | Height: | Size: 5.5 KiB |
|
After Width: | Height: | Size: 6.5 KiB |
|
After Width: | Height: | Size: 6.0 KiB |
|
Before Width: | Height: | Size: 6.8 KiB After Width: | Height: | Size: 5.8 KiB |
|
After Width: | Height: | Size: 4.9 KiB |
|
Before Width: | Height: | Size: 9.1 KiB After Width: | Height: | Size: 6.2 KiB |
|
Before Width: | Height: | Size: 9.6 KiB After Width: | Height: | Size: 6.5 KiB |
|
Before Width: | Height: | Size: 9.1 KiB After Width: | Height: | Size: 7.1 KiB |
|
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 7.0 KiB |
|
Before Width: | Height: | Size: 7.2 KiB After Width: | Height: | Size: 8.0 KiB |
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 8.1 KiB |
|
Before Width: | Height: | Size: 7.2 KiB After Width: | Height: | Size: 6.4 KiB |
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 11 KiB |
|
Before Width: | Height: | Size: 5.1 KiB After Width: | Height: | Size: 5.2 KiB |
|
Before Width: | Height: | Size: 8.5 KiB After Width: | Height: | Size: 7.1 KiB |
|
Before Width: | Height: | Size: 6.1 KiB After Width: | Height: | Size: 5.8 KiB |
|
Before Width: | Height: | Size: 7.0 KiB After Width: | Height: | Size: 7.2 KiB |
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 12 KiB |
@@ -283,7 +283,7 @@
|
||||
"7": "07 - Overpass G",
|
||||
"8": "08 - Overpass H",
|
||||
"9": "09 - Overpass I",
|
||||
"10": "10 - Overpass J (JP Server Only)"
|
||||
"10": "10 - Overpass J"
|
||||
},
|
||||
"Count": {
|
||||
"name": "Sweep X times",
|
||||
@@ -308,7 +308,7 @@
|
||||
"7": "07 - Abandoned Train G",
|
||||
"8": "08 - Abandoned Train H",
|
||||
"9": "09 - Abandoned Train I",
|
||||
"10": "10 - Abandoned Train J (JP Server Only)"
|
||||
"10": "10 - Abandoned Train J"
|
||||
},
|
||||
"Count": {
|
||||
"name": "Sweep X times",
|
||||
@@ -333,7 +333,7 @@
|
||||
"7": "07 - Besieged Classroom G",
|
||||
"8": "08 - Besieged Classroom H",
|
||||
"9": "09 - Besieged Classroom I",
|
||||
"10": "10 - Besieged Classroom J (JP Server Only)"
|
||||
"10": "10 - Besieged Classroom J"
|
||||
},
|
||||
"Count": {
|
||||
"name": "Sweep X times",
|
||||
|
||||
@@ -283,7 +283,7 @@
|
||||
"7": "07 - 高架公路 G",
|
||||
"8": "08 - 高架公路 H",
|
||||
"9": "09 - 高架公路 I",
|
||||
"10": "10 - 高架公路 J(仅日服)"
|
||||
"10": "10 - 高架公路 J"
|
||||
},
|
||||
"Count": {
|
||||
"name": "扫荡次数",
|
||||
@@ -308,7 +308,7 @@
|
||||
"7": "07 - 被遗弃的列车 G",
|
||||
"8": "08 - 被遗弃的列车 H",
|
||||
"9": "09 - 被遗弃的列车 I",
|
||||
"10": "10 - 被遗弃的列车 J(仅日服)"
|
||||
"10": "10 - 被遗弃的列车 J"
|
||||
},
|
||||
"Count": {
|
||||
"name": "扫荡次数",
|
||||
@@ -333,7 +333,7 @@
|
||||
"7": "07 - 被袭击的教室 G",
|
||||
"8": "08 - 被袭击的教室 H",
|
||||
"9": "09 - 被袭击的教室 I",
|
||||
"10": "10 - 被袭击的教室 J(仅日服)"
|
||||
"10": "10 - 被袭击的教室 J"
|
||||
},
|
||||
"Count": {
|
||||
"name": "扫荡次数",
|
||||
|
||||
@@ -134,6 +134,13 @@ GACHA_CHECK = ButtonWrapper(
|
||||
)
|
||||
HOME = ButtonWrapper(
|
||||
name='HOME',
|
||||
jp=Button(
|
||||
file='./assets/jp/base/page/HOME.png',
|
||||
area=(1224, 10, 1250, 35),
|
||||
search=(1204, 0, 1270, 55),
|
||||
color=(162, 176, 202),
|
||||
button=(1224, 10, 1250, 35),
|
||||
),
|
||||
share=Button(
|
||||
file='./assets/share/base/page/HOME.png',
|
||||
area=(1218, 8, 1253, 41),
|
||||
@@ -171,6 +178,13 @@ MAIL_CHECK = ButtonWrapper(
|
||||
)
|
||||
MAIN_GO_TO_CAFE = ButtonWrapper(
|
||||
name='MAIN_GO_TO_CAFE',
|
||||
jp=Button(
|
||||
file='./assets/jp/base/page/MAIN_GO_TO_CAFE.png',
|
||||
area=(86, 632, 113, 670),
|
||||
search=(66, 612, 133, 690),
|
||||
color=(174, 222, 246),
|
||||
button=(86, 632, 113, 670),
|
||||
),
|
||||
share=Button(
|
||||
file='./assets/share/base/page/MAIN_GO_TO_CAFE.png',
|
||||
area=(81, 638, 102, 668),
|
||||
@@ -181,6 +195,13 @@ MAIN_GO_TO_CAFE = ButtonWrapper(
|
||||
)
|
||||
MAIN_GO_TO_CIRCLE = ButtonWrapper(
|
||||
name='MAIN_GO_TO_CIRCLE',
|
||||
jp=Button(
|
||||
file='./assets/jp/base/page/MAIN_GO_TO_CIRCLE.png',
|
||||
area=(531, 631, 561, 659),
|
||||
search=(511, 611, 581, 679),
|
||||
color=(182, 230, 254),
|
||||
button=(531, 631, 561, 659),
|
||||
),
|
||||
share=Button(
|
||||
file='./assets/share/base/page/MAIN_GO_TO_CIRCLE.png',
|
||||
area=(542, 630, 581, 665),
|
||||
@@ -191,6 +212,13 @@ MAIN_GO_TO_CIRCLE = ButtonWrapper(
|
||||
)
|
||||
MAIN_GO_TO_CRAFTING = ButtonWrapper(
|
||||
name='MAIN_GO_TO_CRAFTING',
|
||||
jp=Button(
|
||||
file='./assets/jp/base/page/MAIN_GO_TO_CRAFTING.png',
|
||||
area=(645, 627, 667, 662),
|
||||
search=(625, 607, 687, 682),
|
||||
color=(206, 235, 251),
|
||||
button=(645, 627, 667, 662),
|
||||
),
|
||||
share=Button(
|
||||
file='./assets/share/base/page/MAIN_GO_TO_CRAFTING.png',
|
||||
area=(665, 622, 693, 664),
|
||||
@@ -201,6 +229,13 @@ MAIN_GO_TO_CRAFTING = ButtonWrapper(
|
||||
)
|
||||
MAIN_GO_TO_GACHA = ButtonWrapper(
|
||||
name='MAIN_GO_TO_GACHA',
|
||||
jp=Button(
|
||||
file='./assets/jp/base/page/MAIN_GO_TO_GACHA.png',
|
||||
area=(871, 626, 893, 671),
|
||||
search=(851, 606, 913, 691),
|
||||
color=(172, 223, 242),
|
||||
button=(871, 626, 893, 671),
|
||||
),
|
||||
share=Button(
|
||||
file='./assets/share/base/page/MAIN_GO_TO_GACHA.png',
|
||||
area=(900, 623, 924, 670),
|
||||
@@ -211,6 +246,13 @@ MAIN_GO_TO_GACHA = ButtonWrapper(
|
||||
)
|
||||
MAIN_GO_TO_MAIL = ButtonWrapper(
|
||||
name='MAIN_GO_TO_MAIL',
|
||||
jp=Button(
|
||||
file='./assets/jp/base/page/MAIN_GO_TO_MAIL.png',
|
||||
area=(1144, 27, 1165, 44),
|
||||
search=(1124, 7, 1185, 64),
|
||||
color=(102, 125, 168),
|
||||
button=(1144, 27, 1165, 44),
|
||||
),
|
||||
share=Button(
|
||||
file='./assets/share/base/page/MAIN_GO_TO_MAIL.png',
|
||||
area=(1130, 29, 1156, 49),
|
||||
@@ -221,26 +263,47 @@ MAIN_GO_TO_MAIL = ButtonWrapper(
|
||||
)
|
||||
MAIN_GO_TO_MOMOTALK = ButtonWrapper(
|
||||
name='MAIN_GO_TO_MOMOTALK',
|
||||
jp=Button(
|
||||
file='./assets/jp/base/page/MAIN_GO_TO_MOMOTALK.png',
|
||||
area=(125, 118, 146, 151),
|
||||
search=(105, 98, 166, 171),
|
||||
color=(244, 200, 211),
|
||||
button=(125, 118, 146, 151),
|
||||
),
|
||||
share=Button(
|
||||
file='./assets/share/base/page/MAIN_GO_TO_MOMOTALK.png',
|
||||
area=(154, 134, 177, 158),
|
||||
search=(134, 114, 197, 178),
|
||||
color=(255, 219, 227),
|
||||
button=(154, 134, 177, 158),
|
||||
area=(138, 130, 159, 161),
|
||||
search=(118, 110, 179, 181),
|
||||
color=(251, 215, 224),
|
||||
button=(138, 130, 159, 161),
|
||||
),
|
||||
)
|
||||
MAIN_GO_TO_PURCHASE = ButtonWrapper(
|
||||
name='MAIN_GO_TO_PURCHASE',
|
||||
jp=Button(
|
||||
file='./assets/jp/base/page/MAIN_GO_TO_PURCHASE.png',
|
||||
area=(122, 209, 148, 243),
|
||||
search=(102, 189, 168, 263),
|
||||
color=(190, 222, 246),
|
||||
button=(122, 209, 148, 243),
|
||||
),
|
||||
share=Button(
|
||||
file='./assets/share/base/page/MAIN_GO_TO_PURCHASE.png',
|
||||
area=(148, 204, 183, 253),
|
||||
search=(128, 184, 203, 273),
|
||||
color=(172, 214, 239),
|
||||
button=(148, 204, 183, 253),
|
||||
area=(136, 210, 165, 250),
|
||||
search=(116, 190, 185, 270),
|
||||
color=(175, 216, 240),
|
||||
button=(136, 210, 165, 250),
|
||||
),
|
||||
)
|
||||
MAIN_GO_TO_SCHEDULE = ButtonWrapper(
|
||||
name='MAIN_GO_TO_SCHEDULE',
|
||||
jp=Button(
|
||||
file='./assets/jp/base/page/MAIN_GO_TO_SCHEDULE.png',
|
||||
area=(198, 634, 217, 667),
|
||||
search=(178, 614, 237, 687),
|
||||
color=(176, 222, 243),
|
||||
button=(198, 634, 217, 667),
|
||||
),
|
||||
share=Button(
|
||||
file='./assets/share/base/page/MAIN_GO_TO_SCHEDULE.png',
|
||||
area=(194, 638, 216, 672),
|
||||
@@ -251,6 +314,13 @@ MAIN_GO_TO_SCHEDULE = ButtonWrapper(
|
||||
)
|
||||
MAIN_GO_TO_SHOP = ButtonWrapper(
|
||||
name='MAIN_GO_TO_SHOP',
|
||||
jp=Button(
|
||||
file='./assets/jp/base/page/MAIN_GO_TO_SHOP.png',
|
||||
area=(752, 628, 786, 665),
|
||||
search=(732, 608, 806, 685),
|
||||
color=(168, 221, 248),
|
||||
button=(752, 628, 786, 665),
|
||||
),
|
||||
share=Button(
|
||||
file='./assets/share/base/page/MAIN_GO_TO_SHOP.png',
|
||||
area=(773, 630, 816, 667),
|
||||
@@ -261,29 +331,36 @@ MAIN_GO_TO_SHOP = ButtonWrapper(
|
||||
)
|
||||
MAIN_GO_TO_TASK = ButtonWrapper(
|
||||
name='MAIN_GO_TO_TASK',
|
||||
jp=Button(
|
||||
file='./assets/jp/base/page/MAIN_GO_TO_TASK.png',
|
||||
area=(30, 214, 55, 248),
|
||||
search=(10, 194, 75, 268),
|
||||
color=(186, 218, 245),
|
||||
button=(30, 214, 55, 248),
|
||||
),
|
||||
share=Button(
|
||||
file='./assets/share/base/page/MAIN_GO_TO_TASK.png',
|
||||
area=(52, 220, 78, 248),
|
||||
search=(32, 200, 98, 268),
|
||||
color=(226, 207, 203),
|
||||
button=(52, 220, 78, 248),
|
||||
area=(47, 219, 70, 246),
|
||||
search=(27, 199, 90, 266),
|
||||
color=(212, 204, 208),
|
||||
button=(47, 219, 70, 246),
|
||||
),
|
||||
)
|
||||
MAIN_GO_TO_WORK = ButtonWrapper(
|
||||
name='MAIN_GO_TO_WORK',
|
||||
jp=Button(
|
||||
file='./assets/jp/base/page/MAIN_GO_TO_WORK.png',
|
||||
area=(1167, 605, 1241, 632),
|
||||
search=(1147, 585, 1261, 652),
|
||||
color=(135, 149, 169),
|
||||
button=(1167, 605, 1241, 632),
|
||||
area=(1167, 668, 1222, 688),
|
||||
search=(1147, 648, 1242, 708),
|
||||
color=(141, 156, 174),
|
||||
button=(1167, 668, 1222, 688),
|
||||
),
|
||||
en=Button(
|
||||
file='./assets/en/base/page/MAIN_GO_TO_WORK.png',
|
||||
area=(1127, 605, 1250, 637),
|
||||
search=(1107, 585, 1270, 657),
|
||||
color=(90, 112, 141),
|
||||
button=(1127, 605, 1250, 637),
|
||||
area=(1143, 591, 1241, 613),
|
||||
search=(1123, 571, 1261, 633),
|
||||
color=(110, 129, 154),
|
||||
button=(1143, 591, 1241, 613),
|
||||
),
|
||||
)
|
||||
MISSION_CHECK = ButtonWrapper(
|
||||
@@ -305,6 +382,13 @@ MISSION_CHECK = ButtonWrapper(
|
||||
)
|
||||
MOMOTALK_CHECK = ButtonWrapper(
|
||||
name='MOMOTALK_CHECK',
|
||||
jp=Button(
|
||||
file='./assets/jp/base/page/MOMOTALK_CHECK.png',
|
||||
area=(144, 107, 169, 130),
|
||||
search=(124, 87, 189, 150),
|
||||
color=(253, 211, 219),
|
||||
button=(144, 107, 169, 130),
|
||||
),
|
||||
share=Button(
|
||||
file='./assets/share/base/page/MOMOTALK_CHECK.png',
|
||||
area=(144, 107, 169, 130),
|
||||
@@ -446,10 +530,10 @@ WORK_GO_TO_BOUNTY = ButtonWrapper(
|
||||
name='WORK_GO_TO_BOUNTY',
|
||||
jp=Button(
|
||||
file='./assets/jp/base/page/WORK_GO_TO_BOUNTY.png',
|
||||
area=(667, 383, 764, 409),
|
||||
search=(647, 363, 784, 429),
|
||||
color=(171, 187, 212),
|
||||
button=(667, 383, 764, 409),
|
||||
area=(679, 401, 741, 417),
|
||||
search=(659, 381, 761, 437),
|
||||
color=(155, 164, 186),
|
||||
button=(679, 401, 741, 417),
|
||||
),
|
||||
en=Button(
|
||||
file='./assets/en/base/page/WORK_GO_TO_BOUNTY.png',
|
||||
@@ -463,10 +547,10 @@ WORK_GO_TO_COMMISSIONS = ButtonWrapper(
|
||||
name='WORK_GO_TO_COMMISSIONS',
|
||||
jp=Button(
|
||||
file='./assets/jp/base/page/WORK_GO_TO_COMMISSIONS.png',
|
||||
area=(653, 475, 749, 501),
|
||||
search=(633, 455, 769, 521),
|
||||
color=(171, 185, 208),
|
||||
button=(653, 475, 749, 501),
|
||||
area=(661, 504, 724, 521),
|
||||
search=(641, 484, 744, 541),
|
||||
color=(155, 163, 184),
|
||||
button=(661, 504, 724, 521),
|
||||
),
|
||||
en=Button(
|
||||
file='./assets/en/base/page/WORK_GO_TO_COMMISSIONS.png',
|
||||
@@ -480,10 +564,10 @@ WORK_GO_TO_MISSION = ButtonWrapper(
|
||||
name='WORK_GO_TO_MISSION',
|
||||
jp=Button(
|
||||
file='./assets/jp/base/page/WORK_GO_TO_MISSION.png',
|
||||
area=(722, 155, 807, 199),
|
||||
search=(702, 135, 827, 219),
|
||||
color=(173, 188, 211),
|
||||
button=(722, 155, 807, 199),
|
||||
area=(710, 220, 769, 249),
|
||||
search=(690, 200, 789, 269),
|
||||
color=(137, 153, 180),
|
||||
button=(710, 220, 769, 249),
|
||||
),
|
||||
en=Button(
|
||||
file='./assets/en/base/page/WORK_GO_TO_MISSION.png',
|
||||
@@ -497,10 +581,10 @@ WORK_GO_TO_SCHOOL_EXCHANGE = ButtonWrapper(
|
||||
name='WORK_GO_TO_SCHOOL_EXCHANGE',
|
||||
jp=Button(
|
||||
file='./assets/jp/base/page/WORK_GO_TO_SCHOOL_EXCHANGE.png',
|
||||
area=(636, 566, 753, 592),
|
||||
search=(616, 546, 773, 612),
|
||||
color=(176, 187, 207),
|
||||
button=(636, 566, 753, 592),
|
||||
area=(642, 606, 721, 624),
|
||||
search=(622, 586, 741, 644),
|
||||
color=(167, 174, 192),
|
||||
button=(642, 606, 721, 624),
|
||||
),
|
||||
en=Button(
|
||||
file='./assets/en/base/page/WORK_GO_TO_SCHOOL_EXCHANGE.png',
|
||||
@@ -514,10 +598,10 @@ WORK_GO_TO_STORY = ButtonWrapper(
|
||||
name='WORK_GO_TO_STORY',
|
||||
jp=Button(
|
||||
file='./assets/jp/base/page/WORK_GO_TO_STORY.png',
|
||||
area=(998, 155, 1078, 199),
|
||||
search=(978, 135, 1098, 219),
|
||||
color=(215, 221, 232),
|
||||
button=(998, 155, 1078, 199),
|
||||
area=(993, 220, 1081, 250),
|
||||
search=(973, 200, 1101, 270),
|
||||
color=(209, 214, 224),
|
||||
button=(993, 220, 1081, 250),
|
||||
),
|
||||
en=Button(
|
||||
file='./assets/en/base/page/WORK_GO_TO_STORY.png',
|
||||
@@ -531,10 +615,10 @@ WORK_GO_TO_TACTICAL_CHALLENGE = ButtonWrapper(
|
||||
name='WORK_GO_TO_TACTICAL_CHALLENGE',
|
||||
jp=Button(
|
||||
file='./assets/jp/base/page/WORK_GO_TO_TACTICAL_CHALLENGE.png',
|
||||
area=(801, 565, 920, 593),
|
||||
search=(781, 545, 940, 613),
|
||||
color=(172, 186, 209),
|
||||
button=(801, 565, 920, 593),
|
||||
area=(821, 600, 911, 620),
|
||||
search=(801, 580, 931, 640),
|
||||
color=(156, 164, 185),
|
||||
button=(821, 600, 911, 620),
|
||||
),
|
||||
en=Button(
|
||||
file='./assets/en/base/page/WORK_GO_TO_TACTICAL_CHALLENGE.png',
|
||||
|
||||
@@ -7,33 +7,33 @@ OCR_AP = ButtonWrapper(
|
||||
name='OCR_AP',
|
||||
jp=Button(
|
||||
file='./assets/jp/item/data/OCR_AP.png',
|
||||
area=(512, 13, 597, 32),
|
||||
search=(492, 0, 617, 52),
|
||||
color=(199, 204, 208),
|
||||
button=(512, 13, 597, 32),
|
||||
),
|
||||
share=Button(
|
||||
file='./assets/share/item/data/OCR_AP.png',
|
||||
area=(535, 13, 660, 36),
|
||||
search=(515, 0, 680, 56),
|
||||
color=(207, 215, 220),
|
||||
button=(535, 13, 660, 36),
|
||||
),
|
||||
share=Button(
|
||||
file='./assets/share/item/data/OCR_AP.png',
|
||||
area=(560, 11, 667, 37),
|
||||
search=(540, 0, 687, 57),
|
||||
color=(211, 216, 219),
|
||||
button=(560, 11, 667, 37),
|
||||
),
|
||||
)
|
||||
OCR_DATA = ButtonWrapper(
|
||||
name='OCR_DATA',
|
||||
jp=Button(
|
||||
file='./assets/jp/item/data/OCR_DATA.png',
|
||||
area=(716, 14, 1058, 33),
|
||||
search=(696, 0, 1078, 53),
|
||||
color=(211, 219, 224),
|
||||
button=(716, 14, 1058, 33),
|
||||
),
|
||||
share=Button(
|
||||
file='./assets/share/item/data/OCR_DATA.png',
|
||||
area=(745, 11, 1069, 39),
|
||||
search=(725, 0, 1089, 59),
|
||||
color=(216, 223, 227),
|
||||
button=(745, 11, 1069, 39),
|
||||
),
|
||||
share=Button(
|
||||
file='./assets/share/item/data/OCR_DATA.png',
|
||||
area=(768, 12, 1072, 37),
|
||||
search=(748, 0, 1092, 57),
|
||||
color=(212, 220, 224),
|
||||
button=(768, 12, 1072, 37),
|
||||
),
|
||||
)
|
||||
|
||||