mirror of
https://gitee.com/sui-feng-cb/AzurLaneAutoScript1
synced 2026-03-16 13:57:26 +08:00
Add: OpSi fleet filter
- Fix: Showing disabled tasks in scheduler - Fix: Fleet lock not detected in OpSi - Fix: Filter presets are case sensitive - Opt: Increase confirm timer in question_goto()
This commit is contained in:
@@ -6196,7 +6196,7 @@
|
||||
"OpsiFleetFilter": {
|
||||
"Filter": {
|
||||
"type": "textarea",
|
||||
"value": "Fleet-4 > Fleet-2-Submarine > Fleet-3 > Fleet-1"
|
||||
"value": "Fleet-4 > CallSubmarine > Fleet-2 > Fleet-3 > Fleet-1"
|
||||
}
|
||||
}
|
||||
},
|
||||
@@ -6237,7 +6237,7 @@
|
||||
"OpsiFleetFilter": {
|
||||
"Filter": {
|
||||
"type": "textarea",
|
||||
"value": "Fleet-4 > Fleet-2-Submarine > Fleet-3 > Fleet-1"
|
||||
"value": "Fleet-4 > CallSubmarine > Fleet-2 > Fleet-3 > Fleet-1"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
@@ -423,7 +423,7 @@ OpsiGeneral:
|
||||
ActionPoint > PurpleCoins
|
||||
OpsiFleetFilter:
|
||||
Filter: |-
|
||||
Fleet-4 > Fleet-2-Submarine > Fleet-3 > Fleet-1
|
||||
Fleet-4 > CallSubmarine > Fleet-2 > Fleet-3 > Fleet-1
|
||||
OpsiFleet:
|
||||
Fleet:
|
||||
value: 1
|
||||
|
||||
@@ -166,6 +166,8 @@ class AzurLaneConfig(ConfigUpdater, ManualConfig, GeneratedConfig):
|
||||
now -= self.hoarding
|
||||
for func in self.data.values():
|
||||
func = Function(func)
|
||||
if not func.enable:
|
||||
continue
|
||||
if func.next_run < now:
|
||||
pending.append(func)
|
||||
else:
|
||||
|
||||
@@ -288,7 +288,7 @@ class GeneratedConfig:
|
||||
OpsiGeneral_AkashiShopFilter = 'ActionPoint > PurpleCoins'
|
||||
|
||||
# Group `OpsiFleetFilter`
|
||||
OpsiFleetFilter_Filter = 'Fleet-4 > Fleet-2-Submarine > Fleet-3 > Fleet-1'
|
||||
OpsiFleetFilter_Filter = 'Fleet-4 > CallSubmarine > Fleet-2 > Fleet-3 > Fleet-1'
|
||||
|
||||
# Group `OpsiFleet`
|
||||
OpsiFleet_Fleet = 1 # 1, 2, 3, 4
|
||||
|
||||
@@ -1543,7 +1543,7 @@
|
||||
},
|
||||
"Filter": {
|
||||
"name": "Fleet Filter",
|
||||
"help": "All fleets take turns to attack the boss. If one fleet is dead, change to another. Use \"Submarine\" suffix to call submarines before the attack, but run interval will be increased to 60 minutes."
|
||||
"help": "All fleets take turns to attack the boss. If one fleet is dead, change to another. Use \"CallSubmarine\" to call submarines before the attack, but run interval will be increased to 60 minutes."
|
||||
}
|
||||
},
|
||||
"OpsiFleet": {
|
||||
|
||||
@@ -1543,7 +1543,7 @@
|
||||
},
|
||||
"Filter": {
|
||||
"name": "出击舰队过滤器",
|
||||
"help": "车轮战boss,一个舰队死了就换另一个。使用 \"Submarine\" 后缀以在战斗前呼叫潜艇,但运行间隔将增加至60分钟"
|
||||
"help": "车轮战打boss,一个舰队死了就换另一个。使用 \"CallSubmarine\" 以在战斗前呼叫潜艇,但运行间隔将增加至60分钟"
|
||||
}
|
||||
},
|
||||
"OpsiFleet": {
|
||||
|
||||
@@ -1543,7 +1543,7 @@
|
||||
},
|
||||
"Filter": {
|
||||
"name": "出擊艦隊過濾器",
|
||||
"help": "所有艦隊輪流攻擊boss,一個艦隊死了就換另一個。使用 \"Submarine\" 後綴以在戰鬥前呼叫潛艇,但運行間隔將增加至60分鐘"
|
||||
"help": "所有艦隊輪流攻擊boss,一個艦隊死了就換另一個。使用 \"CallSubmarine\" 以在戰鬥前呼叫潛艇,但運行間隔將增加至60分鐘"
|
||||
}
|
||||
},
|
||||
"OpsiFleet": {
|
||||
|
||||
Reference in New Issue
Block a user