Merge branch 'TheFunny:dev' into dev

tasks/base/assets/assets_base_page.py

@@ -270,10 +270,10 @@ MAIN_GO_TO_CIRCLE = ButtonWrapper(
     name='MAIN_GO_TO_CIRCLE',
     jp=Button(
         file='./assets/jp/base/page/MAIN_GO_TO_CIRCLE.png',
-        area=(486, 630, 522, 665),
+        area=(542, 630, 581, 665),
-        search=(466, 610, 542, 685),
+        search=(522, 610, 601, 685),
-        color=(166, 228, 245),
+        color=(164, 225, 243),
-        button=(486, 630, 522, 665),
+        button=(542, 630, 581, 665),
     ),
     share=Button(
         file='./assets/share/base/page/MAIN_GO_TO_CIRCLE.png',
@@ -287,10 +287,10 @@ MAIN_GO_TO_CRAFTING = ButtonWrapper(
     name='MAIN_GO_TO_CRAFTING',
     jp=Button(
         file='./assets/jp/base/page/MAIN_GO_TO_CRAFTING.png',
-        area=(626, 623, 654, 664),
+        area=(661, 620, 693, 668),
-        search=(606, 603, 674, 684),
+        search=(641, 600, 713, 688),
-        color=(190, 228, 241),
+        color=(183, 216, 230),
-        button=(626, 623, 654, 664),
+        button=(661, 620, 693, 668),
     ),
     share=Button(
         file='./assets/share/base/page/MAIN_GO_TO_CRAFTING.png',
@@ -351,10 +351,10 @@ MAIN_GO_TO_SCHEDULE = ButtonWrapper(
     name='MAIN_GO_TO_SCHEDULE',
     jp=Button(
         file='./assets/jp/base/page/MAIN_GO_TO_SCHEDULE.png',
-        area=(217, 640, 237, 672),
+        area=(194, 646, 222, 672),
-        search=(197, 620, 257, 692),
+        search=(174, 626, 242, 692),
-        color=(154, 201, 228),
+        color=(150, 197, 223),
-        button=(217, 640, 237, 672),
+        button=(194, 646, 222, 672),
     ),
     share=Button(
         file='./assets/share/base/page/MAIN_GO_TO_SCHEDULE.png',
@@ -368,10 +368,10 @@ MAIN_GO_TO_SHOP = ButtonWrapper(
     name='MAIN_GO_TO_SHOP',
     jp=Button(
         file='./assets/jp/base/page/MAIN_GO_TO_SHOP.png',
-        area=(756, 629, 795, 666),
+        area=(774, 628, 816, 670),
-        search=(736, 609, 815, 686),
+        search=(754, 608, 836, 690),
-        color=(151, 215, 241),
+        color=(145, 203, 229),
-        button=(756, 629, 795, 666),
+        button=(774, 628, 816, 670),
     ),
     share=Button(
         file='./assets/share/base/page/MAIN_GO_TO_SHOP.png',
@@ -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),
+        area=(667, 383, 764, 409),
-        search=(649, 392, 785, 456),
+        search=(647, 363, 784, 429),
-        color=(165, 181, 208),
+        color=(171, 187, 212),
-        button=(669, 412, 765, 436),
+        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),
+        area=(653, 475, 749, 501),
-        search=(635, 474, 771, 538),
+        search=(633, 455, 769, 521),
-        color=(165, 179, 204),
+        color=(171, 185, 208),
-        button=(655, 494, 751, 518),
+        button=(653, 475, 749, 501),
     ),
     en=Button(
         file='./assets/en/base/page/WORK_GO_TO_COMMISSIONS.png',
@@ -679,10 +679,10 @@ 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),
+        area=(64, 124, 140, 207),
-        search=(43, 111, 162, 225),
+        search=(44, 104, 160, 227),
-        color=(122, 127, 129),
+        color=(191, 172, 183),
-        button=(63, 131, 142, 205),
+        button=(64, 124, 140, 207),
     ),
     en=Button(
         file='./assets/en/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),
+        area=(722, 155, 807, 199),
-        search=(700, 140, 823, 219),
+        search=(702, 135, 827, 219),
-        color=(165, 178, 204),
+        color=(173, 188, 211),
-        button=(720, 160, 803, 199),
+        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),
+        area=(636, 566, 753, 592),
-        search=(621, 555, 778, 619),
+        search=(616, 546, 773, 612),
-        color=(165, 179, 204),
+        color=(176, 187, 207),
-        button=(641, 575, 758, 599),
+        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),
+        area=(998, 155, 1078, 199),
-        search=(975, 143, 1052, 217),
+        search=(978, 135, 1098, 219),
-        color=(191, 201, 219),
+        color=(215, 221, 232),
-        button=(995, 163, 1032, 197),
+        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),
+        area=(801, 565, 920, 593),
-        search=(992, 515, 1171, 582),
+        search=(781, 545, 940, 613),
-        color=(159, 174, 200),
+        color=(172, 186, 209),
-        button=(1012, 535, 1151, 562),
+        button=(801, 565, 920, 593),
     ),
     en=Button(
         file='./assets/en/base/page/WORK_GO_TO_TACTICAL_CHALLENGE.png',