diff --git a/apps/profile/ProfileList.js b/apps/profile/ProfileList.js index 442d4499..3aaeffe4 100644 --- a/apps/profile/ProfileList.js +++ b/apps/profile/ProfileList.js @@ -133,9 +133,11 @@ const ProfileList = { groupRank, updateTime: player.getUpdateTime(), allowRank: rank && rank.allowRank, - rankCfg + rankCfg, + elem: player.isGs ? 'hydro' : 'sr' }, { e, scale: 1.6 }) }, + /** * 删除面板数据 * @param e diff --git a/models/artis/ArtisAttr.js b/models/artis/ArtisAttr.js index 8f22e2c3..a5517099 100644 --- a/models/artis/ArtisAttr.js +++ b/models/artis/ArtisAttr.js @@ -95,7 +95,6 @@ let AttrSR = { } } export default { - getData (arti, idx = 1, game = 'gs') { let tmp = game === 'gs' ? AttrGS : AttrSR return tmp.getData(arti.mainId, arti.attrIds, arti.level, arti.star, idx) diff --git a/resources/common/bg/bg-anemo.jpg b/resources/common/bg/bg-anemo.jpg deleted file mode 100644 index 985a7d47..00000000 Binary files a/resources/common/bg/bg-anemo.jpg and /dev/null differ diff --git a/resources/common/bg/bg-anemo.webp b/resources/common/bg/bg-anemo.webp new file mode 100644 index 00000000..66f992a0 Binary files /dev/null and b/resources/common/bg/bg-anemo.webp differ diff --git a/resources/common/bg/bg-cryo.jpg b/resources/common/bg/bg-cryo.jpg deleted file mode 100644 index cf4bd1d1..00000000 Binary files a/resources/common/bg/bg-cryo.jpg and /dev/null differ diff --git a/resources/common/bg/bg-cryo.webp b/resources/common/bg/bg-cryo.webp new file mode 100644 index 00000000..56632bee Binary files /dev/null and b/resources/common/bg/bg-cryo.webp differ diff --git a/resources/common/bg/bg-dendro.jpg b/resources/common/bg/bg-dendro.jpg deleted file mode 100644 index b900d286..00000000 Binary files a/resources/common/bg/bg-dendro.jpg and /dev/null differ diff --git a/resources/common/bg/bg-dendro.webp b/resources/common/bg/bg-dendro.webp new file mode 100644 index 00000000..ded89f68 Binary files /dev/null and b/resources/common/bg/bg-dendro.webp differ diff --git a/resources/common/bg/bg-electro.jpg b/resources/common/bg/bg-electro.jpg deleted file mode 100644 index 5dec7463..00000000 Binary files a/resources/common/bg/bg-electro.jpg and /dev/null differ diff --git a/resources/common/bg/bg-electro.webp b/resources/common/bg/bg-electro.webp new file mode 100644 index 00000000..1385395c Binary files /dev/null and b/resources/common/bg/bg-electro.webp differ diff --git a/resources/common/bg/bg-geo.jpg b/resources/common/bg/bg-geo.jpg deleted file mode 100644 index d68405f8..00000000 Binary files a/resources/common/bg/bg-geo.jpg and /dev/null differ diff --git a/resources/common/bg/bg-geo.webp b/resources/common/bg/bg-geo.webp new file mode 100644 index 00000000..4edcb7c1 Binary files /dev/null and b/resources/common/bg/bg-geo.webp differ diff --git a/resources/common/bg/bg-hydro.jpg b/resources/common/bg/bg-hydro.jpg deleted file mode 100644 index cc262f74..00000000 Binary files a/resources/common/bg/bg-hydro.jpg and /dev/null differ diff --git a/resources/common/bg/bg-hydro.webp b/resources/common/bg/bg-hydro.webp new file mode 100644 index 00000000..33969c26 Binary files /dev/null and b/resources/common/bg/bg-hydro.webp differ diff --git a/resources/common/bg/bg-pyro.jpg b/resources/common/bg/bg-pyro.jpg deleted file mode 100644 index 302d6129..00000000 Binary files a/resources/common/bg/bg-pyro.jpg and /dev/null differ diff --git a/resources/common/bg/bg-pyro.webp b/resources/common/bg/bg-pyro.webp new file mode 100644 index 00000000..0a3ba4bf Binary files /dev/null and b/resources/common/bg/bg-pyro.webp differ diff --git a/resources/common/bg/bg-quantum.webp b/resources/common/bg/bg-quantum.webp new file mode 100644 index 00000000..782814c4 Binary files /dev/null and b/resources/common/bg/bg-quantum.webp differ diff --git a/resources/common/bg/bg-sr.jpg b/resources/common/bg/bg-sr.webp similarity index 100% rename from resources/common/bg/bg-sr.jpg rename to resources/common/bg/bg-sr.webp diff --git a/resources/common/bg/talent-anemo.png b/resources/common/bg/talent-anemo.png deleted file mode 100644 index e9926f28..00000000 Binary files a/resources/common/bg/talent-anemo.png and /dev/null differ diff --git a/resources/common/bg/talent-anemo.webp b/resources/common/bg/talent-anemo.webp new file mode 100644 index 00000000..65ef92ba Binary files /dev/null and b/resources/common/bg/talent-anemo.webp differ diff --git a/resources/common/bg/talent-cryo.png b/resources/common/bg/talent-cryo.png deleted file mode 100644 index 2defb365..00000000 Binary files a/resources/common/bg/talent-cryo.png and /dev/null differ diff --git a/resources/common/bg/talent-cryo.webp b/resources/common/bg/talent-cryo.webp new file mode 100644 index 00000000..1e18369c Binary files /dev/null and b/resources/common/bg/talent-cryo.webp differ diff --git a/resources/common/bg/talent-dendro.png b/resources/common/bg/talent-dendro.png deleted file mode 100644 index 2359d71a..00000000 Binary files a/resources/common/bg/talent-dendro.png and /dev/null differ diff --git a/resources/common/bg/talent-dendro.webp b/resources/common/bg/talent-dendro.webp new file mode 100644 index 00000000..835b622a Binary files /dev/null and b/resources/common/bg/talent-dendro.webp differ diff --git a/resources/common/bg/talent-electro.png b/resources/common/bg/talent-electro.png deleted file mode 100644 index 8e3c59da..00000000 Binary files a/resources/common/bg/talent-electro.png and /dev/null differ diff --git a/resources/common/bg/talent-electro.webp b/resources/common/bg/talent-electro.webp new file mode 100644 index 00000000..2ff465df Binary files /dev/null and b/resources/common/bg/talent-electro.webp differ diff --git a/resources/common/bg/talent-geo.png b/resources/common/bg/talent-geo.png deleted file mode 100644 index 87d7d0d3..00000000 Binary files a/resources/common/bg/talent-geo.png and /dev/null differ diff --git a/resources/common/bg/talent-geo.webp b/resources/common/bg/talent-geo.webp new file mode 100644 index 00000000..3de3860d Binary files /dev/null and b/resources/common/bg/talent-geo.webp differ diff --git a/resources/common/bg/talent-hydro.png b/resources/common/bg/talent-hydro.png deleted file mode 100644 index 94081178..00000000 Binary files a/resources/common/bg/talent-hydro.png and /dev/null differ diff --git a/resources/common/bg/talent-hydro.webp b/resources/common/bg/talent-hydro.webp new file mode 100644 index 00000000..4836d841 Binary files /dev/null and b/resources/common/bg/talent-hydro.webp differ diff --git a/resources/common/bg/talent-pyro.png b/resources/common/bg/talent-pyro.png deleted file mode 100644 index 3349fde9..00000000 Binary files a/resources/common/bg/talent-pyro.png and /dev/null differ diff --git a/resources/common/bg/talent-pyro.webp b/resources/common/bg/talent-pyro.webp new file mode 100644 index 00000000..e507798a Binary files /dev/null and b/resources/common/bg/talent-pyro.webp differ diff --git a/resources/common/bg/talent-quantum.webp b/resources/common/bg/talent-quantum.webp new file mode 100644 index 00000000..7b69af3f Binary files /dev/null and b/resources/common/bg/talent-quantum.webp differ diff --git a/resources/common/bg/talent-sr.webp b/resources/common/bg/talent-sr.webp new file mode 100644 index 00000000..18de4c36 Binary files /dev/null and b/resources/common/bg/talent-sr.webp differ diff --git a/resources/common/common.css b/resources/common/common.css index f21e5890..6c979655 100644 --- a/resources/common/common.css +++ b/resources/common/common.css @@ -206,53 +206,67 @@ body { } /******** ELEM ********/ .elem-hydro .talent-icon { - background-image: url("./bg/talent-hydro.png"); + background-image: url("./bg/talent-hydro.webp"); } .elem-hydro .elem-bg, .hydro-bg { - background-image: url("./bg/bg-hydro.jpg"); + background-image: url("./bg/bg-hydro.webp"); } .elem-anemo .talent-icon { - background-image: url("./bg/talent-anemo.png"); + background-image: url("./bg/talent-anemo.webp"); } .elem-anemo .elem-bg, .anemo-bg { - background-image: url("./bg/bg-anemo.jpg"); + background-image: url("./bg/bg-anemo.webp"); } .elem-cryo .talent-icon { - background-image: url("./bg/talent-cryo.png"); + background-image: url("./bg/talent-cryo.webp"); } .elem-cryo .elem-bg, .cryo-bg { - background-image: url("./bg/bg-cryo.jpg"); + background-image: url("./bg/bg-cryo.webp"); } .elem-electro .talent-icon { - background-image: url("./bg/talent-electro.png"); + background-image: url("./bg/talent-electro.webp"); } .elem-electro .elem-bg, .electro-bg { - background-image: url("./bg/bg-electro.jpg"); + background-image: url("./bg/bg-electro.webp"); } .elem-geo .talent-icon { - background-image: url("./bg/talent-geo.png"); + background-image: url("./bg/talent-geo.webp"); } .elem-geo .elem-bg, .geo-bg { - background-image: url("./bg/bg-geo.jpg"); + background-image: url("./bg/bg-geo.webp"); } .elem-pyro .talent-icon { - background-image: url("./bg/talent-pyro.png"); + background-image: url("./bg/talent-pyro.webp"); } .elem-pyro .elem-bg, .pyro-bg { - background-image: url("./bg/bg-pyro.jpg"); + background-image: url("./bg/bg-pyro.webp"); } .elem-dendro .talent-icon { - background-image: url("./bg/talent-dendro.png"); + background-image: url("./bg/talent-dendro.webp"); } .elem-dendro .elem-bg, .dendro-bg { - background-image: url("./bg/bg-dendro.jpg"); + background-image: url("./bg/bg-dendro.webp"); +} +.elem-quantum .talent-icon { + background-image: url("./bg/talent-quantum.webp"); +} +.elem-quantum .elem-bg, +.quantum-bg { + background-image: url("./bg/bg-quantum.webp"); +} +.elem-sr .talent-icon { + background-image: url("./bg/talent-sr.webp"); +} +.elem-sr .elem-bg, +.sr-bg { + background-image: url("./bg/bg-sr.webp"); } /* cont */ .cont { diff --git a/resources/common/common.less b/resources/common/common.less index 84fca6b8..f6a59377 100644 --- a/resources/common/common.less +++ b/resources/common/common.less @@ -163,16 +163,16 @@ body { /******** ELEM ********/ -@elems: hydro, anemo, cryo, electro, geo, pyro, dendro; +@elems: hydro, anemo, cryo, electro, geo, pyro, dendro, quantum, sr; each(@elems, { .elem-@{value} .talent-icon { - background-image: url("./bg/talent-@{value}.png"); + background-image: url("./bg/talent-@{value}.webp"); } .elem-@{value} .elem-bg, .@{value}-bg { - background-image: url("./bg/bg-@{value}.jpg"); + background-image: url("./bg/bg-@{value}.webp"); } }) @@ -391,4 +391,4 @@ ul.cont-msg, .cont-footer ul { padding: 4px 5px 3px; border-radius: 0 0 6px 0; } -} \ No newline at end of file +} diff --git a/resources/common/layout/elem.html b/resources/common/layout/elem.html index 7ad2f5da..24d47976 100644 --- a/resources/common/layout/elem.html +++ b/resources/common/layout/elem.html @@ -12,11 +12,11 @@ {{block 'css'}} {{/block}} -{{set elemCls = {火:'pyro',冰:'cryo',风:'anemo',雷:'electro',量子:'electro',虚数:'geo',物理:'hydro', }[element||elem] || element || elem || 'hydro' }} +{{set elemCls = {火:'pyro',冰:'cryo',风:'anemo',雷:'electro',量子:'quantum',虚数:'geo',物理:'sr', }[element||elem] || element || elem || 'hydro' }}
{{block 'main'}}{{/block}}
{{@copyright || sys?.copyright}}
- \ No newline at end of file + diff --git a/resources/meta-gs/artifact/alias.js b/resources/meta-gs/artifact/alias.js new file mode 100644 index 00000000..fb7864e8 --- /dev/null +++ b/resources/meta-gs/artifact/alias.js @@ -0,0 +1,92 @@ +export const setAbbr = { + 炽烈的炎之魔女: '魔女', + 昔日宗室之仪: '宗室', + 翠绿之影: '风套', + 千岩牢固: '千岩', + 流浪大地的乐团: '乐团', + 绝缘之旗印: '绝缘', + 被怜爱的少女: '少女', + 沉沦之心: '水套', + 角斗士的终幕礼: '角斗', + 冰风迷途的勇士: '冰套', + 逆飞的流星: '逆飞', + 苍白之火: '苍白', + 华馆梦醒形骸记: '华馆', + 战狂: '战狂', + 悠古的磐岩: '岩套', + 渡过烈火的贤人: '渡火', + 游医: '游医', + 教官: '教官', + 冒险家: '冒险', + 追忆之注连: '追忆', + 海染砗磲: '海染', + 如雷的盛怒: '如雷', + 染血的骑士道: '染血', + 平息鸣雷的尊者: '平雷', + 流放者: '流放', + 学士: '学士', + 行者之心: '行者', + 幸运儿: '幸运', + 勇士之心: '勇士', + 守护之心: '守护', + 武人: '武人', + 赌徒: '赌徒', + 奇迹: '奇迹', + 辰砂往生录: '辰砂', + 来歆余响: '余响', + 深林的记忆: '草套', + 饰金之梦: '饰金', + 沙上楼阁史话: '沙套', + 乐园遗落之花: '乐园', + 水仙之梦: '水仙', + 花海甘露之光: '花海', + 逐影猎人: '猎人', + 黄金剧团: '剧团' +} + + +export const setAlias = { + 炽烈的炎之魔女: '魔女', + 昔日宗室之仪: '宗室', + 翠绿之影: '风套,翠绿', + 千岩牢固: '千岩', + 流浪大地的乐团: '乐团,流浪', + 绝缘之旗印: '绝缘', + 被怜爱的少女: '少女', + 沉沦之心: '水套,沉沦套', + 角斗士的终幕礼: '角斗,角斗士', + 冰风迷途的勇士: '冰套', + 逆飞的流星: '逆飞,流星', + 苍白之火: '苍白', + 华馆梦醒形骸记: '华馆', + 战狂: '战狂', + 悠古的磐岩: '岩套,磐岩', + 渡过烈火的贤人: '渡火,度火', + 游医: '游医', + 教官: '教官', + 冒险家: '冒险', + 追忆之注连: '追忆,注连', + 海染砗磲: '海染,海染车磲', + 如雷的盛怒: '如雷', + 染血的骑士道: '染血,骑士,骑士道', + 平息鸣雷的尊者: '平雷', + 流放者: '流放', + 学士: '学士', + 行者之心: '行者', + 幸运儿: '幸运', + 勇士之心: '勇士', + 守护之心: '守护', + 武人: '武人', + 赌徒: '赌徒', + 奇迹: '奇迹', + 辰砂往生录: '晨砂往生录,辰沙往生录,晨砂往生录,辰砂,晨砂,辰沙', + 来歆余响: '余响', + 深林的记忆: '草套,深林', + 饰金之梦: '饰金', + 沙上楼阁史话: '沙套,楼阁', + 乐园遗落之花: '乐园', + 水仙之梦: '水仙', + 花海甘露之光: '花海,甘露,甘露花海,花海甘露,甘露花海之光', + 逐影猎人: '逐影,猎人', + 黄金剧团: '黄金,剧团' +} diff --git a/resources/meta-gs/artifact/meta.js b/resources/meta-gs/artifact/extra.js similarity index 81% rename from resources/meta-gs/artifact/meta.js rename to resources/meta-gs/artifact/extra.js index a218faf1..e069ba1d 100644 --- a/resources/meta-gs/artifact/meta.js +++ b/resources/meta-gs/artifact/extra.js @@ -1,107 +1,6 @@ import lodash from 'lodash' import { Format } from '#miao' -export const abbr = { - 炽烈的炎之魔女: '魔女', - 昔日宗室之仪: '宗室', - 翠绿之影: '风套', - 千岩牢固: '千岩', - 流浪大地的乐团: '乐团', - 绝缘之旗印: '绝缘', - 被怜爱的少女: '少女', - 沉沦之心: '水套', - 角斗士的终幕礼: '角斗', - 冰风迷途的勇士: '冰套', - 逆飞的流星: '逆飞', - 苍白之火: '苍白', - 华馆梦醒形骸记: '华馆', - 战狂: '战狂', - 悠古的磐岩: '岩套', - 渡过烈火的贤人: '渡火', - 游医: '游医', - 教官: '教官', - 冒险家: '冒险', - 追忆之注连: '追忆', - 海染砗磲: '海染', - 如雷的盛怒: '如雷', - 染血的骑士道: '染血', - 平息鸣雷的尊者: '平雷', - 流放者: '流放', - 学士: '学士', - 行者之心: '行者', - 幸运儿: '幸运', - 勇士之心: '勇士', - 守护之心: '守护', - 武人: '武人', - 赌徒: '赌徒', - 奇迹: '奇迹', - 辰砂往生录: '辰砂', - 来歆余响: '余响', - 深林的记忆: '草套', - 饰金之梦: '饰金', - 沙上楼阁史话: '沙套', - 乐园遗落之花: '乐园', - 水仙之梦: '水仙', - 花海甘露之光: '花海', - 逐影猎人: '猎人', - 黄金剧团: '剧团' -} - - -export const aliasCfg = { - 炽烈的炎之魔女: '魔女', - 昔日宗室之仪: '宗室', - 翠绿之影: '风套,翠绿', - 千岩牢固: '千岩', - 流浪大地的乐团: '乐团,流浪', - 绝缘之旗印: '绝缘', - 被怜爱的少女: '少女', - 沉沦之心: '水套,沉沦套', - 角斗士的终幕礼: '角斗,角斗士', - 冰风迷途的勇士: '冰套', - 逆飞的流星: '逆飞,流星', - 苍白之火: '苍白', - 华馆梦醒形骸记: '华馆', - 战狂: '战狂', - 悠古的磐岩: '岩套,磐岩', - 渡过烈火的贤人: '渡火,度火', - 游医: '游医', - 教官: '教官', - 冒险家: '冒险', - 追忆之注连: '追忆,注连', - 海染砗磲: '海染,海染车磲', - 如雷的盛怒: '如雷', - 染血的骑士道: '染血,骑士,骑士道', - 平息鸣雷的尊者: '平雷', - 流放者: '流放', - 学士: '学士', - 行者之心: '行者', - 幸运儿: '幸运', - 勇士之心: '勇士', - 守护之心: '守护', - 武人: '武人', - 赌徒: '赌徒', - 奇迹: '奇迹', - 辰砂往生录: '晨砂往生录,辰沙往生录,晨砂往生录,辰砂,晨砂,辰沙', - 来歆余响: '余响', - 深林的记忆: '草套,深林', - 饰金之梦: '饰金', - 沙上楼阁史话: '沙套,楼阁', - 乐园遗落之花: '乐园', - 水仙之梦: '水仙', - 花海甘露之光: '花海,甘露,甘露花海,花海甘露,甘露花海之光', - 逐影猎人: '逐影,猎人', - 黄金剧团: '黄金,剧团' -} -let alias = {} -lodash.forEach(aliasCfg, (txt, name) => { - lodash.forEach(txt.split(','), (t) => { - alias[t] = name - }) - alias[name] = name -}) -export const aliasMap = alias - export const mainAttr = { 3: 'atk,def,hp,mastery,recharge'.split(','), 4: 'atk,def,hp,mastery,dmg,phy'.split(','), diff --git a/resources/meta-gs/artifact/index.js b/resources/meta-gs/artifact/index.js index 262c716f..2356372a 100644 --- a/resources/meta-gs/artifact/index.js +++ b/resources/meta-gs/artifact/index.js @@ -1,7 +1,8 @@ import { Data, Meta } from '#miao' import lodash from 'lodash' import calc from './calc.js' -import * as metaData from './meta.js' +import { mainAttr, subAttr, attrMap, attrNameMap, mainIdMap, attrIdMap } from './extra.js' +import { setAlias, setAbbr } from './alias.js' import { usefulAttr } from './artis-mark.js' let setMeta = Meta.create('gs', 'artiSet') @@ -30,10 +31,10 @@ lodash.forEach(artis, (ds) => { }) }) -setMeta.addAbbr(metaData.abbr) -setMeta.addAlias(metaData.aliasCfg) +setMeta.addAbbr(setAbbr) +setMeta.addAlias(setAlias) artiMeta.addMeta({ - ...Data.getData(metaData, 'mainAttr,subAttr,attrMap,attrNameMap,mainIdMap,attrIdMap'), + mainAttr, subAttr, attrMap, attrNameMap, mainIdMap, attrIdMap, artiBuffs: calc, usefulAttr }) diff --git a/resources/meta-gs/weapon/meta.js b/resources/meta-gs/weapon/alias.js similarity index 96% rename from resources/meta-gs/weapon/meta.js rename to resources/meta-gs/weapon/alias.js index deda3a40..f068376a 100644 --- a/resources/meta-gs/weapon/meta.js +++ b/resources/meta-gs/weapon/alias.js @@ -1,11 +1,3 @@ -export const weaponType = { - polearm: '枪', - catalyst: '法器', - sword: '剑', - bow: '弓', - claymore: '大剑' -} - export const abbr = { 磐岩结绿: '绿剑', 赤角石溃杵: '赤角石', @@ -202,5 +194,3 @@ export const alias = { 烈阳之嗣: '烈阳,烈阳弓', 测距规: '测距,测距弓' } - -export const weaponSet = ['西风', '天空', '试做', '试作', '祭礼', '黑岩', '宗室', '暗巷', '匣里', '千岩'] diff --git a/resources/meta-gs/weapon/desc.js b/resources/meta-gs/weapon/desc.js index ac212632..ab4ecab9 100644 --- a/resources/meta-gs/weapon/desc.js +++ b/resources/meta-gs/weapon/desc.js @@ -48,8 +48,5 @@ export const descFix = { 测距规: '受到或进行治疗时，获得标记，最多3层，处于后台也能获得。施放战技或爆发时，消耗标记：每枚标记提高$[0]攻击力与$[1]元素伤害，持续10秒。', 王下近侍: '施放战技或爆发时，精通提升$[0]点，持续12秒，每20秒至多触发一次。状态结束或切换角色被移除时，对附近一名敌人造成$[1]攻击力的伤害。', 竭泽: '施放战技后获得持续15秒的状态，CD12秒：在攻击命中敌人时造成$[0]攻击力的范围伤害，每2秒至多一次，触发3次后移除。', - - // "施放元素爆发或创造护盾后的3秒内，将产生「定土玉圭」效果：每2.5秒恢复$[0]点元素能量，并基于装备者的生命值上限，每1000点使其对应元素类型的元素伤害加成提高$[1]，至多提高$[2]。装备该武器的角色处于队伍后台时，依然能产生「定土玉圭」效果。", - // } diff --git a/resources/meta-gs/weapon/extra.js b/resources/meta-gs/weapon/extra.js new file mode 100644 index 00000000..b32b1f19 --- /dev/null +++ b/resources/meta-gs/weapon/extra.js @@ -0,0 +1,9 @@ +export const weaponType = { + polearm: '枪', + catalyst: '法器', + sword: '剑', + bow: '弓', + claymore: '大剑' +} + +export const weaponSet = ['西风', '天空', '试做', '试作', '祭礼', '黑岩', '宗室', '暗巷', '匣里', '千岩'] diff --git a/resources/meta-gs/weapon/index.js b/resources/meta-gs/weapon/index.js index 8ddb7d99..f4794e55 100644 --- a/resources/meta-gs/weapon/index.js +++ b/resources/meta-gs/weapon/index.js @@ -1,6 +1,7 @@ import { Data, Meta } from '#miao' import lodash from 'lodash' -import { weaponType, abbr, alias, weaponSet } from './meta.js' +import { abbr, alias } from './alias.js' +import { weaponType, weaponSet } from './extra.js' import { descFix } from './desc.js' let weaponBuffs = {} diff --git a/resources/meta-sr/artifact/alias.js b/resources/meta-sr/artifact/alias.js new file mode 100644 index 00000000..96cb36e4 --- /dev/null +++ b/resources/meta-sr/artifact/alias.js @@ -0,0 +1,81 @@ +export const artiAbbr = { + 快枪手的野穗毡帽: '快枪手的毡帽', + 快枪手的粗革手套: '快枪手的手套', + 快枪手的猎风披肩: '快枪手的披肩', + 快枪手的铆钉马靴: '快枪手的铆钉靴', + 废土客的呼吸面罩: '废土客的面罩', + 废土客的荒漠终端: '废土客的终端', + 废土客的修士长袍: '废土客的长袍', + 废土客的动力腿甲: '废土客的腿甲', + '「黑塔」的空间站点': '黑塔的空间站点', + '「黑塔」的漫历轨迹': '黑塔的漫历轨迹', + 罗浮仙舟的天外楼船: '罗浮仙舟的楼船', + 罗浮仙舟的建木枝蔓: '罗浮仙舟的建木', + 贝洛伯格的存护堡垒: '贝洛伯格的堡垒', + 贝洛伯格的铁卫防线: '贝洛伯格的防线', + 螺丝星的机械烈阳: '螺丝星的烈阳', + 螺丝星的环星孔带: '螺丝星的孔带', + 萨尔索图的移动城市: '萨尔索图的城市', + 萨尔索图的晨昏界线: '萨尔索图的界线', + 塔利亚的钉壳小镇: '塔利亚的小镇', + 塔利亚的裸皮电线: '塔利亚的电线', + 翁瓦克的诞生之岛: '翁瓦克的诞生岛', + 翁瓦克的环岛海岸: '翁瓦克的海岸', + 泰科铵的镭射球场: '泰科铵的球场', + 泰科铵的弧光赛道: '泰科铵的赛道', + 伊须磨洲的残船鲸落: '伊须磨洲的鲸落', + 伊须磨洲的坼裂缆索: '伊须磨洲的缆索' +} +export const artiSetAbbr = { + 盗匪荒漠的废土客: '虚数套', + 繁星璀璨的天才: '量子套', + 激奏雷电的乐队: '雷套', + 熔岩锻铸的火匠: '火套', + 晨昏交界的翔鹰: '风套', + 野穗伴行的快枪手: '快枪手', + 密林卧雪的猎人: '冰套', + 流星追迹的怪盗: '怪盗', + 街头出身的拳王: '拳王', + 云无留迹的过客: '过客', + 戍卫风雪的铁卫: '铁卫', + 净庭教宗的圣骑士: '圣骑士', + 筑城者的贝洛伯格: '筑城者', + 星体差分机: '差分机', + 停转的萨尔索图: '停转', + 不老者的仙舟: '仙舟', + 盗贼公国塔利亚: '盗贼', + 泛银河商业公司: '泛银河', + 太空封印站: '太空', + 生命的翁瓦克: '翁瓦克', + 繁星竞技场: '竞技场', + 折断的龙骨: '龙骨', + 宝命长存的莳者: '莳者', + 骇域漫游的信使: '信使' +} + +export const aliasCfg = { + 盗匪荒漠的废土客: '虚数套,废土', + 繁星璀璨的天才: '量子套', + 激奏雷电的乐队: '雷套,雷电', + 熔岩锻铸的火匠: '火套', + 晨昏交界的翔鹰: '风套', + 野穗伴行的快枪手: '快枪手,快枪', + 密林卧雪的猎人: '冰套', + 流星追迹的怪盗: '怪盗', + 街头出身的拳王: '拳王,物理套', + 云无留迹的过客: '过客,云无留迹', + 戍卫风雪的铁卫: '铁卫,风雪', + 净庭教宗的圣骑士: '圣骑士,圣骑士', + 筑城者的贝洛伯格: '筑城者,贝洛伯格,筑城', + 星体差分机: '差分机,星体', + 停转的萨尔索图: '停转,萨尔索图,萨尔', + 不老者的仙舟: '仙舟,不老者,不老', + 盗贼公国塔利亚: '盗贼,塔利亚', + 泛银河商业公司: '泛银河,银河,商业', + 太空封印站: '太空,封印站', + 生命的翁瓦克: '翁瓦克,生命', + 繁星竞技场: '繁星,竞技场', + 折断的龙骨: '龙骨', + 宝命长存的莳者: '莳者,时者', + 骇域漫游的信使: '信使' +} diff --git a/resources/meta-sr/artifact/index.js b/resources/meta-sr/artifact/index.js index b8deeb68..935acd58 100644 --- a/resources/meta-sr/artifact/index.js +++ b/resources/meta-sr/artifact/index.js @@ -1,7 +1,8 @@ import { Data, Meta } from '#miao' import lodash from 'lodash' import artiBuffs from './calc.js' -import * as metaCfg from './meta.js' +import { mainAttr, subAttr, attrMap } from './meta.js' +import { artiSetAbbr, aliasCfg, artiAbbr } from './alias.js' import { usefulAttr } from './artis-mark.js' @@ -32,14 +33,11 @@ lodash.forEach(data, (setData) => { }) }) -setMeta.addAbbr(metaCfg.artiSetAbbr) -setMeta.addAlias(metaCfg.aliasCfg) +setMeta.addAbbr(artiSetAbbr) +setMeta.addAlias(aliasCfg) -artiMeta.addAbbr(metaCfg.artiAbbr) +artiMeta.addAbbr(artiAbbr) artiMeta.addAlias(idMap, true) artiMeta.addMeta({ - artiBuffs, - metaData, - usefulAttr, - ...Data.getData(metaCfg, 'mainAttr,subAttr,attrMap') + artiBuffs, metaData, usefulAttr, mainAttr, subAttr, attrMap }) diff --git a/resources/meta-sr/artifact/meta.js b/resources/meta-sr/artifact/meta.js index 2b182fdc..01e6cf07 100644 --- a/resources/meta-sr/artifact/meta.js +++ b/resources/meta-sr/artifact/meta.js @@ -52,85 +52,3 @@ lodash.forEach(attrMap, (attr, key) => { }) export { attrMap } - -export const artiAbbr = { - 快枪手的野穗毡帽: '快枪手的毡帽', - 快枪手的粗革手套: '快枪手的手套', - 快枪手的猎风披肩: '快枪手的披肩', - 快枪手的铆钉马靴: '快枪手的铆钉靴', - 废土客的呼吸面罩: '废土客的面罩', - 废土客的荒漠终端: '废土客的终端', - 废土客的修士长袍: '废土客的长袍', - 废土客的动力腿甲: '废土客的腿甲', - '「黑塔」的空间站点': '黑塔的空间站点', - '「黑塔」的漫历轨迹': '黑塔的漫历轨迹', - 罗浮仙舟的天外楼船: '罗浮仙舟的楼船', - 罗浮仙舟的建木枝蔓: '罗浮仙舟的建木', - 贝洛伯格的存护堡垒: '贝洛伯格的堡垒', - 贝洛伯格的铁卫防线: '贝洛伯格的防线', - 螺丝星的机械烈阳: '螺丝星的烈阳', - 螺丝星的环星孔带: '螺丝星的孔带', - 萨尔索图的移动城市: '萨尔索图的城市', - 萨尔索图的晨昏界线: '萨尔索图的界线', - 塔利亚的钉壳小镇: '塔利亚的小镇', - 塔利亚的裸皮电线: '塔利亚的电线', - 翁瓦克的诞生之岛: '翁瓦克的诞生岛', - 翁瓦克的环岛海岸: '翁瓦克的海岸', - 泰科铵的镭射球场: '泰科铵的球场', - 泰科铵的弧光赛道: '泰科铵的赛道', - 伊须磨洲的残船鲸落: '伊须磨洲的鲸落', - 伊须磨洲的坼裂缆索: '伊须磨洲的缆索' -} -export const artiSetAbbr = { - 盗匪荒漠的废土客: '虚数套', - 繁星璀璨的天才: '量子套', - 激奏雷电的乐队: '雷套', - 熔岩锻铸的火匠: '火套', - 晨昏交界的翔鹰: '风套', - 野穗伴行的快枪手: '快枪手', - 密林卧雪的猎人: '冰套', - 流星追迹的怪盗: '怪盗', - 街头出身的拳王: '拳王', - 云无留迹的过客: '过客', - 戍卫风雪的铁卫: '铁卫', - 净庭教宗的圣骑士: '圣骑士', - 筑城者的贝洛伯格: '筑城者', - 星体差分机: '差分机', - 停转的萨尔索图: '停转', - 不老者的仙舟: '仙舟', - 盗贼公国塔利亚: '盗贼', - 泛银河商业公司: '泛银河', - 太空封印站: '太空', - 生命的翁瓦克: '翁瓦克', - 繁星竞技场: '竞技场', - 折断的龙骨: '龙骨', - 宝命长存的莳者: '莳者', - 骇域漫游的信使: '信使' -} - -export const aliasCfg = { - 盗匪荒漠的废土客: '虚数套,废土', - 繁星璀璨的天才: '量子套', - 激奏雷电的乐队: '雷套,雷电', - 熔岩锻铸的火匠: '火套', - 晨昏交界的翔鹰: '风套', - 野穗伴行的快枪手: '快枪手,快枪', - 密林卧雪的猎人: '冰套', - 流星追迹的怪盗: '怪盗', - 街头出身的拳王: '拳王,物理套', - 云无留迹的过客: '过客,云无留迹', - 戍卫风雪的铁卫: '铁卫,风雪', - 净庭教宗的圣骑士: '圣骑士,圣骑士', - 筑城者的贝洛伯格: '筑城者,贝洛伯格,筑城', - 星体差分机: '差分机,星体', - 停转的萨尔索图: '停转,萨尔索图,萨尔', - 不老者的仙舟: '仙舟,不老者,不老', - 盗贼公国塔利亚: '盗贼,塔利亚', - 泛银河商业公司: '泛银河,银河,商业', - 太空封印站: '太空,封印站', - 生命的翁瓦克: '翁瓦克,生命', - 繁星竞技场: '繁星,竞技场', - 折断的龙骨: '龙骨', - 宝命长存的莳者: '莳者,时者', - 骇域漫游的信使: '信使' -} diff --git a/resources/meta-sr/weapon/meta.js b/resources/meta-sr/weapon/alias.js similarity index 100% rename from resources/meta-sr/weapon/meta.js rename to resources/meta-sr/weapon/alias.js diff --git a/resources/meta-sr/weapon/index.js b/resources/meta-sr/weapon/index.js index 73587ad9..023e4f12 100644 --- a/resources/meta-sr/weapon/index.js +++ b/resources/meta-sr/weapon/index.js @@ -1,6 +1,6 @@ import { Data, Meta } from '#miao' import lodash from 'lodash' -import { abbr, aliasCfg } from './meta.js' +import { abbr, aliasCfg } from './alias.js' const types = '存护,丰饶,毁灭,同谐,虚无,巡猎,智识'.split(',') let data = Data.readJSON('/resources/meta-sr/weapon/data.json', 'miao') diff --git a/tools/index.js b/tools/index.js index 1786903f..59611735 100644 --- a/tools/index.js +++ b/tools/index.js @@ -30,7 +30,7 @@ const Index = { // 检查版本 async checkVersion () { - if (!Version.isV3) { + if (!Version.isV3 && !Version.isAlemonjs) { console.log('警告：miao-plugin需要V3 Yunzai，请升级至最新版Miao-Yunzai以使用miao-plugin') } if (!fs.existsSync(process.cwd() + '/lib/plugins/runtime.js')) {