From ae91b7c2c770355bf8cda5e567f37560ed393275 Mon Sep 17 00:00:00 2001
From: lxk0301 <778732665@qq.com>
Date: Fri, 27 Nov 2020 11:02:05 +0800
Subject: [PATCH] fix bug

---
 jd_dreamFactory.js | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/jd_dreamFactory.js b/jd_dreamFactory.js
index f1ff403d..b799618e 100644
--- a/jd_dreamFactory.js
+++ b/jd_dreamFactory.js
@@ -102,7 +102,7 @@ async function jdDreamFactory() {
 
 
 // 收取发电机的电力
-function collectElectricity(facId = factoryId, help = false, master = '') {
+function collectElectricity(facId = factoryId, help = false, master) {
   return new Promise(async resolve => {
     let url = `/dreamfactory/generator/CollectCurrentElectricity?zone=dream_factory&apptoken=&pgtimestamp=&phoneID=&factoryid=${facId}&doubleflag=1&sceneval=2&g_login_type=1`;
     if (help && master) {
@@ -489,18 +489,8 @@ function stealFriend() {
         data = data['data'];
         for (let i = 0; i < data.list.length; ++i) {
           let pin = data.list[i]['encryptPin'];
-          if (data.list[i]['collectFlag'] === 1) {
-            //只有collectFlag为1的时候,才能偷取好友电力
-            const facId = await getFactoryIdByPin(pin);
-            if (facId) await collectElectricity(facId,true, data.list[i]['key'])
-            // getFactoryIdByPin(pin).then(async (facId) => {
-            //   if (facId) await collectElectricity(facId,true)
-            // }).catch(err => {
-            //
-            // })
-          } else {
-            console.log(`此好友[${pin}]暂不能被你收取电力`)
-          }
+          const facId = await getFactoryIdByPin(pin);
+          if (facId) await collectElectricity(facId,true, data.list[i]['key'])
         }
       }
       resolve()