LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-14 13:29:25 +08:00
Code Activity

Merge remote-tracking branch 'LmeSzinc/master' into dev

Browse Source 
# Conflicts:
#	module/config/argument/args.json
This commit is contained in:
0O0o0oOoO00
2026-02-14 13:50:22 +08:00
parent e784b293f9 cc089b6223
commit f5172b27f1
63 changed files with 818 additions and 769 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because it is too large Load Diff

6
module/config/argument/menu.json
View File

@@ -35,7 +35,6 @@
"page": "setting",
"tasks": [
"EventGeneral",
"Coalition",
"Event",
"Event2",
"Event3",
@@ -44,6 +43,7 @@
"Event6",
"Raid",
"Hospital",
"Coalition",
"MaritimeEscort",
"EventShop",
"WarArchives"
@@ -53,13 +53,13 @@
"menu": "collapse",
"page": "setting",
"tasks": [
"CoalitionSp",
"EventA",
"EventB",
"EventC",
"EventD",
"EventSp",
"RaidDaily"
"RaidDaily",
"CoalitionSp"
]
},
"Reward": {

24
module/config/argument/task.yaml
View File

@@ -123,12 +123,6 @@ Event:
EventGeneral:
- EventGeneral
- TaskBalancer
Coalition:
- Scheduler
- Campaign
- Coalition
- StopCondition
- Emotion
Event:
- Scheduler
- Campaign
@@ -194,6 +188,12 @@ Event:
- Hospital
- StopCondition
- Emotion
Coalition:
- Scheduler
- Campaign
- Coalition
- StopCondition
- Emotion
MaritimeEscort:
- Scheduler
- MaritimeEscort
@@ -217,12 +217,6 @@ EventDaily:
menu: 'collapse'
page: 'setting'
tasks:
CoalitionSp:
- Scheduler
- Campaign
- Coalition
- StopCondition
- Emotion
EventA:
- Scheduler
- EventDaily
@@ -278,6 +272,12 @@ EventDaily:
- Campaign
- StopCondition
- Emotion
CoalitionSp:
- Scheduler
- Campaign
- Coalition
- StopCondition
- Emotion
# ==================== Reward ====================

2
module/config/config_generated.py
View File

@@ -20,7 +20,7 @@ class GeneratedConfig:
# Group `Emulator`
Emulator_Serial = 'auto'
Emulator_PackageName = 'auto' # auto, com.bilibili.azurlane, com.YoStarEN.AzurLane, com.YoStarJP.AzurLane, com.hkmanjuu.azurlane.gp, com.bilibili.blhx.huawei, com.bilibili.blhx.honor, com.bilibili.blhx.mi, com.tencent.tmgp.bilibili.blhx, com.bilibili.blhx.baidu, com.bilibili.blhx.qihoo, com.bilibili.blhx.nearme.gamecenter, com.bilibili.blhx.vivo, com.bilibili.blhx.mz, com.bilibili.blhx.dl, com.bilibili.blhx.lenovo, com.bilibili.blhx.uc, com.bilibili.blhx.mzw, com.yiwu.blhx.yx15, com.bilibili.blhx.m4399, com.bilibili.blhx.bilibiliMove, com.hkmanjuu.azurlane.gp.mc
Emulator_ServerName = 'disabled' # disabled, cn_android-0, cn_android-1, cn_android-2, cn_android-3, cn_android-4, cn_android-5, cn_android-6, cn_android-7, cn_android-8, cn_android-9, cn_android-10, cn_android-11, cn_android-12, cn_android-13, cn_android-14, cn_android-15, cn_android-16, cn_android-17, cn_android-18, cn_android-19, cn_android-20, cn_android-21, cn_android-22, cn_android-23, cn_android-24, cn_android-25, cn_android-26, cn_android-27, cn_ios-0, cn_ios-1, cn_ios-2, cn_ios-3, cn_ios-4, cn_ios-5, cn_ios-6, cn_ios-7, cn_ios-8, cn_ios-9, cn_ios-10, cn_channel-0, cn_channel-1, cn_channel-2, cn_channel-3, cn_channel-4, en-0, en-1, en-2, en-3, en-4, en-5, jp-0, jp-1, jp-2, jp-3, jp-4, jp-5, jp-6, jp-7, jp-8, jp-9, jp-10, jp-11, jp-12, jp-13, jp-14, jp-15, jp-16, jp-17
Emulator_ServerName = 'disabled' # disabled, cn_android-0, cn_android-1, cn_android-2, cn_android-3, cn_android-4, cn_android-5, cn_android-6, cn_android-7, cn_android-8, cn_android-9, cn_android-10, cn_android-11, cn_android-12, cn_android-13, cn_android-14, cn_android-15, cn_android-16, cn_android-17, cn_android-18, cn_android-19, cn_android-20, cn_android-21, cn_android-22, cn_android-23, cn_android-24, cn_android-25, cn_android-26, cn_android-27, cn_android-28, cn_ios-0, cn_ios-1, cn_ios-2, cn_ios-3, cn_ios-4, cn_ios-5, cn_ios-6, cn_ios-7, cn_ios-8, cn_ios-9, cn_ios-10, cn_channel-0, cn_channel-1, cn_channel-2, cn_channel-3, cn_channel-4, en-0, en-1, en-2, en-3, en-4, en-5, jp-0, jp-1, jp-2, jp-3, jp-4, jp-5, jp-6, jp-7, jp-8, jp-9, jp-10, jp-11, jp-12, jp-13, jp-14, jp-15, jp-16, jp-17
Emulator_ScreenshotMethod = 'auto' # auto, ADB, ADB_nc, uiautomator2, aScreenCap, aScreenCap_nc, DroidCast, DroidCast_raw, nemu_ipc, ldopengl
Emulator_ControlMethod = 'MaaTouch' # ADB, uiautomator2, minitouch, Hermit, MaaTouch
Emulator_ScreenshotDedithering = False

144
module/config/full_config_generated.py
View File

@@ -592,42 +592,6 @@ class FullGeneratedConfig:
EventGeneral_TaskBalancer_TaskCall = None
EventGeneral_Storage_Storage = None
# Task `Coalition`
Coalition_Scheduler_Enable = None
Coalition_Scheduler_NextRun = None
Coalition_Scheduler_Command = None
Coalition_Scheduler_SuccessInterval = None
Coalition_Scheduler_FailureInterval = None
Coalition_Scheduler_ServerUpdate = None
Coalition_Campaign_Name = None
Coalition_Campaign_Event = None
Coalition_Campaign_Mode = None
Coalition_Campaign_UseClearMode = None
Coalition_Campaign_UseFleetLock = None
Coalition_Campaign_UseAutoSearch = None
Coalition_Campaign_Use2xBook = None
Coalition_Campaign_AmbushEvade = None
Coalition_Coalition_Mode = None
Coalition_Coalition_Fleet = None
Coalition_StopCondition_OilLimit = None
Coalition_StopCondition_RunCount = None
Coalition_StopCondition_MapAchievement = None
Coalition_StopCondition_StageIncrease = None
Coalition_StopCondition_GetNewShip = None
Coalition_StopCondition_ReachLevel = None
Coalition_Emotion_Mode = None
Coalition_Emotion_Fleet1Value = None
Coalition_Emotion_Fleet1Record = None
Coalition_Emotion_Fleet1Control = None
Coalition_Emotion_Fleet1Recover = None
Coalition_Emotion_Fleet1Oath = None
Coalition_Emotion_Fleet2Value = None
Coalition_Emotion_Fleet2Record = None
Coalition_Emotion_Fleet2Control = None
Coalition_Emotion_Fleet2Recover = None
Coalition_Emotion_Fleet2Oath = None
Coalition_Storage_Storage = None
# Task `Event`
Event_Scheduler_Enable = None
Event_Scheduler_NextRun = None
@@ -1027,6 +991,42 @@ class FullGeneratedConfig:
Hospital_Emotion_Fleet2Oath = None
Hospital_Storage_Storage = None
# Task `Coalition`
Coalition_Scheduler_Enable = None
Coalition_Scheduler_NextRun = None
Coalition_Scheduler_Command = None
Coalition_Scheduler_SuccessInterval = None
Coalition_Scheduler_FailureInterval = None
Coalition_Scheduler_ServerUpdate = None
Coalition_Campaign_Name = None
Coalition_Campaign_Event = None
Coalition_Campaign_Mode = None
Coalition_Campaign_UseClearMode = None
Coalition_Campaign_UseFleetLock = None
Coalition_Campaign_UseAutoSearch = None
Coalition_Campaign_Use2xBook = None
Coalition_Campaign_AmbushEvade = None
Coalition_Coalition_Mode = None
Coalition_Coalition_Fleet = None
Coalition_StopCondition_OilLimit = None
Coalition_StopCondition_RunCount = None
Coalition_StopCondition_MapAchievement = None
Coalition_StopCondition_StageIncrease = None
Coalition_StopCondition_GetNewShip = None
Coalition_StopCondition_ReachLevel = None
Coalition_Emotion_Mode = None
Coalition_Emotion_Fleet1Value = None
Coalition_Emotion_Fleet1Record = None
Coalition_Emotion_Fleet1Control = None
Coalition_Emotion_Fleet1Recover = None
Coalition_Emotion_Fleet1Oath = None
Coalition_Emotion_Fleet2Value = None
Coalition_Emotion_Fleet2Record = None
Coalition_Emotion_Fleet2Control = None
Coalition_Emotion_Fleet2Recover = None
Coalition_Emotion_Fleet2Oath = None
Coalition_Storage_Storage = None
# Task `MaritimeEscort`
MaritimeEscort_Scheduler_Enable = None
MaritimeEscort_Scheduler_NextRun = None
@@ -1106,42 +1106,6 @@ class FullGeneratedConfig:
WarArchives_EnemyPriority_EnemyScaleBalanceWeight = None
WarArchives_Storage_Storage = None
# Task `CoalitionSp`
CoalitionSp_Scheduler_Enable = None
CoalitionSp_Scheduler_NextRun = None
CoalitionSp_Scheduler_Command = None
CoalitionSp_Scheduler_SuccessInterval = None
CoalitionSp_Scheduler_FailureInterval = None
CoalitionSp_Scheduler_ServerUpdate = None
CoalitionSp_Campaign_Name = None
CoalitionSp_Campaign_Event = None
CoalitionSp_Campaign_Mode = None
CoalitionSp_Campaign_UseClearMode = None
CoalitionSp_Campaign_UseFleetLock = None
CoalitionSp_Campaign_UseAutoSearch = None
CoalitionSp_Campaign_Use2xBook = None
CoalitionSp_Campaign_AmbushEvade = None
CoalitionSp_Coalition_Mode = None
CoalitionSp_Coalition_Fleet = None
CoalitionSp_StopCondition_OilLimit = None
CoalitionSp_StopCondition_RunCount = None
CoalitionSp_StopCondition_MapAchievement = None
CoalitionSp_StopCondition_StageIncrease = None
CoalitionSp_StopCondition_GetNewShip = None
CoalitionSp_StopCondition_ReachLevel = None
CoalitionSp_Emotion_Mode = None
CoalitionSp_Emotion_Fleet1Value = None
CoalitionSp_Emotion_Fleet1Record = None
CoalitionSp_Emotion_Fleet1Control = None
CoalitionSp_Emotion_Fleet1Recover = None
CoalitionSp_Emotion_Fleet1Oath = None
CoalitionSp_Emotion_Fleet2Value = None
CoalitionSp_Emotion_Fleet2Record = None
CoalitionSp_Emotion_Fleet2Control = None
CoalitionSp_Emotion_Fleet2Recover = None
CoalitionSp_Emotion_Fleet2Oath = None
CoalitionSp_Storage_Storage = None
# Task `EventA`
EventA_Scheduler_Enable = None
EventA_Scheduler_NextRun = None
@@ -1465,6 +1429,42 @@ class FullGeneratedConfig:
RaidDaily_Emotion_Fleet2Oath = None
RaidDaily_Storage_Storage = None
# Task `CoalitionSp`
CoalitionSp_Scheduler_Enable = None
CoalitionSp_Scheduler_NextRun = None
CoalitionSp_Scheduler_Command = None
CoalitionSp_Scheduler_SuccessInterval = None
CoalitionSp_Scheduler_FailureInterval = None
CoalitionSp_Scheduler_ServerUpdate = None
CoalitionSp_Campaign_Name = None
CoalitionSp_Campaign_Event = None
CoalitionSp_Campaign_Mode = None
CoalitionSp_Campaign_UseClearMode = None
CoalitionSp_Campaign_UseFleetLock = None
CoalitionSp_Campaign_UseAutoSearch = None
CoalitionSp_Campaign_Use2xBook = None
CoalitionSp_Campaign_AmbushEvade = None
CoalitionSp_Coalition_Mode = None
CoalitionSp_Coalition_Fleet = None
CoalitionSp_StopCondition_OilLimit = None
CoalitionSp_StopCondition_RunCount = None
CoalitionSp_StopCondition_MapAchievement = None
CoalitionSp_StopCondition_StageIncrease = None
CoalitionSp_StopCondition_GetNewShip = None
CoalitionSp_StopCondition_ReachLevel = None
CoalitionSp_Emotion_Mode = None
CoalitionSp_Emotion_Fleet1Value = None
CoalitionSp_Emotion_Fleet1Record = None
CoalitionSp_Emotion_Fleet1Control = None
CoalitionSp_Emotion_Fleet1Recover = None
CoalitionSp_Emotion_Fleet1Oath = None
CoalitionSp_Emotion_Fleet2Value = None
CoalitionSp_Emotion_Fleet2Record = None
CoalitionSp_Emotion_Fleet2Control = None
CoalitionSp_Emotion_Fleet2Recover = None
CoalitionSp_Emotion_Fleet2Oath = None
CoalitionSp_Storage_Storage = None
# Task `Commission`
Commission_Scheduler_Enable = None
Commission_Scheduler_NextRun = None

26
module/config/i18n/en-US.json
View File

@@ -94,10 +94,6 @@
"name": "Event General",
"help": ""
},
"Coalition": {
"name": "Light & Shadow Fashion Shoot",
"help": ""
},
"Event": {
"name": "Event",
"help": ""
@@ -130,6 +126,10 @@
"name": "Valley Hospital",
"help": ""
},
"Coalition": {
"name": "Light & Shadow Fashion Shoot",
"help": ""
},
"MaritimeEscort": {
"name": "Maritime Escort",
"help": ""
@@ -142,10 +142,6 @@
"name": "War Archives",
"help": "Due to the lack of maintenance of war archives, continuous clear may not work normally, if Alas runs abnormally, Please manually finish clearing and use auto search"
},
"CoalitionSp": {
"name": "Light & Shadow Fashion Shoot SP",
"help": ""
},
"EventA": {
"name": "Event Daily A",
"help": ""
@@ -170,6 +166,10 @@
"name": "Raid Daily",
"help": ""
},
"CoalitionSp": {
"name": "Light & Shadow Fashion Shoot SP",
"help": ""
},
"Commission": {
"name": "Commission",
"help": ""
@@ -430,6 +430,7 @@
"cn_android-25": "[国服] 水仙行动",
"cn_android-26": "[国服] 冬月计划",
"cn_android-27": "[国服] 长弓计划",
"cn_android-28": "[国服] 裁决协议",
"cn_ios-0": "[国服] 夏威夷",
"cn_ios-1": "[国服] 珊瑚海",
"cn_ios-2": "[国服] 中途岛",
@@ -827,6 +828,7 @@
"raid_20240130": "Spring Festive Fiasco",
"raid_20240328": "From Zero to Hero Rerun",
"raid_20250116": "Spring Fashion Festa",
"raid_20260212": "Spring Auction Adventure",
"war_archives_20180607_cn": "archives Ink Stained Steel Sakura",
"war_archives_20180726_cn": "archives Iris of Light and Dark",
"war_archives_20181020_en": "archives Strive Wish and Strategize",
@@ -1337,10 +1339,10 @@
"Mode": {
"name": "Raid Mode",
"help": "",
"easy": "easy",
"normal": "normal",
"hard": "hard",
"ex": "ex"
"easy": "Easy",
"normal": "Normal",
"hard": "Hard",
"ex": "EX"
},
"UseTicket": {
"name": "Use Ticket(s)",

18
module/config/i18n/ja-JP.json
View File

@@ -94,10 +94,6 @@
"name": "イベント共通設定",
"help": ""
},
"Coalition": {
"name": "特集写真-撮影進行中",
"help": ""
},
"Event": {
"name": "イベント海域",
"help": ""
@@ -130,6 +126,10 @@
"name": "病院探訪",
"help": ""
},
"Coalition": {
"name": "特集写真-撮影進行中",
"help": ""
},
"MaritimeEscort": {
"name": "Maritime Escort",
"help": ""
@@ -142,10 +142,6 @@
"name": "作戦履歴",
"help": ""
},
"CoalitionSp": {
"name": "特集写真-撮影進行中SP",
"help": ""
},
"EventA": {
"name": "毎日イベント海域A",
"help": ""
@@ -170,6 +166,10 @@
"name": "Raid Daily",
"help": ""
},
"CoalitionSp": {
"name": "特集写真-撮影進行中SP",
"help": ""
},
"Commission": {
"name": "委託",
"help": ""
@@ -430,6 +430,7 @@
"cn_android-25": "[国服] 水仙行动",
"cn_android-26": "[国服] 冬月计划",
"cn_android-27": "[国服] 长弓计划",
"cn_android-28": "[国服] 裁决协议",
"cn_ios-0": "[国服] 夏威夷",
"cn_ios-1": "[国服] 珊瑚海",
"cn_ios-2": "[国服] 中途岛",
@@ -827,6 +828,7 @@
"raid_20240130": "新春宴会狂騒曲",
"raid_20240328": "ゼロから頑張る魔王討伐（復刻）",
"raid_20250116": "新春華裳協奏曲",
"raid_20260212": "新春玉逸品会",
"war_archives_20180607_cn": "檔案 墨染まりし鋼の桜",
"war_archives_20180726_cn": "檔案 光と影のアイリス",
"war_archives_20181020_en": "檔案 努力希望と計画",

20
module/config/i18n/zh-CN.json
View File

@@ -94,10 +94,6 @@
"name": "活动通用设置",
"help": ""
},
"Coalition": {
"name": "光影风尚-拍摄进行时",
"help": ""
},
"Event": {
"name": "活动图-1",
"help": ""
@@ -130,6 +126,10 @@
"name": "深谷来信",
"help": ""
},
"Coalition": {
"name": "光影风尚-拍摄进行时",
"help": ""
},
"MaritimeEscort": {
"name": "商船护航",
"help": ""
@@ -142,10 +142,6 @@
"name": "作战档案",
"help": "由于作战档案缺少维护，开荒功能不一定能正常使用，如果发现Alas运行异常，请手动完成开荒后使用自律寻敌功能"
},
"CoalitionSp": {
"name": "光影风尚-拍摄进行时SP",
"help": ""
},
"EventA": {
"name": "活动每日A图",
"help": ""
@@ -170,6 +166,10 @@
"name": "共斗活动每日",
"help": ""
},
"CoalitionSp": {
"name": "光影风尚-拍摄进行时SP",
"help": ""
},
"Commission": {
"name": "委托",
"help": ""
@@ -430,6 +430,7 @@
"cn_android-25": "[国服] 水仙行动",
"cn_android-26": "[国服] 冬月计划",
"cn_android-27": "[国服] 长弓计划",
"cn_android-28": "[国服] 裁决协议",
"cn_ios-0": "[国服] 夏威夷",
"cn_ios-1": "[国服] 珊瑚海",
"cn_ios-2": "[国服] 中途岛",
@@ -827,6 +828,7 @@
"raid_20240130": "寰昌宇定家事忙",
"raid_20240328": "复刻从零开始的魔王讨伐之旅",
"raid_20250116": "华裳巧展喜事长",
"raid_20260212": "春宴怀玉香满庭",
"war_archives_20180607_cn": "档案 墨染的钢铁之花",
"war_archives_20180726_cn": "档案 光与影的鸢尾之华",
"war_archives_20181020_en": "档案 努力希望和计划",
@@ -1340,7 +1342,7 @@
"easy": "简单",
"normal": "普通",
"hard": "困难",
"ex": "ex"
"ex": "EX"
},
"UseTicket": {
"name": "使用演习券",

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

@@ -94,10 +94,6 @@
"name": "活動通用",
"help": ""
},
"Coalition": {
"name": "光影風尚-拍攝進行時",
"help": ""
},
"Event": {
"name": "活動圖",
"help": ""
@@ -130,6 +126,10 @@
"name": "深谷来信",
"help": ""
},
"Coalition": {
"name": "光影風尚-拍攝進行時",
"help": ""
},
"MaritimeEscort": {
"name": "商船護航",
"help": ""
@@ -142,10 +142,6 @@
"name": "作戰檔案",
"help": "由於作戰檔案缺少維護，開荒功能不一定能正常使用，如果發現Alas運行異常，請手動完成開荒後使用自律尋敵功能"
},
"CoalitionSp": {
"name": "光影風尚-拍攝進行時SP",
"help": ""
},
"EventA": {
"name": "活動每日A圖",
"help": ""
@@ -170,6 +166,10 @@
"name": "共鬥活動每日",
"help": ""
},
"CoalitionSp": {
"name": "光影風尚-拍攝進行時SP",
"help": ""
},
"Commission": {
"name": "委託",
"help": ""
@@ -430,6 +430,7 @@
"cn_android-25": "[国服] 水仙行动",
"cn_android-26": "[国服] 冬月计划",
"cn_android-27": "[国服] 长弓计划",
"cn_android-28": "[国服] 裁决协议",
"cn_ios-0": "[国服] 夏威夷",
"cn_ios-1": "[国服] 珊瑚海",
"cn_ios-2": "[国服] 中途岛",
@@ -827,6 +828,7 @@
"raid_20240130": "寰昌宇定家事忙",
"raid_20240328": "從零開始的魔王討伐之旅",
"raid_20250116": "華裳巧展喜事長",
"raid_20260212": "春宴懷玉香滿庭",
"war_archives_20180607_cn": "檔案 墨染的鋼鐵之花",
"war_archives_20180726_cn": "檔案 光與影的鳶尾之華",
"war_archives_20181020_en": "檔案 努力希望和計劃",
@@ -1340,7 +1342,7 @@
"easy": "簡單",
"normal": "普通",
"hard": "困難",
"ex": "ex"
"ex": "EX"
},
"UseTicket": {
"name": "使用演習券",

2
module/config/server.py
View File

@@ -74,7 +74,7 @@ VALID_SERVER_LIST = {
'小王冠行动', '波茨坦公告', '白色方案', '瓦尔基里行动',
'曼哈顿计划', '八月风暴', '秋季旅行', '水星行动', '莱茵河卫兵',
'北极光计划', '长戟计划', '暴雨行动', '水仙行动', '冬月计划',
'长弓计划'
'长弓计划', '裁决协议',
],
'cn_ios': [
'夏威夷', '珊瑚海', '中途岛', '铁底湾', '所罗门', '马里亚纳',