#245 合成零食写到一半

config/custom_combine_op/buy_trick_snack.yml

@@ -0,0 +1,42 @@
+name: '购买合成奇巧零食'
+ops:
+  - op: 'back_to_world_plus'
+    data: []
+  - op: 'transport'
+    data: ['仙舟「罗浮」', '星槎海中枢', '0', '宣夜大道']
+  - op: 'wait'
+    data: ['in_world', '20']
+  - op: 'move'
+    data: [ '420', '606' ]
+  - op: 'move'
+    data: [ '422', '572' ]
+  - op: 'move'
+    data: [ '556', '570' ]
+  - op: 'move'
+    data: [ '565', '525' ]
+  - op: 'move'
+    data: [ '578', '496' ]
+  - op: 'interact'
+    data: ['world_single_line', '货全']
+  - op: 'interact'
+    data: ['talk', '都有些什么好东西']
+  - op: 'wait'
+    data: ['seconds', '0.5']
+  - op: 'click'
+    data: [ '100', '100' ]
+  - op: 'wait'
+    data: ['seconds', '0.5']
+  - op: 'click'
+    data: [ '100', '100' ]
+  - op: 'wait'
+    data: ['seconds', '0.5']
+  - op: 'buy_store_item'
+    data: ['gaseous_liquid', '0']
+    allow_fail: true
+  - op: 'buy_store_item'
+    data: ['seed', '0']
+    allow_fail: true
+  - op: 'back_to_world_plus'
+    data: []
+  - op: 'synthesizing'
+    data: ['consumable', 'trick_snack', '0']

src/gui/about_view.py

@@ -9,7 +9,7 @@
 from basic.log_utils import log
 from gui import components, version, snack_bar
 from gui.sr_basic_view import SrBasicView
-from sr.context import Context
+from sr.context.context import Context
 from sr.one_dragon_config import PROXY_TYPE_LIST
 
 

src/gui/app.py

@@ -7,7 +7,6 @@
 
 from basic import os_utils
 from basic.i18_utils import gt, update_default_lang
-from basic.log_utils import log
 from gui import log_view, calibrator_view, version, one_stop_view, scheduler, snack_bar, about_view
 from gui.settings import gui_config, settings_game_config_view, settings_trailblaze_power_view, \
     settings_echo_of_war_view, \
@@ -17,7 +16,7 @@
 from gui.sim_uni import sim_uni_draft_route_view, sim_uni_challenge_config_view, sim_uni_run_view
 from gui.sr_basic_view import SrBasicView
 from gui.world_patrol import world_patrol_run_view, world_patrol_draft_route_view, world_patrol_whitelist_view
-from sr.context import get_context, Context
+from sr.context.context import get_context, Context
 
 _app_executor = ThreadPoolExecutor(thread_name_prefix='sr_od_app', max_workers=1)
 

src/gui/calibrator_view.py

@@ -4,7 +4,7 @@
 
 from gui.sr_app_view import SrAppView
 from sr.app.calibrator import Calibrator
-from sr.context import Context
+from sr.context.context import Context
 
 
 class CalibratorView(SrAppView):

src/gui/log_view.py

@@ -6,7 +6,7 @@
 from basic.log_utils import log
 from gui import components
 from gui.sr_basic_view import SrBasicView
-from sr.context import Context
+from sr.context.context import Context
 
 
 class GuiHandler(logging.Handler):

src/gui/one_stop_view.py

@@ -15,7 +15,7 @@
 from sr.app.application_base import Application, ApplicationEventId
 from sr.app.one_stop_service.one_stop_service_app import OneStopServiceApp
 from sr.app.one_stop_service.one_stop_service_config import OneStopServiceConfig
-from sr.context import Context, ContextEventId
+from sr.context.context import Context, ContextEventId
 from sr.mystools.one_dragon_mys_config import MysConfig
 from sr.treasures_lightward.treasures_lightward_const import TreasuresLightwardTypeEnum
 

src/gui/settings/settings_basic_view.py

@@ -10,7 +10,7 @@
 from gui.settings.gui_config import GuiConfig
 from gui.sr_basic_view import SrBasicView
 from sr.app.switch_account.switch_account_app import SwitchAccountApp
-from sr.context import Context
+from sr.context.context import Context
 from sr.one_dragon_config import OneDragonAccount
 from sryolo.detector import check_model_exists, get_model_dir_path
 

src/gui/settings/settings_echo_of_war_view.py

@@ -2,16 +2,15 @@
 
 import flet as ft
 
-import sr.app.echo_of_war.echo_of_war_config
 from basic.i18_utils import gt
 from gui import components
 from gui.components.character_input import CharacterInput
 from gui.settings import gui_config
 from gui.settings.gui_config import ThemeColors
 from gui.sr_basic_view import SrBasicView
-from sr.app.echo_of_war.echo_of_war_config import EchoOfWarPlanItem, EchoOfWarConfig
+from sr.app.echo_of_war.echo_of_war_config import EchoOfWarPlanItem
 from sr.const.character_const import CHARACTER_LIST
-from sr.context import Context
+from sr.context.context import Context
 from sr.interastral_peace_guide.guide_const import GuideCategoryEnum, GuideMission, \
     GuideMissionEnum
 

src/gui/settings/settings_game_config_view.py

@@ -2,20 +2,14 @@
 
 import flet as ft
 import keyboard
-from flet_core import CrossAxisAlignment
 
-from basic import i18_utils, os_utils
+from basic import i18_utils
 from basic.i18_utils import gt
-from basic.log_utils import log
-from gui import version, snack_bar, components
+from gui import components
 from gui.components import SettingsList, SettingsListItem, SettingsListGroupTitle
-from gui.settings import gui_config
-from gui.settings.gui_config import GuiConfig
 from gui.sr_basic_view import SrBasicView
-from sr.config import game_config
-from sr.config.game_config import GameConfig
 from sr.const import game_config_const
-from sr.context import Context
+from sr.context.context import Context
 
 
 class SettingsGameConfigView(components.Card, SrBasicView):

src/gui/settings/settings_mys_view.py

@@ -6,7 +6,7 @@
 from basic.log_utils import log
 from gui import components, snack_bar
 from gui.sr_basic_view import SrBasicView
-from sr.context import Context
+from sr.context.context import Context
 
 
 class SettingsMysView(SrBasicView, ft.Row):

src/gui/settings/settings_sim_uni_view.py

@@ -8,7 +8,7 @@
 from gui.settings import gui_config
 from gui.settings.gui_config import ThemeColors
 from gui.sr_basic_view import SrBasicView
-from sr.context import Context
+from sr.context.context import Context
 from sr.sim_uni.sim_uni_const import SimUniWorldEnum
 
 

src/gui/settings/settings_trailblaze_power_view.py

@@ -10,7 +10,7 @@
 from gui.sr_basic_view import SrBasicView
 from sr.app.trailblaze_power.trailblaze_power_config import TrailblazePowerPlanItem
 from sr.const.character_const import CHARACTER_LIST
-from sr.context import Context
+from sr.context.context import Context
 from sr.interastral_peace_guide.guide_const import GuideCategory, GuideCategoryEnum, \
     GuideMission, GuideMissionEnum
 

src/gui/settings/settings_treasures_lightward_view.py

@@ -9,9 +9,9 @@
 from gui.settings import gui_config
 from gui.settings.gui_config import ThemeColors
 from gui.sr_basic_view import SrBasicView
-from sr.const.character_const import CHARACTER_LIST, get_character_by_id, CHARACTER_COMBAT_TYPE_LIST, \
+from sr.const.character_const import CHARACTER_LIST, CHARACTER_COMBAT_TYPE_LIST, \
     get_combat_type_by_id
-from sr.context import Context
+from sr.context.context import Context
 from sr.treasures_lightward.treasures_lightward_team_module import TreasuresLightwardTeamModule, \
     TlModuleItemCharacterTypeEnum, TlModuleItemPositionEnum, TreasuresLightwardTeamModuleItem
 

src/gui/settings/settings_world_patrol_view.py

@@ -7,7 +7,7 @@
 from gui.components import SettingsListItem, SettingsList
 from gui.sr_basic_view import SrBasicView
 from sr.app.world_patrol.world_patrol_whitelist_config import WorldPatrolWhitelist, load_all_whitelist_id
-from sr.context import Context
+from sr.context.context import Context
 
 
 class SettingsWorldPatrolView(SrBasicView, components.Card):

src/gui/sim_uni/sim_uni_challenge_config_view.py

@@ -11,7 +11,7 @@
 from gui.settings.gui_config import ThemeColors
 from gui.sr_basic_view import SrBasicView
 from sr.sim_uni.sim_uni_challenge_config import SimUniChallengeConfig
-from sr.context import Context
+from sr.context.context import Context
 from sr.sim_uni.sim_uni_const import SimUniLevelTypeEnum, SimUniLevelType, level_type_from_id, level_type_from_name, \
     SimUniPath, SimUniBlessLevel, SimUniBlessEnum, bless_enum_from_title, SimUniCurioEnum, \
     curio_enum_from_name

src/gui/sim_uni/sim_uni_draft_route_view.py

@@ -22,7 +22,7 @@
 from sr.sim_uni.sim_uni_route import SimUniRouteOperation, SimUniRoute
 from sr.app.sim_uni.test_sim_uni_route_app import TestSimUniRouteApp
 from sr.const import map_const, operation_const
-from sr.context import Context
+from sr.context.context import Context
 from sr.image.sceenshot import mini_map, LargeMapInfo, large_map
 from sr.sim_uni.sim_uni_const import UNI_NUM_CN, level_type_from_id, SimUniLevelTypeEnum
 

src/gui/sim_uni/sim_uni_run_view.py

@@ -4,13 +4,10 @@
 import re
 
 from basic.i18_utils import gt
-from basic.log_utils import log
 from gui import components
 from gui.sr_app_view import SrAppView
 from sr.app.sim_uni.sim_uni_app import SimUniApp
-from sr.app.world_patrol.world_patrol_app import WorldPatrol
-from sr.app.world_patrol.world_patrol_whitelist_config import WorldPatrolWhitelist, load_all_whitelist_id
-from sr.context import Context
+from sr.context.context import Context
 from sr.sim_uni.sim_uni_const import SimUniWorldEnum
 
 

src/gui/sr_app_view.py

@@ -8,7 +8,7 @@
 from basic.log_utils import log
 from gui import snack_bar, components
 from gui.sr_basic_view import SrBasicView
-from sr.context import Context, ContextEventId
+from sr.context.context import Context, ContextEventId
 
 _sr_app_view_executor = ThreadPoolExecutor(thread_name_prefix='sr_od_sr_app_view', max_workers=1)
 

src/gui/sr_basic_view.py

@@ -1,7 +1,7 @@
 from flet_core import Control
 import flet as ft
 
-from sr.context import Context
+from sr.context.context import Context
 
 
 class SrBasicView(Control):

src/gui/world_patrol/world_patrol_draft_route_view.py

@@ -1,5 +1,4 @@
 import base64
-import os
 from typing import List, Optional
 
 import cv2
@@ -10,22 +9,22 @@
 from flet_core import ScrollMode
 
 import sr.const.operation_const
-from basic import os_utils, Point
+from basic import Point
 from basic.i18_utils import gt
 from basic.img import cv2_utils, MatchResult
 from basic.log_utils import log
-from gui import snack_bar, components
+from gui import components
 from gui.settings import gui_config
 from gui.settings.gui_config import ThemeColors
 from gui.sr_basic_view import SrBasicView
 from sr import cal_pos
 from sr.app.world_patrol.world_patrol_route import WorldPatrolRouteId, WorldPatrolRoute, load_all_route_id, new_route_id
 from sr.app.world_patrol.world_patrol_whitelist_config import WorldPatrolWhitelist
 from sr.app.world_patrol.world_patrol_app import WorldPatrol
-from sr.const import map_const, operation_const
+from sr.const import operation_const
 from sr.const.map_const import Planet, get_planet_by_cn, PLANET_LIST, PLANET_2_REGION, get_region_by_cn, Region, \
-    REGION_2_SP, TransportPoint, region_with_another_floor, get_sub_region_by_cn
-from sr.context import Context
+    REGION_2_SP, TransportPoint, get_sub_region_by_cn
+from sr.context.context import Context
 from sr.image.sceenshot import mini_map, large_map
 
 
@@ -468,7 +467,7 @@ def _add_move_op(self, x: int, y: int):
             log.error('未选择路线')
             return
 
-        if self.sub_region_floor_dropdown.value is None:
+        if self.sub_region_floor_dropdown.value is None or len(self.sub_region_floor_dropdown.value) == 0:
             floor = int(self.switch_floor_dropdown.value)
         else:
             floor = int(self.sub_region_floor_dropdown.value)

src/gui/world_patrol/world_patrol_run_view.py

@@ -8,7 +8,7 @@
 from gui.sr_app_view import SrAppView
 from sr.app.world_patrol.world_patrol_app import WorldPatrol
 from sr.app.world_patrol.world_patrol_whitelist_config import WorldPatrolWhitelist, load_all_whitelist_id
-from sr.context import Context
+from sr.context.context import Context
 
 
 class WorldPatrolRunView(SrAppView):

src/gui/world_patrol/world_patrol_whitelist_view.py

@@ -13,7 +13,7 @@
 from sr.app.world_patrol.world_patrol_route import WorldPatrolRouteId, WorldPatrolRoute, load_all_route_id
 from sr.app.world_patrol.world_patrol_whitelist_config import WorldPatrolWhitelist, load_all_whitelist_id
 from sr.const.map_const import PLANET_LIST, PLANET_2_REGION
-from sr.context import Context
+from sr.context.context import Context
 
 
 class WorldPatrolWhiteListView(components.Card, SrBasicView):

src/sr/app/application_base.py

@@ -3,7 +3,7 @@
 
 from basic.log_utils import log
 from sr.app.app_run_record import AppRunRecord
-from sr.context import Context
+from sr.context.context import Context
 from sr.operation import Operation, OperationResult, StateOperation, StateOperationNode, StateOperationEdge, \
     OperationOneRoundResult
 from sr.operation.unit.enter_game import EnterGame

src/sr/app/assignments/assignments_app.py

@@ -6,7 +6,7 @@
 from basic.img import MatchResult, cv2_utils, MatchResultList
 from sr.app.application_base import Application
 from sr.const import phone_menu_const
-from sr.context import Context
+from sr.context.context import Context
 from sr.image.sceenshot import phone_menu
 from sr.operation import Operation, StateOperationNode, StateOperationEdge, OperationOneRoundResult
 from sr.operation.common.back_to_normal_world_plus import BackToNormalWorldPlus

src/sr/app/buy_xianzhou_parcel/buy_xianzhou_parcel_app.py

@@ -1,7 +1,7 @@
 from basic.i18_utils import gt
 from sr.app.application_base import Application
 from sr.const import map_const
-from sr.context import Context
+from sr.context.context import Context
 from sr.operation import StateOperationNode
 from sr.operation.combine.transport import Transport
 from sr.operation.common.back_to_normal_world_plus import BackToNormalWorldPlus

src/sr/app/calibrator.py

@@ -9,7 +9,7 @@
 from sr.config.game_config import GameConfig, MiniMapPos
 from sr.const import map_const
 from sr.const.map_const import TransportPoint
-from sr.context import Context
+from sr.context.context import Context
 from sr.image.sceenshot import mini_map
 from sr.operation.combine.transport import Transport
 

src/sr/app/claim_email/email_app.py

@@ -7,9 +7,9 @@
 from basic.img import MatchResult, cv2_utils
 from sr.app.application_base import Application
 from sr.const import phone_menu_const
-from sr.context import Context
+from sr.context.context import Context
 from sr.image.sceenshot import phone_menu
-from sr.operation import Operation, StateOperationEdge, StateOperationNode, OperationOneRoundResult
+from sr.operation import StateOperationEdge, StateOperationNode, OperationOneRoundResult
 from sr.operation.common.back_to_normal_world_plus import BackToNormalWorldPlus
 from sr.operation.unit.menu.open_phone_menu import OpenPhoneMenu
 

src/sr/app/daily_training/daily_training_app.py

@@ -5,7 +5,7 @@
 from sr.const import phone_menu_const
 from sr.const.traing_mission_const import MISSION_SALVAGE_RELIC, MISSION_DESTRUCTIBLE_OBJECTS, MISSION_USE_TECHNIQUE, \
     MISSION_TAKE_PHOTO, MISSION_SYNTHESIZE_CONSUMABLE
-from sr.context import Context
+from sr.context.context import Context
 from sr.operation import StateOperationEdge, StateOperationNode
 from sr.operation.combine.destory_objects import DestroyObjects
 from sr.operation.combine.dt_synthesize_consumable import DtSynthesizeConsumable

src/sr/app/echo_of_war/echo_of_war_app.py

@@ -10,10 +10,10 @@
 from sr.app.application_base import Application
 from sr.app.echo_of_war.echo_of_war_config import EchoOfWarPlanItem
 from sr.app.echo_of_war.echo_of_war_run_record import EchoOfWarRunRecord
-from sr.context import Context
+from sr.context.context import Context
 from sr.image.sceenshot import large_map
 from sr.interastral_peace_guide.guide_const import GuideMission, GuideMissionEnum
-from sr.operation import Operation, StateOperationEdge, StateOperationNode, OperationOneRoundResult
+from sr.operation import StateOperationEdge, StateOperationNode, OperationOneRoundResult
 from sr.operation.combine.challenge_ehco_of_war import ChallengeEchoOfWar
 from sr.operation.common.back_to_normal_world_plus import BackToNormalWorldPlus
 from sr.operation.common.cancel_mission_trace import CancelMissionTrace