更新圣遗物id的查询逻辑

config/system/character_system.js

@@ -1,120 +0,0 @@
-/**
- * 请不要直接修改此或删除此文件，防止后续更新冲突
- * 如需新增自定义角色可【复制】config/character_default.js，改名为config/character.js
- */
-export const characters = {
-  10000003: ['琴', 'Jean', '团长', '代理团长', '琴团长', '蒲公英骑士'],
-  10000006: ['丽莎', 'Lisa', '图书管理员', '图书馆管理员', '蔷薇魔女', '阿姨'],
-  10000005: ['空', '男主', '男主角', '龙哥', '空哥', '男爷'],
-  10000007: ['荧', '女主', '女主角', '莹', '萤', '黄毛阿姨', '荧妹', '女爷', '包包', '宴宁'],
-  20000000: ['旅行者', '主角', '卑鄙的外乡人', '荣誉骑士', '爷', '主', '履刑者', '抽卡不歪真君'],
-  10000014: ['芭芭拉', 'Barbara', '巴巴拉', '内鬼', '加湿器', '肉身解咒', '肉身解咒真君', '闪耀偶像', '偶像'],
-  10000015: ['凯亚', 'Kaeya', '盖亚', '凯子哥', '凯鸭', '矿工', '矿工头子', '骑兵队长', '凯子', '凝冰渡海真君'],
-  10000016: ['迪卢克', 'Diluc', '卢姥爷', '姥爷', '卢老爷', '卢锅巴', '正义人', '正e人', '正E人', '卢本伟', '暗夜英雄', '卢卢伯爵', '落魄了', '落魄了家人们'],
-  10000020: ['雷泽', 'Razor', '狼少年', '狼崽子', '狼崽', '卢皮卡', '小狼', '小狼狗', '狼孩'],
-  10000021: ['安柏', 'Amber', '安伯', '兔兔伯爵', '飞行冠军', '侦查骑士', '点火姬', '点火机', '打火机', '打火姬'],
-  10000022: ['温迪', 'Venti', '温蒂', '风神', '卖唱的', '巴巴托斯', '巴巴脱丝', '芭芭托斯', '芭芭脱丝', '干点正事', '不干正事', '吟游诗人', '诶嘿', '唉嘿', '摸鱼'],
-  10000023: ['香菱', 'Xiangling', '香玲', '锅巴', '厨师', '万民堂厨师', '香师傅'],
-  10000024: ['北斗', 'Beidou', '大姐头', '大姐', '无冕的龙王'],
-  10000025: ['行秋', 'Xingqiu', '秋秋人', '秋妹妹', '书呆子', '枕玉', '飞云商会二少爷'],
-  10000026: ['魈', 'Xiao', '打桩机', '插秧', '三眼五显仙人', '三眼五显真人', '降魔大圣', '护法夜叉', '快乐风男', '无聊', '靖妖傩舞', '矮子仙人', '三点五尺仙人', '跳跳虎', '风夜叉'],
-  10000027: ['凝光', 'Ningguang', '富婆', '天权星', '天权'],
-  10000029: ['可莉', '逃跑的太阳', 'Klee', '嘟嘟可', '火花骑士', '蹦蹦炸弹', '炸鱼', '放火烧山', '放火烧山真君', '蒙德最强战力', '逃跑的太阳', '啦啦啦', '哒哒哒', '炸弹人', '禁闭室', '太阳', '小太阳'],
-  10000030: ['钟离', 'Zhongli', '摩拉克斯', '岩王爷', '岩神', '钟师傅', '天动万象', '岩王帝君', '未来可期', '帝君', '拒收病婿'],
-  10000031: ['菲谢尔', 'Fischl', '皇女', '小艾米', '小艾咪', '奥兹', '断罪皇女', '中二病', '中二少女', '中二皇女', '奥兹发射器'],
-  10000032: ['班尼特', 'Bennett', '点赞哥', '点赞', '倒霉少年', '倒霉蛋', '霹雳闪雷真君', '班神', '班爷', '倒霉', '火神', '六星真神'],
-  10000033: ['达达利亚', 'Tartaglia', 'Childe', 'Ajax', '达达鸭', '达达利鸭', '公子', '玩具销售员', '玩具推销员', '钱包', '鸭鸭', '愚人众末席'],
-  10000034: ['诺艾尔', 'Noelle', '女仆', '高达', '岩王帝姬'],
-  10000035: ['七七', 'Qiqi', '僵尸', '肚饿真君', '度厄真君', '77'],
-  10000036: ['重云', 'Chongyun', '纯阳之体', '冰棍'],
-  10000037: ['甘雨', 'Ganyu', '椰羊', '椰奶', '王小美'],
-  10000038: ['阿贝多', 'Albedo', '可莉哥哥', '升降机', '升降台', '电梯', '白垩之子', '贝爷', '白垩', '阿贝少', '花呗多', '阿贝夕', '阿师傅'],
-  10000039: ['迪奥娜', 'Diona', '迪欧娜', 'dio娜', '冰猫', '猫猫', '猫娘', '喵喵', '调酒师'],
-  10000041: ['莫娜', 'Mona', '穷鬼', '穷光蛋', '穷', '莫纳', '占星术士', '占星师', '讨龙真君', '半部讨龙真君', '阿斯托洛吉斯·莫娜·梅姬斯图斯', '梅姬斯图斯', '梅姬斯图斯姬'],
-  10000042: ['刻晴', 'Keqing', '刻情', '氪晴', '刻师傅', '刻师父', '牛杂', '牛杂师傅', '斩尽牛杂', '免疫', '免疫免疫', '屁斜剑法', '玉衡星', '阿晴', '啊晴', '璃月雷神'],
-  10000043: ['砂糖', 'Sucrose', 'sucrose'],
-  10000044: ['辛焱', 'Xinyan', '辛炎', '黑妹', '摇滚'],
-  10000045: ['罗莎莉亚', 'Rosaria', '罗莎莉娅', '白色史莱姆', '白史莱姆', '修女', '罗莎利亚', '罗莎利娅', '罗沙莉亚', '罗沙莉娅', '罗沙利亚', '罗沙利娅', '萝莎莉亚', '萝莎莉娅', '萝莎利亚', '萝莎利娅', '萝沙莉亚', '萝沙莉娅', '萝沙利亚', '萝沙利娅'],
-  10000046: ['胡桃', 'Hu Tao', 'HuTao', 'Hutao', '胡淘', '往生堂堂主', '火化', '抬棺的', '蝴蝶', '核桃', '堂主', '胡堂主', '雪霁梅香', '桃子', '桃'],
-  10000047: ['枫原万叶', 'Kaedehara Kazuha', 'Kazuha', '万叶', '叶天帝', '天帝', '叶师傅'],
-  10000048: ['烟绯', 'Yanfei', '烟老师', '律师', '罗翔'],
-  10000051: ['优菈', 'Eula', '优拉', '尤拉', '尤菈', '浪花骑士', '记仇', '劳伦斯'],
-
-  // 2.0
-  10000002: ['神里绫华', 'Kamisato Ayaka', 'Ayaka', '神里', '绫华', '神里凌华', '凌华', '白鹭公主', '神里大小姐', '龟', '龟龟', '乌龟'],
-  10000049: ['宵宫', 'Yoimiya', '霄宫', '烟花', '肖宫', '肖工', '绷带女孩'],
-  10000052: ['雷电将军', 'Raiden Shogun', 'Raiden', '雷神', '将军', '雷军', '巴尔', '阿影', '影', '巴尔泽布', '煮饭婆', '奶香一刀', '无想一刀', '宅女'],
-  10000053: ['早柚', 'Sayu', '小狸猫', '狸猫', '忍者', '貉'],
-  10000054: ['珊瑚宫心海', 'Sangonomiya Kokomi', 'Kokomi', '心海', '军师', '珊瑚宫', '书记', '观赏鱼', '水母', '鱼', '美人鱼'],
-  10000056: ['九条裟罗', 'Kujou Sara', 'Sara', '九条', '九条沙罗', '裟罗', '沙罗', '天狗'],
-  10000062: ['埃洛伊', 'Aloy'],
-  10000050: ['托马', 'Thoma', '家政官', '太郎丸', '地头蛇', '男仆', '拖马'],
-  10000055: ['五郎', 'Gorou', '柴犬', '土狗', '希娜', '希娜小姐'],
-  10000057: ['荒泷一斗', 'Arataki Itto', 'Itto', '荒龙一斗', '荒泷天下第一斗', '一斗', '一抖', '荒泷', '1斗', '牛牛', '斗子哥', '牛子哥', '牛子', '孩子王', '斗虫', '巧乐兹', '放牛的'],
-  10000058: ['八重神子', 'Yae Miko', 'Miko', '八重', '神子', '狐狸', '想得美哦', '巫女', '屑狐狸', '骚狐狸', '八重宫司', '婶子', '小八', '八重寄子', '寄子', '八神虫子', '八神重子'],
-  10000059: ['鹿野院平藏', 'shikanoin heizou', 'Heizou', '鹿野苑', '鹿野院', '平藏', '鹿野苑平藏', '小鹿'],
-  10000060: ['夜兰', 'Yelan', '夜阑', '叶澜', '腋兰', '夜天后'],
-  10000063: ['申鹤', 'Shenhe', '神鹤', '小姨', '小姨子', '审鹤'],
-  10000064: ['云堇', 'Yun Jin', 'yun jin', '云瑾', '云先生', '云锦', '神女劈观'],
-  10000065: ['久岐忍', 'Kuki Shinobu', 'Kuki', 'Shinobu', '97忍', '小忍', '久歧忍', '97', '茄忍', '茄子', '紫茄子', '阿忍', '忍姐'],
-  10000066: ['神里绫人', 'Kamisato Ayato', 'Ayato', '绫人', '神里凌人', '凌人', '0人', '神人', '零人', '大舅哥'],
-
-  // 3.0
-  10000061: ['绮良良', 'Kirara', '大猫猫', '大喵喵', '稻妻猫猫', '绮娘娘', '琦良良', '良良', '快递员', '草猫', '草猫猫', '草喵', '草喵喵', '猫又'],
-  10000069: ['提纳里', 'Tighnari', '提那里', '小提', '驴'],
-  10000067: ['柯莱', 'Collei', '柯来', '科莱', '科来', '小天使', '须弥安柏', '草安柏', '须弥飞行冠军'],
-  10000068: ['多莉', 'Dori', '多利', '多力', '奸商'],
-  10000070: ['妮露', 'Nilou', '尼露', '妮璐', '舞娘', '红牛'],
-  10000071: ['赛诺', 'Cyno', '塞诺', '胡狼', '大风纪官', '大风机关'],
-  10000072: ['坎蒂丝', 'Candace', '坎迪斯'],
-  10000073: ['纳西妲', 'Nahida', '草神', '小吉祥', '大吉祥', '小草神', '大慈树王', '小吉祥草王', '草萝莉', '羽毛球', '摩诃善法大吉祥智慧主', '智慧主', '智慧之神', '布耶尔'],
-  10000074: ['莱依拉', 'Layla', '莱依菈', '来依菈', '来依拉'],
-  10000075: ['流浪者', 'Wanderer', '散兵', '国崩', '雷电国崩', '大炮', '雷电大炮', '雷大炮', '伞兵', '斯卡拉姆齐'],
-  10000076: ['珐露珊', 'Faruzan', '法露珊', '法璐珊', '法露姗', '法璐姗', '珐露姗', '珐璐姗', '百岁珊', '百岁山', '前辈', '仙贝'],
-  10000077: ['瑶瑶', 'Yaoyao', '遥遥', '萝卜', '月桂'],
-  10000078: ['艾尔海森', 'Alhaitham', '海哥', '埃尔海森', '海森', '海参', '书记官'],
-  10000079: ['迪希雅', 'Dehya', '迪希亚', '迪希娅', '迪西雅', '迪西亚'],
-  10000080: ['米卡', 'Mika', '鹦鹉', '凤头', '凤头鹦鹉'],
-  10000081: ['卡维', 'Kaveh', '艾尔海森室友'],
-  10000082: ['白术', 'Baizhu', '长生'],
-
-  // 4.0
-  10000083: ['琳妮特', 'Lynette', '林妮特', '林尼特', '琳尼特', '女魔术师', '魔术猫', '魔术喵', '登登'],
-  10000084: ['林尼', 'Lyney', '林妮', '琳尼', '琳妮', '男魔术师', '魔术师'],
-  10000085: ['菲米尼', 'Freminet', '非米尼', '潜水员'],
-  10000086: ['莱欧斯利', 'Wriothesley', '莱欧', '枫丹桑博', '欧拉欧拉', '来欧', '来欧斯利'],
-  10000087: ['那维莱特', 'Neuvillette', '那维', '水龙王', '水龙', '审判官', '海獭'],
-  10000088: ['夏洛蒂', 'Charlotte', '夏洛', '夏洛帝', '记者', '小记者'],
-  10000089: ['芙宁娜', 'Furina', 'Focalors', '水神', '芙芙', '芙卡洛斯'],
-
-  // 自定义角色
-  paimon: ['派蒙', '应急食物', '应急食品', '吉祥物', '宠物', '外置器官', '会说话的动物', '矮堇瓜', '飞行矮堇瓜', '最好的伙伴'],
-  nvshi: ['女士', '炽热的炎之魔女', '炎之魔女', '罗莎琳'],
-  fanan: ['伐难', '水夜叉'],
-  yingda: ['应达', '火夜叉', '火鼠大将'],
-  guizhong: ['归终', '哈艮图斯', '哈根达斯', '尘之魔神', '尘神'],
-  ping: ['萍姥姥', '歌尘浪市真君', '歌尘浪市', '萍儿'],
-  puren: ['阿蕾奇诺', '仆人', '黑优菈', '黑暗优菈'],
-  shaonv: ['哥伦比娅', '少女'],
-  furen: ['潘塔罗涅', '富人', '黑白术', '黑术'],
-  boshi: ['多托雷', '博士'],
-  muou: ['桑多涅', '木偶', '人偶'],
-  choujue: ['皮耶罗', '丑角', '老爷子'],
-  gongji: ['普契涅拉', '公鸡', '鸽子'],
-  duizhang: ['卡皮塔诺', '队长'],
-  daiyin: ['戴因斯雷布', '戴因', '男派蒙', '大派蒙', '末光之剑', '拾枝者'],
-  tianli: ['天理', '天理维系者', '维系者']
-}
-
-export const wifeData = {
-  girlfriend: `琴, 丽莎, 荧, 芭芭拉, 安柏, 香菱, 北斗, 凝光, 菲谢尔, 诺艾尔, 甘雨, 莫娜, 刻晴, 砂糖, 辛焱, 罗莎莉亚, 胡桃,
-  烟绯, 优菈, 神里绫华, 宵宫, 雷电将军, 珊瑚宫心海, 九条裟罗, 八重神子, 埃洛伊, 申鹤, 云堇, 夜兰, 久岐忍, 柯莱, 多莉, 伐难,
-  女士, 萍姥姥, 归终, 仆人, 少女, 妮露, 坎蒂丝, 天理, 迪希雅, 莱依拉, 珐露珊, 绮良良, 琳妮特, 夏洛蒂, 芙宁娜`,
-  boyfriend: `空, 凯亚, 迪卢克, 雷泽, 温迪, 行秋, 魈, 钟离, 班尼特, 达达利亚, 重云, 阿贝多, 枫原万叶, 托马, 五郎, 荒泷一斗,
-  鹿野院平藏, 神里绫人, 提纳里, 流浪者, 富人, 博士, 丑角, 公鸡, 队长, 赛诺, 戴因, 卡维, 艾尔海森, 米卡, 白术, 林尼, 菲米尼,
-  莱欧斯利, 那维莱特`,
-  daughter: '可莉, 七七, 迪奥娜, 早柚, 派蒙, 瑶瑶, 纳西妲',
-  son: ''
-}
-
-export const isSys = true

models/Artifact.js

@@ -52,6 +52,15 @@ class Artifact extends Base {
     if (name.id || name.name) {
       return Artifact.get(name.id || name.name, name.game || game)
     }
+    // 兼容圣遗物ID获取
+    if (game === 'gs' && /^\d{5}$/.test(name)) {
+      name = name.toString()
+      let artiSet = ArtifactSet.get(name)
+      if (artiSet) {
+        return artiSet.getArti([4, 2, 5, 1, 3][name[3] - 1])
+      }
+    }
+    // 根据名字查询
     let data = Meta.getData(game, 'arti', name)
     if (data) {
       return new Artifact(data, game)

models/ArtifactSet.js

@@ -24,7 +24,7 @@ class ArtifactSet extends Base {
   }
 
   get img () {
-    let arti = Artifact.get(this.sets[1] || this.sets[5], this.game)
+    let arti = Artifact.get(this.idxs[1] || this.idxs[5], this.game)
     return arti ? arti.img : ''
   }
 
@@ -37,6 +37,9 @@ class ArtifactSet extends Base {
   }
 
   static get (name, game = 'gs') {
+    if (game === 'gs' && /^\d{5}$/.test(name)) {
+      name = name.toString().slice(0, 2)
+    }
     let data = Meta.matchGame(game, 'artiSet', name)
     if (data) {
       return new ArtifactSet(data.data, data.game)
@@ -61,8 +64,8 @@ class ArtifactSet extends Base {
   }
 
   // 循环圣遗物套装
-  static eachSet (sets, fn, game = 'gs') {
+  static eachSet (idxs, fn, game = 'gs') {
-    lodash.forEach(sets || [], (v, k) => {
+    lodash.forEach(idxs || [], (v, k) => {
       let artisSet = ArtifactSet.get(k, game)
       if (artisSet) {
         if (v >= 4) {
@@ -74,7 +77,7 @@ class ArtifactSet extends Base {
   }
 
   getArtiName (idx = 1) {
-    return this.sets[idx]
+    return this.idxs[idx]
   }
 
   getArti (idx = 1) {

models/serv/api/EnkaData.js

@@ -1,6 +1,19 @@
 import lodash from 'lodash'
-import { attrMap, idsMap, artisIdxMap } from './ProfileMeta.js'
+import { Character, Artifact, Weapon } from '#miao.models'
-import { Character, ArtifactSet, Weapon } from '#miao.models'
+
+const artisIdxMap = {
+  EQUIP_BRACER: 1,
+  EQUIP_NECKLACE: 2,
+  EQUIP_SHOES: 3,
+  EQUIP_RING: 4,
+  EQUIP_DRESS: 5,
+  生之花: 1,
+  死之羽: 2,
+  时之沙: 3,
+  空之杯: 4,
+  理之冠: 5
+}
+
 
 let EnkaData = {
   setAvatar (player, data, dataSource = 'enka') {
@@ -74,9 +87,12 @@ let EnkaData = {
       if (!idx) {
         return
       }
-      let setName = idsMap[flat.setNameTextMapHash] || ''
+      let arti = Artifact.get(ds.itemId)
+      if (!arti) {
+        return true
+      }
       ret[idx] = {
-        name: ArtifactSet.getArtiNameBySet(setName, idx),
+        name: arti.name,
         level: Math.min(20, ((re.level) || 1) - 1),
         star: flat.rankLevel || 5,
         mainId: re.mainPropId,
@@ -84,42 +100,6 @@ let EnkaData = {
       }
     })
     return ret
-  },
-
-  getArtifactBak (data) {
-    let ret = {}
-    let get = function (d) {
-      if (!d) {
-        return {}
-      }
-      let id = d.appendPropId || d.mainPropId || ''
-      id = id.replace('FIGHT_PROP_', '')
-      if (!attrMap[id]) {
-        return {}
-      }
-      return { key: attrMap[id], value: d.statValue }
-    }
-    lodash.forEach(data, (ds) => {
-      let flat = ds.flat || {}
-      let sub = flat.reliquarySubstats || []
-      let idx = artisIdxMap[flat.equipType]
-      if (!idx) {
-        return
-      }
-      let setName = idsMap[flat.setNameTextMapHash] || ''
-      ret[idx] = {
-        name: ArtifactSet.getArtiNameBySet(setName, idx),
-        level: Math.min(20, ((ds.reliquary && ds.reliquary.level) || 1) - 1),
-        main: get(flat.reliquaryMainstat),
-        attrs: [
-          get(sub[0]),
-          get(sub[1]),
-          get(sub[2]),
-          get(sub[3])
-        ]
-      }
-    })
-    return ret
   }
 }
 

models/serv/api/ProfileMeta.js

@@ -1,575 +0,0 @@
-// Enka IdsMap
-export const idsMap = {
-  20848859: '黑岩斩刀',
-  22949795: '蔚蓝深空',
-  33330467: '元素熟练',
-  37147251: '匣里日月',
-  43015699: '待定',
-  54857595: '止水息雷',
-  83115355: '被怜爱的少女',
-  85795635: '专注',
-  88505754: '枫原万叶',
-  135182203: '止水息雷',
-  141119323: '风与花的密语',
-  143051931: '西福斯的月光',
-  147298547: '流浪大地的乐团',
-  156294403: '沉沦之心',
-  160493219: '暗铁剑',
-  168956722: '七七',
-  197755235: '贯虹之槊',
-  212557731: '祭雷之人',
-  231911858: '米卡',
-  235897163: '花海甘露之光',
-  240385755: '破浪',
-  246984427: '踏火息雷',
-  262428003: '祭冰之人',
-  270124867: '护国的无垢之心',
-  275622963: '裁叶萃光',
-  287454963: '祭风之人',
-  288666635: '无垢之心',
-  302691299: '琥珀玥',
-  303155515: '离簇不归',
-  307541163: '未完的杰作',
-  310247243: '神乐之真意',
-  313300315: '原木刀',
-  316078811: '鹮穿之喙',
-  334242634: '申鹤',
-  339931171: '乘胜追击',
-  342097547: '辰砂之纺锤',
-  346510395: '衔珠海皇',
-  359484419: '图莱杜拉的回忆',
-  368014203: '斩裂晴空的龙脊',
-  370151050: '莱欧斯利',
-  388272194: '多莉',
-  391273955: '斫断黑翼的利齿',
-  411685275: '钢轮弓',
-  426363739: '流浪的晚星',
-  449192923: '峡湾长歌',
-  452357939: '贯月矢',
-  453444347: '千夜的曙歌',
-  454086795: '圣显之钥',
-  466355514: '卡维',
-  479076483: '冷刃',
-  481755219: '黑岩刺枪',
-  486287579: '余热',
-  500612819: '「旗杆」',
-  500987603: '(test)穿模测试',
-  506630267: '顺风而行',
-  514784907: '踏火止水',
-  521221323: '护国的无垢之心',
-  540938627: '掠食者',
-  566772267: '御伽大王御伽话',
-  577103787: '能量沐浴',
-  578575283: '流月针',
-  586598971: '圆满之相',
-  597991835: '白夜皓月',
-  607067963: '澄澄一心传',
-  613846163: '降世',
-  618786571: '钺矛',
-  623494555: '摧坚',
-  623534363: '西风秘典',
-  630452219: '樱之斋宫',
-  646032090: '鹿野院平藏',
-  646100491: '千岩诀·同心',
-  650049651: '风花之颂',
-  650438131: '秘智之眸的青睐',
-  655825874: '云堇',
-  656120259: '神射手之誓',
-  675511059: '万世的浪涛',
-  680510411: '白影剑',
-  688991243: '息灾',
-  693354267: '尘世之锁',
-  697277554: '烟绯',
-  712501082: '纳西妲',
-  716252627: '千岩长枪',
-  724881171: '金流监督',
-  729851187: '冰之川与雪之砂',
-  735056795: '西风大剑',
-  800766043: '海渊终曲',
-  807607555: '天空之卷',
-  824949859: '嘟嘟！大冒险',
-  828711395: '阿莫斯之弓',
-  836208539: '炊金',
-  850802171: '白铁大剑',
-  855894507: '战狂',
-  862591315: '苍白之火',
-  877751435: '宗室大剑',
-  882305891: '勘探钻机',
-  902184579: '森林王器',
-  902264035: '风鹰剑',
-  902282051: '收割',
-  909145139: '护国的无垢之心',
-  925251851: '枪尖一点',
-  930640955: '钟剑',
-  933076627: '冰风迷途的勇士',
-  942758755: '专注',
-  944332883: '斫峰之刃',
-  949506483: '海洋的胜利',
-  968378595: '西风之鹰的抗争',
-  968893378: '班尼特',
-  991968139: '非时之梦·常世灶食',
-  1006042610: '神里绫华',
-  1012170803: '笼钓瓶一心',
-  1021898539: '弹弓',
-  1021947690: '魈',
-  1028735635: '抗争的践行之歌',
-  1049891906: '赛诺',
-  1053433018: '砂糖',
-  1055195035: '测距规',
-  1072884907: '万国诸海图谱',
-  1075647299: '松籁响起之时',
-  1082448331: '微光的海渊民',
-  1089950259: '天空之傲',
-  1097898243: '沉重',
-  1103732675: '幸运儿',
-  1113306282: '莫娜',
-  1113839851: '石匠号子',
-  1114777131: '和弦',
-  1119368259: '旅程',
-  1130996346: '香菱',
-  1133599347: '矢志不忘',
-  1148024603: '「渔获」',
-  1154009435: '试作星镰',
-  1163263227: '流浪乐章',
-  1163616891: '霜葬',
-  1176721851: '船工号子',
-  1182966603: '佣兵重剑',
-  1186209435: '赌徒',
-  1200948859: '饰铁之花',
-  1201790667: '千夜浮梦',
-  1212345779: '角斗士的终幕礼',
-  1217552947: '白刃流转',
-  1225226258: '琳妮特',
-  1229532227: '苍狼北风',
-  1240067179: '西风猎弓',
-  1249831867: '逐影猎人',
-  1307222899: '徊徊切舍刀',
-  1310150611: '伟大者帕西法尔',
-  1319974859: '激励',
-  1321135667: '匣里龙吟',
-  1337666507: '千岩牢固',
-  1344953075: '顺风而行',
-  1345343763: '磐岩结绿',
-  1348687251: '猎人之径',
-  1383427723: '白月枝芒',
-  1383639611: '奇迹',
-  1388004931: '飞天御剑',
-  1390797107: '白缨枪',
-  1395607523: '兽径的终点',
-  1404688115: '别离的思念之歌',
-  1406746947: '异世界行记',
-  1414366819: '金璋皇极',
-  1437658243: '螭骨剑',
-  1438974835: '逆飞的流星',
-  1455107995: '四风原典',
-  1456643042: '绮良良',
-  1468367538: '迪奥娜',
-  1470442731: '风信之锋',
-  1479961579: '铁影阔剑',
-  1483922610: '九条裟罗',
-  1485303435: '注能之刺',
-  1492752155: '气定神闲',
-  1499235563: '乘胜追击',
-  1499745907: '「一心传」名刀',
-  1499817443: '苍翠之风',
-  1504902330: '那维莱特',
-  1516554699: '石英大剑',
-  1522029867: '踏火息雷',
-  1523089323: '定土玉圭',
-  1524173875: '炽烈的炎之魔女',
-  1533656818: '旅行者',
-  1533746995: '冰原的诸多故事',
-  1538092267: '「一心传」名刀',
-  1541919827: '染血的骑士道',
-  1545992315: '「正义」',
-  1558036915: '辰砂往生录',
-  1562601179: '翠绿之影',
-  1588620330: '神里绫人',
-  1595734083: '(test)穿模测试',
-  1600275315: '波乱月白经津',
-  1608953539: '黎明神剑',
-  1610242915: '传承',
-  1628928163: '风花之愿',
-  1632377563: '渡过烈火的贤人',
-  1651985379: '极昼的先兆者',
-  1660598451: '岩藏之胤',
-  1675079283: '深林的记忆',
-  1675686363: '祭礼大剑',
-  1702903411: '镇灵的低语',
-  1706534267: '有话直说',
-  1722706579: '止水融冰',
-  1732418482: '瑶瑶',
-  1745286795: '名士振舞',
-  1745712907: '驭浪的海祇民',
-  1751039235: '昔日宗室之仪',
-  1756609915: '海染砗磲',
-  1771603299: '金璋皇极',
-  1773425155: '降临之剑',
-  1789612403: '回响',
-  1790067483: '船坞长剑',
-  1820235315: '无矢之歌',
-  1836628747: '叛逆的守护者',
-  1860795787: '曚云之月',
-  1864015138: '刻晴',
-  1873342283: '平息鸣雷的尊者',
-  1890163363: '不灭月华',
-  1901973075: '冬极白星',
-  1921306659: '灰河渡手',
-  1921418842: '诺艾尔',
-  1925210475: '水仙之梦',
-  1927643091: '沙海守望',
-  1932742643: '灭却之戒法',
-  1934830979: '无尽的渴慕',
-  1940821986: '久岐忍',
-  1940919994: '胡桃',
-  1966438658: '安柏',
-  1982136171: '专注',
-  1990641987: '祭礼剑',
-  1990820123: '天目影打刀',
-  1991707099: '试作斩岩',
-  1997709467: '和璞鸢',
-  2006422931: '千岩古剑',
-  2009975571: '(test)穿模测试',
-  2017033267: '气定神闲',
-  2025598051: '顺风而行',
-  2029582603: '怪谭·时雨心地一本足',
-  2040573235: '悠古的磐岩',
-  2060049099: '祭火之人',
-  2077869763: '浪影阔剑',
-  2108574027: '碎石',
-  2109571443: '专注',
-  2125206395: '银剑',
-  '2149411851': '金璋皇极',
-  '2153521307': '沙上楼阁',
-  '2172529947': '乘胜追击',
-  '2176134843': '专注',
-  '2190368347': '决',
-  '2191797987': '冒险家',
-  '2195436779': '石匠号子',
-  '2195665683': '祭礼残章',
-  '2242027395': '黑檀弓',
-  '2244980899': '沉入沙海的史诗',
-  '2257505883': '森林的瑞佑',
-  '2258943483': '巡航的白浪',
-  '2265792579': '狼牙',
-  '2267978875': '盈满之实',
-  '2275710883': '遗祀玉珑',
-  '2276480763': '绝缘之旗印',
-  '2279290283': '魔导绪论',
-  '2297485451': '速射弓斗',
-  '2312640651': '气定神闲',
-  '2317820211': '注能之针',
-  '2322648115': '粉碎',
-  '2324146259': '白辰之环',
-  '2340970067': '历练的猎弓',
-  '2351445619': '堙没的蓝宝石泪滴',
-  '2359799475': '恶王丸',
-  '2360533154': '迪希雅',
-  '2364208851': '行者之心',
-  '2365025043': '街巷游侠',
-  '2375993851': '宗室长剑',
-  '2383998915': '驭浪的海祇民',
-  '2384519283': '弹弓',
-  '2387711994': '珐露珊',
-  '2388785242': '早柚',
-  '2400012995': '祭礼弓',
-  '2410593283': '无锋剑',
-  '2415974179': '船工号子',
-  '2417717595': '暗巷猎手',
-  '2425414923': '落霞',
-  '2432865507': '纯水流华',
-  '2433755451': '揭旗的叛逆之歌',
-  '2440850563': '回响长天的诗歌',
-  '2448629019': '东花坊时雨',
-  '2466140362': '温迪',
-  '2469300579': '乘胜追击',
-  '2470144971': '「伶牙俐齿」',
-  '2470306939': '飞雷御执',
-  '2472444970': '林尼',
-  '2474354867': '西风剑',
-  '2476346187': '踏火止水',
-  '2491797315': '喜多院十文字',
-  '2504399314': '宵宫',
-  '2506955778': '提纳里',
-  '2512309395': '如雷的盛怒',
-  '2521338131': '试作金珀',
-  '2534304035': '雾切御腰物',
-  '2538235187': '沙上楼阁史话',
-  '2539208459': '证誓之明瞳',
-  '2546254811': '华馆梦醒形骸记',
-  '2556914683': '绝弦',
-  '2587614459': '忍冬之果',
-  '2600875323': '静谧之曲',
-  '2614170427': '飞天大御剑',
-  '2646367730': '北斗',
-  '2664629131': '匣里灭辰',
-  '2666951267': '训练大剑',
-  '2673337443': '注能之矢',
-  '2679781122': '甘雨',
-  '2684365579': '登场乐',
-  '2691070627': '森林的瑞佑',
-  '2705029563': '口袋魔导书',
-  '2713453234': '八重神子',
-  '2719832059': '(test)穿模测试',
-  '2722902043': '无垠蔚蓝之歌',
-  '2743659331': '激流',
-  '2749508387': '金璋皇极',
-  '2749853923': '腐殖之剑',
-  '2753539619': '雪葬的星银',
-  '2764598579': '流放者',
-  '2792766467': '无工之剑',
-  '2796697027': '新手长枪',
-  '2832648187': '宗室长弓',
-  '2834063555': '苇海信标',
-  '2834803571': '金璋皇极',
-  '2848374378': '夜兰',
-  '2853296811': '穿刺高天的利齿',
-  '2871793795': '锐利',
-  '2876340530': '重云',
-  '2889777514': '莱依拉',
-  '2890909531': '武人',
-  '2893964243': '飞矢传书',
-  '2915865819': '渊中霞彩',
-  '2918525947': '飞雷之弦振',
-  '2935286715': '宗室猎枪',
-  '2947140987': '暗巷闪光',
-  '2948362178': '柯莱',
-  '2949448555': '苍古自由之誓',
-  '2958179435': '烈阳之嗣',
-  '2963220587': '翡玉法球',
-  '2984815066': '白术',
-  '2988480723': '最初的大魔术',
-  '3001782875': '气定神闲',
-  '3018479371': '船歌',
-  '3024507506': '雷电将军',
-  '3063191787': '竭泽',
-  '3063488107': '强力攻击',
-  '3068316954': '荒泷一斗',
-  '3070169307': '铁尖枪',
-  '3073454867': '玛海菈的水色',
-  '3079462611': '驭浪的海祇民',
-  '3082528187': '深海弦振',
-  '3090373787': '暗巷的酒与诗',
-  '3092975658': '坎蒂丝',
-  '3094139291': '乐园遗落之花',
-  '3097441915': '以理服人',
-  '3101537195': '黄金的血潮',
-  '3102522787': '最终的崇高',
-  '3112448011': '决心',
-  '3112679155': '终末嗟叹之诗',
-  '3156385731': '昭心',
-  '3159145923': '徊徊切舍刀',
-  '3169209451': '弓藏',
-  '3176599083': '王下近侍',
-  '3192689683': '霜葬',
-  '3209694115': '林野晚星',
-  '3221566250': '琴',
-  '3230559562': '流浪者',
-  '3235324891': '护摩之杖',
-  '3252085691': '顺风而行',
-  '3258658763': '嗜魔',
-  '3265161211': '注能之锋',
-  '3273999011': '黑岩绯玉',
-  '3277782506': '菲谢尔',
-  '3302787771': '霜葬',
-  '3305772819': '奔袭战术',
-  '3314157803': '克柔',
-  '3337185491': '浅濑之弭',
-  '3337249451': '过载',
-  '3339083250': '可莉',
-  '3344622722': '丽莎',
-  '3364338659': '无边际的眷顾',
-  '3371922315': '神樱神游神乐舞',
-  '3378007475': '黑岩长剑',
-  '3400133546': '五郎',
-  '3406113971': '顺风而行',
-  '3410220315': '黄金剧团',
-  '3421967235': '吃虎鱼刀',
-  '3439749859': '苍翠猎弓',
-  '3443142923': '龙脊长枪',
-  '3447737235': '黑岩战弓',
-  '3453611803': '网破',
-  '3456986819': '嘟嘟可故事集',
-  '3459616011': '聊聊棒',
-  '3464027035': '「一心传」名刀',
-  '3465493459': '精准',
-  '3500935003': '讨龙英杰谭',
-  '3513240283': '不至之风',
-  '3535784755': '勇士之心',
-  '3541083923': '角斗士',
-  '3555115602': '托马',
-  '3584825427': '学徒笔记',
-  '3587062891': '千岩诀·同心',
-  '3587621259': '笛剑',
-  '3600623979': '猎弓',
-  '3608180322': '迪卢克',
-  '3618167299': '学士',
-  '3625393819': '试作澹月',
-  '3626268211': '来歆余响',
-  '3673792067': '旅行剑',
-  '3684723963': '雨裁',
-  '3685735523': '徊徊切舍刀',
-  '3689108098': '埃洛伊',
-  '3693117451': '便携动力锯',
-  '3717341819': '幽林月影',
-  '3717667418': '优菈',
-  '3717849275': '薙草之稻光',
-  '3719372715': '甲级宝珏',
-  '3722933411': '试作古华',
-  '3747103099': '阳炎古道',
-  '3755004051': '西风长枪',
-  '3762437019': '(test)穿模测试',
-  '3775299170': '芭芭拉',
-  '3782508715': '游医',
-  '3796702635': '变化万端',
-  '3796905611': '黑剑',
-  '3816664530': '旅行者',
-  '3827789435': '宗室秘法录',
-  '3832443723': '不屈',
-  '3836188467': '无羁的朱赤之蝶',
-  '3847143266': '达达利亚',
-  '3850149970': '妮露',
-  '3862787418': '钟离',
-  '3890292467': '教官',
-  '3898539027': '浮游四方的灵云',
-  '3909785739': '蜃气尽头的热梦',
-  '3914045794': '珊瑚宫心海',
-  '3914951691': '赤角石溃杵',
-  '3933622347': '天空之翼',
-  '3949653579': '幽夜华尔兹',
-  '3956074723': '迷宫之王的教导',
-  '3966753539': '洗濯诸类之形',
-  '3975746731': '鸦羽弓',
-  '3995710363': '狼的末路',
-  '3996017211': '收割',
-  '3999792907': '祭水之人',
-  '4000770243': '街巷伏击',
-  '4002157418': '艾尔海森',
-  '4007372867': '碧落之珑',
-  '4022012131': '乘胜追击',
-  '4049410651': '决斗之枪',
-  '4055003299': '天空之刃',
-  '4060235987': '日月辉',
-  '4080317355': '勇气',
-  '4082302819': '守护之心',
-  '4090429643': '沐浴龙血的剑',
-  '4103022435': '铁蜂刺',
-  '4103766499': '黑缨枪',
-  '4108620722': '阿贝多',
-  '4113638323': '昭理的鸢之枪',
-  '4119663210': '凯亚',
-  '4122509083': '断浪长鳍',
-  '4124851547': '雾切之回光',
-  '4127888970': '凝光',
-  '4137694339': '(test)竿测试',
-  '4139294531': '信使',
-  '4144069251': '追忆之注连',
-  '4145306051': '饰金之梦',
-  '4158505619': '天空之脊',
-  '4158971171': '公义的酬报',
-  '4160147242': '雷泽',
-  '4162981171': '(test)穿模测试',
-  '4176923379': '万世流涌大典',
-  '4186179883': '破魔之弓',
-  '4193089947': '桂木斩长正',
-  '4197635682': '行秋',
-  '4201964354': '菲米尼',
-  '4226083179': '名士振舞',
-  '4227142475': '碧玉流转',
-  '4230231107': '若水',
-  '4231466539': '铁骨',
-  '4238339131': '赤沙之杖',
-  '4245213187': '注能之卷',
-  '4258047555': '极夜二重奏',
-  '4260733330': '罗莎莉亚',
-  '4267718859': '反曲弓',
-  '4273845410': '辛焱',
-  '4275754179': '如狼般狩猎者',
-  FIGHT_PROP_BASE_HP: '基础生命值',
-  FIGHT_PROP_HP: '生命值',
-  FIGHT_PROP_HP_PERCENT: '生命值',
-  FIGHT_PROP_BASE_ATTACK: '基础攻击力',
-  FIGHT_PROP_ATTACK: '攻击力',
-  FIGHT_PROP_ATTACK_PERCENT: '攻击力',
-  FIGHT_PROP_BASE_DEFENSE: '基础防御力',
-  FIGHT_PROP_DEFENSE: '防御力',
-  FIGHT_PROP_DEFENSE_PERCENT: '防御力',
-  FIGHT_PROP_BASE_SPEED: '移动速度',
-  FIGHT_PROP_SPEED_PERCENT: '移动速度',
-  FIGHT_PROP_CRITICAL: '暴击率',
-  FIGHT_PROP_ANTI_CRITICAL: '暴击抗性',
-  FIGHT_PROP_CRITICAL_HURT: '暴击伤害',
-  FIGHT_PROP_CHARGE_EFFICIENCY: '元素充能效率',
-  FIGHT_PROP_ADD_HURT: '伤害增加',
-  FIGHT_PROP_SUB_HURT: '受伤减免',
-  FIGHT_PROP_HEAL_ADD: '治疗加成',
-  FIGHT_PROP_HEALED_ADD: '受治疗加成',
-  FIGHT_PROP_ELEMENT_MASTERY: '元素精通',
-  FIGHT_PROP_PHYSICAL_SUB_HURT: '物理抗性',
-  FIGHT_PROP_PHYSICAL_ADD_HURT: '物理伤害加成',
-  FIGHT_PROP_FIRE_ADD_HURT: '火元素伤害加成',
-  FIGHT_PROP_ELEC_ADD_HURT: '雷元素伤害加成',
-  FIGHT_PROP_WATER_ADD_HURT: '水元素伤害加成',
-  FIGHT_PROP_GRASS_ADD_HURT: '草元素伤害加成',
-  FIGHT_PROP_WIND_ADD_HURT: '风元素伤害加成',
-  FIGHT_PROP_ROCK_ADD_HURT: '岩元素伤害加成',
-  FIGHT_PROP_ICE_ADD_HURT: '冰元素伤害加成',
-  FIGHT_PROP_FIRE_SUB_HURT: '火元素抗性',
-  FIGHT_PROP_ELEC_SUB_HURT: '雷元素抗性',
-  FIGHT_PROP_WATER_SUB_HURT: '水元素抗性',
-  FIGHT_PROP_GRASS_SUB_HURT: '草元素抗性',
-  FIGHT_PROP_WIND_SUB_HURT: '风元素抗性',
-  FIGHT_PROP_ROCK_SUB_HURT: '岩元素抗性',
-  FIGHT_PROP_ICE_SUB_HURT: '冰元素抗性',
-  FIGHT_PROP_EFFECT_HIT: '效果命中',
-  FIGHT_PROP_EFFECT_RESIST: '效果抵抗',
-  FIGHT_PROP_FREEZE_SHORTEN: '冻结时间缩短',
-  FIGHT_PROP_DIZZY_SHORTEN: '眩晕时间缩短',
-  FIGHT_PROP_SKILL_CD_MINUS_RATIO: '冷却缩减',
-  FIGHT_PROP_SHIELD_COST_MINUS_RATIO: '护盾强效',
-  FIGHT_PROP_CUR_HP: '生命值',
-  FIGHT_PROP_MAX_HP: '生命值上限',
-  FIGHT_PROP_CUR_ATTACK: '攻击力',
-  FIGHT_PROP_CUR_DEFENSE: '防御力',
-  FIGHT_PROP_CUR_SPEED: '移动速度',
-  abyss: '深境螺旋',
-  achievements: '成就总数',
-  level: '等级'
-}
-
-// 圣遗物词条映射
-export const attrMap = {
-  HP: 'hpPlus',
-  HP_PERCENT: 'hp',
-  ATTACK: 'atkPlus',
-  ATTACK_PERCENT: 'atk',
-  DEFENSE: 'defPlus',
-  DEFENSE_PERCENT: 'def',
-  FIRE_ADD_HURT: 'pyro',
-  ICE_ADD_HURT: 'cryo',
-  ROCK_ADD_HURT: 'geo',
-  ELEC_ADD_HURT: 'electro',
-  WIND_ADD_HURT: 'anemo',
-  WATER_ADD_HURT: 'hydro',
-  PHYSICAL_ADD_HURT: 'phy',
-  GRASS_ADD_HURT: 'dendro',
-  HEAL_ADD: 'heal',
-  ELEMENT_MASTERY: 'mastery',
-  CRITICAL: 'cpct',
-  CRITICAL_HURT: 'cdmg',
-  CHARGE_EFFICIENCY: 'recharge'
-}
-
-// 圣遗物位置映射
-export const artisIdxMap = {
-  EQUIP_BRACER: 1,
-  EQUIP_NECKLACE: 2,
-  EQUIP_SHOES: 3,
-  EQUIP_RING: 4,
-  EQUIP_DRESS: 5,
-  生之花: 1,
-  死之羽: 2,
-  时之沙: 3,
-  空之杯: 4,
-  理之冠: 5
-}

resources/meta-gs/artifact/index.js

@@ -9,30 +9,34 @@ let setMeta = Meta.create('gs', 'artiSet')
 let artiMeta = Meta.create('gs', 'arti')
 
 let artis = Data.readJSON('resources/meta-gs/artifact/data.json', 'miao')
+let setIds = {}
 
 lodash.forEach(artis, (ds) => {
   let artiSet = {
     name: ds.name,
     effect: ds.effect,
-    sets: {}
+    idxs: {}
   }
   setMeta.addDataItem(ds.name, artiSet)
 
-  lodash.forEach(ds.sets, (as, idx) => {
+  lodash.forEach(ds.idxs, (as, idx) => {
     if (as.name) {
       let tmp = {
         set: ds.name,
         name: as.name,
         idx
       }
-      artiSet.sets[idx] = as.name
+      artiSet.idxs[idx] = as.name
       artiMeta.addDataItem(as.name, tmp)
+
+      setIds[artiSet.name] = setIds[artiSet.name] || as.id.toString().slice(0, 2)
     }
   })
 })
 
 setMeta.addAbbr(setAbbr)
 setMeta.addAlias(setAlias)
+setMeta.addAlias(setIds)
 artiMeta.addMeta({
   mainAttr, subAttr, attrMap, attrNameMap, mainIdMap, attrIdMap,
   artiBuffs: calc,

resources/meta-gs/character/alias.js

@@ -82,6 +82,6 @@ export const alias = {
   莱欧斯利: 'Wriothesley,莱欧,枫丹桑博',
   那维莱特: 'Neuvillette,那维,水龙王,水龙,审判官,海獭,龙王',
   夏洛蒂: 'Charlotte,夏洛,夏洛帝,记者,小记者',
-  芙宁娜: 'Furina,Focalors,水神,芙芙,芙卡洛斯',
+  芙宁娜: 'Furina,Focalors,水神,芙芙,芙卡洛斯,傻芙芙',
 }
 

resources/meta-gs/material/data.json

@@ -2228,25 +2228,25 @@
     "star": 1
   },
   "异色结晶石": {
-    "id": "n112082",
+    "id": 112082,
     "name": "异色结晶石",
     "type": "normal",
     "star": 3,
     "items": {
       "异海凝珠": {
-        "id": "n112080",
+        "id": 112080,
         "name": "异海凝珠",
         "type": "normal",
         "star": 1
       },
       "异海之块": {
-        "id": "n112081",
+        "id": 112081,
         "name": "异海之块",
         "type": "normal",
         "star": 2
       },
       "异色结晶石": {
-        "id": "n112082",
+        "id": 112082,
         "name": "异色结晶石",
         "type": "normal",
         "star": 3

resources/meta-gs/weapon/alias.js

@@ -76,7 +76,7 @@ export const alias = {
   灰河渡手: '灰河,水管',
   海渊终曲: '海渊,枫丹锻造剑,枫丹锻造单手剑',
   船坞长剑: '船坞,船坞剑',
-  静水流涌之辉: '静水,水神专武',
+  静水流涌之辉: '静水,水神专武,净水,净水流涌之辉,静水涌流之辉',
   水仙十字之剑: '水仙十字,水仙剑,水仙之剑',
 
   // 大剑

resources/meta-gs/weapon/bow/data.json

@@ -1,196 +1,193 @@
 {
-  "猎弓": {
+  "15101": {
     "id": 15101,
     "name": "猎弓",
     "star": 1
   },
-  "历练的猎弓": {
+  "15201": {
     "id": 15201,
     "name": "历练的猎弓",
     "star": 2
   },
-  "鸦羽弓": {
+  "15301": {
     "id": 15301,
     "name": "鸦羽弓",
     "star": 3
   },
-  "神射手之誓": {
+  "15302": {
     "id": 15302,
     "name": "神射手之誓",
     "star": 3
   },
-  "反曲弓": {
+  "15303": {
     "id": 15303,
     "name": "反曲弓",
     "star": 3
   },
-  "弹弓": {
+  "15304": {
     "id": 15304,
     "name": "弹弓",
     "star": 3
   },
-  "信使": {
+  "15305": {
     "id": 15305,
     "name": "信使",
     "star": 3
   },
-  "黑檀弓": {
+  "15306": {
-    "id": 15306,
+    "id": "15306",
     "name": "黑檀弓",
-    "star": 3
+    "star": 3,
+    "wid": "n15306"
   },
-  "西风猎弓": {
+  "15401": {
     "id": 15401,
     "name": "西风猎弓",
     "star": 4
   },
-  "绝弦": {
+  "15402": {
     "id": 15402,
     "name": "绝弦",
     "star": 4
   },
-  "祭礼弓": {
+  "15403": {
     "id": 15403,
     "name": "祭礼弓",
     "star": 4
   },
-  "宗室长弓": {
+  "15404": {
     "id": 15404,
     "name": "宗室长弓",
     "star": 4
   },
-  "弓藏": {
+  "15405": {
     "id": 15405,
     "name": "弓藏",
     "star": 4
   },
-  "试作澹月": {
+  "15406": {
     "id": 15406,
     "name": "试作澹月",
     "star": 4
   },
-  "钢轮弓": {
+  "15407": {
     "id": 15407,
     "name": "钢轮弓",
     "star": 4
   },
-  "黑岩战弓": {
+  "15408": {
     "id": 15408,
     "name": "黑岩战弓",
     "star": 4
   },
-  "苍翠猎弓": {
+  "15409": {
     "id": 15409,
     "name": "苍翠猎弓",
     "star": 4
   },
-  "暗巷猎手": {
+  "15410": {
     "id": 15410,
     "name": "暗巷猎手",
     "star": 4
   },
-  "落霞": {
+  "15411": {
     "id": 15411,
     "name": "落霞",
     "star": 4
   },
-  "幽夜华尔兹": {
+  "15412": {
     "id": 15412,
     "name": "幽夜华尔兹",
     "star": 4
   },
-  "风花之颂": {
+  "15413": {
     "id": 15413,
     "name": "风花之颂",
     "star": 4
   },
-  "破魔之弓": {
+  "15414": {
     "id": 15414,
     "name": "破魔之弓",
     "star": 4
   },
-  "掠食者": {
+  "15415": {
     "id": 15415,
     "name": "掠食者",
     "star": 4
   },
-  "曚云之月": {
+  "15416": {
     "id": 15416,
     "name": "曚云之月",
     "star": 4
   },
-  "王下近侍": {
+  "15417": {
     "id": 15417,
     "name": "王下近侍",
     "star": 4
   },
-  "竭泽": {
+  "15418": {
     "id": 15418,
     "name": "竭泽",
     "star": 4
   },
-  "天空之翼": {
+  "15419": {
-    "id": 15501,
-    "name": "天空之翼",
-    "star": 5
-  },
-  "阿莫斯之弓": {
-    "id": 15502,
-    "name": "阿莫斯之弓",
-    "star": 5
-  },
-  "终末嗟叹之诗": {
-    "id": 15503,
-    "name": "终末嗟叹之诗",
-    "star": 5
-  },
-  "冬极白星": {
-    "id": 15507,
-    "name": "冬极白星",
-    "star": 5
-  },
-  "若水": {
-    "id": 15508,
-    "name": "若水",
-    "star": 5
-  },
-  "飞雷之弦振": {
-    "id": 15509,
-    "name": "飞雷之弦振",
-    "star": 5
-  },
-  "猎人之径": {
-    "id": 15511,
-    "name": "猎人之径",
-    "star": 5
-  },
-  "鹮穿之喙": {
     "id": 15419,
     "name": "鹮穿之喙",
     "star": 4
   },
-  "烈阳之嗣": {
+  "15424": {
-    "id": "15424",
+    "id": 15424,
     "name": "烈阳之嗣",
-    "star": 4,
+    "star": 4
-    "wid": "n15424"
   },
-  "静谧之曲": {
+  "15425": {
-    "id": "15425",
+    "id": 15425,
     "name": "静谧之曲",
-    "star": 4,
+    "star": 4
-    "wid": "n15425"
   },
-  "最初的大魔术": {
+  "15427": {
-    "id": "15512",
+    "id": 15427,
-    "name": "最初的大魔术",
-    "star": 5,
-    "wid": "n15512"
-  },
-  "测距规": {
-    "id": "15427",
     "name": "测距规",
-    "star": 4,
+    "star": 4
-    "wid": "n15427"
+  },
+  "15501": {
+    "id": 15501,
+    "name": "天空之翼",
+    "star": 5
+  },
+  "15502": {
+    "id": 15502,
+    "name": "阿莫斯之弓",
+    "star": 5
+  },
+  "15503": {
+    "id": 15503,
+    "name": "终末嗟叹之诗",
+    "star": 5
+  },
+  "15507": {
+    "id": 15507,
+    "name": "冬极白星",
+    "star": 5
+  },
+  "15508": {
+    "id": 15508,
+    "name": "若水",
+    "star": 5
+  },
+  "15509": {
+    "id": 15509,
+    "name": "飞雷之弦振",
+    "star": 5
+  },
+  "15511": {
+    "id": 15511,
+    "name": "猎人之径",
+    "star": 5
+  },
+  "15512": {
+    "id": 15512,
+    "name": "最初的大魔术",
+    "star": 5
   }
 }

resources/meta-gs/weapon/catalyst/data.json

@@ -1,192 +1,188 @@
 {
-  "学徒笔记": {
+  "14101": {
     "id": 14101,
     "name": "学徒笔记",
     "star": 1
   },
-  "口袋魔导书": {
+  "14201": {
     "id": 14201,
     "name": "口袋魔导书",
     "star": 2
   },
-  "魔导绪论": {
+  "14301": {
     "id": 14301,
     "name": "魔导绪论",
     "star": 3
   },
-  "讨龙英杰谭": {
+  "14302": {
     "id": 14302,
     "name": "讨龙英杰谭",
     "star": 3
   },
-  "异世界行记": {
+  "14303": {
     "id": 14303,
     "name": "异世界行记",
     "star": 3
   },
-  "翡玉法球": {
+  "14304": {
     "id": 14304,
     "name": "翡玉法球",
     "star": 3
   },
-  "甲级宝珏": {
+  "14305": {
     "id": 14305,
     "name": "甲级宝珏",
     "star": 3
   },
-  "琥珀玥": {
+  "14306": {
-    "id": 14306,
+    "id": "14306",
     "name": "琥珀玥",
-    "star": 3
+    "star": 3,
+    "wid": "n14306"
   },
-  "西风秘典": {
+  "14401": {
     "id": 14401,
     "name": "西风秘典",
     "star": 4
   },
-  "流浪乐章": {
+  "14402": {
     "id": 14402,
     "name": "流浪乐章",
     "star": 4
   },
-  "祭礼残章": {
+  "14403": {
     "id": 14403,
     "name": "祭礼残章",
     "star": 4
   },
-  "宗室秘法录": {
+  "14404": {
     "id": 14404,
     "name": "宗室秘法录",
     "star": 4
   },
-  "匣里日月": {
+  "14405": {
     "id": 14405,
     "name": "匣里日月",
     "star": 4
   },
-  "试作金珀": {
+  "14406": {
     "id": 14406,
     "name": "试作金珀",
     "star": 4
   },
-  "万国诸海图谱": {
+  "14407": {
     "id": 14407,
     "name": "万国诸海图谱",
     "star": 4
   },
-  "黑岩绯玉": {
+  "14408": {
     "id": 14408,
     "name": "黑岩绯玉",
     "star": 4
   },
-  "昭心": {
+  "14409": {
     "id": 14409,
     "name": "昭心",
     "star": 4
   },
-  "暗巷的酒与诗": {
+  "14410": {
     "id": 14410,
     "name": "暗巷的酒与诗",
     "star": 4
   },
-  "忍冬之果": {
+  "14412": {
     "id": 14412,
     "name": "忍冬之果",
     "star": 4
   },
-  "嘟嘟可故事集": {
+  "14413": {
     "id": 14413,
     "name": "嘟嘟可故事集",
     "star": 4
   },
-  "白辰之环": {
+  "14414": {
     "id": 14414,
     "name": "白辰之环",
     "star": 4
   },
-  "证誓之明瞳": {
+  "14415": {
     "id": 14415,
     "name": "证誓之明瞳",
     "star": 4
   },
-  "流浪的晚星": {
+  "14416": {
     "id": 14416,
     "name": "流浪的晚星",
     "star": 4
   },
-  "盈满之实": {
+  "14417": {
     "id": 14417,
     "name": "盈满之实",
     "star": 4
   },
-  "天空之卷": {
+  "14424": {
+    "id": 14424,
+    "name": "遗祀玉珑",
+    "star": 4
+  },
+  "14425": {
+    "id": 14425,
+    "name": "纯水流华",
+    "star": 4
+  },
+  "14426": {
+    "id": 14426,
+    "name": "无垠蔚蓝之歌",
+    "star": 4
+  },
+  "14501": {
     "id": 14501,
     "name": "天空之卷",
     "star": 5
   },
-  "四风原典": {
+  "14502": {
     "id": 14502,
     "name": "四风原典",
     "star": 5
   },
-  "尘世之锁": {
+  "14504": {
     "id": 14504,
     "name": "尘世之锁",
     "star": 5
   },
-  "不灭月华": {
+  "14505": {
-    "id": 14506,
-    "name": "不灭月华",
-    "star": 5
-  },
-  "神乐之真意": {
-    "id": 14509,
-    "name": "神乐之真意",
-    "star": 5
-  },
-  "千夜浮梦": {
-    "id": 14511,
-    "name": "千夜浮梦",
-    "star": 5
-  },
-  "图莱杜拉的回忆": {
-    "id": 14512,
-    "name": "图莱杜拉的回忆",
-    "star": 5
-  },
-  "碧落之珑": {
     "id": 14505,
     "name": "碧落之珑",
     "star": 5
   },
-  "遗祀玉珑": {
+  "14506": {
-    "id": "14424",
+    "id": 14506,
-    "name": "遗祀玉珑",
+    "name": "不灭月华",
-    "star": 4,
+    "star": 5
-    "wid": "n14424"
   },
-  "纯水流华": {
+  "14509": {
-    "id": "14425",
+    "id": 14509,
-    "name": "纯水流华",
+    "name": "神乐之真意",
-    "star": 4,
+    "star": 5
-    "wid": "n14425"
   },
-  "无垠蔚蓝之歌": {
+  "14511": {
-    "id": "14426",
+    "id": 14511,
-    "name": "无垠蔚蓝之歌",
+    "name": "千夜浮梦",
-    "star": 4,
+    "star": 5
-    "wid": "n14426"
   },
-  "金流监督": {
+  "14512": {
-    "id": "14513",
+    "id": 14512,
+    "name": "图莱杜拉的回忆",
+    "star": 5
+  },
+  "14513": {
+    "id": 14513,
     "name": "金流监督",
-    "star": 5,
+    "star": 5
-    "wid": "n14513"
   },
-  "万世流涌大典": {
+  "14514": {
-    "id": "14514",
+    "id": 14514,
     "name": "万世流涌大典",
-    "star": 5,
+    "star": 5
-    "wid": "n14514"
   }
 }

resources/meta-gs/weapon/claymore/data.json

@@ -1,175 +1,173 @@
 {
-  "训练大剑": {
+  "12101": {
     "id": 12101,
     "name": "训练大剑",
     "star": 1
   },
-  "佣兵重剑": {
+  "12201": {
     "id": 12201,
     "name": "佣兵重剑",
     "star": 2
   },
-  "铁影阔剑": {
+  "12301": {
     "id": 12301,
     "name": "铁影阔剑",
     "star": 3
   },
-  "沐浴龙血的剑": {
+  "12302": {
     "id": 12302,
     "name": "沐浴龙血的剑",
     "star": 3
   },
-  "白铁大剑": {
+  "12303": {
     "id": 12303,
     "name": "白铁大剑",
     "star": 3
   },
-  "石英大剑": {
+  "12304": {
-    "id": 12304,
+    "id": "12304",
     "name": "石英大剑",
-    "star": 3
+    "star": 3,
+    "wid": "n12304"
   },
-  "以理服人": {
+  "12305": {
     "id": 12305,
     "name": "以理服人",
     "star": 3
   },
-  "飞天大御剑": {
+  "12306": {
     "id": 12306,
     "name": "飞天大御剑",
     "star": 3
   },
-  "西风大剑": {
+  "12401": {
     "id": 12401,
     "name": "西风大剑",
     "star": 4
   },
-  "钟剑": {
+  "12402": {
     "id": 12402,
     "name": "钟剑",
     "star": 4
   },
-  "祭礼大剑": {
+  "12403": {
     "id": 12403,
     "name": "祭礼大剑",
     "star": 4
   },
-  "宗室大剑": {
+  "12404": {
     "id": 12404,
     "name": "宗室大剑",
     "star": 4
   },
-  "雨裁": {
+  "12405": {
     "id": 12405,
     "name": "雨裁",
     "star": 4
   },
-  "试作古华": {
+  "12406": {
     "id": 12406,
     "name": "试作古华",
     "star": 4
   },
-  "白影剑": {
+  "12407": {
     "id": 12407,
     "name": "白影剑",
     "star": 4
   },
-  "黑岩斩刀": {
+  "12408": {
     "id": 12408,
     "name": "黑岩斩刀",
     "star": 4
   },
-  "螭骨剑": {
+  "12409": {
     "id": 12409,
     "name": "螭骨剑",
     "star": 4
   },
-  "千岩古剑": {
+  "12410": {
     "id": 12410,
     "name": "千岩古剑",
     "star": 4
   },
-  "雪葬的星银": {
+  "12411": {
     "id": 12411,
     "name": "雪葬的星银",
     "star": 4
   },
-  "衔珠海皇": {
+  "12412": {
     "id": 12412,
     "name": "衔珠海皇",
     "star": 4
   },
-  "桂木斩长正": {
+  "12414": {
     "id": 12414,
     "name": "桂木斩长正",
     "star": 4
   },
-  "玛海菈的水色": {
+  "12415": {
     "id": 12415,
     "name": "玛海菈的水色",
     "star": 4
   },
-  "恶王丸": {
+  "12416": {
     "id": 12416,
     "name": "恶王丸",
     "star": 4
   },
-  "森林王器": {
+  "12417": {
     "id": 12417,
     "name": "森林王器",
     "star": 4
   },
-  "天空之傲": {
+  "12418": {
-    "id": 12501,
-    "name": "天空之傲",
-    "star": 5
-  },
-  "狼的末路": {
-    "id": 12502,
-    "name": "狼的末路",
-    "star": 5
-  },
-  "松籁响起之时": {
-    "id": 12503,
-    "name": "松籁响起之时",
-    "star": 5
-  },
-  "无工之剑": {
-    "id": 12504,
-    "name": "无工之剑",
-    "star": 5
-  },
-  "赤角石溃杵": {
-    "id": 12510,
-    "name": "赤角石溃杵",
-    "star": 5
-  },
-  "饰铁之花": {
     "id": 12418,
     "name": "饰铁之花",
     "star": 4
   },
-  "苇海信标": {
+  "12424": {
+    "id": 12424,
+    "name": "聊聊棒",
+    "star": 4
+  },
+  "12425": {
+    "id": 12425,
+    "name": "浪影阔剑",
+    "star": 4
+  },
+  "12427": {
+    "id": 12427,
+    "name": "便携动力锯",
+    "star": 4
+  },
+  "12501": {
+    "id": 12501,
+    "name": "天空之傲",
+    "star": 5
+  },
+  "12502": {
+    "id": 12502,
+    "name": "狼的末路",
+    "star": 5
+  },
+  "12503": {
+    "id": 12503,
+    "name": "松籁响起之时",
+    "star": 5
+  },
+  "12504": {
+    "id": 12504,
+    "name": "无工之剑",
+    "star": 5
+  },
+  "12510": {
+    "id": 12510,
+    "name": "赤角石溃杵",
+    "star": 5
+  },
+  "12511": {
     "id": 12511,
     "name": "苇海信标",
     "star": 5
-  },
-  "聊聊棒": {
-    "id": "12424",
-    "name": "聊聊棒",
-    "star": 4,
-    "wid": "n12424"
-  },
-  "浪影阔剑": {
-    "id": "12425",
-    "name": "浪影阔剑",
-    "star": 4,
-    "wid": "n12425"
-  },
-  "便携动力锯": {
-    "id": "12427",
-    "name": "便携动力锯",
-    "star": 4,
-    "wid": "n12427"
   }
 }

resources/meta-gs/weapon/index.js

@@ -37,7 +37,7 @@ for (let type in weaponType) {
   // data
   let typeData = await Data.readJSON(`resources/meta-gs/weapon/${type}/data.json`, 'miao')
   lodash.forEach(typeData, (ds) => {
-    data[ds.name] = {
+    data[ds.id] = {
       id: ds.id,
       name: ds.name,
       type,

resources/meta-gs/weapon/polearm/data.json

@@ -1,150 +1,147 @@
 {
-  "新手长枪": {
+  "13101": {
     "id": 13101,
     "name": "新手长枪",
     "star": 1
   },
-  "铁尖枪": {
+  "13201": {
     "id": 13201,
     "name": "铁尖枪",
     "star": 2
   },
-  "白缨枪": {
+  "13301": {
     "id": 13301,
     "name": "白缨枪",
     "star": 3
   },
-  "钺矛": {
+  "13302": {
     "id": 13302,
     "name": "钺矛",
     "star": 3
   },
-  "黑缨枪": {
+  "13303": {
     "id": 13303,
     "name": "黑缨枪",
     "star": 3
   },
-  "匣里灭辰": {
+  "13401": {
     "id": 13401,
     "name": "匣里灭辰",
     "star": 4
   },
-  "试作星镰": {
+  "13402": {
     "id": 13402,
     "name": "试作星镰",
     "star": 4
   },
-  "流月针": {
+  "13403": {
     "id": 13403,
     "name": "流月针",
     "star": 4
   },
-  "黑岩刺枪": {
+  "13404": {
     "id": 13404,
     "name": "黑岩刺枪",
     "star": 4
   },
-  "决斗之枪": {
+  "13405": {
     "id": 13405,
     "name": "决斗之枪",
     "star": 4
   },
-  "千岩长枪": {
+  "13406": {
     "id": 13406,
     "name": "千岩长枪",
     "star": 4
   },
-  "西风长枪": {
+  "13407": {
     "id": 13407,
     "name": "西风长枪",
     "star": 4
   },
-  "宗室猎枪": {
+  "13408": {
     "id": 13408,
     "name": "宗室猎枪",
     "star": 4
   },
-  "龙脊长枪": {
+  "13409": {
     "id": 13409,
     "name": "龙脊长枪",
     "star": 4
   },
-  "喜多院十文字": {
+  "13414": {
     "id": 13414,
     "name": "喜多院十文字",
     "star": 4
   },
-  "「渔获」": {
+  "13415": {
     "id": 13415,
     "name": "「渔获」",
     "star": 4
   },
-  "断浪长鳍": {
+  "13416": {
     "id": 13416,
     "name": "断浪长鳍",
     "star": 4
   },
-  "贯月矢": {
+  "13417": {
     "id": 13417,
     "name": "贯月矢",
     "star": 4
   },
-  "风信之锋": {
+  "13419": {
     "id": 13419,
     "name": "风信之锋",
     "star": 4
   },
-  "护摩之杖": {
+  "13424": {
+    "id": 13424,
+    "name": "峡湾长歌",
+    "star": 4
+  },
+  "13425": {
+    "id": 13425,
+    "name": "公义的酬报",
+    "star": 4
+  },
+  "13427": {
+    "id": 13427,
+    "name": "勘探钻机",
+    "star": 4
+  },
+  "13501": {
     "id": 13501,
     "name": "护摩之杖",
     "star": 5
   },
-  "天空之脊": {
+  "13502": {
     "id": 13502,
     "name": "天空之脊",
     "star": 5
   },
-  "贯虹之槊": {
+  "13504": {
     "id": 13504,
     "name": "贯虹之槊",
     "star": 5
   },
-  "和璞鸢": {
+  "13505": {
     "id": 13505,
     "name": "和璞鸢",
     "star": 5
   },
-  "息灾": {
+  "13507": {
     "id": 13507,
     "name": "息灾",
     "star": 5
   },
-  "薙草之稻光": {
+  "13509": {
     "id": 13509,
     "name": "薙草之稻光",
     "star": 5
   },
-  "赤沙之杖": {
+  "13511": {
     "id": 13511,
     "name": "赤沙之杖",
     "star": 5
-  },
-  "峡湾长歌": {
-    "id": "13424",
-    "name": "峡湾长歌",
-    "star": 4,
-    "wid": "n13424"
-  },
-  "公义的酬报": {
-    "id": "13425",
-    "name": "公义的酬报",
-    "star": 4,
-    "wid": "n13425"
-  },
-  "勘探钻机": {
-    "id": "13427",
-    "name": "勘探钻机",
-    "star": 4,
-    "wid": "n13427"
   }
 }

resources/meta-gs/weapon/sword/data.json

@@ -1,218 +1,226 @@
 {
-  "无锋剑": {
+  "11101": {
     "id": 11101,
     "name": "无锋剑",
     "star": 1
   },
-  "银剑": {
+  "11201": {
     "id": 11201,
     "name": "银剑",
     "star": 2
   },
-  "冷刃": {
+  "11301": {
     "id": 11301,
     "name": "冷刃",
     "star": 3
   },
-  "黎明神剑": {
+  "11302": {
     "id": 11302,
     "name": "黎明神剑",
     "star": 3
   },
-  "旅行剑": {
+  "11303": {
     "id": 11303,
     "name": "旅行剑",
     "star": 3
   },
-  "暗铁剑": {
+  "11304": {
     "id": 11304,
     "name": "暗铁剑",
     "star": 3
   },
-  "吃虎鱼刀": {
+  "11305": {
     "id": 11305,
     "name": "吃虎鱼刀",
     "star": 3
   },
-  "飞天御剑": {
+  "11306": {
     "id": 11306,
     "name": "飞天御剑",
     "star": 3
   },
-  "西风剑": {
+  "11401": {
     "id": 11401,
     "name": "西风剑",
     "star": 4
   },
-  "笛剑": {
+  "11402": {
     "id": 11402,
     "name": "笛剑",
     "star": 4
   },
-  "祭礼剑": {
+  "11403": {
     "id": 11403,
     "name": "祭礼剑",
     "star": 4
   },
-  "宗室长剑": {
+  "11404": {
     "id": 11404,
     "name": "宗室长剑",
     "star": 4
   },
-  "匣里龙吟": {
+  "11405": {
     "id": 11405,
     "name": "匣里龙吟",
     "star": 4
   },
-  "试作斩岩": {
+  "11406": {
     "id": 11406,
     "name": "试作斩岩",
     "star": 4
   },
-  "铁蜂刺": {
+  "11407": {
     "id": 11407,
     "name": "铁蜂刺",
     "star": 4
   },
-  "黑岩长剑": {
+  "11408": {
     "id": 11408,
     "name": "黑岩长剑",
     "star": 4
   },
-  "黑剑": {
+  "11409": {
     "id": 11409,
     "name": "黑剑",
     "star": 4
   },
-  "暗巷闪光": {
+  "11410": {
     "id": 11410,
     "name": "暗巷闪光",
     "star": 4
   },
-  "降临之剑": {
+  "11412": {
     "id": 11412,
     "name": "降临之剑",
     "star": 4
   },
-  "腐殖之剑": {
+  "11413": {
     "id": 11413,
     "name": "腐殖之剑",
     "star": 4
   },
-  "天目影打刀": {
+  "11414": {
     "id": 11414,
     "name": "天目影打刀",
     "star": 4
   },
-  "辰砂之纺锤": {
+  "11415": {
     "id": 11415,
     "name": "辰砂之纺锤",
     "star": 4
   },
-  "笼钓瓶一心": {
+  "11416": {
     "id": 11416,
     "name": "笼钓瓶一心",
     "star": 4
   },
-  "原木刀": {
+  "11417": {
     "id": 11417,
     "name": "原木刀",
     "star": 4
   },
-  "西福斯的月光": {
+  "11418": {
     "id": 11418,
     "name": "西福斯的月光",
     "star": 4
   },
-  "「一心传」名刀": {
+  "11419": {
-    "id": 11421,
+    "id": "11419",
     "name": "「一心传」名刀",
-    "star": 4
+    "star": 4,
+    "wid": "n11419"
   },
-  "风鹰剑": {
+  "11420": {
-    "id": 11501,
+    "id": "11420",
-    "name": "风鹰剑",
+    "name": "「一心传」名刀",
-    "star": 5
+    "star": 4,
+    "wid": "n11420"
   },
-  "天空之刃": {
+  "11421": {
-    "id": 11502,
+    "id": "11421",
-    "name": "天空之刃",
+    "name": "「一心传」名刀",
-    "star": 5
+    "star": 4,
+    "wid": "n11421"
   },
-  "苍古自由之誓": {
+  "11422": {
-    "id": 11503,
-    "name": "苍古自由之誓",
-    "star": 5
-  },
-  "斫峰之刃": {
-    "id": 11504,
-    "name": "斫峰之刃",
-    "star": 5
-  },
-  "磐岩结绿": {
-    "id": 11505,
-    "name": "磐岩结绿",
-    "star": 5
-  },
-  "雾切之回光": {
-    "id": 11509,
-    "name": "雾切之回光",
-    "star": 5
-  },
-  "波乱月白经津": {
-    "id": 11510,
-    "name": "波乱月白经津",
-    "star": 5
-  },
-  "圣显之钥": {
-    "id": 11511,
-    "name": "圣显之钥",
-    "star": 5
-  },
-  "东花坊时雨": {
     "id": 11422,
     "name": "东花坊时雨",
     "star": 4
   },
-  "裁叶萃光": {
+  "11424": {
-    "id": 11512,
+    "id": 11424,
-    "name": "裁叶萃光",
-    "star": 5
-  },
-  "狼牙": {
-    "id": "11424",
     "name": "狼牙",
-    "star": 4,
+    "star": 4
-    "wid": "n11424"
   },
-  "海渊终曲": {
+  "11425": {
-    "id": "11425",
+    "id": 11425,
     "name": "海渊终曲",
-    "star": 4,
+    "star": 4
-    "wid": "n11425"
   },
-  "灰河渡手": {
+  "11426": {
-    "id": "11426",
+    "id": 11426,
     "name": "灰河渡手",
-    "star": 4,
+    "star": 4
-    "wid": "n11426"
   },
-  "船坞长剑": {
+  "11427": {
-    "id": "11427",
+    "id": 11427,
     "name": "船坞长剑",
-    "star": 4,
+    "star": 4
-    "wid": "n11427"
   },
-  "水仙十字之剑": {
+  "11428": {
-    "id": "11429",
+    "id": 11428,
     "name": "水仙十字之剑",
     "star": 4,
     "wid": "n11429"
   },
-  "静水流涌之辉": {
+  "11501": {
-    "id": "11513",
+    "id": 11501,
+    "name": "风鹰剑",
+    "star": 5
+  },
+  "11502": {
+    "id": 11502,
+    "name": "天空之刃",
+    "star": 5
+  },
+  "11503": {
+    "id": 11503,
+    "name": "苍古自由之誓",
+    "star": 5
+  },
+  "11504": {
+    "id": 11504,
+    "name": "斫峰之刃",
+    "star": 5
+  },
+  "11505": {
+    "id": 11505,
+    "name": "磐岩结绿",
+    "star": 5
+  },
+  "11509": {
+    "id": 11509,
+    "name": "雾切之回光",
+    "star": 5
+  },
+  "11510": {
+    "id": 11510,
+    "name": "波乱月白经津",
+    "star": 5
+  },
+  "11511": {
+    "id": 11511,
+    "name": "圣显之钥",
+    "star": 5
+  },
+  "11512": {
+    "id": 11512,
+    "name": "裁叶萃光",
+    "star": 5
+  },
+  "11513": {
+    "id": 11513,
     "name": "静水流涌之辉",
-    "star": 5,
+    "star": 5
-    "wid": "n11513"
   }
 }

resources/meta-gs/weapon/sword/水仙十字之剑/data.json

@@ -39,21 +39,9 @@
       "80+": 37.71
     }
   },
-  "materials": {
+  "materials": {},
-    "weapon": "悠古弦音的回响",
-    "monster": "役人的时时刻刻",
-    "normal": "异色结晶石"
-  },
   "affixData": {
-    "text": "装备者不具备「始基力」时：普通攻击、重击、下落攻击命中时，会释放芒性或荒性的能量冲击，造成$[0]攻击力的伤害。该效果每12秒至多触发一次，能量冲击的类型由水仙十字之剑当前的属性决定。",
+    "text": "在数之不尽的故事中，能够配得上传奇勇者的武器，也是开启一切门扉迈过高潮前往命运终局的钥匙。",
-    "datas": {
+    "datas": {}
-      "0": [
-        "160%",
-        "200%",
-        "240%",
-        "280%",
-        "320%"
-      ]
-    }
   }
 }

resources/meta-sr/artifact/index.js

@@ -17,7 +17,7 @@ lodash.forEach(data, (setData) => {
   let artiSet = {
     name: setData.name,
     effect: setData.skill,
-    sets: {}
+    idxs: {}
   }
   setMeta.addDataItem(artiSet.name, artiSet)
 
@@ -29,7 +29,7 @@ lodash.forEach(data, (setData) => {
       idx
     })
     idMap[ds.name] = lodash.keys(ds.ids).join(',')
-    artiSet.sets[idx] = ds.name
+    artiSet.idxs[idx] = ds.name
   })
 })