mirror of
https://github.com/W1NDes/M-AzurLaneAutoScript.git
synced 2026-05-14 07:08:04 +08:00
feat(module): 补充活动剧情模块的GUI显示
- 补充 EventStory 模块的GUI勾选，用于处理活动剧情任务 - 更新配置文件模板 - 增加活动剧情任务的调度
This commit is contained in:
POLAR me
parent
ba1a744626
commit
d4823dc897
5
alas.py
5
alas.py
@ -403,7 +403,10 @@ class AzurLaneAutoScript:
|
||||
def event_sp(self):
|
||||
from module.event.campaign_sp import CampaignSP
|
||||
CampaignSP(config=self.config, device=self.device).run()
|
||||
|
||||
def event_story(self):
|
||||
from module.eventstory.eventstory import EventStory
|
||||
EventStory(config=self.config, device=self.device).run()
|
||||
|
||||
def maritime_escort(self):
|
||||
from module.event.maritime_escort import MaritimeEscort
|
||||
MaritimeEscort(config=self.config, device=self.device).run()
|
||||
|
||||
@ -84,6 +84,9 @@ Deploy:
|
||||
# Address of ocr server for alas instance to connect
|
||||
# [Default] 127.0.0.1:22268
|
||||
OcrClientAddress: 127.0.0.1:22268
|
||||
# set the ocr server use which cpu
|
||||
# [Default] 0,1
|
||||
OcrCpuAffinity: 0,1
|
||||
|
||||
Update:
|
||||
# Use auto update and builtin updater feature
|
||||
|
||||
@ -84,6 +84,9 @@ Deploy:
|
||||
# Address of ocr server for alas instance to connect
|
||||
# [Default] 127.0.0.1:22268
|
||||
OcrClientAddress: 127.0.0.1:22268
|
||||
# set the ocr server use which cpu
|
||||
# [Default] 0,1
|
||||
OcrCpuAffinity: 0,1
|
||||
|
||||
Update:
|
||||
# Use auto update and builtin updater feature
|
||||
|
||||
@ -87,7 +87,7 @@ Deploy:
|
||||
# set the ocr server use which cpu
|
||||
# [Default] 0,1
|
||||
OcrCpuAffinity: 0,1
|
||||
|
||||
|
||||
Update:
|
||||
# Use auto update and builtin updater feature
|
||||
# This may cause problem https://github.com/LmeSzinc/AzurLaneAutoScript/issues/876
|
||||
|
||||
@ -84,6 +84,9 @@ Deploy:
|
||||
# Address of ocr server for alas instance to connect
|
||||
# [Default] 127.0.0.1:22268
|
||||
OcrClientAddress: 127.0.0.1:22268
|
||||
# set the ocr server use which cpu
|
||||
# [Default] 0,1
|
||||
OcrCpuAffinity: 0,1
|
||||
|
||||
Update:
|
||||
# Use auto update and builtin updater feature
|
||||
|
||||
@ -84,6 +84,9 @@ Deploy:
|
||||
# Address of ocr server for alas instance to connect
|
||||
# [Default] 127.0.0.1:22268
|
||||
OcrClientAddress: 127.0.0.1:22268
|
||||
# set the ocr server use which cpu
|
||||
# [Default] 0,1
|
||||
OcrCpuAffinity: 0,1
|
||||
|
||||
Update:
|
||||
# Use auto update and builtin updater feature
|
||||
|
||||
@ -84,6 +84,9 @@ Deploy:
|
||||
# Address of ocr server for alas instance to connect
|
||||
# [Default] 127.0.0.1:22268
|
||||
OcrClientAddress: 127.0.0.1:22268
|
||||
# set the ocr server use which cpu
|
||||
# [Default] 0,1
|
||||
OcrCpuAffinity: 0,1
|
||||
|
||||
Update:
|
||||
# Use auto update and builtin updater feature
|
||||
|
||||
@ -84,6 +84,9 @@ Deploy:
|
||||
# Address of ocr server for alas instance to connect
|
||||
# [Default] 127.0.0.1:22268
|
||||
OcrClientAddress: 127.0.0.1:22268
|
||||
# set the ocr server use which cpu
|
||||
# [Default] 0,1
|
||||
OcrCpuAffinity: 0,1
|
||||
|
||||
Update:
|
||||
# Use auto update and builtin updater feature
|
||||
|
||||
@ -87,7 +87,7 @@ Deploy:
|
||||
# set the ocr server use which cpu
|
||||
# [Default] 0,1
|
||||
OcrCpuAffinity: 0,1
|
||||
|
||||
|
||||
Update:
|
||||
# Use auto update and builtin updater feature
|
||||
# This may cause problem https://github.com/LmeSzinc/AzurLaneAutoScript/issues/876
|
||||
|
||||
@ -1350,6 +1350,19 @@
|
||||
"Storage": {}
|
||||
}
|
||||
},
|
||||
"EventStory": {
|
||||
"Scheduler": {
|
||||
"Enable": false,
|
||||
"NextRun": "2020-01-01 00:00:00",
|
||||
"Command": "EventStory",
|
||||
"SuccessInterval": 0,
|
||||
"FailureInterval": 120,
|
||||
"ServerUpdate": "00:00"
|
||||
},
|
||||
"Storage": {
|
||||
"Storage": {}
|
||||
}
|
||||
},
|
||||
"Commission": {
|
||||
"Scheduler": {
|
||||
"Enable": true,
|
||||
|
||||
@ -3211,16 +3211,17 @@
|
||||
"event_20240912_cn",
|
||||
"event_20241024_cn",
|
||||
"event_20241121_cn",
|
||||
"event_20241219_cn"
|
||||
"event_20241219_cn",
|
||||
"event_20250227_cn"
|
||||
],
|
||||
"option_bold": [
|
||||
"event_20221222_cn",
|
||||
"event_20231221_cn"
|
||||
"event_20240725_cn",
|
||||
"event_20250227_cn"
|
||||
],
|
||||
"cn": "event_20221222_cn",
|
||||
"en": "event_20221222_cn",
|
||||
"jp": "event_20221222_cn",
|
||||
"tw": "event_20231221_cn"
|
||||
"cn": "event_20250227_cn",
|
||||
"en": "event_20250227_cn",
|
||||
"jp": "event_20250227_cn",
|
||||
"tw": "event_20240725_cn"
|
||||
},
|
||||
"Mode": {
|
||||
"type": "select",
|
||||
@ -7419,6 +7420,51 @@
|
||||
}
|
||||
}
|
||||
},
|
||||
"EventStory": {
|
||||
"Scheduler": {
|
||||
"Enable": {
|
||||
"type": "checkbox",
|
||||
"value": false,
|
||||
"option": [
|
||||
true,
|
||||
false
|
||||
]
|
||||
},
|
||||
"NextRun": {
|
||||
"type": "datetime",
|
||||
"value": "2020-01-01 00:00:00",
|
||||
"validate": "datetime"
|
||||
},
|
||||
"Command": {
|
||||
"type": "input",
|
||||
"value": "EventStory",
|
||||
"display": "hide"
|
||||
},
|
||||
"SuccessInterval": {
|
||||
"type": "input",
|
||||
"value": 0,
|
||||
"display": "hide"
|
||||
},
|
||||
"FailureInterval": {
|
||||
"type": "input",
|
||||
"value": 120,
|
||||
"display": "hide"
|
||||
},
|
||||
"ServerUpdate": {
|
||||
"type": "input",
|
||||
"value": "00:00",
|
||||
"display": "hide"
|
||||
}
|
||||
},
|
||||
"Storage": {
|
||||
"Storage": {
|
||||
"type": "storage",
|
||||
"value": {},
|
||||
"valuetype": "ignore",
|
||||
"display": "disabled"
|
||||
}
|
||||
}
|
||||
},
|
||||
"Commission": {
|
||||
"Scheduler": {
|
||||
"Enable": {
|
||||
|
||||
@ -42,7 +42,8 @@
|
||||
"EventD",
|
||||
"EventSp",
|
||||
"RaidDaily",
|
||||
"CoalitionSp"
|
||||
"CoalitionSp",
|
||||
"EventStory"
|
||||
]
|
||||
},
|
||||
"Reward": {
|
||||
|
||||
@ -193,6 +193,8 @@ EventDaily:
|
||||
- Coalition
|
||||
- StopCondition
|
||||
- Emotion
|
||||
EventStory:
|
||||
- Scheduler
|
||||
|
||||
# ==================== Reward ====================
|
||||
|
||||
|
||||
@ -18,7 +18,7 @@ class ManualConfig:
|
||||
> ShopFrequent > ShopOnce > Shipyard > Freebies > Daily > Hard
|
||||
> Oilkeep > Event
|
||||
> OpsiExplore
|
||||
> Minigame > Awaken
|
||||
> EventStory > Minigame > Awaken
|
||||
> OpsiAshBeacon
|
||||
> OpsiDaily > OpsiShop > OpsiVoucher
|
||||
> OpsiAbyssal > OpsiStronghold > OpsiObscure > OpsiArchive
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
import sys
|
||||
sys.path.append(r'C:/Users/W1NDes/Documents/GitHub/MAzurLaneAutoScript')
|
||||
sys.path.append(r'C:/Users/W1NDes/Documents/GitHub/M-AzurLaneAutoScript')
|
||||
import re
|
||||
import typing as t
|
||||
from copy import deepcopy
|
||||
|
||||
@ -122,6 +122,10 @@
|
||||
"name": "Little Academy SP",
|
||||
"help": ""
|
||||
},
|
||||
"EventStory": {
|
||||
"name": "Task.EventStory.name",
|
||||
"help": "Task.EventStory.help"
|
||||
},
|
||||
"Commission": {
|
||||
"name": "Commission",
|
||||
"help": ""
|
||||
|
||||
@ -122,6 +122,10 @@
|
||||
"name": "Task.CoalitionSp.name",
|
||||
"help": "Task.CoalitionSp.help"
|
||||
},
|
||||
"EventStory": {
|
||||
"name": "Task.EventStory.name",
|
||||
"help": "Task.EventStory.help"
|
||||
},
|
||||
"Commission": {
|
||||
"name": "委託",
|
||||
"help": ""
|
||||
|
||||
@ -122,6 +122,10 @@
|
||||
"name": "童心学院每日SP",
|
||||
"help": ""
|
||||
},
|
||||
"EventStory": {
|
||||
"name": "活动剧情",
|
||||
"help": "如果没有活动剧情，就不会运行，所以，勾上就行"
|
||||
},
|
||||
"Commission": {
|
||||
"name": "委托",
|
||||
"help": ""
|
||||
|
||||
@ -122,6 +122,10 @@
|
||||
"name": "極地風暴每日SP",
|
||||
"help": ""
|
||||
},
|
||||
"EventStory": {
|
||||
"name": "Task.EventStory.name",
|
||||
"help": "Task.EventStory.help"
|
||||
},
|
||||
"Commission": {
|
||||
"name": "委託",
|
||||
"help": ""
|
||||
|
||||
@ -124,9 +124,11 @@ class EventStory(CampaignUI, Combat, LoginHandler):
|
||||
return 'unknown'
|
||||
|
||||
def run(self):
|
||||
self.run_event_story()
|
||||
if 1==1:
|
||||
self.run_event_story()
|
||||
|
||||
# Scheduler
|
||||
self.config.task_delay(server_update=True)
|
||||
pass
|
||||
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user