diff --git a/assets/share/assignment/ui/CHARACTER_MATERIALS.png b/assets/share/assignment/ui/CHARACTER_MATERIALS.png index a92a59204..f851dabde 100644 Binary files a/assets/share/assignment/ui/CHARACTER_MATERIALS.png and b/assets/share/assignment/ui/CHARACTER_MATERIALS.png differ diff --git a/assets/share/assignment/ui/ENTRY_LOADED.png b/assets/share/assignment/ui/ENTRY_LOADED.png index cef60fc94..05a9e86ea 100644 Binary files a/assets/share/assignment/ui/ENTRY_LOADED.png and b/assets/share/assignment/ui/ENTRY_LOADED.png differ diff --git a/assets/share/assignment/ui/EXP_MATERIALS_CREDITS.png b/assets/share/assignment/ui/EXP_MATERIALS_CREDITS.png index ab4f7717d..5745314cc 100644 Binary files a/assets/share/assignment/ui/EXP_MATERIALS_CREDITS.png and b/assets/share/assignment/ui/EXP_MATERIALS_CREDITS.png differ diff --git a/assets/share/assignment/ui/OCR_ASSIGNMENT_LIMIT.png b/assets/share/assignment/ui/OCR_ASSIGNMENT_LIMIT.png index d1da78934..30022b8bf 100644 Binary files a/assets/share/assignment/ui/OCR_ASSIGNMENT_LIMIT.png and b/assets/share/assignment/ui/OCR_ASSIGNMENT_LIMIT.png differ diff --git a/assets/share/assignment/ui/OCR_ASSIGNMENT_LIST.png b/assets/share/assignment/ui/OCR_ASSIGNMENT_LIST.png index 6c5a382ff..a2ee98138 100644 Binary files a/assets/share/assignment/ui/OCR_ASSIGNMENT_LIST.png and b/assets/share/assignment/ui/OCR_ASSIGNMENT_LIST.png differ diff --git a/assets/share/assignment/ui/OCR_ASSIGNMENT_TIME.png b/assets/share/assignment/ui/OCR_ASSIGNMENT_TIME.png index e7e9e168d..5c28edd6f 100644 Binary files a/assets/share/assignment/ui/OCR_ASSIGNMENT_TIME.png and b/assets/share/assignment/ui/OCR_ASSIGNMENT_TIME.png differ diff --git a/assets/share/assignment/ui/SYNTHESIS_MATERIALS.png b/assets/share/assignment/ui/SYNTHESIS_MATERIALS.png index a07bbdfbd..a86c08e9c 100644 Binary files a/assets/share/assignment/ui/SYNTHESIS_MATERIALS.png and b/assets/share/assignment/ui/SYNTHESIS_MATERIALS.png differ diff --git a/assets/share/base/page/GUIDE_CHECK.png b/assets/share/base/page/GUIDE_CHECK.png index 297de5dc4..6298283ca 100644 Binary files a/assets/share/base/page/GUIDE_CHECK.png and b/assets/share/base/page/GUIDE_CHECK.png differ diff --git a/assets/share/base/page/GUIDE_CLOSE.png b/assets/share/base/page/GUIDE_CLOSE.png index 447128b52..d08bffb95 100644 Binary files a/assets/share/base/page/GUIDE_CLOSE.png and b/assets/share/base/page/GUIDE_CLOSE.png differ diff --git a/assets/share/combat/team/TEAM_1.png b/assets/share/combat/team/TEAM_1.png index c002be54b..840e5162c 100644 Binary files a/assets/share/combat/team/TEAM_1.png and b/assets/share/combat/team/TEAM_1.png differ diff --git a/assets/share/combat/team/TEAM_2.png b/assets/share/combat/team/TEAM_2.png index 4abd54ad5..d2c4c1ef8 100644 Binary files a/assets/share/combat/team/TEAM_2.png and b/assets/share/combat/team/TEAM_2.png differ diff --git a/assets/share/combat/team/TEAM_3.png b/assets/share/combat/team/TEAM_3.png index 810e0760f..3306d4641 100644 Binary files a/assets/share/combat/team/TEAM_3.png and b/assets/share/combat/team/TEAM_3.png differ diff --git a/assets/share/combat/team/TEAM_4.png b/assets/share/combat/team/TEAM_4.png index 1adddfdd6..2df0ca224 100644 Binary files a/assets/share/combat/team/TEAM_4.png and b/assets/share/combat/team/TEAM_4.png differ diff --git a/assets/share/combat/team/TEAM_5.png b/assets/share/combat/team/TEAM_5.png index 75fbdf1ef..5fd650553 100644 Binary files a/assets/share/combat/team/TEAM_5.png and b/assets/share/combat/team/TEAM_5.png differ diff --git a/assets/share/combat/team/TEAM_6.png b/assets/share/combat/team/TEAM_6.png index 737593094..cbe1e6d9d 100644 Binary files a/assets/share/combat/team/TEAM_6.png and b/assets/share/combat/team/TEAM_6.png differ diff --git a/assets/share/daily/reward/ACTIVE_POINTS_1_CHECKED.png b/assets/share/daily/reward/ACTIVE_POINTS_1_CHECKED.png index ae4ac5c8c..5c82d7e5a 100644 Binary files a/assets/share/daily/reward/ACTIVE_POINTS_1_CHECKED.png and b/assets/share/daily/reward/ACTIVE_POINTS_1_CHECKED.png differ diff --git a/assets/share/daily/reward/ACTIVE_POINTS_1_LOCKED.png b/assets/share/daily/reward/ACTIVE_POINTS_1_LOCKED.png index 1da771ad2..d86ebc13c 100644 Binary files a/assets/share/daily/reward/ACTIVE_POINTS_1_LOCKED.png and b/assets/share/daily/reward/ACTIVE_POINTS_1_LOCKED.png differ diff --git a/assets/share/daily/reward/ACTIVE_POINTS_1_UNLOCK.png b/assets/share/daily/reward/ACTIVE_POINTS_1_UNLOCK.png index ed04cbdb6..2850eff31 100644 Binary files a/assets/share/daily/reward/ACTIVE_POINTS_1_UNLOCK.png and b/assets/share/daily/reward/ACTIVE_POINTS_1_UNLOCK.png differ diff --git a/assets/share/daily/reward/ACTIVE_POINTS_2_CHECKED.png b/assets/share/daily/reward/ACTIVE_POINTS_2_CHECKED.png index b0afd6335..2133c7da6 100644 Binary files a/assets/share/daily/reward/ACTIVE_POINTS_2_CHECKED.png and b/assets/share/daily/reward/ACTIVE_POINTS_2_CHECKED.png differ diff --git a/assets/share/daily/reward/ACTIVE_POINTS_2_LOCKED.png b/assets/share/daily/reward/ACTIVE_POINTS_2_LOCKED.png index 5a87f77ed..28f753038 100644 Binary files a/assets/share/daily/reward/ACTIVE_POINTS_2_LOCKED.png and b/assets/share/daily/reward/ACTIVE_POINTS_2_LOCKED.png differ diff --git a/assets/share/daily/reward/ACTIVE_POINTS_2_UNLOCK.png b/assets/share/daily/reward/ACTIVE_POINTS_2_UNLOCK.png index 4b0989806..69016e559 100644 Binary files a/assets/share/daily/reward/ACTIVE_POINTS_2_UNLOCK.png and b/assets/share/daily/reward/ACTIVE_POINTS_2_UNLOCK.png differ diff --git a/assets/share/daily/reward/ACTIVE_POINTS_3_CHECKED.png b/assets/share/daily/reward/ACTIVE_POINTS_3_CHECKED.png index 64316a011..2eaedd723 100644 Binary files a/assets/share/daily/reward/ACTIVE_POINTS_3_CHECKED.png and b/assets/share/daily/reward/ACTIVE_POINTS_3_CHECKED.png differ diff --git a/assets/share/daily/reward/ACTIVE_POINTS_3_LOCKED.png b/assets/share/daily/reward/ACTIVE_POINTS_3_LOCKED.png index 45cbc0a47..94a9cbdec 100644 Binary files a/assets/share/daily/reward/ACTIVE_POINTS_3_LOCKED.png and b/assets/share/daily/reward/ACTIVE_POINTS_3_LOCKED.png differ diff --git a/assets/share/daily/reward/ACTIVE_POINTS_3_UNLOCK.png b/assets/share/daily/reward/ACTIVE_POINTS_3_UNLOCK.png index bb9885cd9..2585d18ff 100644 Binary files a/assets/share/daily/reward/ACTIVE_POINTS_3_UNLOCK.png and b/assets/share/daily/reward/ACTIVE_POINTS_3_UNLOCK.png differ diff --git a/assets/share/daily/reward/ACTIVE_POINTS_4_CHECKED.png b/assets/share/daily/reward/ACTIVE_POINTS_4_CHECKED.png index ba447dc11..19eff5068 100644 Binary files a/assets/share/daily/reward/ACTIVE_POINTS_4_CHECKED.png and b/assets/share/daily/reward/ACTIVE_POINTS_4_CHECKED.png differ diff --git a/assets/share/daily/reward/ACTIVE_POINTS_4_LOCKED.png b/assets/share/daily/reward/ACTIVE_POINTS_4_LOCKED.png index e9d4e393a..fc94c9530 100644 Binary files a/assets/share/daily/reward/ACTIVE_POINTS_4_LOCKED.png and b/assets/share/daily/reward/ACTIVE_POINTS_4_LOCKED.png differ diff --git a/assets/share/daily/reward/ACTIVE_POINTS_4_UNLOCK.png b/assets/share/daily/reward/ACTIVE_POINTS_4_UNLOCK.png index d1051d801..0a3f2c451 100644 Binary files a/assets/share/daily/reward/ACTIVE_POINTS_4_UNLOCK.png and b/assets/share/daily/reward/ACTIVE_POINTS_4_UNLOCK.png differ diff --git a/assets/share/daily/reward/ACTIVE_POINTS_5_CHECKED.png b/assets/share/daily/reward/ACTIVE_POINTS_5_CHECKED.png index 8c06db22b..1a578593b 100644 Binary files a/assets/share/daily/reward/ACTIVE_POINTS_5_CHECKED.png and b/assets/share/daily/reward/ACTIVE_POINTS_5_CHECKED.png differ diff --git a/assets/share/daily/reward/ACTIVE_POINTS_5_LOCKED.png b/assets/share/daily/reward/ACTIVE_POINTS_5_LOCKED.png index 00c8b04aa..c4cdda214 100644 Binary files a/assets/share/daily/reward/ACTIVE_POINTS_5_LOCKED.png and b/assets/share/daily/reward/ACTIVE_POINTS_5_LOCKED.png differ diff --git a/assets/share/daily/reward/ACTIVE_POINTS_5_UNLOCK.png b/assets/share/daily/reward/ACTIVE_POINTS_5_UNLOCK.png index 144a3fa06..03458970a 100644 Binary files a/assets/share/daily/reward/ACTIVE_POINTS_5_UNLOCK.png and b/assets/share/daily/reward/ACTIVE_POINTS_5_UNLOCK.png differ diff --git a/assets/share/daily/reward/DAILY_QUEST_GOTO.png b/assets/share/daily/reward/DAILY_QUEST_GOTO.png index f06eb8897..39b609774 100644 Binary files a/assets/share/daily/reward/DAILY_QUEST_GOTO.png and b/assets/share/daily/reward/DAILY_QUEST_GOTO.png differ diff --git a/assets/share/daily/reward/DAILY_QUEST_LEFT_START.png b/assets/share/daily/reward/DAILY_QUEST_LEFT_START.png index 3942ab3ee..5cd0f5a61 100644 Binary files a/assets/share/daily/reward/DAILY_QUEST_LEFT_START.png and b/assets/share/daily/reward/DAILY_QUEST_LEFT_START.png differ diff --git a/assets/share/daily/reward/DAILY_QUEST_REWARD.png b/assets/share/daily/reward/DAILY_QUEST_REWARD.png index ebf5c2916..2018cb91f 100644 Binary files a/assets/share/daily/reward/DAILY_QUEST_REWARD.png and b/assets/share/daily/reward/DAILY_QUEST_REWARD.png differ diff --git a/assets/share/daily/reward/DAILY_QUEST_RIGHT_END.png b/assets/share/daily/reward/DAILY_QUEST_RIGHT_END.png index 8bfd42e74..33e55efa6 100644 Binary files a/assets/share/daily/reward/DAILY_QUEST_RIGHT_END.png and b/assets/share/daily/reward/DAILY_QUEST_RIGHT_END.png differ diff --git a/assets/share/daily/reward/OCR_DAILY_QUEST.png b/assets/share/daily/reward/OCR_DAILY_QUEST.png index e372958c5..c6afe52b4 100644 Binary files a/assets/share/daily/reward/OCR_DAILY_QUEST.png and b/assets/share/daily/reward/OCR_DAILY_QUEST.png differ diff --git a/assets/share/dungeon/ui/DAILY_TRAINING_CHECK.SEARCH.png b/assets/share/dungeon/ui/DAILY_TRAINING_CHECK.SEARCH.png deleted file mode 100644 index 3b77dea4c..000000000 Binary files a/assets/share/dungeon/ui/DAILY_TRAINING_CHECK.SEARCH.png and /dev/null differ diff --git a/assets/share/dungeon/ui/DAILY_TRAINING_CHECK.png b/assets/share/dungeon/ui/DAILY_TRAINING_CHECK.png index 47e9c5f35..67e3ce4cf 100644 Binary files a/assets/share/dungeon/ui/DAILY_TRAINING_CHECK.png and b/assets/share/dungeon/ui/DAILY_TRAINING_CHECK.png differ diff --git a/assets/share/dungeon/ui/DAILY_TRAINING_CLICK.SEARCH.png b/assets/share/dungeon/ui/DAILY_TRAINING_CLICK.SEARCH.png deleted file mode 100644 index 3b77dea4c..000000000 Binary files a/assets/share/dungeon/ui/DAILY_TRAINING_CLICK.SEARCH.png and /dev/null differ diff --git a/assets/share/dungeon/ui/DAILY_TRAINING_CLICK.png b/assets/share/dungeon/ui/DAILY_TRAINING_CLICK.png index a105b9cc7..3852e9efd 100644 Binary files a/assets/share/dungeon/ui/DAILY_TRAINING_CLICK.png and b/assets/share/dungeon/ui/DAILY_TRAINING_CLICK.png differ diff --git a/assets/share/dungeon/ui/DAILY_TRAINING_LOADED.png b/assets/share/dungeon/ui/DAILY_TRAINING_LOADED.png index 83844582e..5380fad3a 100644 Binary files a/assets/share/dungeon/ui/DAILY_TRAINING_LOADED.png and b/assets/share/dungeon/ui/DAILY_TRAINING_LOADED.png differ diff --git a/assets/share/dungeon/ui/OCR_DUNGEON_LIST.BUTTON.png b/assets/share/dungeon/ui/OCR_DUNGEON_LIST.BUTTON.png index 676b54866..997eec799 100644 Binary files a/assets/share/dungeon/ui/OCR_DUNGEON_LIST.BUTTON.png and b/assets/share/dungeon/ui/OCR_DUNGEON_LIST.BUTTON.png differ diff --git a/assets/share/dungeon/ui/OCR_DUNGEON_LIST.png b/assets/share/dungeon/ui/OCR_DUNGEON_LIST.png index 39f8e02e3..860fb6c45 100644 Binary files a/assets/share/dungeon/ui/OCR_DUNGEON_LIST.png and b/assets/share/dungeon/ui/OCR_DUNGEON_LIST.png differ diff --git a/assets/share/dungeon/ui/OCR_DUNGEON_NAV.png b/assets/share/dungeon/ui/OCR_DUNGEON_NAV.png index db9f26053..6803449b5 100644 Binary files a/assets/share/dungeon/ui/OCR_DUNGEON_NAV.png and b/assets/share/dungeon/ui/OCR_DUNGEON_NAV.png differ diff --git a/assets/share/dungeon/ui/OPERATION_BRIEFING_CHECK.SEARCH.png b/assets/share/dungeon/ui/OPERATION_BRIEFING_CHECK.SEARCH.png deleted file mode 100644 index 3b77dea4c..000000000 Binary files a/assets/share/dungeon/ui/OPERATION_BRIEFING_CHECK.SEARCH.png and /dev/null differ diff --git a/assets/share/dungeon/ui/OPERATION_BRIEFING_CHECK.png b/assets/share/dungeon/ui/OPERATION_BRIEFING_CHECK.png index a366cedea..aae51c196 100644 Binary files a/assets/share/dungeon/ui/OPERATION_BRIEFING_CHECK.png and b/assets/share/dungeon/ui/OPERATION_BRIEFING_CHECK.png differ diff --git a/assets/share/dungeon/ui/OPERATION_BRIEFING_CLICK.SEARCH.png b/assets/share/dungeon/ui/OPERATION_BRIEFING_CLICK.SEARCH.png deleted file mode 100644 index 3b77dea4c..000000000 Binary files a/assets/share/dungeon/ui/OPERATION_BRIEFING_CLICK.SEARCH.png and /dev/null differ diff --git a/assets/share/dungeon/ui/OPERATION_BRIEFING_CLICK.png b/assets/share/dungeon/ui/OPERATION_BRIEFING_CLICK.png index 76f9a3f0f..200cfe025 100644 Binary files a/assets/share/dungeon/ui/OPERATION_BRIEFING_CLICK.png and b/assets/share/dungeon/ui/OPERATION_BRIEFING_CLICK.png differ diff --git a/assets/share/dungeon/ui/SURVIVAL_INDEX_CHECK.SEARCH.png b/assets/share/dungeon/ui/SURVIVAL_INDEX_CHECK.SEARCH.png deleted file mode 100644 index 3b77dea4c..000000000 Binary files a/assets/share/dungeon/ui/SURVIVAL_INDEX_CHECK.SEARCH.png and /dev/null differ diff --git a/assets/share/dungeon/ui/SURVIVAL_INDEX_CHECK.png b/assets/share/dungeon/ui/SURVIVAL_INDEX_CHECK.png index 7088024da..f33f944a0 100644 Binary files a/assets/share/dungeon/ui/SURVIVAL_INDEX_CHECK.png and b/assets/share/dungeon/ui/SURVIVAL_INDEX_CHECK.png differ diff --git a/assets/share/dungeon/ui/SURVIVAL_INDEX_CLICK.SEARCH.png b/assets/share/dungeon/ui/SURVIVAL_INDEX_CLICK.SEARCH.png deleted file mode 100644 index 3b77dea4c..000000000 Binary files a/assets/share/dungeon/ui/SURVIVAL_INDEX_CLICK.SEARCH.png and /dev/null differ diff --git a/assets/share/dungeon/ui/SURVIVAL_INDEX_CLICK.png b/assets/share/dungeon/ui/SURVIVAL_INDEX_CLICK.png index 0276295b3..3f599d36c 100644 Binary files a/assets/share/dungeon/ui/SURVIVAL_INDEX_CLICK.png and b/assets/share/dungeon/ui/SURVIVAL_INDEX_CLICK.png differ diff --git a/assets/share/dungeon/ui/SURVIVAL_INDEX_LOADED.SEARCH.png b/assets/share/dungeon/ui/SURVIVAL_INDEX_LOADED.SEARCH.png index 9b02545e1..e57b42d9c 100644 Binary files a/assets/share/dungeon/ui/SURVIVAL_INDEX_LOADED.SEARCH.png and b/assets/share/dungeon/ui/SURVIVAL_INDEX_LOADED.SEARCH.png differ diff --git a/assets/share/dungeon/ui/SURVIVAL_INDEX_LOADED.png b/assets/share/dungeon/ui/SURVIVAL_INDEX_LOADED.png index f6d446b77..a5515c9e4 100644 Binary files a/assets/share/dungeon/ui/SURVIVAL_INDEX_LOADED.png and b/assets/share/dungeon/ui/SURVIVAL_INDEX_LOADED.png differ diff --git a/tasks/assignment/assets/assets_assignment_ui.py b/tasks/assignment/assets/assets_assignment_ui.py index f21944631..319fecce4 100644 --- a/tasks/assignment/assets/assets_assignment_ui.py +++ b/tasks/assignment/assets/assets_assignment_ui.py @@ -7,10 +7,10 @@ CHARACTER_MATERIALS = ButtonWrapper( name='CHARACTER_MATERIALS', share=Button( file='./assets/share/assignment/ui/CHARACTER_MATERIALS.png', - area=(123, 81, 307, 134), - search=(103, 61, 327, 154), - color=(234, 233, 229), - button=(123, 81, 307, 134), + area=(146, 91, 255, 124), + search=(126, 71, 275, 144), + color=(213, 213, 208), + button=(146, 91, 255, 124), ), ) DISPATCHED = ButtonWrapper( @@ -27,59 +27,59 @@ ENTRY_LOADED = ButtonWrapper( name='ENTRY_LOADED', share=Button( file='./assets/share/assignment/ui/ENTRY_LOADED.png', - area=(446, 164, 466, 615), - search=(426, 144, 486, 635), - color=(203, 202, 194), - button=(446, 164, 466, 615), + area=(467, 235, 498, 619), + search=(447, 215, 518, 639), + color=(217, 214, 205), + button=(467, 235, 498, 619), ), ) EXP_MATERIALS_CREDITS = ButtonWrapper( name='EXP_MATERIALS_CREDITS', share=Button( file='./assets/share/assignment/ui/EXP_MATERIALS_CREDITS.png', - area=(343, 83, 527, 133), - search=(323, 63, 547, 153), - color=(222, 221, 217), - button=(343, 83, 527, 133), + area=(310, 85, 447, 134), + search=(290, 65, 467, 154), + color=(214, 214, 210), + button=(310, 85, 447, 134), ), ) OCR_ASSIGNMENT_LIMIT = ButtonWrapper( name='OCR_ASSIGNMENT_LIMIT', share=Button( file='./assets/share/assignment/ui/OCR_ASSIGNMENT_LIMIT.png', - area=(1095, 86, 1179, 126), - search=(1075, 66, 1199, 146), - color=(62, 61, 60), - button=(1095, 86, 1179, 126), + area=(1095, 82, 1180, 125), + search=(1075, 62, 1200, 145), + color=(41, 44, 50), + button=(1095, 82, 1180, 125), ), ) OCR_ASSIGNMENT_LIST = ButtonWrapper( name='OCR_ASSIGNMENT_LIST', share=Button( file='./assets/share/assignment/ui/OCR_ASSIGNMENT_LIST.png', - area=(141, 160, 502, 621), - search=(121, 140, 522, 641), - color=(202, 200, 194), - button=(141, 160, 502, 621), + area=(133, 139, 494, 620), + search=(113, 119, 514, 640), + color=(201, 199, 193), + button=(133, 139, 494, 620), ), ) OCR_ASSIGNMENT_TIME = ButtonWrapper( name='OCR_ASSIGNMENT_TIME', share=Button( file='./assets/share/assignment/ui/OCR_ASSIGNMENT_TIME.png', - area=(588, 566, 926, 588), - search=(568, 546, 946, 608), - color=(128, 111, 89), - button=(588, 566, 926, 588), + area=(605, 564, 886, 589), + search=(585, 544, 906, 609), + color=(117, 104, 82), + button=(605, 564, 886, 589), ), ) SYNTHESIS_MATERIALS = ButtonWrapper( name='SYNTHESIS_MATERIALS', share=Button( file='./assets/share/assignment/ui/SYNTHESIS_MATERIALS.png', - area=(558, 85, 748, 135), - search=(538, 65, 768, 155), - color=(230, 229, 225), - button=(558, 85, 748, 135), + area=(521, 91, 603, 128), + search=(501, 71, 623, 148), + color=(208, 208, 203), + button=(521, 91, 603, 128), ), ) diff --git a/tasks/base/assets/assets_base_page.py b/tasks/base/assets/assets_base_page.py index 992b91500..95d2a0d36 100644 --- a/tasks/base/assets/assets_base_page.py +++ b/tasks/base/assets/assets_base_page.py @@ -97,20 +97,20 @@ GUIDE_CHECK = ButtonWrapper( name='GUIDE_CHECK', share=Button( file='./assets/share/base/page/GUIDE_CHECK.png', - area=(44, 216, 63, 248), - search=(24, 196, 83, 268), - color=(196, 198, 200), - button=(44, 216, 63, 248), + area=(64, 297, 83, 326), + search=(44, 277, 103, 346), + color=(197, 196, 197), + button=(64, 297, 83, 326), ), ) GUIDE_CLOSE = ButtonWrapper( name='GUIDE_CLOSE', share=Button( file='./assets/share/base/page/GUIDE_CLOSE.png', - area=(1153, 56, 1183, 87), - search=(1133, 36, 1203, 107), - color=(79, 79, 79), - button=(1153, 56, 1183, 87), + area=(1215, 21, 1248, 54), + search=(1195, 1, 1268, 74), + color=(75, 82, 95), + button=(1215, 21, 1248, 54), ), ) ITEM_CHECK = ButtonWrapper( diff --git a/tasks/combat/assets/assets_combat_team.py b/tasks/combat/assets/assets_combat_team.py index 30413e998..170651d08 100644 --- a/tasks/combat/assets/assets_combat_team.py +++ b/tasks/combat/assets/assets_combat_team.py @@ -37,59 +37,59 @@ TEAM_1 = ButtonWrapper( name='TEAM_1', share=Button( file='./assets/share/combat/team/TEAM_1.png', - area=(432, 32, 467, 63), - search=(412, 12, 487, 83), - color=(142, 134, 127), - button=(432, 32, 467, 63), + area=(365, 29, 411, 65), + search=(345, 9, 431, 85), + color=(113, 109, 117), + button=(365, 29, 411, 65), ), ) TEAM_2 = ButtonWrapper( name='TEAM_2', share=Button( file='./assets/share/combat/team/TEAM_2.png', - area=(531, 32, 572, 63), - search=(511, 12, 592, 83), - color=(142, 136, 129), - button=(531, 32, 572, 63), + area=(467, 29, 511, 65), + search=(447, 9, 531, 85), + color=(126, 124, 130), + button=(467, 29, 511, 65), ), ) TEAM_3 = ButtonWrapper( name='TEAM_3', share=Button( file='./assets/share/combat/team/TEAM_3.png', - area=(631, 32, 673, 63), - search=(611, 12, 693, 83), - color=(135, 128, 117), - button=(631, 32, 673, 63), + area=(567, 28, 614, 66), + search=(547, 8, 634, 86), + color=(115, 116, 123), + button=(567, 28, 614, 66), ), ) TEAM_4 = ButtonWrapper( name='TEAM_4', share=Button( file='./assets/share/combat/team/TEAM_4.png', - area=(731, 32, 774, 63), - search=(711, 12, 794, 83), - color=(129, 121, 113), - button=(731, 32, 774, 63), + area=(666, 29, 712, 63), + search=(646, 9, 732, 83), + color=(106, 103, 98), + button=(666, 29, 712, 63), ), ) TEAM_5 = ButtonWrapper( name='TEAM_5', share=Button( file='./assets/share/combat/team/TEAM_5.png', - area=(831, 32, 873, 63), - search=(811, 12, 893, 83), - color=(139, 129, 117), - button=(831, 32, 873, 63), + area=(767, 30, 816, 66), + search=(747, 10, 836, 86), + color=(106, 100, 96), + button=(767, 30, 816, 66), ), ) TEAM_6 = ButtonWrapper( name='TEAM_6', share=Button( file='./assets/share/combat/team/TEAM_6.png', - area=(931, 32, 973, 63), - search=(911, 12, 993, 83), - color=(133, 124, 113), - button=(931, 32, 973, 63), + area=(867, 29, 912, 63), + search=(847, 9, 932, 83), + color=(113, 106, 101), + button=(867, 29, 912, 63), ), ) diff --git a/tasks/daily/assets/assets_daily_reward.py b/tasks/daily/assets/assets_daily_reward.py index 47cd579e6..801afba63 100644 --- a/tasks/daily/assets/assets_daily_reward.py +++ b/tasks/daily/assets/assets_daily_reward.py @@ -7,150 +7,150 @@ ACTIVE_POINTS_1_CHECKED = ButtonWrapper( name='ACTIVE_POINTS_1_CHECKED', share=Button( file='./assets/share/daily/reward/ACTIVE_POINTS_1_CHECKED.png', - area=(377, 139, 424, 207), - search=(357, 119, 444, 227), - color=(223, 205, 185), - button=(377, 139, 424, 207), + area=(383, 168, 428, 233), + search=(363, 148, 448, 253), + color=(221, 202, 180), + button=(383, 168, 428, 233), ), ) ACTIVE_POINTS_1_LOCKED = ButtonWrapper( name='ACTIVE_POINTS_1_LOCKED', share=Button( file='./assets/share/daily/reward/ACTIVE_POINTS_1_LOCKED.png', - area=(378, 141, 423, 185), - search=(358, 121, 443, 205), - color=(222, 222, 222), - button=(378, 141, 423, 185), + area=(381, 169, 427, 213), + search=(361, 149, 447, 233), + color=(221, 221, 221), + button=(381, 169, 427, 213), ), ) ACTIVE_POINTS_1_UNLOCK = ButtonWrapper( name='ACTIVE_POINTS_1_UNLOCK', share=Button( file='./assets/share/daily/reward/ACTIVE_POINTS_1_UNLOCK.png', - area=(377, 141, 424, 185), - search=(357, 121, 444, 205), - color=(233, 178, 98), - button=(377, 141, 424, 185), + area=(381, 169, 427, 213), + search=(361, 149, 447, 233), + color=(212, 162, 98), + button=(381, 169, 427, 213), ), ) ACTIVE_POINTS_2_CHECKED = ButtonWrapper( name='ACTIVE_POINTS_2_CHECKED', share=Button( file='./assets/share/daily/reward/ACTIVE_POINTS_2_CHECKED.png', - area=(560, 141, 606, 205), - search=(540, 121, 626, 225), - color=(221, 202, 180), - button=(560, 141, 606, 205), + area=(564, 170, 610, 233), + search=(544, 150, 630, 253), + color=(220, 201, 179), + button=(564, 170, 610, 233), ), ) ACTIVE_POINTS_2_LOCKED = ButtonWrapper( name='ACTIVE_POINTS_2_LOCKED', share=Button( file='./assets/share/daily/reward/ACTIVE_POINTS_2_LOCKED.png', - area=(561, 141, 606, 185), - search=(541, 121, 626, 205), - color=(222, 222, 222), - button=(561, 141, 606, 185), + area=(565, 169, 610, 213), + search=(545, 149, 630, 233), + color=(221, 221, 221), + button=(565, 169, 610, 213), ), ) ACTIVE_POINTS_2_UNLOCK = ButtonWrapper( name='ACTIVE_POINTS_2_UNLOCK', share=Button( file='./assets/share/daily/reward/ACTIVE_POINTS_2_UNLOCK.png', - area=(561, 141, 606, 185), - search=(541, 121, 626, 205), - color=(244, 192, 99), - button=(561, 141, 606, 185), + area=(565, 168, 609, 213), + search=(545, 148, 629, 233), + color=(211, 160, 96), + button=(565, 168, 609, 213), ), ) ACTIVE_POINTS_3_CHECKED = ButtonWrapper( name='ACTIVE_POINTS_3_CHECKED', share=Button( file='./assets/share/daily/reward/ACTIVE_POINTS_3_CHECKED.png', - area=(743, 141, 788, 205), - search=(723, 121, 808, 225), - color=(221, 201, 179), - button=(743, 141, 788, 205), + area=(747, 168, 793, 234), + search=(727, 148, 813, 254), + color=(219, 202, 181), + button=(747, 168, 793, 234), ), ) ACTIVE_POINTS_3_LOCKED = ButtonWrapper( name='ACTIVE_POINTS_3_LOCKED', share=Button( file='./assets/share/daily/reward/ACTIVE_POINTS_3_LOCKED.png', - area=(743, 141, 788, 185), - search=(723, 121, 808, 205), - color=(222, 222, 222), - button=(743, 141, 788, 185), + area=(747, 168, 792, 214), + search=(727, 148, 812, 234), + color=(221, 221, 221), + button=(747, 168, 792, 214), ), ) ACTIVE_POINTS_3_UNLOCK = ButtonWrapper( name='ACTIVE_POINTS_3_UNLOCK', share=Button( file='./assets/share/daily/reward/ACTIVE_POINTS_3_UNLOCK.png', - area=(744, 141, 788, 185), - search=(724, 121, 808, 205), - color=(231, 176, 94), - button=(744, 141, 788, 185), + area=(747, 168, 793, 213), + search=(727, 148, 813, 233), + color=(213, 161, 98), + button=(747, 168, 793, 213), ), ) ACTIVE_POINTS_4_CHECKED = ButtonWrapper( name='ACTIVE_POINTS_4_CHECKED', share=Button( file='./assets/share/daily/reward/ACTIVE_POINTS_4_CHECKED.png', - area=(925, 141, 970, 205), - search=(905, 121, 990, 225), - color=(221, 201, 179), - button=(925, 141, 970, 205), + area=(929, 167, 980, 233), + search=(909, 147, 1000, 253), + color=(221, 205, 185), + button=(929, 167, 980, 233), ), ) ACTIVE_POINTS_4_LOCKED = ButtonWrapper( name='ACTIVE_POINTS_4_LOCKED', share=Button( file='./assets/share/daily/reward/ACTIVE_POINTS_4_LOCKED.png', - area=(926, 141, 971, 185), - search=(906, 121, 991, 205), - color=(222, 222, 222), - button=(926, 141, 971, 185), + area=(930, 169, 975, 213), + search=(910, 149, 995, 233), + color=(221, 221, 221), + button=(930, 169, 975, 213), ), ) ACTIVE_POINTS_4_UNLOCK = ButtonWrapper( name='ACTIVE_POINTS_4_UNLOCK', share=Button( file='./assets/share/daily/reward/ACTIVE_POINTS_4_UNLOCK.png', - area=(926, 141, 971, 185), - search=(906, 121, 991, 205), - color=(237, 182, 97), - button=(926, 141, 971, 185), + area=(929, 169, 974, 213), + search=(909, 149, 994, 233), + color=(211, 161, 97), + button=(929, 169, 974, 213), ), ) ACTIVE_POINTS_5_CHECKED = ButtonWrapper( name='ACTIVE_POINTS_5_CHECKED', share=Button( file='./assets/share/daily/reward/ACTIVE_POINTS_5_CHECKED.png', - area=(1108, 141, 1154, 205), - search=(1088, 121, 1174, 225), - color=(221, 201, 179), - button=(1108, 141, 1154, 205), + area=(1112, 168, 1159, 235), + search=(1092, 148, 1179, 255), + color=(220, 203, 182), + button=(1112, 168, 1159, 235), ), ) ACTIVE_POINTS_5_LOCKED = ButtonWrapper( name='ACTIVE_POINTS_5_LOCKED', share=Button( file='./assets/share/daily/reward/ACTIVE_POINTS_5_LOCKED.png', - area=(1108, 141, 1153, 185), - search=(1088, 121, 1173, 205), - color=(222, 222, 222), - button=(1108, 141, 1153, 185), + area=(1111, 169, 1156, 213), + search=(1091, 149, 1176, 233), + color=(221, 221, 221), + button=(1111, 169, 1156, 213), ), ) ACTIVE_POINTS_5_UNLOCK = ButtonWrapper( name='ACTIVE_POINTS_5_UNLOCK', share=Button( file='./assets/share/daily/reward/ACTIVE_POINTS_5_UNLOCK.png', - area=(1109, 141, 1154, 185), - search=(1089, 121, 1174, 205), - color=(237, 182, 96), - button=(1109, 141, 1154, 185), + area=(1113, 170, 1158, 213), + search=(1093, 150, 1178, 233), + color=(211, 158, 92), + button=(1113, 170, 1158, 213), ), ) DAILY_QUEST_FULL = ButtonWrapper( @@ -167,49 +167,49 @@ DAILY_QUEST_GOTO = ButtonWrapper( name='DAILY_QUEST_GOTO', share=Button( file='./assets/share/daily/reward/DAILY_QUEST_GOTO.png', - area=(170, 544, 188, 563), - search=(150, 524, 208, 583), - color=(157, 156, 156), - button=(170, 544, 188, 563), + area=(175, 572, 192, 591), + search=(155, 552, 212, 611), + color=(152, 152, 151), + button=(175, 572, 192, 591), ), ) DAILY_QUEST_LEFT_START = ButtonWrapper( name='DAILY_QUEST_LEFT_START', share=Button( file='./assets/share/daily/reward/DAILY_QUEST_LEFT_START.png', - area=(1100, 187, 1135, 625), - search=(1080, 167, 1155, 645), - color=(214, 214, 213), - button=(1100, 187, 1135, 625), + area=(1105, 257, 1118, 633), + search=(1085, 237, 1138, 653), + color=(205, 205, 205), + button=(1105, 257, 1118, 633), ), ) DAILY_QUEST_REWARD = ButtonWrapper( name='DAILY_QUEST_REWARD', share=Button( file='./assets/share/daily/reward/DAILY_QUEST_REWARD.png', - area=(168, 544, 188, 564), - search=(148, 524, 208, 584), - color=(103, 83, 44), - button=(168, 544, 188, 564), + area=(172, 572, 192, 592), + search=(152, 552, 212, 612), + color=(101, 82, 45), + button=(172, 572, 192, 592), ), ) DAILY_QUEST_RIGHT_END = ButtonWrapper( name='DAILY_QUEST_RIGHT_END', share=Button( file='./assets/share/daily/reward/DAILY_QUEST_RIGHT_END.png', - area=(142, 207, 175, 669), - search=(122, 187, 195, 689), - color=(219, 219, 218), - button=(142, 207, 175, 669), + area=(401, 259, 411, 632), + search=(381, 239, 431, 652), + color=(206, 206, 206), + button=(401, 259, 411, 632), ), ) OCR_DAILY_QUEST = ButtonWrapper( name='OCR_DAILY_QUEST', share=Button( file='./assets/share/daily/reward/OCR_DAILY_QUEST.png', - area=(119, 232, 1165, 595), - search=(99, 212, 1185, 615), - color=(212, 210, 206), - button=(119, 232, 1165, 595), + area=(117, 257, 1173, 630), + search=(97, 237, 1193, 650), + color=(208, 206, 202), + button=(117, 257, 1173, 630), ), ) diff --git a/tasks/dungeon/assets/assets_dungeon_ui.py b/tasks/dungeon/assets/assets_dungeon_ui.py index 5cf5b0695..30207b930 100644 --- a/tasks/dungeon/assets/assets_dungeon_ui.py +++ b/tasks/dungeon/assets/assets_dungeon_ui.py @@ -7,50 +7,50 @@ DAILY_TRAINING_CHECK = ButtonWrapper( name='DAILY_TRAINING_CHECK', share=Button( file='./assets/share/dungeon/ui/DAILY_TRAINING_CHECK.png', - area=(239, 55, 279, 94), - search=(109, 45, 491, 104), - color=(129, 129, 129), - button=(239, 55, 279, 94), + area=(241, 94, 281, 134), + search=(221, 74, 301, 154), + color=(131, 131, 131), + button=(241, 94, 281, 134), ), ) DAILY_TRAINING_CLICK = ButtonWrapper( name='DAILY_TRAINING_CLICK', share=Button( file='./assets/share/dungeon/ui/DAILY_TRAINING_CLICK.png', - area=(230, 55, 270, 94), - search=(109, 45, 491, 104), - color=(98, 96, 96), - button=(230, 55, 270, 94), + area=(241, 95, 281, 134), + search=(221, 75, 301, 154), + color=(97, 96, 93), + button=(241, 95, 281, 134), ), ) DAILY_TRAINING_LOADED = ButtonWrapper( name='DAILY_TRAINING_LOADED', share=Button( file='./assets/share/dungeon/ui/DAILY_TRAINING_LOADED.png', - area=(1139, 520, 1156, 539), - search=(1119, 500, 1176, 559), - color=(63, 56, 50), - button=(1139, 520, 1156, 539), + area=(919, 583, 926, 590), + search=(899, 563, 946, 610), + color=(61, 55, 48), + button=(919, 583, 926, 590), ), ) OCR_DUNGEON_LIST = ButtonWrapper( name='OCR_DUNGEON_LIST', share=Button( file='./assets/share/dungeon/ui/OCR_DUNGEON_LIST.png', - area=(579, 133, 1165, 621), - search=(559, 113, 1185, 641), - color=(216, 218, 223), - button=(438, 132, 584, 621), + area=(581, 176, 1165, 661), + search=(561, 156, 1185, 681), + color=(212, 214, 220), + button=(440, 176, 588, 656), ), ) OCR_DUNGEON_NAV = ButtonWrapper( name='OCR_DUNGEON_NAV', share=Button( file='./assets/share/dungeon/ui/OCR_DUNGEON_NAV.png', - area=(108, 132, 428, 613), - search=(88, 112, 448, 633), - color=(178, 177, 177), - button=(108, 132, 428, 613), + area=(117, 182, 423, 641), + search=(97, 162, 443, 661), + color=(173, 172, 172), + button=(117, 182, 423, 641), ), ) OCR_SIMUNI_POINT = ButtonWrapper( @@ -67,49 +67,49 @@ OPERATION_BRIEFING_CHECK = ButtonWrapper( name='OPERATION_BRIEFING_CHECK', share=Button( file='./assets/share/dungeon/ui/OPERATION_BRIEFING_CHECK.png', - area=(147, 53, 191, 96), - search=(109, 45, 491, 104), - color=(151, 151, 151), - button=(147, 53, 191, 96), + area=(149, 92, 193, 136), + search=(129, 72, 213, 156), + color=(152, 152, 152), + button=(149, 92, 193, 136), ), ) OPERATION_BRIEFING_CLICK = ButtonWrapper( name='OPERATION_BRIEFING_CLICK', share=Button( file='./assets/share/dungeon/ui/OPERATION_BRIEFING_CLICK.png', - area=(138, 53, 182, 96), - search=(109, 45, 491, 104), - color=(83, 81, 81), - button=(138, 53, 182, 96), + area=(149, 92, 193, 136), + search=(129, 72, 213, 156), + color=(80, 79, 76), + button=(149, 92, 193, 136), ), ) SURVIVAL_INDEX_CHECK = ButtonWrapper( name='SURVIVAL_INDEX_CHECK', share=Button( file='./assets/share/dungeon/ui/SURVIVAL_INDEX_CHECK.png', - area=(330, 55, 368, 93), - search=(109, 45, 491, 104), + area=(332, 95, 370, 133), + search=(312, 75, 390, 153), color=(136, 136, 136), - button=(330, 55, 368, 93), + button=(332, 95, 370, 133), ), ) SURVIVAL_INDEX_CLICK = ButtonWrapper( name='SURVIVAL_INDEX_CLICK', share=Button( file='./assets/share/dungeon/ui/SURVIVAL_INDEX_CLICK.png', - area=(421, 56, 459, 93), - search=(109, 45, 491, 104), - color=(95, 93, 93), - button=(421, 56, 459, 93), + area=(332, 94, 370, 133), + search=(312, 74, 390, 153), + color=(90, 89, 87), + button=(332, 94, 370, 133), ), ) SURVIVAL_INDEX_LOADED = ButtonWrapper( name='SURVIVAL_INDEX_LOADED', share=Button( file='./assets/share/dungeon/ui/SURVIVAL_INDEX_LOADED.png', - area=(451, 244, 481, 265), - search=(442, 239, 482, 301), - color=(143, 150, 203), - button=(451, 244, 481, 265), + area=(451, 286, 476, 302), + search=(450, 271, 488, 311), + color=(142, 150, 197), + button=(451, 286, 476, 302), ), )