优化部分伤害计算

model/damage/Calculator.js

@@ -137,6 +137,8 @@ export class Calculator {
             damage.add = (d) => {
                 if (typeof d === 'string')
                     d = this.calc_skill(d);
+                if (!d)
+                    return;
                 logger.debug('追加伤害：' + d.skill.name, d.result);
                 damage.result.expectDMG += d.result.expectDMG;
                 damage.result.critDMG += d.result.critDMG;

model/damage/Calculator.ts

@@ -268,6 +268,7 @@ export class Calculator {
     if (skill.after) {
       damage.add = (d) => {
         if (typeof d === 'string') d = this.calc_skill(d)
+        if (!d) return
         logger.debug('追加伤害：' + d.skill.name, d.result)
         damage.result.expectDMG += d.result.expectDMG
         damage.result.critDMG += d.result.critDMG

model/damage/character/朱鸢/calc.js

@@ -31,20 +31,17 @@ export const skills = [
   { name: '侵蚀每次', type: '侵蚀' },
   { name: '普攻三段（以太）', type: 'AQY3' },
   { name: '冲刺攻击：火力压制', type: 'CCQ' },
+  {
+    name: '6影以太鹿弹',
+    type: 'EQ2',
+    fixedMultiplier: 2.2 * 4,
+    isHide: true,
+    check: ({ avatar }) => avatar.rank >= 6
+  },
   {
     name: '强化特殊技：全弹连射',
     type: 'EQ',
-    after: ({ damage, calc }) => {
+    after: ({ damage }) => damage.add('EQ2')
-      if (calc.avatar.rank >= 6) {
-        const EQ2 = calc.calc_skill({
-          name: '6影以太鹿弹',
-          type: 'EQ2',
-          fixedMultiplier: 2.2 * 4,
-          element: 'Ether'
-        })
-        damage.add(EQ2)
-      }
-    }
   },
   { name: '连携技：歼灭模式', type: 'RL' },
   { name: '终结技：歼灭模式MAX', type: 'RZ' }

model/damage/character/珂蕾妲/calc.js

@@ -24,13 +24,11 @@ export const skills = [
   {
     name: '强化特殊技：沸腾熔炉',
     type: 'EQP',
-    after: ({ avatar, damage }) => {
+    after: ({ damage }) => {
       damage.add('EQP0')
-      if (avatar.rank >= 6) {
+      damage.add('Y6')
-        damage.add('Y6')
-      }
     }
   },
-  { name: '连携技：天崩-地裂', type: 'RL', after: ({ avatar, damage }) => avatar.rank >= 6 && damage.add('Y6') },
+  { name: '连携技：天崩-地裂', type: 'RL', after: ({ damage }) => damage.add('Y6') },
-  { name: '终结技：锤进地心', type: 'RZP', after: ({ avatar, damage }) => avatar.rank >= 6 && damage.add('Y6') }
+  { name: '终结技：锤进地心', type: 'RZP', after: ({ damage }) => damage.add('Y6') }
 ]

model/damage/character/赛斯/calc.js

@@ -35,9 +35,9 @@ export const skills = [
   {
     name: '蓄力普攻：雷霆击-感电',
     type: 'AX',
-    after: ({ avatar, damage }) => {
+    after: ({ damage }) => {
       damage.add('AX0')
-      if (avatar.rank >= 6) damage.add('Y6')
+      damage.add('Y6')
     }
   },
   { name: '闪避反击：以退为进', type: 'CF' },