diff --git a/jd_cfd.js b/jd_cfd.js index dbd9cbf..3cb5567 100644 --- a/jd_cfd.js +++ b/jd_cfd.js @@ -184,7 +184,7 @@ async function cfd() { await $.wait(3000) for(let key of Object.keys($.info.buildInfo.buildList)) { let vo = $.info.buildInfo.buildList[key] - let body = `strBuildIndex=${vo.strBuildIndex}` + let body = `strBuildIndex=${vo.strBuildIndex}&dwType=1` await getBuildInfo(body, vo) await $.wait(3000) } @@ -832,6 +832,7 @@ async function getActTask(type = true) { for (let key of Object.keys(data.Data.TaskList)) { let vo = data.Data.TaskList[key] if ([0, 1, 2].includes(vo.dwOrderId) && (vo.dwCompleteNum !== vo.dwTargetNum) && vo.dwTargetNum < 10) { + if (vo.strTaskName === "升级1个建筑") continue console.log(`开始【🐮牛牛任务】${vo.strTaskName}`) for (let i = vo.dwCompleteNum; i < vo.dwTargetNum; i++) { console.log(`【🐮牛牛任务】${vo.strTaskName} 进度:${i + 1}/${vo.dwTargetNum}`) @@ -975,7 +976,7 @@ async function getBuildInfo(body, buildList, type = true) { console.log(`【${buildNmae}】升级需要${data.ddwNextLvlCostCoin}金币,保留升级需要的3倍${data.ddwNextLvlCostCoin * 3}金币,当前拥有${$.info.ddwCoinBalance}金币`) if(data.dwCanLvlUp > 0 && $.info.ddwCoinBalance >= (data.ddwNextLvlCostCoin * 3)) { console.log(`【${buildNmae}】满足升级条件,开始升级`) - const body = `ddwCostCoin=${data.ddwNextLvlCostCoin}&strBuildIndex=${data.strBuildIndex}` + const body = `strBuildIndex=${data.strBuildIndex}&ddwCostCoin=${data.ddwNextLvlCostCoin}` await $.wait(3000) let buildLvlUpRes = await buildLvlUp(body) if (buildLvlUpRes.iRet === 0) { @@ -1128,7 +1129,7 @@ function getAuthorShareCode(url) { // 获取用户信息 function getUserInfo(showInvite = true) { return new Promise(async (resolve) => { - $.get(taskUrl(`user/QueryUserInfo`, `ddwTaskId=&strShareId=&strMarkList=${encodeURIComponent('guider_step,collect_coin_auth,guider_medal,guider_over_flag,build_food_full,build_sea_full,build_shop_full,build_fun_full,medal_guider_show,guide_guider_show,guide_receive_vistor,daily_task,guider_daily_task')}&strPgUUNum=${token['farm_jstoken']}&strPgtimestamp=${token['timestamp']}&strPhoneID=${token['phoneid']}`), async (err, resp, data) => { + $.get(taskUrl(`user/QueryUserInfo`, `ddwTaskId=&strShareId=&strMarkList=${encodeURIComponent('guider_step,collect_coin_auth,guider_medal,guider_over_flag,build_food_full,build_sea_full,build_shop_full,build_fun_full,medal_guider_show,guide_guider_show,guide_receive_vistor,daily_task,guider_daily_task,cfd_has_show_selef_point,choose_goods_has_show,daily_task_win,new_user_task_win,guider_new_user_task,guider_daily_task_icon,guider_nn_task_icon,tool_layer,new_ask_friend_m')}&strPgtimestamp=${token['timestamp']}&strPhoneID=${token['phoneid']}&strPgUUNum=${token['farm_jstoken']}&strVersion=1.0.1&dwIsReJoin=1`), async (err, resp, data) => { try { if (err) { console.log(`${JSON.stringify(err)}`) diff --git a/jd_cfd_mooncake.js b/jd_cfd_mooncake.js index e725285..743384e 100644 --- a/jd_cfd_mooncake.js +++ b/jd_cfd_mooncake.js @@ -463,7 +463,7 @@ function getAuthorShareCode(url) { // 获取用户信息 function getUserInfo(showInvite = true) { return new Promise(async (resolve) => { - $.get(taskUrl(`user/QueryUserInfo`, `ddwTaskId=&strShareId=&strMarkList=${encodeURIComponent('guider_step,collect_coin_auth,guider_medal,guider_over_flag,build_food_full,build_sea_full,build_shop_full,build_fun_full,medal_guider_show,guide_guider_show,guide_receive_vistor,daily_task,guider_daily_task')}&strPgUUNum=${token['farm_jstoken']}&strPgtimestamp=${token['timestamp']}&strPhoneID=${token['phoneid']}`), async (err, resp, data) => { + $.get(taskUrl(`user/QueryUserInfo`, `ddwTaskId=&strShareId=&strMarkList=${encodeURIComponent('guider_step,collect_coin_auth,guider_medal,guider_over_flag,build_food_full,build_sea_full,build_shop_full,build_fun_full,medal_guider_show,guide_guider_show,guide_receive_vistor,daily_task,guider_daily_task,cfd_has_show_selef_point,choose_goods_has_show,daily_task_win,new_user_task_win,guider_new_user_task,guider_daily_task_icon,guider_nn_task_icon,tool_layer,new_ask_friend_m')}&strPgtimestamp=${token['timestamp']}&strPhoneID=${token['phoneid']}&strPgUUNum=${token['farm_jstoken']}&strVersion=1.0.1&dwIsReJoin=1`), async (err, resp, data) => { try { if (err) { console.log(`${JSON.stringify(err)}`) diff --git a/jd_cfd_mooncake_help.js b/jd_cfd_mooncake_help.js index 5c91f32..404f2f5 100644 --- a/jd_cfd_mooncake_help.js +++ b/jd_cfd_mooncake_help.js @@ -464,7 +464,7 @@ function getAuthorShareCode(url) { // 获取用户信息 function getUserInfo(showInvite = true) { return new Promise(async (resolve) => { - $.get(taskUrl(`user/QueryUserInfo`, `ddwTaskId=&strShareId=&strMarkList=${encodeURIComponent('guider_step,collect_coin_auth,guider_medal,guider_over_flag,build_food_full,build_sea_full,build_shop_full,build_fun_full,medal_guider_show,guide_guider_show,guide_receive_vistor,daily_task,guider_daily_task')}&strPgUUNum=${token['farm_jstoken']}&strPgtimestamp=${token['timestamp']}&strPhoneID=${token['phoneid']}`), async (err, resp, data) => { + $.get(taskUrl(`user/QueryUserInfo`, `ddwTaskId=&strShareId=&strMarkList=${encodeURIComponent('guider_step,collect_coin_auth,guider_medal,guider_over_flag,build_food_full,build_sea_full,build_shop_full,build_fun_full,medal_guider_show,guide_guider_show,guide_receive_vistor,daily_task,guider_daily_task,cfd_has_show_selef_point,choose_goods_has_show,daily_task_win,new_user_task_win,guider_new_user_task,guider_daily_task_icon,guider_nn_task_icon,tool_layer,new_ask_friend_m')}&strPgtimestamp=${token['timestamp']}&strPhoneID=${token['phoneid']}&strPgUUNum=${token['farm_jstoken']}&strVersion=1.0.1&dwIsReJoin=1`), async (err, resp, data) => { try { if (err) { //console.log(`${JSON.stringify(err)}`)