5 Commits
46 changed files with 308 additions and 137 deletions
Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.2 KiB

After

Width:  |  Height:  |  Size: 6.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.9 KiB

After

Width:  |  Height:  |  Size: 5.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.2 KiB

After

Width:  |  Height:  |  Size: 6.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 8.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 6.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 8.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 6.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.1 KiB

After

Width:  |  Height:  |  Size: 5.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.0 KiB

After

Width:  |  Height:  |  Size: 7.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.6 KiB

After

Width:  |  Height:  |  Size: 5.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.6 KiB

After

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 6.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.2 KiB

After

Width:  |  Height:  |  Size: 4.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.5 KiB

After

Width:  |  Height:  |  Size: 5.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.6 KiB

After

Width:  |  Height:  |  Size: 5.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.0 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.2 KiB

After

Width:  |  Height:  |  Size: 5.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.1 KiB

After

Width:  |  Height:  |  Size: 6.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.7 KiB

After

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.1 KiB

After

Width:  |  Height:  |  Size: 6.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.8 KiB

After

Width:  |  Height:  |  Size: 5.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.2 KiB

After

Width:  |  Height:  |  Size: 6.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 11 KiB

+8
View File
@@ -91,6 +91,14 @@
"Schoolhouse": { "Schoolhouse": {
"Stage": 0, "Stage": 0,
"Count": 2 "Count": 2
},
"Road": {
"Stage": 0,
"Count": 0
},
"Mansion": {
"Stage": 0,
"Count": 0
} }
}, },
"Scrimmage": { "Scrimmage": {
+46
View File
@@ -397,6 +397,52 @@
"type": "input", "type": "input",
"value": 2 "value": 2
} }
},
"Road": {
"Stage": {
"type": "select",
"value": 0,
"option": [
0,
1,
2,
3,
4,
5,
6,
7,
8,
9,
10
]
},
"Count": {
"type": "input",
"value": 0
}
},
"Mansion": {
"Stage": {
"type": "select",
"value": 0,
"option": [
0,
1,
2,
3,
4,
5,
6,
7,
8,
9,
10
]
},
"Count": {
"type": "input",
"value": 0
}
} }
}, },
"Scrimmage": { "Scrimmage": {
+10
View File
@@ -113,6 +113,16 @@ Schoolhouse:
value: 0 value: 0
option: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ] option: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ]
Count: 2 Count: 2
Road:
Stage:
value: 0
option: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ]
Count: 0
Mansion:
Stage:
value: 0
option: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ]
Count: 0
Scrimmage: Scrimmage:
OnError: OnError:
+2
View File
@@ -36,6 +36,8 @@ Daily:
- Highway - Highway
- DesertRailroad - DesertRailroad
- Schoolhouse - Schoolhouse
- Road
- Mansion
Scrimmage: Scrimmage:
- Scheduler - Scheduler
- Scrimmage - Scrimmage
+8
View File
@@ -67,6 +67,14 @@ class GeneratedConfig:
Schoolhouse_Stage = 0 # 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 Schoolhouse_Stage = 0 # 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10
Schoolhouse_Count = 2 Schoolhouse_Count = 2
# Group `Road`
Road_Stage = 0 # 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10
Road_Count = 0
# Group `Mansion`
Mansion_Stage = 0 # 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10
Mansion_Count = 0
# Group `Scrimmage` # Group `Scrimmage`
Scrimmage_OnError = 'skip' # stop, skip Scrimmage_OnError = 'skip' # stop, skip
+50
View File
@@ -340,6 +340,56 @@
"help": "Sweep the selected stage for X times" "help": "Sweep the selected stage for X times"
} }
}, },
"Road": {
"_info": {
"name": "Road",
"help": ""
},
"Stage": {
"name": "Select Stage",
"help": "",
"0": "Auto select",
"1": "01 - Burning Road A",
"2": "02 - Burning Road B",
"3": "03 - Burning Road C",
"4": "04 - Burning Road D",
"5": "05 - Burning Road E",
"6": "06 - Burning Road F",
"7": "07 - Burning Road G",
"8": "08 - Burning Road H",
"9": "09 - Burning Road I",
"10": "10 - Burning Road J"
},
"Count": {
"name": "Sweep X times",
"help": "Sweep the selected stage for X times"
}
},
"Mansion": {
"_info": {
"name": "Mansion",
"help": ""
},
"Stage": {
"name": "Select Stage",
"help": "",
"0": "Auto select",
"1": "01 - Historic Mansion A",
"2": "02 - Historic Mansion B",
"3": "03 - Historic Mansion C",
"4": "04 - Historic Mansion D",
"5": "05 - Historic Mansion E",
"6": "06 - Historic Mansion F",
"7": "07 - Historic Mansion G",
"8": "08 - Historic Mansion H",
"9": "09 - Historic Mansion I",
"10": "10 - Historic Mansion J"
},
"Count": {
"name": "Sweep X times",
"help": "Sweep the selected stage for X times"
}
},
"Scrimmage": { "Scrimmage": {
"_info": { "_info": {
"name": "Scrimmage Settings", "name": "Scrimmage Settings",
+50
View File
@@ -340,6 +340,56 @@
"help": "扫荡所选择关卡 X 次" "help": "扫荡所选择关卡 X 次"
} }
}, },
"Road": {
"_info": {
"name": "道路",
"help": ""
},
"Stage": {
"name": "选择关卡",
"help": "",
"0": "自动选择",
"1": "01 - 燃烧道路 A",
"2": "02 - 燃烧道路 B",
"3": "03 - 燃烧道路 C",
"4": "04 - 燃烧道路 D",
"5": "05 - 燃烧道路 E",
"6": "06 - 燃烧道路 F",
"7": "07 - 燃烧道路 G",
"8": "08 - 燃烧道路 H",
"9": "09 - 燃烧道路 I",
"10": "10 - 燃烧道路 J"
},
"Count": {
"name": "扫荡次数",
"help": "扫荡所选择关卡 X 次"
}
},
"Mansion": {
"_info": {
"name": "宅邸",
"help": ""
},
"Stage": {
"name": "选择关卡",
"help": "",
"0": "自动选择",
"1": "01 - 古老宅邸 A",
"2": "02 - 古老宅邸 B",
"3": "03 - 古老宅邸 C",
"4": "04 - 古老宅邸 D",
"5": "05 - 古老宅邸 E",
"6": "06 - 古老宅邸 F",
"7": "07 - 古老宅邸 G",
"8": "08 - 古老宅邸 H",
"9": "09 - 古老宅邸 I",
"10": "10 - 古老宅邸 J"
},
"Count": {
"name": "扫荡次数",
"help": "扫荡所选择关卡 X 次"
}
},
"Scrimmage": { "Scrimmage": {
"_info": { "_info": {
"name": "学院交流会设置", "name": "学院交流会设置",
+72 -107
View File
@@ -134,20 +134,13 @@ GACHA_CHECK = ButtonWrapper(
) )
HOME = ButtonWrapper( HOME = ButtonWrapper(
name='HOME', name='HOME',
jp=Button( share=Button(
file='./assets/jp/base/page/HOME.png', file='./assets/share/base/page/HOME.png',
area=(1224, 10, 1250, 35), area=(1224, 10, 1250, 35),
search=(1204, 0, 1270, 55), search=(1204, 0, 1270, 55),
color=(162, 176, 202), color=(162, 176, 202),
button=(1224, 10, 1250, 35), button=(1224, 10, 1250, 35),
), ),
share=Button(
file='./assets/share/base/page/HOME.png',
area=(1218, 8, 1253, 41),
search=(1198, 0, 1273, 61),
color=(168, 182, 205),
button=(1218, 8, 1253, 41),
),
) )
LOADING_CHECK = ButtonWrapper( LOADING_CHECK = ButtonWrapper(
name='LOADING_CHECK', name='LOADING_CHECK',
@@ -187,10 +180,10 @@ MAIN_GO_TO_CAFE = ButtonWrapper(
), ),
share=Button( share=Button(
file='./assets/share/base/page/MAIN_GO_TO_CAFE.png', file='./assets/share/base/page/MAIN_GO_TO_CAFE.png',
area=(81, 638, 102, 668), area=(85, 637, 113, 674),
search=(61, 618, 122, 688), search=(65, 617, 133, 694),
color=(156, 209, 233), color=(178, 224, 246),
button=(81, 638, 102, 668), button=(85, 637, 113, 674),
), ),
) )
MAIN_GO_TO_CIRCLE = ButtonWrapper( MAIN_GO_TO_CIRCLE = ButtonWrapper(
@@ -204,10 +197,10 @@ MAIN_GO_TO_CIRCLE = ButtonWrapper(
), ),
share=Button( share=Button(
file='./assets/share/base/page/MAIN_GO_TO_CIRCLE.png', file='./assets/share/base/page/MAIN_GO_TO_CIRCLE.png',
area=(542, 630, 581, 665), area=(533, 636, 558, 661),
search=(522, 610, 601, 685), search=(513, 616, 578, 681),
color=(163, 225, 242), color=(162, 224, 255),
button=(542, 630, 581, 665), button=(533, 636, 558, 661),
), ),
) )
MAIN_GO_TO_CRAFTING = ButtonWrapper( MAIN_GO_TO_CRAFTING = ButtonWrapper(
@@ -221,10 +214,10 @@ MAIN_GO_TO_CRAFTING = ButtonWrapper(
), ),
share=Button( share=Button(
file='./assets/share/base/page/MAIN_GO_TO_CRAFTING.png', file='./assets/share/base/page/MAIN_GO_TO_CRAFTING.png',
area=(665, 622, 693, 664), area=(644, 636, 666, 665),
search=(645, 602, 713, 684), search=(624, 616, 686, 685),
color=(192, 229, 241), color=(205, 234, 251),
button=(665, 622, 693, 664), button=(644, 636, 666, 665),
), ),
) )
MAIN_GO_TO_GACHA = ButtonWrapper( MAIN_GO_TO_GACHA = ButtonWrapper(
@@ -238,62 +231,41 @@ MAIN_GO_TO_GACHA = ButtonWrapper(
), ),
share=Button( share=Button(
file='./assets/share/base/page/MAIN_GO_TO_GACHA.png', file='./assets/share/base/page/MAIN_GO_TO_GACHA.png',
area=(900, 623, 924, 670), area=(871, 655, 896, 674),
search=(880, 603, 944, 690), search=(851, 635, 916, 694),
color=(157, 219, 241), color=(139, 221, 249),
button=(900, 623, 924, 670), button=(871, 655, 896, 674),
), ),
) )
MAIN_GO_TO_MAIL = ButtonWrapper( MAIN_GO_TO_MAIL = ButtonWrapper(
name='MAIN_GO_TO_MAIL', name='MAIN_GO_TO_MAIL',
jp=Button( share=Button(
file='./assets/jp/base/page/MAIN_GO_TO_MAIL.png', file='./assets/share/base/page/MAIN_GO_TO_MAIL.png',
area=(1144, 27, 1165, 44), area=(1144, 27, 1165, 44),
search=(1124, 7, 1185, 64), search=(1124, 7, 1185, 64),
color=(102, 125, 168), color=(102, 125, 168),
button=(1144, 27, 1165, 44), button=(1144, 27, 1165, 44),
), ),
share=Button(
file='./assets/share/base/page/MAIN_GO_TO_MAIL.png',
area=(1130, 29, 1156, 49),
search=(1110, 9, 1176, 69),
color=(94, 121, 166),
button=(1130, 29, 1156, 49),
),
) )
MAIN_GO_TO_MOMOTALK = ButtonWrapper( MAIN_GO_TO_MOMOTALK = ButtonWrapper(
name='MAIN_GO_TO_MOMOTALK', name='MAIN_GO_TO_MOMOTALK',
jp=Button( share=Button(
file='./assets/jp/base/page/MAIN_GO_TO_MOMOTALK.png', file='./assets/share/base/page/MAIN_GO_TO_MOMOTALK.png',
area=(125, 118, 146, 151), area=(125, 118, 146, 151),
search=(105, 98, 166, 171), search=(105, 98, 166, 171),
color=(244, 200, 211), color=(244, 200, 211),
button=(125, 118, 146, 151), button=(125, 118, 146, 151),
), ),
share=Button(
file='./assets/share/base/page/MAIN_GO_TO_MOMOTALK.png',
area=(138, 130, 159, 161),
search=(118, 110, 179, 181),
color=(251, 215, 224),
button=(138, 130, 159, 161),
),
) )
MAIN_GO_TO_PURCHASE = ButtonWrapper( MAIN_GO_TO_PURCHASE = ButtonWrapper(
name='MAIN_GO_TO_PURCHASE', name='MAIN_GO_TO_PURCHASE',
jp=Button( share=Button(
file='./assets/jp/base/page/MAIN_GO_TO_PURCHASE.png', file='./assets/share/base/page/MAIN_GO_TO_PURCHASE.png',
area=(122, 209, 148, 243), area=(122, 209, 148, 243),
search=(102, 189, 168, 263), search=(102, 189, 168, 263),
color=(190, 222, 246), color=(190, 222, 246),
button=(122, 209, 148, 243), button=(122, 209, 148, 243),
), ),
share=Button(
file='./assets/share/base/page/MAIN_GO_TO_PURCHASE.png',
area=(136, 210, 165, 250),
search=(116, 190, 185, 270),
color=(175, 216, 240),
button=(136, 210, 165, 250),
),
) )
MAIN_GO_TO_SCHEDULE = ButtonWrapper( MAIN_GO_TO_SCHEDULE = ButtonWrapper(
name='MAIN_GO_TO_SCHEDULE', name='MAIN_GO_TO_SCHEDULE',
@@ -306,10 +278,10 @@ MAIN_GO_TO_SCHEDULE = ButtonWrapper(
), ),
share=Button( share=Button(
file='./assets/share/base/page/MAIN_GO_TO_SCHEDULE.png', file='./assets/share/base/page/MAIN_GO_TO_SCHEDULE.png',
area=(194, 638, 216, 672), area=(196, 650, 225, 670),
search=(174, 618, 236, 692), search=(176, 630, 245, 690),
color=(149, 194, 222), color=(196, 228, 242),
button=(194, 638, 216, 672), button=(196, 650, 225, 670),
), ),
) )
MAIN_GO_TO_SHOP = ButtonWrapper( MAIN_GO_TO_SHOP = ButtonWrapper(
@@ -323,10 +295,10 @@ MAIN_GO_TO_SHOP = ButtonWrapper(
), ),
share=Button( share=Button(
file='./assets/share/base/page/MAIN_GO_TO_SHOP.png', file='./assets/share/base/page/MAIN_GO_TO_SHOP.png',
area=(773, 630, 816, 667), area=(750, 633, 788, 666),
search=(753, 610, 836, 687), search=(730, 613, 808, 686),
color=(146, 208, 235), color=(168, 220, 246),
button=(773, 630, 816, 667), button=(750, 633, 788, 666),
), ),
) )
MAIN_GO_TO_TASK = ButtonWrapper( MAIN_GO_TO_TASK = ButtonWrapper(
@@ -340,10 +312,10 @@ MAIN_GO_TO_TASK = ButtonWrapper(
), ),
share=Button( share=Button(
file='./assets/share/base/page/MAIN_GO_TO_TASK.png', file='./assets/share/base/page/MAIN_GO_TO_TASK.png',
area=(47, 219, 70, 246), area=(37, 216, 60, 247),
search=(27, 199, 90, 266), search=(17, 196, 80, 267),
color=(212, 204, 208), color=(195, 225, 248),
button=(47, 219, 70, 246), button=(37, 216, 60, 247),
), ),
) )
MAIN_GO_TO_WORK = ButtonWrapper( MAIN_GO_TO_WORK = ButtonWrapper(
@@ -357,10 +329,10 @@ MAIN_GO_TO_WORK = ButtonWrapper(
), ),
en=Button( en=Button(
file='./assets/en/base/page/MAIN_GO_TO_WORK.png', file='./assets/en/base/page/MAIN_GO_TO_WORK.png',
area=(1143, 591, 1241, 613), area=(1155, 669, 1250, 690),
search=(1123, 571, 1261, 633), search=(1135, 649, 1270, 710),
color=(110, 129, 154), color=(116, 136, 159),
button=(1143, 591, 1241, 613), button=(1155, 669, 1250, 690),
), ),
) )
MISSION_CHECK = ButtonWrapper( MISSION_CHECK = ButtonWrapper(
@@ -382,13 +354,6 @@ MISSION_CHECK = ButtonWrapper(
) )
MOMOTALK_CHECK = ButtonWrapper( MOMOTALK_CHECK = ButtonWrapper(
name='MOMOTALK_CHECK', 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( share=Button(
file='./assets/share/base/page/MOMOTALK_CHECK.png', file='./assets/share/base/page/MOMOTALK_CHECK.png',
area=(144, 107, 169, 130), area=(144, 107, 169, 130),
@@ -537,10 +502,10 @@ WORK_GO_TO_BOUNTY = ButtonWrapper(
), ),
en=Button( en=Button(
file='./assets/en/base/page/WORK_GO_TO_BOUNTY.png', file='./assets/en/base/page/WORK_GO_TO_BOUNTY.png',
area=(668, 385, 756, 412), area=(679, 402, 736, 421),
search=(648, 365, 776, 432), search=(659, 382, 756, 441),
color=(180, 198, 223), color=(188, 196, 211),
button=(668, 385, 756, 412), button=(679, 402, 736, 421),
), ),
) )
WORK_GO_TO_COMMISSIONS = ButtonWrapper( WORK_GO_TO_COMMISSIONS = ButtonWrapper(
@@ -554,27 +519,27 @@ WORK_GO_TO_COMMISSIONS = ButtonWrapper(
), ),
en=Button( en=Button(
file='./assets/en/base/page/WORK_GO_TO_COMMISSIONS.png', file='./assets/en/base/page/WORK_GO_TO_COMMISSIONS.png',
area=(653, 477, 787, 496), area=(661, 504, 762, 520),
search=(633, 457, 807, 516), search=(641, 484, 782, 540),
color=(187, 199, 218), color=(169, 178, 195),
button=(653, 477, 787, 496), button=(661, 504, 762, 520),
), ),
) )
WORK_GO_TO_MISSION = ButtonWrapper( WORK_GO_TO_MISSION = ButtonWrapper(
name='WORK_GO_TO_MISSION', name='WORK_GO_TO_MISSION',
jp=Button( jp=Button(
file='./assets/jp/base/page/WORK_GO_TO_MISSION.png', file='./assets/jp/base/page/WORK_GO_TO_MISSION.png',
area=(710, 220, 769, 249), area=(703, 231, 742, 252),
search=(690, 200, 789, 269), search=(683, 211, 762, 272),
color=(137, 153, 180), color=(144, 158, 184),
button=(710, 220, 769, 249), button=(703, 231, 742, 252),
), ),
en=Button( en=Button(
file='./assets/en/base/page/WORK_GO_TO_MISSION.png', file='./assets/en/base/page/WORK_GO_TO_MISSION.png',
area=(721, 158, 873, 197), area=(712, 221, 819, 247),
search=(701, 138, 893, 217), search=(692, 201, 839, 267),
color=(180, 195, 215), color=(140, 162, 190),
button=(721, 158, 873, 197), button=(712, 221, 819, 247),
), ),
) )
WORK_GO_TO_SCHOOL_EXCHANGE = ButtonWrapper( WORK_GO_TO_SCHOOL_EXCHANGE = ButtonWrapper(
@@ -588,27 +553,27 @@ WORK_GO_TO_SCHOOL_EXCHANGE = ButtonWrapper(
), ),
en=Button( en=Button(
file='./assets/en/base/page/WORK_GO_TO_SCHOOL_EXCHANGE.png', file='./assets/en/base/page/WORK_GO_TO_SCHOOL_EXCHANGE.png',
area=(635, 569, 769, 597), area=(642, 607, 729, 627),
search=(615, 549, 789, 617), search=(622, 587, 749, 647),
color=(198, 204, 216), color=(196, 200, 211),
button=(635, 569, 769, 597), button=(642, 607, 729, 627),
), ),
) )
WORK_GO_TO_STORY = ButtonWrapper( WORK_GO_TO_STORY = ButtonWrapper(
name='WORK_GO_TO_STORY', name='WORK_GO_TO_STORY',
jp=Button( jp=Button(
file='./assets/jp/base/page/WORK_GO_TO_STORY.png', file='./assets/jp/base/page/WORK_GO_TO_STORY.png',
area=(993, 220, 1081, 250), area=(1074, 232, 1169, 251),
search=(973, 200, 1101, 270), search=(1054, 212, 1189, 271),
color=(209, 214, 224), color=(202, 207, 220),
button=(993, 220, 1081, 250), button=(1074, 232, 1169, 251),
), ),
en=Button( en=Button(
file='./assets/en/base/page/WORK_GO_TO_STORY.png', file='./assets/en/base/page/WORK_GO_TO_STORY.png',
area=(996, 159, 1112, 205), area=(992, 221, 1075, 255),
search=(976, 139, 1132, 225), search=(972, 201, 1095, 275),
color=(200, 209, 225), color=(192, 198, 213),
button=(996, 159, 1112, 205), button=(992, 221, 1075, 255),
), ),
) )
WORK_GO_TO_TACTICAL_CHALLENGE = ButtonWrapper( WORK_GO_TO_TACTICAL_CHALLENGE = ButtonWrapper(
@@ -622,9 +587,9 @@ WORK_GO_TO_TACTICAL_CHALLENGE = ButtonWrapper(
), ),
en=Button( en=Button(
file='./assets/en/base/page/WORK_GO_TO_TACTICAL_CHALLENGE.png', file='./assets/en/base/page/WORK_GO_TO_TACTICAL_CHALLENGE.png',
area=(803, 566, 922, 623), area=(818, 608, 923, 623),
search=(783, 546, 942, 643), search=(798, 588, 943, 643),
color=(186, 201, 220), color=(198, 202, 215),
button=(803, 566, 922, 623), button=(818, 608, 923, 623),
), ),
) )
+52 -8
View File
@@ -54,6 +54,28 @@ CHECK_HIGHWAY = ButtonWrapper(
button=(104, 143, 391, 188), button=(104, 143, 391, 188),
), ),
) )
CHECK_MANSION = ButtonWrapper(
name='CHECK_MANSION',
jp=Button(
file='./assets/jp/bounty/CHECK_MANSION.png',
area=(108, 148, 313, 178),
search=(88, 128, 333, 198),
color=(167, 173, 178),
button=(108, 148, 313, 178),
),
en=None,
)
CHECK_ROAD = ButtonWrapper(
name='CHECK_ROAD',
jp=Button(
file='./assets/jp/bounty/CHECK_ROAD.png',
area=(108, 148, 313, 178),
search=(88, 128, 333, 198),
color=(168, 175, 179),
button=(108, 148, 313, 178),
),
en=None,
)
CHECK_SCHOOLHOUSE = ButtonWrapper( CHECK_SCHOOLHOUSE = ButtonWrapper(
name='CHECK_SCHOOLHOUSE', name='CHECK_SCHOOLHOUSE',
jp=Button( jp=Button(
@@ -92,10 +114,10 @@ SELECT_DESERT_RAILROAD = ButtonWrapper(
name='SELECT_DESERT_RAILROAD', name='SELECT_DESERT_RAILROAD',
jp=Button( jp=Button(
file='./assets/jp/bounty/SELECT_DESERT_RAILROAD.png', file='./assets/jp/bounty/SELECT_DESERT_RAILROAD.png',
area=(1066, 271, 1224, 311), area=(1071, 290, 1219, 321),
search=(1046, 251, 1244, 331), search=(1051, 270, 1239, 341),
color=(178, 188, 199), color=(155, 166, 181),
button=(1066, 271, 1224, 311), button=(1071, 290, 1219, 321),
), ),
en=Button( en=Button(
file='./assets/en/bounty/SELECT_DESERT_RAILROAD.png', file='./assets/en/bounty/SELECT_DESERT_RAILROAD.png',
@@ -122,14 +144,36 @@ SELECT_HIGHWAY = ButtonWrapper(
button=(1073, 167, 1223, 202), button=(1073, 167, 1223, 202),
), ),
) )
SELECT_MANSION = ButtonWrapper(
name='SELECT_MANSION',
jp=Button(
file='./assets/jp/bounty/SELECT_MANSION.png',
area=(1156, 657, 1221, 688),
search=(1136, 637, 1241, 708),
color=(145, 158, 175),
button=(1156, 657, 1221, 688),
),
en=None,
)
SELECT_ROAD = ButtonWrapper(
name='SELECT_ROAD',
jp=Button(
file='./assets/jp/bounty/SELECT_ROAD.png',
area=(1156, 535, 1219, 565),
search=(1136, 515, 1239, 585),
color=(146, 159, 175),
button=(1156, 535, 1219, 565),
),
en=None,
)
SELECT_SCHOOLHOUSE = ButtonWrapper( SELECT_SCHOOLHOUSE = ButtonWrapper(
name='SELECT_SCHOOLHOUSE', name='SELECT_SCHOOLHOUSE',
jp=Button( jp=Button(
file='./assets/jp/bounty/SELECT_SCHOOLHOUSE.png', file='./assets/jp/bounty/SELECT_SCHOOLHOUSE.png',
area=(1154, 381, 1223, 417), area=(1157, 412, 1220, 443),
search=(1134, 361, 1243, 437), search=(1137, 392, 1240, 463),
color=(173, 185, 198), color=(157, 170, 185),
button=(1154, 381, 1223, 417), button=(1157, 412, 1220, 443),
), ),
en=Button( en=Button(
file='./assets/en/bounty/SELECT_SCHOOLHOUSE.png', file='./assets/en/bounty/SELECT_SCHOOLHOUSE.png',
+6 -4
View File
@@ -21,10 +21,12 @@ class BountyStatus(Flag):
class Bounty(BountyUI): class Bounty(BountyUI):
@property @property
def bounty_info(self): def bounty_info(self):
bounty = (SELECT_HIGHWAY, SELECT_DESERT_RAILROAD, SELECT_SCHOOLHOUSE) bounty = (SELECT_HIGHWAY, SELECT_DESERT_RAILROAD, SELECT_SCHOOLHOUSE, SELECT_ROAD, SELECT_MANSION)
check = (CHECK_HIGHWAY, CHECK_DESERT_RAILROAD, CHECK_SCHOOLHOUSE) check = (CHECK_HIGHWAY, CHECK_DESERT_RAILROAD, CHECK_SCHOOLHOUSE, CHECK_ROAD, CHECK_MANSION)
stage = (self.config.Highway_Stage, self.config.DesertRailroad_Stage, self.config.Schoolhouse_Stage) stage = (self.config.Highway_Stage, self.config.DesertRailroad_Stage, self.config.Schoolhouse_Stage,
count = (self.config.Highway_Count, self.config.DesertRailroad_Count, self.config.Schoolhouse_Count) self.config.Road_Stage, self.config.Mansion_Stage)
count = (self.config.Highway_Count, self.config.DesertRailroad_Count, self.config.Schoolhouse_Count,
self.config.Road_Count, self.config.Mansion_Count)
info = zip(bounty, check, stage, count) info = zip(bounty, check, stage, count)
return filter(lambda x: x[3] > 0, info) return filter(lambda x: x[3] > 0, info)
+4 -18
View File
@@ -5,35 +5,21 @@ from module.base.button import Button, ButtonWrapper
OCR_AP = ButtonWrapper( OCR_AP = ButtonWrapper(
name='OCR_AP', name='OCR_AP',
jp=Button( share=Button(
file='./assets/jp/item/data/OCR_AP.png', file='./assets/share/item/data/OCR_AP.png',
area=(512, 13, 597, 32), area=(512, 13, 597, 32),
search=(492, 0, 617, 52), search=(492, 0, 617, 52),
color=(199, 204, 208), color=(199, 204, 208),
button=(512, 13, 597, 32), 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),
),
) )
OCR_DATA = ButtonWrapper( OCR_DATA = ButtonWrapper(
name='OCR_DATA', name='OCR_DATA',
jp=Button( share=Button(
file='./assets/jp/item/data/OCR_DATA.png', file='./assets/share/item/data/OCR_DATA.png',
area=(716, 14, 1058, 33), area=(716, 14, 1058, 33),
search=(696, 0, 1078, 53), search=(696, 0, 1078, 53),
color=(211, 219, 224), color=(211, 219, 224),
button=(716, 14, 1058, 33), 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),
),
) )