diff --git a/model/Enka/formater.js b/model/Enka/formater.js index 3d113fc..811640d 100644 --- a/model/Enka/formater.js +++ b/model/Enka/formater.js @@ -503,8 +503,8 @@ const special = { initial_after_format: (properties) => { delete properties[231], delete properties[232]; delete properties[305]; - const sheerForce = Math.trunc(0.1 * properties[111].final) + - Math.trunc(0.3 * properties[121].final); + const sheerForce = Math.trunc(properties[111].final * 1 / 10) + + Math.trunc(properties[121].final * 3 / 10); properties[19] = { property_name: '贯穿力', property_id: 19, diff --git a/model/Enka/formater.ts b/model/Enka/formater.ts index 3f56935..e310f1c 100644 --- a/model/Enka/formater.ts +++ b/model/Enka/formater.ts @@ -1,4 +1,4 @@ -import type { Mys, Enka, Map } from './interface.js' +import type { Mys, Enka, Map } from './interface.ts' import { getMapData } from '../../utils/file.js' type FilterValueType = { @@ -149,7 +149,7 @@ export class Equip { S: 0.2, A: 0.25, B: 0.3 - })[this.info.rarity as 'S' | 'A' | 'B']) : p.PropertyLevel) + })[this.info.rarity]!) : p.PropertyLevel) property.base = get_base(propId, value) property.level = p.PropertyLevel property.valid = false @@ -320,7 +320,7 @@ export class Property { // } // }) const base = {} as Record - const ids = Object.keys(id2en).map(Number) as (Ids)[] + const ids = Object.keys(id2en).map(Number) as Ids[] ids.forEach((id) => { const prop = id2en[id] if (Object.prototype.hasOwnProperty.call(this.data, prop)) { @@ -587,8 +587,8 @@ const special: Record
-
闪能累积
+
闪能累积
{{basic_properties.adrenalineaccumulate.final}}
diff --git a/resources/panel/damage.html b/resources/panel/damage.html index 751843a..ac153a6 100644 --- a/resources/panel/damage.html +++ b/resources/panel/damage.html @@ -81,6 +81,19 @@
异常精通
{{basic_properties.elementmystery.final}}
+ {{if charData.avatar_profession === 6}} +
+ +
+
贯穿力
+
{{basic_properties.sheerforce.final}}
+
+
+
+
闪能累积
+
{{basic_properties.adrenalineaccumulate.final}}
+
+ {{else}}
穿透率
@@ -91,6 +104,7 @@
能量回复
{{basic_properties.sprecover.final}}
+ {{/if}}