diff --git a/repo/js/AEscoffier_chef/assets/food_dic.json b/repo/js/AEscoffier_chef/assets/food_dic.json index b1dc4a01..889f7213 100644 --- a/repo/js/AEscoffier_chef/assets/food_dic.json +++ b/repo/js/AEscoffier_chef/assets/food_dic.json @@ -1,4 +1,44 @@ { + "肉肉盛宴餐": { + "type": [ + "正常料理", + "活动料理" + ], + "category": [ + "提升攻击", + "提升暴击" + ], + "lvl": 4, + "area": "其他", + "version": "5.7", + "detail": "队伍中所有角色攻击力提高272点，暴击率提升8%，持续300秒。\n多人游戏时，仅对自己的角色生效。", + "material": { + "禽肉": 5, + "虾仁": 4, + "咖啡豆": 3, + "面粉": 3 + }, + "means": "烹饪获得\n\n【食谱】肯德基×原神「夺堡奇兵」联动活动邮件获取", + "character": "无", + "belonging": "无" + }, + "455特饮": { + "type": [ + "饮品" + ], + "category": [ + "其他", + "不可制作" + ], + "lvl": 3, + "area": "其他", + "version": "5.7", + "detail": "复苏选中的角色，为其恢复1200点生命值。", + "material": {}, + "means": "脉动×原神联动活动概率获取", + "character": "无", + "belonging": "无" + }, "「欢夜畅谈」": { "type": [ "特殊料理" @@ -20,6 +60,48 @@ "character": "塔利雅", "belonging": "鲜虾脆薯盏" }, + "九果甘露饮": { + "type": [ + "正常料理" + ], + "category": [ + "提升暴击" + ], + "lvl": 3, + "area": "其他", + "version": "5.7", + "detail": "队伍中所有角色暴击率提升15%，持续300秒。多人游戏时，仅对自己的角色生效。", + "material": { + "墩墩桃": 2, + "日落果": 2, + "苹果": 2, + "树莓": 2 + }, + "means": "烹饪获得\n\n【食谱】肯德基×原神「夺堡奇兵」联动活动邮件获取", + "character": "无", + "belonging": "无" + }, + "鲜奶珠珠派": { + "type": [ + "正常料理" + ], + "category": [ + "提升防御" + ], + "lvl": 3, + "area": "其他", + "version": "5.7", + "detail": "队伍中所有角色防御力提高200点，持续300秒。多人游戏时，仅对自己的角色生效。", + "material": { + "牛奶": 4, + "面粉": 2, + "黄油": 2, + "糖": 1 + }, + "means": "烹饪获得\n\n【食谱】肯德基×原神「夺堡奇兵」联动活动邮件获取", + "character": "无", + "belonging": "无" + }, "「暗渊之获」": { "type": [ "特殊料理" @@ -487,26 +569,6 @@ "character": "无", "belonging": "无" }, - "清心花饼": { - "type": [ - "正常料理" - ], - "category": [ - "恢复体力" - ], - "lvl": 2, - "area": "璃月", - "version": "5.3", - "detail": "恢复50点体力。", - "material": { - "清心": 1, - "面粉": 1, - "糖": 1 - }, - "means": "烹饪获得\n\n【食谱】璃月沉玉谷遗珑埠小吃摊购买获得", - "character": "无", - "belonging": "无" - }, "玉剪着花": { "type": [ "特殊料理" @@ -527,25 +589,23 @@ "character": "蓝砚", "belonging": "清心花饼" }, - "奇瑰之汤": { + "清心花饼": { "type": [ - "正常料理", - "部族惊喜" + "正常料理" ], "category": [ - "其他" + "恢复体力" ], - "lvl": 4, - "area": "纳塔", - "version": "5.2", - "detail": "来自烟谜主部族的小小惊喜。\n彩蛋效果：每8秒恢复1点生命值，共计回复5点生命值。", + "lvl": 2, + "area": "璃月", + "version": "5.3", + "detail": "恢复50点体力。", "material": { - "颗粒果": 1, - "烬芯花": 1, - "糖": 1, - "果酱": 1 + "清心": 1, + "面粉": 1, + "糖": 1 }, - "means": "烹饪获得\n\n【食谱】纳塔·烟谜主部族声望系统2级奖励", + "means": "烹饪获得\n\n【食谱】璃月沉玉谷遗珑埠小吃摊购买获得", "character": "无", "belonging": "无" }, @@ -571,6 +631,28 @@ "character": "无", "belonging": "无" }, + "奇瑰之汤": { + "type": [ + "正常料理", + "部族惊喜" + ], + "category": [ + "其他" + ], + "lvl": 4, + "area": "纳塔", + "version": "5.2", + "detail": "来自烟谜主部族的小小惊喜。\n彩蛋效果：每8秒恢复1点生命值，共计回复5点生命值。", + "material": { + "颗粒果": 1, + "烬芯花": 1, + "糖": 1, + "果酱": 1 + }, + "means": "烹饪获得\n\n【食谱】纳塔·烟谜主部族声望系统2级奖励", + "character": "无", + "belonging": "无" + }, "歇止一刻": { "type": [ "特殊料理" @@ -6741,26 +6823,6 @@ "character": "行秋", "belonging": "水晶虾" }, - "魔法肉酱面": { - "type": [ - "特殊料理" - ], - "category": [ - "持续恢复" - ], - "lvl": 2, - "area": "蒙德", - "version": "1.0", - "detail": "立即为选中的角色恢复生命值上限的26%，并在之后的30秒内，每5秒恢复570点生命值。", - "material": { - "面粉": 2, - "兽肉": 2, - "番茄": 1 - }, - "means": "烹饪获得\n【角色】 丽莎 \n【食谱】 火火肉酱面 ", - "character": "丽莎", - "belonging": "火火肉酱面" - }, "水晶虾": { "type": [ "正常料理" @@ -6781,6 +6843,26 @@ "character": "无", "belonging": "无" }, + "魔法肉酱面": { + "type": [ + "特殊料理" + ], + "category": [ + "持续恢复" + ], + "lvl": 2, + "area": "蒙德", + "version": "1.0", + "detail": "立即为选中的角色恢复生命值上限的26%，并在之后的30秒内，每5秒恢复570点生命值。", + "material": { + "面粉": 2, + "兽肉": 2, + "番茄": 1 + }, + "means": "烹饪获得\n【角色】 丽莎 \n【食谱】 火火肉酱面 ", + "character": "丽莎", + "belonging": "火火肉酱面" + }, "苹果酿": { "type": [ "饮品" @@ -7014,25 +7096,6 @@ "character": "安柏", "belonging": "烤肉排" }, - "蒙德烤鱼": { - "type": [ - "正常料理" - ], - "category": [ - "复活" - ], - "lvl": 1, - "area": "蒙德", - "version": "1.0", - "detail": "复苏选中的角色，为其恢复100点生命值。", - "material": { - "鱼肉": 1, - "胡椒": 1 - }, - "means": "烹饪获得\n\n【食谱】解锁烹饪获得", - "character": "无", - "belonging": "无" - }, "炝炒肉片": { "type": [ "特殊料理" @@ -7052,6 +7115,25 @@ "character": "北斗", "belonging": "爆炒肉片" }, + "蒙德烤鱼": { + "type": [ + "正常料理" + ], + "category": [ + "复活" + ], + "lvl": 1, + "area": "蒙德", + "version": "1.0", + "detail": "复苏选中的角色，为其恢复100点生命值。", + "material": { + "鱼肉": 1, + "胡椒": 1 + }, + "means": "烹饪获得\n\n【食谱】解锁烹饪获得", + "character": "无", + "belonging": "无" + }, "提瓦特焦蛋": { "type": [ "特殊料理" @@ -7201,25 +7283,6 @@ "character": "凯亚", "belonging": "野菇鸡肉串" }, - "野菇鸡肉串": { - "type": [ - "正常料理" - ], - "category": [ - "恢复血量" - ], - "lvl": 1, - "area": "蒙德", - "version": "1.0", - "detail": "为选中的角色恢复生命值上限的9%，并额外恢复1000点生命值。", - "material": { - "蘑菇": 1, - "禽肉": 1 - }, - "means": "烹饪获得\n\n【食谱】解锁烹饪获得", - "character": "无", - "belonging": "无" - }, "烤吃虎鱼": { "type": [ "正常料理" @@ -7239,6 +7302,25 @@ "character": "无", "belonging": "无" }, + "野菇鸡肉串": { + "type": [ + "正常料理" + ], + "category": [ + "恢复血量" + ], + "lvl": 1, + "area": "蒙德", + "version": "1.0", + "detail": "为选中的角色恢复生命值上限的9%，并额外恢复1000点生命值。", + "material": { + "蘑菇": 1, + "禽肉": 1 + }, + "means": "烹饪获得\n\n【食谱】解锁烹饪获得", + "character": "无", + "belonging": "无" + }, "萝卜时蔬汤": { "type": [ "正常料理" diff --git a/repo/js/AEscoffier_chef/main.js b/repo/js/AEscoffier_chef/main.js index ab096417..8736849e 100644 --- a/repo/js/AEscoffier_chef/main.js +++ b/repo/js/AEscoffier_chef/main.js @@ -684,7 +684,7 @@ return false; } try { - food_num_Stamina_Cost_Reduction = typeof(settings.food_num_Stamina_Cost_Reduction) === "undefined" || settings.food_num_Stamina_Cost_Reduction === "" ? 1: parseInt(food_num_Stamina_Cost_Reduction.undefined, 10); + food_num_Stamina_Cost_Reduction = typeof(settings.food_num_Stamina_Cost_Reduction) === "undefined" || settings.food_num_Stamina_Cost_Reduction === "" ? 1: parseInt(settings.food_num_Stamina_Cost_Reduction, 10); } catch(error) { log.error(`food_num_Stamina_Cost_Reduction 读取错误: ${error}`); return false; @@ -1214,7 +1214,7 @@ } // 检测界面 if (!is_food_page()) return false; - // 二次验证食材名【DEBUG】经过先前的字符串距离筛选，此处理应不可能找不到 + // 二次验证料理名【DEBUG】经过先前的字符串距离筛选，此处理应不可能找不到 if (!Object.keys(food_dic).includes(food_name)) { log.warn(`food_dic内未找到名为-${food_name}-的料理，料理名称传入错误或料理数据需要更新`); return false; diff --git a/repo/js/AEscoffier_chef/manifest.json b/repo/js/AEscoffier_chef/manifest.json index bf5c6d4e..1be4a237 100644 --- a/repo/js/AEscoffier_chef/manifest.json +++ b/repo/js/AEscoffier_chef/manifest.json @@ -1,13 +1,13 @@ { "manifest_version": 1, "name": "一只爱可菲(厨娘版)", - "version": "1.3", + "version": "1.3.1", "bgi_version": "0.45.0", "description": "脚本名称：一只爱可菲(厨娘版)\n功能描述：专精料理制作的爱可菲(自动烹饪及解锁、特殊料理)\n核心功能------------------------------>\n1.自动烹饪：支持手动烹饪和自动烹饪，支持只刷满熟练度\n2.自动特殊料理：支持根据菜名和角色名自动进行单/多个特殊料理的烹饪（可以调节预期数量）\n3.其他料理获取：除了烹饪以外的部分料理的获取[仅有数据，未实装]\n注意事项------------------------------>\n1.请确保原神分辨率是1920x1080\n2.请尽量确保食材充足，如果食材不充足会自动跳过\n---------------------------------------->\n作者：提瓦特钓鱼玳师\n脚本反馈邮箱：hijiwos@hotmail.com", "authors": [ { "name": "提瓦特钓鱼玳师", - "links": "https://github.com/Hijiwos" + "url": "https://github.com/Hijiwos" } ], "settings_ui": "settings.json", diff --git a/repo/js/AEscoffier_chef/settings.json b/repo/js/AEscoffier_chef/settings.json index 09ffe4d3..132424cb 100644 --- a/repo/js/AEscoffier_chef/settings.json +++ b/repo/js/AEscoffier_chef/settings.json @@ -285,10 +285,11 @@ "options": [ "无(默认)", "全部料理", + "455特饮", "丰稔之赐", "乌乌黑蛋", - "奇瑰之汤", "纵声欢唱", + "奇瑰之汤", "温泉时光", "咚咚嘭嘭", "宝石闪闪", @@ -354,8 +355,8 @@ "万民堂水煮鱼", "火火肉酱面", "江湖百味", - "魔法肉酱面", "水晶虾", + "魔法肉酱面", "苹果酿", "萝卜时蔬汤", "大碗茶" @@ -413,8 +414,8 @@ "厚云朵松饼", "庄园烤松饼", "侦察骑士烤肉！", - "蒙德烤鱼", "炝炒肉片", + "蒙德烤鱼", "提瓦特焦蛋", "摩拉肉", "爆炒肉片", @@ -489,8 +490,8 @@ "甜甜花酿鸡", "绝境求生烤鱼", "果香串烤", - "野菇鸡肉串", - "烤吃虎鱼" + "烤吃虎鱼", + "野菇鸡肉串" ] }, { @@ -505,6 +506,8 @@ "options": [ "无(默认)", "全部料理", + "肉肉盛宴餐", + "九果甘露饮", "德波大蛋糕·绚丽型", "德波小蛋糕·改良型", "一捧绿野", @@ -568,8 +571,8 @@ "全部料理", "「一梦治愈」", "钱汤馒头", - "清心花饼", "玉剪着花", + "清心花饼", "果味奶糖", "串烤牛心", "巧克力", @@ -600,6 +603,7 @@ "options": [ "无(默认)", "全部料理", + "鲜奶珠珠派", "贝壳彩糖", "「情感支持」", "梅落雪间醉", @@ -716,6 +720,7 @@ "options": [ "无(默认)", "全部料理", + "肉肉盛宴餐", "鎏金殿堂", "德波大蛋糕·绚丽型", "德波小蛋糕·改良型",