diff --git a/assets/jp/base/page/BACK.png b/assets/jp/base/page/BACK.png deleted file mode 100644 index e36fd57..0000000 Binary files a/assets/jp/base/page/BACK.png and /dev/null differ diff --git a/assets/jp/base/page/HOME.png b/assets/jp/base/page/HOME.png deleted file mode 100644 index 6cc85e1..0000000 Binary files a/assets/jp/base/page/HOME.png and /dev/null differ diff --git a/assets/jp/base/page/LOADING_CHECK.png b/assets/jp/base/page/LOADING_CHECK.png deleted file mode 100644 index 25fed20..0000000 Binary files a/assets/jp/base/page/LOADING_CHECK.png and /dev/null differ diff --git a/assets/jp/base/page/MAIN_GO_TO_CAFE.png b/assets/jp/base/page/MAIN_GO_TO_CAFE.png deleted file mode 100644 index 5547831..0000000 Binary files a/assets/jp/base/page/MAIN_GO_TO_CAFE.png and /dev/null differ diff --git a/assets/jp/base/page/MAIN_GO_TO_CIRCLE.png b/assets/jp/base/page/MAIN_GO_TO_CIRCLE.png deleted file mode 100644 index e4d1169..0000000 Binary files a/assets/jp/base/page/MAIN_GO_TO_CIRCLE.png and /dev/null differ diff --git a/assets/jp/base/page/MAIN_GO_TO_CRAFTING.png b/assets/jp/base/page/MAIN_GO_TO_CRAFTING.png deleted file mode 100644 index e607c6a..0000000 Binary files a/assets/jp/base/page/MAIN_GO_TO_CRAFTING.png and /dev/null differ diff --git a/assets/jp/base/page/MAIN_GO_TO_GACHA.png b/assets/jp/base/page/MAIN_GO_TO_GACHA.png deleted file mode 100644 index a7e8d33..0000000 Binary files a/assets/jp/base/page/MAIN_GO_TO_GACHA.png and /dev/null differ diff --git a/assets/jp/base/page/MAIN_GO_TO_MAIL.png b/assets/jp/base/page/MAIN_GO_TO_MAIL.png deleted file mode 100644 index 202ae87..0000000 Binary files a/assets/jp/base/page/MAIN_GO_TO_MAIL.png and /dev/null differ diff --git a/assets/jp/base/page/MAIN_GO_TO_MOMOTALK.png b/assets/jp/base/page/MAIN_GO_TO_MOMOTALK.png deleted file mode 100644 index 58d3cf1..0000000 Binary files a/assets/jp/base/page/MAIN_GO_TO_MOMOTALK.png and /dev/null differ diff --git a/assets/jp/base/page/MAIN_GO_TO_PURCHASE.png b/assets/jp/base/page/MAIN_GO_TO_PURCHASE.png deleted file mode 100644 index 4e365b3..0000000 Binary files a/assets/jp/base/page/MAIN_GO_TO_PURCHASE.png and /dev/null differ diff --git a/assets/jp/base/page/MAIN_GO_TO_SCHEDULE.png b/assets/jp/base/page/MAIN_GO_TO_SCHEDULE.png deleted file mode 100644 index 146282b..0000000 Binary files a/assets/jp/base/page/MAIN_GO_TO_SCHEDULE.png and /dev/null differ diff --git a/assets/jp/base/page/MAIN_GO_TO_SHOP.png b/assets/jp/base/page/MAIN_GO_TO_SHOP.png deleted file mode 100644 index a8e8d89..0000000 Binary files a/assets/jp/base/page/MAIN_GO_TO_SHOP.png and /dev/null differ diff --git a/assets/jp/base/page/MAIN_GO_TO_TASK.png b/assets/jp/base/page/MAIN_GO_TO_TASK.png deleted file mode 100644 index 7dae9e8..0000000 Binary files a/assets/jp/base/page/MAIN_GO_TO_TASK.png and /dev/null differ diff --git a/assets/jp/base/page/MOMOTALK_CHECK.png b/assets/jp/base/page/MOMOTALK_CHECK.png deleted file mode 100644 index 455678a..0000000 Binary files a/assets/jp/base/page/MOMOTALK_CHECK.png and /dev/null differ diff --git a/assets/jp/base/page/MOMOTALK_GO_TO_MAIN.png b/assets/jp/base/page/MOMOTALK_GO_TO_MAIN.png deleted file mode 100644 index 6eda2d7..0000000 Binary files a/assets/jp/base/page/MOMOTALK_GO_TO_MAIN.png and /dev/null differ diff --git a/assets/jp/base/popup/DAILY_NEWS.BUTTON.png b/assets/jp/base/popup/DAILY_NEWS.BUTTON.png deleted file mode 100644 index 33a3f89..0000000 Binary files a/assets/jp/base/popup/DAILY_NEWS.BUTTON.png and /dev/null differ diff --git a/assets/jp/base/popup/DAILY_NEWS.png b/assets/jp/base/popup/DAILY_NEWS.png deleted file mode 100644 index 2f9da4b..0000000 Binary files a/assets/jp/base/popup/DAILY_NEWS.png and /dev/null differ diff --git a/assets/jp/base/popup/DAILY_REWARD.BUTTON.png b/assets/jp/base/popup/DAILY_REWARD.BUTTON.png deleted file mode 100644 index 1989880..0000000 Binary files a/assets/jp/base/popup/DAILY_REWARD.BUTTON.png and /dev/null differ diff --git a/assets/jp/base/popup/DAILY_REWARD.png b/assets/jp/base/popup/DAILY_REWARD.png deleted file mode 100644 index 57eb310..0000000 Binary files a/assets/jp/base/popup/DAILY_REWARD.png and /dev/null differ diff --git a/assets/jp/base/popup/GET_NEW_STUDENT.BUTTON.png b/assets/jp/base/popup/GET_NEW_STUDENT.BUTTON.png deleted file mode 100644 index da6e87e..0000000 Binary files a/assets/jp/base/popup/GET_NEW_STUDENT.BUTTON.png and /dev/null differ diff --git a/assets/jp/base/popup/GET_NEW_STUDENT.png b/assets/jp/base/popup/GET_NEW_STUDENT.png deleted file mode 100644 index 7e9fe54..0000000 Binary files a/assets/jp/base/popup/GET_NEW_STUDENT.png and /dev/null differ diff --git a/assets/jp/cafe/BOX_CAFE.png b/assets/jp/cafe/BOX_CAFE.png deleted file mode 100644 index 6a883b1..0000000 Binary files a/assets/jp/cafe/BOX_CAFE.png and /dev/null differ diff --git a/assets/jp/cafe/BOX_SEARCH.png b/assets/jp/cafe/BOX_SEARCH.png deleted file mode 100644 index 222f8c9..0000000 Binary files a/assets/jp/cafe/BOX_SEARCH.png and /dev/null differ diff --git a/assets/jp/cafe/CLICKABLE_TEMPLATE.png b/assets/jp/cafe/CLICKABLE_TEMPLATE.png deleted file mode 100644 index fb6344b..0000000 Binary files a/assets/jp/cafe/CLICKABLE_TEMPLATE.png and /dev/null differ diff --git a/assets/en/base/page/BACK.png b/assets/share/base/page/BACK.png similarity index 100% rename from assets/en/base/page/BACK.png rename to assets/share/base/page/BACK.png diff --git a/assets/en/base/page/HOME.png b/assets/share/base/page/HOME.png similarity index 100% rename from assets/en/base/page/HOME.png rename to assets/share/base/page/HOME.png diff --git a/assets/en/base/page/LOADING_CHECK.png b/assets/share/base/page/LOADING_CHECK.png similarity index 100% rename from assets/en/base/page/LOADING_CHECK.png rename to assets/share/base/page/LOADING_CHECK.png diff --git a/assets/en/base/page/MAIN_GO_TO_CAFE.png b/assets/share/base/page/MAIN_GO_TO_CAFE.png similarity index 100% rename from assets/en/base/page/MAIN_GO_TO_CAFE.png rename to assets/share/base/page/MAIN_GO_TO_CAFE.png diff --git a/assets/en/base/page/MAIN_GO_TO_CIRCLE.png b/assets/share/base/page/MAIN_GO_TO_CIRCLE.png similarity index 100% rename from assets/en/base/page/MAIN_GO_TO_CIRCLE.png rename to assets/share/base/page/MAIN_GO_TO_CIRCLE.png diff --git a/assets/en/base/page/MAIN_GO_TO_CRAFTING.png b/assets/share/base/page/MAIN_GO_TO_CRAFTING.png similarity index 100% rename from assets/en/base/page/MAIN_GO_TO_CRAFTING.png rename to assets/share/base/page/MAIN_GO_TO_CRAFTING.png diff --git a/assets/en/base/page/MAIN_GO_TO_GACHA.png b/assets/share/base/page/MAIN_GO_TO_GACHA.png similarity index 100% rename from assets/en/base/page/MAIN_GO_TO_GACHA.png rename to assets/share/base/page/MAIN_GO_TO_GACHA.png diff --git a/assets/en/base/page/MAIN_GO_TO_MAIL.png b/assets/share/base/page/MAIN_GO_TO_MAIL.png similarity index 100% rename from assets/en/base/page/MAIN_GO_TO_MAIL.png rename to assets/share/base/page/MAIN_GO_TO_MAIL.png diff --git a/assets/en/base/page/MAIN_GO_TO_MOMOTALK.png b/assets/share/base/page/MAIN_GO_TO_MOMOTALK.png similarity index 100% rename from assets/en/base/page/MAIN_GO_TO_MOMOTALK.png rename to assets/share/base/page/MAIN_GO_TO_MOMOTALK.png diff --git a/assets/en/base/page/MAIN_GO_TO_PURCHASE.png b/assets/share/base/page/MAIN_GO_TO_PURCHASE.png similarity index 100% rename from assets/en/base/page/MAIN_GO_TO_PURCHASE.png rename to assets/share/base/page/MAIN_GO_TO_PURCHASE.png diff --git a/assets/en/base/page/MAIN_GO_TO_SCHEDULE.png b/assets/share/base/page/MAIN_GO_TO_SCHEDULE.png similarity index 100% rename from assets/en/base/page/MAIN_GO_TO_SCHEDULE.png rename to assets/share/base/page/MAIN_GO_TO_SCHEDULE.png diff --git a/assets/en/base/page/MAIN_GO_TO_SHOP.png b/assets/share/base/page/MAIN_GO_TO_SHOP.png similarity index 100% rename from assets/en/base/page/MAIN_GO_TO_SHOP.png rename to assets/share/base/page/MAIN_GO_TO_SHOP.png diff --git a/assets/en/base/page/MAIN_GO_TO_TASK.png b/assets/share/base/page/MAIN_GO_TO_TASK.png similarity index 100% rename from assets/en/base/page/MAIN_GO_TO_TASK.png rename to assets/share/base/page/MAIN_GO_TO_TASK.png diff --git a/assets/en/base/page/MOMOTALK_CHECK.png b/assets/share/base/page/MOMOTALK_CHECK.png similarity index 100% rename from assets/en/base/page/MOMOTALK_CHECK.png rename to assets/share/base/page/MOMOTALK_CHECK.png diff --git a/assets/en/base/page/MOMOTALK_GO_TO_MAIN.png b/assets/share/base/page/MOMOTALK_GO_TO_MAIN.png similarity index 100% rename from assets/en/base/page/MOMOTALK_GO_TO_MAIN.png rename to assets/share/base/page/MOMOTALK_GO_TO_MAIN.png diff --git a/assets/en/base/popup/DAILY_NEWS.BUTTON.png b/assets/share/base/popup/DAILY_NEWS.BUTTON.png similarity index 100% rename from assets/en/base/popup/DAILY_NEWS.BUTTON.png rename to assets/share/base/popup/DAILY_NEWS.BUTTON.png diff --git a/assets/en/base/popup/DAILY_NEWS.png b/assets/share/base/popup/DAILY_NEWS.png similarity index 100% rename from assets/en/base/popup/DAILY_NEWS.png rename to assets/share/base/popup/DAILY_NEWS.png diff --git a/assets/en/base/popup/DAILY_REWARD.BUTTON.png b/assets/share/base/popup/DAILY_REWARD.BUTTON.png similarity index 100% rename from assets/en/base/popup/DAILY_REWARD.BUTTON.png rename to assets/share/base/popup/DAILY_REWARD.BUTTON.png diff --git a/assets/en/base/popup/DAILY_REWARD.png b/assets/share/base/popup/DAILY_REWARD.png similarity index 100% rename from assets/en/base/popup/DAILY_REWARD.png rename to assets/share/base/popup/DAILY_REWARD.png diff --git a/assets/en/base/popup/GET_NEW_STUDENT.BUTTON.png b/assets/share/base/popup/GET_NEW_STUDENT.BUTTON.png similarity index 100% rename from assets/en/base/popup/GET_NEW_STUDENT.BUTTON.png rename to assets/share/base/popup/GET_NEW_STUDENT.BUTTON.png diff --git a/assets/en/base/popup/GET_NEW_STUDENT.png b/assets/share/base/popup/GET_NEW_STUDENT.png similarity index 100% rename from assets/en/base/popup/GET_NEW_STUDENT.png rename to assets/share/base/popup/GET_NEW_STUDENT.png diff --git a/assets/en/cafe/BOX_CAFE.png b/assets/share/cafe/BOX_CAFE.png similarity index 100% rename from assets/en/cafe/BOX_CAFE.png rename to assets/share/cafe/BOX_CAFE.png diff --git a/assets/en/cafe/BOX_SEARCH.png b/assets/share/cafe/BOX_SEARCH.png similarity index 100% rename from assets/en/cafe/BOX_SEARCH.png rename to assets/share/cafe/BOX_SEARCH.png diff --git a/assets/en/cafe/CLICKABLE_TEMPLATE.png b/assets/share/cafe/CLICKABLE_TEMPLATE.png similarity index 100% rename from assets/en/cafe/CLICKABLE_TEMPLATE.png rename to assets/share/cafe/CLICKABLE_TEMPLATE.png diff --git a/tasks/base/assets/assets_base_page.py b/tasks/base/assets/assets_base_page.py index a33d9ac..1d9bf47 100644 --- a/tasks/base/assets/assets_base_page.py +++ b/tasks/base/assets/assets_base_page.py @@ -22,15 +22,8 @@ ACCOUNT_INFO_CHECK = ButtonWrapper( ) BACK = ButtonWrapper( name='BACK', - jp=Button( - file='./assets/jp/base/page/BACK.png', - area=(34, 19, 81, 56), - search=(14, 0, 101, 76), - color=(93, 118, 164), - button=(34, 19, 81, 56), - ), - en=Button( - file='./assets/en/base/page/BACK.png', + share=Button( + file='./assets/share/base/page/BACK.png', area=(34, 19, 81, 56), search=(14, 0, 101, 76), color=(93, 118, 164), @@ -141,15 +134,8 @@ GACHA_CHECK = ButtonWrapper( ) HOME = ButtonWrapper( name='HOME', - jp=Button( - file='./assets/jp/base/page/HOME.png', - area=(1218, 8, 1253, 41), - search=(1198, 0, 1273, 61), - color=(168, 182, 205), - button=(1218, 8, 1253, 41), - ), - en=Button( - file='./assets/en/base/page/HOME.png', + share=Button( + file='./assets/share/base/page/HOME.png', area=(1218, 8, 1253, 41), search=(1198, 0, 1273, 61), color=(168, 182, 205), @@ -158,15 +144,8 @@ HOME = ButtonWrapper( ) LOADING_CHECK = ButtonWrapper( name='LOADING_CHECK', - jp=Button( - file='./assets/jp/base/page/LOADING_CHECK.png', - area=(1084, 659, 1120, 674), - search=(1064, 639, 1140, 694), - color=(173, 196, 219), - button=(1084, 659, 1120, 674), - ), - en=Button( - file='./assets/en/base/page/LOADING_CHECK.png', + share=Button( + file='./assets/share/base/page/LOADING_CHECK.png', area=(1084, 659, 1120, 674), search=(1064, 639, 1140, 694), color=(173, 196, 219), @@ -192,15 +171,8 @@ MAIL_CHECK = ButtonWrapper( ) MAIN_GO_TO_CAFE = ButtonWrapper( name='MAIN_GO_TO_CAFE', - jp=Button( - file='./assets/jp/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), - ), - en=Button( - file='./assets/en/base/page/MAIN_GO_TO_CAFE.png', + share=Button( + file='./assets/share/base/page/MAIN_GO_TO_CAFE.png', area=(81, 638, 102, 668), search=(61, 618, 122, 688), color=(156, 209, 233), @@ -209,15 +181,8 @@ MAIN_GO_TO_CAFE = ButtonWrapper( ) MAIN_GO_TO_CIRCLE = ButtonWrapper( name='MAIN_GO_TO_CIRCLE', - jp=Button( - file='./assets/jp/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), - ), - en=Button( - file='./assets/en/base/page/MAIN_GO_TO_CIRCLE.png', + share=Button( + file='./assets/share/base/page/MAIN_GO_TO_CIRCLE.png', area=(540, 631, 583, 660), search=(520, 611, 603, 680), color=(131, 204, 234), @@ -226,15 +191,8 @@ MAIN_GO_TO_CIRCLE = ButtonWrapper( ) MAIN_GO_TO_CRAFTING = ButtonWrapper( name='MAIN_GO_TO_CRAFTING', - jp=Button( - file='./assets/jp/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), - ), - en=Button( - file='./assets/en/base/page/MAIN_GO_TO_CRAFTING.png', + share=Button( + file='./assets/share/base/page/MAIN_GO_TO_CRAFTING.png', area=(665, 622, 693, 664), search=(645, 602, 713, 684), color=(192, 229, 241), @@ -243,15 +201,8 @@ MAIN_GO_TO_CRAFTING = ButtonWrapper( ) MAIN_GO_TO_GACHA = ButtonWrapper( name='MAIN_GO_TO_GACHA', - jp=Button( - file='./assets/jp/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), - ), - en=Button( - file='./assets/en/base/page/MAIN_GO_TO_GACHA.png', + share=Button( + file='./assets/share/base/page/MAIN_GO_TO_GACHA.png', area=(900, 623, 924, 670), search=(880, 603, 944, 690), color=(157, 219, 241), @@ -260,15 +211,8 @@ MAIN_GO_TO_GACHA = ButtonWrapper( ) MAIN_GO_TO_MAIL = ButtonWrapper( name='MAIN_GO_TO_MAIL', - jp=Button( - file='./assets/jp/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), - ), - en=Button( - file='./assets/en/base/page/MAIN_GO_TO_MAIL.png', + 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), @@ -277,15 +221,8 @@ MAIN_GO_TO_MAIL = ButtonWrapper( ) MAIN_GO_TO_MOMOTALK = ButtonWrapper( name='MAIN_GO_TO_MOMOTALK', - jp=Button( - file='./assets/jp/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), - ), - en=Button( - file='./assets/en/base/page/MAIN_GO_TO_MOMOTALK.png', + share=Button( + file='./assets/share/base/page/MAIN_GO_TO_MOMOTALK.png', area=(154, 134, 177, 158), search=(134, 114, 197, 178), color=(255, 219, 227), @@ -294,15 +231,8 @@ MAIN_GO_TO_MOMOTALK = ButtonWrapper( ) MAIN_GO_TO_PURCHASE = ButtonWrapper( name='MAIN_GO_TO_PURCHASE', - jp=Button( - file='./assets/jp/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), - ), - en=Button( - file='./assets/en/base/page/MAIN_GO_TO_PURCHASE.png', + share=Button( + file='./assets/share/base/page/MAIN_GO_TO_PURCHASE.png', area=(148, 204, 183, 253), search=(128, 184, 203, 273), color=(172, 214, 239), @@ -311,15 +241,8 @@ MAIN_GO_TO_PURCHASE = ButtonWrapper( ) MAIN_GO_TO_SCHEDULE = ButtonWrapper( name='MAIN_GO_TO_SCHEDULE', - jp=Button( - file='./assets/jp/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), - ), - en=Button( - file='./assets/en/base/page/MAIN_GO_TO_SCHEDULE.png', + share=Button( + file='./assets/share/base/page/MAIN_GO_TO_SCHEDULE.png', area=(194, 638, 216, 672), search=(174, 618, 236, 692), color=(149, 194, 222), @@ -328,15 +251,8 @@ MAIN_GO_TO_SCHEDULE = ButtonWrapper( ) MAIN_GO_TO_SHOP = ButtonWrapper( name='MAIN_GO_TO_SHOP', - jp=Button( - file='./assets/jp/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), - ), - en=Button( - file='./assets/en/base/page/MAIN_GO_TO_SHOP.png', + share=Button( + file='./assets/share/base/page/MAIN_GO_TO_SHOP.png', area=(773, 630, 816, 667), search=(753, 610, 836, 687), color=(146, 208, 235), @@ -345,15 +261,8 @@ MAIN_GO_TO_SHOP = ButtonWrapper( ) MAIN_GO_TO_TASK = ButtonWrapper( name='MAIN_GO_TO_TASK', - jp=Button( - file='./assets/jp/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), - ), - en=Button( - file='./assets/en/base/page/MAIN_GO_TO_TASK.png', + share=Button( + file='./assets/share/base/page/MAIN_GO_TO_TASK.png', area=(52, 220, 78, 248), search=(32, 200, 98, 268), color=(226, 207, 203), @@ -396,15 +305,8 @@ MISSION_CHECK = ButtonWrapper( ) MOMOTALK_CHECK = ButtonWrapper( 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), - ), - en=Button( - file='./assets/en/base/page/MOMOTALK_CHECK.png', + share=Button( + file='./assets/share/base/page/MOMOTALK_CHECK.png', area=(144, 107, 169, 130), search=(124, 87, 189, 150), color=(253, 211, 219), @@ -413,15 +315,8 @@ MOMOTALK_CHECK = ButtonWrapper( ) MOMOTALK_GO_TO_MAIN = ButtonWrapper( name='MOMOTALK_GO_TO_MAIN', - jp=Button( - file='./assets/jp/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), - ), - en=Button( - file='./assets/en/base/page/MOMOTALK_GO_TO_MAIN.png', + share=Button( + file='./assets/share/base/page/MOMOTALK_GO_TO_MAIN.png', area=(1108, 105, 1134, 131), search=(1088, 85, 1154, 151), color=(252, 182, 194), diff --git a/tasks/base/assets/assets_base_popup.py b/tasks/base/assets/assets_base_popup.py index 6c9bc43..2b1d4d5 100644 --- a/tasks/base/assets/assets_base_popup.py +++ b/tasks/base/assets/assets_base_popup.py @@ -39,15 +39,8 @@ AP_EXCEED = ButtonWrapper( ) DAILY_NEWS = ButtonWrapper( name='DAILY_NEWS', - jp=Button( - file='./assets/jp/base/popup/DAILY_NEWS.png', - area=(120, 89, 326, 113), - search=(100, 69, 346, 133), - color=(150, 204, 253), - button=(1128, 89, 1156, 117), - ), - en=Button( - file='./assets/en/base/popup/DAILY_NEWS.png', + share=Button( + file='./assets/share/base/popup/DAILY_NEWS.png', area=(120, 89, 326, 113), search=(100, 69, 346, 133), color=(150, 204, 253), @@ -56,15 +49,8 @@ DAILY_NEWS = ButtonWrapper( ) DAILY_REWARD = ButtonWrapper( name='DAILY_REWARD', - jp=Button( - file='./assets/jp/base/popup/DAILY_REWARD.png', - area=(416, 165, 434, 216), - search=(396, 145, 454, 236), - color=(203, 227, 237), - button=(920, 632, 1140, 712), - ), - en=Button( - file='./assets/en/base/popup/DAILY_REWARD.png', + share=Button( + file='./assets/share/base/popup/DAILY_REWARD.png', area=(416, 165, 434, 216), search=(396, 145, 454, 236), color=(203, 227, 237), @@ -73,15 +59,8 @@ DAILY_REWARD = ButtonWrapper( ) GET_NEW_STUDENT = ButtonWrapper( name='GET_NEW_STUDENT', - jp=Button( - file='./assets/jp/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), - ), - en=Button( - file='./assets/en/base/popup/GET_NEW_STUDENT.png', + share=Button( + file='./assets/share/base/popup/GET_NEW_STUDENT.png', area=(32, 93, 158, 114), search=(12, 73, 178, 134), color=(125, 132, 92), diff --git a/tasks/cafe/assets/assets_cafe.py b/tasks/cafe/assets/assets_cafe.py index e8fd438..bf9df06 100644 --- a/tasks/cafe/assets/assets_cafe.py +++ b/tasks/cafe/assets/assets_cafe.py @@ -5,15 +5,8 @@ from module.base.button import Button, ButtonWrapper BOX_CAFE = ButtonWrapper( name='BOX_CAFE', - jp=Button( - file='./assets/jp/cafe/BOX_CAFE.png', - area=(33, 130, 1247, 569), - search=(13, 110, 1267, 589), - color=(175, 181, 186), - button=(33, 130, 1247, 569), - ), - en=Button( - file='./assets/en/cafe/BOX_CAFE.png', + share=Button( + file='./assets/share/cafe/BOX_CAFE.png', area=(33, 130, 1247, 569), search=(13, 110, 1267, 589), color=(175, 181, 186), @@ -22,15 +15,8 @@ BOX_CAFE = ButtonWrapper( ) BOX_SEARCH = ButtonWrapper( name='BOX_SEARCH', - jp=Button( - file='./assets/jp/cafe/BOX_SEARCH.png', - area=(61, 72, 1176, 653), - search=(41, 52, 1196, 673), - color=(172, 180, 188), - button=(61, 72, 1176, 653), - ), - en=Button( - file='./assets/en/cafe/BOX_SEARCH.png', + share=Button( + file='./assets/share/cafe/BOX_SEARCH.png', area=(61, 72, 1176, 653), search=(41, 52, 1196, 673), color=(172, 180, 188), @@ -124,15 +110,8 @@ CHECK_REWARD = ButtonWrapper( ) CLICKABLE_TEMPLATE = ButtonWrapper( name='CLICKABLE_TEMPLATE', - jp=Button( - file='./assets/jp/cafe/CLICKABLE_TEMPLATE.png', - area=(619, 332, 660, 387), - search=(599, 312, 680, 407), - color=(79, 65, 1), - button=(619, 332, 660, 387), - ), - en=Button( - file='./assets/en/cafe/CLICKABLE_TEMPLATE.png', + share=Button( + file='./assets/share/cafe/CLICKABLE_TEMPLATE.png', area=(619, 332, 660, 387), search=(599, 312, 680, 407), color=(79, 65, 1),