From 4512aeffa79a867d24a74e2726609f081a77f73d Mon Sep 17 00:00:00 2001 From: Driver-C <35056839+Driver-C@users.noreply.github.com> Date: Sat, 17 Jun 2023 22:39:43 +0800 Subject: [PATCH] Upd: Standardize the directory structure related to the synthesis of consumables (#15) --- .../RECIPE_UNLOCK.png | Bin .../SYNTHESIZE_CONFIRM.png | Bin .../SYNTHESIZE_CONFIRM_POPUP.png | Bin .../CONSUMABLES_COMFORT_FOOD.SEARCH.png | Bin .../CONSUMABLES_COMFORT_FOOD.png | Bin .../CONSUMABLES_COMFORT_FOOD_CHECK.png | Bin .../CONSUMABLES_SIMPLE_AED.SEARCH.png | Bin .../CONSUMABLES_SIMPLE_AED.png | Bin .../CONSUMABLES_SIMPLE_AED_CHECK.png | Bin .../CONSUMABLES_TRICK_SNACK.SEARCH.png | Bin .../CONSUMABLES_TRICK_SNACK.png | Bin .../CONSUMABLES_TRICK_SNACK_CHECK.png | Bin .../SYNTHESIZE_CONSUMABLES_CHECK.png | Bin .../SYNTHESIZE_GOTO_CONSUMABLES.png | Bin ... => assets_daily_synthesize_consumable.py} | 22 +++++++++--------- tasks/daily/synthesize.py | 2 +- 16 files changed, 12 insertions(+), 12 deletions(-) rename assets/cn/daily/{ => synthesize_consumable}/RECIPE_UNLOCK.png (100%) rename assets/cn/daily/{ => synthesize_consumable}/SYNTHESIZE_CONFIRM.png (100%) rename assets/cn/daily/{ => synthesize_consumable}/SYNTHESIZE_CONFIRM_POPUP.png (100%) rename assets/share/daily/{ => synthesize_consumable}/CONSUMABLES_COMFORT_FOOD.SEARCH.png (100%) rename assets/share/daily/{ => synthesize_consumable}/CONSUMABLES_COMFORT_FOOD.png (100%) rename assets/share/daily/{ => synthesize_consumable}/CONSUMABLES_COMFORT_FOOD_CHECK.png (100%) rename assets/share/daily/{ => synthesize_consumable}/CONSUMABLES_SIMPLE_AED.SEARCH.png (100%) rename assets/share/daily/{ => synthesize_consumable}/CONSUMABLES_SIMPLE_AED.png (100%) rename assets/share/daily/{ => synthesize_consumable}/CONSUMABLES_SIMPLE_AED_CHECK.png (100%) rename assets/share/daily/{ => synthesize_consumable}/CONSUMABLES_TRICK_SNACK.SEARCH.png (100%) rename assets/share/daily/{ => synthesize_consumable}/CONSUMABLES_TRICK_SNACK.png (100%) rename assets/share/daily/{ => synthesize_consumable}/CONSUMABLES_TRICK_SNACK_CHECK.png (100%) rename assets/share/daily/{ => synthesize_consumable}/SYNTHESIZE_CONSUMABLES_CHECK.png (100%) rename assets/share/daily/{ => synthesize_consumable}/SYNTHESIZE_GOTO_CONSUMABLES.png (100%) rename tasks/daily/assets/{assets_daily.py => assets_daily_synthesize_consumable.py} (74%) diff --git a/assets/cn/daily/RECIPE_UNLOCK.png b/assets/cn/daily/synthesize_consumable/RECIPE_UNLOCK.png similarity index 100% rename from assets/cn/daily/RECIPE_UNLOCK.png rename to assets/cn/daily/synthesize_consumable/RECIPE_UNLOCK.png diff --git a/assets/cn/daily/SYNTHESIZE_CONFIRM.png b/assets/cn/daily/synthesize_consumable/SYNTHESIZE_CONFIRM.png similarity index 100% rename from assets/cn/daily/SYNTHESIZE_CONFIRM.png rename to assets/cn/daily/synthesize_consumable/SYNTHESIZE_CONFIRM.png diff --git a/assets/cn/daily/SYNTHESIZE_CONFIRM_POPUP.png b/assets/cn/daily/synthesize_consumable/SYNTHESIZE_CONFIRM_POPUP.png similarity index 100% rename from assets/cn/daily/SYNTHESIZE_CONFIRM_POPUP.png rename to assets/cn/daily/synthesize_consumable/SYNTHESIZE_CONFIRM_POPUP.png diff --git a/assets/share/daily/CONSUMABLES_COMFORT_FOOD.SEARCH.png b/assets/share/daily/synthesize_consumable/CONSUMABLES_COMFORT_FOOD.SEARCH.png similarity index 100% rename from assets/share/daily/CONSUMABLES_COMFORT_FOOD.SEARCH.png rename to assets/share/daily/synthesize_consumable/CONSUMABLES_COMFORT_FOOD.SEARCH.png diff --git a/assets/share/daily/CONSUMABLES_COMFORT_FOOD.png b/assets/share/daily/synthesize_consumable/CONSUMABLES_COMFORT_FOOD.png similarity index 100% rename from assets/share/daily/CONSUMABLES_COMFORT_FOOD.png rename to assets/share/daily/synthesize_consumable/CONSUMABLES_COMFORT_FOOD.png diff --git a/assets/share/daily/CONSUMABLES_COMFORT_FOOD_CHECK.png b/assets/share/daily/synthesize_consumable/CONSUMABLES_COMFORT_FOOD_CHECK.png similarity index 100% rename from assets/share/daily/CONSUMABLES_COMFORT_FOOD_CHECK.png rename to assets/share/daily/synthesize_consumable/CONSUMABLES_COMFORT_FOOD_CHECK.png diff --git a/assets/share/daily/CONSUMABLES_SIMPLE_AED.SEARCH.png b/assets/share/daily/synthesize_consumable/CONSUMABLES_SIMPLE_AED.SEARCH.png similarity index 100% rename from assets/share/daily/CONSUMABLES_SIMPLE_AED.SEARCH.png rename to assets/share/daily/synthesize_consumable/CONSUMABLES_SIMPLE_AED.SEARCH.png diff --git a/assets/share/daily/CONSUMABLES_SIMPLE_AED.png b/assets/share/daily/synthesize_consumable/CONSUMABLES_SIMPLE_AED.png similarity index 100% rename from assets/share/daily/CONSUMABLES_SIMPLE_AED.png rename to assets/share/daily/synthesize_consumable/CONSUMABLES_SIMPLE_AED.png diff --git a/assets/share/daily/CONSUMABLES_SIMPLE_AED_CHECK.png b/assets/share/daily/synthesize_consumable/CONSUMABLES_SIMPLE_AED_CHECK.png similarity index 100% rename from assets/share/daily/CONSUMABLES_SIMPLE_AED_CHECK.png rename to assets/share/daily/synthesize_consumable/CONSUMABLES_SIMPLE_AED_CHECK.png diff --git a/assets/share/daily/CONSUMABLES_TRICK_SNACK.SEARCH.png b/assets/share/daily/synthesize_consumable/CONSUMABLES_TRICK_SNACK.SEARCH.png similarity index 100% rename from assets/share/daily/CONSUMABLES_TRICK_SNACK.SEARCH.png rename to assets/share/daily/synthesize_consumable/CONSUMABLES_TRICK_SNACK.SEARCH.png diff --git a/assets/share/daily/CONSUMABLES_TRICK_SNACK.png b/assets/share/daily/synthesize_consumable/CONSUMABLES_TRICK_SNACK.png similarity index 100% rename from assets/share/daily/CONSUMABLES_TRICK_SNACK.png rename to assets/share/daily/synthesize_consumable/CONSUMABLES_TRICK_SNACK.png diff --git a/assets/share/daily/CONSUMABLES_TRICK_SNACK_CHECK.png b/assets/share/daily/synthesize_consumable/CONSUMABLES_TRICK_SNACK_CHECK.png similarity index 100% rename from assets/share/daily/CONSUMABLES_TRICK_SNACK_CHECK.png rename to assets/share/daily/synthesize_consumable/CONSUMABLES_TRICK_SNACK_CHECK.png diff --git a/assets/share/daily/SYNTHESIZE_CONSUMABLES_CHECK.png b/assets/share/daily/synthesize_consumable/SYNTHESIZE_CONSUMABLES_CHECK.png similarity index 100% rename from assets/share/daily/SYNTHESIZE_CONSUMABLES_CHECK.png rename to assets/share/daily/synthesize_consumable/SYNTHESIZE_CONSUMABLES_CHECK.png diff --git a/assets/share/daily/SYNTHESIZE_GOTO_CONSUMABLES.png b/assets/share/daily/synthesize_consumable/SYNTHESIZE_GOTO_CONSUMABLES.png similarity index 100% rename from assets/share/daily/SYNTHESIZE_GOTO_CONSUMABLES.png rename to assets/share/daily/synthesize_consumable/SYNTHESIZE_GOTO_CONSUMABLES.png diff --git a/tasks/daily/assets/assets_daily.py b/tasks/daily/assets/assets_daily_synthesize_consumable.py similarity index 74% rename from tasks/daily/assets/assets_daily.py rename to tasks/daily/assets/assets_daily_synthesize_consumable.py index 579e7ba4b..a463b6477 100644 --- a/tasks/daily/assets/assets_daily.py +++ b/tasks/daily/assets/assets_daily_synthesize_consumable.py @@ -6,7 +6,7 @@ from module.base.button import Button, ButtonWrapper CONSUMABLES_COMFORT_FOOD = ButtonWrapper( name='CONSUMABLES_COMFORT_FOOD', share=Button( - file='./assets/share/daily/CONSUMABLES_COMFORT_FOOD.png', + file='./assets/share/daily/synthesize_consumable/CONSUMABLES_COMFORT_FOOD.png', area=(144, 241, 209, 298), search=(119, 84, 437, 573), color=(157, 140, 132), @@ -16,7 +16,7 @@ CONSUMABLES_COMFORT_FOOD = ButtonWrapper( CONSUMABLES_COMFORT_FOOD_CHECK = ButtonWrapper( name='CONSUMABLES_COMFORT_FOOD_CHECK', share=Button( - file='./assets/share/daily/CONSUMABLES_COMFORT_FOOD_CHECK.png', + file='./assets/share/daily/synthesize_consumable/CONSUMABLES_COMFORT_FOOD_CHECK.png', area=(588, 194, 684, 260), search=(568, 174, 704, 280), color=(184, 157, 135), @@ -26,7 +26,7 @@ CONSUMABLES_COMFORT_FOOD_CHECK = ButtonWrapper( CONSUMABLES_SIMPLE_AED = ButtonWrapper( name='CONSUMABLES_SIMPLE_AED', share=Button( - file='./assets/share/daily/CONSUMABLES_SIMPLE_AED.png', + file='./assets/share/daily/synthesize_consumable/CONSUMABLES_SIMPLE_AED.png', area=(347, 119, 420, 180), search=(119, 84, 437, 573), color=(94, 81, 80), @@ -36,7 +36,7 @@ CONSUMABLES_SIMPLE_AED = ButtonWrapper( CONSUMABLES_SIMPLE_AED_CHECK = ButtonWrapper( name='CONSUMABLES_SIMPLE_AED_CHECK', share=Button( - file='./assets/share/daily/CONSUMABLES_SIMPLE_AED_CHECK.png', + file='./assets/share/daily/synthesize_consumable/CONSUMABLES_SIMPLE_AED_CHECK.png', area=(585, 186, 685, 263), search=(565, 166, 705, 283), color=(88, 66, 58), @@ -46,7 +46,7 @@ CONSUMABLES_SIMPLE_AED_CHECK = ButtonWrapper( CONSUMABLES_TRICK_SNACK = ButtonWrapper( name='CONSUMABLES_TRICK_SNACK', share=Button( - file='./assets/share/daily/CONSUMABLES_TRICK_SNACK.png', + file='./assets/share/daily/synthesize_consumable/CONSUMABLES_TRICK_SNACK.png', area=(346, 362, 417, 418), search=(119, 84, 437, 573), color=(122, 129, 127), @@ -56,7 +56,7 @@ CONSUMABLES_TRICK_SNACK = ButtonWrapper( CONSUMABLES_TRICK_SNACK_CHECK = ButtonWrapper( name='CONSUMABLES_TRICK_SNACK_CHECK', share=Button( - file='./assets/share/daily/CONSUMABLES_TRICK_SNACK_CHECK.png', + file='./assets/share/daily/synthesize_consumable/CONSUMABLES_TRICK_SNACK_CHECK.png', area=(593, 188, 678, 267), search=(573, 168, 698, 287), color=(130, 137, 127), @@ -66,7 +66,7 @@ CONSUMABLES_TRICK_SNACK_CHECK = ButtonWrapper( RECIPE_UNLOCK = ButtonWrapper( name='RECIPE_UNLOCK', cn=Button( - file='./assets/cn/daily/RECIPE_UNLOCK.png', + file='./assets/cn/daily/synthesize_consumable/RECIPE_UNLOCK.png', area=(836, 647, 913, 668), search=(816, 627, 933, 688), color=(167, 167, 167), @@ -76,7 +76,7 @@ RECIPE_UNLOCK = ButtonWrapper( SYNTHESIZE_CONFIRM = ButtonWrapper( name='SYNTHESIZE_CONFIRM', cn=Button( - file='./assets/cn/daily/SYNTHESIZE_CONFIRM.png', + file='./assets/cn/daily/synthesize_consumable/SYNTHESIZE_CONFIRM.png', area=(847, 645, 895, 672), search=(827, 625, 915, 692), color=(189, 190, 190), @@ -86,7 +86,7 @@ SYNTHESIZE_CONFIRM = ButtonWrapper( SYNTHESIZE_CONFIRM_POPUP = ButtonWrapper( name='SYNTHESIZE_CONFIRM_POPUP', cn=Button( - file='./assets/cn/daily/SYNTHESIZE_CONFIRM_POPUP.png', + file='./assets/cn/daily/synthesize_consumable/SYNTHESIZE_CONFIRM_POPUP.png', area=(770, 476, 857, 506), search=(750, 456, 877, 526), color=(176, 175, 172), @@ -96,7 +96,7 @@ SYNTHESIZE_CONFIRM_POPUP = ButtonWrapper( SYNTHESIZE_CONSUMABLES_CHECK = ButtonWrapper( name='SYNTHESIZE_CONSUMABLES_CHECK', share=Button( - file='./assets/share/daily/SYNTHESIZE_CONSUMABLES_CHECK.png', + file='./assets/share/daily/synthesize_consumable/SYNTHESIZE_CONSUMABLES_CHECK.png', area=(38, 114, 78, 138), search=(18, 94, 98, 158), color=(145, 147, 148), @@ -106,7 +106,7 @@ SYNTHESIZE_CONSUMABLES_CHECK = ButtonWrapper( SYNTHESIZE_GOTO_CONSUMABLES = ButtonWrapper( name='SYNTHESIZE_GOTO_CONSUMABLES', share=Button( - file='./assets/share/daily/SYNTHESIZE_GOTO_CONSUMABLES.png', + file='./assets/share/daily/synthesize_consumable/SYNTHESIZE_GOTO_CONSUMABLES.png', area=(38, 120, 78, 141), search=(18, 100, 98, 161), color=(95, 98, 106), diff --git a/tasks/daily/synthesize.py b/tasks/daily/synthesize.py index baeccf5c0..945e6ea40 100644 --- a/tasks/daily/synthesize.py +++ b/tasks/daily/synthesize.py @@ -4,7 +4,7 @@ from tasks.base.assets.assets_base_page import MENU_CHECK, SYNTHESIZE_CHECK from tasks.base.assets.assets_base_popup import GET_REWARD from tasks.base.page import Page, page_menu, page_synthesize from tasks.base.ui import UI -from tasks.daily.assets.assets_daily import * +from tasks.daily.assets.assets_daily_synthesize_consumable import * class SynthesizeUI(UI):