From 52ef8512fac6c339814a6a156f475d8630bd10dd Mon Sep 17 00:00:00 2001 From: UCPr <2032385471@qq.com> Date: Thu, 13 Feb 2025 15:55:27 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85=E4=BC=8A=E8=8A=99=E7=90=B3?= =?UTF-8?q?=E9=A9=B1=E5=8A=A8=E7=9B=98=E9=A2=91=E5=88=86=E3=80=81=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3=E4=BC=8A=E8=8A=99=E7=90=B3=E4=BC=A4=E5=AE=B3=E8=AE=A1?= =?UTF-8?q?=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- model/damage/BuffManager.js | 45 ++++++++++++------- model/damage/BuffManager.ts | 62 ++++++++++++++++++++------- model/damage/README.md | 20 ++++++--- model/damage/character/伊芙琳/calc.js | 15 +++---- resources/map/EquipScore.json | 16 +++++++ 5 files changed, 112 insertions(+), 46 deletions(-) diff --git a/model/damage/BuffManager.js b/model/damage/BuffManager.js index 3e44065..076b052 100644 --- a/model/damage/BuffManager.js +++ b/model/damage/BuffManager.js @@ -113,32 +113,47 @@ export class BuffManager { buffs = buffs.filter(buff => { if (buff.status === false) return false; - for (const key in param) { - if (key === 'redirect') - continue; - if (key === 'range') { + const judge = (() => { + // 未传入calc时不判断range、include、exclude + if (typeof valueOcalc !== 'object' || Array.isArray(valueOcalc)) + return true; + // buff指定排除该技能 + if (buff.exclude && buff.exclude.includes(valueOcalc.skill.type)) + return false; + // 11 10 01 + if (buff.range || buff.include) { + // 11 01 存在include且满足时则直接返回true + if (buff.include && buff.include.includes(valueOcalc.skill.type)) + return true; + // 01 没有range则代表只有include，直接返回false + if (!buff.range) + return false; + // 11 10 直接返回range的结果即可 const buffRange = buff.range; const skillRange = param.range?.filter(r => typeof r === 'string'); - if (!buffRange || !skillRange) - continue; // 对任意类型生效 - if (!skillRange.length) - continue; + if (!skillRange?.length) + return true; // 对任意类型生效 // buff作用范围向后覆盖 // 存在重定向时，range须全匹配，redirect向后覆盖 else if (param.redirect) { if (skillRange.some(ST => buffRange.some(BT => BT === ST))) - continue; + return true; if (buffRange.some(BT => param.redirect.startsWith(BT))) - continue; + return true; return false; } // 不存在重定向时，range向后覆盖 - else if (!skillRange.some(ST => buffRange.some(BT => ST.startsWith(BT)))) - return false; - else - continue; + return skillRange.some(ST => buffRange.some(BT => ST.startsWith(BT))); } - else if (key === 'element') { + // 00 + return true; + })(); + if (!judge) + return false; + for (const key in param) { + if (key === 'redirect' || key === 'range') + continue; + if (key === 'element') { if (!buff.element || !param.element) continue; // 对任意属性生效 if (Array.isArray(buff.element)) { diff --git a/model/damage/BuffManager.ts b/model/damage/BuffManager.ts index 60a51d6..3cf9d57 100644 --- a/model/damage/BuffManager.ts +++ b/model/damage/BuffManager.ts @@ -75,8 +75,26 @@ export interface buff { buffM: BuffManager calc: Calculator }) => number) | string | number[] - /** Buff增益技能类型范围，无则对全部生效；参考技能类型命名标准 */ + /** + * Buff增益技能类型**生效范围**；参考技能类型命名标准 + * - 当技能参数不存在**redirect**时，**range**作用范围向后覆盖 + * - 当技能参数存在**redirect**时，**range**须全匹配，**redirect**向后覆盖 + */ range?: string[] | anomaly[] + /** + * Buff增益技能类型**生效技能** + * - 不同于**range**，仅全匹配时该值生效，不会向后覆盖 + * - 无**range**且无**include**则该buff对全部技能生效 + * - **range**与**include**符合其一则认为buff生效 + * - 当技能参数存在**redirect**时，**range**与**include**的区别在于**include**不会尝试匹配**redirect** + */ + include?: string[] + /** + * Buff增益技能类型**排除技能** + * - 与**include**相同，仅全匹配时该值生效，不会向后覆盖 + * - 优先级高于**range**与**include** + */ + exclude?: string[] /** Buff增益属性类型，无则对全部生效 */ element?: element | element[] /** @@ -152,13 +170,13 @@ export class BuffManager { } _filter(buffs: buff[], type: T, value: buff[T]): buff[] - _filter(buffs: buff[], obj: { [key in Exclude]?: buff[key] } & { element: element, redirect?: skill['type'] }, calc?: Calculator): buff[] + _filter(buffs: buff[], obj: { [key in Exclude]?: buff[key] } & { element: element, redirect?: skill['type'] }, calc?: Calculator): buff[] _filter(buffs: buff[], fnc: (buff: buff, index: number) => boolean): buff[] _filter( buffs: buff[], param: | T - | ({ [key in Exclude]?: buff[key] } & { element: element, redirect?: skill['type'] }) + | ({ [key in Exclude]?: buff[key] } & { element: element, redirect?: skill['type'] }) | ((buff: buff, index: number) => boolean), valueOcalc?: buff[T] | Calculator ) { @@ -169,24 +187,38 @@ export class BuffManager { } else if (typeof param === 'object') { buffs = buffs.filter(buff => { if (buff.status === false) return false - for (const key in param) { - if (key === 'redirect') continue - if (key === 'range') { + const judge = (() => { + // 未传入calc时不判断range、include、exclude + if (typeof valueOcalc !== 'object' || Array.isArray(valueOcalc)) return true + // buff指定排除该技能 + if (buff.exclude && buff.exclude.includes(valueOcalc.skill.type)) return false + // 11 10 01 + if (buff.range || buff.include) { + // 11 01 存在include且满足时则直接返回true + if (buff.include && buff.include.includes(valueOcalc.skill.type)) return true + // 01 没有range则代表只有include，直接返回false + if (!buff.range) return false + // 11 10 直接返回range的结果即可 const buffRange = buff.range const skillRange = param.range?.filter(r => typeof r === 'string') - if (!buffRange || !skillRange) continue // 对任意类型生效 - if (!skillRange.length) continue + if (!skillRange?.length) return true // 对任意类型生效 // buff作用范围向后覆盖 // 存在重定向时，range须全匹配，redirect向后覆盖 else if (param.redirect) { - if (skillRange.some(ST => buffRange.some(BT => BT === ST))) continue - if (buffRange.some(BT => param.redirect!.startsWith(BT))) continue + if (skillRange.some(ST => buffRange.some(BT => BT === ST))) return true + if (buffRange.some(BT => param.redirect!.startsWith(BT))) return true return false } // 不存在重定向时，range向后覆盖 - else if (!skillRange.some(ST => buffRange.some(BT => ST.startsWith(BT)))) return false - else continue - } else if (key === 'element') { + return skillRange.some(ST => buffRange.some(BT => ST.startsWith(BT))) + } + // 00 + return true + })() + if (!judge) return false + for (const key in param) { + if (key === 'redirect' || key === 'range') continue + if (key === 'element') { if (!buff.element || !param.element) continue // 对任意属性生效 if (Array.isArray(buff.element)) { if (buff.element.includes(param.element)) continue @@ -243,7 +275,7 @@ export class BuffManager { * - 存在重定向时，range须全匹配，redirect向后覆盖 * - 不存在重定向时，range向后覆盖 */ - filter(obj: { [key in Exclude]?: buff[key] } & { element: element, redirect?: skill['type'] }, calc?: Calculator): buff[] + filter(obj: { [key in Exclude]?: buff[key] } & { element: element, redirect?: skill['type'] }, calc?: Calculator): buff[] /** * 根据指定函数筛选buff */ @@ -251,7 +283,7 @@ export class BuffManager { filter( param: | T - | ({ [key in Exclude]?: buff[key] } & { element: element, redirect?: skill['type'] }) + | ({ [key in Exclude]?: buff[key] } & { element: element, redirect?: skill['type'] }) | ((buff: buff, index: number) => boolean), valueOcalc?: buff[T] | Calculator ) { diff --git a/model/damage/README.md b/model/damage/README.md index 777b545..ff4d78f 100644 --- a/model/damage/README.md +++ b/model/damage/README.md @@ -23,7 +23,7 @@ ### 认识buff -每个buff由各项[buff参数](./BuffManager.ts#L49)组成，重要参数： +每个buff由各项[buff参数](./BuffManager.ts#L48)组成，重要参数： ```js { @@ -48,7 +48,11 @@ * 角色自身的buff提高值可能随技能/天赋等级提高而提高，此时可以于data.json的"buff"中添加对应的倍率信息（同上支持百分比提高），此时value即为键名，其首字母必须为对应技能的基类（参考技能类型命名标准） */ value: number | number[] | Function | string - /** Buff增益技能类型范围，无则对全部生效；参考技能类型命名标准 */ + /** + * Buff增益技能类型生效范围；参考技能类型命名标准 + * - 当技能参数不存在redirect时，range作用范围向后覆盖 + * - 当技能参数存在redirect时，range须全匹配，redirect向后覆盖 + */ range?: string[] /** Buff增益属性类型，无则对全部属性生效 */ element?: element | element[] @@ -59,15 +63,17 @@ - **name**：Buff名称。可重复 -- **source**：Buff来源。用于管理buff、简化参数、判断生效条件等。查看[buff来源](./BuffManager.ts#L33) +- **source**：Buff来源。用于管理buff、简化参数、判断生效条件等。查看[buff来源](./BuffManager.ts#L32) -- **type**：Buff增益的类型。查看[增益类型](./BuffManager.ts#L35) +- **type**：Buff增益的类型。查看[增益类型](./BuffManager.ts#L34) - **value**：Buff增益值。具体解释如上述 - **range**：Buff增益技能类型范围。该参数用于鉴别不同buff的[生效范围](#技能类型命名对buff作用的影响)（比如只对普攻生效），[填写方法](#技能类型命名标准)会在技能属性中详细说明 -- **element**：Buff增益属性类型，可为字符串或字符串数组。该参数用于鉴别不同buff的生效属性（比如只对冰属性伤害生效）。查看[属性类型](./BuffManager.ts#L6) +- **element**：Buff增益属性类型，可为字符串或字符串数组。该参数用于鉴别不同buff的生效属性（比如只对冰属性伤害生效）。查看[属性类型](./BuffManager.ts#L5) + +- buff存在更多的参数用于处理各种情况，详见[buff参数](./BuffManager.ts#L48) ### 注册buff @@ -269,7 +275,9 @@ buff作用范围将以技能类型命名为依据向后覆盖。以上述[艾莲 - 属性异常中**强击**和**碎冰**没有持续时间的概念，总倍率不受持续时间的影响也无法结算紊乱。因此对于作用于**异常持续时间**的buff，其buff.range应填写异常对应的**状态异常**（**畏缩**和**霜寒**），灼烧等既是伤害异常也是状态异常则无需区分。 -- 对于`“X"(造成的伤害)被视为“Y”(伤害)`此类特殊技能，需要指定技能**重定向参数**，同时上述buff覆盖规则会发生变化，具体请参考[源码内描述](./Calculator.ts#L22)，此处不作过多说明 +- 对于`“X"(造成的伤害)被视为“Y”(伤害)`此类特殊技能，需要指定技能**重定向参数**，同时上述buff覆盖规则会发生变化，具体请参考[源码内描述](./Calculator.ts#L22) + + > 需要注意的是：即使出现`“X"(造成的伤害)被视为“Y”(伤害)`，对**Y**类型的增益**X**不一定能吃到，视具体情况变化 ### 技能倍率 diff --git a/model/damage/character/伊芙琳/calc.js b/model/damage/character/伊芙琳/calc.js index 3b85867..407c19a 100644 --- a/model/damage/character/伊芙琳/calc.js +++ b/model/damage/character/伊芙琳/calc.js @@ -25,21 +25,16 @@ export const buffs = [ name: '额外能力：潜袭支点', type: '增伤', value: 0.3, - range: ['RL', 'RZ'] + range: ['RL', 'RZ'], + exclude: ['Y6'] }, { name: '额外能力：潜袭支点', type: '倍率', check: ({ calc }) => calc.get_CRITRate() >= 0.8, - value: ({ calc }) => calc.skill.name !== '连携技：月辉丝·绊' ? 0 : calc.get_SkillMultiplier('RL') * 0.25, - range: ['RL'] - }, - { - name: '额外能力：潜袭支点', - type: '倍率', - check: ({ calc }) => calc.get_CRITRate() >= 0.8, - value: ({ calc }) => calc.get_SkillMultiplier('RZ') * 0.25, - range: ['RZ'] + value: ({ calc }) => calc.get_SkillMultiplier(calc.skill.type) * 0.25, + range: ['RL', 'RZ'], + exclude: ['Y6'] } ] diff --git a/resources/map/EquipScore.json b/resources/map/EquipScore.json index 4f11d51..6c41f16 100644 --- a/resources/map/EquipScore.json +++ b/resources/map/EquipScore.json @@ -376,6 +376,22 @@ "31403": 0, "31903": 0.5 }, + "1321": { + "11102": 0, + "11103": 0, + "12102": 0.75, + "12103": 0.75, + "13103": 0, + "13102": 0, + "20103": 1, + "21103": 1, + "23103": 0.75, + "23203": 0.75, + "30502": 0, + "31203": 0, + "31403": 0, + "31603": 1 + }, "2011": {}, "2021": {} }