Use main-window menus, cache maps, and handle settled sweep events
This commit is contained in:
+19
-8
@@ -14,7 +14,7 @@ from .engine import Engine
|
||||
from .model import Catalog, Policy, WIKI, duration
|
||||
from .egg_rules_gui import EggTable
|
||||
from .management import expansion_quote, manual_monster_actions
|
||||
from .native_widgets import ComboBox, use_native_scrollbars
|
||||
from .native_widgets import ComboBox, SpinBox, DoubleSpinBox, use_native_scrollbars
|
||||
from .login import PasswordLogin, device_id, server_labels
|
||||
from .quests import QuestPolicy
|
||||
from .daily import DailyPolicy
|
||||
@@ -29,8 +29,10 @@ from .inventory_gui import ITEM_TYPES, InventoryTable
|
||||
from .ranch_gui import RanchView
|
||||
from .policy_io import portable_config, import_config
|
||||
from .table_widgets import table_item
|
||||
from .stage_cache import StageCache
|
||||
|
||||
APP_VERSION = "1.1.0"
|
||||
GAME_VERSION = "1.9.68"
|
||||
|
||||
ROOT = Path(sys.executable).parent if getattr(sys, "frozen", False) else Path(__file__).resolve().parent.parent
|
||||
STATE = ROOT / "local_state" / "ranch_helper"
|
||||
@@ -58,7 +60,7 @@ class Job(C.QRunnable):
|
||||
|
||||
|
||||
def spin(low, high, value, decimals=False):
|
||||
widget = W.QDoubleSpinBox() if decimals else W.QSpinBox()
|
||||
widget = DoubleSpinBox() if decimals else SpinBox()
|
||||
widget.setRange(low, high)
|
||||
widget.setValue(value)
|
||||
return widget
|
||||
@@ -287,9 +289,6 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
self.plans, self.yields.parentWidget()]
|
||||
for page in order:
|
||||
self.tabs.addTab(page, self.tabs.tabText(self.tabs.indexOf(page)))
|
||||
strategies = self.menuBar().addMenu("策略配置")
|
||||
strategies.addAction("导入全部策略…", self.import_policies)
|
||||
strategies.addAction("导出全部策略…", self.export_policies)
|
||||
self.monster_view.currentIndexChanged.connect(self.monster_view_changed)
|
||||
self.monster_room.currentIndexChanged.connect(self.monster_view_changed)
|
||||
self.monster_view.setCurrentIndex(self.monster_view.findData(0))
|
||||
@@ -1003,6 +1002,8 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
if tab is self.yields.parentWidget():
|
||||
self.render_catalog()
|
||||
self.report("收益资料已从本地表刷新")
|
||||
elif tab is self.map_page:
|
||||
self.refresh_maps()
|
||||
else:
|
||||
self.refresh()
|
||||
|
||||
@@ -1106,11 +1107,16 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
def background():
|
||||
started = time.perf_counter()
|
||||
value = function()
|
||||
if kind in ("poll", "hatch", "monster_lock", "manual_monsters", "expansion", "growth_sync", "master_sync", "daily_claim", "connected"):
|
||||
if kind in ("poll", "hatch", "monster_lock", "manual_monsters", "expansion", "growth_sync", "master_sync", "map_refresh", "daily_claim", "connected"):
|
||||
snapshot = value[1] if kind == "connected" else value[0]
|
||||
managed = set() if kind == "connected" else set(engine.planner.managed)
|
||||
preparing = time.perf_counter()
|
||||
views = prepare_views(catalog, snapshot, managed)
|
||||
cache = engine.stage_cache
|
||||
if kind == "connected":
|
||||
session = value[0].session
|
||||
folder = self.profile_root / "roles" / identity(session) if isinstance(session, Session) and session.role_id else self.state
|
||||
cache = StageCache(catalog, folder / "maps.json")
|
||||
views = prepare_views(catalog, snapshot, managed, cache)
|
||||
return Presented(value, views, (time.perf_counter() - preparing) * 1000, (time.perf_counter() - started) * 1000)
|
||||
return value
|
||||
job = Job(kind, background)
|
||||
@@ -1153,7 +1159,7 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
note="worker总耗时包含网络;大列表在后续短批次更新")
|
||||
|
||||
def apply_result(self, kind, value):
|
||||
if kind in ("poll", "hatch", "monster_lock", "manual_monsters", "expansion", "growth_sync", "master_sync", "daily_claim"):
|
||||
if kind in ("poll", "hatch", "monster_lock", "manual_monsters", "expansion", "growth_sync", "master_sync", "map_refresh", "daily_claim"):
|
||||
snapshot, plans, message = value
|
||||
self.render(snapshot, plans)
|
||||
self.report(message)
|
||||
@@ -1177,6 +1183,9 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
self.engine.client.close()
|
||||
self.engine = Engine(self.catalog, client, self.state / "purchase_budget.json")
|
||||
self.engine.snapshot = snapshot
|
||||
if self.prepared_views and self.prepared_views.snapshot is snapshot and self.prepared_views.stage_cache:
|
||||
self.engine.stage_cache = self.prepared_views.stage_cache
|
||||
self.reset_map_view()
|
||||
if isinstance(client.session, Session):
|
||||
if client.session.account_name and client.session.account_name != self.account.text().strip():
|
||||
_, saved_account, saved_password = self.credentials.load()
|
||||
@@ -1556,6 +1565,7 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
self.engine.client.persist_session()
|
||||
self.engine.client.close()
|
||||
self.engine = Engine(self.catalog)
|
||||
self.reset_map_view()
|
||||
self.active_identity = None
|
||||
self.state = self.profile_root
|
||||
self.load_config(copy.deepcopy(self.default_config))
|
||||
@@ -1684,6 +1694,7 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
self.next_poll = 0
|
||||
self.arm_hatching()
|
||||
self.statusBar().showMessage("规则已自动保存并应用", 3000)
|
||||
return value
|
||||
|
||||
def save_config(self, *args, quiet=False):
|
||||
try:
|
||||
|
||||
Reference in New Issue
Block a user