diff --git a/assets/en/login/SURVEY.BUTTON.png b/assets/en/login/SURVEY.BUTTON.png deleted file mode 100644 index 000cfba..0000000 Binary files a/assets/en/login/SURVEY.BUTTON.png and /dev/null differ diff --git a/assets/jp/base/page/EVENT_CHECK.png b/assets/jp/base/page/EVENT_CHECK.png new file mode 100644 index 0000000..ec30691 Binary files /dev/null and b/assets/jp/base/page/EVENT_CHECK.png differ diff --git a/assets/jp/base/page/WORK_GO_TO_EVENT.png b/assets/jp/base/page/WORK_GO_TO_EVENT.png new file mode 100644 index 0000000..2b9aa0f Binary files /dev/null and b/assets/jp/base/page/WORK_GO_TO_EVENT.png differ diff --git a/assets/jp/base/popup/LEVEL_UP.BUTTON.png b/assets/jp/base/popup/LEVEL_UP.BUTTON.png new file mode 100644 index 0000000..a8e8b85 Binary files /dev/null and b/assets/jp/base/popup/LEVEL_UP.BUTTON.png differ diff --git a/assets/en/login/SURVEY.png b/assets/jp/base/popup/LEVEL_UP.png similarity index 52% rename from assets/en/login/SURVEY.png rename to assets/jp/base/popup/LEVEL_UP.png index 2f9c537..19ded3d 100644 Binary files a/assets/en/login/SURVEY.png and b/assets/jp/base/popup/LEVEL_UP.png differ diff --git a/assets/jp/base/popup/LOCATION_LEVEL_UP.BUTTON.png b/assets/jp/base/popup/LOCATION_LEVEL_UP.BUTTON.png new file mode 100644 index 0000000..a9f6b33 Binary files /dev/null and b/assets/jp/base/popup/LOCATION_LEVEL_UP.BUTTON.png differ diff --git a/assets/jp/base/popup/LOCATION_LEVEL_UP.png b/assets/jp/base/popup/LOCATION_LEVEL_UP.png new file mode 100644 index 0000000..cee4301 Binary files /dev/null and b/assets/jp/base/popup/LOCATION_LEVEL_UP.png differ diff --git a/assets/jp/base/popup/QUIT.BUTTON.png b/assets/jp/base/popup/QUIT.BUTTON.png new file mode 100644 index 0000000..094d0a8 Binary files /dev/null and b/assets/jp/base/popup/QUIT.BUTTON.png differ diff --git a/assets/jp/base/popup/QUIT.png b/assets/jp/base/popup/QUIT.png new file mode 100644 index 0000000..ac4e79d Binary files /dev/null and b/assets/jp/base/popup/QUIT.png differ diff --git a/assets/jp/login/OCR_YEAR.png b/assets/jp/login/OCR_YEAR.png new file mode 100644 index 0000000..4db7b6f Binary files /dev/null and b/assets/jp/login/OCR_YEAR.png differ diff --git a/assets/jp/mission/CHECK_COMMISSIONS.png b/assets/jp/mission/CHECK_COMMISSIONS.png new file mode 100644 index 0000000..ccab72d Binary files /dev/null and b/assets/jp/mission/CHECK_COMMISSIONS.png differ diff --git a/assets/jp/mission/CHECK_CR.png b/assets/jp/mission/CHECK_CR.png new file mode 100644 index 0000000..55a21df Binary files /dev/null and b/assets/jp/mission/CHECK_CR.png differ diff --git a/assets/jp/mission/CHECK_MISSION_SWEEP.png b/assets/jp/mission/CHECK_MISSION_SWEEP.png new file mode 100644 index 0000000..4ac1c5d Binary files /dev/null and b/assets/jp/mission/CHECK_MISSION_SWEEP.png differ diff --git a/assets/jp/mission/CHECK_XP.png b/assets/jp/mission/CHECK_XP.png new file mode 100644 index 0000000..59ef189 Binary files /dev/null and b/assets/jp/mission/CHECK_XP.png differ diff --git a/assets/jp/mission/EVENT_INDEX.png b/assets/jp/mission/EVENT_INDEX.png new file mode 100644 index 0000000..104fbc4 Binary files /dev/null and b/assets/jp/mission/EVENT_INDEX.png differ diff --git a/assets/jp/mission/EVENT_ITEM.png b/assets/jp/mission/EVENT_ITEM.png new file mode 100644 index 0000000..2f2a2a7 Binary files /dev/null and b/assets/jp/mission/EVENT_ITEM.png differ diff --git a/assets/jp/mission/EVENT_LIST.png b/assets/jp/mission/EVENT_LIST.png new file mode 100644 index 0000000..a3eb22d Binary files /dev/null and b/assets/jp/mission/EVENT_LIST.png differ diff --git a/assets/jp/mission/EVENT_STARS.png b/assets/jp/mission/EVENT_STARS.png new file mode 100644 index 0000000..bdc774b Binary files /dev/null and b/assets/jp/mission/EVENT_STARS.png differ diff --git a/assets/jp/mission/HARD_OFF.png b/assets/jp/mission/HARD_OFF.png new file mode 100644 index 0000000..a2ba018 Binary files /dev/null and b/assets/jp/mission/HARD_OFF.png differ diff --git a/assets/jp/mission/HARD_ON.png b/assets/jp/mission/HARD_ON.png new file mode 100644 index 0000000..98bddd2 Binary files /dev/null and b/assets/jp/mission/HARD_ON.png differ diff --git a/assets/jp/mission/LEFT.png b/assets/jp/mission/LEFT.png new file mode 100644 index 0000000..f1bc365 Binary files /dev/null and b/assets/jp/mission/LEFT.png differ diff --git a/assets/jp/mission/NORMAL_OFF.png b/assets/jp/mission/NORMAL_OFF.png new file mode 100644 index 0000000..3c409f2 Binary files /dev/null and b/assets/jp/mission/NORMAL_OFF.png differ diff --git a/assets/jp/mission/NORMAL_ON.png b/assets/jp/mission/NORMAL_ON.png new file mode 100644 index 0000000..208f895 Binary files /dev/null and b/assets/jp/mission/NORMAL_ON.png differ diff --git a/assets/jp/mission/OCR_AREA.png b/assets/jp/mission/OCR_AREA.png new file mode 100644 index 0000000..d9a8316 Binary files /dev/null and b/assets/jp/mission/OCR_AREA.png differ diff --git a/assets/jp/mission/QUEST_OFF.png b/assets/jp/mission/QUEST_OFF.png new file mode 100644 index 0000000..21e2241 Binary files /dev/null and b/assets/jp/mission/QUEST_OFF.png differ diff --git a/assets/jp/mission/QUEST_ON.png b/assets/jp/mission/QUEST_ON.png new file mode 100644 index 0000000..b727c8b Binary files /dev/null and b/assets/jp/mission/QUEST_ON.png differ diff --git a/assets/jp/mission/RIGHT.png b/assets/jp/mission/RIGHT.png new file mode 100644 index 0000000..e4c0e74 Binary files /dev/null and b/assets/jp/mission/RIGHT.png differ diff --git a/assets/jp/mission/SELECT_CR.png b/assets/jp/mission/SELECT_CR.png new file mode 100644 index 0000000..33750b4 Binary files /dev/null and b/assets/jp/mission/SELECT_CR.png differ diff --git a/assets/jp/mission/SELECT_XP.png b/assets/jp/mission/SELECT_XP.png new file mode 100644 index 0000000..0ba5cf6 Binary files /dev/null and b/assets/jp/mission/SELECT_XP.png differ diff --git a/assets/jp/momotalk/BEGIN_STORY.png b/assets/jp/momotalk/BEGIN_STORY.png new file mode 100644 index 0000000..946ce85 Binary files /dev/null and b/assets/jp/momotalk/BEGIN_STORY.png differ diff --git a/assets/jp/momotalk/CHATTING.png b/assets/jp/momotalk/CHATTING.png new file mode 100644 index 0000000..048e79d Binary files /dev/null and b/assets/jp/momotalk/CHATTING.png differ diff --git a/assets/jp/momotalk/CHAT_AREA.png b/assets/jp/momotalk/CHAT_AREA.png new file mode 100644 index 0000000..d82d019 Binary files /dev/null and b/assets/jp/momotalk/CHAT_AREA.png differ diff --git a/assets/jp/momotalk/CONFIRM_SKIP.png b/assets/jp/momotalk/CONFIRM_SKIP.png new file mode 100644 index 0000000..594ad39 Binary files /dev/null and b/assets/jp/momotalk/CONFIRM_SKIP.png differ diff --git a/assets/jp/momotalk/CONFIRM_SORT.png b/assets/jp/momotalk/CONFIRM_SORT.png new file mode 100644 index 0000000..ab6ed64 Binary files /dev/null and b/assets/jp/momotalk/CONFIRM_SORT.png differ diff --git a/assets/jp/momotalk/FIRST_UNREAD.png b/assets/jp/momotalk/FIRST_UNREAD.png new file mode 100644 index 0000000..bafb1b5 Binary files /dev/null and b/assets/jp/momotalk/FIRST_UNREAD.png differ diff --git a/assets/jp/momotalk/MENU.png b/assets/jp/momotalk/MENU.png new file mode 100644 index 0000000..c022024 Binary files /dev/null and b/assets/jp/momotalk/MENU.png differ diff --git a/assets/jp/momotalk/NOTIFICATION_BADGE.png b/assets/jp/momotalk/NOTIFICATION_BADGE.png new file mode 100644 index 0000000..9202809 Binary files /dev/null and b/assets/jp/momotalk/NOTIFICATION_BADGE.png differ diff --git a/assets/jp/momotalk/REPLY.png b/assets/jp/momotalk/REPLY.png new file mode 100644 index 0000000..02aa666 Binary files /dev/null and b/assets/jp/momotalk/REPLY.png differ diff --git a/assets/jp/momotalk/SELECT_STUDENT.png b/assets/jp/momotalk/SELECT_STUDENT.png new file mode 100644 index 0000000..47d9930 Binary files /dev/null and b/assets/jp/momotalk/SELECT_STUDENT.png differ diff --git a/assets/jp/momotalk/SKIP.png b/assets/jp/momotalk/SKIP.png new file mode 100644 index 0000000..c1796b8 Binary files /dev/null and b/assets/jp/momotalk/SKIP.png differ diff --git a/assets/jp/momotalk/SORT_ASCENDING.png b/assets/jp/momotalk/SORT_ASCENDING.png new file mode 100644 index 0000000..29124fe Binary files /dev/null and b/assets/jp/momotalk/SORT_ASCENDING.png differ diff --git a/assets/jp/momotalk/SORT_DESCENDING.png b/assets/jp/momotalk/SORT_DESCENDING.png new file mode 100644 index 0000000..8aa4e34 Binary files /dev/null and b/assets/jp/momotalk/SORT_DESCENDING.png differ diff --git a/assets/jp/momotalk/STORY.png b/assets/jp/momotalk/STORY.png new file mode 100644 index 0000000..a6ad08d Binary files /dev/null and b/assets/jp/momotalk/STORY.png differ diff --git a/assets/jp/momotalk/SWITCH_MESSAGE.png b/assets/jp/momotalk/SWITCH_MESSAGE.png new file mode 100644 index 0000000..0198f32 Binary files /dev/null and b/assets/jp/momotalk/SWITCH_MESSAGE.png differ diff --git a/assets/jp/momotalk/SWITCH_MESSAGE_CHECK.png b/assets/jp/momotalk/SWITCH_MESSAGE_CHECK.png new file mode 100644 index 0000000..658cfd7 Binary files /dev/null and b/assets/jp/momotalk/SWITCH_MESSAGE_CHECK.png differ diff --git a/assets/jp/momotalk/SWITCH_STUDENT.png b/assets/jp/momotalk/SWITCH_STUDENT.png new file mode 100644 index 0000000..40252dd Binary files /dev/null and b/assets/jp/momotalk/SWITCH_STUDENT.png differ diff --git a/assets/jp/momotalk/SWITCH_STUDENT_CHECK.png b/assets/jp/momotalk/SWITCH_STUDENT_CHECK.png new file mode 100644 index 0000000..d8131ae Binary files /dev/null and b/assets/jp/momotalk/SWITCH_STUDENT_CHECK.png differ diff --git a/assets/jp/momotalk/UNREAD.png b/assets/jp/momotalk/UNREAD.png new file mode 100644 index 0000000..8cfadb9 Binary files /dev/null and b/assets/jp/momotalk/UNREAD.png differ diff --git a/assets/jp/momotalk/UNREAD_OFF.png b/assets/jp/momotalk/UNREAD_OFF.png new file mode 100644 index 0000000..fc884d5 Binary files /dev/null and b/assets/jp/momotalk/UNREAD_OFF.png differ diff --git a/assets/jp/momotalk/UNREAD_ON.png b/assets/jp/momotalk/UNREAD_ON.png new file mode 100644 index 0000000..44afed7 Binary files /dev/null and b/assets/jp/momotalk/UNREAD_ON.png differ diff --git a/assets/jp/schedule/CONFIRM.png b/assets/jp/schedule/CONFIRM.png new file mode 100644 index 0000000..450a966 Binary files /dev/null and b/assets/jp/schedule/CONFIRM.png differ diff --git a/assets/jp/schedule/FIRST_ITEM.png b/assets/jp/schedule/FIRST_ITEM.png new file mode 100644 index 0000000..7b0d858 Binary files /dev/null and b/assets/jp/schedule/FIRST_ITEM.png differ diff --git a/assets/jp/schedule/LOCATIONS.png b/assets/jp/schedule/LOCATIONS.png new file mode 100644 index 0000000..88d66fa Binary files /dev/null and b/assets/jp/schedule/LOCATIONS.png differ diff --git a/assets/jp/schedule/LOCATIONS_POPUP.png b/assets/jp/schedule/LOCATIONS_POPUP.png new file mode 100644 index 0000000..5b40a34 Binary files /dev/null and b/assets/jp/schedule/LOCATIONS_POPUP.png differ diff --git a/assets/jp/schedule/OCR_TICKET.png b/assets/jp/schedule/OCR_TICKET.png new file mode 100644 index 0000000..ff08412 Binary files /dev/null and b/assets/jp/schedule/OCR_TICKET.png differ diff --git a/assets/jp/schedule/SCROLL.png b/assets/jp/schedule/SCROLL.png index 02308f9..35dbd26 100644 Binary files a/assets/jp/schedule/SCROLL.png and b/assets/jp/schedule/SCROLL.png differ diff --git a/assets/jp/schedule/START_LESSON.png b/assets/jp/schedule/START_LESSON.png new file mode 100644 index 0000000..1dd22b7 Binary files /dev/null and b/assets/jp/schedule/START_LESSON.png differ diff --git a/assets/jp/shop/CONFIRM_PURCHASE.BUTTON.png b/assets/jp/shop/CONFIRM_PURCHASE.BUTTON.png new file mode 100644 index 0000000..1ad67e1 Binary files /dev/null and b/assets/jp/shop/CONFIRM_PURCHASE.BUTTON.png differ diff --git a/assets/jp/shop/CONFIRM_PURCHASE.png b/assets/jp/shop/CONFIRM_PURCHASE.png new file mode 100644 index 0000000..c1a0298 Binary files /dev/null and b/assets/jp/shop/CONFIRM_PURCHASE.png differ diff --git a/assets/jp/shop/CONFIRM_REFRESH.BUTTON.png b/assets/jp/shop/CONFIRM_REFRESH.BUTTON.png new file mode 100644 index 0000000..3b1ca10 Binary files /dev/null and b/assets/jp/shop/CONFIRM_REFRESH.BUTTON.png differ diff --git a/assets/jp/shop/CONFIRM_REFRESH.png b/assets/jp/shop/CONFIRM_REFRESH.png new file mode 100644 index 0000000..cb0128c Binary files /dev/null and b/assets/jp/shop/CONFIRM_REFRESH.png differ diff --git a/assets/jp/shop/ITEM_LIST.png b/assets/jp/shop/ITEM_LIST.png new file mode 100644 index 0000000..d0e9d18 Binary files /dev/null and b/assets/jp/shop/ITEM_LIST.png differ diff --git a/assets/jp/shop/NORMAL_OFF.png b/assets/jp/shop/NORMAL_OFF.png new file mode 100644 index 0000000..d34b1f5 Binary files /dev/null and b/assets/jp/shop/NORMAL_OFF.png differ diff --git a/assets/jp/shop/NORMAL_ON.png b/assets/jp/shop/NORMAL_ON.png new file mode 100644 index 0000000..aaa1185 Binary files /dev/null and b/assets/jp/shop/NORMAL_ON.png differ diff --git a/assets/jp/shop/OCR_REFRESH.png b/assets/jp/shop/OCR_REFRESH.png new file mode 100644 index 0000000..643f9be Binary files /dev/null and b/assets/jp/shop/OCR_REFRESH.png differ diff --git a/assets/jp/shop/PURCHASE.png b/assets/jp/shop/PURCHASE.png new file mode 100644 index 0000000..3e4aa3b Binary files /dev/null and b/assets/jp/shop/PURCHASE.png differ diff --git a/assets/jp/shop/REFRESH.png b/assets/jp/shop/REFRESH.png new file mode 100644 index 0000000..2a0b705 Binary files /dev/null and b/assets/jp/shop/REFRESH.png differ diff --git a/assets/jp/shop/TC_OFF.png b/assets/jp/shop/TC_OFF.png new file mode 100644 index 0000000..5f8264d Binary files /dev/null and b/assets/jp/shop/TC_OFF.png differ diff --git a/assets/jp/shop/TC_ON.png b/assets/jp/shop/TC_ON.png new file mode 100644 index 0000000..d3a79b3 Binary files /dev/null and b/assets/jp/shop/TC_ON.png differ diff --git a/assets/jp/task/COMPLETE.png b/assets/jp/task/COMPLETE.png new file mode 100644 index 0000000..b5d1074 Binary files /dev/null and b/assets/jp/task/COMPLETE.png differ diff --git a/tasks/base/assets/assets_base_page.py b/tasks/base/assets/assets_base_page.py index 11f1b3e..bd54a6e 100644 --- a/tasks/base/assets/assets_base_page.py +++ b/tasks/base/assets/assets_base_page.py @@ -159,7 +159,13 @@ CRAFTING_CHECK = ButtonWrapper( ) EVENT_CHECK = ButtonWrapper( name='EVENT_CHECK', - jp=None, + jp=Button( + file='./assets/jp/base/page/EVENT_CHECK.png', + area=(107, 11, 210, 37), + search=(87, 0, 230, 57), + color=(204, 211, 218), + button=(107, 11, 210, 37), + ), en=Button( file='./assets/en/base/page/EVENT_CHECK.png', area=(102, 6, 187, 40), @@ -629,7 +635,13 @@ WORK_GO_TO_COMMISSIONS = ButtonWrapper( ) WORK_GO_TO_EVENT = ButtonWrapper( name='WORK_GO_TO_EVENT', - jp=None, + 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), + ), en=Button( file='./assets/en/base/page/WORK_GO_TO_EVENT.png', area=(67, 131, 142, 201), diff --git a/tasks/base/assets/assets_base_popup.py b/tasks/base/assets/assets_base_popup.py index 8261af0..59390b9 100644 --- a/tasks/base/assets/assets_base_popup.py +++ b/tasks/base/assets/assets_base_popup.py @@ -179,7 +179,13 @@ ITEM_EXPIRED = ButtonWrapper( ) LEVEL_UP = ButtonWrapper( name='LEVEL_UP', - jp=None, + jp=Button( + file='./assets/jp/base/popup/LEVEL_UP.png', + area=(722, 210, 746, 238), + search=(702, 190, 766, 258), + color=(184, 202, 219), + button=(571, 559, 713, 601), + ), en=Button( file='./assets/en/base/popup/LEVEL_UP.png', area=(722, 210, 746, 238), @@ -197,7 +203,13 @@ LEVEL_UP = ButtonWrapper( ) LOCATION_LEVEL_UP = ButtonWrapper( name='LOCATION_LEVEL_UP', - jp=None, + jp=Button( + file='./assets/jp/base/popup/LOCATION_LEVEL_UP.png', + area=(430, 141, 463, 180), + search=(410, 121, 483, 200), + color=(177, 194, 207), + button=(577, 616, 707, 647), + ), en=Button( file='./assets/en/base/popup/LOCATION_LEVEL_UP.png', area=(430, 141, 463, 180), @@ -263,7 +275,13 @@ NETWORK_RECONNECT_OK = ButtonWrapper( ) QUIT = ButtonWrapper( name='QUIT', - jp=None, + jp=Button( + file='./assets/jp/base/popup/QUIT.png', + area=(497, 313, 779, 353), + search=(477, 293, 799, 373), + color=(210, 210, 210), + button=(442, 487, 592, 521), + ), en=Button( file='./assets/en/base/popup/QUIT.png', area=(587, 309, 688, 357), diff --git a/tasks/login/assets/assets_login.py b/tasks/login/assets/assets_login.py index a3c3277..3c14588 100644 --- a/tasks/login/assets/assets_login.py +++ b/tasks/login/assets/assets_login.py @@ -53,7 +53,13 @@ LOGIN_LOADING = ButtonWrapper( ) OCR_YEAR = ButtonWrapper( name='OCR_YEAR', - jp=None, + jp=Button( + file='./assets/jp/login/OCR_YEAR.png', + area=(377, 689, 414, 701), + search=(357, 669, 434, 720), + color=(160, 157, 158), + button=(377, 689, 414, 701), + ), en=Button( file='./assets/en/login/OCR_YEAR.png', area=(377, 689, 414, 701), @@ -72,13 +78,7 @@ OCR_YEAR = ButtonWrapper( SURVEY = ButtonWrapper( name='SURVEY', jp=None, - en=Button( - file='./assets/en/login/SURVEY.png', - area=(946, 269, 994, 307), - search=(926, 249, 1014, 327), - color=(211, 223, 166), - button=(1199, 6, 1264, 75), - ), + en=None, zht=Button( file='./assets/zht/login/SURVEY.png', area=(946, 269, 994, 307), diff --git a/tasks/mission/assets/assets_mission.py b/tasks/mission/assets/assets_mission.py index e48a060..1edb15a 100644 --- a/tasks/mission/assets/assets_mission.py +++ b/tasks/mission/assets/assets_mission.py @@ -5,7 +5,13 @@ from module.base.button import Button, ButtonWrapper CHECK_COMMISSIONS = ButtonWrapper( name='CHECK_COMMISSIONS', - jp=None, + jp=Button( + file='./assets/jp/mission/CHECK_COMMISSIONS.png', + area=(654, 93, 881, 128), + search=(634, 73, 901, 148), + color=(108, 129, 151), + button=(654, 93, 881, 128), + ), en=Button( file='./assets/en/mission/CHECK_COMMISSIONS.png', area=(646, 78, 909, 135), @@ -23,7 +29,13 @@ CHECK_COMMISSIONS = ButtonWrapper( ) CHECK_CR = ButtonWrapper( name='CHECK_CR', - jp=None, + jp=Button( + file='./assets/jp/mission/CHECK_CR.png', + area=(108, 147, 313, 180), + search=(88, 127, 333, 200), + color=(195, 201, 205), + button=(108, 147, 313, 180), + ), en=Button( file='./assets/en/mission/CHECK_CR.png', area=(97, 137, 340, 191), @@ -41,7 +53,13 @@ CHECK_CR = ButtonWrapper( ) CHECK_MISSION_SWEEP = ButtonWrapper( name='CHECK_MISSION_SWEEP', - jp=None, + jp=Button( + file='./assets/jp/mission/CHECK_MISSION_SWEEP.png', + area=(637, 188, 722, 213), + search=(617, 168, 742, 233), + color=(169, 180, 193), + button=(637, 188, 722, 213), + ), en=Button( file='./assets/en/mission/CHECK_MISSION_SWEEP.png', area=(654, 184, 703, 209), @@ -59,7 +77,13 @@ CHECK_MISSION_SWEEP = ButtonWrapper( ) CHECK_XP = ButtonWrapper( name='CHECK_XP', - jp=None, + jp=Button( + file='./assets/jp/mission/CHECK_XP.png', + area=(106, 147, 225, 180), + search=(86, 127, 245, 200), + color=(167, 172, 176), + button=(106, 147, 225, 180), + ), en=Button( file='./assets/en/mission/CHECK_XP.png', area=(94, 135, 325, 194), @@ -77,7 +101,13 @@ CHECK_XP = ButtonWrapper( ) EVENT_INDEX = ButtonWrapper( name='EVENT_INDEX', - jp=None, + jp=Button( + file='./assets/jp/mission/EVENT_INDEX.png', + area=(704, 135, 761, 694), + search=(684, 115, 781, 714), + color=(189, 197, 195), + button=(704, 135, 761, 694), + ), en=Button( file='./assets/en/mission/EVENT_INDEX.png', area=(704, 135, 761, 694), @@ -95,7 +125,13 @@ EVENT_INDEX = ButtonWrapper( ) EVENT_ITEM = ButtonWrapper( name='EVENT_ITEM', - jp=None, + jp=Button( + file='./assets/jp/mission/EVENT_ITEM.png', + area=(691, 136, 1198, 232), + search=(671, 116, 1218, 252), + color=(201, 219, 224), + button=(691, 136, 1198, 232), + ), en=Button( file='./assets/en/mission/EVENT_ITEM.png', area=(691, 136, 1198, 232), @@ -113,7 +149,13 @@ EVENT_ITEM = ButtonWrapper( ) EVENT_LIST = ButtonWrapper( name='EVENT_LIST', - jp=None, + jp=Button( + file='./assets/jp/mission/EVENT_LIST.png', + area=(695, 137, 1196, 688), + search=(675, 117, 1216, 708), + color=(171, 185, 190), + button=(695, 137, 1196, 688), + ), en=Button( file='./assets/en/mission/EVENT_LIST.png', area=(695, 137, 1196, 688), @@ -131,7 +173,13 @@ EVENT_LIST = ButtonWrapper( ) EVENT_STARS = ButtonWrapper( name='EVENT_STARS', - jp=None, + jp=Button( + file='./assets/jp/mission/EVENT_STARS.png', + area=(704, 186, 761, 218), + search=(684, 166, 781, 238), + color=(228, 223, 194), + button=(704, 186, 761, 218), + ), en=Button( file='./assets/en/mission/EVENT_STARS.png', area=(704, 186, 761, 218), @@ -149,7 +197,13 @@ EVENT_STARS = ButtonWrapper( ) HARD_OFF = ButtonWrapper( name='HARD_OFF', - jp=None, + jp=Button( + file='./assets/jp/mission/HARD_OFF.png', + area=(1034, 144, 1095, 172), + search=(1014, 124, 1115, 192), + color=(204, 211, 218), + button=(1034, 144, 1095, 172), + ), en=Button( file='./assets/en/mission/HARD_OFF.png', area=(947, 132, 1193, 182), @@ -167,7 +221,13 @@ HARD_OFF = ButtonWrapper( ) HARD_ON = ButtonWrapper( name='HARD_ON', - jp=None, + jp=Button( + file='./assets/jp/mission/HARD_ON.png', + area=(1032, 143, 1095, 172), + search=(1012, 123, 1115, 192), + color=(211, 104, 54), + button=(1032, 143, 1095, 172), + ), en=Button( file='./assets/en/mission/HARD_ON.png', area=(940, 133, 1189, 186), @@ -185,7 +245,13 @@ HARD_ON = ButtonWrapper( ) LEFT = ButtonWrapper( name='LEFT', - jp=None, + jp=Button( + file='./assets/jp/mission/LEFT.png', + area=(0, 301, 89, 408), + search=(0, 281, 109, 428), + color=(193, 224, 241), + button=(0, 301, 89, 408), + ), en=Button( file='./assets/en/mission/LEFT.png', area=(0, 301, 89, 408), @@ -203,7 +269,13 @@ LEFT = ButtonWrapper( ) NORMAL_OFF = ButtonWrapper( name='NORMAL_OFF', - jp=None, + jp=Button( + file='./assets/jp/mission/NORMAL_OFF.png', + area=(759, 146, 847, 171), + search=(739, 126, 867, 191), + color=(197, 205, 214), + button=(759, 146, 847, 171), + ), en=Button( file='./assets/en/mission/NORMAL_OFF.png', area=(682, 135, 927, 182), @@ -221,7 +293,13 @@ NORMAL_OFF = ButtonWrapper( ) NORMAL_ON = ButtonWrapper( name='NORMAL_ON', - jp=None, + jp=Button( + file='./assets/jp/mission/NORMAL_ON.png', + area=(759, 145, 845, 172), + search=(739, 125, 865, 192), + color=(107, 115, 72), + button=(759, 145, 845, 172), + ), en=Button( file='./assets/en/mission/NORMAL_ON.png', area=(682, 137, 924, 185), @@ -239,7 +317,13 @@ NORMAL_ON = ButtonWrapper( ) OCR_AREA = ButtonWrapper( name='OCR_AREA', - jp=None, + jp=Button( + file='./assets/jp/mission/OCR_AREA.png', + area=(111, 178, 174, 212), + search=(91, 158, 194, 232), + color=(218, 222, 227), + button=(111, 178, 174, 212), + ), en=Button( file='./assets/en/mission/OCR_AREA.png', area=(108, 176, 176, 219), @@ -257,7 +341,13 @@ OCR_AREA = ButtonWrapper( ) QUEST_OFF = ButtonWrapper( name='QUEST_OFF', - jp=None, + jp=Button( + file='./assets/jp/mission/QUEST_OFF.png', + area=(903, 80, 989, 115), + search=(883, 60, 1009, 135), + color=(212, 217, 221), + button=(903, 80, 989, 115), + ), en=Button( file='./assets/en/mission/QUEST_OFF.png', area=(859, 69, 1025, 125), @@ -275,7 +365,13 @@ QUEST_OFF = ButtonWrapper( ) QUEST_ON = ButtonWrapper( name='QUEST_ON', - jp=None, + jp=Button( + file='./assets/jp/mission/QUEST_ON.png', + area=(903, 82, 987, 113), + search=(883, 62, 1007, 133), + color=(84, 93, 69), + button=(903, 82, 987, 113), + ), en=Button( file='./assets/en/mission/QUEST_ON.png', area=(861, 71, 1025, 124), @@ -293,7 +389,13 @@ QUEST_ON = ButtonWrapper( ) RIGHT = ButtonWrapper( name='RIGHT', - jp=None, + jp=Button( + file='./assets/jp/mission/RIGHT.png', + area=(1202, 311, 1280, 412), + search=(1182, 291, 1280, 432), + color=(193, 223, 241), + button=(1202, 311, 1280, 412), + ), en=Button( file='./assets/en/mission/RIGHT.png', area=(1202, 311, 1280, 412), @@ -311,7 +413,13 @@ RIGHT = ButtonWrapper( ) SELECT_CR = ButtonWrapper( name='SELECT_CR', - jp=None, + jp=Button( + file='./assets/jp/mission/SELECT_CR.png', + area=(1009, 271, 1226, 312), + search=(989, 251, 1246, 332), + color=(207, 213, 221), + button=(1009, 271, 1226, 312), + ), en=Button( file='./assets/en/mission/SELECT_CR.png', area=(1004, 267, 1237, 321), @@ -329,7 +437,13 @@ SELECT_CR = ButtonWrapper( ) SELECT_XP = ButtonWrapper( name='SELECT_XP', - jp=None, + jp=Button( + file='./assets/jp/mission/SELECT_XP.png', + area=(1095, 166, 1224, 205), + search=(1075, 146, 1244, 225), + color=(175, 185, 198), + button=(1095, 166, 1224, 205), + ), en=Button( file='./assets/en/mission/SELECT_XP.png', area=(1016, 165, 1227, 211), diff --git a/tasks/momotalk/assets/assets_momotalk.py b/tasks/momotalk/assets/assets_momotalk.py index 7154630..e6f98a2 100644 --- a/tasks/momotalk/assets/assets_momotalk.py +++ b/tasks/momotalk/assets/assets_momotalk.py @@ -5,7 +5,13 @@ from module.base.button import Button, ButtonWrapper BEGIN_STORY = ButtonWrapper( name='BEGIN_STORY', - jp=None, + jp=Button( + file='./assets/jp/momotalk/BEGIN_STORY.png', + area=(729, 533, 1110, 600), + search=(709, 513, 1130, 620), + color=(112, 210, 244), + button=(729, 533, 1110, 600), + ), en=Button( file='./assets/en/momotalk/BEGIN_STORY.png', area=(796, 540, 1059, 591), @@ -23,7 +29,13 @@ BEGIN_STORY = ButtonWrapper( ) CHATTING = ButtonWrapper( name='CHATTING', - jp=None, + jp=Button( + file='./assets/jp/momotalk/CHATTING.png', + area=(776, 520, 817, 545), + search=(756, 500, 837, 565), + color=(89, 103, 121), + button=(776, 520, 817, 545), + ), en=Button( file='./assets/en/momotalk/CHATTING.png', area=(774, 563, 821, 585), @@ -41,7 +53,13 @@ CHATTING = ButtonWrapper( ) CHAT_AREA = ButtonWrapper( name='CHAT_AREA', - jp=None, + jp=Button( + file='./assets/jp/momotalk/CHAT_AREA.png', + area=(686, 153, 1146, 626), + search=(666, 133, 1166, 646), + color=(190, 186, 195), + button=(686, 153, 1146, 626), + ), en=Button( file='./assets/en/momotalk/CHAT_AREA.png', area=(760, 149, 1149, 628), @@ -59,7 +77,13 @@ CHAT_AREA = ButtonWrapper( ) CONFIRM_SKIP = ButtonWrapper( name='CONFIRM_SKIP', - jp=None, + jp=Button( + file='./assets/jp/momotalk/CONFIRM_SKIP.png', + area=(664, 491, 871, 554), + search=(644, 471, 891, 574), + color=(113, 214, 249), + button=(664, 491, 871, 554), + ), en=Button( file='./assets/en/momotalk/CONFIRM_SKIP.png', area=(674, 486, 871, 555), @@ -77,7 +101,13 @@ CONFIRM_SKIP = ButtonWrapper( ) CONFIRM_SORT = ButtonWrapper( name='CONFIRM_SORT', - jp=None, + jp=Button( + file='./assets/jp/momotalk/CONFIRM_SORT.png', + area=(243, 403, 656, 440), + search=(223, 383, 676, 460), + color=(252, 253, 253), + button=(243, 403, 656, 440), + ), en=Button( file='./assets/en/momotalk/CONFIRM_SORT.png', area=(239, 407, 657, 439), @@ -95,7 +125,13 @@ CONFIRM_SORT = ButtonWrapper( ) FIRST_UNREAD = ButtonWrapper( name='FIRST_UNREAD', - jp=None, + jp=Button( + file='./assets/jp/momotalk/FIRST_UNREAD.png', + area=(635, 244, 660, 272), + search=(615, 224, 680, 292), + color=(251, 85, 43), + button=(635, 244, 660, 272), + ), en=Button( file='./assets/en/momotalk/FIRST_UNREAD.png', area=(636, 239, 661, 265), @@ -113,7 +149,13 @@ FIRST_UNREAD = ButtonWrapper( ) MENU = ButtonWrapper( name='MENU', - jp=None, + jp=Button( + file='./assets/jp/momotalk/MENU.png', + area=(1159, 28, 1249, 55), + search=(1139, 8, 1269, 75), + color=(184, 192, 201), + button=(1159, 28, 1249, 55), + ), en=Button( file='./assets/en/momotalk/MENU.png', area=(1156, 15, 1251, 63), @@ -131,7 +173,13 @@ MENU = ButtonWrapper( ) NOTIFICATION_BADGE = ButtonWrapper( name='NOTIFICATION_BADGE', - jp=None, + jp=Button( + file='./assets/jp/momotalk/NOTIFICATION_BADGE.png', + area=(163, 107, 196, 129), + search=(143, 87, 216, 149), + color=(240, 110, 65), + button=(163, 107, 196, 129), + ), en=Button( file='./assets/en/momotalk/NOTIFICATION_BADGE.png', area=(171, 109, 200, 128), @@ -149,7 +197,13 @@ NOTIFICATION_BADGE = ButtonWrapper( ) REPLY = ButtonWrapper( name='REPLY', - jp=None, + jp=Button( + file='./assets/jp/momotalk/REPLY.png', + area=(792, 509, 868, 530), + search=(772, 489, 888, 550), + color=(172, 184, 193), + button=(792, 509, 868, 530), + ), en=Button( file='./assets/en/momotalk/REPLY.png', area=(791, 431, 855, 462), @@ -167,7 +221,13 @@ REPLY = ButtonWrapper( ) SELECT_STUDENT = ButtonWrapper( name='SELECT_STUDENT', - jp=None, + jp=Button( + file='./assets/jp/momotalk/SELECT_STUDENT.png', + area=(801, 374, 1023, 399), + search=(781, 354, 1043, 419), + color=(226, 227, 228), + button=(801, 374, 1023, 399), + ), en=Button( file='./assets/en/momotalk/SELECT_STUDENT.png', area=(839, 369, 998, 403), @@ -185,7 +245,13 @@ SELECT_STUDENT = ButtonWrapper( ) SKIP = ButtonWrapper( name='SKIP', - jp=None, + jp=Button( + file='./assets/jp/momotalk/SKIP.png', + area=(1188, 96, 1233, 142), + search=(1168, 76, 1253, 162), + color=(87, 107, 130), + button=(1188, 96, 1233, 142), + ), en=Button( file='./assets/en/momotalk/SKIP.png', area=(1192, 103, 1229, 141), @@ -203,7 +269,13 @@ SKIP = ButtonWrapper( ) SORT_ASCENDING = ButtonWrapper( name='SORT_ASCENDING', - jp=None, + jp=Button( + file='./assets/jp/momotalk/SORT_ASCENDING.png', + area=(633, 166, 646, 186), + search=(613, 146, 666, 206), + color=(205, 216, 224), + button=(633, 166, 646, 186), + ), en=Button( file='./assets/en/momotalk/SORT_ASCENDING.png', area=(631, 166, 648, 188), @@ -221,7 +293,13 @@ SORT_ASCENDING = ButtonWrapper( ) SORT_DESCENDING = ButtonWrapper( name='SORT_DESCENDING', - jp=None, + jp=Button( + file='./assets/jp/momotalk/SORT_DESCENDING.png', + area=(633, 168, 646, 187), + search=(613, 148, 666, 207), + color=(202, 212, 221), + button=(633, 168, 646, 187), + ), en=Button( file='./assets/en/momotalk/SORT_DESCENDING.png', area=(631, 166, 648, 189), @@ -239,7 +317,13 @@ SORT_DESCENDING = ButtonWrapper( ) STORY = ButtonWrapper( name='STORY', - jp=None, + jp=Button( + file='./assets/jp/momotalk/STORY.png', + area=(792, 531, 887, 553), + search=(772, 511, 907, 573), + color=(218, 206, 212), + button=(792, 531, 887, 553), + ), en=Button( file='./assets/en/momotalk/STORY.png', area=(790, 529, 979, 557), @@ -257,7 +341,13 @@ STORY = ButtonWrapper( ) SWITCH_MESSAGE = ButtonWrapper( name='SWITCH_MESSAGE', - jp=None, + jp=Button( + file='./assets/jp/momotalk/SWITCH_MESSAGE.png', + area=(150, 271, 193, 297), + search=(130, 251, 213, 317), + color=(194, 198, 206), + button=(150, 271, 193, 297), + ), en=Button( file='./assets/en/momotalk/SWITCH_MESSAGE.png', area=(147, 271, 194, 297), @@ -275,7 +365,13 @@ SWITCH_MESSAGE = ButtonWrapper( ) SWITCH_MESSAGE_CHECK = ButtonWrapper( name='SWITCH_MESSAGE_CHECK', - jp=None, + jp=Button( + file='./assets/jp/momotalk/SWITCH_MESSAGE_CHECK.png', + area=(231, 167, 379, 190), + search=(211, 147, 399, 210), + color=(197, 201, 202), + button=(231, 167, 379, 190), + ), en=Button( file='./assets/en/momotalk/SWITCH_MESSAGE_CHECK.png', area=(228, 165, 391, 194), @@ -293,7 +389,13 @@ SWITCH_MESSAGE_CHECK = ButtonWrapper( ) SWITCH_STUDENT = ButtonWrapper( name='SWITCH_STUDENT', - jp=None, + jp=Button( + file='./assets/jp/momotalk/SWITCH_STUDENT.png', + area=(151, 168, 193, 213), + search=(131, 148, 213, 233), + color=(169, 176, 188), + button=(151, 168, 193, 213), + ), en=Button( file='./assets/en/momotalk/SWITCH_STUDENT.png', area=(148, 167, 194, 217), @@ -311,7 +413,13 @@ SWITCH_STUDENT = ButtonWrapper( ) SWITCH_STUDENT_CHECK = ButtonWrapper( name='SWITCH_STUDENT_CHECK', - jp=None, + jp=Button( + file='./assets/jp/momotalk/SWITCH_STUDENT_CHECK.png', + area=(232, 168, 275, 190), + search=(212, 148, 295, 210), + color=(169, 174, 176), + button=(232, 168, 275, 190), + ), en=Button( file='./assets/en/momotalk/SWITCH_STUDENT_CHECK.png', area=(229, 166, 320, 192), @@ -329,7 +437,13 @@ SWITCH_STUDENT_CHECK = ButtonWrapper( ) UNREAD = ButtonWrapper( name='UNREAD', - jp=None, + jp=Button( + file='./assets/jp/momotalk/UNREAD.png', + area=(454, 158, 570, 194), + search=(434, 138, 590, 214), + color=(242, 243, 243), + button=(454, 158, 570, 194), + ), en=Button( file='./assets/en/momotalk/UNREAD.png', area=(454, 160, 568, 193), @@ -347,7 +461,13 @@ UNREAD = ButtonWrapper( ) UNREAD_OFF = ButtonWrapper( name='UNREAD_OFF', - jp=None, + jp=Button( + file='./assets/jp/momotalk/UNREAD_OFF.png', + area=(458, 273, 655, 314), + search=(438, 253, 675, 334), + color=(252, 252, 252), + button=(458, 273, 655, 314), + ), en=Button( file='./assets/en/momotalk/UNREAD_OFF.png', area=(456, 273, 658, 316), @@ -365,7 +485,13 @@ UNREAD_OFF = ButtonWrapper( ) UNREAD_ON = ButtonWrapper( name='UNREAD_ON', - jp=None, + jp=Button( + file='./assets/jp/momotalk/UNREAD_ON.png', + area=(463, 274, 653, 314), + search=(443, 254, 673, 334), + color=(245, 118, 143), + button=(463, 274, 653, 314), + ), en=Button( file='./assets/en/momotalk/UNREAD_ON.png', area=(456, 272, 658, 314), diff --git a/tasks/schedule/assets/assets_schedule.py b/tasks/schedule/assets/assets_schedule.py index 2e39721..34d3b26 100644 --- a/tasks/schedule/assets/assets_schedule.py +++ b/tasks/schedule/assets/assets_schedule.py @@ -5,7 +5,13 @@ from module.base.button import Button, ButtonWrapper CONFIRM = ButtonWrapper( name='CONFIRM', - jp=None, + jp=Button( + file='./assets/jp/schedule/CONFIRM.png', + area=(532, 524, 742, 591), + search=(512, 504, 762, 611), + color=(114, 214, 249), + button=(532, 524, 742, 591), + ), en=Button( file='./assets/en/schedule/CONFIRM.png', area=(532, 528, 748, 589), @@ -23,7 +29,13 @@ CONFIRM = ButtonWrapper( ) FIRST_ITEM = ButtonWrapper( name='FIRST_ITEM', - jp=None, + jp=Button( + file='./assets/jp/schedule/FIRST_ITEM.png', + area=(751, 137, 1133, 236), + search=(731, 117, 1153, 256), + color=(199, 210, 222), + button=(751, 137, 1133, 236), + ), en=Button( file='./assets/en/schedule/FIRST_ITEM.png', area=(727, 137, 1103, 239), @@ -41,7 +53,13 @@ FIRST_ITEM = ButtonWrapper( ) LOCATIONS = ButtonWrapper( name='LOCATIONS', - jp=None, + jp=Button( + file='./assets/jp/schedule/LOCATIONS.png', + area=(1085, 637, 1249, 693), + search=(1065, 617, 1269, 713), + color=(107, 201, 237), + button=(1085, 637, 1249, 693), + ), en=Button( file='./assets/en/schedule/LOCATIONS.png', area=(1075, 638, 1256, 693), @@ -59,7 +77,13 @@ LOCATIONS = ButtonWrapper( ) LOCATIONS_POPUP = ButtonWrapper( name='LOCATIONS_POPUP', - jp=None, + jp=Button( + file='./assets/jp/schedule/LOCATIONS_POPUP.png', + area=(489, 99, 792, 135), + search=(469, 79, 812, 155), + color=(202, 209, 216), + button=(489, 99, 792, 135), + ), en=Button( file='./assets/en/schedule/LOCATIONS_POPUP.png', area=(534, 101, 750, 135), @@ -77,7 +101,13 @@ LOCATIONS_POPUP = ButtonWrapper( ) OCR_TICKET = ButtonWrapper( name='OCR_TICKET', - jp=None, + jp=Button( + file='./assets/jp/schedule/OCR_TICKET.png', + area=(187, 86, 235, 114), + search=(167, 66, 255, 134), + color=(220, 230, 232), + button=(187, 86, 235, 114), + ), en=Button( file='./assets/en/schedule/OCR_TICKET.png', area=(220, 79, 266, 121), @@ -97,10 +127,10 @@ SCROLL = ButtonWrapper( name='SCROLL', jp=Button( file='./assets/jp/schedule/SCROLL.png', - area=(742, 136, 1101, 671), - search=(722, 116, 1121, 691), - color=(198, 214, 210), - button=(742, 136, 1101, 671), + area=(749, 140, 1130, 669), + search=(729, 120, 1150, 689), + color=(197, 215, 212), + button=(749, 140, 1130, 669), ), en=Button( file='./assets/en/schedule/SCROLL.png', @@ -119,7 +149,13 @@ SCROLL = ButtonWrapper( ) START_LESSON = ButtonWrapper( name='START_LESSON', - jp=None, + jp=Button( + file='./assets/jp/schedule/START_LESSON.png', + area=(513, 534, 770, 568), + search=(493, 514, 790, 588), + color=(101, 187, 220), + button=(513, 534, 770, 568), + ), en=Button( file='./assets/en/schedule/START_LESSON.png', area=(506, 523, 773, 585), diff --git a/tasks/shop/assets/assets_shop.py b/tasks/shop/assets/assets_shop.py index ff4534c..e5bd337 100644 --- a/tasks/shop/assets/assets_shop.py +++ b/tasks/shop/assets/assets_shop.py @@ -5,7 +5,13 @@ from module.base.button import Button, ButtonWrapper CONFIRM_PURCHASE = ButtonWrapper( name='CONFIRM_PURCHASE', - jp=None, + jp=Button( + file='./assets/jp/shop/CONFIRM_PURCHASE.png', + area=(465, 231, 809, 307), + search=(445, 211, 829, 327), + color=(213, 214, 215), + button=(670, 458, 865, 516), + ), en=Button( file='./assets/en/shop/CONFIRM_PURCHASE.png', area=(467, 231, 807, 309), @@ -23,7 +29,13 @@ CONFIRM_PURCHASE = ButtonWrapper( ) CONFIRM_REFRESH = ButtonWrapper( name='CONFIRM_REFRESH', - jp=None, + jp=Button( + file='./assets/jp/shop/CONFIRM_REFRESH.png', + area=(451, 271, 825, 304), + search=(431, 251, 845, 324), + color=(200, 201, 202), + button=(677, 430, 861, 498), + ), en=Button( file='./assets/en/shop/CONFIRM_REFRESH.png', area=(474, 271, 806, 306), @@ -41,7 +53,13 @@ CONFIRM_REFRESH = ButtonWrapper( ) ITEM_LIST = ButtonWrapper( name='ITEM_LIST', - jp=None, + jp=Button( + file='./assets/jp/shop/ITEM_LIST.png', + area=(622, 126, 1241, 612), + search=(602, 106, 1261, 632), + color=(194, 207, 215), + button=(622, 126, 1241, 612), + ), en=Button( file='./assets/en/shop/ITEM_LIST.png', area=(625, 127, 1244, 610), @@ -59,7 +77,13 @@ ITEM_LIST = ButtonWrapper( ) NORMAL_OFF = ButtonWrapper( name='NORMAL_OFF', - jp=None, + jp=Button( + file='./assets/jp/shop/NORMAL_OFF.png', + area=(6, 109, 206, 167), + search=(0, 89, 226, 187), + color=(240, 241, 240), + button=(6, 109, 206, 167), + ), en=Button( file='./assets/en/shop/NORMAL_OFF.png', area=(4, 111, 213, 167), @@ -77,7 +101,13 @@ NORMAL_OFF = ButtonWrapper( ) NORMAL_ON = ButtonWrapper( name='NORMAL_ON', - jp=None, + jp=Button( + file='./assets/jp/shop/NORMAL_ON.png', + area=(9, 114, 205, 164), + search=(0, 94, 225, 184), + color=(71, 88, 91), + button=(9, 114, 205, 164), + ), en=Button( file='./assets/en/shop/NORMAL_ON.png', area=(4, 109, 212, 170), @@ -95,7 +125,13 @@ NORMAL_ON = ButtonWrapper( ) OCR_REFRESH = ButtonWrapper( name='OCR_REFRESH', - jp=None, + jp=Button( + file='./assets/jp/shop/OCR_REFRESH.png', + area=(674, 308, 717, 332), + search=(654, 288, 737, 352), + color=(211, 212, 213), + button=(674, 308, 717, 332), + ), en=Button( file='./assets/en/shop/OCR_REFRESH.png', area=(712, 302, 762, 344), @@ -113,7 +149,13 @@ OCR_REFRESH = ButtonWrapper( ) PURCHASE = ButtonWrapper( name='PURCHASE', - jp=None, + jp=Button( + file='./assets/jp/shop/PURCHASE.png', + area=(1106, 637, 1223, 685), + search=(1086, 617, 1243, 705), + color=(235, 217, 68), + button=(1106, 637, 1223, 685), + ), en=Button( file='./assets/en/shop/PURCHASE.png', area=(1102, 640, 1227, 684), @@ -131,7 +173,13 @@ PURCHASE = ButtonWrapper( ) REFRESH = ButtonWrapper( name='REFRESH', - jp=None, + jp=Button( + file='./assets/jp/shop/REFRESH.png', + area=(1096, 641, 1223, 683), + search=(1076, 621, 1243, 703), + color=(233, 235, 238), + button=(1096, 641, 1223, 683), + ), en=Button( file='./assets/en/shop/REFRESH.png', area=(1098, 643, 1223, 682), @@ -149,7 +197,13 @@ REFRESH = ButtonWrapper( ) TC_OFF = ButtonWrapper( name='TC_OFF', - jp=None, + jp=Button( + file='./assets/jp/shop/TC_OFF.png', + area=(9, 499, 199, 553), + search=(0, 479, 219, 573), + color=(230, 234, 237), + button=(9, 499, 199, 553), + ), en=Button( file='./assets/en/shop/TC_OFF.png', area=(2, 503, 209, 558), @@ -167,7 +221,13 @@ TC_OFF = ButtonWrapper( ) TC_ON = ButtonWrapper( name='TC_ON', - jp=None, + jp=Button( + file='./assets/jp/shop/TC_ON.png', + area=(9, 502, 199, 550), + search=(0, 482, 219, 570), + color=(77, 95, 94), + button=(9, 502, 199, 550), + ), en=Button( file='./assets/en/shop/TC_ON.png', area=(3, 493, 208, 548), diff --git a/tasks/task/assets/assets_task.py b/tasks/task/assets/assets_task.py index e85455a..41f753f 100644 --- a/tasks/task/assets/assets_task.py +++ b/tasks/task/assets/assets_task.py @@ -101,7 +101,13 @@ CLAIM_ALL = ButtonWrapper( ) COMPLETE = ButtonWrapper( name='COMPLETE', - jp=None, + jp=Button( + file='./assets/jp/task/COMPLETE.png', + area=(933, 644, 1016, 697), + search=(913, 624, 1036, 717), + color=(127, 131, 135), + button=(933, 644, 1016, 697), + ), en=Button( file='./assets/en/task/COMPLETE.png', area=(921, 643, 1026, 692),