Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 22 additions & 8 deletions config/template.json
Original file line number Diff line number Diff line change
Expand Up @@ -497,13 +497,20 @@
"FailureInterval": 120,
"ServerUpdate": "04:00"
},
"Event": {
"EventInfo": {
"Event": "",
"StoryPart": "Story_1",
"StoryDifficulty": "Normal"
},
"StoryStage": {
"AutoPush": false,
"AutoFormation": false,
"AutoTicketPurchase": false,
"Sweep": true
},
"Event": {
"LoginStamp": true,
"Challenge": true,
"Story": false,
"StoryPart": "Story_1",
"StoryDifficulty": "Normal",
"Coop": false,
"Shop": false,
"ShopDelayList": "TITLE",
Expand All @@ -524,13 +531,20 @@
"FailureInterval": 120,
"ServerUpdate": "04:00"
},
"Event": {
"EventInfo": {
"Event": "",
"StoryPart": "Story_1",
"StoryDifficulty": "Normal"
},
"StoryStage": {
"AutoPush": false,
"AutoFormation": false,
"AutoTicketPurchase": false,
"Sweep": true
},
"Event": {
"LoginStamp": true,
"Challenge": true,
"Story": false,
"StoryPart": "Story_1",
"StoryDifficulty": "Normal",
"Coop": false,
"Shop": false,
"ShopDelayList": "TITLE",
Expand Down
84 changes: 58 additions & 26 deletions module/config/argument/args.json
Original file line number Diff line number Diff line change
Expand Up @@ -1779,7 +1779,7 @@
"display": "hide"
}
},
"Event": {
"EventInfo": {
"Event": {
"type": "select",
"value": "",
Expand All @@ -1797,18 +1797,6 @@
],
"display": "disabled"
},
"LoginStamp": {
"type": "checkbox",
"value": true
},
"Challenge": {
"type": "checkbox",
"value": true
},
"Story": {
"type": "checkbox",
"value": false
},
"StoryPart": {
"type": "select",
"value": "Story_1",
Expand All @@ -1826,6 +1814,34 @@
"Hard"
],
"display": "disabled"
}
},
"StoryStage": {
"AutoPush": {
"type": "checkbox",
"value": false
},
"AutoFormation": {
"type": "checkbox",
"value": false
},
"AutoTicketPurchase": {
"type": "checkbox",
"value": false
},
"Sweep": {
"type": "checkbox",
"value": true
}
},
"Event": {
"LoginStamp": {
"type": "checkbox",
"value": true
},
"Challenge": {
"type": "checkbox",
"value": true
},
"Coop": {
"type": "checkbox",
Expand Down Expand Up @@ -1897,7 +1913,7 @@
"display": "hide"
}
},
"Event": {
"EventInfo": {
"Event": {
"type": "select",
"value": "",
Expand All @@ -1915,18 +1931,6 @@
],
"display": "disabled"
},
"LoginStamp": {
"type": "checkbox",
"value": true
},
"Challenge": {
"type": "checkbox",
"value": true
},
"Story": {
"type": "checkbox",
"value": false
},
"StoryPart": {
"type": "select",
"value": "Story_1",
Expand All @@ -1944,6 +1948,34 @@
"Hard"
],
"display": "disabled"
}
},
"StoryStage": {
"AutoPush": {
"type": "checkbox",
"value": false
},
"AutoFormation": {
"type": "checkbox",
"value": false
},
"AutoTicketPurchase": {
"type": "checkbox",
"value": false
},
"Sweep": {
"type": "checkbox",
"value": true
}
},
"Event": {
"LoginStamp": {
"type": "checkbox",
"value": true
},
"Challenge": {
"type": "checkbox",
"value": true
},
"Coop": {
"type": "checkbox",
Expand Down
13 changes: 9 additions & 4 deletions module/config/argument/argument.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ BlaExchange:
Priority:
value: 'Gem_×320 > Gem_×120 > Gem_×60 > Gem_×30 > Welcome_Gift_Core_Dust_×30'
type: textarea
Event:
EventInfo:
Event:
value: ''
option: [
Expand All @@ -223,9 +223,6 @@ Event:
'event_20250612'
]
display: disabled
LoginStamp: true
Challenge: true
Story: false
StoryPart:
value: 'Story_1'
option: [
Expand All @@ -240,6 +237,14 @@ Event:
'Hard'
]
display: disabled
StoryStage:
AutoPush: false
AutoFormation: false
AutoTicketPurchase: false
Sweep: true
Event:
LoginStamp: true
Challenge: true
Coop: false
Shop: false
ShopDelayList:
Expand Down
4 changes: 4 additions & 0 deletions module/config/argument/task.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -129,9 +129,13 @@ StoryEvent:
tasks:
Event:
- Scheduler
- EventInfo
- StoryStage
- Event
Event2:
- Scheduler
- EventInfo
- StoryStage
- Event

# ==================== Surface ====================
Expand Down
12 changes: 6 additions & 6 deletions module/config/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -223,14 +223,14 @@ def limit_next_run(tasks, limit):
# 选择最新的活动
for task in ["Event"]:
# deep_set(self.data, keys=f"{task}.Event.Event", value=self.EVENTS[0].get('event_id'))
self.modified[f"{task}.Event.Event"] = self.EVENTS[0].get('event_id')
self.modified[f"{task}.Event.StoryPart"] = self.EVENTS[0].get('story_part')
self.modified[f"{task}.Event.StoryDifficulty"] = self.EVENTS[0].get('story_difficulty')
self.modified[f"{task}.EventInfo.Event"] = self.EVENTS[0].get('event_id')
self.modified[f"{task}.EventInfo.StoryPart"] = self.EVENTS[0].get('story_part')
self.modified[f"{task}.EventInfo.StoryDifficulty"] = self.EVENTS[0].get('story_difficulty')
for task in ["Event2"]:
# deep_set(self.data, keys=f"{task}.Event.Event", value=self.EVENTS[0].get('event_id'))
self.modified[f"{task}.Event.Event"] = self.EVENTS[1].get('event_id')
self.modified[f"{task}.Event.StoryPart"] = self.EVENTS[1].get('story_part')
self.modified[f"{task}.Event.StoryDifficulty"] = self.EVENTS[1].get('story_difficulty')
self.modified[f"{task}.EventInfo.Event"] = self.EVENTS[1].get('event_id')
self.modified[f"{task}.EventInfo.StoryPart"] = self.EVENTS[1].get('story_part')
self.modified[f"{task}.EventInfo.StoryDifficulty"] = self.EVENTS[1].get('story_difficulty')

def get_next(self):
"""
Expand Down
15 changes: 11 additions & 4 deletions module/config/config_generated.py
Original file line number Diff line number Diff line change
Expand Up @@ -139,13 +139,20 @@ class GeneratedConfig:
# Group `BlaExchange`
BlaExchange_Priority = 'Gem_×320 > Gem_×120 > Gem_×60 > Gem_×30 > Welcome_Gift_Core_Dust_×30'

# Group `EventInfo`
EventInfo_Event = '' # event_20251120, event_20251030, event_20251016, event_20250924, event_20250904, event_20250807, event_20250716, event_20250703s, event_20250703l, event_20250612
EventInfo_StoryPart = 'Story_1' # Story_1, Story_2
EventInfo_StoryDifficulty = 'Normal' # Normal, Hard

# Group `StoryStage`
StoryStage_AutoPush = False
StoryStage_AutoFormation = False
StoryStage_AutoTicketPurchase = False
StoryStage_Sweep = True

# Group `Event`
Event_Event = '' # event_20251120, event_20251030, event_20251016, event_20250924, event_20250904, event_20250807, event_20250716, event_20250703s, event_20250703l, event_20250612
Event_LoginStamp = True
Event_Challenge = True
Event_Story = False
Event_StoryPart = 'Story_1' # Story_1, Story_2
Event_StoryDifficulty = 'Normal' # Normal, Hard
Event_Coop = False
Event_Shop = False
Event_ShopDelayList = 'TITLE'
Expand Down
84 changes: 54 additions & 30 deletions module/config/i18n/en-US.json
Original file line number Diff line number Diff line change
Expand Up @@ -758,25 +758,65 @@
"help": "If empty, nothing will be purchased. Format example: 'Gem_×320 > Welcome_Gift_Core_Dust_×30'. Default is to exchange for Gems. Example options include Gem_×320, Welcome_Gift_Core_Dust_×30, Gem_×30, Skill_Manual_I_×5, Ultra_Boost_Module_×5, Code_Manual_Selection_Box_×5, Gem_×60, Mid-Quality_Mold_×3, Credit_Case_(1H)_x9, Core_Dust_Case_(1H)_×3, Gem_×120, Mid-Quality_Mold_×8, Battle_Data_Set_Case_(1H)_×6, Core_Dust_Case_(1H)_×6, Skill_Manual_I_×30, Ultra_Boost_Module_×30, Code_Manual_Selection_Box_×30"
}
},
"EventInfo": {
"_info": {
"name": "EventInfo._info.name",
"help": "EventInfo._info.help"
},
"Event": {
"name": "EventInfo.Event.name",
"help": "EventInfo.Event.help",
"event_20251120": "event_20251120",
"event_20251030": "event_20251030",
"event_20251016": "event_20251016",
"event_20250924": "event_20250924",
"event_20250904": "event_20250904",
"event_20250807": "event_20250807",
"event_20250716": "event_20250716",
"event_20250703s": "event_20250703s",
"event_20250703l": "event_20250703l",
"event_20250612": "event_20250612"
},
"StoryPart": {
"name": "EventInfo.StoryPart.name",
"help": "EventInfo.StoryPart.help",
"Story_1": "Story_1",
"Story_2": "Story_2"
},
"StoryDifficulty": {
"name": "EventInfo.StoryDifficulty.name",
"help": "EventInfo.StoryDifficulty.help",
"Normal": "Normal",
"Hard": "Hard"
}
},
"StoryStage": {
"_info": {
"name": "StoryStage._info.name",
"help": "StoryStage._info.help"
},
"AutoPush": {
"name": "StoryStage.AutoPush.name",
"help": "StoryStage.AutoPush.help"
},
"AutoFormation": {
"name": "StoryStage.AutoFormation.name",
"help": "StoryStage.AutoFormation.help"
},
"AutoTicketPurchase": {
"name": "StoryStage.AutoTicketPurchase.name",
"help": "StoryStage.AutoTicketPurchase.help"
},
"Sweep": {
"name": "StoryStage.Sweep.name",
"help": "StoryStage.Sweep.help"
}
},
"Event": {
"_info": {
"name": "Event Settings",
"help": ""
},
"Event": {
"name": "Current Events",
"help": "",
"event_20251120": "BLANK Ticket",
"event_20251030": "GODDESS FALL",
"event_20251016": "GO! NINJA THIEF!",
"event_20250924": "REBORN EVIL",
"event_20250904": "COINS IN RUSH",
"event_20250807": "ABSOLUTE",
"event_20250716": "BOOM! THE GHOST!",
"event_20250703s": "OVER THE HORIZON",
"event_20250703l": "OuteR: Automata",
"event_20250612": "Memories Teller"
},
"LoginStamp": {
"name": "Login Stamp",
"help": ""
Expand All @@ -785,22 +825,6 @@
"name": "Challenge",
"help": "Requires teams to be set up in advance"
},
"Story": {
"name": "Stage Sweep",
"help": "Fast fight on the penultimate stage. Must have cleared penultimate stage of current open stage. Use SemiCombat for auto routing. Ensure your stage progress follows the event"
},
"StoryPart": {
"name": "Stage Selection",
"help": "",
"Story_1": "Story 1",
"Story_2": "Story 2"
},
"StoryDifficulty": {
"name": "Stage Difficulty",
"help": "",
"Normal": "Normal",
"Hard": "Hard"
},
"Coop": {
"name": "Coop",
"help": "Built-in Coop in large events defaults to easy play for Normal difficulty"
Expand Down
Loading