diff --git a/CHANGELOG.md b/CHANGELOG.md index c7ff5a9..bb794cb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,15 @@ +# 1.0.3 +* 新增了`#图鉴设置`可以查看图鉴功能设定 +* 感谢 @傻里傻气的小萌新 的背景图片支持 +* 新增了`秘境图鉴` +* 图鉴系列均 @逍遥 提供 +* 新增`图鉴匹配`设置 +* 优化之前的别名文件 + # 1.0.2 * 重写`体力`渲染 * 增加`#图鉴设置体力开关`防止跟乐神的冲突默认是关闭的 -* 体力背景位置在Yunzai-Bot/plugins/xiaoyao-cvs-plugin/resources/dailyNote/background_image/新加的图片放这个目录下面就行 +* 体力背景位置在 Yunzai-Bot/plugins/xiaoyao-cvs-plugin/resources/dailyNote/background_image/新加的图片放这个目录下面就行 * 增加`#图鉴帮助`查看插件包功能概况 * 增加`#图鉴版本`查看插件版本（借鉴喵喵代码 emmm好吧cv） diff --git a/README.md b/README.md index 6b79d5c..6c2705d 100644 --- a/README.md +++ b/README.md @@ -19,6 +19,7 @@ #### 安装教程 1. git clone https://gitee.com/Ctrlcvs/xiaoyao-cvs-plugin.git ./plugins/xiaoyao-cvs-plugin/ +2. git clone https://github.com/Ctrlcvs/xiaoyao-cvs-plugin.git ./plugins/xiaoyao-cvs-plugin/ #### 使用说明 diff --git a/apps/admin.js b/apps/admin.js index fd5713b..4fd4b8e 100644 --- a/apps/admin.js +++ b/apps/admin.js @@ -21,6 +21,8 @@ const require = createRequire( import.meta.url); let cfgMap = { "体力": "sys.Note", + "帮助": "sys.help", + "匹配": "sys.Atlas", }; let sysCfgReg = `^#图鉴设置\s*(${lodash.keys(cfgMap).join("|")})?\s*(.*)$`; export const rule = { @@ -65,7 +67,7 @@ export async function sysCfg(e, { let val = regRet[2] || ""; let cfgKey = cfgMap[regRet[1]]; - + if (cfgKey === "sys.scale") { val = Math.min(200, Math.max(50, val * 1 || 100)); } else { @@ -76,13 +78,36 @@ export async function sysCfg(e, { Cfg.set(cfgKey, val); } } - e.reply("设置成功！！"); - return true; - // //渲染图像 - // return await Common.render("admin/index", { - // ...cfg, - // }, { e, render, scale: 1.4 }); + // e.reply("设置成功！！"); + // return true; + let cfg = { + help: getStatus("sys.help", false), + Note: getStatus("sys.Note"), + Atlas: getStatus("sys.Atlas"), + imgPlus: fs.existsSync(plusPath), + bg:await rodom(), //获取底图 + } + console.log(cfg) + //渲染图像 + return await Common.render("admin/index", { + ...cfg, + }, { + e, + render, + scale: 1.4 + }); } + +const rodom=async function(){ + var image = fs.readdirSync(`./plugins/xiaoyao-cvs-plugin/resources/admin/imgs/bg`); + var list_img = []; + for (let val of image) { + list_img.push(val) + } + var imgs = list_img.length == 1 ? list_img[0] : list_img[lodash.random(0, list_img.length - 1)]; + return imgs; +} + const checkAuth = async function(e) { return await e.checkAuth({ auth: "master", diff --git a/apps/render.js b/apps/render.js index dc9dc66..f5d155c 100644 --- a/apps/render.js +++ b/apps/render.js @@ -54,8 +54,6 @@ async function render1(app = "", type = "", data = {}, imgType = "jpeg") { }); } - - async function doRender(app, type, data, imgType, renderCfg) { let { tplKey, tplFile, savePath, saveId } = renderCfg; diff --git a/apps/xiaoyao_image.js b/apps/xiaoyao_image.js index 21df62e..804e15f 100644 --- a/apps/xiaoyao_image.js +++ b/apps/xiaoyao_image.js @@ -2,22 +2,29 @@ import { segment } from "oicq"; import fs from "fs"; +import { Cfg } from "../components/index.js"; import Data from "../components/Data.js" import path from 'path'; import fetch from "node-fetch"; const _path = process.cwd(); const __dirname = path.resolve(); -const list = ["shiwu_tujian", "yuanmo_tujian"] +const list = ["shiwu_tujian", "yuanmo_tujian","mijin_tujian"] export async function AtlasAlias(e) { + let reg=/#(.*)/; + if(Cfg.get("sys.Atlas")){ + reg=/#*(.*)图鉴/; + } + if(!reg.test(e.msg)){ + return false; + } if (await roleInfo(e)) return true; if (await weaponInfo(e)) return true; // if (await foodInfo(e)) return true; if (await RelicsInfo(e)) return true; // if (await monsterInfo(e)) return true; var name = e.msg.replace(/#|＃|信息|图鉴|命座|天赋|突破|圣遗物|食物|食材|的|特殊|材|料|特色|料理|理|色/g, ""); - send_Msg(e, "all", name) - return true; + return send_Msg(e, "all", name); } @@ -57,9 +64,9 @@ const send_Msg = function(e, type, name) { } } } - path = `${_path}/plugins/xiaoyao-cvs-plugin/resources/xiaoyao-plus/${type}/${name}.png` + path = `${_path}/plugins/xiaoyao-cvs-plugin/resources/xiaoyao-plus/${type}/${name}.png` if (!fs.existsSync(path)) { - return true; + return false; } e.reply(segment.image(`file:///${path}`)); return true; diff --git a/components/Changelog.js b/components/Changelog.js index 6546644..d12ba25 100644 --- a/components/Changelog.js +++ b/components/Changelog.js @@ -15,6 +15,8 @@ const getLine = function (line) { line = line.replace(/(^\s*\*|\r)/g, ''); line = line.replace(/\s*`([^`]+`)/g, '$1'); line = line.replace(/`\s*/g, ''); + line = line.replace(/\s*\*\*([^\*]+\*\*)/g, '$1') + line = line.replace(/\*\*\s*/g, ''); line = line.replace(/ⁿᵉʷ/g, ''); return line; } diff --git a/components/Common.js b/components/Common.js index 683c8ea..0bfdefb 100644 --- a/components/Common.js +++ b/components/Common.js @@ -6,11 +6,12 @@ export const render = async function (path, params, cfg) { let paths = path.split("/"); let { render, e } = cfg; let _layout_path = process.cwd() + "/plugins/xiaoyao-cvs-plugin/resources/"; + let layout_path= process.cwd() + "/plugins/xiaoyao-cvs-plugin/resources/common/layout/"; let base64 = await render1(paths[0], paths[1], { ...params, _layout_path, - defaultLayout: _layout_path + "default.html", - elemLayout: _layout_path + "elem.html", + defaultLayout: layout_path + "default.html", + elemLayout: layout_path + "elem.html", sys: { scale: Cfg.scale(cfg.scale || 1), copyright: `Created By Yunzai-Bot${yunzaiVersion} & xiaoyao-cvs-Plugin${currentVersion}` diff --git a/index.js b/index.js index 922e9b4..104cf6e 100644 --- a/index.js +++ b/index.js @@ -40,7 +40,7 @@ let rule = { describe: "查看插件的功能", }, AtlasAlias: { - reg: "#*(.*)(信息|图鉴|命座|天赋|突破|材料|特色料理|特殊料理)$", + reg: "#*(.*)$", describe: "角色、食物、怪物、武器信息图鉴", }, Note: { diff --git a/resources/Atlas_alias/mijin_tujian.json b/resources/Atlas_alias/mijin_tujian.json new file mode 100644 index 0000000..e0406e3 --- /dev/null +++ b/resources/Atlas_alias/mijin_tujian.json @@ -0,0 +1,133 @@ +{ + "沉眠之庭": [ + "沉眠之庭本", + "华馆本", + "华馆梦醒形骸记本", + "海染本", + "海染本", + "砗磲本", + "砗磲本", + "海染砗磲本" + ], + "芬德尼尔之顶": [ + "芬德尼尔之顶本", + "沉沦之心本", + "沉沦本", + "水本", + "水套本", + "冰风迷途的勇士本", + "冰风本", + "冰本", + "冰套本" + ], + + "孤云凌霄之处": [ + "孤云凌霄之处本", + "岩本", + "磐岩本", + "悠古的磐岩本", + "逆飞本", + "流星本", + "逆飞的流星本" + ], + "椛染之庭": [ + "椛染之庭本", + "绝缘本", + "绝缘之旗印本", + "追忆本", + "追忆之注连本" + ], + "华池岩岫": [ + "华池岩岫本", + "染血本", + "骑士本", + "染血的骑士道本", + "宗室本", + "昔日宗室之仪本" + ], + "铭记之谷": [ + "铭记之谷本", + "翠绿本", + "翠绿之影本", + "风本", + "少女本", + "被怜爱的少女本" + ], + "山脊守望": [ + "山脊守望本", + "千岩本", + "千岩牢固本", + "苍白本", + "苍白之火本" + ], + "无妄引咎密宫": [ + "无妄引咎密宫本", + "魔女本", + "火本", + "炽烈的炎之魔女本", + "渡火本", + "渡过烈火的贤人本" + ], + "岩中幽谷": [ + "岩中幽谷本", + "辰砂本", + "往生录本", + "辰砂往生录本", + "余响本", + "来歆本", + "来歆余响本" + ], + "仲夏庭园": [ + "仲夏庭园本", + "如雷本", + "如雷的盛怒本", + "平雷本", + "平息鸣雷的尊者本" + ], + "震雷连山密宫": [ + "震雷连山密宫本", + "孤云本", + "孤云", + "雾海本", + "雾海", + "漆黑本", + "漆黑" + ], + "塞西莉亚苗圃": [ + "塞西莉亚苗圃本", + "高塔本", + "高塔", + "凛风本", + "凛风", + "狮牙本", + "狮牙" + ], + "砂流之庭": [ + "砂流之庭本", + "远海本", + "远海", + "鸣神本", + "鸣神", + "今昔本", + "今昔" + ], + "太山府": [ + "太山府本", + "繁荣本", + "繁荣", + "勤劳本", + "勤劳", + "黄金本", + "黄金" + ], + "忘却之峡": [ + "忘却之峡本", + "自由本", + "自由", + "抗争本", + "抗争", + "诗文本", + "诗文" + ], + "堇色之庭": ["菫色之庭","堇色之庭本","菫色之庭本","浮世本","浮世","风雅本","风雅","天光本","天光"] +} diff --git a/resources/Atlas_alias/shiwu_tujian.json b/resources/Atlas_alias/shiwu_tujian.json index d4dfe86..ae291a7 100644 --- a/resources/Atlas_alias/shiwu_tujian.json +++ b/resources/Atlas_alias/shiwu_tujian.json @@ -5,50 +5,50 @@ "庄园烤松饼": ["庄园烤松饼", "厚云朵松饼", "诺艾尔"], "嘟嘟莲海鲜羹": ["嘟嘟莲海鲜羹", "极致一钓", "达达利亚"], "黄油松茸": ["黄油松茸"], - "堆高高": ["堆高高", "蒙德往事", "迪卢克"], + "堆高高": ["堆高高", "蒙德往事", "迪卢克", "举高高", "高高"], "蒙德土豆饼": ["蒙德土豆饼", "爪爪土豆饼", "雷泽"], "冷肉拼盘": ["冷肉拼盘", "祝圣交响乐", "菲谢尔"], - "鲜虾脆薯盏": ["鲜虾脆薯盏"], - "稠汁蔬菜炖肉": ["稠汁蔬菜炖肉"], + "鲜虾脆薯盏": ["鲜虾脆薯盏", "鲜虾脆"], + "稠汁蔬菜炖肉": ["稠汁蔬菜炖肉", "炖肉"], "黄油煎鱼": ["黄油煎鱼", "林之梦", "阿贝多"], - "蜜酱胡萝卜煎肉": ["蜜酱胡萝卜煎肉"], + "蜜酱胡萝卜煎肉": ["蜜酱胡萝卜煎肉", "煎肉", "胡罗卜煎肉"], "烤蘑菇披萨": ["烤蘑菇披萨", "提神醒脑披萨", "琴"], "蟹黄火腿焗时蔬": ["蟹黄火腿焗时蔬", "伍玖叁式营养餐", "砂糖"], - "冒险家蛋堡": ["冒险家蛋堡"], + "冒险家蛋堡": ["冒险家蛋堡", "蛋堡"], "月亮派": ["月亮派", "骇浪派", "优菈"], - "北地苹果焖肉": ["北地苹果焖肉"], + "北地苹果焖肉": ["北地苹果焖肉", "焖肉"], "烤吃虎鱼": ["烤吃虎鱼", "绝境求生烤鱼", "刻晴"], - "米窝窝": ["米窝窝"], + "米窝窝": ["米窝窝", "窝窝头"], "香嫩椒椒鸡": ["香嫩椒椒鸡", "摇●滚●鸡!", "辛焱"], - "干炒鱼河": ["干炒鱼河"], - "岩港三鲜": ["岩港三鲜"], + "干炒鱼河": ["干炒鱼河", "河鱼"], + "岩港三鲜": ["岩港三鲜#岩三鲜"], "凉拌薄荷": ["凉拌薄荷"], "素鲍鱼": ["素鲍鱼", "幽幽大行军", "胡桃"], "水晶虾": ["水晶虾", "江湖百味", "行秋"], - "北地烟熏鸡": ["北地烟熏鸡"], + "北地烟熏鸡": ["北地烟熏鸡", "烟熏鸡"], "山珍热卤面": ["山珍热卤面", "山珍凉卤面", "重云"], "莲子禽蛋羹": ["莲子禽蛋羹", "云遮玉", "云堇"], "蟹黄豆腐": ["蟹黄豆腐", "自有方圆", "烟绯"], "四方和平": ["四方和平", "盛世太平", "甘雨"], "松鼠鱼": ["松鼠鱼"], "来来菜": ["来来菜", "没有未来菜", "七七"], - "轻策农家菜": ["轻策农家菜"], - "绝云锅巴": ["绝云锅巴"], - "干锅腊肉": ["干锅腊肉"], + "轻策农家菜": ["轻策农家菜", "农家菜"], + "绝云锅巴": ["绝云锅巴", "锅巴"], + "干锅腊肉": ["干锅腊肉", "腊肉"], "腌笃鲜": ["腌笃鲜", "文火慢炖腌笃鲜", "钟离"], "清炒虾仁": ["清炒虾仁", "沾露虾仁", "夜兰"], - "兽肉薄荷卷": ["兽肉薄荷卷"], + "兽肉薄荷卷": ["兽肉薄荷卷", "薄荷卷"], "水煮黑背鲈": ["水煮黑背鲈", "万民堂水煮鱼", "香菱"], - "明月蛋": ["明月蛋"], - "金丝虾球": ["金丝虾球"], + "明月蛋": ["明月蛋", "蛋"], + "金丝虾球": ["金丝虾球", "虾球"], "龙须面": ["龙须面", "连心面", "申鹤"], "扣三丝": ["扣三丝", "海灯节特色扣三丝"], "莲花酥": ["莲花酥"], "鸡豆花": ["鸡豆花"], - "中原杂碎": ["中原杂碎"], - "仙跳墙": ["仙跳墙"], + "中原杂碎": ["中原杂碎", "杂碎"], + "仙跳墙": ["仙跳墙", "猴戏墙"], "天枢肉": ["天枢肉"], - "翡玉什锦袋": ["翡玉什锦袋"], + "翡玉什锦袋": ["翡玉什锦袋", "翡翠袋"], "干烧香鱼": ["干烧香鱼", "雨奇晴好", "枫原万叶"], "鸟蛋寿司": ["鸟蛋寿司", "奇策", "珊瑚宫心海"], "鸟蛋烧": ["鸟蛋烧", "永恒的信仰", "九条裟罗"], @@ -56,33 +56,33 @@ "甜虾寿司": ["甜虾寿司"], "味噌汤": ["味噌汤", "暖意", "托马"], "黄金蟹": ["黄金蟹"], - "炸肉排三明治": ["炸肉排三明治"], + "炸肉排三明治": ["炸肉排三明治", "三明治", "炸肉排"], "爆炒肉片": ["爆炒肉片", "炝炒肉片", "北斗"], "乌冬面": ["乌冬面", "福内乌冬", "八重神子"], "山家烧": ["山家烧"], - "金枪鱼寿司": ["金枪鱼寿司"], - "鲜鱼炖萝卜": ["鲜鱼炖萝卜"], - "蒲烧鳗肉": ["蒲烧鳗肉"], + "金枪鱼寿司": ["金枪鱼寿司", "寿司", "金枪鱼"], + "鲜鱼炖萝卜": ["鲜鱼炖萝卜", "炖萝卜"], + "蒲烧鳗肉": ["蒲烧鳗肉", "烧鳗肉"], "杏仁豆腐": ["杏仁豆腐", "美梦", "魈"], "若竹煮": ["若竹煮"], "什锦炒面": ["什锦炒面", "强者之道", "荒泷一斗"], - "松茸酿肉卷": ["松茸酿肉卷"], - "树莓水馒头": ["树莓水馒头"], + "松茸酿肉卷": ["松茸酿肉卷", "酿肉卷"], + "树莓水馒头": ["树莓水馒头", "水馒头"], "三彩团子": ["三彩团子", "夏祭游鱼", "宵宫"], "蛋包饭": ["蛋包饭"], - "五宝腌菜": ["五宝腌菜"], + "五宝腌菜": ["五宝腌菜", "腌菜"], "多多烧": ["多多烧"], - "绯樱虾仙贝": ["绯樱虾仙贝"], + "绯樱虾仙贝": ["绯樱虾仙贝", "虾仙贝"], "珍珠翡翠白玉汤": ["珍珠翡翠白玉汤", "海灯节特色白玉汤"], "串串三味": ["串串三味"], - "鳗肉茶泡饭": ["鳗肉茶泡饭"], - "日落鲷鱼烧": ["日落鲷鱼烧"], + "鳗肉茶泡饭": ["鳗肉茶泡饭", "茶泡饭"], + "日落鲷鱼烧": ["日落鲷鱼烧", "稠鱼烧"], "兽骨拉面": ["兽骨拉面", "常胜传说", "五郎"], "摩拉肉": ["摩拉肉", "乾坤摩拉肉", "凝光"], - "蟹黄壳壳烧": ["蟹黄壳壳烧"], + "蟹黄壳壳烧": ["蟹黄壳壳烧", "蟹黄烧"], "饭团": ["饭团", "头晕回避术·改", "早柚"], "绯樱饼": ["绯樱饼", "红炉一点雪", "神里绫华"], - "绀田煮": ["绀田煮"], + "绀田煮": ["绀田煮", "干田煮"], "活力喵饭": ["活力喵饭"], "渡来禽肉": ["渡来禽肉"], "绯樱天妇罗": ["绯樱天妇罗", "静寂闲雅", "神里绫人"], @@ -90,10 +90,12 @@ "文心豆腐": ["文心豆腐"], "米饭布丁": ["米饭布丁"], "红烩兽肉": ["红烩兽肉"], - "脆脆鸡腿堡": ["脆脆鸡腿堡"], + "脆脆鸡腿堡": ["脆脆鸡腿堡", "汉堡", "鸡腿堡"], "辣肉窝窝头": ["辣肉窝窝头"], - "大黄金吮指鸡": ["大黄金吮指鸡"], + "大黄金吮指鸡": ["大黄金吮指鸡", "吮指原味鸡"], "市井杂煮": ["市井杂煮"], - "丰年有余": ["丰年有余"], - "香浓土豆泥": ["香浓土豆泥"] + "丰年有余": ["丰年有余", "年年有余"], + "香浓土豆泥": ["香浓土豆泥", "土豆泥"], + "应急食物": ["应急食物", "派蒙", "应急食品"], + "甜甜花酿鸡": ["甜甜花酿鸡", "甜甜鸡", "吃鸡"] } diff --git a/resources/Atlas_alias/yuanmo_tujian.json b/resources/Atlas_alias/yuanmo_tujian.json index d15303e..9208926 100644 --- a/resources/Atlas_alias/yuanmo_tujian.json +++ b/resources/Atlas_alias/yuanmo_tujian.json @@ -1,147 +1,129 @@ { - "公子": ["周本公子", "公子周本", "原魔公子", "原魔达达利亚", "周本达达利亚", "达达利亚周本"], - "女士": ["女士", "周本女士", "女士周本", "愚人众女士", "火之魔女", "火魔女"], - "北风的王狼": ["奔狼的领主", "北风狼", "狼王", "周本狼王", "狼王周本"], - "祸津御建鸣神命": ["原魔雷神", "原魔雷电将军", "周本雷电将军", "雷电将军周本", "周本雷神", "雷神周本"], - "若陀龙王": ["肥坨", "龙王", "若陀", "肥宅", "钟离坐骑"], - "裂空的魔龙": ["风魔龙", "风龙", "特瓦林", "温迪坐骑"], - - "雷史莱姆": ["小型雷史莱姆"], - "冰史莱姆": ["小型冰史莱姆"], - "火史莱姆": ["小型火史莱姆"], - "水史莱姆": ["小型水史莱姆"], - "风史莱姆": ["小型风史莱姆", "史莱姆"], - "岩史莱姆": ["小型岩史莱姆"], - "草史莱姆": ["小型草史莱姆"], - - "大型雷史莱姆": ["大雷史莱姆"], - "大型冰史莱姆": ["大冰史莱姆"], - "大型火史莱姆": ["大火史莱姆"], - "大型水史莱姆": ["大水史莱姆"], - "大型风史莱姆": ["大风史莱姆", "大史莱姆"], - "大型岩史莱姆": ["大岩史莱姆"], - "大型草史莱姆": ["大草史莱姆"], - "变异雷史莱姆": ["变异史莱姆", "大黄雷史莱姆", "黄雷史莱姆"], - - "雷飘浮灵": ["雷漂浮灵"], - "冰飘浮灵": ["冰漂浮灵"], - "火飘浮灵": ["火漂浮灵"], - "水飘浮灵": ["水漂浮灵"], - "风飘浮灵": ["风漂浮灵"], - "岩飘浮灵": ["岩漂浮灵"], - "浮游水蕈兽": ["水蕈兽", "浮游水"], - - "狂风之核": ["狂风核", "风核"], - - "无相之冰": ["无相冰", "塔勒特"], - "无相之雷": ["无相雷", "阿莱夫"], - "无相之火": ["无相火", "亚因"], - "无相之水": ["无相水", "希伊"], - "无相之岩": ["无相岩", "基末尔"], - "无相之风": ["无相风", "贝特"], - "纯水精灵": ["纯水", "洛蒂娅"], - "雷音权现": ["雷鸟", "雷霆的大鹫", "菅名卡帕奇莉", "卡帕奇莉"], - "黄金王兽": ["黄金狗", "大流血狗"], - "急冻树": ["冰树","急冻树"], - "爆炎树": ["火树","爆炎树"], - - "丘丘岩盔王": ["岩丘丘王"], - "丘丘雷兜王": ["雷丘丘王"], - "丘丘霜铠王": ["冰丘丘王"], - "丘丘人":["丘丘人"], - "射手丘丘人": ["弓箭丘丘人"], - "冰弹丘丘人": ["冰丘丘人"], - "冰箭丘丘人": ["冰弓丘丘人"], - "火箭丘丘人": ["火弓丘丘人"], - "爆弹丘丘人": ["火丘丘人"], - "雷箭丘丘人": ["雷弓丘丘人"], - "雷弹丘丘人": ["雷丘丘人"], - "冰盾丘丘暴徒": ["冰丘丘暴徒"], - "岩盾丘丘暴徒": ["岩丘丘暴徒"], - "火斧丘丘暴徒": ["火丘丘暴徒"], - "雷盾丘丘暴徒": ["雷丘丘暴徒"], - "奇怪的丘丘人": ["大伟丘"], - "冰丘丘萨满": ["冰萨满"], - "风丘丘萨满": ["风萨满"], - "岩丘丘萨满": ["岩萨满"], - "草丘丘萨满": ["草萨满"], - "雷丘丘萨满": ["雷萨满"], - "水丘丘萨满": ["水萨满"], - - "愚人众·冰萤术士": ["冰萤术士", "冰莹术士"], - "愚人众·火之债务处理人": ["火之债务处理人", "债务处理人", "债务人"], - "愚人众·藏镜仕女": ["藏镜仕女", "镜女"], - "愚人众·雷萤术士": ["原魔雷莹术士", "原魔雷萤术士"], - "愚人众先遣队·冰铳重卫士": ["冰铳重卫士", "愚人众冰铳", "冰铳", "冰胖"], - "愚人众先遣队·岩使游击兵": ["岩使游击兵", "愚人众岩铳", "岩铳", "岩使"], - "愚人众先遣队·水铳重卫士": ["水铳重卫士", "愚人众水铳", "水铳", "水胖"], - "愚人众先遣队·火铳游击兵": ["火铳游击兵", "愚人众火铳", "火铳", "火枪"], - "愚人众先遣队·雷锤前锋军": ["雷锤前锋军", "愚人众雷锤", "雷锤", "雷锤哥"], - "愚人众先遣队·风拳前锋军": ["风拳前锋军", "愚人众风拳", "风拳", "风拳哥"], - - "冰萤": ["冰荧", "冰莹"], - "水萤": ["水荧", "水莹"], - "雷萤": ["雷荧", "雷莹"], - - "盗宝团·雷之药剂师": ["雷之药剂师", "盗宝团雷"], - "盗宝团·粉碎者": ["粉碎者"], - "盗宝团·神射手": ["神射手"], - "盗宝团·火之药剂师": ["火之药剂师", "盗宝团火"], - "盗宝团·海上男儿": ["海上男儿"], - "盗宝团·水之药剂师": ["水之药剂师", "盗宝团水"], - "盗宝团·杂工": ["杂工"], - "盗宝团·斥候": ["斥候"], - "盗宝团·掘墓者": ["掘墓者"], - "盗宝团·拳术家": ["拳术家"], - "盗宝团·冰之药剂师": ["冰之药剂师", "盗宝团冰"], - - "海乱鬼·炎威": ["火海乱鬼", "火武士"], - "海乱鬼·雷腾": ["雷海乱鬼", "海乱鬼", "雷武士"], - "野伏·机巧番": ["机巧番"], - "野伏·火付番": ["火付番"], - "野伏·阵刀番": ["阵刀番", "野伏众"], - - "冰霜骗骗花": ["冰骗骗花"], - "炽热骗骗花": ["火骗骗花"], - "电气骗骗花": ["雷骗骗花", "骗骗花"], - - "恒常机关阵列": ["恒常机关", "无相铁"], - "遗迹巨蛇": ["巨蛇", "大蛇", "铁蛇", "岩蛇"], - "魔偶剑鬼": ["剑鬼", "魔偶"], - "遗迹守卫": ["独眼小宝", "小宝", "守卫"], - "遗迹猎者": ["猎者"], - "遗迹重机": ["重机", "独眼大宝", "大宝"], - "遗迹侦察者": ["侦察者"], - "遗迹巡弋者": ["巡弋者"], - "遗迹歼击者": ["歼击者"], - "遗迹防卫者": ["防卫者"], - - "古岩龙蜥": ["古龙蜥"], - "岩龙蜥": ["龙蜥"], - "幼岩龙蜥": ["幼龙蜥", "小龙蜥"], - - "大雪猪王": ["大雪猪", "雪猪王"], - - "深渊使徒·激流": ["激流", "水使徒"], - "深渊咏者·渊火": ["渊火", "火使徒", "火咏者"], - "深渊咏者·紫电": ["紫电", "雷使徒", "雷咏者"], - "火深渊法师": ["火法师"], - "水深渊法师": ["水法师"], - "冰深渊法师": ["冰法师"], - "雷深渊法师": ["雷法师"], - - "深海龙蜥·吞雷": ["吞雷", "雷龙蜥"], - "深海龙蜥·啮冰": ["啮冰", "冰龙蜥"], - "深海龙蜥·原种": ["原种", "原种龙蜥"], - "深海龙蜥之群": ["深海龙蜥", "深海龙蜥群"], - - "嗜岩·兽境幼兽": ["岩兽境幼兽", "小岩流血狗"], - "嗜雷·兽境幼兽": ["雷兽境幼兽", "小雷流血狗", "小流血狗"], - "嗜雷·兽境猎犬": ["雷兽境猎犬", "雷流血狗", "流血狗"], - "嗜岩·兽境猎犬": ["岩兽境猎犬", "岩流血狗"], - - "黑蛇骑士·斩风之剑": ["黑蛇骑士", "黑蛇众"], - "黯色空壳·旗令": ["黯色空壳", "火黯色空壳"], - "黯色空壳·破阵": ["雷黯色空壳"], - "黯色空壳·近卫": ["冰黯色空壳"] -} \ No newline at end of file + "公子": ["周本公子", "公子周本", "原魔公子", "原魔达达利亚", "周本达达利亚", "达达利亚周本", "公子", "玩具销售员"], + "女士": ["女士", "周本女士", "女士周本", "愚人众女士", "火之魔女", "火魔女"], + "北风的王狼": ["奔狼的领主", "北风狼", "狼王", "周本狼王", "狼王周本", "二哈", "安德琉斯", "北风的狼王", "北风守护"], + "祸津御建鸣神命": ["原魔雷神", "原魔雷电将军", "周本雷电将军", "雷电将军周本", "周本雷神", "雷神周本", "御建所大人", "雷军", "原魔雷军"], + "若陀龙王": ["肥坨", "龙王", "若陀", "肥宅", "钟离坐骑#坨子哥", "坨坨"], + "裂空的魔龙": ["风魔龙", "风龙", "特瓦林", "温迪坐骑"], + "雷史莱姆": ["小型雷史莱姆", "小蕾姆"], + "冰史莱姆": ["小型冰史莱姆", "小冰姆"], + "火史莱姆": ["小型火史莱姆", "小火姆"], + "水史莱姆": ["小型水史莱姆", "小水母"], + "风史莱姆": ["小型风史莱姆", "史莱姆", "小风姆"], + "岩史莱姆": ["小型岩史莱姆", "小岩姆"], + "草史莱姆": ["小型草史莱姆", "小草姆"], + "大型雷史莱姆": ["大雷史莱姆", "大蕾姆"], + "大型冰史莱姆": ["大冰史莱姆", "大冰姆"], + "大型火史莱姆": ["大火史莱姆大火姆"], + "大型水史莱姆": ["大水史莱姆", "大水母"], + "大型风史莱姆": ["大风史莱姆", "大史莱姆", "大风姆"], + "大型岩史莱姆": ["大岩史莱姆", "大岩姆"], + "大型草史莱姆": ["大草史莱姆", "大草姆"], + "变异雷史莱姆": ["变异史莱姆", "大黄雷史莱姆", "黄雷史莱姆", "大黄姆"], + "雷飘浮灵": ["雷漂浮灵", "雷灵"], + "冰飘浮灵": ["冰漂浮灵", "冰灵"], + "火飘浮灵": ["火漂浮灵", "火灵"], + "水飘浮灵": ["水漂浮灵", "水灵"], + "风飘浮灵": ["风漂浮灵", "风灵"], + "岩飘浮灵": ["岩漂浮灵", "岩灵"], + "浮游水蕈兽": ["水蕈兽", "浮游水", "吐泡泡"], + "狂风之核": ["狂风核", "风核"], + "无相之冰": ["无相冰", "塔勒特"], + "无相之雷": ["无相雷", "阿莱夫"], + "无相之火": ["无相火", "亚因##风火轮"], + "无相之水": ["无相水", "希伊", "恶心第二"], + "无相之岩": ["无相岩", "基末尔"], + "无相之风": ["无相风", "贝特"], + "纯水精灵": ["纯水", "洛蒂娅", "贼恶心"], + "雷音权现": ["雷鸟", "雷霆的大鹫", "菅名卡帕奇莉", "卡帕奇莉"], + "黄金王兽": ["黄金狗", "大流血狗"], + "急冻树": ["冰树", "急冻树"], + "爆炎树": ["火树", "爆炎树"], + "丘丘岩盔王": ["岩丘丘王", "岩丘王"], + "丘丘雷兜王": ["雷丘丘王", "雷丘王"], + "丘丘霜铠王": ["冰丘丘王", "铠王", "霜铠王", "冰丘王", "冰铠王"], + "丘丘人": ["丘丘人#qq人"], + "射手丘丘人": ["弓箭丘丘人", "弓qq"], + "冰弹丘丘人": ["冰丘丘人", "冰qq"], + "冰箭丘丘人": ["冰弓丘丘人", "冰弓qq"], + "火箭丘丘人": ["火弓丘丘人", "火弓qq"], + "爆弹丘丘人": ["火丘丘人", "火弓qq"], + "雷箭丘丘人": ["雷弓丘丘人", "雷弓qq"], + "雷弹丘丘人": ["雷丘丘人", "雷qq"], + "冰盾丘丘暴徒": ["冰丘丘暴徒", "冰暴徒"], + "岩盾丘丘暴徒": ["岩丘丘暴徒"], + "火斧丘丘暴徒": ["火丘丘暴徒", "岩暴徒"], + "雷盾丘丘暴徒": ["雷丘丘暴徒", "雷暴徒"], + "奇怪的丘丘人": ["大伟丘", "大伟哥"], + "冰丘丘萨满": ["冰萨满"], + "风丘丘萨满": ["风萨满"], + "岩丘丘萨满": ["岩萨满"], + "草丘丘萨满": ["草萨满"], + "雷丘丘萨满": ["雷萨满"], + "水丘丘萨满": ["水萨满"], + "愚人众·冰萤术士": ["冰萤术士", "冰莹术士"], + "愚人众·火之债务处理人": ["火之债务处理人", "债务处理人", "债务人"], + "愚人众·藏镜仕女": ["藏镜仕女", "镜女"], + "愚人众·雷萤术士": ["原魔雷莹术士", "原魔雷萤术士", "萤术士"], + "愚人众先遣队·冰铳重卫士": ["冰铳重卫士", "愚人众冰铳", "冰铳", "冰胖"], + "愚人众先遣队·岩使游击兵": ["岩使游击兵", "愚人众岩铳", "岩铳", "岩使"], + "愚人众先遣队·水铳重卫士": ["水铳重卫士", "愚人众水铳", "水铳", "水胖"], + "愚人众先遣队·火铳游击兵": ["火铳游击兵", "愚人众火铳", "火铳", "火枪"], + "愚人众先遣队·雷锤前锋军": ["雷锤前锋军", "愚人众雷锤", "雷锤", "雷锤哥"], + "愚人众先遣队·风拳前锋军": ["风拳前锋军", "愚人众风拳", "风拳", "风拳哥"], + "冰萤": ["冰荧", "冰莹"], + "水萤": ["水荧", "水莹"], + "雷萤": ["雷荧", "雷莹"], + "盗宝团·雷之药剂师": ["雷之药剂师", "盗宝团雷"], + "盗宝团·粉碎者": ["粉碎者"], + "盗宝团·神射手": ["神射手"], + "盗宝团·火之药剂师": ["火之药剂师", "盗宝团火"], + "盗宝团·海上男儿": ["海上男儿"], + "盗宝团·水之药剂师": ["水之药剂师", "盗宝团水"], + "盗宝团·杂工": ["杂工"], + "盗宝团·斥候": ["斥候"], + "盗宝团·掘墓者": ["掘墓者"], + "盗宝团·拳术家": ["拳术家"], + "盗宝团·冰之药剂师": ["冰之药剂师", "盗宝团冰"], + "海乱鬼·炎威": ["火海乱鬼", "火武士"], + "海乱鬼·雷腾": ["雷海乱鬼", "海乱鬼", "雷武士"], + "野伏·机巧番": ["机巧番"], + "野伏·火付番": ["火付番"], + "野伏·阵刀番": ["阵刀番", "野伏众"], + "冰霜骗骗花": ["冰骗骗花"], + "炽热骗骗花": ["火骗骗花"], + "电气骗骗花": ["雷骗骗花", "骗骗花"], + "恒常机关阵列": ["恒常机关", "无相铁"], + "遗迹巨蛇": ["巨蛇", "大蛇", "铁蛇", "岩蛇"], + "魔偶剑鬼": ["剑鬼", "魔偶"], + "遗迹守卫": ["独眼小宝", "小宝", "守卫"], + "遗迹猎者": ["猎者", "飞天小宝"], + "遗迹重机": ["重机", "独眼大宝", "大宝"], + "遗迹侦察者": ["侦察者"], + "遗迹巡弋者": ["巡弋者"], + "遗迹歼击者": ["歼击者"], + "遗迹防卫者": ["防卫者"], + "古岩龙蜥": ["古龙蜥"], + "岩龙蜥": ["龙蜥"], + "幼岩龙蜥": ["幼龙蜥", "小龙蜥"], + "大雪猪王": ["大雪猪", "雪猪王"], + "深渊使徒·激流": ["激流", "水使徒"], + "深渊咏者·渊火": ["渊火", "火使徒", "火咏者"], + "深渊咏者·紫电": ["紫电", "雷使徒", "雷咏者"], + "火深渊法师": ["火法师", "火法"], + "水深渊法师": ["水法师", "水法"], + "冰深渊法师": ["冰法师", "冰法"], + "雷深渊法师": ["雷法师", "雷法"], + "深海龙蜥·吞雷": ["吞雷", "雷龙蜥"], + "深海龙蜥·啮冰": ["啮冰", "冰龙蜥"], + "深海龙蜥·原种": ["原种", "原种龙蜥"], + "深海龙蜥之群": ["深海龙蜥", "深海龙蜥群"], + "嗜岩·兽境幼兽": ["岩兽境幼兽", "小岩流血狗"], + "嗜雷·兽境幼兽": ["雷兽境幼兽", "小雷流血狗", "小流血狗"], + "嗜雷·兽境猎犬": ["雷兽境猎犬", "雷流血狗", "流血狗"], + "嗜岩·兽境猎犬": ["岩兽境猎犬", "岩流血狗"], + "黑蛇骑士·斩风之剑": ["黑蛇骑士", "黑蛇众"], + "黯色空壳·旗令": ["黯色空壳", "火黯色空壳", "旗令"], + "黯色空壳·破阵": ["雷黯色空壳", "破阵"], + "黯色空壳·近卫": ["冰黯色空壳", "近卫"] +} diff --git a/resources/admin/imgs/bg/bg.png b/resources/admin/imgs/bg/bg.png new file mode 100644 index 0000000..a9af1d8 Binary files /dev/null and b/resources/admin/imgs/bg/bg.png differ diff --git a/resources/admin/imgs/bg/bg_.png b/resources/admin/imgs/bg/bg_.png new file mode 100644 index 0000000..07a9023 Binary files /dev/null and b/resources/admin/imgs/bg/bg_.png differ diff --git a/resources/admin/imgs/cfg-right.jpg b/resources/admin/imgs/cfg-right.jpg new file mode 100644 index 0000000..5bf552a Binary files /dev/null and b/resources/admin/imgs/cfg-right.jpg differ diff --git a/resources/admin/imgs/cfg-right.png b/resources/admin/imgs/cfg-right.png new file mode 100644 index 0000000..fcee367 Binary files /dev/null and b/resources/admin/imgs/cfg-right.png differ diff --git a/resources/admin/index.css b/resources/admin/index.css new file mode 100644 index 0000000..ea49912 --- /dev/null +++ b/resources/admin/index.css @@ -0,0 +1,76 @@ +body { + transform: scale(1); + width: 520px; +} +.container { + /* background: url("./imgs/bg/bg.png") #000144 left top no-repeat; */ + background-size: 520px auto; + width: 520px; +} +.head-box { + margin: 0 0 80px 0; +} +.cfg-box { + border-radius: 15px; + margin-top: 20px; + margin-bottom: 20px; + padding: 5px 15px; + overflow: hidden; + background: #f5f5f5; + box-shadow: 0 5px 10px 0 rgba(0, 0, 0, 0.15); + position: relative; + background: rgba(35, 38, 57, 0.8); +} +.cfg-group { + color: #ceb78b; + font-size: 18px; + font-weight: bold; + padding: 10px 20px; +} +.cfg-li { + border-radius: 18px; + min-height: 36px; + position: relative; + overflow: hidden; + margin-bottom: 10px; + background: rgba(203, 196, 190, 0); +} +.cfg-line { + color: #4e5769; + line-height: 36px; + padding-left: 20px; + font-weight: bold; + border-radius: 16px; + box-shadow: 0 0 2px rgba(0, 0, 0, 0.5); + background: url("./imgs/cfg-right.jpg") right top #cbc4be no-repeat; + background-size: auto 36px; +} +.cfg-hint { + font-size: 12px; + font-weight: normal; + margin-top: 3px; + margin-bottom: -3px; +} +.cfg-status { + position: absolute; + top: 0; + right: 0; + height: 36px; + width: 160px; + text-align: center; + line-height: 36px; + font-size: 16px; + color: #495366; + font-weight: bold; + border-radius: 0 16px 16px 0; + font-family: Number, "微软雅黑", sans-serif; +} +.cfg-status.status-off { + color: #a95151; +} +.cfg-desc { + font-size: 12px; + color: #cbc4be; + margin: 5px 0 5px 20px; +} +/*# sourceMappingURL=index.css.map */ \ No newline at end of file diff --git a/resources/admin/index.html b/resources/admin/index.html new file mode 100644 index 0000000..ca06904 --- /dev/null +++ b/resources/admin/index.html @@ -0,0 +1,113 @@ +{{extend defaultLayout}} + +{{block 'css'}} + + + +{{/block}} +{{block 'main'}} + +
+
+
#图鉴设置
+
图鉴管理面板
+
+
+
+
游戏图鉴卡片展示
+ +
+
+
角色资料与信息查询
+ +
+
+
系统设置
+ + +
+{{/block}} diff --git a/resources/admin/index.less b/resources/admin/index.less new file mode 100644 index 0000000..2df4b93 --- /dev/null +++ b/resources/admin/index.less @@ -0,0 +1,90 @@ +body { + transform: scale(1); + width: 520px; +} + +.container { + background: url("./imgs/bg.png") #000144 left top no-repeat; + background-size: 520px auto; + width:520px; +} + +.head-box { + margin: 0 0 80px 0; +} + +.cfg-box { + border-radius: 15px; + margin-top: 20px; + margin-bottom: 20px; + padding: 5px 15px; + overflow: hidden; + background: #f5f5f5; + box-shadow: 0 5px 10px 0 rgb(0 0 0 / 15%); + position: relative; + background: rgba(35, 38, 57, .8); +} + + +.cfg-group { + color: #ceb78b; + font-size: 18px; + font-weight: bold; + padding: 10px 20px; +} + +.cfg-ul { + +} + +.cfg-li { + border-radius: 18px; + min-height: 36px; + position: relative; + overflow: hidden; + margin-bottom: 10px; + background: rgba(203, 196, 190, 0); +} + +.cfg-line { + color: #4e5769; + line-height: 36px; + padding-left: 20px; + font-weight: bold; + border-radius: 16px; + box-shadow: 0 0 2px rgba(0, 0, 0, 0.5); + background: url("./imgs/cfg-right.jpg") right top #cbc4be no-repeat; + background-size: auto 36px; +} + +.cfg-hint { + font-size: 12px; + font-weight: normal; + margin-top: 3px; + margin-bottom: -3px; +} + +.cfg-status { + position: absolute; + top: 0; + right: 0; + height: 36px; + width: 160px; + text-align: center; + line-height: 36px; + font-size: 16px; + color: #495366; + font-weight: bold; + border-radius: 0 16px 16px 0; + font-family: Number, "微软雅黑", sans-serif; +} + +.cfg-status.status-off { + color: #a95151; +} + +.cfg-desc { + font-size: 12px; + color: #cbc4be; + margin: 5px 0 5px 20px; +} \ No newline at end of file diff --git a/resources/font/HYWenHei.ttf b/resources/font/HYWenHei.ttf new file mode 100644 index 0000000..1ea5700 Binary files /dev/null and b/resources/font/HYWenHei.ttf differ diff --git a/resources/font/MiSans-Bold.ttf b/resources/font/MiSans-Bold.ttf new file mode 100644 index 0000000..13b6185 Binary files /dev/null and b/resources/font/MiSans-Bold.ttf differ diff --git a/resources/font/MiSans-Demibold.ttf b/resources/font/MiSans-Demibold.ttf new file mode 100644 index 0000000..39d5887 Binary files /dev/null and b/resources/font/MiSans-Demibold.ttf differ diff --git a/resources/font/MiSans-ExtraLight.ttf b/resources/font/MiSans-ExtraLight.ttf new file mode 100644 index 0000000..86606c6 Binary files /dev/null and b/resources/font/MiSans-ExtraLight.ttf differ diff --git a/resources/font/MiSans-Heavy.ttf b/resources/font/MiSans-Heavy.ttf new file mode 100644 index 0000000..3d71199 Binary files /dev/null and b/resources/font/MiSans-Heavy.ttf differ diff --git a/resources/font/MiSans-Light.ttf b/resources/font/MiSans-Light.ttf new file mode 100644 index 0000000..bf1af84 Binary files /dev/null and b/resources/font/MiSans-Light.ttf differ diff --git a/resources/font/MiSans-Medium.ttf b/resources/font/MiSans-Medium.ttf new file mode 100644 index 0000000..79b9d10 Binary files /dev/null and b/resources/font/MiSans-Medium.ttf differ diff --git a/resources/font/MiSans-Normal.ttf b/resources/font/MiSans-Normal.ttf new file mode 100644 index 0000000..3199d46 Binary files /dev/null and b/resources/font/MiSans-Normal.ttf differ diff --git a/resources/font/MiSans-Regular.ttf b/resources/font/MiSans-Regular.ttf new file mode 100644 index 0000000..9cbfff5 Binary files /dev/null and b/resources/font/MiSans-Regular.ttf differ diff --git a/resources/font/MiSans-Semibold.ttf b/resources/font/MiSans-Semibold.ttf new file mode 100644 index 0000000..83c1a53 Binary files /dev/null and b/resources/font/MiSans-Semibold.ttf differ diff --git a/resources/font/MiSans-Thin.ttf b/resources/font/MiSans-Thin.ttf new file mode 100644 index 0000000..3ef2ef6 Binary files /dev/null and b/resources/font/MiSans-Thin.ttf differ diff --git a/resources/help/version-info.css b/resources/help/version-info.css index 069a8c8..0758627 100644 --- a/resources/help/version-info.css +++ b/resources/help/version-info.css @@ -7,7 +7,6 @@ body { font-size: 18px; color: #1e1f20; - font-family: Number, YS2; transform: scale(1.3); transform-origin: 0 0; width: 520px; @@ -32,9 +31,6 @@ body { .log-cont .cont-title.current-version { font-size: 20px; } -.log-cont .cont-body { - font-family: Number, YS2; -} .log-cont ul { font-size: 14px; padding-left: 20px; @@ -46,13 +42,15 @@ body { margin: 1px 0; } .log-cont .cmd { - font-family: Number, YS; color: #d3bc8e; display: inline-block; border-radius: 3px; background: rgba(0, 0, 0, 0.5); padding: 0 3px; - margin: 1px 3px; + margin: 1px 2px; +} +.log-cont .strong { + color: #24d5cd; } .log-cont .new { display: inline-block; @@ -61,7 +59,6 @@ body { } .log-cont .new:before { content: "NEW"; - font-family: Number; display: inline-block; transform: scale(0.6); transform-origin: 0 0; diff --git a/resources/help/version-info.html b/resources/help/version-info.html index 74f53ca..11b56bc 100644 --- a/resources/help/version-info.html +++ b/resources/help/version-info.html @@ -11,7 +11,7 @@ {{if idx === 0 }}
当前版本 {{ds.version}}
{{else}} -
喵喵版本 {{ds.version}}
+
图鉴版本 {{ds.version}}
{{/if}}