Skip to content

Commit da1cea7

Browse files
guoh064guoh064
committed
Add: [JP] island season task handler
1 parent 538f723 commit da1cea7

File tree

13 files changed

+206
-1
lines changed

13 files changed

+206
-1
lines changed

‎alas.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -407,6 +407,10 @@ def gems_farming(self):
407407
GemsFarming(config=self.config, device=self.device).run(
408408
name=self.config.Campaign_Name, folder=self.config.Campaign_Event, mode=self.config.Campaign_Mode)
409409

410+
def island_season_task(self):
411+
from module.island.season_task import IslandSeasonTaskHandler
412+
IslandSeasonTaskHandler(config=self.config, device=self.device).run()
413+
410414
def daemon(self):
411415
from module.daemon.daemon import AzurLaneDaemon
412416
AzurLaneDaemon(config=self.config, device=self.device, task="Daemon").run()

‎config/template.json‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1906,6 +1906,27 @@
19061906
"Storage": {}
19071907
}
19081908
},
1909+
"IslandInfo": {
1910+
"IslandSeasonTask": {
1911+
"TaskDict": null
1912+
},
1913+
"Storage": {
1914+
"Storage": {}
1915+
}
1916+
},
1917+
"IslandSeasonTask": {
1918+
"Scheduler": {
1919+
"Enable": false,
1920+
"NextRun": "2020-01-01 00:00:00",
1921+
"Command": "IslandSeasonTask",
1922+
"SuccessInterval": 0,
1923+
"FailureInterval": 120,
1924+
"ServerUpdate": "00:00"
1925+
},
1926+
"Storage": {
1927+
"Storage": {}
1928+
}
1929+
},
19091930
"Daemon": {
19101931
"Daemon": {
19111932
"EnterMap": true

‎module/config/argument/args.json‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9184,6 +9184,67 @@
91849184
}
91859185
}
91869186
},
9187+
"IslandInfo": {
9188+
"IslandSeasonTask": {
9189+
"TaskDict": {
9190+
"type": "textarea",
9191+
"value": ""
9192+
}
9193+
},
9194+
"Storage": {
9195+
"Storage": {
9196+
"type": "storage",
9197+
"value": {},
9198+
"valuetype": "ignore",
9199+
"display": "disabled"
9200+
}
9201+
}
9202+
},
9203+
"IslandSeasonTask": {
9204+
"Scheduler": {
9205+
"Enable": {
9206+
"type": "checkbox",
9207+
"value": false,
9208+
"option": [
9209+
true,
9210+
false
9211+
]
9212+
},
9213+
"NextRun": {
9214+
"type": "datetime",
9215+
"value": "2020-01-01 00:00:00",
9216+
"validate": "datetime"
9217+
},
9218+
"Command": {
9219+
"type": "input",
9220+
"value": "IslandSeasonTask",
9221+
"display": "hide"
9222+
},
9223+
"SuccessInterval": {
9224+
"type": "input",
9225+
"value": 0,
9226+
"display": "hide"
9227+
},
9228+
"FailureInterval": {
9229+
"type": "input",
9230+
"value": 120,
9231+
"display": "hide"
9232+
},
9233+
"ServerUpdate": {
9234+
"type": "input",
9235+
"value": "00:00",
9236+
"display": "hide"
9237+
}
9238+
},
9239+
"Storage": {
9240+
"Storage": {
9241+
"type": "storage",
9242+
"value": {},
9243+
"valuetype": "ignore",
9244+
"display": "disabled"
9245+
}
9246+
}
9247+
},
91879248
"Daemon": {
91889249
"Daemon": {
91899250
"EnterMap": {

‎module/config/argument/argument.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -732,6 +732,13 @@ OpsiHazard1Leveling:
732732
value: 0
733733
option: [ 0, 44, 22 ]
734734

735+
# =================== Island ====================
736+
IslandSeasonTask:
737+
TaskDict:
738+
type: textarea
739+
value: |-
740+
741+
735742
# ==================== Tools ====================
736743

737744
Daemon:

‎module/config/argument/menu.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,14 @@
9696
"OpsiCrossMonth"
9797
]
9898
},
99+
"Island": {
100+
"menu": "collapse",
101+
"page": "setting",
102+
"tasks": [
103+
"IslandInfo",
104+
"IslandSeasonTask"
105+
]
106+
},
99107
"Tool": {
100108
"menu": "collapse",
101109
"page": "tool",

‎module/config/argument/task.yaml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -325,6 +325,17 @@ Opsi:
325325
OpsiCrossMonth:
326326
- Scheduler
327327

328+
# =================== Island ===================
329+
Island:
330+
menu: 'collapse'
331+
page: 'setting'
332+
tasks:
333+
IslandInfo:
334+
- IslandSeasonTask
335+
IslandSeasonTask:
336+
- Scheduler
337+
338+
328339
# ==================== Tool ====================
329340

330341
Tool:

‎module/config/config_generated.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -435,6 +435,9 @@ class GeneratedConfig:
435435
# Group `OpsiHazard1Leveling`
436436
OpsiHazard1Leveling_TargetZone = 0 # 0, 44, 22
437437

438+
# Group `IslandSeasonTask`
439+
IslandSeasonTask_TaskDict = None
440+
438441
# Group `Daemon`
439442
Daemon_EnterMap = True
440443

‎module/config/config_manual.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ def SERVER(self):
2222
> OpsiAshBeacon
2323
> OpsiDaily > OpsiShop > OpsiVoucher
2424
> OpsiAbyssal > OpsiStronghold > OpsiObscure > OpsiArchive
25+
> IslandSeasonTask
2526
> Daily > Hard > OpsiAshBeacon > OpsiAshAssist > OpsiMonthBoss
2627
> Sos > EventSp > EventA > EventB > EventC > EventD
2728
> RaidDaily > CoalitionSp > WarArchives > MaritimeEscort

‎module/config/i18n/en-US.json‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@
2828
"name": "OpSi",
2929
"help": ""
3030
},
31+
"Island": {
32+
"name": "Menu.Island.name",
33+
"help": "Menu.Island.help"
34+
},
3135
"Tool": {
3236
"name": "Tools",
3337
"help": ""
@@ -254,6 +258,14 @@
254258
"name": "Cross Month Daily",
255259
"help": " ALAS will enter OpSi 10min before OpSi reset, wait until OpSi reset but not exit OpSi. Then do the daily, obscure, abyssal and meowfficer farming to get extra gold plates. When running dailies, settings in task \"OpSiDaily\" are used, the rest function are the same.\n IMPORTANT: Please do not touch the game while ALAS is waiting for OpSi reset."
256260
},
261+
"IslandInfo": {
262+
"name": "Task.IslandInfo.name",
263+
"help": "Task.IslandInfo.help"
264+
},
265+
"IslandSeasonTask": {
266+
"name": "Task.IslandSeasonTask.name",
267+
"help": "Task.IslandSeasonTask.help"
268+
},
257269
"Daemon": {
258270
"name": "Normal Semi-auto",
259271
"help": ""
@@ -2540,6 +2552,16 @@
25402552
"22": "22 | NA Ocean SW Sector B"
25412553
}
25422554
},
2555+
"IslandSeasonTask": {
2556+
"_info": {
2557+
"name": "IslandSeasonTask._info.name",
2558+
"help": "IslandSeasonTask._info.help"
2559+
},
2560+
"TaskDict": {
2561+
"name": "IslandSeasonTask.TaskDict.name",
2562+
"help": "IslandSeasonTask.TaskDict.help"
2563+
}
2564+
},
25432565
"Daemon": {
25442566
"_info": {
25452567
"name": "Semi-auto Clicking",

‎module/config/i18n/ja-JP.json‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@
2828
"name": "セイレーン作戦",
2929
"help": ""
3030
},
31+
"Island": {
32+
"name": "Menu.Island.name",
33+
"help": "Menu.Island.help"
34+
},
3135
"Tool": {
3236
"name": "ツール",
3337
"help": ""
@@ -254,6 +258,14 @@
254258
"name": "Cross Month Daily",
255259
"help": " ALAS will enter OpSi 10min before OpSi reset, wait until OpSi reset but not exit OpSi. Then do the daily, obscure, abyssal and meowfficer farming to get extra gold plates. When running dailies, settings in task \"OpSiDaily\" are used, the rest function are the same.\n IMPORTANT: Please do not touch the game while ALAS is waiting for OpSi reset."
256260
},
261+
"IslandInfo": {
262+
"name": "Task.IslandInfo.name",
263+
"help": "Task.IslandInfo.help"
264+
},
265+
"IslandSeasonTask": {
266+
"name": "Task.IslandSeasonTask.name",
267+
"help": "Task.IslandSeasonTask.help"
268+
},
257269
"Daemon": {
258270
"name": "半自動クリック",
259271
"help": ""
@@ -2540,6 +2552,16 @@
25402552
"22": "22"
25412553
}
25422554
},
2555+
"IslandSeasonTask": {
2556+
"_info": {
2557+
"name": "IslandSeasonTask._info.name",
2558+
"help": "IslandSeasonTask._info.help"
2559+
},
2560+
"TaskDict": {
2561+
"name": "IslandSeasonTask.TaskDict.name",
2562+
"help": "IslandSeasonTask.TaskDict.help"
2563+
}
2564+
},
25432565
"Daemon": {
25442566
"_info": {
25452567
"name": "Daemon._info.name",

0 commit comments

Comments
 (0)