From 4b19ec4c0947cb129f4009402149d1b0c2d2d239 Mon Sep 17 00:00:00 2001 From: Ezalor Date: Sat, 20 Nov 2021 15:37:57 +0800 Subject: [PATCH 1/2] Update jd_fruit.js --- jd_fruit.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jd_fruit.js b/jd_fruit.js index 1fae30d1..10dfcf56 100644 --- a/jd_fruit.js +++ b/jd_fruit.js @@ -463,7 +463,7 @@ async function doTenWaterAgain() { // } // 所有的浇水(10次浇水)任务，获取水滴任务完成后，如果剩余水滴大于等于60g,则继续浇水(保留部分水滴是用于完成第二天的浇水10次的任务) let overageEnergy = totalEnergy - retainWater; - if (totalEnergy >= ($.farmInfo.farmUserPro.treeTotalEnergy - $.farmInfo.farmUserPro.treeEnergy)) { + if (!($.isNode() ? (process.env.retainWater) : ($.getdata('retainWater'))) && totalEnergy >= ($.farmInfo.farmUserPro.treeTotalEnergy - $.farmInfo.farmUserPro.treeEnergy)) { //如果现有的水滴，大于水果可兑换所需的对滴(也就是把水滴浇完，水果就能兑换了) isFruitFinished = false; for (let i = 0; i < ($.farmInfo.farmUserPro.treeTotalEnergy - $.farmInfo.farmUserPro.treeEnergy) / 10; i++) { From 5f281d645797218f5d151e272acff2983cbeefa7 Mon Sep 17 00:00:00 2001 From: Ezalor Date: Sat, 20 Nov 2021 18:14:26 +0800 Subject: [PATCH 2/2] Update jd_fruit.js --- jd_fruit.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jd_fruit.js b/jd_fruit.js index 10dfcf56..ab657a7d 100644 --- a/jd_fruit.js +++ b/jd_fruit.js @@ -463,7 +463,7 @@ async function doTenWaterAgain() { // } // 所有的浇水(10次浇水)任务，获取水滴任务完成后，如果剩余水滴大于等于60g,则继续浇水(保留部分水滴是用于完成第二天的浇水10次的任务) let overageEnergy = totalEnergy - retainWater; - if (!($.isNode() ? (process.env.retainWater) : ($.getdata('retainWater'))) && totalEnergy >= ($.farmInfo.farmUserPro.treeTotalEnergy - $.farmInfo.farmUserPro.treeEnergy)) { + if (retainWater != 100 && totalEnergy >= ($.farmInfo.farmUserPro.treeTotalEnergy - $.farmInfo.farmUserPro.treeEnergy)) { //如果现有的水滴，大于水果可兑换所需的对滴(也就是把水滴浇完，水果就能兑换了) isFruitFinished = false; for (let i = 0; i < ($.farmInfo.farmUserPro.treeTotalEnergy - $.farmInfo.farmUserPro.treeEnergy) / 10; i++) {