Merge pull request #758 from 1umine/master

修复旅行者评分规则错误以及冰系角色带冰套打融化能吃到冰套暴击加成的问题

apps/profile.js

@@ -80,7 +80,7 @@ app.reg({
   talentStat: {
     name: '天赋统计',
     fn: ProfileStat.stat,
-    rule: /^#*(我的)*(今日|今天|明日|明天|周.*)?(五|四|5|4|星)?(技能|天赋)+(汇总|统计|列表)?[ |0-9]*$/
+    rule: /^#*(我的)?(今日|今天|明日|明天|周.*)?([五四54]星)?(技能|天赋)+(汇总|统计|列表)?[ |0-9]*$/
   },
 
   avatarList: {

models/character/CharCfg.js

@@ -64,7 +64,8 @@ let CharCfg = {
   },
   getArtisCfg (char) {
     if (char.game !== 'sr') {
-      let charName = char.isTraveler ? `旅行者/${char.elem}` : char.name
+      // 评分规则在 旅行者 下而非 旅行者/elem 下
+      let charName = char.isTraveler ? `旅行者` : char.name
       return cfgMapGs.char[charName]?.artis || false
     } else {
       return cfgMapSr.char[char.name]?.artis || false

models/dmg/DmgAttr.js

@@ -129,7 +129,10 @@ let DmgAttr = {
       let aCfg = attrMap[reduceAttr]
       attr[reduceAttr][aCfg.calc] -= aCfg.value
     }
-
+    
+    lodash.forEach(buffs, (buff) => {
+      meta.mastery = meta.mastery || buff.mastery // 先反应
+    })
     lodash.forEach(buffs, (buff) => {
       let ds = DmgAttr.getDs(attr, meta, params)
 

resources/meta-gs/artifact/calc.js

@@ -122,7 +122,7 @@ const buffs = {
   冰风迷途的勇士: {
     2: attr('dmg', 15, '冰'),
     4: {
-      check: ({ element }) => element === '冰',
+      check: ({ element, mastery }) => element === '冰' && mastery != 'melt',
       title: '攻击处于冰元素影响下的敌人时，暴击率提高20%',
       data: {
         cpct: 20

resources/meta-gs/character/index.js

@@ -9,6 +9,15 @@ let meta = Meta.create('gs', 'char')
 meta.addData(data)
 meta.addAlias(alias)
 
+// 导入主角天赋对应元素，以据此判断主角元素
+let travelers = ["荧", "空", "旅行者"]
+travelers.forEach(name => {
+  meta.addDataItem(
+    meta.getId(name),
+    Data.readJSON(`resources/meta-gs/character/${name}/data.json`, 'miao')
+  )
+})
+
 // 添加自定义角色
 lodash.forEach(extraChars, (alias, char) => {
   meta.addDataItem(char, {

resources/meta-gs/character/旅行者/data.json

@@ -32,10 +32,13 @@
     "10118": "q",
     "10602": "e",
     "10605": "q",
+    "10087": "e",
+    "10088": "q",
     "100553": "a",
     "100555": "a",
     "100556": "a",
-    "100557": "a"
+    "100557": "a",
+    "100552": "a"
   },
   "talentElem": {
     "10067": "anemo",
@@ -45,7 +48,9 @@
     "10117": "dendro",
     "10118": "dendro",
     "10602": "electro",
-    "10605": "electro"
+    "10605": "electro",
+    "10087": "hydro",
+    "10088": "hydro"
   },
   "talentCons": {
     "e": 5,

resources/meta-gs/character/枫原万叶/artis.js

@@ -1,6 +1,6 @@
 export default function ({ cons, rule, def }) {
     if (cons === 6) {
-      return rule('万叶-满命', { atk: 75, cpct: 100, cdmg: 100, mastery: 30, dmg: 100, recharge: 55 })
+      return rule('万叶-满命', { atk: 75, cpct: 100, cdmg: 100, mastery: 100, dmg: 100, recharge: 55 })
     }
     return def({ hp: 0, atk: 75, def: 0, cpct: 50, cdmg: 50, mastery: 100, dmg: 100, phy: 0, recharge: 55, heal: 0 })
   }

resources/meta-gs/character/空/data.json

@@ -32,10 +32,13 @@
     "10118": "q",
     "10602": "e",
     "10605": "q",
+    "10087": "e",
+    "10088": "q",
     "100543": "a",
     "100545": "a",
     "100546": "a",
-    "100547": "a"
+    "100547": "a",
+    "100548": "a"
   },
   "talentElem": {
     "10067": "anemo",
@@ -45,7 +48,9 @@
     "10117": "dendro",
     "10118": "dendro",
     "10602": "electro",
-    "10605": "electro"
+    "10605": "electro",
+    "10087": "hydro",
+    "10088": "hydro"
   },
   "talentCons": {
     "e": 5,

resources/meta-gs/character/荧/data.json

@@ -32,10 +32,13 @@
     "10118": "q",
     "10602": "e",
     "10605": "q",
+    "10087": "e",
+    "10088": "q",
     "100553": "a",
     "100555": "a",
     "100556": "a",
-    "100557": "a"
+    "100557": "a",
+    "100552": "a"
   },
   "talentElem": {
     "10067": "anemo",
@@ -45,7 +48,9 @@
     "10117": "dendro",
     "10118": "dendro",
     "10602": "electro",
-    "10605": "electro"
+    "10605": "electro",
+    "10087": "hydro",
+    "10088": "hydro"
   },
   "talentCons": {
     "e": 5,