sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-12 23:47:02 +08:00
Code Activity

Merge pull request #3411 from LmeSzinc/dev

Browse Source 
Dev
This commit is contained in:
LmeSzinc
2024-01-05 11:45:07 +08:00
committed by GitHub
parent 31c31fe70d fd5b29d02a
commit c628bc3b28
5 changed files with 30 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
campaign/Readme.md
View File

@@ -169,4 +169,5 @@ To add a new event, add a new row in here, and run `python -m module.config.conf
| 20231123 | event 20231123 cn | The Ninja Scrolls: Azur Flash | 苍闪忍法帖 | The Ninja Scrolls: Azur Flash | 蒼閃忍法帖 | - |
| 20231130 | event 20231123 cn | The Ninja Scrolls: Azur Flash | - | - | - | 蒼閃忍法帖 |
| 20221222 | event 20221222 cn | Parallel Superimposition | - | - | - | 定向折疊 |
| 20231221 | event 20231221 cn | Light-Chasing Sea of Stars | 星海逐光 | Light-Chasing Sea of Stars | 光追う星の海 | - |
| 20231221 | event 20231221 cn | Light-Chasing Sea of Stars | 星海逐光 | Light-Chasing Sea of Stars | 光追う星の海 | - |
| 20240104 | event 20210225 cn | Khorovod of Dawn's Rime | - | - | - | 復刻破曉冰華 |

32
module/config/argument/args.json
View File

@@ -1681,12 +1681,12 @@
"display": "hide",
"option_bold": [
"event_20231221_cn",
"event_20221222_cn"
"event_20210225_cn"
],
"cn": "event_20231221_cn",
"en": "event_20231221_cn",
"jp": "event_20231221_cn",
"tw": "event_20221222_cn"
"tw": "event_20210225_cn"
},
"Mode": {
"type": "select",
@@ -2013,12 +2013,12 @@
],
"option_bold": [
"event_20231221_cn",
"event_20221222_cn"
"event_20210225_cn"
],
"cn": "event_20231221_cn",
"en": "event_20231221_cn",
"jp": "event_20231221_cn",
"tw": "event_20221222_cn"
"tw": "event_20210225_cn"
},
"Mode": {
"type": "select",
@@ -2460,12 +2460,12 @@
],
"option_bold": [
"event_20231221_cn",
"event_20221222_cn"
"event_20210225_cn"
],
"cn": "event_20231221_cn",
"en": "event_20231221_cn",
"jp": "event_20231221_cn",
"tw": "event_20221222_cn"
"tw": "event_20210225_cn"
},
"Mode": {
"type": "select",
@@ -3845,12 +3845,12 @@
],
"option_bold": [
"event_20231221_cn",
"event_20221222_cn"
"event_20210225_cn"
],
"cn": "event_20231221_cn",
"en": "event_20231221_cn",
"jp": "event_20231221_cn",
"tw": "event_20221222_cn"
"tw": "event_20210225_cn"
},
"Mode": {
"type": "select",
@@ -4309,12 +4309,12 @@
],
"option_bold": [
"event_20231221_cn",
"event_20221222_cn"
"event_20210225_cn"
],
"cn": "event_20231221_cn",
"en": "event_20231221_cn",
"jp": "event_20231221_cn",
"tw": "event_20221222_cn"
"tw": "event_20210225_cn"
},
"Mode": {
"type": "select",
@@ -4773,12 +4773,12 @@
],
"option_bold": [
"event_20231221_cn",
"event_20221222_cn"
"event_20210225_cn"
],
"cn": "event_20231221_cn",
"en": "event_20231221_cn",
"jp": "event_20231221_cn",
"tw": "event_20221222_cn"
"tw": "event_20210225_cn"
},
"Mode": {
"type": "select",
@@ -5237,12 +5237,12 @@
],
"option_bold": [
"event_20231221_cn",
"event_20221222_cn"
"event_20210225_cn"
],
"cn": "event_20231221_cn",
"en": "event_20231221_cn",
"jp": "event_20231221_cn",
"tw": "event_20221222_cn"
"tw": "event_20210225_cn"
},
"Mode": {
"type": "select",
@@ -5691,12 +5691,12 @@
],
"option_bold": [
"event_20231221_cn",
"event_20221222_cn"
"event_20210225_cn"
],
"cn": "event_20231221_cn",
"en": "event_20231221_cn",
"jp": "event_20231221_cn",
"tw": "event_20221222_cn"
"tw": "event_20210225_cn"
},
"Mode": {
"type": "select",

2
module/config/i18n/zh-TW.json
View File

@@ -671,7 +671,7 @@
"event_20201126_cn": "假日航線",
"event_20201229_cn": "復刻-負象限作戰",
"event_20210121_cn": "復刻神聖的悲喜劇",
"event_20210225_cn": "破曉冰華",
"event_20210225_cn": "復刻破曉冰華",
"event_20210225_tw": "北境序曲",
"event_20210325_cn": "復刻箱庭療法",
"event_20210415_tw": "復刻圍剿施佩伯爵",

9
module/device/screenshot.py
View File

@@ -98,7 +98,14 @@ class Screenshot(Adb, WSA, DroidCast, AScreenCap, Scrcpy):
@cached_property
def screenshot_deque(self):
return deque(maxlen=int(self.config.Error_ScreenshotLength))
try:
length = int(self.config.Error_ScreenshotLength)
except ValueError:
logger.error(f'Error_ScreenshotLength={self.config.Error_ScreenshotLength} is not an integer')
raise RequestHumanTakeover
# Limit in 1~300
length = max(1, min(length, 300))
return deque(maxlen=length)
def save_screenshot(self, genre='items', interval=None, to_base_folder=False):
"""Save a screenshot. Use millisecond timestamp as file name.

6
module/ui/scroll.py
View File

@@ -189,10 +189,10 @@ class Scroll:
multiply = self.length / (self.total - self.length)
target = current + page * multiply
target = round(min(max(target, 0), 1), 3)
self.set(target, main=main, random_range=random_range, skip_first_screenshot=True)
return self.set(target, main=main, random_range=random_range, skip_first_screenshot=True)
def next_page(self, main, page=0.8, random_range=(-0.01, 0.01), skip_first_screenshot=True):
self.drag_page(page, main=main, random_range=random_range, skip_first_screenshot=skip_first_screenshot)
return self.drag_page(page, main=main, random_range=random_range, skip_first_screenshot=skip_first_screenshot)
def prev_page(self, main, page=0.8, random_range=(-0.01, 0.01), skip_first_screenshot=True):
self.drag_page(-page, main=main, random_range=random_range, skip_first_screenshot=skip_first_screenshot)
return self.drag_page(-page, main=main, random_range=random_range, skip_first_screenshot=skip_first_screenshot)