From 81959a0d8afa066c8a0c9ec6bd015a685727e1d5 Mon Sep 17 00:00:00 2001
From: lxk0301 <778732665@qq.com>
Date: Sun, 6 Dec 2020 14:03:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=AC=E5=96=9C=E5=B7=A5=E5=8E=82=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E6=8B=BE=E5=8F=96=E5=9C=B0=E4=B8=8B=E9=9B=B6=E4=BB=B6?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=8C=E8=BE=BE=E5=88=B0=E4=B8=8A=E9=99=90?=
 =?UTF-8?q?=E5=90=8E=E4=B8=8D=E5=86=8D=E7=BB=A7=E7=BB=AD=EF=BC=8C=E8=8A=82?=
 =?UTF-8?q?=E7=9C=81=E8=84=9A=E6=9C=AC=E8=BF=90=E8=A1=8C=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jd_dreamFactory.js   | 19 ++++++++++++++-----
 jd_lotteryMachine.js |  2 +-
 jd_rankingList.js    |  2 +-
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/jd_dreamFactory.js b/jd_dreamFactory.js
index 8047f6bc..e2e1eb50 100644
--- a/jd_dreamFactory.js
+++ b/jd_dreamFactory.js
@@ -629,6 +629,7 @@ function DrawProductionStagePrize() {
   })
 }
 async function PickUp(encryptPin = $.encryptPin, help = false) {
+  $.pickUpMyselfComponent = true;
   const GetUserComponentRes = await GetUserComponent(encryptPin);
   if (GetUserComponentRes && GetUserComponentRes['ret'] === 0) {
     const { componentList } = GetUserComponentRes['data'];
@@ -638,6 +639,7 @@ async function PickUp(encryptPin = $.encryptPin, help = false) {
       } else {
         $.log(`自家地下暂无零件可收`)
       }
+      $.pickUpMyselfComponent = false;
     }
     for (let item of componentList) {
       await $.wait(1000);
@@ -656,7 +658,8 @@ async function PickUp(encryptPin = $.encryptPin, help = false) {
           if (help) {
             console.log(`收好友[${encryptPin}]零件失败：${PickUpComponentRes.msg},直接跳出`)
           } else {
-            console.log(`收自己地下零件失败：${PickUpComponentRes.msg},直接跳出`)
+            console.log(`收自己地下零件失败：${PickUpComponentRes.msg},直接跳出`);
+            $.pickUpMyselfComponent = false;
           }
           break
         }
@@ -729,6 +732,10 @@ function PickUpComponent(index, encryptPin) {
 }
 //偷好友的电力
 async function stealFriend() {
+  if (!$.pickUpMyselfComponent) {
+    $.log(`今日收取零件已达上限，偷好友零件也达到上限，故跳出`)
+    return
+  }
   await getFriendList();
   $.friendList = [...new Set($.friendList)];
   for (let i = 0; i < $.friendList.length; i++) {
@@ -1159,6 +1166,8 @@ function updateTuanIdsCDN(url = 'https://raw.fastgit.org/lxk0301/updateTeam/mast
 }
 async function showMsg() {
   return new Promise(async resolve => {
+    message += `【收取自己零件】${$.pickUpMyselfComponent ? `获得${$.pickEle}电力` : `今日已达上限`}\n`;
+    message += `【收取好友零件】${$.pickUpMyselfComponent ? `获得${$.pickFriendEle}电力` : `今日已达上限`}\n`;
     let ctrTemp;
     if ($.isNode() && process.env.DREAMFACTORY_NOTIFY_CONTROL) {
       ctrTemp = `${process.env.DREAMFACTORY_NOTIFY_CONTROL}` === 'false';
@@ -1170,13 +1179,13 @@ async function showMsg() {
     if (ctrTemp) {
       $.msg($.name, '', message);
       if ($.isNode()) {
-        await notify.sendNotify(`${$.name} - 账号${$.index} - ${$.nickName}`, `${message}\n【收取零件】获得${$.pickEle}电力`);
+        await notify.sendNotify(`${$.name} - 账号${$.index} - ${$.nickName}`, `${message}`);
       }
     } else if (new Date().getHours() === 22) {
-      $.msg($.name, '', `${message}【收取自己零件】获得${$.pickEle}电力\n【收取${$.friendList.length}好友零件】获得${$.pickFriendEle}电力`)
-      $.log(`\n${message}【收取自己零件】获得${$.pickEle}电力\n【收取${$.friendList.length}好友零件】获得${$.pickFriendEle}电力`);
+      $.msg($.name, '', `${message}`)
+      $.log(`\n${message}`);
     } else {
-      $.log(`\n${message}【收取自己零件】获得${$.pickEle}电力\n【收取${$.friendList.length}好友零件】获得${$.pickFriendEle}电力`);
+      $.log(`\n${message}`);
     }
     resolve()
   })
diff --git a/jd_lotteryMachine.js b/jd_lotteryMachine.js
index 452a1d67..3b15d131 100644
--- a/jd_lotteryMachine.js
+++ b/jd_lotteryMachine.js
@@ -47,7 +47,7 @@ function updateShareCodes(url = 'https://raw.githubusercontent.com/yangtingxiao/
     })
   })
 }
-function updateShareCodesCDN(url = 'https://cdn.jsdelivr.net/gh/yangtingxiao/QuantumultX@master/scripts/jd/jd_lotteryMachine.js') {
+function updateShareCodesCDN(url = 'https://raw.fastgit.org/yangtingxiao/QuantumultX/master/scripts/jd/jd_lotteryMachine.js') {
   return new Promise(resolve => {
     $.get({url}, async (err, resp, data) => {
       try {
diff --git a/jd_rankingList.js b/jd_rankingList.js
index 71bf00c7..24f2ce8f 100644
--- a/jd_rankingList.js
+++ b/jd_rankingList.js
@@ -48,7 +48,7 @@ function updateShareCodes(url = 'https://raw.githubusercontent.com/yangtingxiao/
     })
   })
 }
-function scriptsCDN(url = 'https://cdn.jsdelivr.net/gh/yangtingxiao/QuantumultX@master/scripts/jd/jd_rankingList.js') {
+function scriptsCDN(url = 'https://raw.fastgit.org/yangtingxiao/QuantumultX/master/scripts/jd/jd_rankingList.js') {
   return new Promise(resolve => {
     $.get({url}, async (err, resp, data) => {
       try {