Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
06b293c
Merge pull request #5 from pur1fying/feature/service
Kiramei Nov 21, 2025
126bd75
Merge branch 'pur1fying:master' into master
Kiramei Nov 21, 2025
3d2e4e7
Restore: feature/service
Kiramei Nov 21, 2025
888ecb3
Fix: uv does need setuptools to support adb
Kiramei Nov 21, 2025
a5ec905
Merge branch 'pur1fying:master' into master
Kiramei Nov 23, 2025
a6c1425
Update: Check local version every time
Kiramei Nov 24, 2025
eea393a
Merge branch 'master' into fix-rich
Kiramei Dec 3, 2025
72e520a
Merge pull request #7 from pur1fying/fix-rich
Kiramei Dec 3, 2025
8234386
Update requirements for Sub Utils and rich package
Kiramei Dec 3, 2025
51269d6
Fix: Refactor logging to use rich formatting and centralize setup
Kiramei Dec 3, 2025
8019db5
Update utils.py
Kiramei Dec 3, 2025
ad1d81c
Merge branch 'pur1fying:master' into master
Kiramei Dec 11, 2025
66cc91c
Merge branch 'pur1fying:master' into master
Kiramei Dec 13, 2025
fd25214
Feat: Add the frontend part
Kiramei Dec 16, 2025
bcb55b7
Update: Add update-to-latest functionality and refactor update logic
Kiramei Dec 18, 2025
52c65ba
Feat: Docker Support For Service Mode
Kiramei Dec 18, 2025
0e9b10e
Merge pull request #8 from Kiramei/feat/docker-support
Kiramei Dec 18, 2025
bffaa18
Merge branch 'pur1fying:master' into master
Kiramei Dec 18, 2025
0396caf
Refactor: installer logic refactor
Kiramei Dec 18, 2025
127fddf
Merge pull request #9 from Kiramei/feat/docker-support
Kiramei Dec 18, 2025
d6a0e90
Merge branch 'pur1fying:master' into master
Kiramei Dec 18, 2025
e6e29b3
Fix: Add DotPrinter for progress feedback and improve temp dir usage
Kiramei Dec 18, 2025
61c5c1d
Fix: MirrorC param pass error
Kiramei Dec 19, 2025
4c30b25
Update: Optimize Docker Size
Kiramei Dec 19, 2025
cf213fd
Merge branch 'pur1fying:master' into master
Kiramei Dec 30, 2025
a121c5f
Merge branch 'pur1fying:master' into master
Kiramei Jan 9, 2026
942f822
Merge branch 'master' into pr/430
pur1fying Feb 2, 2026
7b89d5f
Merge branch 'pur1fying:master' into master
Kiramei Apr 13, 2026
454d348
Sync: Move reqs to deploy/service
Kiramei Apr 15, 2026
323832d
Pre: Remote control
Kiramei Apr 21, 2026
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
7 changes: 5 additions & 2 deletions core/Baas_thread.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@

class Baas_thread:

def __init__(self, config, logger_signal=None, button_signal=None, update_signal=None, exit_signal=None):
def __init__(self, config, logger_signal=None, button_signal=None, update_signal=None, exit_signal=None, **kwargs):
self.project_dir = os.path.abspath(os.path.dirname(__file__))
self.project_dir = os.path.dirname(self.project_dir)
self.u2_client = None
Expand Down Expand Up @@ -100,7 +100,7 @@ def __init__(self, config, logger_signal=None, button_signal=None, update_signal
self.task_finish_to_main_page = False
self.static_config = ConfigSet.static_config
self.ocr = None
self.logger = utils.Logger(logger_signal)
self.logger = utils.Logger(logger_signal, jsonify=kwargs.get("jsonify", False))
self.last_refresh_u2_time = 0
self.latest_img_array = None
self.total_assault_difficulty_names = ["NORMAL", "HARD", "VERYHARD", "HARDCORE", "EXTREME", "INSANE", "TORMENT"]
Expand Down Expand Up @@ -695,6 +695,9 @@ def init_config(self):
except Exception as e:
self.logger.error("Config initialization failed")
self.logger.error(e.__str__())

import traceback
traceback.print_exc()
return False

def swipe(self, fx, fy, tx, ty, duration=None, post_sleep_time=0):
Expand Down
31 changes: 21 additions & 10 deletions core/config/config_set.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
import re
from core.config.generated_user_config import Config
from core.config.generated_static_config import StaticConfig
from gui.util.customized_ui import BoundComponent
from gui.util.translator import baasTranslator as bt
from dataclasses import asdict


Expand Down Expand Up @@ -54,20 +52,32 @@ def get_server_mode(server):
return 'JP'

def get(self, key, default=None):
self._init_config()
value = getattr(self.config, key, default)
return bt.tr('ConfigTranslation', value)
try:
from gui.util.translator import baasTranslator as bt
self._init_config()
value = getattr(self.config, key, default)
return bt.tr('ConfigTranslation', value)
except ModuleNotFoundError:
self._init_config()
return getattr(self.config, key, default)

def has(self, key):
self._init_config()
return hasattr(self.config, key)

def set(self, key, value):
self._init_config()
value = bt.undo(value)
setattr(self.config, key, value)
self.save()
self.dynamic_update(key)
try:
from gui.util.translator import baasTranslator as bt
self._init_config()
value = bt.undo(value)
setattr(self.config, key, value)
self.save()
self.dynamic_update(key)
except ModuleNotFoundError:
self._init_config()
setattr(self.config, key, value)
self.save()
self.dynamic_update(key)

def update(self, key, value):
self.set(key, value)
Expand Down Expand Up @@ -114,6 +124,7 @@ def inject(self, component, string_rule, attribute="setText"):
:param attribute: Attribute to inject (default is setText)
:return: BoundComponent, which can be ignored
"""
from gui.util.customized_ui import BoundComponent
bounded = BoundComponent(component, string_rule, self, attribute)
self.inject_config_list.extend(re.findall(r'{(.*?)}', string_rule))
self.inject_comp_list.append(bounded)
Expand Down
10 changes: 1 addition & 9 deletions core/config/default_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@

DEFAULT_CONFIG = """
{
"name": "新的配置",
"name": "New Config",
"purchase_arena_ticket_times": "0",
"screenshot_interval": "0.3",
"autostart": false,
Expand Down Expand Up @@ -3643,14 +3643,6 @@
"JP_name": "ホシノ(臨戦)",
"JP_implementation": true
},
{
"CN_name": "星野(临战)",
"CN_implementation": false,
"Global_name": "Hoshino (Battle)",
"Global_implementation": false,
"JP_name": "ホシノ(臨戦)",
"JP_implementation": true
},
{
"CN_name": "萌绘(泳装)",
"CN_implementation": false,
Expand Down
Loading