From 93f6430869528cf5f087143c2b8aaeb5cc93d54b Mon Sep 17 00:00:00 2001 From: lxk0301 <778732665@qq.com> Date: Tue, 1 Dec 2020 17:32:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=AC=E5=96=9C=E5=B7=A5=E5=8E=82=E6=89=8B?= =?UTF-8?q?=E6=9C=BA=E4=B8=8A=E9=9D=A2=E8=BF=90=E8=A1=8C=E6=AF=8F=E5=A4=A9?= =?UTF-8?q?=E5=9C=A822=E7=82=B9=E8=BF=90=E8=A1=8C=E7=9A=84=E6=97=B6?= =?UTF-8?q?=E5=80=99=E9=80=9A=E7=9F=A5=EF=BC=8C=E6=9A=82=E6=97=B6=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=E5=81=B7=E5=A5=BD=E5=8F=8B=E7=94=B5=E5=8A=9B=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jdDreamFactoryShareCodes.js | 2 +- jd_dreamFactory.js | 24 +++++++++++++++--------- jd_jdfactory.js | 8 +++++--- 3 files changed, 21 insertions(+), 13 deletions(-) diff --git a/jdDreamFactoryShareCodes.js b/jdDreamFactoryShareCodes.js index b17202a2..5f591dc8 100644 --- a/jdDreamFactoryShareCodes.js +++ b/jdDreamFactoryShareCodes.js @@ -9,7 +9,7 @@ // 如: 京东账号1的shareCode1@京东账号1的shareCode2&京东账号2的shareCode1@京东账号2的shareCode2 let shareCodes = [ 'V5LkjP4WRyjeCKR9VRwcRX0bBuTz7MEK0-E99EJ7u0k=@Bo-jnVs_m9uBvbRzraXcSA==',//账号一的好友shareCode,不同好友中间用@符号隔开 - 'V5LkjP4WRyjeCKR9VRwcRX0bBuTz7MEK0-E99EJ7u0k=@Bo-jnVs_m9uBvbRzraXcSA==',//账号二的好友shareCode，不同好友中间用@符号隔开 + '1uzRU5HkaUgvy0AB5Q9VUg==@PDPM257r_KuQhil2Y7koNw==',//账号二的好友shareCode，不同好友中间用@符号隔开 ] // 判断github action里面是否有东东萌宠互助码 if (process.env.DREAM_FACTORY_SHARE_CODES) { diff --git a/jd_dreamFactory.js b/jd_dreamFactory.js index 8e7f6471..1ba423df 100644 --- a/jd_dreamFactory.js +++ b/jd_dreamFactory.js @@ -32,7 +32,7 @@ const notify = $.isNode() ? require('./sendNotify') : ''; let jdNotify = true;//是否关闭通知，false打开通知推送，true关闭通知推送 const randomCount = $.isNode() ? 20 : 5; let cookiesArr = [], cookie = '', message = ''; -const inviteCodes = ['PDPM257r_KuQhil2Y7koNw==', "gB99tYLjvPcEFloDgamoBw=="]; +const inviteCodes = ['V5LkjP4WRyjeCKR9VRwcRX0bBuTz7MEK0-E99EJ7u0k=', 'PDPM257r_KuQhil2Y7koNw==', "gB99tYLjvPcEFloDgamoBw=="]; const jdCookieNode = $.isNode() ? require('./jdCookie.js') : ''; if ($.isNode()) { Object.keys(jdCookieNode).forEach((item) => { @@ -86,7 +86,7 @@ if ($.isNode()) { async function jdDreamFactory() { await userInfo(); - await JoinTuan(); + // await JoinTuan();参团功能暂时无效， await helpFriends(); if (!$.unActive) return await getUserElectricity(); @@ -487,7 +487,7 @@ function userInfo() { console.log(`生产进度：${((production.investedElectric / production.needElectric) * 100).toFixed(2)}%`); message += `【京东账号${$.index}】${$.nickName}\n` message += `【生产商品】${$.productName}\n`; - message += `【当前等级】${data.user.currentLevel}\n`; + message += `【当前等级】${data.user.userIdentity} ${data.user.currentLevel}\n`; message += `【生产进度】${((production.investedElectric / production.needElectric) * 100).toFixed(2)}%\n`; if (production.investedElectric >= production.needElectric) { $.msg($.name, ``, `【京东账号${$.index}】${$.nickName}\n【生产商品】${$.productName}\n已生产完,请速去兑换`, {'open-url': 'openjd://virtual?params=%7B%20%22category%22:%20%22jump%22,%20%22des%22:%20%22m%22,%20%22url%22:%20%22https://wqsd.jd.com/pingou/dream_factory/index.html%22%20%7D'}) @@ -593,7 +593,7 @@ function PickUpComponent(index, encryptPin, help) { if (data['ret'] === 0) { data = data['data']; if (help) { - console.log(`收取好友零件成功:获得${data['increaseElectric']}电力\n`); + console.log(`收取好友[${encryptPin}]零件成功:获得${data['increaseElectric']}电力\n`); $.pickFriendEle += data['increaseElectric']; } else { console.log(`收取自家零件成功:获得${data['increaseElectric']}电力\n`); @@ -601,7 +601,7 @@ function PickUpComponent(index, encryptPin, help) { } } else { if (help) { - console.log(`收好友零件失败：${JSON.stringify(data)}`) + console.log(`收好友[${encryptPin}]零件失败：${JSON.stringify(data)}`) } else { console.log(`收零件失败：${JSON.stringify(data)}`) } @@ -630,10 +630,13 @@ function stealFriend() { if (data['ret'] === 0) { data = data['data']; for (let i = 0; i < data.list.length; i++) { - let pin = data.list[i]['encryptPin']; - await getFactoryIdByPin(pin); - if ($.stealFactoryId) await collectElectricity($.stealFactoryId,true, data.list[i]['key']); - await PickUp(pin, true) + let pin = data.list[i]['encryptPin'];//好友的encryptPin + if (pin === 'V5LkjP4WRyjeCKR9VRwcRX0bBuTz7MEK0-E99EJ7u0k=' || pin === 'Bo-jnVs_m9uBvbRzraXcSA==') { + continue + } + await PickUp(pin, true); + // await getFactoryIdByPin(pin);//获取好友工厂ID + // if ($.stealFactoryId) await collectElectricity($.stealFactoryId,true, pin); } } else { console.log(`异常：${JSON.stringify(data)}`) @@ -771,6 +774,9 @@ async function showMsg() { if ($.isNode()) { await notify.sendNotify(`${$.name} - 账号${$.index} - ${$.nickName}`, `${message}\n【收取零件】获得${$.pickEle}电力`); } + } else if (new Date().getHours() === 22) { + $.msg($.name, '', `${message}【收取自己零件】获得${$.pickEle}电力\n【收取好友零件】获得${$.pickFriendEle}电力`) + $.log(`\n${message}【收取自己零件】获得${$.pickEle}电力\n【收取好友零件】获得${$.pickFriendEle}电力`); } else { $.log(`\n${message}【收取自己零件】获得${$.pickEle}电力\n【收取好友零件】获得${$.pickFriendEle}电力`); } diff --git a/jd_jdfactory.js b/jd_jdfactory.js index 1405a28c..e13a136e 100644 --- a/jd_jdfactory.js +++ b/jd_jdfactory.js @@ -203,7 +203,7 @@ async function algorithm() { $.msg($.name, '', `京东账号${$.index}${$.nickName}\n当前总电量为：${$.batteryValue * 1}\n当前总电量为：${$.batteryValue * 1}\n【满足】兑换${$.canMakeList[0].name}所需总电量：${$.canMakeList[0].totalScore}\n请点击弹窗直达活动页面\n选择此心仪商品并手动投入电量兑换`, {'open-url': '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/2uSsV2wHEkySvompfjB43nuKkcHp/index.html%22%20%7D'}); await notify.sendNotify(`${$.name} - 账号${$.index} - ${$.nickName}`, `当前总电量为：${$.batteryValue * 1}\n【满足】兑换${$.canMakeList[0].name}所需总电量：${$.canMakeList[0].totalScore}\n请速去活动页面查看`); } else { - console.log(`\n目前电量${$.batteryValue * 1},不满足兑换\n`) + console.log(`\n目前电量${$.batteryValue * 1},不满足兑换 ${$.canMakeList[0].name}所需的 ${$.canMakeList[0].fullScore}电量\n`) } } } @@ -511,10 +511,12 @@ function jdfactory_getProductList(flag = false) { if (data.data.bizCode === 0) { $.canMakeList = data.data.result.canMakeList;//当前可选商品列表 sellOut:1为已抢光，0为目前可选择 $.canMakeList.sort(sortCouponCount); + console.log(`商品名称 可选状态 剩余量`) + for (let item of $.canMakeList) { + console.log(`${item.name.slice(-4)} ${item.sellOut === 1 ? '已抢光':'可 选'} ${item.couponCount}`); + } if (!flag) { - console.log(`商品名称 可选状态 剩余量`) for (let item of $.canMakeList) { - console.log(`${item.name.slice(-4)} ${item.sellOut === 1 ? '已抢光':'可选'} ${item.couponCount}`); if (item.name.indexOf(wantProduct) > -1 && item.couponCount > 0 && item.sellOut === 0) { await jdfactory_makeProduct(item.skuId); break