diff --git a/assets/en-US/daemon/PLAY_HIGHLIGHTS.png b/assets/en-US/daemon/PLAY_HIGHLIGHTS.png new file mode 100644 index 00000000..8da730e0 Binary files /dev/null and b/assets/en-US/daemon/PLAY_HIGHLIGHTS.png differ diff --git a/assets/en-US/episode_viewing/INCOMPLETE.png b/assets/en-US/episode_viewing/INCOMPLETE.png new file mode 100644 index 00000000..af64968b Binary files /dev/null and b/assets/en-US/episode_viewing/INCOMPLETE.png differ diff --git a/assets/en-US/episode_viewing/REWARD.png b/assets/en-US/episode_viewing/REWARD.png new file mode 100644 index 00000000..d4f0a800 Binary files /dev/null and b/assets/en-US/episode_viewing/REWARD.png differ diff --git a/assets/en-US/ui/CONVERSATION_CHECK.png b/assets/en-US/ui/CONVERSATION_CHECK.png new file mode 100644 index 00000000..b226d382 Binary files /dev/null and b/assets/en-US/ui/CONVERSATION_CHECK.png differ diff --git a/assets/en-US/ui/CONVERSATION_GOTO_EPISODE_VIEWING.png b/assets/en-US/ui/CONVERSATION_GOTO_EPISODE_VIEWING.png new file mode 100644 index 00000000..84b8f37c Binary files /dev/null and b/assets/en-US/ui/CONVERSATION_GOTO_EPISODE_VIEWING.png differ diff --git a/assets/en-US/ui/EPISODE_VIEWING_CHECK.png b/assets/en-US/ui/EPISODE_VIEWING_CHECK.png new file mode 100644 index 00000000..9b8c9326 Binary files /dev/null and b/assets/en-US/ui/EPISODE_VIEWING_CHECK.png differ diff --git a/assets/en-US/ui/TEAM_CHECK.png b/assets/en-US/ui/TEAM_CHECK.png new file mode 100644 index 00000000..73968601 Binary files /dev/null and b/assets/en-US/ui/TEAM_CHECK.png differ diff --git a/assets/en-US/ui/TEAM_GOTO_CONVERSATION.png b/assets/en-US/ui/TEAM_GOTO_CONVERSATION.png new file mode 100644 index 00000000..1e943b8f Binary files /dev/null and b/assets/en-US/ui/TEAM_GOTO_CONVERSATION.png differ diff --git a/module/daemon/assets.py b/module/daemon/assets.py index e26a6680..c09fa1b3 100644 --- a/module/daemon/assets.py +++ b/module/daemon/assets.py @@ -13,4 +13,4 @@ MAIN_STORY_MARK_IN = Button(area={'zh-CN': (346, 583, 374, 637), 'en-US': (346, 583, 374, 637)}, color={'zh-CN': (162, 164, 164), 'en-US': (162, 164, 164)}, button={'zh-CN': (346, 583, 374, 637), 'en-US': (346, 583, 374, 637)}, file={'zh-CN': './assets/zh-CN/daemon/MAIN_STORY_MARK_IN.png', 'en-US': './assets/zh-CN/daemon/MAIN_STORY_MARK_IN.png'}) MAIN_STORY_MARK_OUT = Button(area={'zh-CN': (512, 1041, 534, 1090), 'en-US': (512, 1041, 534, 1090)}, color={'zh-CN': (157, 158, 158), 'en-US': (157, 158, 158)}, button={'zh-CN': (512, 1041, 534, 1090), 'en-US': (512, 1041, 534, 1090)}, file={'zh-CN': './assets/zh-CN/daemon/MAIN_STORY_MARK_OUT.png', 'en-US': './assets/zh-CN/daemon/MAIN_STORY_MARK_OUT.png'}) MAIN_STORY_NORMAL = Button(area={'zh-CN': (522, 1153, 577, 1163), 'en-US': (522, 1153, 577, 1163)}, color={'zh-CN': (69, 193, 249), 'en-US': (69, 193, 249)}, button={'zh-CN': (522, 1153, 577, 1163), 'en-US': (522, 1153, 577, 1163)}, file={'zh-CN': './assets/zh-CN/daemon/MAIN_STORY_NORMAL.png', 'en-US': './assets/zh-CN/daemon/MAIN_STORY_NORMAL.png'}) -PLAY_HIGHLIGHTS = Button(area={'zh-CN': (467, 690, 518, 715), 'en-US': (467, 690, 518, 715)}, color={'zh-CN': (158, 222, 250), 'en-US': (158, 222, 250)}, button={'zh-CN': (467, 690, 518, 715), 'en-US': (467, 690, 518, 715)}, file={'zh-CN': './assets/zh-CN/daemon/PLAY_HIGHLIGHTS.png', 'en-US': './assets/zh-CN/daemon/PLAY_HIGHLIGHTS.png'}) +PLAY_HIGHLIGHTS = Button(area={'zh-CN': (467, 690, 518, 715), 'en-US': (499, 692, 596, 711)}, color={'zh-CN': (158, 222, 250), 'en-US': (135, 214, 248)}, button={'zh-CN': (467, 690, 518, 715), 'en-US': (499, 692, 596, 711)}, file={'zh-CN': './assets/zh-CN/daemon/PLAY_HIGHLIGHTS.png', 'en-US': './assets/en-US/daemon/PLAY_HIGHLIGHTS.png'}) diff --git a/module/episode_viewing/assets.py b/module/episode_viewing/assets.py index 732764fa..1f9389df 100644 --- a/module/episode_viewing/assets.py +++ b/module/episode_viewing/assets.py @@ -5,6 +5,6 @@ # Don't modify it manually. COMPLETE = Button(area={'zh-CN': (329, 1167, 390, 1191), 'en-US': (329, 1167, 390, 1191)}, color={'zh-CN': (144, 145, 147), 'en-US': (144, 145, 147)}, button={'zh-CN': (329, 1167, 390, 1191), 'en-US': (329, 1167, 390, 1191)}, file={'zh-CN': './assets/zh-CN/episode_viewing/COMPLETE.png', 'en-US': './assets/zh-CN/episode_viewing/COMPLETE.png'}) -INCOMPLETE = Button(area={'zh-CN': (543, 1173, 602, 1191), 'en-US': (543, 1173, 602, 1191)}, color={'zh-CN': (159, 156, 156), 'en-US': (159, 156, 156)}, button={'zh-CN': (543, 1173, 602, 1191), 'en-US': (543, 1173, 602, 1191)}, file={'zh-CN': './assets/zh-CN/episode_viewing/INCOMPLETE.png', 'en-US': './assets/zh-CN/episode_viewing/INCOMPLETE.png'}) -REWARD = Button(area={'zh-CN': (534, 1172, 614, 1191), 'en-US': (534, 1172, 614, 1191)}, color={'zh-CN': (163, 224, 250), 'en-US': (163, 224, 250)}, button={'zh-CN': (534, 1172, 614, 1191), 'en-US': (534, 1172, 614, 1191)}, file={'zh-CN': './assets/zh-CN/episode_viewing/REWARD.png', 'en-US': './assets/zh-CN/episode_viewing/REWARD.png'}) +INCOMPLETE = Button(area={'zh-CN': (543, 1173, 602, 1191), 'en-US': (522, 1177, 622, 1188)}, color={'zh-CN': (159, 156, 156), 'en-US': (157, 155, 155)}, button={'zh-CN': (543, 1173, 602, 1191), 'en-US': (522, 1177, 622, 1188)}, file={'zh-CN': './assets/zh-CN/episode_viewing/INCOMPLETE.png', 'en-US': './assets/en-US/episode_viewing/INCOMPLETE.png'}) +REWARD = Button(area={'zh-CN': (534, 1172, 614, 1191), 'en-US': (534, 1172, 614, 1191)}, color={'zh-CN': (163, 224, 250), 'en-US': (163, 224, 250)}, button={'zh-CN': (534, 1172, 614, 1191), 'en-US': (534, 1172, 614, 1191)}, file={'zh-CN': './assets/zh-CN/episode_viewing/REWARD.png', 'en-US': './assets/en-US/episode_viewing/REWARD.png'}) TEMPLATE_EPISODE = Template(file={'zh-CN': './assets/zh-CN/episode_viewing/TEMPLATE_EPISODE.png', 'en-US': './assets/zh-CN/episode_viewing/TEMPLATE_EPISODE.png'}) diff --git a/module/ui/assets.py b/module/ui/assets.py index c2f6c513..75f78a92 100644 --- a/module/ui/assets.py +++ b/module/ui/assets.py @@ -19,14 +19,14 @@ CLICK_TO_NEXT = Button(area={'zh-CN': (289, 858, 431, 876), 'en-US': (289, 858, 431, 876)}, color={'zh-CN': (141, 141, 141), 'en-US': (141, 141, 141)}, button={'zh-CN': (289, 858, 431, 876), 'en-US': (289, 858, 431, 876)}, file={'zh-CN': './assets/zh-CN/ui/CLICK_TO_NEXT.png', 'en-US': './assets/zh-CN/ui/CLICK_TO_NEXT.png'}) COMMISSION_CHECK = Button(area={'zh-CN': (93, 183, 259, 213), 'en-US': (93, 183, 259, 213)}, color={'zh-CN': (134, 134, 134), 'en-US': (134, 134, 134)}, button={'zh-CN': (93, 183, 259, 213), 'en-US': (93, 183, 259, 213)}, file={'zh-CN': './assets/zh-CN/ui/COMMISSION_CHECK.png', 'en-US': './assets/zh-CN/ui/COMMISSION_CHECK.png'}) COMMISSION_GOTO_OUTPOST = Button(area={'zh-CN': (634, 152, 679, 197), 'en-US': (634, 152, 679, 197)}, color={'zh-CN': (232, 228, 231), 'en-US': (232, 228, 231)}, button={'zh-CN': (634, 152, 679, 197), 'en-US': (634, 152, 679, 197)}, file={'zh-CN': './assets/zh-CN/ui/COMMISSION_GOTO_OUTPOST.png', 'en-US': './assets/zh-CN/ui/COMMISSION_GOTO_OUTPOST.png'}) -CONVERSATION_CHECK = Button(area={'zh-CN': (262, 171, 452, 187), 'en-US': (262, 171, 452, 187)}, color={'zh-CN': (138, 138, 136), 'en-US': (138, 138, 136)}, button={'zh-CN': (262, 171, 452, 187), 'en-US': (262, 171, 452, 187)}, file={'zh-CN': './assets/zh-CN/ui/CONVERSATION_CHECK.png', 'en-US': './assets/zh-CN/ui/CONVERSATION_CHECK.png'}) -CONVERSATION_GOTO_EPISODE_VIEWING = Button(area={'zh-CN': (600, 1197, 668, 1219), 'en-US': (600, 1197, 668, 1219)}, color={'zh-CN': (135, 215, 248), 'en-US': (135, 215, 248)}, button={'zh-CN': (600, 1197, 668, 1219), 'en-US': (600, 1197, 668, 1219)}, file={'zh-CN': './assets/zh-CN/ui/CONVERSATION_GOTO_EPISODE_VIEWING.png', 'en-US': './assets/zh-CN/ui/CONVERSATION_GOTO_EPISODE_VIEWING.png'}) +CONVERSATION_CHECK = Button(area={'zh-CN': (262, 171, 452, 187), 'en-US': (285, 116, 317, 144)}, color={'zh-CN': (138, 138, 136), 'en-US': (143, 144, 145)}, button={'zh-CN': (262, 171, 452, 187), 'en-US': (285, 116, 317, 144)}, file={'zh-CN': './assets/zh-CN/ui/CONVERSATION_CHECK.png', 'en-US': './assets/en-US/ui/CONVERSATION_CHECK.png'}) +CONVERSATION_GOTO_EPISODE_VIEWING = Button(area={'zh-CN': (600, 1197, 668, 1219), 'en-US': (483, 1204, 668, 1216)}, color={'zh-CN': (135, 215, 248), 'en-US': (138, 216, 249)}, button={'zh-CN': (600, 1197, 668, 1219), 'en-US': (483, 1204, 668, 1216)}, file={'zh-CN': './assets/zh-CN/ui/CONVERSATION_GOTO_EPISODE_VIEWING.png', 'en-US': './assets/en-US/ui/CONVERSATION_GOTO_EPISODE_VIEWING.png'}) DAILY_CHECK = Button(area={'zh-CN': (298, 132, 422, 156), 'en-US': (298, 132, 422, 156)}, color={'zh-CN': (159, 195, 228), 'en-US': (159, 195, 228)}, button={'zh-CN': (298, 132, 422, 156), 'en-US': (298, 132, 422, 156)}, file={'zh-CN': './assets/zh-CN/ui/DAILY_CHECK.png', 'en-US': './assets/zh-CN/ui/DAILY_CHECK.png'}) DAILY_GOTO_MAIN = Button(area={'zh-CN': (646, 75, 674, 105), 'en-US': (646, 75, 674, 105)}, color={'zh-CN': (76, 156, 211), 'en-US': (76, 156, 211)}, button={'zh-CN': (646, 75, 674, 105), 'en-US': (646, 75, 674, 105)}, file={'zh-CN': './assets/zh-CN/ui/DAILY_GOTO_MAIN.png', 'en-US': './assets/zh-CN/ui/DAILY_GOTO_MAIN.png'}) DESTROY_CHECK = Button(area={'zh-CN': (331, 464, 389, 531), 'en-US': (331, 464, 389, 531)}, color={'zh-CN': (122, 126, 128), 'en-US': (122, 126, 128)}, button={'zh-CN': (331, 464, 389, 531), 'en-US': (331, 464, 389, 531)}, file={'zh-CN': './assets/zh-CN/ui/DESTROY_CHECK.png', 'en-US': './assets/zh-CN/ui/DESTROY_CHECK.png'}) DESTROY_GOTO_REWARD = Button(area={'zh-CN': (603, 310, 642, 351), 'en-US': (603, 310, 642, 351)}, color={'zh-CN': (122, 122, 113), 'en-US': (122, 122, 113)}, button={'zh-CN': (603, 310, 642, 351), 'en-US': (603, 310, 642, 351)}, file={'zh-CN': './assets/zh-CN/ui/DESTROY_GOTO_REWARD.png', 'en-US': './assets/zh-CN/ui/DESTROY_GOTO_REWARD.png'}) EMPTY_CHECK = Button(area={'zh-CN': (272, 496, 421, 534), 'en-US': (272, 496, 421, 534)}, color={'zh-CN': (100, 102, 104), 'en-US': (100, 102, 104)}, button={'zh-CN': (272, 496, 421, 534), 'en-US': (272, 496, 421, 534)}, file={'zh-CN': './assets/zh-CN/ui/EMPTY_CHECK.png', 'en-US': './assets/zh-CN/ui/EMPTY_CHECK.png'}) -EPISODE_VIEWING_CHECK = Button(area={'zh-CN': (71, 580, 156, 596), 'en-US': (71, 580, 156, 596)}, color={'zh-CN': (173, 173, 174), 'en-US': (173, 173, 174)}, button={'zh-CN': (71, 580, 156, 596), 'en-US': (71, 580, 156, 596)}, file={'zh-CN': './assets/zh-CN/ui/EPISODE_VIEWING_CHECK.png', 'en-US': './assets/zh-CN/ui/EPISODE_VIEWING_CHECK.png'}) +EPISODE_VIEWING_CHECK = Button(area={'zh-CN': (71, 580, 156, 596), 'en-US': (69, 583, 211, 594)}, color={'zh-CN': (173, 173, 174), 'en-US': (157, 158, 159)}, button={'zh-CN': (71, 580, 156, 596), 'en-US': (69, 583, 211, 594)}, file={'zh-CN': './assets/zh-CN/ui/EPISODE_VIEWING_CHECK.png', 'en-US': './assets/en-US/ui/EPISODE_VIEWING_CHECK.png'}) EPISODE_VIEWING_GOTO_CONVERSATION = Button(area={'zh-CN': (634, 568, 659, 594), 'en-US': (634, 568, 659, 594)}, color={'zh-CN': (178, 181, 182), 'en-US': (178, 181, 182)}, button={'zh-CN': (634, 568, 659, 594), 'en-US': (634, 568, 659, 594)}, file={'zh-CN': './assets/zh-CN/ui/EPISODE_VIEWING_GOTO_CONVERSATION.png', 'en-US': './assets/zh-CN/ui/EPISODE_VIEWING_GOTO_CONVERSATION.png'}) EVENT_SWITCH = Button(area={'zh-CN': (674, 1120, 702, 1144), 'en-US': (674, 1120, 702, 1144)}, color={'zh-CN': (124, 125, 127), 'en-US': (124, 125, 127)}, button={'zh-CN': (674, 1120, 702, 1144), 'en-US': (674, 1120, 702, 1144)}, file={'zh-CN': './assets/zh-CN/ui/EVENT_SWITCH.png', 'en-US': './assets/zh-CN/ui/EVENT_SWITCH.png'}) FACILITY_BACK = Button(area={'zh-CN': (142, 1204, 163, 1226), 'en-US': (142, 1204, 163, 1226)}, color={'zh-CN': (186, 186, 184), 'en-US': (186, 186, 184)}, button={'zh-CN': (142, 1204, 163, 1226), 'en-US': (142, 1204, 163, 1226)}, file={'zh-CN': './assets/zh-CN/ui/FACILITY_BACK.png', 'en-US': './assets/zh-CN/ui/FACILITY_BACK.png'}) @@ -83,8 +83,8 @@ SPECIAL_ARENA_CHECK = Button(area={'zh-CN': (204, 138, 524, 229), 'en-US': (204, 138, 524, 229)}, color={'zh-CN': (87, 90, 97), 'en-US': (87, 90, 97)}, button={'zh-CN': (204, 138, 524, 229), 'en-US': (204, 138, 524, 229)}, file={'zh-CN': './assets/zh-CN/ui/SPECIAL_ARENA_CHECK.png', 'en-US': './assets/zh-CN/ui/SPECIAL_ARENA_CHECK.png'}) SPECIAL_INTERCEPTION_CHECK = Button(area={'zh-CN': (73, 831, 260, 862), 'en-US': (73, 831, 260, 862)}, color={'zh-CN': (200, 199, 200), 'en-US': (200, 199, 200)}, button={'zh-CN': (73, 831, 260, 862), 'en-US': (73, 831, 260, 862)}, file={'zh-CN': './assets/zh-CN/ui/SPECIAL_INTERCEPTION_CHECK.png', 'en-US': './assets/zh-CN/ui/SPECIAL_INTERCEPTION_CHECK.png'}) SYNCHRO_CHECK = Button(area={'zh-CN': (122, 469, 202, 482), 'en-US': (122, 469, 202, 482)}, color={'zh-CN': (108, 108, 107), 'en-US': (108, 108, 107)}, button={'zh-CN': (122, 469, 202, 482), 'en-US': (122, 469, 202, 482)}, file={'zh-CN': './assets/zh-CN/ui/SYNCHRO_CHECK.png', 'en-US': './assets/zh-CN/ui/SYNCHRO_CHECK.png'}) -TEAM_CHECK = Button(area={'zh-CN': (35, 305, 152, 320), 'en-US': (35, 305, 152, 320)}, color={'zh-CN': (200, 198, 199), 'en-US': (200, 198, 199)}, button={'zh-CN': (35, 305, 152, 320), 'en-US': (35, 305, 152, 320)}, file={'zh-CN': './assets/zh-CN/ui/TEAM_CHECK.png', 'en-US': './assets/zh-CN/ui/TEAM_CHECK.png'}) -TEAM_GOTO_CONVERSATION = Button(area={'zh-CN': (393, 136, 456, 174), 'en-US': (393, 136, 456, 174)}, color={'zh-CN': (72, 71, 69), 'en-US': (72, 71, 69)}, button={'zh-CN': (393, 136, 456, 174), 'en-US': (393, 136, 456, 174)}, file={'zh-CN': './assets/zh-CN/ui/TEAM_GOTO_CONVERSATION.png', 'en-US': './assets/zh-CN/ui/TEAM_GOTO_CONVERSATION.png'}) +TEAM_CHECK = Button(area={'zh-CN': (35, 305, 152, 320), 'en-US': (32, 40, 79, 53)}, color={'zh-CN': (200, 198, 199), 'en-US': (140, 140, 141)}, button={'zh-CN': (35, 305, 152, 320), 'en-US': (32, 40, 79, 53)}, file={'zh-CN': './assets/zh-CN/ui/TEAM_CHECK.png', 'en-US': './assets/en-US/ui/TEAM_CHECK.png'}) +TEAM_GOTO_CONVERSATION = Button(area={'zh-CN': (393, 136, 456, 174), 'en-US': (324, 141, 354, 168)}, color={'zh-CN': (72, 71, 69), 'en-US': (122, 120, 122)}, button={'zh-CN': (393, 136, 456, 174), 'en-US': (324, 141, 354, 168)}, file={'zh-CN': './assets/zh-CN/ui/TEAM_GOTO_CONVERSATION.png', 'en-US': './assets/en-US/ui/TEAM_GOTO_CONVERSATION.png'}) TEAM_GOTO_LIBERATION = Button(area={'zh-CN': (114, 142, 159, 163), 'en-US': (114, 142, 159, 163)}, color={'zh-CN': (129, 127, 127), 'en-US': (129, 127, 127)}, button={'zh-CN': (114, 142, 159, 163), 'en-US': (114, 142, 159, 163)}, file={'zh-CN': './assets/zh-CN/ui/TEAM_GOTO_LIBERATION.png', 'en-US': './assets/zh-CN/ui/TEAM_GOTO_LIBERATION.png'}) TEAM_GOTO_MAIN = Button(area={'zh-CN': (340, 1225, 380, 1245), 'en-US': (340, 1225, 380, 1245)}, color={'zh-CN': (76, 77, 73), 'en-US': (76, 77, 73)}, button={'zh-CN': (340, 1225, 380, 1245), 'en-US': (340, 1225, 380, 1245)}, file={'zh-CN': './assets/zh-CN/ui/TEAM_GOTO_MAIN.png', 'en-US': './assets/zh-CN/ui/TEAM_GOTO_MAIN.png'}) TRIBE_TOWER_CHECK = Button(area={'zh-CN': (196, 97, 536, 168), 'en-US': (196, 97, 536, 168)}, color={'zh-CN': (130, 137, 141), 'en-US': (130, 137, 141)}, button={'zh-CN': (196, 97, 536, 168), 'en-US': (196, 97, 536, 168)}, file={'zh-CN': './assets/zh-CN/ui/TRIBE_TOWER_CHECK.png', 'en-US': './assets/zh-CN/ui/TRIBE_TOWER_CHECK.png'})