更新圣遗物id的查询逻辑

CHANGELOG.md

@@ -1,10 +1,8 @@
-# 2.5.2
+# 2.5.3
 
-* 新增`#天赋统计`、`#周三天赋`命令，查看角色天赋及技能书
-* 新增`#五星练度统计`、`#四星天赋`命令，指定查看五星或四星角色数据
-* 新增`#刷新天赋`命令，用于在有CK情况下强制刷新本地天赋缓存数据
+* 增加原神4.3相关的角色与圣遗物素材
 
-# 2.5.1
+# 2.5.1 ~ 2.5.2
 
 * 面板功能升级
   * 角色面板展示圣遗物副词缀统计
@@ -14,6 +12,9 @@
   * 重构Models的结构，重构Meta的数据处理逻辑
   * 重构面板数据、圣遗物数据、角色属性的处理与保存逻辑
   * 原神的面板数据迁移至 **/data/PlayerData/gs**，原神资源迁移至**resources/meta-gs**
+* 新增`#天赋统计`、`#周三天赋`命令，查看角色天赋及技能书
+* 新增`#五星练度统计`、`#四星天赋`命令，指定查看五星或四星角色数据
+* 新增`#刷新天赋`命令，用于在有CK情况下强制刷新本地天赋缓存数据
 
 # 2.5.0
 

config/system/cfg_system.js

@@ -137,7 +137,7 @@ export const cfgSchema = {
       notReleasedData: {
         title: '未实装角色数据',
         key: '未实装',
-        def: true,
+        def: false,
         showDesc: true,
         desc: '开启时才能查看未实装角色信息。数据仅供参考，请以游戏正式实装内容为准'
       },

models/Avatar.js

@@ -222,6 +222,7 @@ export default class Avatar extends Base {
       return {}
     }
     let wData = Weapon.get(ret.id, this.game)
+    ret.sName = wData.sName
     ret.splash = wData.imgs.gacha
     let wAttr = wData.calcAttr(ret.level, ret.promote)
     let attrs = {}

models/Weapon.js

@@ -38,6 +38,13 @@ class Weapon extends Base {
     return name.length <= 4 ? name : (abbr || name)
   }
 
+  get sName () {
+    let name = this.name
+    let abbr = this.meta?.abbr
+    name = name.replaceAll(/[「」]/g, '')
+    return name.length <= 8 ? name : (abbr || name)
+  }
+
   get imgs () {
     if (this.isGs) {
       return {

resources/character/profile-detail.html

@@ -71,7 +71,7 @@
         <div class="char-weapon">
           <div class="img" style="background-image:url({{_res_path}}{{weapon.img}})"></div>
           <div class="head">
-            <strong>{{weapon.name}}</strong>
+            <strong>{{weapon.sName || weapon.name}}</strong>
             <div class="star star-{{weapon.star}}"></div>
             <span><span class="affix affix-{{weapon.affix}}">精{{weapon.affix}}</span> Lv.{{weapon.leve || weapon.level}} </span>
           </div>
@@ -215,7 +215,7 @@
         <div class="item weapon">
           <div class="img" style="background-image:url({{_res_path}}{{weapon.img}})"></div>
           <div class="head">
-            <strong>{{weapon.name}}</strong>
+            <strong>{{weapon.sName || weapon.name}}</strong>
             <span class="info"><span
               class="affix affix-{{weapon.affix}}">精{{weapon.affix}}</span> Lv.{{weapon.leve || weapon.level}} </span>
             <div class="weapon-attr">

resources/meta-gs/artifact/alias.js

@@ -41,7 +41,9 @@ export const setAbbr = {
   水仙之梦: '水仙',
   花海甘露之光: '花海',
   逐影猎人: '猎人',
-  黄金剧团: '剧团'
+  黄金剧团: '剧团',
+  昔时之歌: '昔时',
+  回声之林夜话: '回声'
 }
 
 
@@ -88,5 +90,7 @@ export const setAlias = {
   水仙之梦: '水仙',
   花海甘露之光: '花海,甘露,甘露花海,花海甘露,甘露花海之光',
   逐影猎人: '逐影,猎人',
-  黄金剧团: '黄金,剧团'
+  黄金剧团: '黄金,剧团',
+  昔时之歌: '昔时',
+  回声之林夜话: '回声夜话,夜话'
 }

resources/meta-gs/artifact/artis-mark.js

@@ -76,6 +76,6 @@ export const usefulAttr = {
   菲米尼: { hp: 0, atk: 75, def: 0, cpct: 100, cdmg: 100, mastery: 0, dmg: 100, phy: 100, recharge: 55, heal: 0 },
   那维莱特: { hp: 100, atk: 0, def: 0, cpct: 100, cdmg: 100, mastery: 75, dmg: 100, phy: 0, recharge: 75, heal: 0 },
   莱欧斯利: { hp: 0, atk: 75, def: 0, cpct: 100, cdmg: 100, mastery: 75, dmg: 100, phy: 0, recharge: 55, heal: 0 },
-  芙宁娜: { hp: 100, atk: 0, def: 0, cpct: 100, cdmg: 100, mastery: 75, dmg: 100, phy: 0, recharge: 75, heal: 100 },
-  夏洛蒂:{ hp: 0, atk: 75, def: 0, cpct: 100, cdmg: 100, mastery: 75, dmg: 100, phy: 0, recharge: 75, heal: 100 },
+  芙宁娜: { hp: 100, atk: 0, def: 0, cpct: 100, cdmg: 100, mastery: 45, dmg: 100, phy: 0, recharge: 75, heal: 100 },
+  夏洛蒂: { hp: 0, atk: 75, def: 0, cpct: 100, cdmg: 100, mastery: 75, dmg: 100, phy: 0, recharge: 75, heal: 100 },
 }

resources/meta-gs/artifact/data.json

@@ -1340,5 +1340,65 @@
       "2": "元素战技造成的伤害提升20%。",
       "4": "元素战技造成的伤害提升20%；此外，处于队伍后台时，元素战技造成的伤害还将进一步提升20%，该效果将在登场后2秒移除。"
     }
+  },
+  "400281": {
+    "id": "400281",
+    "name": "昔时之歌",
+    "idxs": {
+      "1": {
+        "id": "33543",
+        "name": "昔时遗落之誓"
+      },
+      "2": {
+        "id": "33523",
+        "name": "昔时浮想之思"
+      },
+      "3": {
+        "id": "33553",
+        "name": "昔时回映之音"
+      },
+      "4": {
+        "id": "33513",
+        "name": "昔时应许之梦"
+      },
+      "5": {
+        "id": "33533",
+        "name": "昔时传奏之诗"
+      }
+    },
+    "skills": {
+      "2": "治疗加成提高15%。",
+      "4": "装备者对队伍中的角色进行治疗时，将产生持续10秒的渴盼效果，记录治疗的生命值回复量（包括溢出值）。持续时间结束时，渴盼效果将转变为「彼时的浪潮」效果：当前场上角色的普通攻击、重击、下落攻击、元素战技与元素爆发命中敌人时，将基于渴盼效果所记录的回复量的3%提高造成的伤害，「彼时的浪潮」将在生效10次或10秒后移除。一次渴盼效果至多记录30000点回复量，同时至多存在一个，能够记录多个装备者的产生的回复量；装备者处于队伍后台时，依然能触发该效果。"
+    }
+  },
+  "400291": {
+    "id": "400291",
+    "name": "回声之林夜话",
+    "idxs": {
+      "1": {
+        "id": "34543",
+        "name": "无私的妆饰花"
+      },
+      "2": {
+        "id": "34523",
+        "name": "诚恳的蘸水笔"
+      },
+      "3": {
+        "id": "34553",
+        "name": "忠实的砂时计"
+      },
+      "4": {
+        "id": "34513",
+        "name": "慷慨的墨水瓶"
+      },
+      "5": {
+        "id": "34533",
+        "name": "慈爱的淑女帽"
+      }
+    },
+    "skills": {
+      "2": "攻击力提高18%。",
+      "4": "施放元素战技后的10秒内，岩元素伤害加成提升16%；若处于结晶反应产生的护盾庇护下，上述效果提高150%，进一步提高的效果将在失去结晶护盾庇护的1秒后移除。"
+    }
   }
 }

resources/meta-gs/character/alias.js

@@ -73,15 +73,17 @@ export const alias = {
   迪希雅: 'Dehya,迪希亚,迪希娅,迪西雅,迪西亚',
   米卡: 'Mika,鹦鹉,凤头,凤头鹦鹉',
   卡维: 'Kaveh,艾尔海森室友',
-  白术: 'Baizhu,长生',
+  白术: 'Baizhu,长生,白医生',
 
   // 4.0
   琳妮特: 'Lynette,林妮特,林尼特,琳尼特,女魔术师,魔术猫,魔术喵,登登',
   林尼: 'Lyney,林妮,琳尼,琳妮,男魔术师,魔术师',
   菲米尼: 'Freminet,非米尼,潜水员',
-  莱欧斯利: 'Wriothesley,莱欧,枫丹桑博',
-  那维莱特: 'Neuvillette,那维,水龙王,水龙,审判官,海獭,龙王',
+  莱欧斯利: 'Wriothesley,莱欧,枫丹桑博,公爵',
+  那维莱特: 'Neuvillette,那维,水龙王,水龙,审判官,海獭,龙王,最高审判官,水之龙王',
   夏洛蒂: 'Charlotte,夏洛,夏洛帝,记者,小记者',
   芙宁娜: 'Furina,Focalors,水神,芙芙,芙卡洛斯,傻芙芙',
+  娜维娅: 'navia,大小姐,刺玫会,黄豆,流汗黄豆,黄豆姐',
+  夏沃蕾: 'chevreuse,夏沃雷',
 }
 

resources/meta-gs/character/data.json

@@ -1339,6 +1339,36 @@
     },
     "eta": 1699408800000
   },
+  "10000090": {
+    "id": 10000090,
+    "name": "夏沃蕾",
+    "abbr": "夏沃蕾",
+    "star": 4,
+    "elem": "pyro",
+    "weapon": "polearm",
+    "talentId": {},
+    "talentCons": {
+      "a": 0,
+      "e": 3,
+      "q": 5
+    },
+    "eta": 1703037600000
+  },
+  "10000091": {
+    "id": 10000091,
+    "name": "娜维娅",
+    "abbr": "娜维娅",
+    "star": 5,
+    "elem": "geo",
+    "weapon": "claymore",
+    "talentId": {},
+    "talentCons": {
+      "a": 0,
+      "e": 3,
+      "q": 5
+    },
+    "eta": 1703037600000
+  },
   "20000000": {
     "id": 20000000,
     "name": "旅行者",

resources/meta-gs/character/芙宁娜/calc.js

@@ -27,7 +27,7 @@ export const details = [{
 }]
 
 export const mainAttr = 'hp,mastery,cpct,cdmg'
-export const defDmgIdx = 4
+export const defDmgIdx = 3
 
 export const buffs = [{
   title: '芙宁娜天赋：消耗4队友生命值，E伤害提升140%'
@@ -35,7 +35,7 @@ export const buffs = [{
   title: '天赋E·万众狂欢：300层气氛值提升[dmg]%伤害，[heal]%治疗加成',
   data: {
     dmg: ({ talent }) => talent.q['气氛值转化提升伤害比例'] * 300,
-    heal: ({ talent }) => talent.q['气氛值转化治疗加成比例'] * 300
+    heal: ({ talent }) => talent.q['气氛值转化受治疗加成比例'] * 300
   }
 }, {
   title: '芙宁娜被动：基于生命值，提升召唤物伤害[eDmg]%',
@@ -47,7 +47,7 @@ export const buffs = [{
   cons: 1,
   data: {
     dmg: ({ talent }) => talent.q['气氛值转化提升伤害比例'] * 100,
-    heal: ({ talent }) => talent.q['气氛值转化治疗加成比例'] * 100
+    heal: ({ talent }) => talent.q['气氛值转化受治疗加成比例'] * 100
   }
 }, {
   title: '芙宁娜2命：万众狂欢持续期间，满气氛值提升芙宁娜140%生命值',

resources/meta-gs/material/data.json

@@ -2228,25 +2228,25 @@
     "star": 1
   },
   "异色结晶石": {
-    "id": 112082,
+    "id": "n112082",
     "name": "异色结晶石",
     "type": "normal",
     "star": 3,
     "items": {
       "异海凝珠": {
-        "id": 112080,
+        "id": "n112080",
         "name": "异海凝珠",
         "type": "normal",
         "star": 1
       },
       "异海之块": {
-        "id": 112081,
+        "id": "n112081",
         "name": "异海之块",
         "type": "normal",
         "star": 2
       },
       "异色结晶石": {
-        "id": 112082,
+        "id": "n112082",
         "name": "异色结晶石",
         "type": "normal",
         "star": 3
@@ -2517,5 +2517,11 @@
     "name": "无光丝线",
     "type": "weekly",
     "star": 5
+  },
+  "初露之源": {
+    "id": "n101240",
+    "name": "初露之源",
+    "type": "specialty",
+    "star": 1
   }
 }

resources/meta-gs/weapon/alias.js

@@ -42,7 +42,8 @@ export const abbr = {
   便携动力锯: '动力锯',
   无垠蔚蓝之歌: '无垠之歌',
   静水流涌之辉: '静水之辉',
-  水仙十字之剑: '水仙之剑'
+  水仙十字之剑: '水仙之剑',
+  '「究极霸王超级魔剑」': '超级魔剑'
 }
 
 export const alias = {
@@ -103,6 +104,9 @@ export const alias = {
   浪影阔剑: '浪影,浪影大剑,枫丹锻造大剑',
   聊聊棒: '聊聊,聊聊大剑',
   便携动力锯: '便携锯,动力锯,锯子',
+  '「究极霸王超级魔剑」': '霸王超级魔剑,究极霸王超级魔剑,霸王剑,超级魔剑,霸王魔剑,究极魔剑',
+  裁断: '斧头',
+
 
   // 枪
   天空之脊: '天空枪,薄荷枪',
@@ -156,7 +160,7 @@ export const alias = {
   流浪的晚星: '流浪的晚星,晚星',
   证誓之明瞳: '证誓,明瞳,证誓明瞳',
   嘟嘟可故事集: '嘟嘟可,故事集,故事书',
-  碧落之珑: '碧落,不灭绿华',
+  碧落之珑: '碧落,不灭绿华,猕猴桃',
   万世流涌大典: '流涌大典,万世大典,万世流涌,万世涌流大典,万世涌流',
   纯水流华: '纯水,枫丹锻造法器',
   遗祀玉珑: '遗祀',

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

@@ -135,6 +135,12 @@
     "name": "浪影阔剑",
     "star": 4
   },
+  "12426": {
+    "id": "12426",
+    "name": "「究极霸王超级魔剑」",
+    "star": 4,
+    "wid": "n12426"
+  },
   "12427": {
     "id": 12427,
     "name": "便携动力锯",
@@ -169,5 +175,11 @@
     "id": 12511,
     "name": "苇海信标",
     "star": 5
+  },
+  "12512": {
+    "id": "12512",
+    "name": "裁断",
+    "star": 5,
+    "wid": "n12512"
   }
 }

resources/meta-gs/weapon/claymore/「究极霸王超级魔剑」/data.json

@@ -0,0 +1,66 @@
+{
+  "id": "12426",
+  "name": "「究极霸王超级魔剑」",
+  "affixTitle": "加油！",
+  "star": 4,
+  "desc": "攻击力提升12%。不仅如此！海沫村中曾蒙你帮助的美露莘们的声援心意充满了力量，依照她们的数目，攻击力至多进一步提升12%。",
+  "attr": {
+    "atk": {
+      "1": 43.73,
+      "20": 118.57,
+      "40": 225.99,
+      "50": 293.36,
+      "60": 360.9,
+      "70": 428.69,
+      "80": 496.72,
+      "90": 564.78,
+      "20+": 144.47,
+      "40+": 251.99,
+      "50+": 319.26,
+      "60+": 386.8,
+      "70+": 454.69,
+      "80+": 522.62
+    },
+    "bonusKey": "recharge",
+    "bonusData": {
+      "1": 6.67,
+      "20": 11.78,
+      "40": 17.17,
+      "50": 19.86,
+      "60": 22.55,
+      "70": 25.24,
+      "80": 27.93,
+      "90": 30.63,
+      "20+": 11.78,
+      "40+": 17.17,
+      "50+": 19.86,
+      "60+": 22.55,
+      "70+": 25.24,
+      "80+": 27.93
+    }
+  },
+  "materials": {
+    "weapon": "无垢之海的金杯",
+    "monster": "役人的时时刻刻",
+    "normal": "奇械机芯齿轮"
+  },
+  "affixData": {
+    "text": "攻击力提升$[0]。不仅如此！海沫村中曾蒙你帮助的美露莘们的声援心意充满了力量，依照她们的数目，攻击力至多进一步提升$[1]。",
+    "datas": {
+      "0": [
+        "12%",
+        "15%",
+        "18%",
+        "21%",
+        "24%"
+      ],
+      "1": [
+        "12%",
+        "15%",
+        "18%",
+        "21%",
+        "24%"
+      ]
+    }
+  }
+}

resources/meta-gs/weapon/claymore/石英大剑/data.json

@@ -1,5 +1,5 @@
 {
-  "id": 12304,
+  "id": "12304",
   "name": "石英大剑",
   "affixTitle": "余热",
   "star": 3,
@@ -39,11 +39,7 @@
       "80+": 128.21
     }
   },
-  "materials": {
-    "weapon": "孤云寒林的神体",
-    "monster": "督察长祭刀",
-    "normal": "禁咒绘卷"
-  },
+  "materials": {},
   "affixData": {
     "text": "触发超载、融化、燃烧、蒸发、烈绽放或火元素扩散反应后的12秒内，攻击力提高$[0]。",
     "datas": {

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

@@ -0,0 +1,66 @@
+{
+  "id": "12512",
+  "name": "裁断",
+  "affixTitle": "诸多朝与暮的誓约",
+  "star": 5,
+  "desc": "攻击力提升20%；队伍中的角色获取结晶反应产生的晶片时，会为装备者赋予1枚「约印」，使元素战技造成的伤害提升18%，约印持续15秒，至多同时持有2枚。所有约印将在装备者的元素战技造成伤害后的0.2秒后移除。",
+  "attr": {
+    "atk": {
+      "1": 47.54,
+      "20": 133.29,
+      "40": 260.56,
+      "50": 341.43,
+      "60": 423.4,
+      "70": 506.22,
+      "80": 589.85,
+      "90": 674.33,
+      "20+": 164.39,
+      "40+": 291.66,
+      "50+": 372.63,
+      "60+": 454.5,
+      "70+": 537.32,
+      "80+": 620.95
+    },
+    "bonusKey": "cpct",
+    "bonusData": {
+      "1": 4.8,
+      "20": 8.48,
+      "40": 12.36,
+      "50": 14.3,
+      "60": 16.24,
+      "70": 18.17,
+      "80": 20.11,
+      "90": 22.05,
+      "20+": 8.48,
+      "40+": 12.36,
+      "50+": 14.3,
+      "60+": 16.24,
+      "70+": 18.17,
+      "80+": 20.11
+    }
+  },
+  "materials": {
+    "weapon": "悠古弦音的回响",
+    "monster": "异界生命核",
+    "normal": "奇械机芯齿轮"
+  },
+  "affixData": {
+    "text": "攻击力提升$[0]；队伍中的角色获取结晶反应产生的晶片时，会为装备者赋予1枚「约印」，使元素战技造成的伤害提升$[1]，约印持续15秒，至多同时持有2枚。所有约印将在装备者的元素战技造成伤害后的0.2秒后移除。",
+    "datas": {
+      "0": [
+        "20%",
+        "25%",
+        "30%",
+        "35%",
+        "40%"
+      ],
+      "1": [
+        "18%",
+        "22.5%",
+        "27%",
+        "31.5%",
+        "36%"
+      ]
+    }
+  }
+}

resources/meta-gs/weapon/desc.js

@@ -35,6 +35,7 @@ export const descFix = {
   森林王器: '触发草元素反应后，每20秒产生至多存在10秒的种识之叶，后台也能触发。拾取提升精通$[0]点，持续12秒。',
   玛海菈的水色: '每10秒基于精通的$[0]提升攻击力，并基于该提升的30%为其他角色提升攻击力，持续12秒。处于后台时也能触发，多件同名武器可叠加。',
   雪葬的星银: '普攻与重击命中敌人时，有$[0]概率造成$[1]攻击力的范围伤害。若敌人处于冰元素影响下，则造成$[2]攻击力的伤害。每10秒至多一次。',
+  裁断: '攻击力提升$[0]；获取结晶晶片时，为装备者赋予1枚约印，使下一个战技伤害提升$[1]，约印持续15秒，至多持有2枚。',
 
   // 长柄武器
   勘探钻机: '受到或进行治疗时，获得标记，最多3层，处于后台也能获得。施放战技或爆发时，消耗标记：每枚标记提高$[0]攻击力与$[1]元素伤害加成。',