From bf201a3cae08879a94d639bab4e26b8aa242a41a Mon Sep 17 00:00:00 2001 From: 5117600049 <511760049@qq.com> Date: Sat, 17 May 2025 11:37:43 +0800 Subject: [PATCH] =?UTF-8?q?JS=E8=84=9A=E6=9C=AC=EF=BC=9A=E7=BB=99=E5=85=BD?= =?UTF-8?q?=E8=82=89=E5=A5=BD=E6=84=9F=E4=BA=8B=E4=BB=B6=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E4=BA=86=E4=B8=87=E5=8F=B6=E4=B8=93=E7=94=A8=E7=9A=84=E6=8B=BE?= =?UTF-8?q?=E5=8F=96=E6=A8=A1=E5=BC=8F=EF=BC=8C43min300=E4=B8=AA=20(#851)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update main.js * Update settings.json * Add files via upload * Add files via upload * Add files via upload --- .../assets/AutoPath/万叶版前往.json | 30 +++++++++++++++++++ .../assets/AutoPath/万叶版返回.json | 30 +++++++++++++++++++ .../assets/万叶拾取.json | 1 + .../main.js | 16 ++++++++-- .../settings.json | 10 +++++-- .../万叶刷肉专用策略.txt | 9 ++++++ 6 files changed, 91 insertions(+), 5 deletions(-) create mode 100644 repo/js/AutoFriendshipEvilBaresItsFangsGetRawMeat/assets/AutoPath/万叶版前往.json create mode 100644 repo/js/AutoFriendshipEvilBaresItsFangsGetRawMeat/assets/AutoPath/万叶版返回.json create mode 100644 repo/js/AutoFriendshipEvilBaresItsFangsGetRawMeat/assets/万叶拾取.json create mode 100644 repo/js/AutoFriendshipEvilBaresItsFangsGetRawMeat/万叶刷肉专用策略.txt diff --git a/repo/js/AutoFriendshipEvilBaresItsFangsGetRawMeat/assets/AutoPath/万叶版前往.json b/repo/js/AutoFriendshipEvilBaresItsFangsGetRawMeat/assets/AutoPath/万叶版前往.json new file mode 100644 index 00000000..821fa59b --- /dev/null +++ b/repo/js/AutoFriendshipEvilBaresItsFangsGetRawMeat/assets/AutoPath/万叶版前往.json @@ -0,0 +1,30 @@ +{ + "info": { + "name": "万叶版前往", + "type": "collect", + "author": "柒叶子", + "version": "1.0", + "description": "", + "bgi_version": "0.44.4" + }, + "positions": [ + { + "id": 1, + "x": 3614.63, + "y": -521.6, + "action": "", + "move_mode": "dash", + "action_params": "", + "type": "path" + }, + { + "id": 2, + "x": 3578.08, + "y": -500.75, + "action": "fight", + "move_mode": "dash", + "action_params": "", + "type": "path" + } + ] +} \ No newline at end of file diff --git a/repo/js/AutoFriendshipEvilBaresItsFangsGetRawMeat/assets/AutoPath/万叶版返回.json b/repo/js/AutoFriendshipEvilBaresItsFangsGetRawMeat/assets/AutoPath/万叶版返回.json new file mode 100644 index 00000000..392fa700 --- /dev/null +++ b/repo/js/AutoFriendshipEvilBaresItsFangsGetRawMeat/assets/AutoPath/万叶版返回.json @@ -0,0 +1,30 @@ +{ + "info": { + "name": "万叶版返回", + "type": "collect", + "author": "柒叶子", + "version": "1.0", + "description": "", + "bgi_version": "0.44.4" + }, + "positions": [ + { + "id": 1, + "x": 3605.18, + "y": -513.32, + "action": "", + "move_mode": "dash", + "action_params": "", + "type": "path" + }, + { + "id": 2, + "x": 3614.63, + "y": -521.6, + "action": "", + "move_mode": "dash", + "action_params": "", + "type": "path" + } + ] +} \ No newline at end of file diff --git a/repo/js/AutoFriendshipEvilBaresItsFangsGetRawMeat/assets/万叶拾取.json b/repo/js/AutoFriendshipEvilBaresItsFangsGetRawMeat/assets/万叶拾取.json new file mode 100644 index 00000000..7e12dbdf --- /dev/null +++ b/repo/js/AutoFriendshipEvilBaresItsFangsGetRawMeat/assets/万叶拾取.json @@ -0,0 +1 @@ +{"macroEvents":[{"type":0,"keyCode":83,"mouseX":0,"mouseY":0,"time":454},{"type":0,"keyCode":68,"mouseX":0,"mouseY":0,"time":813},{"type":1,"keyCode":83,"mouseX":0,"mouseY":0,"time":829},{"type":0,"keyCode":87,"mouseX":0,"mouseY":0,"time":1032},{"type":1,"keyCode":68,"mouseX":0,"mouseY":0,"time":1110},{"type":0,"keyCode":65,"mouseX":0,"mouseY":0,"time":1625},{"type":1,"keyCode":87,"mouseX":0,"mouseY":0,"time":1688},{"type":0,"keyCode":83,"mouseX":0,"mouseY":0,"time":2125},{"type":1,"keyCode":65,"mouseX":0,"mouseY":0,"time":2204},{"type":0,"keyCode":68,"mouseX":0,"mouseY":0,"time":2625},{"type":1,"keyCode":83,"mouseX":0,"mouseY":0,"time":2704},{"type":1,"keyCode":68,"mouseX":0,"mouseY":0,"time":3250}],"info":{"name":"","description":"","x":638,"y":382,"width":2560,"height":1440,"recordDpi":1.75}} \ No newline at end of file diff --git a/repo/js/AutoFriendshipEvilBaresItsFangsGetRawMeat/main.js b/repo/js/AutoFriendshipEvilBaresItsFangsGetRawMeat/main.js index 0241afe6..d66c1610 100644 --- a/repo/js/AutoFriendshipEvilBaresItsFangsGetRawMeat/main.js +++ b/repo/js/AutoFriendshipEvilBaresItsFangsGetRawMeat/main.js @@ -112,7 +112,19 @@ "forceInteraction": true })); - await AutoPath(`好感-张牙舞爪的恶党-循环${getMeatMode ? '(二净甸刷肉版)' : '(二净甸)'}`); + //原版逻辑 await AutoPath(`好感-张牙舞爪的恶党-循环${getMeatMode ? '(二净甸刷肉版)' : '(二净甸)'}`); + //多种拾取模式 + if (getMeatMode == "通用拾取") { + await AutoPath(`好感-张牙舞爪的恶党-循环(二净甸刷肉版)`); + } + else if (getMeatMode == "万叶拾取") { + await AutoPath(`万叶版前往`); + await keyMouseScript.runFile(`assets/万叶拾取.json`); + await AutoPath(`万叶版返回`); + } + else { + await AutoPath(`好感-张牙舞爪的恶党-循环(二净甸)`); + } // 关闭急速拾取 dispatcher.addTimer(new RealtimeTimer("AutoPick", { @@ -213,4 +225,4 @@ const startTime = Date.now(); await AutoFriendship(runTimes, statueTimes, getMeatMode, delayTime, startTime, ocrTimeout); -})(); \ No newline at end of file +})(); diff --git a/repo/js/AutoFriendshipEvilBaresItsFangsGetRawMeat/settings.json b/repo/js/AutoFriendshipEvilBaresItsFangsGetRawMeat/settings.json index 018c18fc..228ef4f2 100644 --- a/repo/js/AutoFriendshipEvilBaresItsFangsGetRawMeat/settings.json +++ b/repo/js/AutoFriendshipEvilBaresItsFangsGetRawMeat/settings.json @@ -6,8 +6,12 @@ }, { "name": "getMeatMode", - "type": "checkbox", - "label": "开启刷兽肉模式【勾选才拾取兽肉】" + "type": "select", + "label": "开启刷兽肉模式【勾选才拾取兽肉】", + "options": [ + "通用拾取", + "万叶拾取" + ] }, { "name": "inputValue", @@ -54,4 +58,4 @@ "type": "input-text", "label": "OCR超时时间（选填，默认为30秒）" } -] \ No newline at end of file +] diff --git a/repo/js/AutoFriendshipEvilBaresItsFangsGetRawMeat/万叶刷肉专用策略.txt b/repo/js/AutoFriendshipEvilBaresItsFangsGetRawMeat/万叶刷肉专用策略.txt new file mode 100644 index 00000000..907d2099 --- /dev/null +++ b/repo/js/AutoFriendshipEvilBaresItsFangsGetRawMeat/万叶刷肉专用策略.txt @@ -0,0 +1,9 @@ +丽莎 e +枫原万叶 e(hold),attack,e(hold),attack + + + + + + +