mirror of https://github.com/NobyDa/Script.git
JD: Logical improvement.
This commit is contained in:
parent
3d115ec3e0
commit
3996349aff
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
京东多合一签到脚本
|
京东多合一签到脚本
|
||||||
|
|
||||||
更新时间: 2020.9.12 19:25 v1.54 (Beta)
|
更新时间: 2020.9.13 21:10 v1.55
|
||||||
有效接口: 28+
|
有效接口: 28+
|
||||||
脚本兼容: QuantumultX, Surge, Loon, JSBox, Node.js
|
脚本兼容: QuantumultX, Surge, Loon, JSBox, Node.js
|
||||||
电报频道: @NobyDa
|
电报频道: @NobyDa
|
||||||
|
@ -1335,16 +1335,20 @@ function JingDongSpeedUp(s, id) {
|
||||||
const percent = Math.round((cc.data.done_distance / cc.data.distance) * 100)
|
const percent = Math.round((cc.data.done_distance / cc.data.distance) * 100)
|
||||||
console.log(`\n天天加速-目前结束时间: \n${cc.data.end_time} [${percent}%]`)
|
console.log(`\n天天加速-目前结束时间: \n${cc.data.end_time} [${percent}%]`)
|
||||||
$nobyda.ItemIsUsed = false
|
$nobyda.ItemIsUsed = false
|
||||||
var step1 = await JDSpaceEvent(s); //处理太空事件
|
if (!$nobyda.isAllEvents) await JDSpaceEvent(s); //处理太空事件
|
||||||
var step2 = await JDQueryTask(s); //处理任务道具
|
if (!$nobyda.isAlltasks) await JDQueryTask(s); //处理太空任务
|
||||||
var step3 = await JDQueryTaskID(s); //查询道具ID
|
var step3 = await JDQueryTaskID(s); //查询道具ID
|
||||||
var step4 = await JDUseProps(s, step3); //使用道具
|
var step4 = await JDUseProps(s, step3); //使用道具
|
||||||
if (step4 && $nobyda.ItemIsUsed) { //如果使用了道具, 则再次检查任务
|
if (step4 && $nobyda.ItemIsUsed) { //如果使用了道具, 则再次检查任务
|
||||||
await JingDongSpeedUp(s)
|
await JingDongSpeedUp(s)
|
||||||
} else if (!merge.SpeedUp.notify) {
|
} else {
|
||||||
|
$nobyda.isAllEvents = false; //避免多账号问题
|
||||||
|
$nobyda.isAlltasks = false;
|
||||||
|
if (!merge.SpeedUp.notify) {
|
||||||
merge.SpeedUp.fail = 1
|
merge.SpeedUp.fail = 1
|
||||||
merge.SpeedUp.notify = `京东天天-加速: 失败, 加速中${percent<10?` `:``}[${percent}%] ⚠️`
|
merge.SpeedUp.notify = `京东天天-加速: 失败, 加速中${percent<10?` `:``}[${percent}%] ⚠️`
|
||||||
}
|
}
|
||||||
|
}
|
||||||
} else if (cc.data.task_status == 2) {
|
} else if (cc.data.task_status == 2) {
|
||||||
merge.SpeedUp.bean = cc.data.beans_num || 0
|
merge.SpeedUp.bean = cc.data.beans_num || 0
|
||||||
merge.SpeedUp.notify = `京东天天-加速: 成功, 明细: ${merge.SpeedUp.bean || `无`}京豆 🐶`
|
merge.SpeedUp.notify = `京东天天-加速: 成功, 明细: ${merge.SpeedUp.bean || `无`}京豆 🐶`
|
||||||
|
@ -1441,6 +1445,7 @@ function JDSpaceEvent(s) {
|
||||||
$nobyda.AnError("太空事件-领取", "SpeedUp", eor)
|
$nobyda.AnError("太空事件-领取", "SpeedUp", eor)
|
||||||
} finally {
|
} finally {
|
||||||
if (list.length == spaceEventCount) {
|
if (list.length == spaceEventCount) {
|
||||||
|
if (list.length == spaceNumTask) $nobyda.isAllEvents = true; //避免重复查询
|
||||||
console.log(`\n天天加速-已成功领取${spaceNumTask}个事件`)
|
console.log(`\n天天加速-已成功领取${spaceNumTask}个事件`)
|
||||||
resolve()
|
resolve()
|
||||||
}
|
}
|
||||||
|
@ -1449,6 +1454,7 @@ function JDSpaceEvent(s) {
|
||||||
}
|
}
|
||||||
if (out) setTimeout(resolve, out + s)
|
if (out) setTimeout(resolve, out + s)
|
||||||
} else {
|
} else {
|
||||||
|
$nobyda.isAllEvents = true; //避免重复查询
|
||||||
resolve()
|
resolve()
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
@ -1527,6 +1533,7 @@ function JDQueryTask(s) {
|
||||||
$nobyda.AnError("领取道具-加速", "SpeedUp", eor)
|
$nobyda.AnError("领取道具-加速", "SpeedUp", eor)
|
||||||
} finally {
|
} finally {
|
||||||
if (CID.length == count) {
|
if (CID.length == count) {
|
||||||
|
if (CID.length == NumTask) $nobyda.isAlltasks = true; //避免重复查询
|
||||||
console.log("\n天天加速-已成功领取" + NumTask + "个道具")
|
console.log("\n天天加速-已成功领取" + NumTask + "个道具")
|
||||||
resolve(NumTask)
|
resolve(NumTask)
|
||||||
}
|
}
|
||||||
|
@ -1535,6 +1542,7 @@ function JDQueryTask(s) {
|
||||||
}
|
}
|
||||||
if (out) setTimeout(resolve, out + s)
|
if (out) setTimeout(resolve, out + s)
|
||||||
} else {
|
} else {
|
||||||
|
$nobyda.isAlltasks = true; //避免重复查询
|
||||||
resolve(NumTask)
|
resolve(NumTask)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
Loading…
Reference in New Issue