diff --git a/jdPlantBeanShareCodes.js b/jdPlantBeanShareCodes.js index 356cc89f..3894909b 100644 --- a/jdPlantBeanShareCodes.js +++ b/jdPlantBeanShareCodes.js @@ -8,7 +8,7 @@ // 同一个京东账号的好友互助码用@符号隔开,不同京东账号之间用&符号或者换行隔开,下面给一个示例 // 如: 京东账号1的shareCode1@京东账号1的shareCode2&京东账号2的shareCode1@京东账号2的shareCode2 let PlantBeanShareCodes = [ - '66j4yt3ebl5ierjljoszp7e4izzbzaqhi5k2unz2afwlyqsgnasq@olmijoxgmjutyrsovl2xalt2tbtfmg6sqldcb3q@e7lhibzb3zek27amgsvywffxx7hxgtzstrk2lba',//账号一的好友shareCode,不同好友中间用@符号隔开 + '66j4yt3ebl5ierjljoszp7e4izzbzaqhi5k2unz2afwlyqsgnasq@olmijoxgmjutyrsovl2xalt2tbtfmg6sqldcb3q@e7lhibzb3zek27amgsvywffxx7hxgtzstrk2lba@olmijoxgmjutyx55upqaqxrblt7f3h26dgj2riy',//账号一的好友shareCode,不同好友中间用@符号隔开 '4npkonnsy7xi3p6pjfxg6ct5gll42gmvnz7zgoy@6dygkptofggtp6ffhbowku3xgu@mlrdw3aw26j3wgzjipsxgonaoyr2evrdsifsziy@mlrdw3aw26j3wgzjipsxgonaoyr2evrdsifsziy',//账号二的好友shareCode,不同好友中间用@符号隔开 ] // 判断github action里面是否有东东萌宠互助码 diff --git a/jd_moneyTree.js b/jd_moneyTree.js index 0cac2758..843d25a1 100644 --- a/jd_moneyTree.js +++ b/jd_moneyTree.js @@ -1,6 +1,6 @@ /* 京东摇钱树 :https://raw.githubusercontent.com/lxk0301/jd_scripts/master/jd_moneyTree.js -更新时间:2020-11-07 +更新时间:2020-11-16 京东摇钱树支持京东双账号 注:如果使用Node.js, 需自行安装'crypto-js,got,http-server,tough-cookie'模块. 例: npm install crypto-js http-server tough-cookie got --save */ @@ -30,7 +30,6 @@ if ($.isNode()) { cookiesArr.push($.getdata('CookieJD2')); } -const Notice = $.getdata('jdMoneyTreeNoticeTimes') * 1 || 2;//设置运行多少次才通知。默认运行两次脚本通知,其他设置请在BoxJs进行设置 let jdNotify = true;//是否开启静默运行,默认true开启 const JD_API_HOST = 'https://ms.jr.jd.com/gw/generic/uc/h5/m'; let userInfo = null, taskInfo = [], message = '', subTitle = '', fruitTotal = 0; @@ -80,16 +79,10 @@ async function jd_moneyTree() { await stealFriendFruit() await msgControl(); - console.log(`运行脚本次数和设置的次数是否相等::${($.getdata($.treeMsgTime) * 1) === Notice}`); - jdNotify = $.getdata('jdMoneyTreeNotify') ? $.getdata('jdMoneyTreeNotify') : jdNotify; - console.log(`box订阅静默运行-是否打开::${jdNotify || jdNotify === 'true'}`); - console.log(`是否弹窗通知::${(($.getdata($.treeMsgTime) * 1) === Notice) && (!jdNotify || jdNotify === 'false')}`); $.log(`\n${message}\n`); if (!jdNotify || jdNotify === 'false') { - if (($.getdata($.treeMsgTime) * 1) === Notice) { - $.msg($.name, subTitle, message); - $.setdata('0', $.treeMsgTime); - } + $.msg($.name, subTitle, message); + $.setdata('0', $.treeMsgTime); } } function user_info() { @@ -121,13 +114,6 @@ function user_info() { if (userInfo.realName) { // console.log(`助力码sharePin为::${userInfo.sharePin}`); $.treeMsgTime = userInfo.sharePin; - if ($.getdata($.treeMsgTime)) { - if ($.getdata($.treeMsgTime) >= Notice) { - $.setdata('0', $.treeMsgTime); - } - } else { - $.setdata('0', $.treeMsgTime); - } subTitle = `【${userInfo.nick}】${userInfo.treeInfo.treeName}`; // message += `【我的金果数量】${userInfo.treeInfo.fruit}\n`; // message += `【我的金币数量】${userInfo.treeInfo.coin}\n`; diff --git a/jd_plantBean.js b/jd_plantBean.js index 917bbb20..b69b8937 100644 --- a/jd_plantBean.js +++ b/jd_plantBean.js @@ -36,7 +36,7 @@ let shareCodes = [ // IOS本地脚本用户这个列表填入你要助力的好 //账号一的好友shareCode,不同好友的shareCode中间用@符号隔开 '66j4yt3ebl5ierjljoszp7e4izzbzaqhi5k2unz2afwlyqsgnasq@olmijoxgmjutyrsovl2xalt2tbtfmg6sqldcb3q@e7lhibzb3zek27amgsvywffxx7hxgtzstrk2lba@e7lhibzb3zek32e72n4xesxmgc2m76eju62zk3y', //账号二的好友shareCode,不同好友的shareCode中间用@符号隔开 - '4npkonnsy7xi3p6pjfxg6ct5gll42gmvnz7zgoy@6dygkptofggtp6ffhbowku3xgu@mlrdw3aw26j3wgzjipsxgonaoyr2evrdsifsziy', + 'olmijoxgmjutyx55upqaqxrblt7f3h26dgj2riy@4npkonnsy7xi3p6pjfxg6ct5gll42gmvnz7zgoy@6dygkptofggtp6ffhbowku3xgu@mlrdw3aw26j3wgzjipsxgonaoyr2evrdsifsziy', ] let currentRoundId = null;//本期活动id let lastRoundId = null;//上期id diff --git a/lxk0301.boxjs.json b/lxk0301.boxjs.json index a1ae6c06..e3095126 100644 --- a/lxk0301.boxjs.json +++ b/lxk0301.boxjs.json @@ -540,13 +540,6 @@ "val": true, "type": "boolean", "desc": "运行京东摇钱树脚本时不发出系统弹窗通知" - }, - { - "id": "jdMoneyTreeNoticeTimes", - "name": "通知频率", - "val": 2, - "type": "number", - "desc": "脚本运行多少次后弹窗通知(默认2次,如果开启静默运行,此设置失效)" } ], "author": "@lxk0301",