Merge 96fa53a419 into ac2cfe3974

tasks/base/assets/assets_base_page.py

@@ -631,10 +631,10 @@ WORK_GO_TO_BOUNTY = ButtonWrapper(
     name='WORK_GO_TO_BOUNTY',
     jp=Button(
         file='./assets/jp/base/page/WORK_GO_TO_BOUNTY.png',
-        area=(669, 412, 765, 436),
-        search=(649, 392, 785, 456),
-        color=(165, 181, 208),
-        button=(669, 412, 765, 436),
+        area=(667, 383, 764, 409),
+        search=(647, 363, 784, 429),
+        color=(171, 187, 212),
+        button=(667, 383, 764, 409),
     ),
     en=Button(
         file='./assets/en/base/page/WORK_GO_TO_BOUNTY.png',
@@ -655,10 +655,10 @@ WORK_GO_TO_COMMISSIONS = ButtonWrapper(
     name='WORK_GO_TO_COMMISSIONS',
     jp=Button(
         file='./assets/jp/base/page/WORK_GO_TO_COMMISSIONS.png',
-        area=(655, 494, 751, 518),
-        search=(635, 474, 771, 538),
-        color=(165, 179, 204),
-        button=(655, 494, 751, 518),
+        area=(653, 475, 749, 501),
+        search=(633, 455, 769, 521),
+        color=(171, 185, 208),
+        button=(653, 475, 749, 501),
     ),
     en=Button(
         file='./assets/en/base/page/WORK_GO_TO_COMMISSIONS.png',
@@ -679,17 +679,17 @@ WORK_GO_TO_EVENT = ButtonWrapper(
     name='WORK_GO_TO_EVENT',
     jp=Button(
         file='./assets/jp/base/page/WORK_GO_TO_EVENT.png',
-        area=(63, 131, 142, 205),
-        search=(43, 111, 162, 225),
-        color=(122, 127, 129),
-        button=(63, 131, 142, 205),
+        area=(64, 124, 140, 207),
+        search=(44, 104, 160, 227),
+        color=(191, 172, 183),
+        button=(64, 124, 140, 207),
     ),
     en=Button(
         file='./assets/en/base/page/WORK_GO_TO_EVENT.png',
-        area=(67, 131, 142, 201),
-        search=(47, 111, 162, 221),
-        color=(134, 153, 166),
-        button=(67, 131, 142, 201),
+        area=(71, 134, 137, 200),
+        search=(51, 114, 157, 220),
+        color=(147, 142, 140),
+        button=(71, 134, 137, 200),
     ),
     zht=Button(
         file='./assets/zht/base/page/WORK_GO_TO_EVENT.png',
@@ -703,10 +703,10 @@ WORK_GO_TO_MISSION = ButtonWrapper(
     name='WORK_GO_TO_MISSION',
     jp=Button(
         file='./assets/jp/base/page/WORK_GO_TO_MISSION.png',
-        area=(720, 160, 803, 199),
-        search=(700, 140, 823, 219),
-        color=(165, 178, 204),
-        button=(720, 160, 803, 199),
+        area=(722, 155, 807, 199),
+        search=(702, 135, 827, 219),
+        color=(173, 188, 211),
+        button=(722, 155, 807, 199),
     ),
     en=Button(
         file='./assets/en/base/page/WORK_GO_TO_MISSION.png',
@@ -727,10 +727,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=(641, 575, 758, 599),
-        search=(621, 555, 778, 619),
-        color=(165, 179, 204),
-        button=(641, 575, 758, 599),
+        area=(636, 566, 753, 592),
+        search=(616, 546, 773, 612),
+        color=(176, 187, 207),
+        button=(636, 566, 753, 592),
     ),
     en=Button(
         file='./assets/en/base/page/WORK_GO_TO_SCHOOL_EXCHANGE.png',
@@ -751,10 +751,10 @@ WORK_GO_TO_STORY = ButtonWrapper(
     name='WORK_GO_TO_STORY',
     jp=Button(
         file='./assets/jp/base/page/WORK_GO_TO_STORY.png',
-        area=(995, 163, 1032, 197),
-        search=(975, 143, 1052, 217),
-        color=(191, 201, 219),
-        button=(995, 163, 1032, 197),
+        area=(998, 155, 1078, 199),
+        search=(978, 135, 1098, 219),
+        color=(215, 221, 232),
+        button=(998, 155, 1078, 199),
     ),
     en=Button(
         file='./assets/en/base/page/WORK_GO_TO_STORY.png',
@@ -775,10 +775,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=(1012, 535, 1151, 562),
-        search=(992, 515, 1171, 582),
-        color=(159, 174, 200),
-        button=(1012, 535, 1151, 562),
+        area=(801, 565, 920, 593),
+        search=(781, 545, 940, 613),
+        color=(172, 186, 209),
+        button=(801, 565, 920, 593),
     ),
     en=Button(
         file='./assets/en/base/page/WORK_GO_TO_TACTICAL_CHALLENGE.png',

tasks/tactical_challenge/assets/assets_tactical_challenge.py

@@ -182,17 +182,17 @@ PLAYER_SELECT_FIRST = ButtonWrapper(
     ),
     en=Button(
         file='./assets/en/tactical_challenge/PLAYER_SELECT_FIRST.png',
-        area=(470, 293, 503, 322),
-        search=(450, 273, 523, 342),
-        color=(206, 214, 220),
-        button=(606, 181, 1100, 256),
+        area=(469, 292, 489, 319),
+        search=(449, 272, 509, 339),
+        color=(195, 205, 211),
+        button=(563, 197, 1128, 267),
     ),
     zht=Button(
         file='./assets/zht/tactical_challenge/PLAYER_SELECT_FIRST.png',
-        area=(469, 289, 512, 325),
-        search=(449, 269, 532, 345),
-        color=(206, 214, 221),
-        button=(606, 173, 1099, 260),
+        area=(461, 292, 493, 320),
+        search=(441, 272, 513, 340),
+        color=(199, 210, 216),
+        button=(563, 194, 1131, 279),
     ),
 )
 PLAYER_SELECT_SECOND = ButtonWrapper(
@@ -206,17 +206,17 @@ PLAYER_SELECT_SECOND = ButtonWrapper(
     ),
     en=Button(
         file='./assets/en/tactical_challenge/PLAYER_SELECT_SECOND.png',
-        area=(467, 450, 507, 482),
-        search=(447, 430, 527, 502),
-        color=(210, 219, 225),
-        button=(610, 338, 1098, 407),
+        area=(466, 453, 491, 478),
+        search=(446, 433, 511, 498),
+        color=(196, 207, 213),
+        button=(559, 354, 1121, 424),
     ),
     zht=Button(
         file='./assets/zht/tactical_challenge/PLAYER_SELECT_SECOND.png',
-        area=(471, 451, 504, 480),
-        search=(451, 431, 524, 500),
-        color=(201, 209, 215),
-        button=(606, 334, 1102, 416),
+        area=(465, 451, 494, 482),
+        search=(445, 431, 514, 502),
+        color=(199, 210, 216),
+        button=(558, 357, 1130, 431),
     ),
 )
 PLAYER_SELECT_THIRD = ButtonWrapper(
@@ -230,17 +230,17 @@ PLAYER_SELECT_THIRD = ButtonWrapper(
     ),
     en=Button(
         file='./assets/en/tactical_challenge/PLAYER_SELECT_THIRD.png',
-        area=(472, 612, 504, 641),
-        search=(452, 592, 524, 661),
-        color=(208, 216, 222),
-        button=(609, 500, 1101, 565),
+        area=(464, 608, 492, 638),
+        search=(444, 588, 512, 658),
+        color=(202, 213, 219),
+        button=(558, 513, 1124, 579),
     ),
     zht=Button(
         file='./assets/zht/tactical_challenge/PLAYER_SELECT_THIRD.png',
-        area=(470, 609, 503, 638),
-        search=(450, 589, 523, 658),
-        color=(201, 209, 215),
-        button=(613, 490, 1099, 572),
+        area=(466, 607, 492, 637),
+        search=(446, 587, 512, 657),
+        color=(197, 207, 213),
+        button=(558, 510, 1125, 580),
     ),
 )
 PREPARE_CHALLENGE = ButtonWrapper(