diff --git a/README.md b/README.md index 7c888e82b..f78134b89 100644 --- a/README.md +++ b/README.md @@ -183,7 +183,7 @@ - `Assets`用于存放脚本使用到的资源文件,其中 - `Pathing`用于存放[地图追踪](https://bettergi.com/feats/autos/pathing-dev.html)文件 - - `RecognitionObject`用于存放[模板匹配](https://bettergi.com/dev/js/rec.html#%E6%A8%A1%E6%9D%BF%E5%8C%B9%E9%85%8D)对象 + - `RecognitionObject`用于存放[模板匹配、图像识别](https://bettergi.com/dev/js/rec.html#%E6%A8%A1%E6%9D%BF%E5%8C%B9%E9%85%8D)对象 **其他注意事项** diff --git a/repo/js/识图工具 区域坐标/assets/1p.png b/repo/js/模板匹配区域坐标输出/assets/1p.png similarity index 100% rename from repo/js/识图工具 区域坐标/assets/1p.png rename to repo/js/模板匹配区域坐标输出/assets/1p.png diff --git a/repo/js/识图工具 区域坐标/assets/Bagpack.png b/repo/js/模板匹配区域坐标输出/assets/Bagpack.png similarity index 100% rename from repo/js/识图工具 区域坐标/assets/Bagpack.png rename to repo/js/模板匹配区域坐标输出/assets/Bagpack.png diff --git a/repo/js/识图工具 区域坐标/assets/Comfirm.png b/repo/js/模板匹配区域坐标输出/assets/Comfirm.png similarity index 100% rename from repo/js/识图工具 区域坐标/assets/Comfirm.png rename to repo/js/模板匹配区域坐标输出/assets/Comfirm.png diff --git a/repo/js/识图工具 区域坐标/assets/Paimon.png b/repo/js/模板匹配区域坐标输出/assets/Paimon.png similarity index 100% rename from repo/js/识图工具 区域坐标/assets/Paimon.png rename to repo/js/模板匹配区域坐标输出/assets/Paimon.png diff --git a/repo/js/识图工具 区域坐标/assets/Space.png b/repo/js/模板匹配区域坐标输出/assets/Space.png similarity index 100% rename from repo/js/识图工具 区域坐标/assets/Space.png rename to repo/js/模板匹配区域坐标输出/assets/Space.png diff --git a/repo/js/识图工具 区域坐标/main.js b/repo/js/模板匹配区域坐标输出/main.js similarity index 100% rename from repo/js/识图工具 区域坐标/main.js rename to repo/js/模板匹配区域坐标输出/main.js diff --git a/repo/js/识图工具 区域坐标/manifest.json b/repo/js/模板匹配区域坐标输出/manifest.json similarity index 100% rename from repo/js/识图工具 区域坐标/manifest.json rename to repo/js/模板匹配区域坐标输出/manifest.json diff --git a/repo/js/识图工具 区域坐标/settings.json b/repo/js/模板匹配区域坐标输出/settings.json similarity index 100% rename from repo/js/识图工具 区域坐标/settings.json rename to repo/js/模板匹配区域坐标输出/settings.json diff --git a/repo/js/铁匠铺/manifest.json b/repo/js/铁匠铺/manifest.json index 9adca455e..13d14822d 100644 --- a/repo/js/铁匠铺/manifest.json +++ b/repo/js/铁匠铺/manifest.json @@ -4,7 +4,12 @@ "version": "2.3.0", "bgi_version": "0.48.2", "description": "自动选择铁匠铺和使用矿物去锻造精锻矿。\n \n使用前请阅读“readme”文件以获取更多详细信息。 \n---更新说明--- \n- 请查阅readme", - "tags": ["铁匠铺", "锻造", "精锻用矿"], + "tags": [ + "铁匠铺", + "锻造", + "精锻用魔矿", + "模板匹配" + ], "authors": [ { "name": "呱呱z", @@ -20,4 +25,4 @@ ], "settings_ui": "settings.json", "main": "main.js" -} +} \ No newline at end of file diff --git a/repo/js/食材加工 识图/assets/Cooking.png b/repo/js/食材加工/assets/Cooking.png similarity index 100% rename from repo/js/食材加工 识图/assets/Cooking.png rename to repo/js/食材加工/assets/Cooking.png diff --git a/repo/js/食材加工 识图/assets/E_Dialogue.png b/repo/js/食材加工/assets/E_Dialogue.png similarity index 100% rename from repo/js/食材加工 识图/assets/E_Dialogue.png rename to repo/js/食材加工/assets/E_Dialogue.png diff --git a/repo/js/食材加工 识图/assets/F_Dialogue.png b/repo/js/食材加工/assets/F_Dialogue.png similarity index 100% rename from repo/js/食材加工 识图/assets/F_Dialogue.png rename to repo/js/食材加工/assets/F_Dialogue.png diff --git a/repo/js/食材加工 识图/assets/Picture/Bacon.png b/repo/js/食材加工/assets/Picture/Bacon.png similarity index 100% rename from repo/js/食材加工 识图/assets/Picture/Bacon.png rename to repo/js/食材加工/assets/Picture/Bacon.png diff --git a/repo/js/食材加工 识图/assets/Picture/Butter.png b/repo/js/食材加工/assets/Picture/Butter.png similarity index 100% rename from repo/js/食材加工 识图/assets/Picture/Butter.png rename to repo/js/食材加工/assets/Picture/Butter.png diff --git a/repo/js/食材加工 识图/assets/Picture/Cheese.png b/repo/js/食材加工/assets/Picture/Cheese.png similarity index 100% rename from repo/js/食材加工 识图/assets/Picture/Cheese.png rename to repo/js/食材加工/assets/Picture/Cheese.png diff --git a/repo/js/食材加工 识图/assets/Picture/Crab-Roe.png b/repo/js/食材加工/assets/Picture/Crab-Roe.png similarity index 100% rename from repo/js/食材加工 识图/assets/Picture/Crab-Roe.png rename to repo/js/食材加工/assets/Picture/Crab-Roe.png diff --git a/repo/js/食材加工 识图/assets/Picture/Fish.png b/repo/js/食材加工/assets/Picture/Fish.png similarity index 100% rename from repo/js/食材加工 识图/assets/Picture/Fish.png rename to repo/js/食材加工/assets/Picture/Fish.png diff --git a/repo/js/食材加工 识图/assets/Picture/Flour.png b/repo/js/食材加工/assets/Picture/Flour.png similarity index 100% rename from repo/js/食材加工 识图/assets/Picture/Flour.png rename to repo/js/食材加工/assets/Picture/Flour.png diff --git a/repo/js/食材加工 识图/assets/Picture/Ham.png b/repo/js/食材加工/assets/Picture/Ham.png similarity index 100% rename from repo/js/食材加工 识图/assets/Picture/Ham.png rename to repo/js/食材加工/assets/Picture/Ham.png diff --git a/repo/js/食材加工 识图/assets/Picture/Jam.png b/repo/js/食材加工/assets/Picture/Jam.png similarity index 100% rename from repo/js/食材加工 识图/assets/Picture/Jam.png rename to repo/js/食材加工/assets/Picture/Jam.png diff --git a/repo/js/食材加工 识图/assets/Picture/Lard.png b/repo/js/食材加工/assets/Picture/Lard.png similarity index 100% rename from repo/js/食材加工 识图/assets/Picture/Lard.png rename to repo/js/食材加工/assets/Picture/Lard.png diff --git a/repo/js/食材加工 识图/assets/Picture/Mysterious-Meat.png b/repo/js/食材加工/assets/Picture/Mysterious-Meat.png similarity index 100% rename from repo/js/食材加工 识图/assets/Picture/Mysterious-Meat.png rename to repo/js/食材加工/assets/Picture/Mysterious-Meat.png diff --git a/repo/js/食材加工 识图/assets/Picture/Raw-Meat.png b/repo/js/食材加工/assets/Picture/Raw-Meat.png similarity index 100% rename from repo/js/食材加工 识图/assets/Picture/Raw-Meat.png rename to repo/js/食材加工/assets/Picture/Raw-Meat.png diff --git a/repo/js/食材加工 识图/assets/Picture/Sausage.png b/repo/js/食材加工/assets/Picture/Sausage.png similarity index 100% rename from repo/js/食材加工 识图/assets/Picture/Sausage.png rename to repo/js/食材加工/assets/Picture/Sausage.png diff --git a/repo/js/食材加工 识图/assets/Picture/Smoked-Poultry.png b/repo/js/食材加工/assets/Picture/Smoked-Poultry.png similarity index 100% rename from repo/js/食材加工 识图/assets/Picture/Smoked-Poultry.png rename to repo/js/食材加工/assets/Picture/Smoked-Poultry.png diff --git a/repo/js/食材加工 识图/assets/Picture/Spices.png b/repo/js/食材加工/assets/Picture/Spices.png similarity index 100% rename from repo/js/食材加工 识图/assets/Picture/Spices.png rename to repo/js/食材加工/assets/Picture/Spices.png diff --git a/repo/js/食材加工 识图/assets/Picture/Sugar.png b/repo/js/食材加工/assets/Picture/Sugar.png similarity index 100% rename from repo/js/食材加工 识图/assets/Picture/Sugar.png rename to repo/js/食材加工/assets/Picture/Sugar.png diff --git a/repo/js/食材加工 识图/assets/pageScroll.json b/repo/js/食材加工/assets/pageScroll.json similarity index 97% rename from repo/js/食材加工 识图/assets/pageScroll.json rename to repo/js/食材加工/assets/pageScroll.json index ae0447780..7e19ca0f7 100644 --- a/repo/js/食材加工 识图/assets/pageScroll.json +++ b/repo/js/食材加工/assets/pageScroll.json @@ -1,22 +1,22 @@ -{ - "macroEvents": [ - {"type": 2, "mouseX": 1200, "mouseY": 901, "time": 0}, - {"type": 2, "mouseX": 1200, "mouseY": 801, "time": 50}, - {"type": 2, "mouseX": 1200, "mouseY": 701, "time": 100}, - {"type": 2, "mouseX": 1200, "mouseY": 601, "time": 150}, - {"type": 2, "mouseX": 1200, "mouseY": 501, "time": 200}, - {"type": 2, "mouseX": 1200, "mouseY": 401, "time": 250}, - {"type": 2, "mouseX": 1200, "mouseY": 301, "time": 300}, - {"type": 2, "mouseX": 1200, "mouseY": 201, "time": 350}, - {"type": 2, "mouseX": 1200, "mouseY": 200, "mouseButton": "Left", "time": 400} - ], - "info": { - "name": "", - "description": "", - "x": 0, - "y": 0, - "width": 1920, - "height": 1080, - "recordDpi": 1 - } -} +{ + "macroEvents": [ + {"type": 2, "mouseX": 1200, "mouseY": 901, "time": 0}, + {"type": 2, "mouseX": 1200, "mouseY": 801, "time": 50}, + {"type": 2, "mouseX": 1200, "mouseY": 701, "time": 100}, + {"type": 2, "mouseX": 1200, "mouseY": 601, "time": 150}, + {"type": 2, "mouseX": 1200, "mouseY": 501, "time": 200}, + {"type": 2, "mouseX": 1200, "mouseY": 401, "time": 250}, + {"type": 2, "mouseX": 1200, "mouseY": 301, "time": 300}, + {"type": 2, "mouseX": 1200, "mouseY": 201, "time": 350}, + {"type": 2, "mouseX": 1200, "mouseY": 200, "mouseButton": "Left", "time": 400} + ], + "info": { + "name": "", + "description": "", + "x": 0, + "y": 0, + "width": 1920, + "height": 1080, + "recordDpi": 1 + } +} diff --git a/repo/js/食材加工 识图/assets/pageScroll2.json b/repo/js/食材加工/assets/pageScroll2.json similarity index 97% rename from repo/js/食材加工 识图/assets/pageScroll2.json rename to repo/js/食材加工/assets/pageScroll2.json index 8ac7db36c..1f9e6676b 100644 --- a/repo/js/食材加工 识图/assets/pageScroll2.json +++ b/repo/js/食材加工/assets/pageScroll2.json @@ -1,22 +1,22 @@ -{ - "macroEvents": [ - {"type": 2, "mouseX": 1200, "mouseY": 901, "time": 0}, - {"type": 2, "mouseX": 1200, "mouseY": 801, "time": 50}, - {"type": 2, "mouseX": 1200, "mouseY": 701, "time": 100}, - {"type": 2, "mouseX": 1200, "mouseY": 601, "time": 150}, - {"type": 2, "mouseX": 1200, "mouseY": 501, "time": 200}, - {"type": 2, "mouseX": 1200, "mouseY": 401, "time": 250}, - {"type": 2, "mouseX": 1200, "mouseY": 301, "time": 300}, - {"type": 2, "mouseX": 1200, "mouseY": 205, "time": 350}, - {"type": 2, "mouseX": 1200, "mouseY": 204, "mouseButton": "Left", "time": 400} - ], - "info": { - "name": "", - "description": "", - "x": 0, - "y": 0, - "width": 1920, - "height": 1080, - "recordDpi": 1 - } -} +{ + "macroEvents": [ + {"type": 2, "mouseX": 1200, "mouseY": 901, "time": 0}, + {"type": 2, "mouseX": 1200, "mouseY": 801, "time": 50}, + {"type": 2, "mouseX": 1200, "mouseY": 701, "time": 100}, + {"type": 2, "mouseX": 1200, "mouseY": 601, "time": 150}, + {"type": 2, "mouseX": 1200, "mouseY": 501, "time": 200}, + {"type": 2, "mouseX": 1200, "mouseY": 401, "time": 250}, + {"type": 2, "mouseX": 1200, "mouseY": 301, "time": 300}, + {"type": 2, "mouseX": 1200, "mouseY": 205, "time": 350}, + {"type": 2, "mouseX": 1200, "mouseY": 204, "mouseButton": "Left", "time": 400} + ], + "info": { + "name": "", + "description": "", + "x": 0, + "y": 0, + "width": 1920, + "height": 1080, + "recordDpi": 1 + } +} diff --git a/repo/js/食材加工 识图/assets/滚轮下翻.json b/repo/js/食材加工/assets/滚轮下翻.json similarity index 98% rename from repo/js/食材加工 识图/assets/滚轮下翻.json rename to repo/js/食材加工/assets/滚轮下翻.json index cd0e99aca..18e572736 100644 --- a/repo/js/食材加工 识图/assets/滚轮下翻.json +++ b/repo/js/食材加工/assets/滚轮下翻.json @@ -1,3 +1,3 @@ -{"macroEvents":[{"type":6,"mouseX":0,"mouseY":-120,"time":0}, -{"type":6,"mouseX":0,"mouseY":0,"time":100}], +{"macroEvents":[{"type":6,"mouseX":0,"mouseY":-120,"time":0}, +{"type":6,"mouseX":0,"mouseY":0,"time":100}], "info":{"name":"","description":"","x":0,"y":0,"width":1920,"height":1080,"recordDpi":1}} \ No newline at end of file diff --git a/repo/js/食材加工 识图/assets/璃月杂货商东升旁灶台.json b/repo/js/食材加工/assets/璃月杂货商东升旁灶台.json similarity index 100% rename from repo/js/食材加工 识图/assets/璃月杂货商东升旁灶台.json rename to repo/js/食材加工/assets/璃月杂货商东升旁灶台.json diff --git a/repo/js/食材加工 识图/main.js b/repo/js/食材加工/main.js similarity index 100% rename from repo/js/食材加工 识图/main.js rename to repo/js/食材加工/main.js diff --git a/repo/js/食材加工 识图/manifest.json b/repo/js/食材加工/manifest.json similarity index 90% rename from repo/js/食材加工 识图/manifest.json rename to repo/js/食材加工/manifest.json index 773d7b579..be93807b8 100644 --- a/repo/js/食材加工 识图/manifest.json +++ b/repo/js/食材加工/manifest.json @@ -11,7 +11,8 @@ ], "tags": [ "食材", - "图像识别" + "料理", + "模板匹配" ], "settings_ui": "settings.json", "main": "main.js" diff --git a/repo/js/食材加工 识图/settings.json b/repo/js/食材加工/settings.json similarity index 96% rename from repo/js/食材加工 识图/settings.json rename to repo/js/食材加工/settings.json index e09087565..f71078760 100644 --- a/repo/js/食材加工 识图/settings.json +++ b/repo/js/食材加工/settings.json @@ -1,92 +1,92 @@ -[ - { - "name": "CookingTimes", - "type": "input-text", - "label": "【料理制作】:\n\n烹饪次数(默认0,即跳过)" - }, - { - "name": "Cooking", - "type": "input-text", - "label": "输入料理名" - }, - { - "name": "PrepCount", - "type": "input-text", - "label": "\n====================\n\n【食材加工】:\n\n加工数量(不填默认99)" - }, - { - "name": "Processing11", - "type": "checkbox", - "label": "如勾选:面粉,黄油,糖\n上方填入88,66\n则加工面粉88,黄油66,糖88\n-----------------\n\n1小麦=面粉" - }, - { - "name": "Processing15", - "type": "checkbox", - "label": "-----------------\n\n1牛奶=奶油" - }, - { - "name": "Processing17", - "type": "checkbox", - "label": "-----------------\n\n2牛奶=黄油" - }, - { - "name": "Processing25", - "type": "checkbox", - "label": "-----------------\n\n3牛奶=奶酪" - }, - { - "name": "Processing18", - "type": "checkbox", - "label": "-----------------\n\n2兽肉+1盐=火腿" - }, - { - "name": "Processing27", - "type": "checkbox", - "label": "-----------------\n\n3兽肉=香肠" - }, - { - "name": "Processing16", - "type": "checkbox", - "label": "--------------------\n\n3禽肉+1盐=熏禽肉" - }, - { - "name": "Processing26", - "type": "checkbox", - "label": "-----------------\n\n4兽肉+2盐=培根" - }, - { - "name": "Processing21", - "type": "checkbox", - "label": "-----------------\n\n2甜甜花=糖" - }, - { - "name": "Processing22", - "type": "checkbox", - "label": "-----------------\n\n2香辛果=香辛料" - }, - { - "name": "Processing24", - "type": "checkbox", - "label": "----------------------------\n\n3日落果+2树莓+1糖=果酱" - }, - { - "name": "Processing23", - "type": "checkbox", - "label": "-----------------\n\n4螃蟹=蟹黄" - }, - { - "name": "Processing12", - "type": "checkbox", - "label": "--------------------\n\n冷鲜肉 转化成 兽肉" - }, - { - "name": "Processing14", - "type": "checkbox", - "label": "-----------------------------\n\n神秘的肉 转化成 肉加工产物" - }, - { - "name": "Processing13", - "type": "checkbox", - "label": "--------------------------------\n\n鱼 转化成 鱼肉,排除 红色花鳉" - } +[ + { + "name": "CookingTimes", + "type": "input-text", + "label": "【料理制作】:\n\n烹饪次数(默认0,即跳过)" + }, + { + "name": "Cooking", + "type": "input-text", + "label": "输入料理名" + }, + { + "name": "PrepCount", + "type": "input-text", + "label": "\n====================\n\n【食材加工】:\n\n加工数量(不填默认99)" + }, + { + "name": "Processing11", + "type": "checkbox", + "label": "如勾选:面粉,黄油,糖\n上方填入88,66\n则加工面粉88,黄油66,糖88\n-----------------\n\n1小麦=面粉" + }, + { + "name": "Processing15", + "type": "checkbox", + "label": "-----------------\n\n1牛奶=奶油" + }, + { + "name": "Processing17", + "type": "checkbox", + "label": "-----------------\n\n2牛奶=黄油" + }, + { + "name": "Processing25", + "type": "checkbox", + "label": "-----------------\n\n3牛奶=奶酪" + }, + { + "name": "Processing18", + "type": "checkbox", + "label": "-----------------\n\n2兽肉+1盐=火腿" + }, + { + "name": "Processing27", + "type": "checkbox", + "label": "-----------------\n\n3兽肉=香肠" + }, + { + "name": "Processing16", + "type": "checkbox", + "label": "--------------------\n\n3禽肉+1盐=熏禽肉" + }, + { + "name": "Processing26", + "type": "checkbox", + "label": "-----------------\n\n4兽肉+2盐=培根" + }, + { + "name": "Processing21", + "type": "checkbox", + "label": "-----------------\n\n2甜甜花=糖" + }, + { + "name": "Processing22", + "type": "checkbox", + "label": "-----------------\n\n2香辛果=香辛料" + }, + { + "name": "Processing24", + "type": "checkbox", + "label": "----------------------------\n\n3日落果+2树莓+1糖=果酱" + }, + { + "name": "Processing23", + "type": "checkbox", + "label": "-----------------\n\n4螃蟹=蟹黄" + }, + { + "name": "Processing12", + "type": "checkbox", + "label": "--------------------\n\n冷鲜肉 转化成 兽肉" + }, + { + "name": "Processing14", + "type": "checkbox", + "label": "-----------------------------\n\n神秘的肉 转化成 肉加工产物" + }, + { + "name": "Processing13", + "type": "checkbox", + "label": "--------------------------------\n\n鱼 转化成 鱼肉,排除 红色花鳉" + } ] \ No newline at end of file