YoursFunny/ArisuAutoSweeper
1
0
Fork 0
mirror of https://github.com/TheFunny/ArisuAutoSweeper synced 2026-06-09 20:04:52 +00:00
Code Releases Wiki Activity

feat:lesson

Browse Source
This commit is contained in:
RedDeadDepresso
2024-01-01 11:04:16 +00:00
committed by YoursFunny
parent 93b7ca8cfc
commit fe7c6f92a8
20 changed files with 969 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/config/argument/args.json
+152
View File
@@ -318,6 +318,158 @@
}
}
},
"Schedule": {
"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": "Schedule",
"display": "hide"
},
"ServerUpdate": {
"type": "input",
"value": "04:00",
"display": "hide"
}
},
"Schedule": {
"OnError": {
"type": "select",
"value": "skip",
"option": [
"stop",
"skip"
]
}
},
"Choice1": {
"Location": {
"type": "select",
"value": "None",
"option": [
"None",
0,
1,
2,
3,
4,
5,
6,
7,
8,
9
]
},
"Classrooms": {
"type": "textarea",
"value": null
}
},
"Choice2": {
"Location": {
"type": "select",
"value": "None",
"option": [
"None",
0,
1,
2,
3,
4,
5,
6,
7,
8,
9
]
},
"Classrooms": {
"type": "textarea",
"value": null
}
},
"Choice3": {
"Location": {
"type": "select",
"value": "None",
"option": [
"None",
0,
1,
2,
3,
4,
5,
6,
7,
8,
9
]
},
"Classrooms": {
"type": "textarea",
"value": null
}
},
"Choice4": {
"Location": {
"type": "select",
"value": "None",
"option": [
"None",
0,
1,
2,
3,
4,
5,
6,
7,
8,
9
]
},
"Classrooms": {
"type": "textarea",
"value": null
}
},
"Choice5": {
"Location": {
"type": "select",
"value": "None",
"option": [
"None",
0,
1,
2,
3,
4,
5,
6,
7,
8,
9
]
},
"Classrooms": {
"type": "textarea",
"value": null
}
}
},
"Shop": {
"Scheduler": {
"Enable": {
module/config/argument/argument.yaml
+41
View File
@@ -93,6 +93,47 @@ Invitation:
type: textarea
Substitute: false
Schedule:
OnError:
value: skip
option: [ stop, skip ]
Choice1:
Location:
value: None
option: [ None, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 ]
Classrooms:
value: null
type: textarea
Choice2:
Location:
value: None
option: [ None, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 ]
Classrooms:
value: null
type: textarea
Choice3:
Location:
value: None
option: [ None, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 ]
Classrooms:
value: null
type: textarea
Choice4:
Location:
value: None
option: [ None, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 ]
Classrooms:
value: null
type: textarea
Choice5:
Location:
value: None
option: [ None, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 ]
Classrooms:
value: null
type: textarea
Bounty:
OnError:
value: skip
module/config/argument/menu.json
+1
View File
@@ -13,6 +13,7 @@
"page": "setting",
"tasks": [
"Cafe",
"Schedule",
"Shop"
]
},
module/config/argument/task.yaml
+8
View File
@@ -29,6 +29,14 @@ Daily:
- Scheduler
- Cafe
- Invitation
Schedule:
- Scheduler
- Schedule
- Choice1
- Choice2
- Choice3
- Choice4
- Choice5
Shop:
- Scheduler
- NormalShop
module/config/config_generated.py
+23
View File
@@ -52,6 +52,29 @@ class GeneratedConfig:
Invitation_Name = None
Invitation_Substitute = False
# Group `Schedule`
Schedule_OnError = 'skip' # stop, skip
# Group `Choice1`
Choice1_Location = 'None' # None, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9
Choice1_Classrooms = None
# Group `Choice2`
Choice2_Location = 'None' # None, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9
Choice2_Classrooms = None
# Group `Choice3`
Choice3_Location = 'None' # None, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9
Choice3_Classrooms = None
# Group `Choice4`
Choice4_Location = 'None' # None, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9
Choice4_Classrooms = None
# Group `Choice5`
Choice5_Location = 'None' # None, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9
Choice5_Classrooms = None
# Group `Bounty`
Bounty_OnError = 'skip' # stop, skip
module/config/config_manual.py
+1 -1
View File
@@ -9,7 +9,7 @@ class ManualConfig:
SCHEDULER_PRIORITY = """
Restart
> Cafe > TacticalChallenge > Circle > Mail
> DataUpdate > Bounty > Scrimmage > Task > Shop > Mission > Momotalk
> DataUpdate > Bounty > Scrimmage > Schedule > Task > Shop > Mission > Momotalk
"""
"""
module/config/i18n/en-US.json
+141
View File
@@ -34,6 +34,10 @@
"name": "Cafe",
"help": ""
},
"Schedule": {
"name": "Lesson",
"help": "AAS will execute Lesson starting from Choice 1 to Choice 5.\nIt will ignore any Choice that have Location set as None or the text area for classrooms is empty.\nIf any of the active Choices have incorrect input, it will perform the action set in Error handling."
},
"Shop": {
"name": "Shop",
"help": ""
@@ -277,6 +281,143 @@
"help": "Whether to replace the existing student with their alt.\nIf not, try to match the next student"
}
},
"Schedule": {
"_info": {
"name": "Lesson Settings",
"help": ""
},
"OnError": {
"name": "Error Handling",
"help": "Perform the selected action when an error occurs (ticket not enough or any invalid setting)",
"stop": "Stop script",
"skip": "Skip current task"
}
},
"Choice1": {
"_info": {
"name": "Choice 1",
"help": ""
},
"Location": {
"name": "Location",
"help": "",
"None": "None",
"0": "Schale Office",
"1": "Schale Residence",
"2": "Gehenna",
"3": "Abydos",
"4": "Millennium",
"5": "Trinity",
"6": "Red Winter",
"7": "Hyakkiyako",
"8": "D.U. Shiratori",
"9": "Shanhaijing"
},
"Classrooms": {
"name": "Classrooms",
"help": "Type a number from 1 to 9 that represents the classroom position in the locations popup.\nUse > to connect multiple classrooms and AAS will select them following the order they appear. Example:\n5 > 3 > 2 > 4 > 1"
}
},
"Choice2": {
"_info": {
"name": "Choice 2",
"help": ""
},
"Location": {
"name": "Location",
"help": "",
"None": "None",
"0": "Schale Office",
"1": "Schale Residence",
"2": "Gehenna",
"3": "Abydos",
"4": "Millennium",
"5": "Trinity",
"6": "Red Winter",
"7": "Hyakkiyako",
"8": "D.U. Shiratori",
"9": "Shanhaijing"
},
"Classrooms": {
"name": "Classrooms",
"help": ""
}
},
"Choice3": {
"_info": {
"name": "Choice 3",
"help": ""
},
"Location": {
"name": "Location",
"help": "",
"None": "None",
"0": "Schale Office",
"1": "Schale Residence",
"2": "Gehenna",
"3": "Abydos",
"4": "Millennium",
"5": "Trinity",
"6": "Red Winter",
"7": "Hyakkiyako",
"8": "D.U. Shiratori",
"9": "Shanhaijing"
},
"Classrooms": {
"name": "Classrooms",
"help": ""
}
},
"Choice4": {
"_info": {
"name": "Choice 4",
"help": ""
},
"Location": {
"name": "Location",
"help": "",
"None": "None",
"0": "Schale Office",
"1": "Schale Residence",
"2": "Gehenna",
"3": "Abydos",
"4": "Millennium",
"5": "Trinity",
"6": "Red Winter",
"7": "Hyakkiyako",
"8": "D.U. Shiratori",
"9": "Shanhaijing"
},
"Classrooms": {
"name": "Classrooms",
"help": ""
}
},
"Choice5": {
"_info": {
"name": "Choice 5",
"help": ""
},
"Location": {
"name": "Location",
"help": "",
"None": "None",
"0": "Schale Office",
"1": "Schale Residence",
"2": "Gehenna",
"3": "Abydos",
"4": "Millennium",
"5": "Trinity",
"6": "Red Winter",
"7": "Hyakkiyako",
"8": "D.U. Shiratori",
"9": "Shanhaijing"
},
"Classrooms": {
"name": "Classrooms",
"help": ""
}
},
"Bounty": {
"_info": {
"name": "Bounty Settings",
module/config/i18n/zh-CN.json
+141
View File
@@ -34,6 +34,10 @@
"name": "咖啡厅",
"help": ""
},
"Schedule": {
"name": "Task.Schedule.name",
"help": "Task.Schedule.help"
},
"Shop": {
"name": "商店",
"help": ""
@@ -277,6 +281,143 @@
"help": "若咖啡厅已存在所邀请学生的不同服装，选择是否替换该学生\n若不替换，则尝试匹配下一位学生"
}
},
"Schedule": {
"_info": {
"name": "Schedule._info.name",
"help": "Schedule._info.help"
},
"OnError": {
"name": "Schedule.OnError.name",
"help": "Schedule.OnError.help",
"stop": "stop",
"skip": "skip"
}
},
"Choice1": {
"_info": {
"name": "Choice1._info.name",
"help": "Choice1._info.help"
},
"Location": {
"name": "Choice1.Location.name",
"help": "Choice1.Location.help",
"None": "None",
"0": "0",
"1": "1",
"2": "2",
"3": "3",
"4": "4",
"5": "5",
"6": "6",
"7": "7",
"8": "8",
"9": "9"
},
"Classrooms": {
"name": "Choice1.Classrooms.name",
"help": "Choice1.Classrooms.help"
}
},
"Choice2": {
"_info": {
"name": "Choice2._info.name",
"help": "Choice2._info.help"
},
"Location": {
"name": "Choice2.Location.name",
"help": "Choice2.Location.help",
"None": "None",
"0": "0",
"1": "1",
"2": "2",
"3": "3",
"4": "4",
"5": "5",
"6": "6",
"7": "7",
"8": "8",
"9": "9"
},
"Classrooms": {
"name": "Choice2.Classrooms.name",
"help": "Choice2.Classrooms.help"
}
},
"Choice3": {
"_info": {
"name": "Choice3._info.name",
"help": "Choice3._info.help"
},
"Location": {
"name": "Choice3.Location.name",
"help": "Choice3.Location.help",
"None": "None",
"0": "0",
"1": "1",
"2": "2",
"3": "3",
"4": "4",
"5": "5",
"6": "6",
"7": "7",
"8": "8",
"9": "9"
},
"Classrooms": {
"name": "Choice3.Classrooms.name",
"help": "Choice3.Classrooms.help"
}
},
"Choice4": {
"_info": {
"name": "Choice4._info.name",
"help": "Choice4._info.help"
},
"Location": {
"name": "Choice4.Location.name",
"help": "Choice4.Location.help",
"None": "None",
"0": "0",
"1": "1",
"2": "2",
"3": "3",
"4": "4",
"5": "5",
"6": "6",
"7": "7",
"8": "8",
"9": "9"
},
"Classrooms": {
"name": "Choice4.Classrooms.name",
"help": "Choice4.Classrooms.help"
}
},
"Choice5": {
"_info": {
"name": "Choice5._info.name",
"help": "Choice5._info.help"
},
"Location": {
"name": "Choice5.Location.name",
"help": "Choice5.Location.help",
"None": "None",
"0": "0",
"1": "1",
"2": "2",
"3": "3",
"4": "4",
"5": "5",
"6": "6",
"7": "7",
"8": "8",
"9": "9"
},
"Classrooms": {
"name": "Choice5.Classrooms.name",
"help": "Choice5.Classrooms.help"
}
},
"Bounty": {
"_info": {
"name": "悬赏通缉设置",