增加莱依拉的伤害计算及圣遗物评分权重

CHANGELOG.md

@@ -3,6 +3,7 @@
 * 角色面板彩蛋图（满命/三皇冠/ACE 任一触发）支持自定义
     * 自定义图像可放置在 **resources/profile/super-character/** 目录下
 * 增加命令 `#最强排行`、`#最高分排行` 查看群排行
+* 增加莱依拉的伤害计算及圣遗物评分权重
 
 # 2.0.1~2.0.9
 

models/profile-lib/DmgCalc.js

@@ -174,6 +174,9 @@ let DmgCalc = {
 
     // 计算护盾
     dmgFn.shield = function (num) {
+      if (showDetail) {
+        console.log(num, calc(attr.shield), calc(attr.shield.inc))
+      }
       return {
         avg: num * (calc(attr.shield) / 100) * (attr.shield.inc / 100)
       }

resources/character/profile-detail.html

@@ -172,11 +172,11 @@
       <div class="title dmg-idx">{{idx+1}}</div>
       <div class="title dmg-title">{{dmg.title}}</div>
       {{if dmg.dmg === "NaN"}}
-      <div class="value value-full">{{dmg.avg}}</div>
+      <div class="value value-full">{{dmg.avg}}{{dmg.unit}}</div>
       <div class="value value-none"></div>
       {{else}}
-      <div class="value">{{dmg.dmg}}</div>
-      <div class="value">{{dmg.avg}}</div>
+      <div class="value">{{dmg.dmg}}{{dmg.unit}}</div>
+      <div class="value">{{dmg.avg}}{{dmg.unit}}</div>
       {{/if}}
     </div>
     {{/each}}

resources/meta/artifact/artis-mark.js

@@ -98,5 +98,6 @@ export const usefulAttr = {
   坎蒂丝: { hp: 75, atk: 75, def: 0, cpct: 100, cdmg: 100, mastery: 0, dmg: 100, phy: 0, recharge: 55, heal: 0 },
   妮露: { hp: 80, atk: 0, def: 0, cpct: 100, cdmg: 100, mastery: 75, dmg: 80, phy: 0, recharge: 30, heal: 0 },
   纳西妲: { hp: 0, atk: 55, def: 0, cpct: 100, cdmg: 100, mastery: 100, dmg: 100, phy: 0, recharge: 55, heal: 0 },
-  多莉: { hp: 75, atk: 75, def: 0, cpct: 100, cdmg: 100, mastery: 0, dmg: 75, phy: 0, recharge: 55, heal: 100 }
+  多莉: { hp: 75, atk: 75, def: 0, cpct: 100, cdmg: 100, mastery: 0, dmg: 75, phy: 0, recharge: 55, heal: 100 },
+  莱依拉: { hp: 100, atk: 75, def: 0, cpct: 100, cdmg: 100, mastery: 0, dmg: 100, phy: 0, recharge: 35 }
 }

resources/meta/character/坎蒂丝/calc.js

@@ -0,0 +1,31 @@
+export const details = [{
+  title: 'E护盾吸收',
+  dmg: ({ attr, calc, talent }, { shield }) =>
+    shield(calc(attr.hp) * talent.e['护盾吸收量2'][0] / 100 + talent.e['护盾吸收量2'][1])
+}, {
+  title: '蓄力E伤害',
+  dmg: ({ calc, attr, talent }, { basic }) => basic(calc(attr.hp) * talent.e['蓄力完成伤害'] / 100)
+}, {
+  title: 'Q提升普攻伤害',
+  dmg: ({ attr, calc }) => {
+    return {
+      avg: 20 + Math.floor(calc(attr.hp) / 1000) * 0.5,
+      unit: '%'
+    }
+  }
+}]
+
+export const mainAttr = 'hp,atk,cpct,cdmg'
+
+export const buffs = [{
+  title: '坎蒂丝2命：E命中敌人提升20%生命值',
+  cons: 2,
+  data: {
+    hpPct: 20
+  }
+}, {
+  title: '坎蒂丝被动：Q伤害加成基于生命值上限提升[_a]%',
+  data: {
+    _a: ({ attr, calc }) => Math.floor(calc(attr.hp) / 1000) * 0.5
+  }
+}]

resources/meta/character/流浪者/data.json

@@ -5,11 +5,11 @@
   "title": "久世浮倾",
   "star": 5,
   "elem": "anemo",
-  "allegiance": "？？？",
+  "allegiance": "无",
   "weapon": "catalyst",
-  "birth": "1-1",
+  "birth": "1-3",
   "astro": "浪客座",
-  "desc": "测试角色",
+  "desc": "身份成谜的流浪人士。衣着打扮像是修验者，言行却并不是修验者应有的模样。",
   "cncv": "？？？",
   "jpcv": "？？？",
   "costume": false,
@@ -30,8 +30,8 @@
   },
   "talentId": {},
   "talentCons": {
-    "e": 3,
-    "q": 5
+    "e": 5,
+    "q": 3
   },
   "materials": {
     "gem": "自在松石",

resources/meta/character/流浪者/detail.json

@@ -19,21 +19,21 @@
           "unit": "",
           "isSame": false,
           "values": [
-            "79.79%",
-            "86.28%",
-            "92.78%",
-            "102.05%",
-            "108.55%",
-            "115.97%",
-            "126.18%",
-            "136.38%",
-            "146.59%",
-            "157.72%",
-            "168.85%",
-            "179.99%",
-            "191.12%",
-            "202.25%",
-            "213.38%"
+            "66.18%",
+            "71.57%",
+            "76.96%",
+            "84.65%",
+            "90.04%",
+            "96.19%",
+            "104.66%",
+            "113.12%",
+            "121.59%",
+            "130.82%",
+            "140.06%",
+            "149.29%",
+            "158.53%",
+            "167.76%",
+            "177%"
           ]
         },
         {
@@ -41,21 +41,21 @@
           "unit": "",
           "isSame": false,
           "values": [
-            "69.58%",
-            "75.25%",
-            "80.91%",
-            "89%",
-            "94.66%",
-            "101.14%",
-            "110.04%",
-            "118.94%",
-            "127.84%",
-            "137.55%",
-            "147.26%",
-            "156.97%",
-            "166.67%",
-            "176.38%",
-            "186.09%"
+            "62.54%",
+            "67.63%",
+            "72.72%",
+            "79.99%",
+            "85.08%",
+            "90.9%",
+            "98.9%",
+            "106.9%",
+            "114.9%",
+            "123.62%",
+            "132.35%",
+            "141.08%",
+            "149.8%",
+            "158.53%",
+            "167.26%"
           ]
         },
         {
@@ -63,21 +63,21 @@
           "unit": "",
           "isSame": false,
           "values": [
-            "51.89% + 51.89%",
-            "56.12% + 56.12%",
-            "60.34% + 60.34%",
-            "66.38% + 66.38%",
-            "70.6% + 70.6%",
-            "75.43% + 75.43%",
-            "82.07% + 82.07%",
-            "88.7% + 88.7%",
-            "95.34% + 95.34%",
-            "102.58% + 102.58%",
-            "109.82% + 109.82%",
-            "117.07% + 117.07%",
-            "124.31% + 124.31%",
-            "131.55% + 131.55%",
-            "138.79% + 138.79%"
+            "45.75% + 45.75%",
+            "49.48% + 49.48%",
+            "53.2% + 53.2%",
+            "58.52% + 58.52%",
+            "62.25% + 62.25%",
+            "66.5% + 66.5%",
+            "72.35% + 72.35%",
+            "78.21% + 78.21%",
+            "84.06% + 84.06%",
+            "90.44% + 90.44%",
+            "96.83% + 96.83%",
+            "103.21% + 103.21%",
+            "109.59% + 109.59%",
+            "115.98% + 115.98%",
+            "122.36% + 122.36%"
           ]
         },
         {
@@ -176,9 +176,10 @@
       "desc": [
         "凝聚大气的力量，借此摆脱大地的桎梏。对周围造成风元素伤害并跃升至空中，进入「优风倾姿」状态。",
         "<h3>优风倾姿</h3>",
-        "流浪者的普通攻击与重击的影响范围与造成的伤害提高，重击不再消耗体力，并持续悬浮在空中。此时，流浪者的行动具有如下特性：",
+        "流浪者在这种状态下，无法进行下落攻击，进行普通攻击与重击时，将转为进行空居·不生断与空居·刀风界，造成的伤害与影响范围提高，伤害分别视为普通攻击伤害与重击伤害。进行空居·刀风界将不消耗体力。",
+        "流浪者在这种状态下将持续悬浮在空中。此时，流浪者的行动具有如下特性：",
         "·将持续消耗「空居力」，维持悬浮状态；",
-        "·进行冲刺时，将额外消耗空居力在空中冲刺；长按冲刺时，将持续消耗空居力以维持快速移动；",
+        "·进行冲刺时，将额外消耗空居力在空中加速；长按冲刺时，将持续消耗空居力以维持快速移动。该效果将替代冲刺；",
         "·进行跳跃时，将额外消耗空居力抬升悬浮高度；长按跳跃时，将持续消耗空居力以持续抬升高度。",
         "<h3>空居力耗竭后将结束该状态。</h3>",
         "在优风倾姿持续期间再次施放将结束该状态。",
@@ -208,47 +209,47 @@
           ]
         },
         {
-          "name": "普通攻击伤害提高",
+          "name": "空居·不生断伤害",
           "unit": "",
           "isSame": false,
           "values": [
-            "41.75%",
-            "44.25%",
-            "46.75%",
-            "50%",
-            "52.5%",
-            "55%",
-            "58.25%",
-            "61.5%",
-            "64.75%",
-            "68%",
-            "71.25%",
-            "74.5%",
-            "77.75%",
-            "81%",
-            "84.25%"
+            "132.98%普通攻击伤害",
+            "134.96%普通攻击伤害",
+            "136.93%普通攻击伤害",
+            "139.5%普通攻击伤害",
+            "141.47%普通攻击伤害",
+            "143.45%普通攻击伤害",
+            "146.02%普通攻击伤害",
+            "148.58%普通攻击伤害",
+            "151.15%普通攻击伤害",
+            "153.72%普通攻击伤害",
+            "156.29%普通攻击伤害",
+            "158.85%普通攻击伤害",
+            "161.42%普通攻击伤害",
+            "163.99%普通攻击伤害",
+            "166.56%普通攻击伤害"
           ]
         },
         {
-          "name": "重击伤害提高",
+          "name": "空居·刀风界伤害",
           "unit": "",
           "isSame": false,
           "values": [
-            "33.4%",
-            "35.4%",
-            "37.4%",
-            "40%",
-            "42%",
-            "44%",
-            "46.6%",
-            "49.2%",
-            "51.8%",
-            "54.4%",
-            "57%",
-            "59.6%",
-            "62.2%",
-            "64.8%",
-            "67.4%"
+            "126.39%重击伤害",
+            "127.97%重击伤害",
+            "129.55%重击伤害",
+            "131.6%重击伤害",
+            "133.18%重击伤害",
+            "134.76%重击伤害",
+            "136.81%重击伤害",
+            "138.87%重击伤害",
+            "140.92%重击伤害",
+            "142.98%重击伤害",
+            "145.03%重击伤害",
+            "147.08%重击伤害",
+            "149.14%重击伤害",
+            "151.19%重击伤害",
+            "153.25%重击伤害"
           ]
         },
         {
@@ -379,7 +380,7 @@
     "1": {
       "name": "初番·茂风流羽行",
       "desc": [
-        "在优风倾姿状态下，流浪者的普通攻击与重击的攻击速度提升10%。",
+        "在优风倾姿状态下，流浪者进行空居·不生断与空居·刀风界的攻击速度提升10%。",
         "此外，固有天赋「梦迹一风」发射的风矢能额外造成25%攻击力的伤害，该效果需要解锁固有天赋「梦迹一风」。"
       ]
     },
@@ -393,31 +394,30 @@
     "3": {
       "name": "三番·久世舞夕颜",
       "desc": [
-        "羽画·风姿华歌的技能等级提高3级。",
+        "狂言·式乐五番的技能等级提高3级。",
         "至多提升至15级。"
       ]
     },
     "4": {
       "name": "四番·花月歌浮舟",
       "desc": [
-        "施放羽画·风姿华歌时，若触发了固有天赋「拾玉得花」依据元素类型强化的效果，还将随机获得1种本次施放未触发的强化效果。",
+        "施放羽画·风姿华歌时，若触发了固有天赋「拾玉得花」依据元素类型强化的效果，还将随机获得1种本次施放未触发的强化效果。同时至多获得3种元素对应的强化效果。",
         "需要解锁固有天赋「拾玉得花」。"
       ]
     },
     "5": {
       "name": "末番·今昔渡来殿",
       "desc": [
-        "狂言·式乐五番的技能等级提高3级。",
+        "羽画·风姿华歌的技能等级提高3级。",
         "至多提升至15级。"
       ]
     },
     "6": {
       "name": "祝言·霞幕倾松风",
       "desc": [
-        "在优风倾姿状态下，流浪者主动施放的普通攻击命中敌人时，将产生如下效果：",
-        "·额外造成一次40%攻击力的风元素伤害，该伤害视为普通攻击伤害；",
-        "·为流浪者恢复4点空居力。每0.2秒至多通过这种方式恢复1次空居力，在一次优风倾姿的持续期间，至多触发5次；",
-        "·当流浪者的空居力低于40点时, 为流浪者恢复4点空居力。"
+        "在优风倾姿状态下，流浪者主动施放的空居·不生断命中敌人时，将产生如下效果：",
+        "·在命中的位置额外进行一次空居·不生断，造成原本40%的伤害，该伤害视为普通攻击伤害；",
+        "·当流浪者的空居力低于40点时，为流浪者恢复4点空居力。每0.2秒至多通过这种方式恢复1次空居力，在一次优风倾姿的持续期间，至多触发5次。"
       ]
     }
   },
@@ -442,8 +442,8 @@
     {
       "name": "梦迹一风",
       "desc": [
-        "在优风倾姿状态下，流浪者的普通攻击或重击命中敌人时，有16%几率获得「倾落」效果：流浪者在本次优风倾姿的状态下进行冲刺时，将移除倾落效果，使此次冲刺不消耗空居力，并发射4枚风矢，分别造成35%攻击力的风元素伤害。",
-        "普通攻击与重击未产生倾落效果时，会使下次产生概率提升12%；0.1秒内至多判定1次是否产生倾落效果。"
+        "在优风倾姿状态下，流浪者的空居·不生断或空居·刀风界命中敌人时，有16%几率获得「倾落」效果：流浪者在本次优风倾姿的状态下进行空中加速时，将移除倾落效果，使此次空中加速不消耗空居力，并发射4枚风矢，分别造成35%攻击力的风元素伤害。",
+        "空居·不生断与空居·刀风界未产生倾落效果时，会使下次产生概率提升12%；0.1秒内至多判定1次是否产生倾落效果。"
       ]
     }
   ],

resources/meta/character/珐露珊/data.json

@@ -5,11 +5,11 @@
   "title": "机逐封秘",
   "star": 4,
   "elem": "anemo",
-  "allegiance": "？？？",
+  "allegiance": "室罗婆耽学院",
   "weapon": "bow",
-  "birth": "1-1",
+  "birth": "8-20",
   "astro": "蔓藤花饰座",
-  "desc": "测试角色",
+  "desc": "来自「一百年前」的学者，喜欢以前辈自居，对各类古老文字与古典机关都颇有研究。",
   "cncv": "？？？",
   "jpcv": "？？？",
   "costume": false,

resources/meta/character/珐露珊/detail.json

@@ -299,11 +299,11 @@
       "id": 7633,
       "name": "抟风秘道",
       "desc": [
-        "珐露珊迅速部署「赫耀多方面体」，造成风元素范围伤害，并释放一次「烈风波」。",
-        "存在期间内，「赫耀多方面体」将持续以三角形路径移动，每次移动到三角形路径的顶点时，「赫耀多方面体」都将释放一次「烈风波」。",
+        "珐露珊迅速部署「赫耀多方面体」，释放一次「烈风波」，并造成风元素范围伤害。",
+        "存在期间内，赫耀多方面体将持续以三角形路径移动，每次移动到三角形路径的顶点时，赫耀多方面体都将释放一次烈风波。",
         "<h3>烈风波</h3>",
-        "·「烈风波」命中敌人时，将对敌人施加「诡风之祸」效果：降低敌人的风元素抗性；",
-        "·「烈风波」释放时，将为附近的队伍中所有角色施加「祈风之赐」效果：获得风元素伤害加成。",
+        "·烈风波释放时，将对周围的敌人施加「诡风之祸」效果：降低敌人的风元素抗性；",
+        "·烈风波释放时，将为附近的队伍中所有角色施加「祈风之赐」效果：获得风元素伤害加成。",
         "<i>对于隐藏在古老遗迹中未知的智慧，理应抱有足够的敬畏之心。</i>"
       ],
       "tables": [
@@ -508,7 +508,7 @@
     "4": {
       "name": "神机明悟",
       "desc": [
-        "依据命中敌人的数量，非想风天产生的风涡可以为珐露珊恢复元素能量：命中一名敌人时，将为珐露珊恢复2点元素能量；每额外命中一名敌人，都将进一步为珐露珊恢复0.5点元素能量。",
+        "依据命中敌人的数量，风压坍陷产生的风涡可以为珐露珊恢复元素能量：命中一名敌人时，将为珐露珊恢复2点元素能量；每额外命中一名敌人，都将进一步为珐露珊恢复0.5点元素能量。",
         "一次风涡，至多通过这种方式为珐露珊恢复4点元素能量。"
       ]
     },
@@ -521,7 +521,7 @@
     "6": {
       "name": "妙道合真",
       "desc": [
-        "处于抟风秘道的「祈风之赐」效果影响下的角色，造成风元素伤害时的暴击伤害提升40%；处于「祈风之赐」效果影响下的队伍中自己的当前场上角色造成伤害时，将向敌人额外发射一枚「飓烈箭」，此效果3秒至多触发一次。"
+        "处于抟风秘道的「祈风之赐」效果影响下的角色，造成风元素伤害时的暴击伤害提升40%；处于「祈风之赐」效果影响下的当前场上角色造成伤害时，将为该敌人施加「风压坍陷」。此效果3秒至多触发一次，队伍中所有角色共享冷却时间。"
       ]
     }
   },
@@ -535,13 +535,13 @@
     {
       "name": "迅捷流风",
       "desc": [
-        "珐露珊处于非想风天的「疾风示现」状态下时，瞄准射击所需的蓄力时间减少60%，并能对「风压坍陷」效果产生的风涡命中的敌人施加抟风秘道的「诡风之祸」效果。"
+        "珐露珊处于非想风天的「疾风示现」状态下时，瞄准射击所需的蓄力时间减少60%；并能对「风压坍陷」效果产生的风涡命中的敌人施加抟风秘道的「诡风之祸」效果。"
       ]
     },
     {
       "name": "七窟遗智",
       "desc": [
-        "处于抟风秘道的「祈风之赐」效果下的角色，对敌人造成风元素伤害时，基于珐露珊基础攻击力的45.9%，提高造成的伤害。此效果将在对敌人造成风元素伤害的0.1秒后清除，每0.8秒最多触发一次。"
+        "处于抟风秘道的「祈风之赐」效果下的角色的普通攻击、重击、下落攻击、元素战技或元素爆发对敌人造成风元素伤害时，会产生烈风护持效果：基于珐露珊基础攻击力的32%，提高造成的伤害。每0.8秒至多产生一次烈风护持效果，该效果将在「祈风之赐」持续时间结束或生效1次后消失。"
       ]
     }
   ],

resources/meta/character/莱依拉/calc.js

@@ -0,0 +1,38 @@
+export const details = [{
+  title: '满层E护盾量',
+  dmg: ({ attr, calc, talent }, { shield }) =>
+    shield(calc(attr.hp) * talent.e['护盾基础吸收量2'][0] / 100 + talent.e['护盾基础吸收量2'][1])
+}, {
+  title: 'E飞星单伤害',
+  dmg: ({ attr, talent }, dmg) => dmg(talent.e['飞星伤害'], 'e')
+}, {
+  title: 'Q星光弹伤害',
+  dmg: ({ attr, calc, talent }, { basic }) => basic(calc(attr.hp) * talent.q['星光弹伤害'] / 100)
+}]
+
+export const mainAttr = 'hp,atk,cpct,cdmg'
+
+export const buffs = [{
+  title: '莱依拉1命：安眠帷幕护盾的伤害吸收量提高20%',
+  cons: 1,
+  data: {
+    shield: 20
+  }
+}, {
+  title: '莱依拉6命：飞星与星光弹造成的伤害提升40%',
+  cons: 6,
+  data: {
+    eDmg: 40,
+    qDmg: 40
+  }
+}, {
+  title: '莱依拉被动：满层护盾强效提升24%',
+  data: {
+    shield: 24
+  }
+}, {
+  title: '莱依拉被动：飞星造成的伤害值基于生命值提高[ePlus]',
+  data: {
+    ePlus: ({ attr, calc }) => calc(attr.hp) * 0.015
+  }
+}]

resources/meta/weapon/sword/calc.js

@@ -150,7 +150,7 @@ export default function (step) {
       }
     }, {
       title: '满Buff提高攻击力[atkPct]%',
-      buffCount: 5,
+      buffCount: 10,
       refine: {
         atkPct: step(4)
       }