Merge branch 'MaaAssistantArknights:dev' into dev

This commit is contained in:
Songyang.Huo
2023-10-13 08:11:53 +08:00
committed by GitHub
3 changed files with 6 additions and 6 deletions

View File

@@ -6136,4 +6136,4 @@
"Headhunt x10"
]
}
}
}

View File

@@ -1,10 +1,10 @@
{
"activity": {
"name": "CC#12 Operation Basepoint",
"time": 1696179600
"name": "Guide Ahead - Rerun",
"time": 1695315600
},
"gacha": {
"pool": "Joint Operation 9",
"time": 1696179600
"pool": "The Front That Was",
"time": 1696935600
}
}

View File

@@ -3771,4 +3771,4 @@
"Trade",
"Mfg"
]
}
}