Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "v1.13.2"
description = "MaaDebugger"
authors = [{ name = "MaaXYZ" }]
dependencies = [
"MaaFw>=5.0.1",
"MaaFw>=5.1.0",
"nicegui>=2.21,<3.0",
"asyncify",
"pillow",
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
maafw>=5.0.1
maafw>=5.1.0
nicegui>=2.21,<3.0
asyncify
pillow
Expand Down
1 change: 1 addition & 0 deletions src/MaaDebugger/maafw/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
from PIL import Image
from maa.controller import AdbController, Win32Controller
from maa.context import Context, ContextEventSink
from maa.pipeline import JNodeAttr
from maa.tasker import Tasker, RecognitionDetail
from maa.resource import Resource, ResourceEventSink
from maa.toolkit import Toolkit, AdbDevice, DesktopWindow
Expand Down
10 changes: 5 additions & 5 deletions src/MaaDebugger/webpage/index_page/runtime_control.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from nicegui.binding import bindable_dataclass
from maa.resource import Resource, NotificationType

from ...maafw import maafw, MyContextEventSink, MyResourceEventSink
from ...maafw import maafw, MyContextEventSink, MyResourceEventSink, JNodeAttr
from ...webpage.components.status_indicator import Status, StatusIndicator
from ...webpage.reco_page import RecoData
from .global_status import GlobalStatus
Expand Down Expand Up @@ -39,7 +39,7 @@ class ItemData:
class ListData:
row_len: int
current: str
list_to_reco: list[str]
list_to_reco: list[JNodeAttr]


def main():
Expand Down Expand Up @@ -171,7 +171,7 @@ def create_list(self, row: ui.row, data: ListData):
ui.separator()

for index in range(len(data.list_to_reco)):
name = data.list_to_reco[index]
name = data.list_to_reco[index].name
self.create_items(index, name, data.row_len)

ls.set_visibility(True)
Expand Down Expand Up @@ -218,7 +218,7 @@ def on_recognized(self, reco_id: int, name: str, hit: bool):
asyncio.run(maafw.screenshotter.refresh(False))

# maafw
def on_next_list_starting(self, current: str, list_to_reco: list[str]):
def on_next_list_starting(self, current: str, list_to_reco: list[JNodeAttr]):
self.row_len += 1

list_data = ListData(self.row_len, current, list_to_reco)
Expand Down Expand Up @@ -268,7 +268,7 @@ def on_next_list_starting(self, current: str, list_to_reco: list[str]):
def add_list_data(self, data: ListData):
self.list_data_map[data.row_len] = data
for index in range(len(data.list_to_reco)):
name = data.list_to_reco[index]
name = data.list_to_reco[index].name
self.add_item_data(index, name, data.row_len)

def on_resource_loading(
Expand Down