更新套装图片map；更新下载节点排序

apps/manage/assets.js

@@ -10,14 +10,14 @@ import {
   getHakushWeapon,
 } from '../../lib/download.js';
 import { char } from '../../lib/convert.js';
-import { getAllEquipID } from '../../lib/convert/equip.js';
+import { getAllSuitID } from '../../lib/convert/equip.js';
 import { getAllWeaponID } from '../../lib/convert/weapon.js';
 import * as LocalURI from '../../lib/download/const.js';
 
 export async function downloadAll() {
   if (!this.e.isMaster) return false;
   const charIDs = char.getAllCharactersID();
-  const equipSprites = getAllEquipID();
+  const equipSprites = getAllSuitID();
   const weaponSprites = getAllWeaponID();
   const result = {
     images: {

lib/assets/const.js

@@ -1,15 +1,15 @@
 // 节点列表
 export const URL_LIB = {
-  '[CNJS]': 'http://cn-js-nj-1.lcf.icu:13214',
+  "[Lulu]": "http://lulush.microgg.cn",
-  '[TW]': 'http://tw-taipei-1.lcf.icu:20532',
+  "[MiniGG]": "http://file.minigg.cn/sayu-bot",
-  '[SG]': 'http://sg-1.lcf.icu:12588',
+  "[Singapore]": "https://sg.qxqx.cf",
-  '[US]': 'http://us-lax-2.lcf.icu:12588',
+  "[Chuncheon]": "https://kr.qxqx.cf",
-  '[Chuncheon]': 'https://kr.qxqx.cf',
+  "[CNJS]": "http://cn-js-nj-1.lcf.icu:13214",
-  '[Seoul]': 'https://kr-s.qxqx.cf',
+  "[TW]": "http://tw-taipei-1.lcf.icu:20532",
-  '[Singapore]': 'https://sg.qxqx.cf',
+  "[SG]": "http://sg-1.lcf.icu:12588",
-  '[MiniGG]': 'http://file.minigg.cn/sayu-bot',
+  "[US]": "http://us-lax-2.lcf.icu:12588",
-  '[Lulu]': 'http://lulush.microgg.cn',
+  "[Seoul]": "https://kr-s.qxqx.cf",
-  '[TakeyaYuki]': 'https://gscore.focalors.com',
+  "[TakeyaYuki]": "https://gscore.focalors.com"
 };
 
 // 文件类型路径

lib/convert/equip.js

@@ -1,10 +1,10 @@
 import { getMapData } from '../../utils/file.js'
 
-/** @type {import('../../model/Enka/interface.js').Map.EquipId2Data} */
+/** @type {import('../../model/Enka/interface.js').Map.SuitData} */
-const EquipId2Data = getMapData('EquipId2Data')
+const SuitData = getMapData('SuitData')
 
 /**
- * 获取驱动盘装备的图片
+ * 获取驱动盘装备的图片名
  * @param {string | number} equipId
  * @returns {string | null}
  */
@@ -12,17 +12,17 @@ export function equipIdToSprite(equipId) {
   equipId = equipId.toString()
   if (equipId.length === 5) {
     const suitId = equipId.slice(0, 3) + '00'
-    if (EquipId2Data.hasOwnProperty(suitId)) {
+    if (SuitData.hasOwnProperty(suitId)) {
-      return EquipId2Data[suitId]['sprite_file'].replace('3D', '')
+      return SuitData[suitId]['sprite_file']
     }
   }
   return null
 }
 
 /**
- * 获取所有装备的id
+ * 获取所有套装id
  * @returns {string[]}
  */
-export function getAllEquipID() {
+export function getAllSuitID() {
-  return Object.keys(EquipId2Data)
+  return Object.keys(SuitData)
 }

model/Enka/enkaApi.js

@@ -1,11 +1,9 @@
 import { Enka2Mys } from './formater.js'
-import fetch from 'node-fetch'
 import settings from '../../lib/settings.js'
-import _ from 'lodash'
+import fetch from 'node-fetch'
 
 const config = settings.getConfig('config')
-const defConfig = settings.getdefSet('config')
+const EnkaApi = config.enkaApi
-const EnkaApi = _.get(config, 'enkaApi') || _.get(defConfig, 'enkaApi')
 
 export function getGameRoles(uid, region = false) {
   const _uid = String(uid)

model/Enka/formater.js

@@ -7,7 +7,6 @@ var Rarity;
 })(Rarity || (Rarity = {}));
 const WeaponId2Data = getMapData('WeaponId2Data');
 const PartnerId2Data = getMapData('PartnerId2Data');
-const EquipId2Data = getMapData('EquipId2Data');
 const SuitData = getMapData('SuitData');
 const id2zh = {
     111: '生命值',
@@ -66,7 +65,7 @@ export class Equip {
         this.enkaEquip = enkaEquip;
         this.Equipment = this.enkaEquip.Equipment;
         this.id = this.Equipment.Id;
-        this.data = EquipId2Data[`${this.id.toString().slice(0, 3)}00`];
+        this.data = SuitData[`${this.id.toString().slice(0, 3)}00`];
         if (!this.data) {
             throw new Error(`驱动盘数据缺失: ${this.id}`);
         }
@@ -104,7 +103,7 @@ export class Equip {
         return {
             id: this.id,
             level: this.Equipment.Level,
-            name: `${this.data.equip_name}[${this.enkaEquip.Slot}]`,
+            name: `${this.data.name}[${this.enkaEquip.Slot}]`,
             icon: '',
             rarity: Rarity[+String(this.id)[3]] || 'S',
             equipment_type: this.enkaEquip.Slot,
@@ -136,7 +135,7 @@ export class Equip {
     equip_suit() {
         return {
             suit_id: +`${this.id.toString().slice(0, 3)}00`,
-            name: this.data.equip_name,
+            name: this.data.name,
             own: 0,
             desc1: this.data.desc1,
             desc2: this.data.desc2
@@ -469,7 +468,7 @@ export function Enka2Mys(enkaAvatars, __isToFixed__ = true) {
         try {
             const info = parseInfo(enkaAvatar);
             if (!info) {
-                throw new Error(`角色数据缺失: ${enkaAvatar.Id}`);
+                throw `角色数据缺失: ${enkaAvatar.Id}`;
             }
             const avatar = info;
             avatar.ranks = [];

model/Enka/formater.ts

@@ -15,7 +15,6 @@ enum Rarity {
 
 const WeaponId2Data = getMapData('WeaponId2Data') as Map.WeaponId2Data
 const PartnerId2Data = getMapData('PartnerId2Data') as Map.PartnerId2Data
-const EquipId2Data = getMapData('EquipId2Data') as Map.EquipId2Data
 const SuitData = getMapData('SuitData') as Map.SuitData
 
 const id2zh = {
@@ -80,14 +79,14 @@ export class Equip {
   readonly enkaEquip: Enka.Equip
   readonly Equipment: Enka.Equip['Equipment']
   readonly id: number
-  readonly data: Map.EquipId2Data[string]
+  readonly data: Map.SuitData[string]
   readonly info: FilterValueType<Mys.Equip, string | number | boolean>
   readonly equip: Mys.Equip
   constructor(enkaEquip: Enka.Equip) {
     this.enkaEquip = enkaEquip
     this.Equipment = this.enkaEquip.Equipment
     this.id = this.Equipment.Id
-    this.data = EquipId2Data[`${this.id.toString().slice(0, 3)}00`]
+    this.data = SuitData[`${this.id.toString().slice(0, 3)}00`]
     if (!this.data) {
       throw new Error(`驱动盘数据缺失: ${this.id}`)
     }
@@ -129,7 +128,7 @@ export class Equip {
     return {
       id: this.id,
       level: this.Equipment.Level,
-      name: `${this.data.equip_name}[${this.enkaEquip.Slot}]`,
+      name: `${this.data.name}[${this.enkaEquip.Slot}]`,
       icon: '',
       rarity: Rarity[+String(this.id)[3]] || 'S',
       equipment_type: this.enkaEquip.Slot,
@@ -163,7 +162,7 @@ export class Equip {
   equip_suit(): Mys.Equip['equip_suit'] {
     return {
       suit_id: +`${this.id.toString().slice(0, 3)}00`,
-      name: this.data.equip_name,
+      name: this.data.name,
       own: 0,
       desc1: this.data.desc1,
       desc2: this.data.desc2
@@ -540,7 +539,7 @@ export function Enka2Mys(enkaAvatars: Enka.Avatar | Enka.Avatar[], __isToFixed__
     try {
       const info = parseInfo(enkaAvatar)
       if (!info) {
-        throw new Error(`角色数据缺失: ${enkaAvatar.Id}`)
+        throw `角色数据缺失: ${enkaAvatar.Id}`
       }
       const avatar = info as Mys.Avatar
       avatar.ranks = []

model/Enka/interface.ts

@@ -343,21 +343,12 @@ export namespace Map {
     }
   }
 
-  export interface EquipId2Data {
-    [id: string]: {
-      equip_id_list: number[]
-      sprite_file: string
-      equip_name: string
-      desc1: string
-      desc2: string
-    }
-  }
-
   export interface SuitData {
     [suit_id: string]: {
+      sprite_file: string
       name: string
+      desc1: string
       desc2: string
-      desc4: string
       properties: Mys.Property[]
     }
   }

resources/map/EquipId2Data.json

@@ -1,522 +0,0 @@
-{
-    "31900": {
-        "equip_id_list": [
-            31921,
-            31922,
-            31923,
-            31924,
-            31925,
-            31926,
-            31931,
-            31932,
-            31933,
-            31934,
-            31935,
-            31936,
-            31941,
-            31942,
-            31943,
-            31944,
-            31945,
-            31946
-        ],
-        "sprite_file": "3DSuitProtoPunk",
-        "equip_name": "原始朋克",
-        "desc1": "施加的护盾值提升15%。",
-        "desc2": "队伍中任意角色发动<color=#FFFFFF>[招架支援]</color>或<color=#FFFFFF>[回避支援]</color>时，全队角色造成的伤害提升15%，持续10秒，同名被动效果之间不可叠加。"
-    },
-    "31300": {
-        "equip_id_list": [
-            31321,
-            31322,
-            31323,
-            31324,
-            31325,
-            31326,
-            31331,
-            31332,
-            31333,
-            31334,
-            31335,
-            31336,
-            31341,
-            31342,
-            31343,
-            31344,
-            31345,
-            31346
-        ],
-        "sprite_file": "3DSuitFreedomBlues",
-        "equip_name": "自由蓝调",
-        "desc1": "异常精通+30点。",
-        "desc2": "<color=#FFFFFF>[强化特殊技]</color>命中敌人时，根据装备者的属性类型，使目标对应属性异常积蓄抗性降低20%，持续8秒，相同属性类型的效果不可叠加。"
-    },
-    "31600": {
-        "equip_id_list": [
-            31621,
-            31622,
-            31623,
-            31624,
-            31625,
-            31626,
-            31631,
-            31632,
-            31633,
-            31634,
-            31635,
-            31636,
-            31641,
-            31642,
-            31643,
-            31644,
-            31645,
-            31646
-        ],
-        "sprite_file": "3DSuitSwingJazz",
-        "equip_name": "摇摆爵士",
-        "desc1": "能量自动回复+20%。",
-        "desc2": "发动<color=#FFFFFF>[连携技]</color>或<color=#FFFFFF>[终结技]</color>时，全队角色造成的伤害提升15%，持续12秒，同名被动效果之间不可叠加。"
-    },
-    "32700": {
-        "equip_id_list": [
-            32721,
-            32722,
-            32723,
-            32724,
-            32725,
-            32726,
-            32731,
-            32732,
-            32733,
-            32734,
-            32735,
-            32736,
-            32741,
-            32742,
-            32743,
-            32744,
-            32745,
-            32746
-        ],
-        "sprite_file": "3DSuitBranch&BladeSong",
-        "equip_name": "折枝剑歌",
-        "desc1": "暴击伤害+16%。",
-        "desc2": "异常掌控大于等于115点时，装备者的暴击伤害提升30%；队伍中任意角色对敌人施加<color=#98EFF0>[冻结]</color>或触发<color=#98EFF0>[碎冰]</color>效果时，装备者的暴击率提升12%，持续15秒。"
-    },
-    "31100": {
-        "equip_id_list": [
-            31121,
-            31122,
-            31123,
-            31124,
-            31125,
-            31126,
-            31131,
-            31132,
-            31133,
-            31134,
-            31135,
-            31136,
-            31141,
-            31142,
-            31143,
-            31144,
-            31145,
-            31146
-        ],
-        "sprite_file": "3DSuitPufferElectro",
-        "equip_name": "河豚电音",
-        "desc1": "穿透率+8%。",
-        "desc2": "<color=#FFFFFF>[终结技]</color>造成的伤害提升20%；发动<color=#FFFFFF>[终结技]</color>时，装备者的攻击力提升15%，持续12秒。"
-    },
-    "33200": {
-        "equip_id_list": [
-            33221,
-            33222,
-            33223,
-            33224,
-            33225,
-            33226,
-            33231,
-            33232,
-            33233,
-            33234,
-            33235,
-            33236,
-            33241,
-            33242,
-            33243,
-            33244,
-            33245,
-            33246
-        ],
-        "sprite_file": "3DSuitKingoftheSummit",
-        "equip_name": "山大王",
-        "desc1": "攻击造成的失衡值提升6%",
-        "desc2": "装备者为[击破]角色时，发动<color=#FFFFFF>[强化特殊技]</color>或<color=#FFFFFF>[连携技]</color>会使全队角色暴击伤害提升15%，装备者的暴击率大于等于50%时暴击伤害额外提升15%，持续15秒，重复触发时刷新持续时间，同名被动效果之间不可叠加。"
-    },
-    "31200": {
-        "equip_id_list": [
-            31221,
-            31222,
-            31223,
-            31224,
-            31225,
-            31226,
-            31231,
-            31232,
-            31233,
-            31234,
-            31235,
-            31236,
-            31241,
-            31242,
-            31243,
-            31244,
-            31245,
-            31246
-        ],
-        "sprite_file": "3DSuitShockstarDisco",
-        "equip_name": "震星迪斯科",
-        "desc1": "冲击力+6%。",
-        "desc2": "<color=#FFFFFF>[普通攻击]</color>、<color=#FFFFFF>[冲刺攻击]</color>、<color=#FFFFFF>[闪避反击]</color>对主要攻击目标造成的失衡值提升20%。"
-    },
-    "32800": {
-        "equip_id_list": [
-            32821,
-            32822,
-            32823,
-            32824,
-            32825,
-            32826,
-            32831,
-            32832,
-            32833,
-            32834,
-            32835,
-            32836,
-            32841,
-            32842,
-            32843,
-            32844,
-            32845,
-            32846
-        ],
-        "sprite_file": "3DSuitAstralVoice",
-        "equip_name": "静听嘉音",
-        "desc1": "攻击力+10%。",
-        "desc2": "队伍中任意角色通过<color=#FFFFFF>[快速支援]</color>入场时，全队角色获得1层<color=#FFFFFF>[嘉音]</color>，最多叠加3层，持续15秒，重复触发时刷新持续时间，每拥有1层<color=#FFFFFF>[嘉音]</color>，通过<color=#FFFFFF>[快速支援]</color>入场的角色造成的伤害提升8%，同名被动效果之间不可叠加。"
-    },
-    "33100": {
-        "equip_id_list": [
-            33121,
-            33122,
-            33123,
-            33124,
-            33125,
-            33126,
-            33131,
-            33132,
-            33133,
-            33134,
-            33135,
-            33136,
-            33141,
-            33142,
-            33143,
-            33144,
-            33145,
-            33146
-        ],
-        "sprite_file": "3DSuitYunkuiTales",
-        "equip_name": "云岿如我",
-        "desc1": "生命值+10%",
-        "desc2": "发动<color=#FFFFFF>[强化特殊技]</color>、<color=#FFFFFF>[连携技]</color>、<color=#FFFFFF>[终结技]</color>时，暴击率提升4%，最多叠加3层，持续15秒，重复触发时刷新持续时间，拥有3层效果时，造成的贯穿伤害提升10%。"
-    },
-    "32400": {
-        "equip_id_list": [
-            32421,
-            32422,
-            32423,
-            32424,
-            32425,
-            32426,
-            32431,
-            32432,
-            32433,
-            32434,
-            32435,
-            32436,
-            32441,
-            32442,
-            32443,
-            32444,
-            32445,
-            32446
-        ],
-        "sprite_file": "3DSuitThunderMetal",
-        "equip_name": "雷暴重金属",
-        "desc1": "<color=#2EB6FF>电属性伤害</color>+10%。",
-        "desc2": "当场上存在处于<color=#2EB6FF>[感电]</color>状态下的敌人时，装备者的攻击力提升28%。"
-    },
-    "32900": {
-        "equip_id_list": [
-            32921,
-            32922,
-            32923,
-            32924,
-            32925,
-            32926,
-            32931,
-            32932,
-            32933,
-            32934,
-            32935,
-            32936,
-            32941,
-            32942,
-            32943,
-            32944,
-            32945,
-            32946
-        ],
-        "sprite_file": "3DSuitShadow",
-        "equip_name": "如影相随",
-        "desc1": "<color=#FFFFFF>[追加攻击]</color>和<color=#FFFFFF>[冲刺攻击]</color>造成的伤害提升15%。",
-        "desc2": "<color=#FFFFFF>[追加攻击]</color>或<color=#FFFFFF>[冲刺攻击]</color>命中敌人时，若造成的伤害与装备者的属性一致，则获得1层增益效果，同一招式内最多触发一次；每拥有1层增益效果，装备者的攻击力提升4%，暴击率提升4%，最多叠加3层，持续15秒，重复触发时刷新持续时间。"
-    },
-    "31500": {
-        "equip_id_list": [
-            31521,
-            31522,
-            31523,
-            31524,
-            31525,
-            31526,
-            31531,
-            31532,
-            31533,
-            31534,
-            31535,
-            31536,
-            31541,
-            31542,
-            31543,
-            31544,
-            31545,
-            31546
-        ],
-        "sprite_file": "3DSuitSoulRock",
-        "equip_name": "灵魂摇滚",
-        "desc1": "防御力+16%。",
-        "desc2": "受到敌方攻击并损失生命值时，装备者受到的伤害降低40%，持续2.5秒，15秒内最多触发一次。"
-    },
-    "32500": {
-        "equip_id_list": [
-            32521,
-            32522,
-            32523,
-            32524,
-            32525,
-            32526,
-            32531,
-            32532,
-            32533,
-            32534,
-            32535,
-            32536,
-            32541,
-            32542,
-            32543,
-            32544,
-            32545,
-            32546
-        ],
-        "sprite_file": "3DSuitPolarMetal",
-        "equip_name": "极地重金属",
-        "desc1": "<color=#98EFF0>冰属性伤害</color>+10%。",
-        "desc2": "<color=#FFFFFF>[普通攻击]</color>和<color=#FFFFFF>[冲刺攻击]</color>造成的伤害提升20%，队伍中任意角色对敌人施加<color=#98EFF0>[冻结]</color>或触发<color=#98EFF0>[碎冰]</color>效果时，该增益效果额外提升20%，持续12秒。"
-    },
-    "32600": {
-        "equip_id_list": [
-            32621,
-            32622,
-            32623,
-            32624,
-            32625,
-            32626,
-            32631,
-            32632,
-            32633,
-            32634,
-            32635,
-            32636,
-            32641,
-            32642,
-            32643,
-            32644,
-            32645,
-            32646
-        ],
-        "sprite_file": "3DSuitFangedMetal",
-        "equip_name": "獠牙重金属",
-        "desc1": "<color=#F0D12B>物理伤害</color>+10%。",
-        "desc2": "队伍中任意角色对敌人施加<color=#F0D12B>[强击]</color>效果时，装备者对目标造成的伤害提升35%，持续12秒。"
-    },
-    "31800": {
-        "equip_id_list": [
-            31821,
-            31822,
-            31823,
-            31824,
-            31825,
-            31826,
-            31831,
-            31832,
-            31833,
-            31834,
-            31835,
-            31836,
-            31841,
-            31842,
-            31843,
-            31844,
-            31845,
-            31846
-        ],
-        "sprite_file": "3DSuitChaosJazz",
-        "equip_name": "混沌爵士",
-        "desc1": "异常精通+30点。",
-        "desc2": "<color=#FF5521>火属性伤害</color>和<color=#2EB6FF>电属性伤害</color>提升15%；位于后场时，<color=#FFFFFF>[强化特殊技]</color>和<color=#FFFFFF>[支援攻击]</color>造成的伤害提升20%，换入前场后，该增益效果仍然保留，持续5秒，保留效果7.5秒内最多触发一次。"
-    },
-    "33000": {
-        "equip_id_list": [
-            33021,
-            33022,
-            33023,
-            33024,
-            33025,
-            33026,
-            33031,
-            33032,
-            33033,
-            33034,
-            33035,
-            33036,
-            33041,
-            33042,
-            33043,
-            33044,
-            33045,
-            33046
-        ],
-        "sprite_file": "3DSuitSavior",
-        "equip_name": "法厄同之歌",
-        "desc1": "异常掌控+8%。",
-        "desc2": "队伍中任意角色发动<color=#FFFFFF>[强化特殊技]</color>时，装备者的异常精通提升45点，持续8秒；如果发动<color=#FFFFFF>[强化特殊技]</color>的角色不是装备者本人时，装备者造成的<color=#FE437E>以太伤害</color>提升25%。"
-    },
-    "31400": {
-        "equip_id_list": [
-            31421,
-            31422,
-            31423,
-            31424,
-            31425,
-            31426,
-            31431,
-            31432,
-            31433,
-            31434,
-            31435,
-            31436,
-            31441,
-            31442,
-            31443,
-            31444,
-            31445,
-            31446
-        ],
-        "sprite_file": "3DSuitHormonePunk",
-        "equip_name": "激素朋克",
-        "desc1": "攻击力+10%。",
-        "desc2": "进入接战状态或换入前场时，装备者的攻击力提升25%，持续10秒，20秒内最多触发一次。"
-    },
-    "32200": {
-        "equip_id_list": [
-            32221,
-            32222,
-            32223,
-            32224,
-            32225,
-            32226,
-            32231,
-            32232,
-            32233,
-            32234,
-            32235,
-            32236,
-            32241,
-            32242,
-            32243,
-            32244,
-            32245,
-            32246
-        ],
-        "sprite_file": "3DSuitInfernoMetal",
-        "equip_name": "炎狱重金属",
-        "desc1": "<color=#FF5521>火属性伤害</color>+10%。",
-        "desc2": "攻击命中处于<color=#FF5521>[灼烧]</color>状态下的敌人时，装备者的暴击率提升28%，持续8秒。"
-    },
-    "31000": {
-        "equip_id_list": [
-            31021,
-            31022,
-            31023,
-            31024,
-            31025,
-            31026,
-            31031,
-            31032,
-            31033,
-            31034,
-            31035,
-            31036,
-            31041,
-            31042,
-            31043,
-            31044,
-            31045,
-            31046
-        ],
-        "sprite_file": "3DSuitWoodpeckerElectro",
-        "equip_name": "啄木鸟电音",
-        "desc1": "暴击率+8%。",
-        "desc2": "<color=#FFFFFF>[普通攻击]</color>、<color=#FFFFFF>[闪避反击]</color>或<color=#FFFFFF>[强化特殊技]</color>命中敌人并触发暴击时，分别为装备者提供1层增益效果，每层增益效果使装备者的攻击力提升9%，持续6秒，不同招式分别结算持续时间。"
-    },
-    "32300": {
-        "equip_id_list": [
-            32321,
-            32322,
-            32323,
-            32324,
-            32325,
-            32326,
-            32331,
-            32332,
-            32333,
-            32334,
-            32335,
-            32336,
-            32341,
-            32342,
-            32343,
-            32344,
-            32345,
-            32346
-        ],
-        "sprite_file": "3DSuitChaosMetal",
-        "equip_name": "混沌重金属",
-        "desc1": "<color=#FE437E>以太伤害</color>+10%。",
-        "desc2": "装备者的暴击伤害提升20%，队伍中任意角色触发<color=#FE437E>[侵蚀]</color>效果的额外伤害时，该增益效果额外提升5.5%，最多叠加6层，持续8秒，重复触发时刷新持续时间。"
-    }
-}

resources/map/SuitData.json

@@ -1,8 +1,9 @@
 {
   "31000": {
+    "sprite_file": "SuitWoodpeckerElectro",
     "name": "啄木鸟电音",
-    "desc2": "暴击率+8%。",
+    "desc1": "暴击率+8%。",
-    "desc4": "<color=#FFFFFF>[普通攻击]</color>、<color=#FFFFFF>[闪避反击]</color>或<color=#FFFFFF>[强化特殊技]</color>命中敌人并触发暴击时，分别为装备者提供1层增益效果，每层增益效果使装备者的攻击力提升9%，持续6秒，不同招式分别结算持续时间。",
+    "desc2": "<color=#FFFFFF>[普通攻击]</color>、<color=#FFFFFF>[闪避反击]</color>或<color=#FFFFFF>[强化特殊技]</color>命中敌人并触发暴击时，分别为装备者提供1层增益效果，每层增益效果使装备者的攻击力提升9%，持续6秒，不同招式分别结算持续时间。",
     "properties": [
       {
         "property_id": 20103,
@@ -11,9 +12,10 @@
     ]
   },
   "31100": {
+    "sprite_file": "SuitPufferElectro",
     "name": "河豚电音",
-    "desc2": "穿透率+8%。",
+    "desc1": "穿透率+8%。",
-    "desc4": "<color=#FFFFFF>[终结技]</color>造成的伤害提升20%；发动<color=#FFFFFF>[终结技]</color>时，装备者的攻击力提升15%，持续12秒。",
+    "desc2": "<color=#FFFFFF>[终结技]</color>造成的伤害提升20%；发动<color=#FFFFFF>[终结技]</color>时，装备者的攻击力提升15%，持续12秒。",
     "properties": [
       {
         "property_id": 23103,
@@ -22,9 +24,10 @@
     ]
   },
   "31200": {
+    "sprite_file": "SuitShockstarDisco",
     "name": "震星迪斯科",
-    "desc2": "冲击力+6%。",
+    "desc1": "冲击力+6%。",
-    "desc4": "<color=#FFFFFF>[普通攻击]</color>、<color=#FFFFFF>[冲刺攻击]</color>、<color=#FFFFFF>[闪避反击]</color>对主要攻击目标造成的失衡值提升20%。",
+    "desc2": "<color=#FFFFFF>[普通攻击]</color>、<color=#FFFFFF>[冲刺攻击]</color>、<color=#FFFFFF>[闪避反击]</color>对主要攻击目标造成的失衡值提升20%。",
     "properties": [
       {
         "property_id": 12202,
@@ -33,9 +36,10 @@
     ]
   },
   "31300": {
+    "sprite_file": "SuitFreedomBlues",
     "name": "自由蓝调",
-    "desc2": "异常精通+30点。",
+    "desc1": "异常精通+30点。",
-    "desc4": "<color=#FFFFFF>[强化特殊技]</color>命中敌人时，根据装备者的属性类型，使目标对应属性异常积蓄抗性降低20%，持续8秒，相同属性类型的效果不可叠加。",
+    "desc2": "<color=#FFFFFF>[强化特殊技]</color>命中敌人时，根据装备者的属性类型，使目标对应属性异常积蓄抗性降低20%，持续8秒，相同属性类型的效果不可叠加。",
     "properties": [
       {
         "property_id": 31203,
@@ -44,9 +48,10 @@
     ]
   },
   "31400": {
+    "sprite_file": "SuitHormonePunk",
     "name": "激素朋克",
-    "desc2": "攻击力+10%。",
+    "desc1": "攻击力+10%。",
-    "desc4": "成为接战状态下的当前操作角色时，装备者的攻击力提升25%，持续10秒，20秒内最多触发一次。",
+    "desc2": "成为接战状态下的当前操作角色时，装备者的攻击力提升25%，持续10秒，20秒内最多触发一次。",
     "properties": [
       {
         "property_id": 12102,
@@ -55,9 +60,10 @@
     ]
   },
   "31500": {
+    "sprite_file": "SuitSoulRock",
     "name": "灵魂摇滚",
-    "desc2": "防御力+16%。",
+    "desc1": "防御力+16%。",
-    "desc4": "受到敌方攻击并损失生命值时，装备者受到的伤害降低40%，持续2.5秒，15秒内最多触发一次。",
+    "desc2": "受到敌方攻击并损失生命值时，装备者受到的伤害降低40%，持续2.5秒，15秒内最多触发一次。",
     "properties": [
       {
         "property_id": 13102,
@@ -66,9 +72,10 @@
     ]
   },
   "31600": {
+    "sprite_file": "SuitSwingJazz",
     "name": "摇摆爵士",
-    "desc2": "能量自动回复+20%。",
+    "desc1": "能量自动回复+20%。",
-    "desc4": "发动<color=#FFFFFF>[连携技]</color>或<color=#FFFFFF>[终结技]</color>时，全队角色造成的伤害提升15%，持续12秒，同名被动效果之间不可叠加。",
+    "desc2": "发动<color=#FFFFFF>[连携技]</color>或<color=#FFFFFF>[终结技]</color>时，全队角色造成的伤害提升15%，持续12秒，同名被动效果之间不可叠加。",
     "properties": [
       {
         "property_id": 30502,
@@ -77,9 +84,10 @@
     ]
   },
   "31800": {
+    "sprite_file": "SuitChaosJazz",
     "name": "混沌爵士",
-    "desc2": "异常精通+30点。",
+    "desc1": "异常精通+30点。",
-    "desc4": "<color=#FF5521>火属性伤害</color>和<color=#2EB6FF>电属性伤害</color>提升15%；位于后场时，<color=#FFFFFF>[强化特殊技]</color>和<color=#FFFFFF>[支援攻击]</color>造成的伤害提升20%，换入前场后，该增益效果仍然保留，持续5秒，保留效果7.5秒内最多触发一次。",
+    "desc2": "<color=#FF5521>火属性伤害</color>和<color=#2EB6FF>电属性伤害</color>提升15%；位于后场时，<color=#FFFFFF>[强化特殊技]</color>和<color=#FFFFFF>[支援攻击]</color>造成的伤害提升20%，换入前场后，该增益效果仍然保留，持续5秒，保留效果7.5秒内最多触发一次。",
     "properties": [
       {
         "property_id": 31203,
@@ -88,15 +96,17 @@
     ]
   },
   "31900": {
+    "sprite_file": "SuitProtoPunk",
     "name": "原始朋克",
-    "desc2": "施加的护盾值提升15%。",
+    "desc1": "施加的护盾值提升15%。",
-    "desc4": "队伍中任意角色发动<color=#FFFFFF>[招架支援]</color>或<color=#FFFFFF>[回避支援]</color>时，全队角色造成的伤害提升15%，持续10秒，同名被动效果之间不可叠加。",
+    "desc2": "队伍中任意角色发动<color=#FFFFFF>[招架支援]</color>或<color=#FFFFFF>[回避支援]</color>时，全队角色造成的伤害提升15%，持续10秒，同名被动效果之间不可叠加。",
     "properties": []
   },
   "32200": {
+    "sprite_file": "SuitInfernoMetal",
     "name": "炎狱重金属",
-    "desc2": "<color=#FF5521>火属性伤害</color>+10%。",
+    "desc1": "<color=#FF5521>火属性伤害</color>+10%。",
-    "desc4": "攻击命中处于<color=#FF5521>[灼烧]</color>状态下的敌人时，装备者的暴击率提升28%，持续8秒。",
+    "desc2": "攻击命中处于<color=#FF5521>[灼烧]</color>状态下的敌人时，装备者的暴击率提升28%，持续8秒。",
     "properties": [
       {
         "property_id": 31603,
@@ -105,9 +115,10 @@
     ]
   },
   "32300": {
+    "sprite_file": "SuitChaosMetal",
     "name": "混沌重金属",
-    "desc2": "<color=#FE437E>以太伤害</color>+10%。",
+    "desc1": "<color=#FE437E>以太伤害</color>+10%。",
-    "desc4": "装备者的暴击伤害提升20%，队伍中任意角色触发<color=#FE437E>[侵蚀]</color>效果的额外伤害时，该增益效果额外提升5.5%，最多叠加6层，持续8秒，重复触发时刷新持续时间。",
+    "desc2": "装备者的暴击伤害提升20%，队伍中任意角色触发<color=#FE437E>[侵蚀]</color>效果的额外伤害时，该增益效果额外提升5.5%，最多叠加6层，持续8秒，重复触发时刷新持续时间。",
     "properties": [
       {
         "property_id": 31903,
@@ -116,9 +127,10 @@
     ]
   },
   "32400": {
+    "sprite_file": "SuitThunderMetal",
     "name": "雷暴重金属",
-    "desc2": "<color=#2EB6FF>电属性伤害</color>+10%。",
+    "desc1": "<color=#2EB6FF>电属性伤害</color>+10%。",
-    "desc4": "当场上存在处于<color=#2EB6FF>[感电]</color>状态下的敌人时，装备者的攻击力提升28%。",
+    "desc2": "当场上存在处于<color=#2EB6FF>[感电]</color>状态下的敌人时，装备者的攻击力提升28%。",
     "properties": [
       {
         "property_id": 31803,
@@ -127,9 +139,10 @@
     ]
   },
   "32500": {
+    "sprite_file": "SuitPolarMetal",
     "name": "极地重金属",
-    "desc2": "<color=#98EFF0>冰属性伤害</color>+10%。",
+    "desc1": "<color=#98EFF0>冰属性伤害</color>+10%。",
-    "desc4": "<color=#FFFFFF>[普通攻击]</color>和<color=#FFFFFF>[冲刺攻击]</color>造成的伤害提升20%，队伍中任意角色对敌人施加<color=#98EFF0>[冻结]</color>或触发<color=#98EFF0>[碎冰]</color>效果时，该增益效果额外提升20%，持续12秒。",
+    "desc2": "<color=#FFFFFF>[普通攻击]</color>和<color=#FFFFFF>[冲刺攻击]</color>造成的伤害提升20%，队伍中任意角色对敌人施加<color=#98EFF0>[冻结]</color>或触发<color=#98EFF0>[碎冰]</color>效果时，该增益效果额外提升20%，持续12秒。",
     "properties": [
       {
         "property_id": 31703,
@@ -138,9 +151,10 @@
     ]
   },
   "32600": {
+    "sprite_file": "SuitFangedMetal",
     "name": "獠牙重金属",
-    "desc2": "<color=#F0D12B>物理伤害</color>+10%。",
+    "desc1": "<color=#F0D12B>物理伤害</color>+10%。",
-    "desc4": "队伍中任意角色对敌人施加<color=#F0D12B>[强击]</color>效果时，装备者对目标造成的伤害提升35%，持续12秒。",
+    "desc2": "队伍中任意角色对敌人施加<color=#F0D12B>[强击]</color>效果时，装备者对目标造成的伤害提升35%，持续12秒。",
     "properties": [
       {
         "property_id": 31503,
@@ -149,9 +163,10 @@
     ]
   },
   "32700": {
+    "sprite_file": "SuitBranch&BladeSong",
     "name": "折枝剑歌",
-    "desc2": "暴击伤害+16%。",
+    "desc1": "暴击伤害+16%。",
-    "desc4": "异常掌控大于等于115点时，装备者的暴击伤害提升30%；队伍中任意角色对敌人施加<color=#98EFF0>[冻结]</color>或触发<color=#98EFF0>[碎冰]</color>效果时，装备者的暴击率提升12%，持续15秒。",
+    "desc2": "异常掌控大于等于115点时，装备者的暴击伤害提升30%；队伍中任意角色对敌人施加<color=#98EFF0>[冻结]</color>或触发<color=#98EFF0>[碎冰]</color>效果时，装备者的暴击率提升12%，持续15秒。",
     "properties": [
       {
         "property_id": 21103,
@@ -160,9 +175,10 @@
     ]
   },
   "32800": {
+    "sprite_file": "SuitAstralVoice",
     "name": "静听嘉音",
-    "desc2": "攻击力+10%。",
+    "desc1": "攻击力+10%。",
-    "desc4": "队伍中任意角色通过<color=#FFFFFF>[快速支援]</color>入场时，全队角色获得1层<color=#FFFFFF>[嘉音]</color>，最多叠加3层，持续15秒，重复触发时刷新持续时间，每拥有1层<color=#FFFFFF>[嘉音]</color>，通过<color=#FFFFFF>[快速支援]</color>入场的角色造成的伤害提升8%，同名被动效果之间不可叠加。",
+    "desc2": "队伍中任意角色通过<color=#FFFFFF>[快速支援]</color>入场时，全队角色获得1层<color=#FFFFFF>[嘉音]</color>，最多叠加3层，持续15秒，重复触发时刷新持续时间，每拥有1层<color=#FFFFFF>[嘉音]</color>，通过<color=#FFFFFF>[快速支援]</color>入场的角色造成的伤害提升8%，同名被动效果之间不可叠加。",
     "properties": [
       {
         "property_id": 12102,
@@ -171,15 +187,17 @@
     ]
   },
   "32900": {
+    "sprite_file": "SuitShadow",
     "name": "如影相随",
-    "desc2": "<color=#FFFFFF>[追加攻击]</color>和<color=#FFFFFF>[冲刺攻击]</color>造成的伤害提升15%。",
+    "desc1": "<color=#FFFFFF>[追加攻击]</color>和<color=#FFFFFF>[冲刺攻击]</color>造成的伤害提升15%。",
-    "desc4": "<color=#FFFFFF>[追加攻击]</color>或<color=#FFFFFF>[冲刺攻击]</color>命中敌人时，若造成的伤害与装备者的属性一致，则获得1层增益效果，同一招式内最多触发一次；每拥有1层增益效果，装备者的攻击力提升4%，暴击率提升4%，最多叠加3层，持续15秒，重复触发时刷新持续时间。",
+    "desc2": "<color=#FFFFFF>[追加攻击]</color>或<color=#FFFFFF>[冲刺攻击]</color>命中敌人时，若造成的伤害与装备者的属性一致，则获得1层增益效果，同一招式内最多触发一次；每拥有1层增益效果，装备者的攻击力提升4%，暴击率提升4%，最多叠加3层，持续15秒，重复触发时刷新持续时间。",
     "properties": []
   },
   "33000": {
+    "sprite_file": "SuitSavior",
     "name": "法厄同之歌",
-    "desc2": "异常掌控+8%。",
+    "desc1": "异常掌控+8%。",
-    "desc4": "队伍中任意角色发动<color=#FFFFFF>[强化特殊技]</color>时，装备者的异常精通提升45点，持续8秒；如果发动<color=#FFFFFF>[强化特殊技]</color>的角色不是装备者本人时，装备者造成的<color=#FE437E>以太伤害</color>提升25%。",
+    "desc2": "队伍中任意角色发动<color=#FFFFFF>[强化特殊技]</color>时，装备者的异常精通提升45点，持续8秒；如果发动<color=#FFFFFF>[强化特殊技]</color>的角色不是装备者本人时，装备者造成的<color=#FE437E>以太伤害</color>提升25%。",
     "properties": [
       {
         "property_id": 31402,
@@ -188,9 +206,10 @@
     ]
   },
   "33100": {
+    "sprite_file": "SuitYunkuiTales",
     "name": "云岿如我",
-    "desc2": "生命值+10%",
+    "desc1": "生命值+10%",
-    "desc4": "发动<color=#FFFFFF>[强化特殊技]</color>、<color=#FFFFFF>[连携技]</color>、<color=#FFFFFF>[终结技]</color>时，暴击率提升4%，最多叠加3层，持续15秒，重复触发时刷新持续时间，拥有3层效果时，造成的贯穿伤害提升10%。",
+    "desc2": "发动<color=#FFFFFF>[强化特殊技]</color>、<color=#FFFFFF>[连携技]</color>、<color=#FFFFFF>[终结技]</color>时，暴击率提升4%，最多叠加3层，持续15秒，重复触发时刷新持续时间，拥有3层效果时，造成的贯穿伤害提升10%。",
     "properties": [
       {
         "property_id": 11102,
@@ -199,21 +218,24 @@
     ]
   },
   "33200": {
+    "sprite_file": "SuitKingoftheSummit",
     "name": "山大王",
-    "desc2": "攻击造成的失衡值提升6%",
+    "desc1": "攻击造成的失衡值提升6%",
-    "desc4": "装备者为[击破]角色时，发动<color=#FFFFFF>[强化特殊技]</color>或<color=#FFFFFF>[连携技]</color>会使全队角色暴击伤害提升15%，装备者的暴击率大于等于50%时暴击伤害额外提升15%，持续15秒，重复触发时刷新持续时间，同名被动效果之间不可叠加。",
+    "desc2": "装备者为[击破]角色时，发动<color=#FFFFFF>[强化特殊技]</color>或<color=#FFFFFF>[连携技]</color>会使全队角色暴击伤害提升15%，装备者的暴击率大于等于50%时暴击伤害额外提升15%，持续15秒，重复触发时刷新持续时间，同名被动效果之间不可叠加。",
     "properties": []
   },
   "33300": {
+    "sprite_file": "SuitDawnsBloom",
     "name": "拂晓生花",
-    "desc2": "<color=#FFFFFF>[普通攻击]</color>造成的伤害提升15%。",
+    "desc1": "<color=#FFFFFF>[普通攻击]</color>造成的伤害提升15%。",
-    "desc4": "<color=#FFFFFF>[普通攻击]</color>造成的伤害提升20%，装备者为[强攻]角色时，发动<color=#FFFFFF>[强化特殊技]</color>或<color=#FFFFFF>[终结技]</color>会使<color=#FFFFFF>[普通攻击]</color>造成的伤害额外提升20%，持续25秒，重复触发时刷新持续时间。",
+    "desc2": "<color=#FFFFFF>[普通攻击]</color>造成的伤害提升20%，装备者为[强攻]角色时，发动<color=#FFFFFF>[强化特殊技]</color>或<color=#FFFFFF>[终结技]</color>会使<color=#FFFFFF>[普通攻击]</color>造成的伤害额外提升20%，持续25秒，重复触发时刷新持续时间。",
     "properties": []
   },
   "33400": {
+    "sprite_file": "SuitMoonlightLullaby",
     "name": "月光骑士颂",
-    "desc2": "能量自动回复+20%。",
+    "desc1": "能量自动回复+20%。",
-    "desc4": "装备者为[支援]角色时，发动<color=#FFFFFF>[强化特殊技]</color>或<color=#FFFFFF>[终结技]</color>会使全队角色造成的伤害提升18%，持续25秒，重复触发时刷新持续时间，同名被动效果之间不可叠加。",
+    "desc2": "装备者为[支援]角色时，发动<color=#FFFFFF>[强化特殊技]</color>或<color=#FFFFFF>[终结技]</color>会使全队角色造成的伤害提升18%，持续25秒，重复触发时刷新持续时间，同名被动效果之间不可叠加。",
     "properties": [
       {
         "property_id": 30502,

resources/panel/card.html

@@ -220,7 +220,7 @@
           {{each equip.properties prop}}
           <div class="properties">
             <div class="prop-icon {{prop.classname}}"></div>
-            {{if prop.score !== false}}
+            {{if prop.base_score !== false}}
             <div class="label yellow hit{{prop.base_score * 100 - (prop.base_score * 100 % 25)}}">
               {{else}}
                 <div class="label yellow">