diff --git a/assets/en/base/popup/GET_REWARD.BUTTON.png b/assets/en/base/popup/GET_REWARD.BUTTON.png index 13245a1..63b0d59 100644 Binary files a/assets/en/base/popup/GET_REWARD.BUTTON.png and b/assets/en/base/popup/GET_REWARD.BUTTON.png differ diff --git a/assets/en/base/popup/GET_REWARD.png b/assets/en/base/popup/GET_REWARD.png index 4c2247e..9f13977 100644 Binary files a/assets/en/base/popup/GET_REWARD.png and b/assets/en/base/popup/GET_REWARD.png differ diff --git a/assets/en/login/LOGIN_CONFIRM.png b/assets/en/login/LOGIN_CONFIRM.png index c657014..03f1832 100644 Binary files a/assets/en/login/LOGIN_CONFIRM.png and b/assets/en/login/LOGIN_CONFIRM.png differ diff --git a/assets/en/tactical_challenge/CHALLENGE_WIN.BUTTON.png b/assets/en/tactical_challenge/CHALLENGE_WIN.BUTTON.png index 34e7256..a4e07a5 100644 Binary files a/assets/en/tactical_challenge/CHALLENGE_WIN.BUTTON.png and b/assets/en/tactical_challenge/CHALLENGE_WIN.BUTTON.png differ diff --git a/assets/en/tactical_challenge/CHALLENGE_WIN.png b/assets/en/tactical_challenge/CHALLENGE_WIN.png index 2295dc2..26573e1 100644 Binary files a/assets/en/tactical_challenge/CHALLENGE_WIN.png and b/assets/en/tactical_challenge/CHALLENGE_WIN.png differ diff --git a/assets/en/tactical_challenge/PLAYER_SELECT_FIRST.BUTTON.png b/assets/en/tactical_challenge/PLAYER_SELECT_FIRST.BUTTON.png index 00ae01a..c6b6b3b 100644 Binary files a/assets/en/tactical_challenge/PLAYER_SELECT_FIRST.BUTTON.png and b/assets/en/tactical_challenge/PLAYER_SELECT_FIRST.BUTTON.png differ diff --git a/assets/en/tactical_challenge/PLAYER_SELECT_FIRST.png b/assets/en/tactical_challenge/PLAYER_SELECT_FIRST.png index fa4383b..8508a54 100644 Binary files a/assets/en/tactical_challenge/PLAYER_SELECT_FIRST.png and b/assets/en/tactical_challenge/PLAYER_SELECT_FIRST.png differ diff --git a/assets/en/tactical_challenge/PLAYER_SELECT_SECOND.BUTTON.png b/assets/en/tactical_challenge/PLAYER_SELECT_SECOND.BUTTON.png index ed66719..79d07a5 100644 Binary files a/assets/en/tactical_challenge/PLAYER_SELECT_SECOND.BUTTON.png and b/assets/en/tactical_challenge/PLAYER_SELECT_SECOND.BUTTON.png differ diff --git a/assets/en/tactical_challenge/PLAYER_SELECT_SECOND.png b/assets/en/tactical_challenge/PLAYER_SELECT_SECOND.png index 23a87c8..0336841 100644 Binary files a/assets/en/tactical_challenge/PLAYER_SELECT_SECOND.png and b/assets/en/tactical_challenge/PLAYER_SELECT_SECOND.png differ diff --git a/assets/en/tactical_challenge/PLAYER_SELECT_THIRD.BUTTON.png b/assets/en/tactical_challenge/PLAYER_SELECT_THIRD.BUTTON.png index 370db5e..151008f 100644 Binary files a/assets/en/tactical_challenge/PLAYER_SELECT_THIRD.BUTTON.png and b/assets/en/tactical_challenge/PLAYER_SELECT_THIRD.BUTTON.png differ diff --git a/assets/en/tactical_challenge/PLAYER_SELECT_THIRD.png b/assets/en/tactical_challenge/PLAYER_SELECT_THIRD.png index 4f42af9..8f5ed67 100644 Binary files a/assets/en/tactical_challenge/PLAYER_SELECT_THIRD.png and b/assets/en/tactical_challenge/PLAYER_SELECT_THIRD.png differ diff --git a/tasks/base/assets/assets_base_page.py b/tasks/base/assets/assets_base_page.py index 42b3300..a33d9ac 100644 --- a/tasks/base/assets/assets_base_page.py +++ b/tasks/base/assets/assets_base_page.py @@ -12,6 +12,13 @@ ACCOUNT_INFO_CHECK = ButtonWrapper( color=(193, 201, 210), button=(108, 11, 235, 36), ), + en=Button( + file='./assets/en/base/page/ACCOUNT_INFO_CHECK.png', + area=(103, 10, 219, 39), + search=(83, 0, 239, 59), + color=(192, 200, 209), + button=(103, 10, 219, 39), + ), ) BACK = ButtonWrapper( name='BACK', @@ -22,6 +29,13 @@ BACK = ButtonWrapper( color=(93, 118, 164), button=(34, 19, 81, 56), ), + en=Button( + file='./assets/en/base/page/BACK.png', + area=(34, 19, 81, 56), + search=(14, 0, 101, 76), + color=(93, 118, 164), + button=(34, 19, 81, 56), + ), ) BOUNTY_CHECK = ButtonWrapper( name='BOUNTY_CHECK', @@ -32,6 +46,13 @@ BOUNTY_CHECK = ButtonWrapper( color=(150, 164, 177), button=(107, 10, 158, 37), ), + en=Button( + file='./assets/en/base/page/BOUNTY_CHECK.png', + area=(101, 5, 206, 42), + search=(81, 0, 226, 62), + color=(200, 208, 216), + button=(101, 5, 206, 42), + ), ) CAFE_CHECK = ButtonWrapper( name='CAFE_CHECK', @@ -42,6 +63,13 @@ CAFE_CHECK = ButtonWrapper( color=(188, 197, 205), button=(264, 11, 337, 35), ), + en=Button( + file='./assets/en/base/page/CAFE_CHECK.png', + area=(196, 8, 259, 37), + search=(176, 0, 279, 57), + color=(188, 197, 206), + button=(196, 8, 259, 37), + ), ) CIRCLE_CHECK = ButtonWrapper( name='CIRCLE_CHECK', @@ -52,6 +80,13 @@ CIRCLE_CHECK = ButtonWrapper( color=(195, 203, 211), button=(107, 11, 211, 36), ), + en=Button( + file='./assets/en/base/page/CIRCLE_CHECK.png', + area=(102, 8, 168, 38), + search=(82, 0, 188, 58), + color=(190, 199, 208), + button=(102, 8, 168, 38), + ), ) COMMISSIONS_CHECK = ButtonWrapper( name='COMMISSIONS_CHECK', @@ -62,6 +97,13 @@ COMMISSIONS_CHECK = ButtonWrapper( color=(146, 160, 174), button=(107, 10, 158, 37), ), + en=Button( + file='./assets/en/base/page/COMMISSIONS_CHECK.png', + area=(103, 7, 286, 37), + search=(83, 0, 306, 57), + color=(191, 200, 209), + button=(103, 7, 286, 37), + ), ) CRAFTING_CHECK = ButtonWrapper( name='CRAFTING_CHECK', @@ -72,6 +114,13 @@ CRAFTING_CHECK = ButtonWrapper( color=(200, 208, 215), button=(108, 10, 214, 37), ), + en=Button( + file='./assets/en/base/page/CRAFTING_CHECK.png', + area=(103, 4, 226, 41), + search=(83, 0, 246, 61), + color=(202, 210, 217), + button=(103, 4, 226, 41), + ), ) GACHA_CHECK = ButtonWrapper( name='GACHA_CHECK', @@ -82,6 +131,13 @@ GACHA_CHECK = ButtonWrapper( color=(135, 148, 164), button=(159, 10, 210, 37), ), + en=Button( + file='./assets/en/base/page/GACHA_CHECK.png', + area=(217, 8, 385, 37), + search=(197, 0, 405, 57), + color=(189, 197, 206), + button=(217, 8, 385, 37), + ), ) HOME = ButtonWrapper( name='HOME', @@ -92,6 +148,13 @@ HOME = ButtonWrapper( color=(168, 182, 205), button=(1218, 8, 1253, 41), ), + en=Button( + file='./assets/en/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( name='LOADING_CHECK', @@ -102,6 +165,13 @@ LOADING_CHECK = ButtonWrapper( color=(173, 196, 219), button=(1084, 659, 1120, 674), ), + en=Button( + file='./assets/en/base/page/LOADING_CHECK.png', + area=(1084, 659, 1120, 674), + search=(1064, 639, 1140, 694), + color=(173, 196, 219), + button=(1084, 659, 1120, 674), + ), ) MAIL_CHECK = ButtonWrapper( name='MAIL_CHECK', @@ -112,6 +182,13 @@ MAIL_CHECK = ButtonWrapper( color=(205, 212, 219), button=(108, 9, 186, 37), ), + en=Button( + file='./assets/en/base/page/MAIL_CHECK.png', + area=(107, 11, 216, 37), + search=(87, 0, 236, 57), + color=(174, 184, 196), + button=(107, 11, 216, 37), + ), ) MAIN_GO_TO_CAFE = ButtonWrapper( name='MAIN_GO_TO_CAFE', @@ -122,6 +199,13 @@ MAIN_GO_TO_CAFE = ButtonWrapper( color=(156, 209, 233), button=(81, 638, 102, 668), ), + en=Button( + file='./assets/en/base/page/MAIN_GO_TO_CAFE.png', + area=(81, 638, 102, 668), + search=(61, 618, 122, 688), + color=(156, 209, 233), + button=(81, 638, 102, 668), + ), ) MAIN_GO_TO_CIRCLE = ButtonWrapper( name='MAIN_GO_TO_CIRCLE', @@ -132,6 +216,13 @@ MAIN_GO_TO_CIRCLE = ButtonWrapper( color=(131, 204, 234), button=(540, 631, 583, 660), ), + en=Button( + file='./assets/en/base/page/MAIN_GO_TO_CIRCLE.png', + area=(540, 631, 583, 660), + search=(520, 611, 603, 680), + color=(131, 204, 234), + button=(540, 631, 583, 660), + ), ) MAIN_GO_TO_CRAFTING = ButtonWrapper( name='MAIN_GO_TO_CRAFTING', @@ -142,6 +233,13 @@ MAIN_GO_TO_CRAFTING = ButtonWrapper( color=(192, 229, 241), button=(665, 622, 693, 664), ), + en=Button( + file='./assets/en/base/page/MAIN_GO_TO_CRAFTING.png', + area=(665, 622, 693, 664), + search=(645, 602, 713, 684), + color=(192, 229, 241), + button=(665, 622, 693, 664), + ), ) MAIN_GO_TO_GACHA = ButtonWrapper( name='MAIN_GO_TO_GACHA', @@ -152,6 +250,13 @@ MAIN_GO_TO_GACHA = ButtonWrapper( color=(157, 219, 241), button=(900, 623, 924, 670), ), + en=Button( + file='./assets/en/base/page/MAIN_GO_TO_GACHA.png', + area=(900, 623, 924, 670), + search=(880, 603, 944, 690), + color=(157, 219, 241), + button=(900, 623, 924, 670), + ), ) MAIN_GO_TO_MAIL = ButtonWrapper( name='MAIN_GO_TO_MAIL', @@ -162,6 +267,13 @@ MAIN_GO_TO_MAIL = ButtonWrapper( color=(94, 121, 166), button=(1130, 29, 1156, 49), ), + en=Button( + file='./assets/en/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( name='MAIN_GO_TO_MOMOTALK', @@ -172,6 +284,13 @@ MAIN_GO_TO_MOMOTALK = ButtonWrapper( color=(255, 219, 227), button=(154, 134, 177, 158), ), + en=Button( + file='./assets/en/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), + ), ) MAIN_GO_TO_PURCHASE = ButtonWrapper( name='MAIN_GO_TO_PURCHASE', @@ -182,6 +301,13 @@ MAIN_GO_TO_PURCHASE = ButtonWrapper( color=(172, 214, 239), button=(148, 204, 183, 253), ), + en=Button( + file='./assets/en/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), + ), ) MAIN_GO_TO_SCHEDULE = ButtonWrapper( name='MAIN_GO_TO_SCHEDULE', @@ -192,6 +318,13 @@ MAIN_GO_TO_SCHEDULE = ButtonWrapper( color=(149, 194, 222), button=(194, 638, 216, 672), ), + en=Button( + file='./assets/en/base/page/MAIN_GO_TO_SCHEDULE.png', + area=(194, 638, 216, 672), + search=(174, 618, 236, 692), + color=(149, 194, 222), + button=(194, 638, 216, 672), + ), ) MAIN_GO_TO_SHOP = ButtonWrapper( name='MAIN_GO_TO_SHOP', @@ -202,6 +335,13 @@ MAIN_GO_TO_SHOP = ButtonWrapper( color=(146, 208, 235), button=(773, 630, 816, 667), ), + en=Button( + file='./assets/en/base/page/MAIN_GO_TO_SHOP.png', + area=(773, 630, 816, 667), + search=(753, 610, 836, 687), + color=(146, 208, 235), + button=(773, 630, 816, 667), + ), ) MAIN_GO_TO_TASK = ButtonWrapper( name='MAIN_GO_TO_TASK', @@ -212,6 +352,13 @@ MAIN_GO_TO_TASK = ButtonWrapper( color=(226, 207, 203), button=(52, 220, 78, 248), ), + en=Button( + file='./assets/en/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), + ), ) MAIN_GO_TO_WORK = ButtonWrapper( name='MAIN_GO_TO_WORK', @@ -222,6 +369,13 @@ MAIN_GO_TO_WORK = ButtonWrapper( color=(135, 149, 169), button=(1167, 605, 1241, 632), ), + 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), + ), ) MISSION_CHECK = ButtonWrapper( name='MISSION_CHECK', @@ -232,6 +386,13 @@ MISSION_CHECK = ButtonWrapper( color=(188, 197, 206), button=(108, 12, 183, 36), ), + en=Button( + file='./assets/en/base/page/MISSION_CHECK.png', + area=(105, 7, 255, 39), + search=(85, 0, 275, 59), + color=(194, 202, 210), + button=(105, 7, 255, 39), + ), ) MOMOTALK_CHECK = ButtonWrapper( name='MOMOTALK_CHECK', @@ -242,6 +403,13 @@ MOMOTALK_CHECK = ButtonWrapper( color=(253, 211, 219), button=(144, 107, 169, 130), ), + en=Button( + file='./assets/en/base/page/MOMOTALK_CHECK.png', + area=(144, 107, 169, 130), + search=(124, 87, 189, 150), + color=(253, 211, 219), + button=(144, 107, 169, 130), + ), ) MOMOTALK_GO_TO_MAIN = ButtonWrapper( name='MOMOTALK_GO_TO_MAIN', @@ -252,6 +420,13 @@ MOMOTALK_GO_TO_MAIN = ButtonWrapper( color=(252, 182, 194), button=(1108, 105, 1134, 131), ), + en=Button( + file='./assets/en/base/page/MOMOTALK_GO_TO_MAIN.png', + area=(1108, 105, 1134, 131), + search=(1088, 85, 1154, 151), + color=(252, 182, 194), + button=(1108, 105, 1134, 131), + ), ) SCHEDULE_CHECK = ButtonWrapper( name='SCHEDULE_CHECK', @@ -262,6 +437,13 @@ SCHEDULE_CHECK = ButtonWrapper( color=(188, 197, 206), button=(108, 12, 159, 36), ), + en=Button( + file='./assets/en/base/page/SCHEDULE_CHECK.png', + area=(101, 5, 200, 40), + search=(81, 0, 220, 60), + color=(202, 210, 217), + button=(101, 5, 200, 40), + ), ) SCHOOL_EXCHANGE_CHECK = ButtonWrapper( name='SCHOOL_EXCHANGE_CHECK', @@ -272,6 +454,13 @@ SCHOOL_EXCHANGE_CHECK = ButtonWrapper( color=(134, 149, 164), button=(107, 11, 158, 36), ), + en=Button( + file='./assets/en/base/page/SCHOOL_EXCHANGE_CHECK.png', + area=(99, 6, 263, 41), + search=(79, 0, 283, 61), + color=(200, 208, 215), + button=(99, 6, 263, 41), + ), ) SHOP_CHECK = ButtonWrapper( name='SHOP_CHECK', @@ -282,6 +471,13 @@ SHOP_CHECK = ButtonWrapper( color=(200, 208, 215), button=(108, 10, 212, 36), ), + en=Button( + file='./assets/en/base/page/SHOP_CHECK.png', + area=(103, 11, 176, 41), + search=(83, 0, 196, 61), + color=(188, 197, 207), + button=(103, 11, 176, 41), + ), ) STORY_CHECK = ButtonWrapper( name='STORY_CHECK', @@ -292,6 +488,13 @@ STORY_CHECK = ButtonWrapper( color=(194, 203, 211), button=(108, 11, 157, 36), ), + en=Button( + file='./assets/en/base/page/STORY_CHECK.png', + area=(104, 11, 178, 40), + search=(84, 0, 198, 60), + color=(188, 197, 207), + button=(104, 11, 178, 40), + ), ) TACTICAL_CHALLENGE_CHECK = ButtonWrapper( name='TACTICAL_CHALLENGE_CHECK', @@ -302,6 +505,13 @@ TACTICAL_CHALLENGE_CHECK = ButtonWrapper( color=(129, 145, 161), button=(107, 11, 133, 37), ), + en=Button( + file='./assets/en/base/page/TACTICAL_CHALLENGE_CHECK.png', + area=(104, 10, 214, 38), + search=(84, 0, 234, 58), + color=(190, 199, 207), + button=(104, 10, 214, 38), + ), ) TASK_CHECK = ButtonWrapper( name='TASK_CHECK', @@ -312,6 +522,13 @@ TASK_CHECK = ButtonWrapper( color=(189, 198, 207), button=(109, 12, 155, 36), ), + en=Button( + file='./assets/en/base/page/TASK_CHECK.png', + area=(102, 11, 185, 37), + search=(82, 0, 205, 57), + color=(185, 194, 204), + button=(102, 11, 185, 37), + ), ) WORK_CHECK = ButtonWrapper( name='WORK_CHECK', @@ -322,6 +539,13 @@ WORK_CHECK = ButtonWrapper( color=(164, 175, 187), button=(107, 10, 185, 38), ), + en=Button( + file='./assets/en/base/page/WORK_CHECK.png', + area=(105, 5, 244, 41), + search=(85, 0, 264, 61), + color=(197, 205, 213), + button=(105, 5, 244, 41), + ), ) WORK_GO_TO_BOUNTY = ButtonWrapper( name='WORK_GO_TO_BOUNTY', @@ -332,6 +556,13 @@ WORK_GO_TO_BOUNTY = ButtonWrapper( color=(165, 181, 208), button=(669, 412, 765, 436), ), + en=Button( + file='./assets/en/base/page/WORK_GO_TO_BOUNTY.png', + area=(671, 409, 760, 440), + search=(651, 389, 780, 460), + color=(183, 202, 227), + button=(671, 409, 760, 440), + ), ) WORK_GO_TO_COMMISSIONS = ButtonWrapper( name='WORK_GO_TO_COMMISSIONS', @@ -342,6 +573,13 @@ WORK_GO_TO_COMMISSIONS = ButtonWrapper( color=(165, 179, 204), button=(655, 494, 751, 518), ), + en=Button( + file='./assets/en/base/page/WORK_GO_TO_COMMISSIONS.png', + area=(656, 494, 803, 517), + search=(636, 474, 823, 537), + color=(192, 204, 221), + button=(656, 494, 803, 517), + ), ) WORK_GO_TO_MISSION = ButtonWrapper( name='WORK_GO_TO_MISSION', @@ -352,6 +590,13 @@ WORK_GO_TO_MISSION = ButtonWrapper( color=(165, 178, 204), button=(720, 160, 803, 199), ), + en=Button( + file='./assets/en/base/page/WORK_GO_TO_MISSION.png', + area=(720, 160, 871, 206), + search=(700, 140, 891, 226), + color=(192, 204, 221), + button=(720, 160, 871, 206), + ), ) WORK_GO_TO_SCHOOL_EXCHANGE = ButtonWrapper( name='WORK_GO_TO_SCHOOL_EXCHANGE', @@ -362,6 +607,13 @@ WORK_GO_TO_SCHOOL_EXCHANGE = ButtonWrapper( color=(165, 179, 204), button=(641, 575, 758, 599), ), + en=Button( + file='./assets/en/base/page/WORK_GO_TO_SCHOOL_EXCHANGE.png', + area=(643, 572, 778, 602), + search=(623, 552, 798, 622), + color=(190, 203, 221), + button=(643, 572, 778, 602), + ), ) WORK_GO_TO_STORY = ButtonWrapper( name='WORK_GO_TO_STORY', @@ -372,6 +624,13 @@ WORK_GO_TO_STORY = ButtonWrapper( color=(191, 201, 219), button=(995, 163, 1032, 197), ), + en=Button( + file='./assets/en/base/page/WORK_GO_TO_STORY.png', + area=(994, 159, 1109, 211), + search=(974, 139, 1129, 231), + color=(208, 215, 228), + button=(994, 159, 1109, 211), + ), ) WORK_GO_TO_TACTICAL_CHALLENGE = ButtonWrapper( name='WORK_GO_TO_TACTICAL_CHALLENGE', @@ -382,4 +641,11 @@ WORK_GO_TO_TACTICAL_CHALLENGE = ButtonWrapper( color=(159, 174, 200), button=(1012, 535, 1151, 562), ), + en=Button( + file='./assets/en/base/page/WORK_GO_TO_TACTICAL_CHALLENGE.png', + area=(1034, 435, 1162, 466), + search=(1014, 415, 1182, 486), + color=(179, 199, 221), + button=(1034, 435, 1162, 466), + ), ) diff --git a/tasks/base/assets/assets_base_popup.py b/tasks/base/assets/assets_base_popup.py index 8dfb836..1a12a7a 100644 --- a/tasks/base/assets/assets_base_popup.py +++ b/tasks/base/assets/assets_base_popup.py @@ -12,6 +12,13 @@ AFFECTION_LEVEL_UP = ButtonWrapper( color=(208, 223, 243), button=(882, 244, 1176, 476), ), + en=Button( + file='./assets/en/base/popup/AFFECTION_LEVEL_UP.png', + area=(686, 599, 801, 650), + search=(666, 579, 821, 670), + color=(217, 227, 243), + button=(882, 244, 1176, 476), + ), ) AP_EXCEED = ButtonWrapper( name='AP_EXCEED', @@ -22,6 +29,13 @@ AP_EXCEED = ButtonWrapper( color=(139, 153, 168), button=(535, 494, 746, 565), ), + en=Button( + file='./assets/en/base/popup/AP_EXCEED.png', + area=(610, 124, 669, 153), + search=(590, 104, 689, 173), + color=(139, 153, 168), + button=(535, 494, 746, 565), + ), ) DAILY_NEWS = ButtonWrapper( name='DAILY_NEWS', @@ -32,6 +46,13 @@ DAILY_NEWS = ButtonWrapper( color=(150, 204, 253), button=(1128, 89, 1156, 117), ), + en=Button( + file='./assets/en/base/popup/DAILY_NEWS.png', + area=(120, 89, 326, 113), + search=(100, 69, 346, 133), + color=(150, 204, 253), + button=(1128, 89, 1156, 117), + ), ) DAILY_REWARD = ButtonWrapper( name='DAILY_REWARD', @@ -42,6 +63,13 @@ DAILY_REWARD = ButtonWrapper( color=(203, 227, 237), button=(920, 632, 1140, 712), ), + en=Button( + file='./assets/en/base/popup/DAILY_REWARD.png', + area=(416, 165, 434, 216), + search=(396, 145, 454, 236), + color=(203, 227, 237), + button=(920, 632, 1140, 712), + ), ) GET_NEW_STUDENT = ButtonWrapper( name='GET_NEW_STUDENT', @@ -52,6 +80,13 @@ GET_NEW_STUDENT = ButtonWrapper( color=(125, 132, 92), button=(934, 643, 1263, 714), ), + en=Button( + file='./assets/en/base/popup/GET_NEW_STUDENT.png', + area=(32, 93, 158, 114), + search=(12, 73, 178, 134), + color=(125, 132, 92), + button=(934, 643, 1263, 714), + ), ) GET_REWARD = ButtonWrapper( name='GET_REWARD', @@ -62,6 +97,13 @@ GET_REWARD = ButtonWrapper( color=(230, 222, 93), button=(675, 623, 870, 695), ), + en=Button( + file='./assets/en/base/popup/GET_REWARD.png', + area=(629, 138, 651, 167), + search=(609, 118, 671, 187), + color=(211, 210, 90), + button=(578, 617, 707, 646), + ), ) GET_REWARD_SKIP = ButtonWrapper( name='GET_REWARD_SKIP', @@ -72,6 +114,13 @@ GET_REWARD_SKIP = ButtonWrapper( color=(197, 200, 205), button=(1137, 34, 1243, 65), ), + en=Button( + file='./assets/en/base/popup/GET_REWARD_SKIP.png', + area=(1137, 34, 1243, 65), + search=(1117, 14, 1263, 85), + color=(197, 200, 205), + button=(1137, 34, 1243, 65), + ), ) ITEM_EXPIRED = ButtonWrapper( name='ITEM_EXPIRED', @@ -82,6 +131,13 @@ ITEM_EXPIRED = ButtonWrapper( color=(131, 145, 162), button=(537, 487, 742, 553), ), + en=Button( + file='./assets/en/base/popup/ITEM_EXPIRED.png', + area=(612, 147, 668, 175), + search=(592, 127, 688, 195), + color=(131, 145, 162), + button=(537, 487, 742, 553), + ), ) NETWORK_RECONNECT = ButtonWrapper( name='NETWORK_RECONNECT', @@ -92,6 +148,13 @@ NETWORK_RECONNECT = ButtonWrapper( color=(78, 138, 169), button=(663, 467, 870, 537), ), + en=Button( + file='./assets/en/base/popup/NETWORK_RECONNECT.png', + area=(688, 484, 852, 517), + search=(668, 464, 872, 537), + color=(99, 180, 213), + button=(664, 469, 871, 534), + ), ) NETWORK_RECONNECT_OK = ButtonWrapper( name='NETWORK_RECONNECT_OK', @@ -102,4 +165,11 @@ NETWORK_RECONNECT_OK = ButtonWrapper( color=(91, 165, 196), button=(665, 468, 870, 536), ), + en=Button( + file='./assets/en/base/popup/NETWORK_RECONNECT_OK.png', + area=(744, 487, 791, 515), + search=(724, 467, 811, 535), + color=(91, 165, 196), + button=(665, 468, 870, 536), + ), ) diff --git a/tasks/cafe/assets/assets_cafe.py b/tasks/cafe/assets/assets_cafe.py index 0be5d03..0a65744 100644 --- a/tasks/cafe/assets/assets_cafe.py +++ b/tasks/cafe/assets/assets_cafe.py @@ -12,6 +12,13 @@ BOX_CAFE = ButtonWrapper( color=(175, 181, 186), button=(33, 130, 1247, 569), ), + en=Button( + file='./assets/en/cafe/BOX_CAFE.png', + area=(33, 130, 1247, 569), + search=(13, 110, 1267, 589), + color=(175, 181, 186), + button=(33, 130, 1247, 569), + ), ) CAFE_FIRST = ButtonWrapper( name='CAFE_FIRST', @@ -22,6 +29,13 @@ CAFE_FIRST = ButtonWrapper( color=(111, 127, 147), button=(82, 152, 136, 175), ), + en=Button( + file='./assets/en/cafe/CAFE_FIRST.png', + area=(82, 152, 136, 175), + search=(62, 132, 156, 195), + color=(111, 127, 147), + button=(82, 152, 136, 175), + ), ) CAFE_SECOND = ButtonWrapper( name='CAFE_SECOND', @@ -32,6 +46,13 @@ CAFE_SECOND = ButtonWrapper( color=(110, 126, 146), button=(219, 152, 279, 175), ), + en=Button( + file='./assets/en/cafe/CAFE_SECOND.png', + area=(219, 152, 279, 175), + search=(199, 132, 299, 195), + color=(110, 126, 146), + button=(219, 152, 279, 175), + ), ) CHANGE_CAFE_NOT_SELECTED = ButtonWrapper( name='CHANGE_CAFE_NOT_SELECTED', @@ -42,6 +63,13 @@ CHANGE_CAFE_NOT_SELECTED = ButtonWrapper( color=(185, 193, 203), button=(84, 89, 178, 109), ), + en=Button( + file='./assets/en/cafe/CHANGE_CAFE_NOT_SELECTED.png', + area=(84, 89, 178, 109), + search=(64, 69, 198, 129), + color=(185, 193, 203), + button=(84, 89, 178, 109), + ), ) CHANGE_CAFE_SELECTED = ButtonWrapper( name='CHANGE_CAFE_SELECTED', @@ -52,6 +80,13 @@ CHANGE_CAFE_SELECTED = ButtonWrapper( color=(82, 105, 130), button=(40, 87, 191, 112), ), + en=Button( + file='./assets/en/cafe/CHANGE_CAFE_SELECTED.png', + area=(40, 87, 191, 112), + search=(20, 67, 211, 132), + color=(82, 105, 130), + button=(40, 87, 191, 112), + ), ) CHECK_REWARD = ButtonWrapper( name='CHECK_REWARD', @@ -62,6 +97,13 @@ CHECK_REWARD = ButtonWrapper( color=(82, 105, 129), button=(1086, 607, 1225, 685), ), + en=Button( + file='./assets/en/cafe/CHECK_REWARD.png', + area=(1090, 613, 1229, 644), + search=(1070, 593, 1249, 664), + color=(64, 88, 115), + button=(1086, 611, 1229, 685), + ), ) CLICKABLE_TEMPLATE = ButtonWrapper( name='CLICKABLE_TEMPLATE', @@ -72,6 +114,13 @@ CLICKABLE_TEMPLATE = ButtonWrapper( color=(79, 65, 1), button=(619, 332, 660, 387), ), + en=Button( + file='./assets/en/cafe/CLICKABLE_TEMPLATE.png', + area=(619, 332, 660, 387), + search=(599, 312, 680, 407), + color=(79, 65, 1), + button=(619, 332, 660, 387), + ), ) GET_REWARD = ButtonWrapper( name='GET_REWARD', @@ -82,6 +131,13 @@ GET_REWARD = ButtonWrapper( color=(159, 133, 48), button=(546, 494, 735, 563), ), + en=Button( + file='./assets/en/cafe/GET_REWARD.png', + area=(581, 503, 692, 536), + search=(561, 483, 712, 556), + color=(208, 190, 63), + button=(539, 491, 741, 555), + ), ) GET_REWARD_CLOSE = ButtonWrapper( name='GET_REWARD_CLOSE', @@ -92,6 +148,13 @@ GET_REWARD_CLOSE = ButtonWrapper( color=(172, 179, 188), button=(970, 134, 996, 160), ), + en=Button( + file='./assets/en/cafe/GET_REWARD_CLOSE.png', + area=(883, 134, 926, 178), + search=(863, 114, 946, 198), + color=(215, 220, 224), + button=(883, 134, 926, 178), + ), ) GOT_REWARD = ButtonWrapper( name='GOT_REWARD', @@ -102,6 +165,13 @@ GOT_REWARD = ButtonWrapper( color=(209, 210, 209), button=(561, 501, 718, 556), ), + en=Button( + file='./assets/en/cafe/GOT_REWARD.png', + area=(543, 489, 741, 558), + search=(523, 469, 761, 578), + color=(211, 212, 212), + button=(543, 489, 741, 558), + ), ) INVENTORY = ButtonWrapper( name='INVENTORY', @@ -112,6 +182,13 @@ INVENTORY = ButtonWrapper( color=(198, 205, 213), button=(1130, 94, 1156, 120), ), + en=Button( + file='./assets/en/cafe/INVENTORY.png', + area=(559, 90, 720, 128), + search=(539, 70, 740, 148), + color=(197, 204, 212), + button=(1123, 90, 1165, 130), + ), ) MOMOTALK_CLOSE = ButtonWrapper( name='MOMOTALK_CLOSE', @@ -122,6 +199,13 @@ MOMOTALK_CLOSE = ButtonWrapper( color=(252, 182, 194), button=(824, 82, 850, 108), ), + en=Button( + file='./assets/en/cafe/MOMOTALK_CLOSE.png', + area=(824, 82, 850, 108), + search=(804, 62, 870, 128), + color=(252, 182, 194), + button=(824, 82, 850, 108), + ), ) OCR_CAFE = ButtonWrapper( name='OCR_CAFE', @@ -132,6 +216,13 @@ OCR_CAFE = ButtonWrapper( color=(87, 107, 129), button=(1103, 642, 1202, 672), ), + en=Button( + file='./assets/en/cafe/OCR_CAFE.png', + area=(1105, 639, 1195, 674), + search=(1085, 619, 1215, 694), + color=(84, 104, 127), + button=(1105, 639, 1195, 674), + ), ) STUDENT_LIST = ButtonWrapper( name='STUDENT_LIST', @@ -142,4 +233,11 @@ STUDENT_LIST = ButtonWrapper( color=(145, 157, 172), button=(545, 423, 738, 495), ), + en=Button( + file='./assets/en/cafe/STUDENT_LIST.png', + area=(587, 167, 692, 203), + search=(567, 147, 712, 223), + color=(195, 202, 210), + button=(548, 426, 739, 493), + ), ) diff --git a/tasks/circle/assets/assets_circle.py b/tasks/circle/assets/assets_circle.py index 68e424a..2a5f4e3 100644 --- a/tasks/circle/assets/assets_circle.py +++ b/tasks/circle/assets/assets_circle.py @@ -12,4 +12,11 @@ GET_REWARD_AP = ButtonWrapper( color=(198, 206, 213), button=(543, 457, 735, 524), ), + en=Button( + file='./assets/en/circle/GET_REWARD_AP.png', + area=(420, 143, 851, 182), + search=(400, 123, 871, 202), + color=(204, 212, 219), + button=(545, 460, 741, 521), + ), ) diff --git a/tasks/login/assets/assets_login.py b/tasks/login/assets/assets_login.py index 0187655..aa9ef58 100644 --- a/tasks/login/assets/assets_login.py +++ b/tasks/login/assets/assets_login.py @@ -12,6 +12,13 @@ LOGIN_CONFIRM = ButtonWrapper( color=(211, 215, 220), button=(990, 354, 1232, 506), ), + en=Button( + file='./assets/en/login/LOGIN_CONFIRM.png', + area=(34, 622, 93, 654), + search=(14, 602, 113, 674), + color=(216, 220, 225), + button=(990, 354, 1232, 506), + ), ) LOGIN_LOADING = ButtonWrapper( name='LOGIN_LOADING', @@ -22,6 +29,13 @@ LOGIN_LOADING = ButtonWrapper( color=(8, 66, 96), button=(34, 682, 60, 707), ), + en=Button( + file='./assets/en/login/LOGIN_LOADING.png', + area=(34, 682, 60, 707), + search=(14, 662, 80, 720), + color=(8, 66, 96), + button=(34, 682, 60, 707), + ), ) UPDATE = ButtonWrapper( name='UPDATE', @@ -32,4 +46,11 @@ UPDATE = ButtonWrapper( color=(183, 192, 201), button=(666, 527, 872, 595), ), + en=Button( + file='./assets/en/login/UPDATE.png', + area=(526, 87, 756, 117), + search=(506, 67, 776, 137), + color=(183, 192, 201), + button=(666, 527, 872, 595), + ), ) diff --git a/tasks/mail/assets/assets_mail.py b/tasks/mail/assets/assets_mail.py index fe64618..26049be 100644 --- a/tasks/mail/assets/assets_mail.py +++ b/tasks/mail/assets/assets_mail.py @@ -12,6 +12,13 @@ MAIL_RECEIVE = ButtonWrapper( color=(174, 151, 53), button=(1043, 640, 1226, 701), ), + en=Button( + file='./assets/en/mail/MAIL_RECEIVE.png', + area=(1074, 656, 1202, 685), + search=(1054, 636, 1222, 705), + color=(207, 188, 63), + button=(1047, 643, 1231, 700), + ), ) MAIL_RECEIVED = ButtonWrapper( name='MAIL_RECEIVED', @@ -22,4 +29,11 @@ MAIL_RECEIVED = ButtonWrapper( color=(195, 196, 196), button=(1085, 657, 1186, 685), ), + en=Button( + file='./assets/en/mail/MAIL_RECEIVED.png', + area=(1072, 649, 1197, 686), + search=(1052, 629, 1217, 706), + color=(204, 205, 206), + button=(1072, 649, 1197, 686), + ), ) diff --git a/tasks/schedule/assets/assets_schedule.py b/tasks/schedule/assets/assets_schedule.py index 75b7492..8e923b2 100644 --- a/tasks/schedule/assets/assets_schedule.py +++ b/tasks/schedule/assets/assets_schedule.py @@ -12,4 +12,11 @@ SCROLL = ButtonWrapper( color=(198, 214, 210), button=(742, 136, 1101, 671), ), + en=Button( + file='./assets/en/schedule/SCROLL.png', + area=(727, 137, 1103, 671), + search=(707, 117, 1123, 691), + color=(198, 214, 210), + button=(727, 137, 1103, 671), + ), ) diff --git a/tasks/tactical_challenge/assets/assets_tactical_challenge.py b/tasks/tactical_challenge/assets/assets_tactical_challenge.py index 33a6425..6b03847 100644 --- a/tasks/tactical_challenge/assets/assets_tactical_challenge.py +++ b/tasks/tactical_challenge/assets/assets_tactical_challenge.py @@ -12,6 +12,13 @@ CHALLENGE_LOSE = ButtonWrapper( color=(146, 158, 173), button=(548, 431, 738, 499), ), + en=Button( + file='./assets/en/tactical_challenge/CHALLENGE_LOSE.png', + area=(535, 184, 749, 229), + search=(515, 164, 769, 249), + color=(206, 213, 219), + button=(544, 435, 741, 496), + ), ) CHALLENGE_WIN = ButtonWrapper( name='CHALLENGE_WIN', @@ -22,6 +29,13 @@ CHALLENGE_WIN = ButtonWrapper( color=(151, 165, 180), button=(549, 495, 737, 563), ), + en=Button( + file='./assets/en/tactical_challenge/CHALLENGE_WIN.png', + area=(538, 128, 743, 160), + search=(518, 108, 763, 180), + color=(193, 201, 210), + button=(549, 500, 742, 555), + ), ) GET_REWARD_CREDIT = ButtonWrapper( name='GET_REWARD_CREDIT', @@ -32,6 +46,13 @@ GET_REWARD_CREDIT = ButtonWrapper( color=(215, 193, 61), button=(308, 360, 397, 415), ), + en=Button( + file='./assets/en/tactical_challenge/GET_REWARD_CREDIT.png', + area=(307, 361, 402, 414), + search=(287, 341, 422, 434), + color=(233, 213, 66), + button=(307, 361, 402, 414), + ), ) GET_REWARD_DAILY = ButtonWrapper( name='GET_REWARD_DAILY', @@ -42,6 +63,13 @@ GET_REWARD_DAILY = ButtonWrapper( color=(214, 192, 60), button=(307, 440, 395, 493), ), + en=Button( + file='./assets/en/tactical_challenge/GET_REWARD_DAILY.png', + area=(307, 442, 399, 494), + search=(287, 422, 419, 514), + color=(232, 212, 65), + button=(307, 442, 399, 494), + ), ) GOT_REWARD_CREDIT = ButtonWrapper( name='GOT_REWARD_CREDIT', @@ -52,6 +80,13 @@ GOT_REWARD_CREDIT = ButtonWrapper( color=(203, 205, 204), button=(308, 358, 398, 416), ), + en=Button( + file='./assets/en/tactical_challenge/GOT_REWARD_CREDIT.png', + area=(307, 361, 400, 416), + search=(287, 341, 420, 436), + color=(209, 211, 210), + button=(307, 361, 400, 416), + ), ) GOT_REWARD_DAILY = ButtonWrapper( name='GOT_REWARD_DAILY', @@ -62,6 +97,13 @@ GOT_REWARD_DAILY = ButtonWrapper( color=(203, 203, 204), button=(307, 439, 397, 494), ), + en=Button( + file='./assets/en/tactical_challenge/GOT_REWARD_DAILY.png', + area=(305, 439, 402, 497), + search=(285, 419, 422, 517), + color=(210, 210, 210), + button=(305, 439, 402, 497), + ), ) OCR_TICKET = ButtonWrapper( name='OCR_TICKET', @@ -72,6 +114,13 @@ OCR_TICKET = ButtonWrapper( color=(200, 202, 204), button=(206, 479, 240, 499), ), + en=Button( + file='./assets/en/tactical_challenge/OCR_TICKET.png', + area=(211, 472, 251, 505), + search=(191, 452, 271, 525), + color=(223, 226, 228), + button=(211, 472, 251, 505), + ), ) PLAYER_SELECT_FIRST = ButtonWrapper( name='PLAYER_SELECT_FIRST', @@ -82,6 +131,13 @@ PLAYER_SELECT_FIRST = ButtonWrapper( color=(191, 202, 207), button=(558, 179, 1118, 282), ), + 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), + ), ) PLAYER_SELECT_SECOND = ButtonWrapper( name='PLAYER_SELECT_SECOND', @@ -92,6 +148,13 @@ PLAYER_SELECT_SECOND = ButtonWrapper( color=(192, 203, 208), button=(554, 336, 1127, 443), ), + 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), + ), ) PLAYER_SELECT_THIRD = ButtonWrapper( name='PLAYER_SELECT_THIRD', @@ -102,6 +165,13 @@ PLAYER_SELECT_THIRD = ButtonWrapper( color=(194, 206, 211), button=(557, 495, 1120, 599), ), + 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), + ), ) PREPARE_CHALLENGE = ButtonWrapper( name='PREPARE_CHALLENGE', @@ -112,6 +182,13 @@ PREPARE_CHALLENGE = ButtonWrapper( color=(148, 161, 175), button=(561, 548, 723, 598), ), + en=Button( + file='./assets/en/tactical_challenge/PREPARE_CHALLENGE.png', + area=(510, 79, 771, 112), + search=(490, 59, 791, 132), + color=(191, 199, 208), + button=(538, 555, 745, 602), + ), ) SKIP_OFF = ButtonWrapper( name='SKIP_OFF', @@ -122,6 +199,13 @@ SKIP_OFF = ButtonWrapper( color=(96, 137, 171), button=(1088, 582, 1250, 626), ), + en=Button( + file='./assets/en/tactical_challenge/SKIP_OFF.png', + area=(1087, 585, 1127, 622), + search=(1067, 565, 1147, 642), + color=(96, 137, 171), + button=(1088, 585, 1249, 623), + ), ) SKIP_ON = ButtonWrapper( name='SKIP_ON', @@ -132,6 +216,13 @@ SKIP_ON = ButtonWrapper( color=(99, 177, 212), button=(1089, 581, 1250, 626), ), + en=Button( + file='./assets/en/tactical_challenge/SKIP_ON.png', + area=(1096, 591, 1121, 615), + search=(1076, 571, 1141, 635), + color=(99, 177, 212), + button=(1090, 582, 1252, 625), + ), ) START_CHALLENGE = ButtonWrapper( name='START_CHALLENGE', @@ -142,4 +233,11 @@ START_CHALLENGE = ButtonWrapper( color=(148, 161, 176), button=(1091, 635, 1246, 704), ), + en=Button( + file='./assets/en/tactical_challenge/START_CHALLENGE.png', + area=(101, 9, 196, 39), + search=(81, 0, 216, 59), + color=(190, 199, 209), + button=(1089, 637, 1250, 704), + ), )