diff --git a/lib/convert/element.js b/lib/convert/element.js index 5071799..ac96648 100644 --- a/lib/convert/element.js +++ b/lib/convert/element.js @@ -5,11 +5,18 @@ const ELEMENT_TYPE = { 200: 'physdmg', 201: 'fire', }; +const SUB_ELEMENT_TYPE = { + 1: 'frost', + 2: 'auricink', +}; /** * * @param {keyof ELEMENT_TYPE} id + * @param {keyof SUB_ELEMENT_TYPE} sub_id * @returns */ -export const IDToElement = id => { +export const IDToElement = (id, sub_id) => { + if (sub_id && SUB_ELEMENT_TYPE[sub_id]) + return SUB_ELEMENT_TYPE[sub_id]; return ELEMENT_TYPE[id]; }; diff --git a/model/avatar.js b/model/avatar.js index 9e39d04..8136cfd 100644 --- a/model/avatar.js +++ b/model/avatar.js @@ -257,7 +257,7 @@ export class ZZZAvatarInfo { /** @type {number} */ this.ranks_num = this.ranks.filter(rank => rank.is_unlocked).length; /** @type {string} */ - this.element_str = element.IDToElement(element_type); + this.element_str = element.IDToElement(element_type, sub_element_type); /** @type {boolean} */ this.isNew = isNew; /** @type {number} 等级级别(取十位数字)*/ diff --git a/resources/common/images/IconAuricInk.png b/resources/common/images/IconAuricInk.png new file mode 100644 index 0000000..a7bcc8e Binary files /dev/null and b/resources/common/images/IconAuricInk.png differ diff --git a/resources/common/images/IconDungeonBuffEther.png b/resources/common/images/IconDungeonBuffEther.png index da2de46..ea4d889 100644 Binary files a/resources/common/images/IconDungeonBuffEther.png and b/resources/common/images/IconDungeonBuffEther.png differ diff --git a/resources/common/images/IconFire.png b/resources/common/images/IconFire.png index 65ee97a..c1357e4 100644 Binary files a/resources/common/images/IconFire.png and b/resources/common/images/IconFire.png differ diff --git a/resources/common/images/IconFrost.png b/resources/common/images/IconFrost.png new file mode 100644 index 0000000..7cccae2 Binary files /dev/null and b/resources/common/images/IconFrost.png differ diff --git a/resources/common/images/IconPhysDmg.png b/resources/common/images/IconPhysDmg.png index a30fff0..cc23a8d 100644 Binary files a/resources/common/images/IconPhysDmg.png and b/resources/common/images/IconPhysDmg.png differ diff --git a/resources/common/images/IconThunder.png b/resources/common/images/IconThunder.png index fe436ce..536311c 100644 Binary files a/resources/common/images/IconThunder.png and b/resources/common/images/IconThunder.png differ diff --git a/resources/common/images/prop/IconRupture.png b/resources/common/images/prop/IconRupture.png new file mode 100644 index 0000000..bef31b9 Binary files /dev/null and b/resources/common/images/prop/IconRupture.png differ diff --git a/resources/common/images/property/IconSheerDMGBonus.png b/resources/common/images/property/IconSheerDMGBonus.png new file mode 100644 index 0000000..cb81651 Binary files /dev/null and b/resources/common/images/property/IconSheerDMGBonus.png differ diff --git a/resources/common/images/property/IconSheerForce.png b/resources/common/images/property/IconSheerForce.png new file mode 100644 index 0000000..46020d3 Binary files /dev/null and b/resources/common/images/property/IconSheerForce.png differ diff --git a/resources/common/style/index.css b/resources/common/style/index.css index 8196d14..de01452 100644 --- a/resources/common/style/index.css +++ b/resources/common/style/index.css @@ -81,6 +81,12 @@ .property.dungeon { background-image: url("../images/IconDungeonBuffEther.png"); } +.property.frost { + background-image: url("../images/IconFrost.png"); +} +.property.auricink { + background-image: url("../images/IconAuricInk.png"); +} .prop-icon { aspect-ratio: 1; @@ -142,6 +148,9 @@ .prop-icon.thunder { background-image: url("../images/property/IconThunder.png"); } +.prop-icon.sheerforce { + background-image: url("../images/property/IconSheerForce.png"); +} .pro-icon { aspect-ratio: 1; diff --git a/resources/common/style/index.scss b/resources/common/style/index.scss index 28c3e52..b0c4eff 100644 --- a/resources/common/style/index.scss +++ b/resources/common/style/index.scss @@ -99,6 +99,12 @@ &.dungeon { background-image: url('../images/IconDungeonBuffEther.png'); } + &.frost { + background-image: url('../images/IconFrost.png'); + } + &.auricink { + background-image: url('../images/IconAuricInk.png'); + } } .prop-icon { @@ -160,6 +166,9 @@ &.thunder { background-image: url('../images/property/IconThunder.png'); } + &.sheerforce { + background-image: url('../images/property/IconSheerForce.png'); + } } .pro-icon { diff --git a/resources/panel/card.html b/resources/panel/card.html index 02b18cd..ae127ea 100644 --- a/resources/panel/card.html +++ b/resources/panel/card.html @@ -83,8 +83,7 @@ {{if charData.avatar_profession === 6}}