biaoge
/
yydspure
mirror of https://github.biaoge.workers.dev/https://github.com/okyyds/yydspure.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

yyds

yyds 2022-02-27 00:37:48 +08:00
parent 7eec94376c
commit de59620530
1 changed files with 289 additions and 161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

178
jd_fruit.js
View File

@ -24,7 +24,7 @@ cron "5 6-18/6 * * *" script-path=https://gitee.com/lxk0301/jd_scripts/raw/maste
jd免费水果 搬的https://github.com/liuxiaoyucc/jd-helper/blob/a6f275d9785748014fc6cca821e58427162e9336/fruit/fruit.js jd免费水果 搬的https://github.com/liuxiaoyucc/jd-helper/blob/a6f275d9785748014fc6cca821e58427162e9336/fruit/fruit.js
*/ */
const $ = new Env('东东农场_内部互助'); const $ = new Env('东东农场互助版');
let cookiesArr = [], cookie = '', isBox = false, notify,allMessage = ''; let cookiesArr = [], cookie = '', isBox = false, notify,allMessage = '';
//助力好友分享码(最多3个,否则后面的助力失败),原因:京东农场每人每天只有3次助力机会 //助力好友分享码(最多3个,否则后面的助力失败),原因:京东农场每人每天只有3次助力机会
//此此内容是IOS用户下载脚本到本地使用，填写互助码的地方，同一京东账号的好友互助码请使用@符号隔开。 //此此内容是IOS用户下载脚本到本地使用，填写互助码的地方，同一京东账号的好友互助码请使用@符号隔开。
@ -37,7 +37,47 @@ let jdNotify = false;//是否关闭通知，false打开通知推送，true关闭
let jdFruitBeanCard = false;//农场使用水滴换豆卡(如果出现限时活动时100g水换20豆,此时比浇水划算,推荐换豆),true表示换豆(不浇水),false表示不换豆(继续浇水),脚本默认是浇水 let jdFruitBeanCard = false;//农场使用水滴换豆卡(如果出现限时活动时100g水换20豆,此时比浇水划算,推荐换豆),true表示换豆(不浇水),false表示不换豆(继续浇水),脚本默认是浇水
const JD_API_HOST = 'https://api.m.jd.com/client.action'; const JD_API_HOST = 'https://api.m.jd.com/client.action';
const urlSchema = `openjd://virtual?params=%7B%20%22category%22:%20%22jump%22,%20%22des%22:%20%22m%22,%20%22url%22:%20%22https://h5.m.jd.com/babelDiy/Zeus/3KSjXqQabiTuD1cJ28QskrpWoBKT/index.html%22%20%7D`; const urlSchema = `openjd://virtual?params=%7B%20%22category%22:%20%22jump%22,%20%22des%22:%20%22m%22,%20%22url%22:%20%22https://h5.m.jd.com/babelDiy/Zeus/3KSjXqQabiTuD1cJ28QskrpWoBKT/index.html%22%20%7D`;
let NowHour = new Date().getHours();
let llhelp=true;
if ($.isNode() && process.env.CC_NOHELPAFTER8) {
if (process.env.CC_NOHELPAFTER8=="true"){
if (NowHour>8){
llhelp=false;
console.log(`现在是9点后时段，不启用互助....`);
}
}
}
const fs = require('fs');
let boolneedUpdate=false;
let strShare = './Fruit_ShareCache.json';
let Fileexists = fs.existsSync(strShare);
let TempShareCache = [];
if (Fileexists) {
console.log("检测到东东农场缓存文件Fruit_ShareCache.json，载入...");
TempShareCache = fs.readFileSync(strShare, 'utf-8');
if (TempShareCache) {
TempShareCache = TempShareCache.toString();
TempShareCache = JSON.parse(TempShareCache);
}
}
let WP_APP_TOKEN_ONE = "";
if ($.isNode()) {
if (process.env.WP_APP_TOKEN_ONE) {
WP_APP_TOKEN_ONE = process.env.WP_APP_TOKEN_ONE;
}
}
if (WP_APP_TOKEN_ONE) {
console.log(`检测到已配置Wxpusher的Token，启用一对一推送...`);
if (NowHour <9 || NowHour > 21) {
WP_APP_TOKEN_ONE = "";
console.log(`农场只在9点后和22点前启用一对一推送，故此次暂时取消一对一推送...`);
}
} else
console.log(`检测到未配置Wxpusher的Token，禁用一对一推送...`);
let lnrun=0;
let llgetshare=false;
!(async () => { !(async () => {
await requireConfig(); await requireConfig();
@ -45,17 +85,20 @@ const urlSchema = `openjd://virtual?params=%7B%20%22category%22:%20%22jump%22,%2
$.msg($.name, '【提示】请先获取京东账号一cookie\n直接使用NobyDa的京东签到获取', 'https://bean.m.jd.com/bean/signIndex.action', { "open-url": "https://bean.m.jd.com/bean/signIndex.action" }); $.msg($.name, '【提示】请先获取京东账号一cookie\n直接使用NobyDa的京东签到获取', 'https://bean.m.jd.com/bean/signIndex.action', { "open-url": "https://bean.m.jd.com/bean/signIndex.action" });
return; return;
} }
if (llhelp) {
console.log('开始收集您的互助码，用于账号内部互助，请稍等...'); console.log('开始收集您的互助码，用于账号内部互助，请稍等...');
for (let i = 0; i < cookiesArr.length; i++) { for (let i = 0; i < cookiesArr.length; i++) {
if (cookiesArr[i]) { if (cookiesArr[i]) {
cookie = cookiesArr[i]; cookie = cookiesArr[i];
$.UserName = decodeURIComponent(cookie.match(/pt_pin=([^; ]+)(?=;?)/) && cookie.match(/pt_pin=([^; ]+)(?=;?)/)[1]) $.UserName = decodeURIComponent(cookie.match(/pt_pin=([^; ]+)(?=;?)/) && cookie.match(/pt_pin=([^; ]+)(?=;?)/)[1]);
$.index = i + 1; $.index = i + 1;
$.isLogin = true; $.isLogin = true;
$.nickName = ''; $.nickName = '';
await TotalBean(); await TotalBean();
if (!$.isLogin) { if (!$.isLogin) {
$.msg($.name, `【提示】cookie已失效`, `京东账号${$.index} ${$.nickName || $.UserName}\n请重新登录获取\nhttps://bean.m.jd.com/bean/signIndex.action`, { "open-url": "https://bean.m.jd.com/bean/signIndex.action" }); $.msg($.name, `【提示】cookie已失效`, `京东账号${$.index} ${$.nickName || $.UserName}\n请重新登录获取\nhttps://bean.m.jd.com/bean/signIndex.action`, {
"open-url": "https://bean.m.jd.com/bean/signIndex.action"
});
if ($.isNode()) { if ($.isNode()) {
await notify.sendNotify(`${$.name}cookie已失效 - ${$.UserName}`, `京东账号${$.index} ${$.UserName}\n请重新登录获取cookie`); await notify.sendNotify(`${$.name}cookie已失效 - ${$.UserName}`, `京东账号${$.index} ${$.UserName}\n请重新登录获取cookie`);
@ -66,7 +109,29 @@ const urlSchema = `openjd://virtual?params=%7B%20%22category%22:%20%22jump%22,%2
subTitle = ''; subTitle = '';
option = {}; option = {};
$.retry = 0; $.retry = 0;
llgetshare=false;
await GetCollect(); await GetCollect();
if(llgetshare){
await $.wait(5000);
lnrun++;
}
if(lnrun==10){
console.log(`访问接口次数达到10次，休息一分钟.....`);
await $.wait(60*1000);
lnrun=0;
}
}
}
if (boolneedUpdate) {
var str = JSON.stringify(TempShareCache, null, 2);
fs.writeFile(strShare, str, function (err) {
if (err) {
console.log(err);
console.log("缓存文件Fruit_ShareCache.json更新失败!");
} else {
console.log("缓存文件Fruit_ShareCache.json更新成功!");
}
})
} }
} }
for (let i = 0; i < cookiesArr.length; i++) { for (let i = 0; i < cookiesArr.length; i++) {
@ -79,7 +144,9 @@ const urlSchema = `openjd://virtual?params=%7B%20%22category%22:%20%22jump%22,%2
await TotalBean(); await TotalBean();
console.log(`\n开始【京东账号${$.index}】${$.nickName || $.UserName}\n`); console.log(`\n开始【京东账号${$.index}】${$.nickName || $.UserName}\n`);
if (!$.isLogin) { if (!$.isLogin) {
$.msg($.name, `【提示】cookie已失效`, `京东账号${$.index} ${$.nickName || $.UserName}\n请重新登录获取\nhttps://bean.m.jd.com/bean/signIndex.action`, { "open-url": "https://bean.m.jd.com/bean/signIndex.action" }); $.msg($.name, `【提示】cookie已失效`, `京东账号${$.index} ${$.nickName || $.UserName}\n请重新登录获取\nhttps://bean.m.jd.com/bean/signIndex.action`, {
"open-url": "https://bean.m.jd.com/bean/signIndex.action"
});
if ($.isNode()) { if ($.isNode()) {
await notify.sendNotify(`${$.name}cookie已失效 - ${$.UserName}`, `京东账号${$.index} ${$.UserName}\n请重新登录获取cookie`); await notify.sendNotify(`${$.name}cookie已失效 - ${$.UserName}`, `京东账号${$.index} ${$.UserName}\n请重新登录获取cookie`);
@ -90,7 +157,14 @@ const urlSchema = `openjd://virtual?params=%7B%20%22category%22:%20%22jump%22,%2
subTitle = ''; subTitle = '';
option = {}; option = {};
$.retry = 0; $.retry = 0;
lnrun++;
await jdFruit(); await jdFruit();
if (lnrun == 5) {
console.log(`访问接口次数达到5次，休息一分钟.....`);
await $.wait(60 * 1000);
lnrun = 0;
}
} }
} }
if ($.isNode() && allMessage && $.ctrTemp) { if ($.isNode() && allMessage && $.ctrTemp) {
@ -118,6 +192,9 @@ async function jdFruit() {
if ($.isNode()) { if ($.isNode()) {
await notify.sendNotify(`${$.name} - 账号${$.index} - ${$.nickName || $.UserName}水果已可领取`, `【京东账号${$.index}】${$.nickName || $.UserName}\n【提醒⏰】${$.farmInfo.farmUserPro.name}已可领取\n请去京东APP或微信小程序查看`); await notify.sendNotify(`${$.name} - 账号${$.index} - ${$.nickName || $.UserName}水果已可领取`, `【京东账号${$.index}】${$.nickName || $.UserName}\n【提醒⏰】${$.farmInfo.farmUserPro.name}已可领取\n请去京东APP或微信小程序查看`);
} }
if ($.isNode() && WP_APP_TOKEN_ONE) {
await notify.sendNotifybyWxPucher($.name, `【提醒⏰】${$.farmInfo.farmUserPro.name}已可领取\n【领取步骤】京东->我的->东东农场兑换京东红包,可以用于京东app的任意商品.`, `${$.UserName}`);
}
return return
} else if ($.farmInfo.treeState === 1) { } else if ($.farmInfo.treeState === 1) {
console.log(`\n${$.farmInfo.farmUserPro.name}种植中...\n`) console.log(`\n${$.farmInfo.farmUserPro.name}种植中...\n`)
@ -267,16 +344,22 @@ async function predictionFruit() {
} }
//浇水十次 //浇水十次
async function doTenWater() { async function doTenWater() {
try {
jdFruitBeanCard = $.getdata('jdFruitBeanCard') ? $.getdata('jdFruitBeanCard') : jdFruitBeanCard; jdFruitBeanCard = $.getdata('jdFruitBeanCard') ? $.getdata('jdFruitBeanCard') : jdFruitBeanCard;
if ($.isNode() && process.env.FRUIT_BEAN_CARD) { if ($.isNode() && process.env.FRUIT_BEAN_CARD) {
jdFruitBeanCard = process.env.FRUIT_BEAN_CARD; jdFruitBeanCard = process.env.FRUIT_BEAN_CARD;
} }
await myCardInfoForFarm(); await myCardInfoForFarm();
const { fastCard, doubleCard, beanCard, signCard } = $.myCardInfoRes; const {
if (`${jdFruitBeanCard}` === 'true' && JSON.stringify($.myCardInfoRes).match(`限时翻倍`) && beanCard > 0) { fastCard,
doubleCard,
beanCard,
signCard
} = $.myCardInfoRes;
/* if (`${jdFruitBeanCard}` === 'true' && JSON.stringify($.myCardInfoRes).match(`限时翻倍`) && beanCard > 0) {
console.log(`您设置的是使用水滴换豆卡，且背包有水滴换豆卡${beanCard}张, 跳过10次浇水任务`) console.log(`您设置的是使用水滴换豆卡，且背包有水滴换豆卡${beanCard}张, 跳过10次浇水任务`)
return return
} } */
if ($.farmTask.totalWaterTaskInit.totalWaterTaskTimes < $.farmTask.totalWaterTaskInit.totalWaterTaskLimit) { if ($.farmTask.totalWaterTaskInit.totalWaterTaskTimes < $.farmTask.totalWaterTaskInit.totalWaterTaskLimit) {
console.log(`\n准备浇水十次`); console.log(`\n准备浇水十次`);
let waterCount = 0; let waterCount = 0;
@ -296,7 +379,7 @@ async function doTenWater() {
console.log(`水滴不够，结束浇水`) console.log(`水滴不够，结束浇水`)
break break
} }
await gotStageAward();//领取阶段性水滴奖励 await gotStageAward(); //领取阶段性水滴奖励
} }
} else { } else {
console.log('浇水出现失败异常,跳出不在继续浇水') console.log('浇水出现失败异常,跳出不在继续浇水')
@ -310,10 +393,17 @@ async function doTenWater() {
if ($.isNode()) { if ($.isNode()) {
await notify.sendNotify(`${$.name} - 账号${$.index} - ${$.nickName || $.UserName}水果已可领取`, `京东账号${$.index} ${$.nickName || $.UserName}\n${$.farmInfo.farmUserPro.name}已可领取`); await notify.sendNotify(`${$.name} - 账号${$.index} - ${$.nickName || $.UserName}水果已可领取`, `京东账号${$.index} ${$.nickName || $.UserName}\n${$.farmInfo.farmUserPro.name}已可领取`);
} }
if ($.isNode() && WP_APP_TOKEN_ONE) {
await notify.sendNotifybyWxPucher($.name, `【提醒⏰】${$.farmInfo.farmUserPro.name}已可领取\n【领取步骤】京东->我的->东东农场兑换京东红包,可以用于京东app的任意商品.`, `${$.UserName}`);
}
} }
} else { } else {
console.log('\n今日已完成10次浇水任务\n'); console.log('\n今日已完成10次浇水任务\n');
} }
} catch (e) {
console.log(`doTenWater 任务执行异常‼️‼️`);
$.logErr(e);
}
} }
//领取首次浇水奖励 //领取首次浇水奖励
async function getFirstWaterAward() { async function getFirstWaterAward() {
@ -383,18 +473,23 @@ async function doTenWaterAgain() {
} }
if (`${jdFruitBeanCard}` === 'true' && JSON.stringify($.myCardInfoRes).match('限时翻倍')) { if (`${jdFruitBeanCard}` === 'true' && JSON.stringify($.myCardInfoRes).match('限时翻倍')) {
console.log(`\n您设置的是水滴换豆功能,现在为您换豆`); console.log(`\n您设置的是水滴换豆功能,现在为您换豆`);
if (totalEnergy >= 100 && $.myCardInfoRes.beanCard > 0) {
for (let lncount = 0; lncount < $.myCardInfoRes.beanCard; lncount++) {
if (totalEnergy >= 150 && $.myCardInfoRes.beanCard > 0) {
//使用水滴换豆卡 //使用水滴换豆卡
await userMyCardForFarm('beanCard'); await userMyCardForFarm('beanCard');
console.log(`使用水滴换豆卡结果:${JSON.stringify($.userMyCardRes)}`); console.log(`使用水滴换豆卡结果:${JSON.stringify($.userMyCardRes)}`);
if ($.userMyCardRes.code === '0') { if ($.userMyCardRes.code === '0') {
totalEnergy=totalEnergy-100;
message += `【水滴换豆卡】获得${$.userMyCardRes.beanCount}个京豆\n`; message += `【水滴换豆卡】获得${$.userMyCardRes.beanCount}个京豆\n`;
return
} }
} else { } else {
console.log(`您目前水滴:${totalEnergy}g,水滴换豆卡${$.myCardInfoRes.beanCard}张,暂不满足水滴换豆的条件,为您继续浇水`) console.log(`您目前水滴:${totalEnergy}g,水滴换豆卡${$.myCardInfoRes.beanCard}张,暂不满足水滴换豆的条件,为您继续浇水`)
break;
} }
} }
return;
}
// if (totalEnergy > 100 && $.myCardInfoRes.fastCard > 0) { // if (totalEnergy > 100 && $.myCardInfoRes.fastCard > 0) {
// //使用快速浇水卡 // //使用快速浇水卡
// await userMyCardForFarm('fastCard'); // await userMyCardForFarm('fastCard');
@ -434,6 +529,9 @@ async function doTenWaterAgain() {
if ($.isNode()) { if ($.isNode()) {
await notify.sendNotify(`${$.name} - 账号${$.index} - ${$.nickName || $.UserName}水果已可领取`, `京东账号${$.index} ${$.nickName || $.UserName}\n${$.farmInfo.farmUserPro.name}已可领取`); await notify.sendNotify(`${$.name} - 账号${$.index} - ${$.nickName || $.UserName}水果已可领取`, `京东账号${$.index} ${$.nickName || $.UserName}\n${$.farmInfo.farmUserPro.name}已可领取`);
} }
if ($.isNode() && WP_APP_TOKEN_ONE) {
await notify.sendNotifybyWxPucher($.name, `【提醒⏰】${$.farmInfo.farmUserPro.name}已可领取\n【领取步骤】京东->我的->东东农场兑换京东红包,可以用于京东app的任意商品.`, `${$.UserName}`);
}
} }
} else if (overageEnergy >= 10) { } else if (overageEnergy >= 10) {
console.log("目前剩余水滴：【" + totalEnergy + "】g，可继续浇水"); console.log("目前剩余水滴：【" + totalEnergy + "】g，可继续浇水");
@ -462,6 +560,9 @@ async function doTenWaterAgain() {
if ($.isNode()) { if ($.isNode()) {
await notify.sendNotify(`${$.name} - 账号${$.index} - ${$.nickName || $.UserName}水果已可领取`, `京东账号${$.index} ${$.nickName || $.UserName}\n${$.farmInfo.farmUserPro.name}已可领取`); await notify.sendNotify(`${$.name} - 账号${$.index} - ${$.nickName || $.UserName}水果已可领取`, `京东账号${$.index} ${$.nickName || $.UserName}\n${$.farmInfo.farmUserPro.name}已可领取`);
} }
if ($.isNode() && WP_APP_TOKEN_ONE) {
await notify.sendNotifybyWxPucher($.name, `【提醒⏰】${$.farmInfo.farmUserPro.name}已可领取\n【领取步骤】京东->我的->东东农场兑换京东红包,可以用于京东app的任意商品.`, `${$.UserName}`);
}
} }
} else { } else {
console.log("目前剩余水滴：【" + totalEnergy + "】g,不再继续浇水,保留部分水滴用于完成第二天【十次浇水得水滴】任务") console.log("目前剩余水滴：【" + totalEnergy + "】g,不再继续浇水,保留部分水滴用于完成第二天【十次浇水得水滴】任务")
@ -673,12 +774,13 @@ async function getExtraAward() {
} }
//助力好友 //助力好友
async function masterHelpShare() { async function masterHelpShare() {
console.log('开始助力好友')
await initForFarm(); await initForFarm();
let salveHelpAddWater = 0; let salveHelpAddWater = 0;
let remainTimes = 3;//今日剩余助力次数,默认3次（京东农场每人每天3次助力机会）。 let remainTimes = 3;//今日剩余助力次数,默认3次（京东农场每人每天3次助力机会）。
let helpSuccessPeoples = '';//成功助力好友 let helpSuccessPeoples = '';//成功助力好友
if(llhelp){
console.log('开始助力好友')
for (let code of newShareCodes) { for (let code of newShareCodes) {
console.log(`${$.UserName}开始助力: ${code}`); console.log(`${$.UserName}开始助力: ${code}`);
if (!code) continue; if (!code) continue;
@ -717,6 +819,7 @@ async function masterHelpShare() {
console.log(`助力失败::${JSON.stringify($.helpResult)}`); console.log(`助力失败::${JSON.stringify($.helpResult)}`);
} }
} }
}
if ($.isLoon() || $.isQuanX() || $.isSurge()) { if ($.isLoon() || $.isQuanX() || $.isSurge()) {
let helpSuccessPeoplesKey = timeFormat() + $.farmInfo.farmUserPro.shareCode; let helpSuccessPeoplesKey = timeFormat() + $.farmInfo.farmUserPro.shareCode;
if (!$.getdata(helpSuccessPeoplesKey)) { if (!$.getdata(helpSuccessPeoplesKey)) {
@ -741,7 +844,6 @@ async function masterHelpShare() {
console.log(`【助力好友👬】获得${salveHelpAddWater}g💧\n`); console.log(`【助力好友👬】获得${salveHelpAddWater}g💧\n`);
} }
message += `【今日剩余助力👬】${remainTimes}次\n`; message += `【今日剩余助力👬】${remainTimes}次\n`;
console.log('助力好友结束，即将开始领取额外水滴奖励\n');
} }
//水滴雨 //水滴雨
async function executeWaterRains() { async function executeWaterRains() {
@ -753,7 +855,7 @@ async function executeWaterRains() {
if (Date.now() < ($.farmTask.waterRainInit.lastTime + 3 * 60 * 60 * 1000)) { if (Date.now() < ($.farmTask.waterRainInit.lastTime + 3 * 60 * 60 * 1000)) {
executeWaterRain = false; executeWaterRain = false;
// message += `【第${$.farmTask.waterRainInit.winTimes + 1}次水滴雨】未到时间，请${new Date($.farmTask.waterRainInit.lastTime + 3 * 60 * 60 * 1000).toLocaleTimeString()}再试\n`; // message += `【第${$.farmTask.waterRainInit.winTimes + 1}次水滴雨】未到时间，请${new Date($.farmTask.waterRainInit.lastTime + 3 * 60 * 60 * 1000).toLocaleTimeString()}再试\n`;
console.log(`\`【第${$.farmTask.waterRainInit.winTimes + 1}次水滴雨】未到时间，请${new Date($.farmTask.waterRainInit.lastTime + 3 * 60 * 60 * 1000).toLocaleTimeString()}再试\n`); console.log(`【第${$.farmTask.waterRainInit.winTimes + 1}次水滴雨】未到时间，请${new Date($.farmTask.waterRainInit.lastTime + 3 * 60 * 60 * 1000).toLocaleTimeString()}再试\n`);
} }
} }
if (executeWaterRain) { if (executeWaterRain) {
@ -997,13 +1099,39 @@ async function duck() {
} }
async function GetCollect() { async function GetCollect() {
try { try {
console.log(`\n【京东账号${$.index}（${$.UserName}）的${$.name}好友互助码】`);
var llfound = false;
var strShareCode = "";
if (TempShareCache) {
for (let j = 0; j < TempShareCache.length; j++) {
if (TempShareCache[j].pt_pin == $.UserName) {
llfound = true;
strShareCode = TempShareCache[j].ShareCode;
}
}
}
if (!llfound) {
console.log($.UserName + "该账号无缓存，尝试联网获取互助码.....");
llgetshare=true;
await initForFarm(); await initForFarm();
if ($.farmInfo.farmUserPro) { if ($.farmInfo.farmUserPro) {
console.log(`\n【京东账号${$.index}（${$.UserName}）的${$.name}好友互助码】${$.farmInfo.farmUserPro.shareCode}`); var tempAddCK = {};
newShareCodes.push($.farmInfo.farmUserPro.shareCode) strShareCode=$.farmInfo.farmUserPro.shareCode;
tempAddCK = {
"pt_pin": $.UserName,
"ShareCode": strShareCode
};
TempShareCache.push(tempAddCK);
//标识，需要更新缓存文件
boolneedUpdate = true;
}
}
if (strShareCode) {
console.log(`\n`+strShareCode);
newShareCodes.push(strShareCode)
} else { } else {
console.log(`\n【京东账号${$.index}（${$.UserName}）的${$.name}好友互助码】\n数据异常,使用ccwav的互助码:f910ae66879a422daeb32f9250fc5e2e`); console.log(`\n数据异常`);
newShareCodes.push("f910ae66879a422daeb32f9250fc5e2e");
} }
} catch (e) { } catch (e) {
$.logErr(e); $.logErr(e);
@ -1017,7 +1145,7 @@ async function getFullCollectionReward() {
$.post(taskUrl("getFullCollectionReward", body), (err, resp, data) => { $.post(taskUrl("getFullCollectionReward", body), (err, resp, data) => {
try { try {
if (err) { if (err) {
console.log('\n东东农场: API查询请求失败 ‼️‼️'); console.log('\ngetFullCollectionReward: API查询请求失败 ‼️‼️');
console.log(JSON.stringify(err)); console.log(JSON.stringify(err));
$.logErr(err); $.logErr(err);
} else { } else {
@ -1071,8 +1199,8 @@ async function gotStageAwardForFarm(type) {
} }
//浇水API //浇水API
async function waterGoodForFarm() { async function waterGoodForFarm() {
await $.wait(1000); await $.wait(2000);
console.log('等待了1秒'); console.log('等待了2秒');
const functionId = arguments.callee.name.toString(); const functionId = arguments.callee.name.toString();
$.waterResult = await request(functionId); $.waterResult = await request(functionId);
@ -1082,8 +1210,8 @@ async function initForTurntableFarm() {
$.initForTurntableFarmRes = await request(arguments.callee.name.toString(), { version: 4, channel: 1 }); $.initForTurntableFarmRes = await request(arguments.callee.name.toString(), { version: 4, channel: 1 });
} }
async function lotteryForTurntableFarm() { async function lotteryForTurntableFarm() {
await $.wait(2000); await $.wait(3000);
console.log('等待了2秒'); console.log('等待了3秒');
$.lotteryRes = await request(arguments.callee.name.toString(), { type: 1, version: 4, channel: 1 }); $.lotteryRes = await request(arguments.callee.name.toString(), { type: 1, version: 4, channel: 1 });
} }
@ -1267,7 +1395,7 @@ async function initForFarm() {
$.post(option, (err, resp, data) => { $.post(option, (err, resp, data) => {
try { try {
if (err) { if (err) {
console.log('\n东东农场: API查询请求失败 ‼️‼️'); console.log('\ninitForFarm: API查询请求失败 ‼️‼️');
console.log(JSON.stringify(err)); console.log(JSON.stringify(err));
$.logErr(err); $.logErr(err);
} else { } else {
@ -1402,7 +1530,7 @@ function request(function_id, body = {}, timeout = 1000) {
$.get(taskUrl(function_id, body), (err, resp, data) => { $.get(taskUrl(function_id, body), (err, resp, data) => {
try { try {
if (err) { if (err) {
console.log('\n东东农场: API查询请求失败 ‼️‼️') console.log('\nrequest: API查询请求失败 ‼️‼️')
console.log(JSON.stringify(err)); console.log(JSON.stringify(err));
console.log(`function_id:${function_id}`) console.log(`function_id:${function_id}`)
$.logErr(err); $.logErr(err);