Merge branch 'main' of https://git.zhaozuohong.vip/mower-ng/mower-ng
All checks were successful
ci/woodpecker/push/check_format Pipeline was successful
All checks were successful
ci/woodpecker/push/check_format Pipeline was successful
This commit is contained in:
commit
7c607164f5
3 changed files with 40 additions and 1055 deletions
|
@ -199,6 +199,7 @@ class Arknights数据处理器:
|
|||
关卡代码 += " 突袭"
|
||||
关卡名称 = self.关卡表["stages"][键]["name"]
|
||||
关卡结束时间戳 = 还未结束的非常驻关卡[键]["endTs"]
|
||||
关卡消耗理智 = self.关卡表["stages"][键]["apCost"]
|
||||
# 关卡结束时间 = datetime.fromtimestamp(还未结束的非常驻关卡[键]["endTs"] + 1)
|
||||
关卡掉落表 = self.关卡表["stages"][键]["stageDropInfo"][
|
||||
"displayDetailRewards"
|
||||
|
@ -244,6 +245,7 @@ class Arknights数据处理器:
|
|||
"name": 关卡名称,
|
||||
"drop": 关卡掉落,
|
||||
"end": 关卡结束时间戳,
|
||||
"理智消耗": 关卡消耗理智,
|
||||
"周一": 1,
|
||||
"周二": 1,
|
||||
"周三": 1,
|
||||
|
|
|
@ -10,7 +10,8 @@
|
|||
"周四": 1,
|
||||
"周五": 1,
|
||||
"周六": 1,
|
||||
"周日": 1
|
||||
"周日": 1,
|
||||
"理智消耗":36
|
||||
},
|
||||
{
|
||||
"id": "1-7",
|
||||
|
@ -23,7 +24,8 @@
|
|||
"周四": 1,
|
||||
"周五": 1,
|
||||
"周六": 1,
|
||||
"周日": 1
|
||||
"周日": 1,
|
||||
"理智消耗":6
|
||||
},
|
||||
{
|
||||
"id": "Annihilation",
|
||||
|
@ -36,7 +38,8 @@
|
|||
"周四": 1,
|
||||
"周五": 1,
|
||||
"周六": 1,
|
||||
"周日": 1
|
||||
"周日": 1,
|
||||
"理智消耗":25
|
||||
},
|
||||
{
|
||||
"id": "LS-6",
|
||||
|
@ -49,7 +52,8 @@
|
|||
"周四": 1,
|
||||
"周五": 1,
|
||||
"周六": 1,
|
||||
"周日": 1
|
||||
"周日": 1,
|
||||
"理智消耗": 36
|
||||
},
|
||||
{
|
||||
"id": "CE-6",
|
||||
|
@ -62,7 +66,8 @@
|
|||
"周四": 1,
|
||||
"周五": 0,
|
||||
"周六": 1,
|
||||
"周日": 1
|
||||
"周日": 1,
|
||||
"理智消耗": 36
|
||||
},
|
||||
{
|
||||
"id": "AP-5",
|
||||
|
@ -75,10 +80,11 @@
|
|||
"周四": 1,
|
||||
"周五": 0,
|
||||
"周六": 1,
|
||||
"周日": 1
|
||||
"周日": 1,
|
||||
"理智消耗": 30
|
||||
},
|
||||
{
|
||||
"id": "SK-6",
|
||||
"id": "SK-5",
|
||||
"name": "碳条",
|
||||
"drop": "",
|
||||
"end": -1,
|
||||
|
@ -88,7 +94,8 @@
|
|||
"周四": 0,
|
||||
"周五": 1,
|
||||
"周六": 1,
|
||||
"周日": 0
|
||||
"周日": 0,
|
||||
"理智消耗": 30
|
||||
},
|
||||
{
|
||||
"id": "CA-5",
|
||||
|
@ -101,7 +108,8 @@
|
|||
"周四": 0,
|
||||
"周五": 1,
|
||||
"周六": 0,
|
||||
"周日": 1
|
||||
"周日": 1,
|
||||
"理智消耗": 30
|
||||
},
|
||||
{
|
||||
"id": "PR-A-2",
|
||||
|
@ -114,7 +122,8 @@
|
|||
"周四": 1,
|
||||
"周五": 1,
|
||||
"周六": 0,
|
||||
"周日": 1
|
||||
"周日": 1,
|
||||
"理智消耗": 36
|
||||
},
|
||||
{
|
||||
"id": "PR-B-2",
|
||||
|
@ -127,7 +136,8 @@
|
|||
"周四": 0,
|
||||
"周五": 1,
|
||||
"周六": 1,
|
||||
"周日": 0
|
||||
"周日": 0,
|
||||
"理智消耗": 36
|
||||
},
|
||||
{
|
||||
"id": "PR-C-2",
|
||||
|
@ -140,7 +150,8 @@
|
|||
"周四": 1,
|
||||
"周五": 0,
|
||||
"周六": 1,
|
||||
"周日": 1
|
||||
"周日": 1,
|
||||
"理智消耗": 36
|
||||
},
|
||||
{
|
||||
"id": "PR-D-2",
|
||||
|
@ -153,6 +164,7 @@
|
|||
"周四": 0,
|
||||
"周五": 0,
|
||||
"周六": 1,
|
||||
"周日": 1
|
||||
"周日": 1,
|
||||
"理智消耗": 36
|
||||
}
|
||||
]
|
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue