Merge pull request #217 from FanchangWang/master
[京喜农场] 助力兼容返回值 // ret=1012 has complete 已完成
This commit is contained in:
@@ -568,11 +568,12 @@ function helpShareCode(smp, active, joinnum) {
|
|||||||
const {ret, retmsg = ''} = JSON.parse(res);
|
const {ret, retmsg = ''} = JSON.parse(res);
|
||||||
$.log(`助力结果:ret=${ret} retmsg="${retmsg ? retmsg : 'OK'}"`);
|
$.log(`助力结果:ret=${ret} retmsg="${retmsg ? retmsg : 'OK'}"`);
|
||||||
// ret=0 助力成功
|
// ret=0 助力成功
|
||||||
// ret=1021 cannot help self 不能助力自己
|
|
||||||
// ret=1011 active 不同
|
// ret=1011 active 不同
|
||||||
|
// ret=1012 has complete 已完成
|
||||||
// ret=1009 retmsg="today has help p2p" 今天已助力过
|
// ret=1009 retmsg="today has help p2p" 今天已助力过
|
||||||
|
// ret=1021 cannot help self 不能助力自己
|
||||||
// ret=1032 retmsg="err operate env" 被助力者为 APP 专属种子,当前助力账号未配置 TOKEN
|
// ret=1032 retmsg="err operate env" 被助力者为 APP 专属种子,当前助力账号未配置 TOKEN
|
||||||
if (ret === 0 || ret === 1009 || ret === 1011 || ret === 1021 || ret === 1032) {
|
if (ret === 0 || ret === 1009 || ret === 1011 || ret === 1012 || ret === 1021 || ret === 1032) {
|
||||||
resolve(true);
|
resolve(true);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
15
jd_nian.js
15
jd_nian.js
@@ -161,6 +161,7 @@ async function doTask() {
|
|||||||
if (task.status === 1) {
|
if (task.status === 1) {
|
||||||
await collectScore(item.taskId, task.itemId);
|
await collectScore(item.taskId, task.itemId);
|
||||||
}
|
}
|
||||||
|
await $.wait(3000)
|
||||||
}
|
}
|
||||||
} else if (item.status === 2) {
|
} else if (item.status === 2) {
|
||||||
console.log(`${item.taskName}已做完`)
|
console.log(`${item.taskName}已做完`)
|
||||||
@@ -174,6 +175,7 @@ async function doTask() {
|
|||||||
if (task.status === 1) {
|
if (task.status === 1) {
|
||||||
await collectScore(item.taskId, task.itemId, 1);
|
await collectScore(item.taskId, task.itemId, 1);
|
||||||
}
|
}
|
||||||
|
await $.wait(3000)
|
||||||
}
|
}
|
||||||
} else if(item.status===2){
|
} else if(item.status===2){
|
||||||
console.log(`${item.taskName}已做完`)
|
console.log(`${item.taskName}已做完`)
|
||||||
@@ -190,6 +192,13 @@ async function doTask() {
|
|||||||
} else if(item.status===2){
|
} else if(item.status===2){
|
||||||
console.log(`${item.taskName}已做完`)
|
console.log(`${item.taskName}已做完`)
|
||||||
}
|
}
|
||||||
|
}else if (item.taskType === 13) {
|
||||||
|
if (item.status === 1) {
|
||||||
|
console.log(`准备做此任务:${item.taskName}`)
|
||||||
|
await collectScore(item.taskId, "1");
|
||||||
|
} else if(item.status===2){
|
||||||
|
console.log(`${item.taskName}已做完`)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -259,7 +268,7 @@ function getHomeData(info=false) {
|
|||||||
$.secretp = null
|
$.secretp = null
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
console.log(`当前爆竹${$.userInfo.raiseInfo.remainScore}🧨,下一关需要${$.userInfo.raiseInfo.nextLevelScore}🧨`)
|
console.log(`当前爆竹${$.userInfo.raiseInfo.remainScore}🧨,下一关需要${$.userInfo.raiseInfo.nextLevelScore-$.userInfo.raiseInfo.curLevelStartScore}🧨`)
|
||||||
|
|
||||||
if(info) {
|
if(info) {
|
||||||
message += `当前爆竹${$.userInfo.raiseInfo.remainScore}🧨\n`
|
message += `当前爆竹${$.userInfo.raiseInfo.remainScore}🧨\n`
|
||||||
@@ -269,8 +278,8 @@ function getHomeData(info=false) {
|
|||||||
console.log(`可收取的爆竹大于0,去收取爆竹`)
|
console.log(`可收取的爆竹大于0,去收取爆竹`)
|
||||||
await collectProduceScore()
|
await collectProduceScore()
|
||||||
}
|
}
|
||||||
if(parseInt($.userInfo.raiseInfo.remainScore) >= parseInt($.userInfo.raiseInfo.curLevelStartScore)){
|
if(parseInt($.userInfo.raiseInfo.remainScore) >= parseInt($.userInfo.raiseInfo.nextLevelScore-$.userInfo.raiseInfo.curLevelStartScore)){
|
||||||
console.log(`去升级`)
|
console.log(`当前爆竹🧨大于升级所需爆竹🧨,去升级`)
|
||||||
await $.wait(2000)
|
await $.wait(2000)
|
||||||
await raise()
|
await raise()
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user