sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-04-08 15:58:44 +08:00
Code Activity

Merge pull request #1517 from LmeSzinc/bug_fix

Browse Source 
Bug fix
This commit is contained in:
LmeSzinc
2022-08-13 00:08:59 +08:00
committed by GitHub
parent 4212a87211 28f1411933
commit 560a192ecb
5 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
assets/gui/css/alas-mobile.css
View File

@@ -44,6 +44,7 @@
#pywebio-scope-running, #pywebio-scope-running,
#pywebio-scope-pending, #pywebio-scope-pending,
#pywebio-scope-waiting { #pywebio-scope-waiting,
#pywebio-scope-log {
overflow-y: auto; overflow-y: auto;
} }

3
module/commission/commission.py
View File

@@ -114,6 +114,9 @@ class RewardCommission(UI, InfoHandler):
""" """
# Count Commission # Count Commission
total = daily.add_by_eq(urgent) total = daily.add_by_eq(urgent)
# Commissions with higher suffix are always below those with smaller suffix
# Reverse the commission list to choose commissions with higher suffix first
total = total[::-1]
self.max_commission = 4 self.max_commission = 4
for comm in total: for comm in total:
if comm.genre == 'event_daily': if comm.genre == 'event_daily':

2
module/commission/project.py
View File

@@ -326,6 +326,8 @@ class Commission:
return False return False
if self.repeat_count != other.repeat_count: if self.repeat_count != other.repeat_count:
return False return False
if self.genre in ['extra_oil', 'night_oil'] and self.suffix != other.suffix:
return False
return True return True

5
module/logger.py
View File

@@ -4,9 +4,8 @@ import os
import sys import sys
from typing import Callable, List from typing import Callable, List
import rich.box
from rich.console import Console, ConsoleOptions, ConsoleRenderable, NewLine from rich.console import Console, ConsoleOptions, ConsoleRenderable, NewLine
from rich.highlighter import RegexHighlighter from rich.highlighter import RegexHighlighter, NullHighlighter
from rich.logging import RichHandler from rich.logging import RichHandler
from rich.rule import Rule from rich.rule import Rule
from rich.style import Style from rich.style import Style
@@ -199,6 +198,7 @@ def set_file_logger(name=pyw_name):
file_console = Console( file_console = Console(
file=file, file=file,
no_color=True, no_color=True,
highlight=False,
width=119, width=119,
) )
@@ -210,6 +210,7 @@ def set_file_logger(name=pyw_name):
rich_tracebacks=True, rich_tracebacks=True,
tracebacks_show_locals=True, tracebacks_show_locals=True,
tracebacks_extra_lines=3, tracebacks_extra_lines=3,
highlighter=NullHighlighter(),
) )
hdlr.setFormatter(file_formatter) hdlr.setFormatter(file_formatter)

6
module/webui/app.py
View File

@@ -409,9 +409,11 @@ class AlasGUI(Frame):
validate = deep_get(self.ALAS_ARGS, k + ".validate") validate = deep_get(self.ALAS_ARGS, k + ".validate")
if not len(str(v)): if not len(str(v)):
default = deep_get(self.ALAS_ARGS, k + ".value") default = deep_get(self.ALAS_ARGS, k + ".value")
modified[k] = default
deep_set(config, k, default) deep_set(config, k, default)
valid.append(k) valid.append(k)
modified[k] = default pin["_".join(k.split("."))] = default
elif not validate or re_fullmatch(validate, v): elif not validate or re_fullmatch(validate, v):
deep_set(config, k, v) deep_set(config, k, v)
valid.append(k) valid.append(k)
@@ -425,7 +427,7 @@ class AlasGUI(Frame):
modified[k] = v modified[k] = v
deep_set(config, k, v) deep_set(config, k, v)
valid.append(k) valid.append(k)
pin[k] = v pin["_".join(k.split("."))] = v
else: else:
modified.pop(k) modified.pop(k)
invalid.append(k) invalid.append(k)