diff --git a/apps/profile.js b/apps/profile.js
index d0d89f62..eb1e7fdd 100644
--- a/apps/profile.js
+++ b/apps/profile.js
@@ -14,7 +14,6 @@ let app = App.init({
 })
 
 app.reg({
-
   profileList: {
     name: '面板角色列表',
     desc: '查看当前已获取面板数据的角色列表',
diff --git a/apps/profile/ProfileDetail.js b/apps/profile/ProfileDetail.js
index b41ca07f..58fe06b5 100644
--- a/apps/profile/ProfileDetail.js
+++ b/apps/profile/ProfileDetail.js
@@ -40,9 +40,6 @@ let ProfileDetail = {
       msg = msg.replace(uidRet[0], '')
     }
 
-    if (/星铁/.test(msg)) {
-      e.isSr = true
-    }
     let name = msg.replace(/#|老婆|老公|星铁|原神/g, '').trim()
     msg = msg.replace('面版', '面板')
     let dmgRet = /(?:伤害|武器)(\d?)$/.exec(name)
@@ -75,6 +72,9 @@ let ProfileDetail = {
     if (!char) {
       return false
     }
+    if (/星铁/.test(msg) || char.isSr) {
+      e.isSr = true
+    }
 
     let uid = e.uid || await getTargetUid(e)
     if (!uid) {
@@ -147,8 +147,6 @@ let ProfileDetail = {
           if (a.phy > a.dmg) {
             key2 = 'phy'
           }
-        } else {
-          key2 = Format.elem(char.elem, '', 'sr')
         }
       }
       attr[key] = fn(a[key2])
@@ -161,7 +159,6 @@ let ProfileDetail = {
     let wCfg = {}
     if (mode === 'weapon') {
       wCfg = weapon.calcAttr(w.level, w.promote)
-      wCfg.info = weapon.getAffixInfo(weapon.affix)
       wCfg.weapons = await ProfileWeapon.calc(profile)
     }
 
diff --git a/components/common/Elem.js b/components/common/Elem.js
index 765d627a..54899272 100644
--- a/components/common/Elem.js
+++ b/components/common/Elem.js
@@ -74,8 +74,13 @@ const Elem = {
     })
   },
 
-  isElem (elem = '') {
-    return !!elemMap[elem]
+  isElem (elem = '', game = 'gs') {
+    return !!(game === 'gs' ? elemMap : elemMapSR)[elem]
+  },
+
+  sameElem (key1, key2, game = 'gs') {
+    let map = (game === 'gs' ? elemMap : elemMapSR)
+    return map[key1] === map[key2]
   }
 }
 export default Elem
diff --git a/models/Artifact.js b/models/Artifact.js
index 90a07dd3..3dc015dc 100644
--- a/models/Artifact.js
+++ b/models/Artifact.js
@@ -126,7 +126,6 @@ class Artifact extends Base {
     lodash.forEach(attrData, (ds) => {
       let _ds = ds
       if (lodash.isString(ds)) {
-        console.log('str subids', ds)
         let [id, count, step] = ds.split(',')
         ds = { id, count, step }
       }
diff --git a/models/ArtifactSet.js b/models/ArtifactSet.js
index 2ffc544b..cf0877fe 100644
--- a/models/ArtifactSet.js
+++ b/models/ArtifactSet.js
@@ -3,19 +3,27 @@
 * */
 import Base from './Base.js'
 import { abbr, artiMap, artiSetMap } from '../resources/meta/artifact/index.js'
+import { artiMap as artiMapSR, artiSetMap as artiSetMapSR } from '../resources/meta-sr/artifact/index.js'
+
 import { Artifact } from './index.js'
 
 class ArtifactSet extends Base {
-  constructor (name) {
+  constructor (name, game = 'gs') {
     super()
-    let cache = this._getCache(`arti-set:${name}`)
+    let cache = this._getCache(`arti-set:${game}:${name}`)
     if (cache) {
       return cache
     }
-    let data = artiSetMap[name]
+    let data = (game === 'gs' ? artiSetMap : artiSetMapSR)[name]
     if (!data) {
-      return false
+      if (artiSetMapSR[name]) {
+        data = artiSetMapSR[name]
+        game = 'sr'
+      } else {
+        return false
+      }
     }
+    this.game = game
     this.meta = data
     return this._cache()
   }
@@ -33,24 +41,22 @@ class ArtifactSet extends Base {
     if (artiMap[name]) {
       return ArtifactSet.get(artiMap[name].set)
     }
+    if (artiMapSR[name]) {
+      return ArtifactSet.get(artiMap[name].set, 'sr')
+    }
     return false
   }
 
   static get (name) {
     if (artiSetMap[name]) {
-      return new ArtifactSet(name)
+      return new ArtifactSet(name, 'gs')
+    }
+    if (artiSetMapSR[name]) {
+      return new ArtifactSet(name, 'sr')
     }
     return false
   }
 
-  getArtiName (idx = 1) {
-    return this.sets[idx]
-  }
-
-  getArti (idx = 1) {
-    return Artifact.get(this.getArtiName(idx))
-  }
-
   static getArtiNameBySet (set, idx = 1) {
     let artiSet = ArtifactSet.get(set)
     if (artiSet) {
@@ -58,6 +64,14 @@ class ArtifactSet extends Base {
     }
     return ''
   }
+
+  getArtiName (idx = 1) {
+    return this.sets[idx]
+  }
+
+  getArti (idx = 1) {
+    return Artifact.get(this.getArtiName(idx))
+  }
 }
 
 export default ArtifactSet
diff --git a/models/AvatarArtis.js b/models/AvatarArtis.js
index 73e89ded..4c02f6a0 100644
--- a/models/AvatarArtis.js
+++ b/models/AvatarArtis.js
@@ -34,9 +34,9 @@ export default class AvatarArtis extends Base {
     return ArtisMark.hasAttr(this.artis)
   }
 
-  static _eachArtisSet (sets, fn) {
+  static _eachArtisSet (sets, fn, game = 'gs') {
     lodash.forEach(sets || [], (v, k) => {
-      let artisSet = ArtifactSet.get(k)
+      let artisSet = ArtifactSet.get(k, game)
       if (artisSet) {
         if (v >= 4) {
           fn(artisSet, 2)
@@ -306,6 +306,6 @@ export default class AvatarArtis extends Base {
   }
 
   eachArtisSet (fn) {
-    AvatarArtis._eachArtisSet(this.sets, fn)
+    AvatarArtis._eachArtisSet(this.sets, fn, this.game)
   }
 }
diff --git a/models/ProfileAttr.js b/models/ProfileAttr.js
index 0effb7e5..9ef6c5f4 100644
--- a/models/ProfileAttr.js
+++ b/models/ProfileAttr.js
@@ -12,17 +12,18 @@ let attrReg = {
 }
 
 class ProfileAttr extends Base {
-  constructor (data = null, game = 'gs') {
+  constructor (char, data = null) {
     super()
-    this.game = game
+    this.char = char
+    this.game = char.game
     this.init(data, this.game)
   }
 
-  static create (data = null, game = 'gs') {
-    return new ProfileAttr(data, game)
+  static create (char, data = null) {
+    return new ProfileAttr(char, data)
   }
 
-  init (data, game = 'gs') {
+  init (data) {
     // 基础属性
     this._attr = {}
     this._base = {}
@@ -36,16 +37,7 @@ class ProfileAttr extends Base {
       }
       base[key] = 0
     })
-    if (game === 'sr') {
-      Format.eachElem((key) => {
-        attr[key] = {
-          base: 0,
-          plus: 0,
-          pct: 0
-        }
-        base[key] = 0
-      }, game)
-    }
+
     if (data) {
       this.setAttr(data, true)
     }
@@ -83,6 +75,13 @@ class ProfileAttr extends Base {
   addAttr (key, val, isBase = false) {
     let attr = this._attr
     let base = this._base
+
+    if (this.isSr && Format.isElem(key, this.game)) {
+      if (Format.sameElem(this.char.elem, key, this.game)) {
+        key = 'dmg'
+      }
+    }
+
     if (baseAttr[this.game].includes(key)) {
       attr[key].plus += val * 1
       if (isBase) {
@@ -121,7 +120,13 @@ class ProfileAttr extends Base {
       })
     }
     lodash.forEach(data, (val, key) => {
-      this.addAttr(key, val)
+      if (this.isSr && Format.isElem(key, this.game)) {
+        if (this.char.elem === Format.elem(key, '', this.game)) {
+          this.addAttr('dmg', val)
+        }
+      } else {
+        this.addAttr(key, val)
+      }
     })
   }
 
diff --git a/models/Weapon.js b/models/Weapon.js
index 5f254687..7240c1e3 100644
--- a/models/Weapon.js
+++ b/models/Weapon.js
@@ -1,7 +1,11 @@
 import Base from './Base.js'
 import { Data, Format } from '#miao'
-import { weaponData, weaponAbbr, weaponAlias, weaponType, weaponSet } from '../resources/meta/weapon/index.js'
-import { weaponData as weaponDataSR, weaponAlias as weaponAliasSR } from '../resources/meta-sr/weapon/index.js'
+import { weaponData, weaponAbbr, weaponAlias, weaponType, weaponSet, weaponBuffs } from '../resources/meta/weapon/index.js'
+import {
+  weaponData as weaponDataSR,
+  weaponAlias as weaponAliasSR,
+  weaponBuffs as weaponBuffsSR
+} from '../resources/meta-sr/weapon/index.js'
 
 import lodash from 'lodash'
 
@@ -168,24 +172,7 @@ class Weapon extends Base {
     }
   }
 
-  getAffixInfo (affix) {
-    let d = this.getDetail()
-    let ad = this.detail.affixData
-    let txt = ad.text
-    lodash.forEach(ad.datas, (ds, idx) => {
-      txt = txt.replace(`$[${idx}]`, ds[affix - 1])
-    })
-    return {
-      name: d.name,
-      star: d.star,
-      desc: d.desc,
-      imgs: this.imgs,
-      affix,
-      affixTitle: d.affixTitle,
-      affixDetail: txt
-    }
-  }
-
+  // 获取精炼描述
   getAffixDesc (affix = 1) {
     let skill = this.detail.skill
     let { name, desc, tables } = skill
@@ -194,7 +181,7 @@ class Weapon extends Base {
     while ((ret = reg.exec(desc)) !== null) {
       let idx = ret[1]
       let pct = ret[2]
-      let value = tables[idx - 1][affix - 1]
+      let value = tables?.[idx]?.[affix - 1]
       if (pct === '%') {
         value = Format.percent(value)
       }
@@ -205,6 +192,38 @@ class Weapon extends Base {
       desc
     }
   }
+
+  getWeaponBuffs (affix, isStatic = true) {
+    let { isSr, detail } = this
+    let wBuffs = (isSr ? weaponBuffsSR : weaponBuffs)
+    let buffs = wBuffs[this.id] || wBuffs[this.name]
+    if (!buffs) {
+      return false
+    }
+    let ret = []
+    if (lodash.isPlainObject(buffs)) {
+      buffs = [buffs]
+    }
+    lodash.forEach(buffs, (ds) => {
+      if (!!ds.isStatic !== !!isStatic) {
+        return true
+      }
+      if (isSr) {
+        if (!ds.idx || !ds.key) return true
+        let value = detail?.skill?.tables?.[ds.idx]
+        if (!value) return true
+
+        if (!value[affix - 1]) return true
+        let tmp = {}
+        tmp[ds.key] = value[affix - 1]
+        ret.push({
+          isStatic: true,
+          data: tmp
+        })
+      }
+    })
+    return ret
+  }
 }
 
 export default Weapon
diff --git a/models/player/MiaoData.js b/models/player/MiaoData.js
index bfac23c0..3733ec3a 100644
--- a/models/player/MiaoData.js
+++ b/models/player/MiaoData.js
@@ -7,7 +7,9 @@ let MiaoData = {
   setAvatar (player, ds) {
     let char = Character.get(ds.id)
     let avatar = player.getAvatar(ds.id, true)
-
+    if (!char) {
+      return false
+    }
     if (player.isSr) {
       avatar.setAvatar({
         ...ds,
diff --git a/models/profile/AttrCalc.js b/models/profile/AttrCalc.js
index 3d76764c..41645673 100644
--- a/models/profile/AttrCalc.js
+++ b/models/profile/AttrCalc.js
@@ -6,6 +6,7 @@
 import { Weapon, ProfileAttr } from '../index.js'
 import { Format } from '#miao'
 import { calc as artisBuffs } from '../../resources/meta/artifact/index.js'
+import { artisBuffs as artisBuffsSR } from '../../resources/meta-sr/artifact/index.js'
 import { weaponBuffs } from '../../resources/meta/weapon/index.js'
 import lodash from 'lodash'
 
@@ -57,7 +58,7 @@ class AttrCalc {
    * @returns {{}}
    */
   calc () {
-    this.attr = ProfileAttr.create({}, this.game)
+    this.attr = ProfileAttr.create(this.char, {})
     if (this.isGs) {
       this.addAttr('recharge', 100, true)
       this.addAttr('cpct', 5, true)
@@ -99,7 +100,11 @@ class AttrCalc {
       lodash.forEach(trees || [], (tid) => {
         let tCfg = tree[tid]
         if (tCfg) {
-          self.addAttr(tCfg.key, tCfg.value)
+          let key = tCfg.key
+          if (['atk', 'hp', 'def'].includes(key)) {
+            key = key + 'Pct'
+          }
+          self.addAttr(key, tCfg.value)
         }
       })
       return
@@ -159,15 +164,27 @@ class AttrCalc {
     let wCalcRet = weapon.calcAttr(wData.level, wData.promote)
     let self = this
 
+    let buffs = weapon.getWeaponBuffs(wData.affix, true)
     if (this.isSr) {
       // 星铁面板属性
       lodash.forEach(wCalcRet, (v, k) => {
         k = k + (['hp', 'atk', 'def'].includes(k) ? 'Base' : '')
         self.addAttr(k, v, true)
       })
+      // 检查武器类型
+      if (weapon.type === this.char.weapon) {
+        // todo sr&gs 统一
+        let wBuffs = weapon.getWeaponBuffs(wData.affix, true)
+        lodash.forEach(wBuffs, (buff) => {
+          lodash.forEach(buff.data || [], (v, k) => {
+            self.addAttr(k, v)
+          })
+        })
+      }
       return
     }
 
+    // 原神属性
     if (wCalcRet) {
       this.addAttr('atkBase', wCalcRet.atkBase)
       this.addAttr(wCalcRet.attr?.key, wCalcRet.attr?.value)
@@ -202,9 +219,10 @@ class AttrCalc {
         this.calcArtisAttr(ds, this.char)
       })
     })
+    let artiBuffsMap = this.isSr ? artisBuffsSR : artisBuffs
     // 计算圣遗物静态加成
     artis.eachArtisSet((set, num) => {
-      let buff = artisBuffs[set.name] && artisBuffs[set.name][num]
+      let buff = (artiBuffsMap[set.name] && artiBuffsMap[set.name][num]) || artiBuffsMap[set.name + num]
       if (!buff || !buff.isStatic) {
         return true
       }
diff --git a/resources/character/profile-detail.html b/resources/character/profile-detail.html
index e12e9dd2..c9a90647 100644
--- a/resources/character/profile-detail.html
+++ b/resources/character/profile-detail.html
@@ -113,7 +113,7 @@
     {{if game === 'sr'}}
     <div class="cont">
       <div class="cont-footer dmg-desc">
-        <strong>面板数据尚未完全计算全部Buff，面板不准确</strong>
+        <strong>伤害计算、圣遗物评分及词条数功能尚未完成...</strong>
       </div>
     </div>
 
diff --git a/resources/meta-sr/artifact/calc.js b/resources/meta-sr/artifact/calc.js
new file mode 100644
index 00000000..5a792edd
--- /dev/null
+++ b/resources/meta-sr/artifact/calc.js
@@ -0,0 +1,33 @@
+let attr = (key, val) => {
+  let data = {}
+  data[key] = val
+  return {
+    isStatic: true,
+    data
+  }
+}
+export default {
+  云无留迹的过客2: attr('heal', 10),
+  野穗伴行的快枪手2: attr('atkPct', 12),
+  野穗伴行的快枪手4: [attr('speed', 6), attr('aDmg', 10)],
+  净庭教宗的圣骑士2: attr('defPct', 15),
+  净庭教宗的圣骑士4: attr('shield', 20),
+  密林卧雪的猎人2: attr('ice', 10),
+  街头出身的拳王2: attr('phy', 10),
+  熔岩锻铸的火匠2: attr('fire', 10),
+  繁星璀璨的天才2: attr('quantum', 10),
+  激奏雷电的乐队2: attr('elec', 10),
+  晨昏交界的翔鹰2: attr('wind', 10),
+  流星追迹的怪盗2: attr('stance', 16),
+  流星追迹的怪盗4: attr('stance', 16),
+  盗匪荒漠的废土客2: attr('imaginary', 10),
+  太空封印站2: attr('atkPct', 12),
+  不老者的仙舟2: attr('hpPct', 12),
+  泛银河商业公司2: attr('effPct', 12),
+  筑城者的贝洛伯格2: attr('defPct', 12),
+  星体差分机2: attr('cdmg', 16),
+  停转的萨尔索图2: attr('cpct', 8),
+  盗贼公国塔利亚2: attr('stance', 16),
+  生命的翁瓦克2: attr('recharge', 5)
+
+}
diff --git a/resources/meta-sr/artifact/index.js b/resources/meta-sr/artifact/index.js
index 60876274..907f5bcd 100644
--- a/resources/meta-sr/artifact/index.js
+++ b/resources/meta-sr/artifact/index.js
@@ -1,12 +1,21 @@
 import { Data } from '#miao'
 import lodash from 'lodash'
+import artisBuffs from './calc.js'
 
 let data = Data.readJSON('/resources/meta-sr/artifact/data.json', 'miao')
 let meta = Data.readJSON('/resources/meta-sr/artifact/meta.json', 'miao')
 
 let artiMap = {}
 let idMap = {}
+let artiSetMap = {}
 lodash.forEach(data, (setData) => {
+  let artiSet = {
+    name: setData.name,
+    effect: setData.skill,
+    sets: {}
+  }
+  artiSetMap[setData.name] = artiSet
+
   lodash.forEach(setData.idxs, (ds, idx) => {
     artiMap[ds.name] = {
       ...ds,
@@ -18,7 +27,8 @@ lodash.forEach(data, (setData) => {
     lodash.forEach(ds.ids, (star, id) => {
       idMap[id] = artiMap[ds.name]
     })
+    artiSet.sets[idx] = ds.name
   })
 })
 export const metaData = meta
-export { artiMap, idMap }
\ No newline at end of file
+export { artiMap, idMap, artisBuffs, artiSetMap }
\ No newline at end of file
diff --git a/resources/meta-sr/weapon/index.js b/resources/meta-sr/weapon/index.js
index 24a011a3..47cebe2b 100644
--- a/resources/meta-sr/weapon/index.js
+++ b/resources/meta-sr/weapon/index.js
@@ -1,6 +1,9 @@
 import { Data } from '#miao'
 import lodash from 'lodash'
 
+const types = '存护,丰饶,毁灭,同谐,虚无,巡猎,智识'.split(',')
+
+
 let data = Data.readJSON('/resources/meta-sr/weapon/data.json', 'miao')
 let aliasMap = {}
 
@@ -10,4 +13,28 @@ lodash.forEach(data, (ds) => {
 })
 
 export const weaponAlias = aliasMap
-export const weaponData = data
\ No newline at end of file
+export const weaponData = data
+
+const weaponBuffs = {}
+
+let loadBuffs = async function () {
+  for (let type of types) {
+    let calc = await Data.importDefault(`/resources/meta-sr/weapon/${type}/calc.js`, 'miao')
+    if (lodash.isFunction(calc)) {
+      calc = calc((idx, key) => {
+        return {
+          isStatic: true,
+          idx,
+          key
+        }
+      })
+    }
+    lodash.forEach(calc, (ds, key) => {
+      let id = aliasMap[key]
+      weaponBuffs[id] = ds
+    })
+  }
+}
+await loadBuffs()
+
+export { weaponBuffs }
\ No newline at end of file
diff --git a/resources/meta-sr/weapon/丰饶/calc.js b/resources/meta-sr/weapon/丰饶/calc.js
new file mode 100644
index 00000000..168fe0ad
--- /dev/null
+++ b/resources/meta-sr/weapon/丰饶/calc.js
@@ -0,0 +1,13 @@
+export default function (staticIdx) {
+  return {
+    一场术后对话: [staticIdx(1, 'recharge')],
+    同一种心情: [staticIdx(1, 'heal')],
+    嘉果: [],
+    时节不居: [staticIdx(1, 'hpPct'), staticIdx(2, 'heal')],
+    暖夜不会漫长: [staticIdx(1, 'hpPct')],
+    此时恰好: [staticIdx(1, 'effDef')],
+    物穰: [],
+    等价交换: [],
+    蕃息: []
+  }
+}
\ No newline at end of file
diff --git a/resources/meta-sr/weapon/丰饶/一场术后对话/data.json b/resources/meta-sr/weapon/丰饶/一场术后对话/data.json
index a42d8d29..ad7cbac1 100644
--- a/resources/meta-sr/weapon/丰饶/一场术后对话/data.json
+++ b/resources/meta-sr/weapon/丰饶/一场术后对话/data.json
@@ -114,21 +114,21 @@
     "id": 21000,
     "name": "互相治愈",
     "desc": "使装备者的能量恢复效率提高<nobr>$1[i]%</nobr>，并在施放终结技时治疗量提高<nobr>$2[i]%</nobr>。",
-    "tables": [
-      [
-        0.08,
-        0.1,
-        0.12,
-        0.14,
-        0.16
+    "tables": {
+      "1": [
+        8,
+        10,
+        12,
+        14.000000000000002,
+        16
       ],
-      [
-        0.12,
-        0.15,
-        0.18,
-        0.21,
-        0.24
+      "2": [
+        12,
+        15,
+        18,
+        21,
+        24
       ]
-    ]
+    }
   }
 }
\ No newline at end of file
diff --git a/resources/meta-sr/weapon/丰饶/同一种心情/data.json b/resources/meta-sr/weapon/丰饶/同一种心情/data.json
index c5c4e046..44f9966c 100644
--- a/resources/meta-sr/weapon/丰饶/同一种心情/data.json
+++ b/resources/meta-sr/weapon/丰饶/同一种心情/data.json
@@ -114,21 +114,21 @@
     "id": 21007,
     "name": "救治与维修",
     "desc": "使装备者的治疗量提高<nobr>$1[i]%</nobr>，并在施放战技时为我方全体恢复<nobr>$2[i]</nobr>点能量。",
-    "tables": [
-      [
-        0.1,
-        0.125,
-        0.15,
-        0.175,
-        0.2
+    "tables": {
+      "1": [
+        10,
+        12.5,
+        15,
+        17.5,
+        20
       ],
-      [
+      "2": [
         2,
         2.5,
         3,
         3.5,
         4
       ]
-    ]
+    }
   }
 }
\ No newline at end of file
diff --git a/resources/meta-sr/weapon/丰饶/嘉果/data.json b/resources/meta-sr/weapon/丰饶/嘉果/data.json
index d1611409..81ffcc2e 100644
--- a/resources/meta-sr/weapon/丰饶/嘉果/data.json
+++ b/resources/meta-sr/weapon/丰饶/嘉果/data.json
@@ -114,14 +114,14 @@
     "id": 20008,
     "name": "甘美",
     "desc": "战斗开始时，立即为我方全体恢复<nobr>$1[i]</nobr>点能量。",
-    "tables": [
-      [
+    "tables": {
+      "1": [
         6,
         7.5,
         9,
         10.5,
         12
       ]
-    ]
+    }
   }
 }
\ No newline at end of file
diff --git a/resources/meta-sr/weapon/丰饶/时节不居/data.json b/resources/meta-sr/weapon/丰饶/时节不居/data.json
index 35108ac1..bc685d3b 100644
--- a/resources/meta-sr/weapon/丰饶/时节不居/data.json
+++ b/resources/meta-sr/weapon/丰饶/时节不居/data.json
@@ -114,28 +114,28 @@
     "id": 23013,
     "name": "日有四时",
     "desc": "使装备者生命上限提高<nobr>$1[i]%</nobr>，治疗量提高<nobr>$2[i]%</nobr>。当装备者对我方目标提供治疗时，记录治疗量。当任意我方目标施放攻击后，根据记录治疗量的<nobr>$3[i]%</nobr>，对随机1个受到攻击的敌方目标造成基于装备者属性的附加伤害。该伤害不受加成影响，每回合最多结算1次。",
-    "tables": [
-      [
-        0.18,
-        0.21,
-        0.24,
-        0.27,
-        0.3
+    "tables": {
+      "1": [
+        18,
+        21,
+        24,
+        27,
+        30
       ],
-      [
-        0.12,
-        0.14,
-        0.16,
-        0.18,
-        0.2
+      "2": [
+        12,
+        14.000000000000002,
+        16,
+        18,
+        20
       ],
-      [
-        0.36,
-        0.42,
-        0.48,
-        0.54,
-        0.6
+      "3": [
+        36,
+        42,
+        48,
+        54,
+        60
       ]
-    ]
+    }
   }
 }
\ No newline at end of file
diff --git a/resources/meta-sr/weapon/丰饶/暖夜不会漫长/data.json b/resources/meta-sr/weapon/丰饶/暖夜不会漫长/data.json
index 20980b9e..cc7d7b94 100644
--- a/resources/meta-sr/weapon/丰饶/暖夜不会漫长/data.json
+++ b/resources/meta-sr/weapon/丰饶/暖夜不会漫长/data.json
@@ -114,21 +114,21 @@
     "id": 21028,
     "name": "小小灯火",
     "desc": "使装备者的生命上限提高<nobr>$1[i]%</nobr>。施放普攻或战技后，为我方全体回复等同于各自生命上限<nobr>$2[f1]%</nobr>的生命值。",
-    "tables": [
-      [
-        0.16,
-        0.2,
-        0.24,
-        0.28,
-        0.32
+    "tables": {
+      "1": [
+        16,
+        20,
+        24,
+        28.000000000000004,
+        32
       ],
-      [
-        0.02,
-        0.025,
-        0.03,
-        0.035,
-        0.04
+      "2": [
+        2,
+        2.5,
+        3,
+        3.5000000000000004,
+        4
       ]
-    ]
+    }
   }
 }
\ No newline at end of file
diff --git a/resources/meta-sr/weapon/丰饶/此时恰好/data.json b/resources/meta-sr/weapon/丰饶/此时恰好/data.json
index 9f234480..3b82e89b 100644
--- a/resources/meta-sr/weapon/丰饶/此时恰好/data.json
+++ b/resources/meta-sr/weapon/丰饶/此时恰好/data.json
@@ -114,28 +114,28 @@
     "id": 21014,
     "name": "折射的视线",
     "desc": "使装备者的效果抵抗提高<nobr>$1[i]%</nobr>，并使装备者的治疗量提高，提高数值等同于效果抵抗的<nobr>$2[i]%</nobr>，最多使治疗量提高<nobr>$3[i]%</nobr>。",
-    "tables": [
-      [
-        0.16,
-        0.2,
-        0.24,
-        0.28,
-        0.32
+    "tables": {
+      "1": [
+        16,
+        20,
+        24,
+        28.000000000000004,
+        32
       ],
-      [
-        0.33,
-        0.36,
-        0.39,
-        0.42,
-        0.45
+      "2": [
+        33,
+        36,
+        39,
+        42,
+        45
       ],
-      [
-        0.15,
-        0.18,
-        0.21,
-        0.24,
-        0.27
+      "3": [
+        15,
+        18,
+        21,
+        24,
+        27
       ]
-    ]
+    }
   }
 }
\ No newline at end of file
diff --git a/resources/meta-sr/weapon/丰饶/物穰/data.json b/resources/meta-sr/weapon/丰饶/物穰/data.json
index 12596647..5357acea 100644
--- a/resources/meta-sr/weapon/丰饶/物穰/data.json
+++ b/resources/meta-sr/weapon/丰饶/物穰/data.json
@@ -114,14 +114,14 @@
     "id": 20001,
     "name": "繁盛",
     "desc": "装备者施放战技和终结技时，治疗量提高<nobr>$1[i]%</nobr>。",
-    "tables": [
-      [
-        0.12,
-        0.15,
-        0.18,
-        0.21,
-        0.24
+    "tables": {
+      "1": [
+        12,
+        15,
+        18,
+        21,
+        24
       ]
-    ]
+    }
   }
 }
\ No newline at end of file
diff --git a/resources/meta-sr/weapon/丰饶/等价交换/data.json b/resources/meta-sr/weapon/丰饶/等价交换/data.json
index 57f80fb6..c525baac 100644
--- a/resources/meta-sr/weapon/丰饶/等价交换/data.json
+++ b/resources/meta-sr/weapon/丰饶/等价交换/data.json
@@ -114,14 +114,14 @@
     "id": 21021,
     "name": "酣适",
     "desc": "当装备者的回合开始时，随机为1个当前能量百分比小于<nobr>50.0%</nobr>的我方其他目标恢复<nobr>$1[i]</nobr>点能量。",
-    "tables": [
-      [
+    "tables": {
+      "1": [
         8,
         10,
         12,
         14,
         16
       ]
-    ]
+    }
   }
 }
\ No newline at end of file
diff --git a/resources/meta-sr/weapon/丰饶/蕃息/data.json b/resources/meta-sr/weapon/丰饶/蕃息/data.json
index cf063568..cd5e1fdd 100644
--- a/resources/meta-sr/weapon/丰饶/蕃息/data.json
+++ b/resources/meta-sr/weapon/丰饶/蕃息/data.json
@@ -114,14 +114,14 @@
     "id": 20015,
     "name": "丰饶民",
     "desc": "当装备者施放普攻后，使下一次行动提前<nobr>$1[i]%</nobr>。",
-    "tables": [
-      [
-        0.12,
-        0.14,
-        0.16,
-        0.18,
-        0.2
+    "tables": {
+      "1": [
+        12,
+        14.000000000000002,
+        16,
+        18,
+        20
       ]
-    ]
+    }
   }
 }
\ No newline at end of file
diff --git a/resources/meta-sr/weapon/同谐/calc.js b/resources/meta-sr/weapon/同谐/calc.js
new file mode 100644
index 00000000..367c6edb
--- /dev/null
+++ b/resources/meta-sr/weapon/同谐/calc.js
@@ -0,0 +1,13 @@
+export default function (staticIdx) {
+  return {
+    与行星相会: [],
+    但战斗还未结束: [staticIdx(1, 'recharge')],
+    '舞！舞！舞！': [],
+    记忆中的模样: [staticIdx(1, 'stance')],
+    调和: [],
+    轮契: [],
+    过往未来: [],
+    镂月裁云之意: [],
+    齐颂: []
+  }
+}
\ No newline at end of file
diff --git a/resources/meta-sr/weapon/同谐/与行星相会/data.json b/resources/meta-sr/weapon/同谐/与行星相会/data.json
index 5d868f5f..2bf6492b 100644
--- a/resources/meta-sr/weapon/同谐/与行星相会/data.json
+++ b/resources/meta-sr/weapon/同谐/与行星相会/data.json
@@ -114,14 +114,14 @@
     "id": 21011,
     "name": "启程",
     "desc": "进入战斗后，当我方目标造成与装备者相同属性的伤害时，造成的伤害提高<nobr>$1[i]%</nobr>。",
-    "tables": [
-      [
-        0.12,
-        0.15,
-        0.18,
-        0.21,
-        0.24
+    "tables": {
+      "1": [
+        12,
+        15,
+        18,
+        21,
+        24
       ]
-    ]
+    }
   }
 }
\ No newline at end of file
diff --git a/resources/meta-sr/weapon/同谐/但战斗还未结束/data.json b/resources/meta-sr/weapon/同谐/但战斗还未结束/data.json
index d2a557c8..07da8bf4 100644
--- a/resources/meta-sr/weapon/同谐/但战斗还未结束/data.json
+++ b/resources/meta-sr/weapon/同谐/但战斗还未结束/data.json
@@ -114,21 +114,21 @@
     "id": 23003,
     "name": "继承人",
     "desc": "使装备者的能量恢复效率提高<nobr>$1[i]%</nobr>，并在对我方目标施放终结技时恢复1个战技点。该效果每施放2次终结技可触发1次。当装备者施放战技后，使下一个行动的我方其他目标造成的伤害提高<nobr>$2[i]%</nobr>，持续<nobr>1</nobr>回合。",
-    "tables": [
-      [
-        0.1,
-        0.12,
-        0.14,
-        0.16,
-        0.18
+    "tables": {
+      "1": [
+        10,
+        12,
+        14.000000000000002,
+        16,
+        18
       ],
-      [
-        0.3,
-        0.35,
-        0.4,
-        0.45,
-        0.5
+      "2": [
+        30,
+        35,
+        40,
+        45,
+        50
       ]
-    ]
+    }
   }
 }
\ No newline at end of file
diff --git a/resources/meta-sr/weapon/同谐/舞！舞！舞！/data.json b/resources/meta-sr/weapon/同谐/舞！舞！舞！/data.json
index 424cf15e..07726eb0 100644
--- a/resources/meta-sr/weapon/同谐/舞！舞！舞！/data.json
+++ b/resources/meta-sr/weapon/同谐/舞！舞！舞！/data.json
@@ -114,14 +114,14 @@
     "id": 21018,
     "name": "停不下来啦！",
     "desc": "当装备者施放终结技后，我方全体行动提前<nobr>$1[i]%</nobr>。",
-    "tables": [
-      [
-        0.16,
-        0.18,
-        0.2,
-        0.22,
-        0.24
+    "tables": {
+      "1": [
+        16,
+        18,
+        20,
+        22,
+        24
       ]
-    ]
+    }
   }
 }
\ No newline at end of file
diff --git a/resources/meta-sr/weapon/同谐/记忆中的模样/data.json b/resources/meta-sr/weapon/同谐/记忆中的模样/data.json
index e03df2b7..a10691f0 100644
--- a/resources/meta-sr/weapon/同谐/记忆中的模样/data.json
+++ b/resources/meta-sr/weapon/同谐/记忆中的模样/data.json
@@ -114,21 +114,21 @@
     "id": 21004,
     "name": "老相片",
     "desc": "使装备者的击破特攻提高<nobr>$1[i]%</nobr>。装备者施放攻击后，额外恢复<nobr>$2[i]</nobr>点能量，该效果单个回合内不可重复触发。",
-    "tables": [
-      [
-        0.28,
-        0.35,
-        0.42,
-        0.49,
-        0.56
+    "tables": {
+      "1": [
+        28.000000000000004,
+        35,
+        42,
+        49,
+        56.00000000000001
       ],
-      [
+      "2": [
         4,
         5,
         6,
         7,
         8
       ]
-    ]
+    }
   }
 }
\ No newline at end of file
diff --git a/resources/meta-sr/weapon/同谐/调和/data.json b/resources/meta-sr/weapon/同谐/调和/data.json
index a912f675..5d09cc5c 100644
--- a/resources/meta-sr/weapon/同谐/调和/data.json
+++ b/resources/meta-sr/weapon/同谐/调和/data.json
@@ -114,14 +114,14 @@
     "id": 20019,
     "name": "家族",
     "desc": "进入战斗时，我方全体速度提高<nobr>$1[i]</nobr>，持续<nobr>1</nobr>回合。",
-    "tables": [
-      [
+    "tables": {
+      "1": [
         12,
         14,
         16,
         18,
         20
       ]
-    ]
+    }
   }
 }
\ No newline at end of file
diff --git a/resources/meta-sr/weapon/同谐/轮契/data.json b/resources/meta-sr/weapon/同谐/轮契/data.json
index e90a57f9..781d4f5a 100644
--- a/resources/meta-sr/weapon/同谐/轮契/data.json
+++ b/resources/meta-sr/weapon/同谐/轮契/data.json
@@ -114,14 +114,14 @@
     "id": 20012,
     "name": "速决",
     "desc": "使装备者施放攻击或受到攻击后，额外恢复<nobr>$1[i]</nobr>点能量，该效果单个回合内不可重复触发。",
-    "tables": [
-      [
+    "tables": {
+      "1": [
         4,
         5,
         6,
         7,
         8
       ]
-    ]
+    }
   }
 }
\ No newline at end of file
diff --git a/resources/meta-sr/weapon/同谐/过往未来/data.json b/resources/meta-sr/weapon/同谐/过往未来/data.json
index 7bd40835..c7ac81a2 100644
--- a/resources/meta-sr/weapon/同谐/过往未来/data.json
+++ b/resources/meta-sr/weapon/同谐/过往未来/data.json
@@ -114,14 +114,14 @@
     "id": 21025,
     "name": "旧日纸鸢",
     "desc": "当装备者施放战技后，使下一个行动的我方其他目标造成的伤害提高<nobr>$1[i]%</nobr>，持续<nobr>1</nobr>回合。",
-    "tables": [
-      [
-        0.16,
-        0.2,
-        0.24,
-        0.28,
-        0.32
+    "tables": {
+      "1": [
+        16,
+        20,
+        24,
+        28.000000000000004,
+        32
       ]
-    ]
+    }
   }
 }
\ No newline at end of file
diff --git a/resources/meta-sr/weapon/同谐/镂月裁云之意/data.json b/resources/meta-sr/weapon/同谐/镂月裁云之意/data.json
index a88c0fb0..72188939 100644
--- a/resources/meta-sr/weapon/同谐/镂月裁云之意/data.json
+++ b/resources/meta-sr/weapon/同谐/镂月裁云之意/data.json
@@ -114,28 +114,28 @@
     "id": 21032,
     "name": "秘密",
     "desc": "在战斗开始时以及当装备者回合开始时，随机生效1个效果。该效果生效时，替换上次的效果且本次不会与上次重复。效果包含：使我方全体攻击力提高<nobr>$1[i]%</nobr>；使我方全体暴击伤害提高<nobr>$2[i]%</nobr>；使我方全体能量恢复效率提高<nobr>$3[i]%</nobr>。同类效果无法叠加，在装备者陷入无法战斗状态时解除。",
-    "tables": [
-      [
-        0.1,
-        0.125,
-        0.15,
-        0.175,
-        0.2
+    "tables": {
+      "1": [
+        10,
+        12.5,
+        15,
+        17.5,
+        20
       ],
-      [
-        0.12,
-        0.15,
-        0.18,
-        0.21,
-        0.24
+      "2": [
+        12,
+        15,
+        18,
+        21,
+        24
       ],
-      [
-        0.06,
-        0.075,
-        0.09,
-        0.105,
-        0.12
+      "3": [
+        6,
+        7.5,
+        9,
+        10.5,
+        12
       ]
-    ]
+    }
   }
 }
\ No newline at end of file
diff --git a/resources/meta-sr/weapon/同谐/齐颂/data.json b/resources/meta-sr/weapon/同谐/齐颂/data.json
index 85ab649f..39b9dbc4 100644
--- a/resources/meta-sr/weapon/同谐/齐颂/data.json
+++ b/resources/meta-sr/weapon/同谐/齐颂/data.json
@@ -114,14 +114,14 @@
     "id": 20005,
     "name": "协力",
     "desc": "进入战斗后，使我方全体的攻击力提高<nobr>$1[i]%</nobr>。同类技能无法重复生效。",
-    "tables": [
-      [
-        0.08,
-        0.09,
-        0.1,
-        0.11,
-        0.12
+    "tables": {
+      "1": [
+        8,
+        9,
+        10,
+        11,
+        12
       ]
-    ]
+    }
   }
 }
\ No newline at end of file
diff --git a/resources/meta-sr/weapon/存护/calc.js b/resources/meta-sr/weapon/存护/calc.js
new file mode 100644
index 00000000..dd8bc50f
--- /dev/null
+++ b/resources/meta-sr/weapon/存护/calc.js
@@ -0,0 +1,14 @@
+export default function (staticIdx) {
+  return {
+    余生的第一天: [staticIdx(1, 'defPct')],
+    制胜的瞬间: [staticIdx(1, 'defPct'), staticIdx(1, 'effPct')],
+    宇宙市场趋势: [staticIdx(1, 'defPct')],
+    开疆: [staticIdx(1, 'stance')],
+    戍御: [],
+    我们是地火: [],
+    朗道的选择: [],
+    琥珀: [staticIdx(1, 'defPct')],
+    记忆的质料: [staticIdx(1, 'effDef')],
+    '这就是我啦！': [staticIdx(1, 'defPct')]
+  }
+}
\ No newline at end of file
diff --git a/resources/meta-sr/weapon/存护/余生的第一天/data.json b/resources/meta-sr/weapon/存护/余生的第一天/data.json
index bf28d38f..2cfbbf71 100644
--- a/resources/meta-sr/weapon/存护/余生的第一天/data.json
+++ b/resources/meta-sr/weapon/存护/余生的第一天/data.json
@@ -114,21 +114,21 @@
     "id": 21002,
     "name": "此刻定格",
     "desc": "使装备者的防御力提高<nobr>$1[i]%</nobr>。进入战斗后，使我方全体的伤害抗性提高<nobr>$2[i]%</nobr>。同类技能无法重复生效。",
-    "tables": [
-      [
-        0.16,
-        0.18,
-        0.2,
-        0.22,
-        0.24
+    "tables": {
+      "1": [
+        16,
+        18,
+        20,
+        22,
+        24
       ],
-      [
-        0.08,
-        0.09,
-        0.1,
-        0.11,
-        0.12
+      "2": [
+        8,
+        9,
+        10,
+        11,
+        12
       ]
-    ]
+    }
   }
 }
\ No newline at end of file
diff --git a/resources/meta-sr/weapon/存护/制胜的瞬间/data.json b/resources/meta-sr/weapon/存护/制胜的瞬间/data.json
index fe740d31..69137561 100644
--- a/resources/meta-sr/weapon/存护/制胜的瞬间/data.json
+++ b/resources/meta-sr/weapon/存护/制胜的瞬间/data.json
@@ -114,28 +114,28 @@
     "id": 23005,
     "name": "决断",
     "desc": "使装备者的防御力提高<nobr>$1[i]%</nobr>，效果命中提高<nobr>$2[i]%</nobr>，同时使自身受到攻击的概率提高。当装备者受到攻击后，防御力额外提高<nobr>$3[i]%</nobr>，持续到自身回合结束。",
-    "tables": [
-      [
-        0.24,
-        0.28,
-        0.32,
-        0.36,
-        0.4
+    "tables": {
+      "1": [
+        24,
+        28.000000000000004,
+        32,
+        36,
+        40
       ],
-      [
-        0.24,
-        0.28,
-        0.32,
-        0.36,
-        0.4
+      "2": [
+        24,
+        28.000000000000004,
+        32,
+        36,
+        40
       ],
-      [
-        0.24,
-        0.28,
-        0.32,
-        0.36,
-        0.4
+      "3": [
+        24,
+        28.000000000000004,
+        32,
+        36,
+        40
       ]
-    ]
+    }
   }
 }
\ No newline at end of file
diff --git a/resources/meta-sr/weapon/存护/宇宙市场趋势/data.json b/resources/meta-sr/weapon/存护/宇宙市场趋势/data.json
index 996f28d1..0decdf65 100644
--- a/resources/meta-sr/weapon/存护/宇宙市场趋势/data.json
+++ b/resources/meta-sr/weapon/存护/宇宙市场趋势/data.json
@@ -114,28 +114,28 @@
     "id": 21016,
     "name": "新一轮洗牌",
     "desc": "使装备者的防御力提高<nobr>$1[i]%</nobr>。当装备者受到攻击后，有<nobr>$2[i]%</nobr>的基础概率使敌方目标陷入灼烧状态，每回合造成等同于装备者<nobr>$3[i]%</nobr>防御力的持续伤害，持续<nobr>2</nobr>回合。",
-    "tables": [
-      [
-        0.16,
-        0.2,
-        0.24,
-        0.28,
-        0.32
+    "tables": {
+      "1": [
+        16,
+        20,
+        24,
+        28.000000000000004,
+        32
       ],
-      [
-        1,
-        1.05,
-        1.1,
-        1.15,
-        1.2
+      "2": [
+        100,
+        105,
+        110.00000000000001,
+        114.99999999999999,
+        120
       ],
-      [
-        0.4,
-        0.5,
-        0.6,
-        0.7,
-        0.8
+      "3": [
+        40,
+        50,
+        60,
+        70,
+        80
       ]
-    ]
+    }
   }
 }
\ No newline at end of file
diff --git a/resources/meta-sr/weapon/存护/开疆/data.json b/resources/meta-sr/weapon/存护/开疆/data.json
index 90392053..8e652e62 100644
--- a/resources/meta-sr/weapon/存护/开疆/data.json
+++ b/resources/meta-sr/weapon/存护/开疆/data.json
@@ -114,14 +114,14 @@
     "id": 20017,
     "name": "公司",
     "desc": "当装备者击破敌方目标的弱点时，回复等同于自身生命上限<nobr>$1[i]%</nobr>的生命值。",
-    "tables": [
-      [
-        0.12,
-        0.14,
-        0.16,
-        0.18,
-        0.2
+    "tables": {
+      "1": [
+        12,
+        14.000000000000002,
+        16,
+        18,
+        20
       ]
-    ]
+    }
   }
 }
\ No newline at end of file
diff --git a/resources/meta-sr/weapon/存护/戍御/data.json b/resources/meta-sr/weapon/存护/戍御/data.json
index d8721fbb..91601394 100644
--- a/resources/meta-sr/weapon/存护/戍御/data.json
+++ b/resources/meta-sr/weapon/存护/戍御/data.json
@@ -114,14 +114,14 @@
     "id": 20010,
     "name": "兴复",
     "desc": "使装备者施放终结技时，回复等同于自身生命上限<nobr>$1[i]%</nobr>的生命值。",
-    "tables": [
-      [
-        0.18,
-        0.21,
-        0.24,
-        0.27,
-        0.3
+    "tables": {
+      "1": [
+        18,
+        21,
+        24,
+        27,
+        30
       ]
-    ]
+    }
   }
 }
\ No newline at end of file
diff --git a/resources/meta-sr/weapon/存护/我们是地火/data.json b/resources/meta-sr/weapon/存护/我们是地火/data.json
index 655f9343..8780c608 100644
--- a/resources/meta-sr/weapon/存护/我们是地火/data.json
+++ b/resources/meta-sr/weapon/存护/我们是地火/data.json
@@ -114,21 +114,21 @@
     "id": 21023,
     "name": "泪中人",
     "desc": "战斗开始时，使我方全体受到的伤害降低<nobr>$1[i]%</nobr>，持续<nobr>5</nobr>回合。同时立即为我方全体回复等同于各自已损失生命值<nobr>$2[i]%</nobr>的生命值。",
-    "tables": [
-      [
-        0.08,
-        0.1,
-        0.12,
-        0.14,
-        0.16
+    "tables": {
+      "1": [
+        8,
+        10,
+        12,
+        14.000000000000002,
+        16
       ],
-      [
-        0.3,
-        0.35,
-        0.4,
-        0.45,
-        0.5
+      "2": [
+        30,
+        35,
+        40,
+        45,
+        50
       ]
-    ]
+    }
   }
 }
\ No newline at end of file
diff --git a/resources/meta-sr/weapon/存护/朗道的选择/data.json b/resources/meta-sr/weapon/存护/朗道的选择/data.json
index 019e3f51..1d219375 100644
--- a/resources/meta-sr/weapon/存护/朗道的选择/data.json
+++ b/resources/meta-sr/weapon/存护/朗道的选择/data.json
@@ -114,14 +114,14 @@
     "id": 21009,
     "name": "时光如梭",
     "desc": "使装备者受到攻击的概率提高，同时受到的伤害降低<nobr>$1[i]%</nobr>。",
-    "tables": [
-      [
-        0.16,
-        0.18,
-        0.2,
-        0.22,
-        0.24
+    "tables": {
+      "1": [
+        16,
+        18,
+        20,
+        22,
+        24
       ]
-    ]
+    }
   }
 }
\ No newline at end of file
diff --git a/resources/meta-sr/weapon/存护/琥珀/data.json b/resources/meta-sr/weapon/存护/琥珀/data.json
index 865cf3ef..5d16bc30 100644
--- a/resources/meta-sr/weapon/存护/琥珀/data.json
+++ b/resources/meta-sr/weapon/存护/琥珀/data.json
@@ -114,21 +114,21 @@
     "id": 20003,
     "name": "静滞",
     "desc": "使装备者的防御力提高<nobr>$1[i]%</nobr>。当装备者当前生命值百分比小于<nobr>50.0%</nobr>时，其防御力额外提高<nobr>$2[i]%</nobr>。",
-    "tables": [
-      [
-        0.16,
-        0.2,
-        0.24,
-        0.28,
-        0.32
+    "tables": {
+      "1": [
+        16,
+        20,
+        24,
+        28.000000000000004,
+        32
       ],
-      [
-        0.16,
-        0.2,
-        0.24,
-        0.28,
-        0.32
+      "2": [
+        16,
+        20,
+        24,
+        28.000000000000004,
+        32
       ]
-    ]
+    }
   }
 }
\ No newline at end of file
diff --git a/resources/meta-sr/weapon/存护/记忆的质料/data.json b/resources/meta-sr/weapon/存护/记忆的质料/data.json
index 988b41c4..42d07de1 100644
--- a/resources/meta-sr/weapon/存护/记忆的质料/data.json
+++ b/resources/meta-sr/weapon/存护/记忆的质料/data.json
@@ -114,28 +114,28 @@
     "id": 24002,
     "name": "珍存",
     "desc": "使装备者的效果抵抗提高<nobr>$1[i]%</nobr>，当装备者受到攻击后，如果自身未持有护盾，则获得1个等同于装备者<nobr>$2[i]%</nobr>生命上限的护盾，持续<nobr>2</nobr>回合。该效果每<nobr>3</nobr>回合只能触发1次。如果装备者持有护盾，则使自身受到的伤害降低<nobr>$3[i]%</nobr>。",
-    "tables": [
-      [
-        0.08,
-        0.1,
-        0.12,
-        0.14,
-        0.16
+    "tables": {
+      "1": [
+        8,
+        10,
+        12,
+        14.000000000000002,
+        16
       ],
-      [
-        0.16,
-        0.2,
-        0.24,
-        0.28,
-        0.32
+      "2": [
+        16,
+        20,
+        24,
+        28.000000000000004,
+        32
       ],
-      [
-        0.12,
-        0.15,
-        0.18,
-        0.21,
-        0.24
+      "3": [
+        12,
+        15,
+        18,
+        21,
+        24
       ]
-    ]
+    }
   }
 }
\ No newline at end of file
diff --git a/resources/meta-sr/weapon/存护/这就是我啦！/data.json b/resources/meta-sr/weapon/存护/这就是我啦！/data.json
index 1a4c1a42..1c45cd3d 100644
--- a/resources/meta-sr/weapon/存护/这就是我啦！/data.json
+++ b/resources/meta-sr/weapon/存护/这就是我啦！/data.json
@@ -114,21 +114,21 @@
     "id": 21030,
     "name": "新篇章",
     "desc": "使装备者防御力提高<nobr>$1[i]%</nobr>。使装备者施放终结技时造成的伤害值提高，提高数值等同于装备者防御力的<nobr>$2[i]%</nobr>，该效果对每个敌方目标仅生效1次。",
-    "tables": [
-      [
-        0.16,
-        0.2,
-        0.24,
-        0.28,
-        0.32
+    "tables": {
+      "1": [
+        16,
+        20,
+        24,
+        28.000000000000004,
+        32
       ],
-      [
-        0.6,
-        0.75,
-        0.9,
-        1.05,
-        1.2
+      "2": [
+        60,
+        75,
+        90,
+        105,
+        120
       ]
-    ]
+    }
   }
 }
\ No newline at end of file
diff --git a/resources/meta-sr/weapon/巡猎/calc.js b/resources/meta-sr/weapon/巡猎/calc.js
new file mode 100644
index 00000000..005ec673
--- /dev/null
+++ b/resources/meta-sr/weapon/巡猎/calc.js
@@ -0,0 +1,27 @@
+export default function (staticIdx) {
+  return {
+    于夜色中: [staticIdx(1, 'cpct'), ({ attr, tables }) => {
+      let buffCount = Math.min(6, Math.floor((attr.speed - 100) / 10))
+      let dmg = tables[2] * buffCount
+      let cdmg = tables[3] * buffCount
+      return {
+        title: `${buffCount}层Buff提高普攻与战技伤害[aDmg]%，终结技的暴击伤害[qCdmg]%`,
+        data: {
+          aDmg: dmg,
+          eDmg: dmg,
+          qCdmg: cdmg
+        }
+      }
+    }],
+    唯有沉默: [staticIdx(1, 'atkPct')],
+    如泥酣眠: [staticIdx(1, 'cdmg')],
+    星海巡航: [staticIdx(1, 'cpct')],
+    春水初生: [],
+    '点个关注吧！': [],
+    相抗: [],
+    离弦: [],
+    论剑: [],
+    重返幽冥: [staticIdx(1, 'cpct')],
+    锋镝: []
+  }
+}
\ No newline at end of file
diff --git a/resources/meta-sr/weapon/巡猎/于夜色中/data.json b/resources/meta-sr/weapon/巡猎/于夜色中/data.json
index 33e690c4..1ff3a63a 100644
--- a/resources/meta-sr/weapon/巡猎/于夜色中/data.json
+++ b/resources/meta-sr/weapon/巡猎/于夜色中/data.json
@@ -114,28 +114,28 @@
     "id": 23001,
     "name": "花与蝶",
     "desc": "使装备者的暴击率提高<nobr>$1[i]%</nobr>。当装备者在战斗中速度大于<nobr>100</nobr>时，每超过<nobr>10</nobr>点，普攻和战技造成的伤害提高<nobr>$2[i]%</nobr>，同时终结技的暴击伤害提高<nobr>$3[i]%</nobr>，该效果可叠加<nobr>6</nobr>层。",
-    "tables": [
-      [
-        0.18,
-        0.21,
-        0.24,
-        0.27,
-        0.3
+    "tables": {
+      "1": [
+        18,
+        21,
+        24,
+        27,
+        30
       ],
-      [
-        0.06,
-        0.07,
-        0.08,
-        0.09,
-        0.1
+      "2": [
+        6,
+        7.000000000000001,
+        8,
+        9,
+        10
       ],
-      [
-        0.12,
-        0.14,
-        0.16,
-        0.18,
-        0.2
+      "3": [
+        12,
+        14.000000000000002,
+        16,
+        18,
+        20
       ]
-    ]
+    }
   }
 }
\ No newline at end of file
diff --git a/resources/meta-sr/weapon/巡猎/唯有沉默/data.json b/resources/meta-sr/weapon/巡猎/唯有沉默/data.json
index a5aa3f9e..c1d74116 100644
--- a/resources/meta-sr/weapon/巡猎/唯有沉默/data.json
+++ b/resources/meta-sr/weapon/巡猎/唯有沉默/data.json
@@ -114,21 +114,21 @@
     "id": 21003,
     "name": "记录",
     "desc": "使装备者的攻击力提高<nobr>$1[i]%</nobr>。当场上的敌方目标数量小于等于2时，装备者的暴击率提高<nobr>$2[i]%</nobr>。",
-    "tables": [
-      [
-        0.16,
-        0.2,
-        0.24,
-        0.28,
-        0.32
+    "tables": {
+      "1": [
+        16,
+        20,
+        24,
+        28.000000000000004,
+        32
       ],
-      [
-        0.12,
-        0.15,
-        0.18,
-        0.21,
-        0.24
+      "2": [
+        12,
+        15,
+        18,
+        21,
+        24
       ]
-    ]
+    }
   }
 }
\ No newline at end of file
diff --git a/resources/meta-sr/weapon/巡猎/如泥酣眠/data.json b/resources/meta-sr/weapon/巡猎/如泥酣眠/data.json
index a81f2275..11e8c217 100644
--- a/resources/meta-sr/weapon/巡猎/如泥酣眠/data.json
+++ b/resources/meta-sr/weapon/巡猎/如泥酣眠/data.json
@@ -114,21 +114,21 @@
     "id": 23012,
     "name": "美梦",
     "desc": "使装备者的暴击伤害提高<nobr>$1[i]%</nobr>。当装备者的普攻或战技伤害未造成暴击时，使自身暴击率提高<nobr>$2[i]%</nobr>，持续<nobr>1</nobr>回合。该效果每<nobr>3</nobr>回合可以触发1次。",
-    "tables": [
-      [
-        0.3,
-        0.35,
-        0.4,
-        0.45,
-        0.5
+    "tables": {
+      "1": [
+        30,
+        35,
+        40,
+        45,
+        50
       ],
-      [
-        0.36,
-        0.42,
-        0.48,
-        0.54,
-        0.6
+      "2": [
+        36,
+        42,
+        48,
+        54,
+        60
       ]
-    ]
+    }
   }
 }
\ No newline at end of file
diff --git a/resources/meta-sr/weapon/巡猎/星海巡航/data.json b/resources/meta-sr/weapon/巡猎/星海巡航/data.json
index 9bf9ad3d..f630c861 100644
--- a/resources/meta-sr/weapon/巡猎/星海巡航/data.json
+++ b/resources/meta-sr/weapon/巡猎/星海巡航/data.json
@@ -114,28 +114,28 @@
     "id": 24001,
     "name": "猎逐",
     "desc": "使装备者的暴击率提高<nobr>$1[i]%</nobr>，装备者对生命值百分比小于等于<nobr>50.0%</nobr>的敌方目标暴击率额外提高<nobr>$2[i]%</nobr>。当装备者消灭敌方目标后，攻击力提高<nobr>$3[i]%</nobr>，持续<nobr>2</nobr>回合。",
-    "tables": [
-      [
-        0.08,
-        0.1,
-        0.12,
-        0.14,
-        0.16
+    "tables": {
+      "1": [
+        8,
+        10,
+        12,
+        14.000000000000002,
+        16
       ],
-      [
-        0.08,
-        0.1,
-        0.12,
-        0.14,
-        0.16
+      "2": [
+        8,
+        10,
+        12,
+        14.000000000000002,
+        16
       ],
-      [
-        0.2,
-        0.25,
-        0.3,
-        0.35,
-        0.4
+      "3": [
+        20,
+        25,
+        30,
+        35,
+        40
       ]
-    ]
+    }
   }
 }
\ No newline at end of file
diff --git a/resources/meta-sr/weapon/巡猎/春水初生/data.json b/resources/meta-sr/weapon/巡猎/春水初生/data.json
index 3300f0a7..f2dec86b 100644
--- a/resources/meta-sr/weapon/巡猎/春水初生/data.json
+++ b/resources/meta-sr/weapon/巡猎/春水初生/data.json
@@ -114,21 +114,21 @@
     "id": 21024,
     "name": "驱散余寒",
     "desc": "进入战斗后，使装备者速度提高<nobr>$1[i]%</nobr>，造成的伤害提高<nobr>$2[i]%</nobr>。当装备者受到伤害后该效果失效，下个回合结束时该效果恢复。",
-    "tables": [
-      [
-        0.08,
-        0.09,
-        0.1,
-        0.11,
-        0.12
+    "tables": {
+      "1": [
+        8,
+        9,
+        10,
+        11,
+        12
       ],
-      [
-        0.12,
-        0.15,
-        0.18,
-        0.21,
-        0.24
+      "2": [
+        12,
+        15,
+        18,
+        21,
+        24
       ]
-    ]
+    }
   }
 }
\ No newline at end of file
diff --git a/resources/meta-sr/weapon/巡猎/点个关注吧！/data.json b/resources/meta-sr/weapon/巡猎/点个关注吧！/data.json
index 219fcce7..e859433e 100644
--- a/resources/meta-sr/weapon/巡猎/点个关注吧！/data.json
+++ b/resources/meta-sr/weapon/巡猎/点个关注吧！/data.json
@@ -114,21 +114,21 @@
     "id": 21017,
     "name": "不赞不许走！",
     "desc": "使装备者普攻和战技造成的伤害提高<nobr>$1[i]%</nobr>，当装备者的当前能量值等于其能量上限时，该效果额外提高<nobr>$2[i]%</nobr>。",
-    "tables": [
-      [
-        0.24,
-        0.3,
-        0.36,
-        0.42,
-        0.48
+    "tables": {
+      "1": [
+        24,
+        30,
+        36,
+        42,
+        48
       ],
-      [
-        0.24,
-        0.3,
-        0.36,
-        0.42,
-        0.48
+      "2": [
+        24,
+        30,
+        36,
+        42,
+        48
       ]
-    ]
+    }
   }
 }
\ No newline at end of file
diff --git a/resources/meta-sr/weapon/巡猎/相抗/data.json b/resources/meta-sr/weapon/巡猎/相抗/data.json
index ef96ea22..8dab6ee6 100644
--- a/resources/meta-sr/weapon/巡猎/相抗/data.json
+++ b/resources/meta-sr/weapon/巡猎/相抗/data.json
@@ -114,14 +114,14 @@
     "id": 20014,
     "name": "联盟",
     "desc": "使装备者在消灭敌方目标后，速度提高<nobr>$1[i]%</nobr>，持续<nobr>2</nobr>回合。",
-    "tables": [
-      [
-        0.1,
-        0.12,
-        0.14,
-        0.16,
-        0.18
+    "tables": {
+      "1": [
+        10,
+        12,
+        14.000000000000002,
+        16,
+        18
       ]
-    ]
+    }
   }
 }
\ No newline at end of file
diff --git a/resources/meta-sr/weapon/巡猎/离弦/data.json b/resources/meta-sr/weapon/巡猎/离弦/data.json
index a3e685e1..fc33a9c5 100644
--- a/resources/meta-sr/weapon/巡猎/离弦/data.json
+++ b/resources/meta-sr/weapon/巡猎/离弦/data.json
@@ -114,14 +114,14 @@
     "id": 20007,
     "name": "鸣角",
     "desc": "使装备者消灭敌方目标后，攻击力提高<nobr>$1[i]%</nobr>，持续<nobr>3</nobr>回合。",
-    "tables": [
-      [
-        0.24,
-        0.3,
-        0.36,
-        0.42,
-        0.48
+    "tables": {
+      "1": [
+        24,
+        30,
+        36,
+        42,
+        48
       ]
-    ]
+    }
   }
 }
\ No newline at end of file
diff --git a/resources/meta-sr/weapon/巡猎/论剑/data.json b/resources/meta-sr/weapon/巡猎/论剑/data.json
index a335f43e..1ad2646c 100644
--- a/resources/meta-sr/weapon/巡猎/论剑/data.json
+++ b/resources/meta-sr/weapon/巡猎/论剑/data.json
@@ -114,14 +114,14 @@
     "id": 21010,
     "name": "各自的答案",
     "desc": "当装备者多次击中同一敌方目标时，每次造成的伤害提高<nobr>$1[i]%</nobr>，该效果最多叠加<nobr>5</nobr>层。若攻击目标发生变化，立即解除当前的增益效果。",
-    "tables": [
-      [
-        0.08,
-        0.1,
-        0.12,
-        0.14,
-        0.16
+    "tables": {
+      "1": [
+        8,
+        10,
+        12,
+        14.000000000000002,
+        16
       ]
-    ]
+    }
   }
 }
\ No newline at end of file
diff --git a/resources/meta-sr/weapon/巡猎/重返幽冥/data.json b/resources/meta-sr/weapon/巡猎/重返幽冥/data.json
index 983cece1..9f6535e4 100644
--- a/resources/meta-sr/weapon/巡猎/重返幽冥/data.json
+++ b/resources/meta-sr/weapon/巡猎/重返幽冥/data.json
@@ -114,21 +114,21 @@
     "id": 21031,
     "name": "汹涌",
     "desc": "使装备者暴击率提高<nobr>$1[i]%</nobr>。暴击后有<nobr>$2[i]%</nobr>的固定概率解除被攻击敌方目标所持有的1个增益效果，该效果每次攻击只可触发1次。",
-    "tables": [
-      [
-        0.12,
-        0.15,
-        0.18,
-        0.21,
-        0.24
+    "tables": {
+      "1": [
+        12,
+        15,
+        18,
+        21,
+        24
       ],
-      [
-        0.16,
-        0.2,
-        0.24,
-        0.28,
-        0.32
+      "2": [
+        16,
+        20,
+        24,
+        28.000000000000004,
+        32
       ]
-    ]
+    }
   }
 }
\ No newline at end of file
diff --git a/resources/meta-sr/weapon/巡猎/锋镝/data.json b/resources/meta-sr/weapon/巡猎/锋镝/data.json
index e717d3ba..0f236eb8 100644
--- a/resources/meta-sr/weapon/巡猎/锋镝/data.json
+++ b/resources/meta-sr/weapon/巡猎/锋镝/data.json
@@ -114,14 +114,14 @@
     "id": 20000,
     "name": "危机",
     "desc": "战斗开始时，使装备者的暴击率提高<nobr>$1[i]%</nobr>，持续<nobr>3</nobr>回合。",
-    "tables": [
-      [
-        0.12,
-        0.15,
-        0.18,
-        0.21,
-        0.24
+    "tables": {
+      "1": [
+        12,
+        15,
+        18,
+        21,
+        24
       ]
-    ]
+    }
   }
 }
\ No newline at end of file
diff --git a/resources/meta-sr/weapon/智识/calc.js b/resources/meta-sr/weapon/智识/calc.js
new file mode 100644
index 00000000..0407ea91
--- /dev/null
+++ b/resources/meta-sr/weapon/智识/calc.js
@@ -0,0 +1,14 @@
+export default function (staticIdx) {
+  return {
+    '「我」的诞生': [],
+    今日亦是和平的一日: [],
+    别让世界静下来: [staticIdx(1, 'recharge')],
+    天才们的休憩: [staticIdx(1, 'atkPct')],
+    拂晓之前: [staticIdx(1, 'cdmg')],
+    早餐的仪式感: [staticIdx(1, 'dmg')],
+    智库: [],
+    灵钥: [],
+    睿见: [],
+    银河铁道之夜: [],
+  }
+}
\ No newline at end of file
diff --git a/resources/meta-sr/weapon/智识/「我」的诞生/data.json b/resources/meta-sr/weapon/智识/「我」的诞生/data.json
index 7badab16..12076115 100644
--- a/resources/meta-sr/weapon/智识/「我」的诞生/data.json
+++ b/resources/meta-sr/weapon/智识/「我」的诞生/data.json
@@ -114,21 +114,21 @@
     "id": 21006,
     "name": "画像少女",
     "desc": "使装备者追加攻击造成的伤害提高<nobr>$1[i]%</nobr>。若该敌方目标当前生命值百分比小于等于<nobr>50.0%</nobr>，则追加攻击造成的伤害额外提高<nobr>$2[i]%</nobr>。",
-    "tables": [
-      [
-        0.24,
-        0.3,
-        0.36,
-        0.42,
-        0.48
+    "tables": {
+      "1": [
+        24,
+        30,
+        36,
+        42,
+        48
       ],
-      [
-        0.24,
-        0.3,
-        0.36,
-        0.42,
-        0.48
+      "2": [
+        24,
+        30,
+        36,
+        42,
+        48
       ]
-    ]
+    }
   }
 }
\ No newline at end of file
diff --git a/resources/meta-sr/weapon/智识/今日亦是和平的一日/data.json b/resources/meta-sr/weapon/智识/今日亦是和平的一日/data.json
index 112b3db6..143fd782 100644
--- a/resources/meta-sr/weapon/智识/今日亦是和平的一日/data.json
+++ b/resources/meta-sr/weapon/智识/今日亦是和平的一日/data.json
@@ -114,6 +114,6 @@
     "id": 21034,
     "name": "风雨将至",
     "desc": "进入战斗后，根据装备者的能量上限，提高装备者造成的伤害：每点能量提高<nobr>#1[f2]%</nobr>，最多计入<nobr>160</nobr>点。",
-    "tables": []
+    "tables": {}
   }
 }
\ No newline at end of file
diff --git a/resources/meta-sr/weapon/智识/别让世界静下来/data.json b/resources/meta-sr/weapon/智识/别让世界静下来/data.json
index f83f5a41..bedf52b5 100644
--- a/resources/meta-sr/weapon/智识/别让世界静下来/data.json
+++ b/resources/meta-sr/weapon/智识/别让世界静下来/data.json
@@ -114,21 +114,21 @@
     "id": 21013,
     "name": "声音的力量",
     "desc": "使装备者进入战斗时立即恢复<nobr>$1[i]</nobr>点能量，同时使其终结技造成的伤害提高<nobr>$2[i]%</nobr>。",
-    "tables": [
-      [
+    "tables": {
+      "1": [
         20,
         23,
         26,
         29,
         32
       ],
-      [
-        0.32,
-        0.4,
-        0.48,
-        0.56,
-        0.64
+      "2": [
+        32,
+        40,
+        48,
+        56.00000000000001,
+        64
       ]
-    ]
+    }
   }
 }
\ No newline at end of file
diff --git a/resources/meta-sr/weapon/智识/天才们的休憩/data.json b/resources/meta-sr/weapon/智识/天才们的休憩/data.json
index 48011ff8..093fe5c4 100644
--- a/resources/meta-sr/weapon/智识/天才们的休憩/data.json
+++ b/resources/meta-sr/weapon/智识/天才们的休憩/data.json
@@ -114,21 +114,21 @@
     "id": 21020,
     "name": "各得其所",
     "desc": "使装备者攻击力提高<nobr>$1[i]%</nobr>，当装备者消灭敌方目标后，暴击伤害提高<nobr>$2[i]%</nobr>，持续<nobr>3</nobr>回合。",
-    "tables": [
-      [
-        0.16,
-        0.2,
-        0.24,
-        0.28,
-        0.32
+    "tables": {
+      "1": [
+        16,
+        20,
+        24,
+        28.000000000000004,
+        32
       ],
-      [
-        0.24,
-        0.3,
-        0.36,
-        0.42,
-        0.48
+      "2": [
+        24,
+        30,
+        36,
+        42,
+        48
       ]
-    ]
+    }
   }
 }
\ No newline at end of file
diff --git a/resources/meta-sr/weapon/智识/拂晓之前/data.json b/resources/meta-sr/weapon/智识/拂晓之前/data.json
index b8fbe70f..3ba7e5c9 100644
--- a/resources/meta-sr/weapon/智识/拂晓之前/data.json
+++ b/resources/meta-sr/weapon/智识/拂晓之前/data.json
@@ -114,28 +114,28 @@
     "id": 23010,
     "name": "长夜",
     "desc": "使装备者暴击伤害提高<nobr>$1[i]%</nobr>。使装备者战技和终结技造成的伤害提高<nobr>$2[i]%</nobr>。当装备者施放战技或终结技后，获得【梦身】效果。触发追加攻击时，消耗【梦身】，使追加攻击造成的伤害提高<nobr>$3[i]%</nobr>。",
-    "tables": [
-      [
-        0.36,
-        0.42,
-        0.48,
-        0.54,
-        0.6
+    "tables": {
+      "1": [
+        36,
+        42,
+        48,
+        54,
+        60
       ],
-      [
-        0.18,
-        0.21,
-        0.24,
-        0.27,
-        0.3
+      "2": [
+        18,
+        21,
+        24,
+        27,
+        30
       ],
-      [
-        0.48,
-        0.56,
-        0.64,
-        0.72,
-        0.8
+      "3": [
+        48,
+        56.00000000000001,
+        64,
+        72,
+        80
       ]
-    ]
+    }
   }
 }
\ No newline at end of file
diff --git a/resources/meta-sr/weapon/智识/早餐的仪式感/data.json b/resources/meta-sr/weapon/智识/早餐的仪式感/data.json
index af39f39f..45793eda 100644
--- a/resources/meta-sr/weapon/智识/早餐的仪式感/data.json
+++ b/resources/meta-sr/weapon/智识/早餐的仪式感/data.json
@@ -114,21 +114,21 @@
     "id": 21027,
     "name": "各就其位",
     "desc": "使装备者造成伤害提高<nobr>$1[i]%</nobr>。每消灭1个敌方目标，装备者的攻击力提高<nobr>$2[i]%</nobr>，该效果最多叠加<nobr>3</nobr>层。",
-    "tables": [
-      [
-        0.12,
-        0.15,
-        0.18,
-        0.21,
-        0.24
+    "tables": {
+      "1": [
+        12,
+        15,
+        18,
+        21,
+        24
       ],
-      [
-        0.04,
-        0.05,
-        0.06,
-        0.07,
-        0.08
+      "2": [
+        4,
+        5,
+        6,
+        7.000000000000001,
+        8
       ]
-    ]
+    }
   }
 }
\ No newline at end of file
diff --git a/resources/meta-sr/weapon/智识/智库/data.json b/resources/meta-sr/weapon/智识/智库/data.json
index 631df3e6..25b8adae 100644
--- a/resources/meta-sr/weapon/智识/智库/data.json
+++ b/resources/meta-sr/weapon/智识/智库/data.json
@@ -114,14 +114,14 @@
     "id": 20006,
     "name": "博识",
     "desc": "使装备者终结技造成的伤害提高<nobr>$1[i]%</nobr>。",
-    "tables": [
-      [
-        0.28,
-        0.35,
-        0.42,
-        0.49,
-        0.56
+    "tables": {
+      "1": [
+        28.000000000000004,
+        35,
+        42,
+        49,
+        56.00000000000001
       ]
-    ]
+    }
   }
 }
\ No newline at end of file
diff --git a/resources/meta-sr/weapon/智识/灵钥/data.json b/resources/meta-sr/weapon/智识/灵钥/data.json
index d8177de3..fafdbefb 100644
--- a/resources/meta-sr/weapon/智识/灵钥/data.json
+++ b/resources/meta-sr/weapon/智识/灵钥/data.json
@@ -114,14 +114,14 @@
     "id": 20013,
     "name": "顿悟",
     "desc": "使装备者施放战技后额外恢复<nobr>$1[i]</nobr>点能量，该效果单个回合内不可重复触发。",
-    "tables": [
-      [
+    "tables": {
+      "1": [
         8,
         9,
         10,
         11,
         12
       ]
-    ]
+    }
   }
 }
\ No newline at end of file
diff --git a/resources/meta-sr/weapon/智识/睿见/data.json b/resources/meta-sr/weapon/智识/睿见/data.json
index b3be2b4f..9aed46c8 100644
--- a/resources/meta-sr/weapon/智识/睿见/data.json
+++ b/resources/meta-sr/weapon/智识/睿见/data.json
@@ -114,14 +114,14 @@
     "id": 20020,
     "name": "天才",
     "desc": "当装备者施放终结技时，攻击力提高<nobr>$1[i]%</nobr>，持续<nobr>2</nobr>回合。",
-    "tables": [
-      [
-        0.24,
-        0.3,
-        0.36,
-        0.42,
-        0.48
+    "tables": {
+      "1": [
+        24,
+        30,
+        36,
+        42,
+        48
       ]
-    ]
+    }
   }
 }
\ No newline at end of file
diff --git a/resources/meta-sr/weapon/智识/银河铁道之夜/data.json b/resources/meta-sr/weapon/智识/银河铁道之夜/data.json
index 5b2ec3a1..fe856d22 100644
--- a/resources/meta-sr/weapon/智识/银河铁道之夜/data.json
+++ b/resources/meta-sr/weapon/智识/银河铁道之夜/data.json
@@ -114,21 +114,21 @@
     "id": 23000,
     "name": "流星群",
     "desc": "场上每有1个敌方目标，使装备者的攻击力提高<nobr>$1[f1]%</nobr>，该效果最多叠加5层。当有敌方目标的弱点被击破时，装备者造成的伤害提高<nobr>$2[i]%</nobr>，持续1回合。",
-    "tables": [
-      [
-        0.09,
-        0.105,
-        0.12,
-        0.135,
-        0.15
+    "tables": {
+      "1": [
+        9,
+        10.5,
+        12,
+        13.5,
+        15
       ],
-      [
-        0.3,
-        0.35,
-        0.4,
-        0.45,
-        0.5
+      "2": [
+        30,
+        35,
+        40,
+        45,
+        50
       ]
-    ]
+    }
   }
 }
\ No newline at end of file
diff --git a/resources/meta-sr/weapon/毁灭/calc.js b/resources/meta-sr/weapon/毁灭/calc.js
new file mode 100644
index 00000000..f95d9e62
--- /dev/null
+++ b/resources/meta-sr/weapon/毁灭/calc.js
@@ -0,0 +1,14 @@
+export default function (staticIdx) {
+  return {
+    乐圮: [],
+    俱殁: [],
+    在蓝天下: [staticIdx(1, 'atkPct')],
+    天倾: [],
+    无可取代的东西: [staticIdx(1, 'atkPct')],
+    无处可逃: [staticIdx(1, 'atkPct')],
+    '汪！散步时间！': [staticIdx(1, 'atkPct')],
+    秘密誓心: [staticIdx(1, 'dmg')],
+    记一位星神的陨落: [],
+    鼹鼠党欢迎你: []
+  }
+}
\ No newline at end of file
diff --git a/resources/meta-sr/weapon/毁灭/乐圮/data.json b/resources/meta-sr/weapon/毁灭/乐圮/data.json
index 6e362d0f..290f2316 100644
--- a/resources/meta-sr/weapon/毁灭/乐圮/data.json
+++ b/resources/meta-sr/weapon/毁灭/乐圮/data.json
@@ -114,14 +114,14 @@
     "id": 20009,
     "name": "诛讨",
     "desc": "使装备者对当前生命值百分比大于<nobr>50.0%</nobr>的敌方目标造成的伤害提高<nobr>$1[i]%</nobr>。",
-    "tables": [
-      [
-        0.2,
-        0.25,
-        0.3,
-        0.35,
-        0.4
+    "tables": {
+      "1": [
+        20,
+        25,
+        30,
+        35,
+        40
       ]
-    ]
+    }
   }
 }
\ No newline at end of file
diff --git a/resources/meta-sr/weapon/毁灭/俱殁/data.json b/resources/meta-sr/weapon/毁灭/俱殁/data.json
index 08bab85a..159f0d2b 100644
--- a/resources/meta-sr/weapon/毁灭/俱殁/data.json
+++ b/resources/meta-sr/weapon/毁灭/俱殁/data.json
@@ -114,14 +114,14 @@
     "id": 20016,
     "name": "军团",
     "desc": "装备者当前生命值百分比小于<nobr>80.0%</nobr>时，暴击率提高<nobr>$1[i]%</nobr>。",
-    "tables": [
-      [
-        0.12,
-        0.15,
-        0.18,
-        0.21,
-        0.24
+    "tables": {
+      "1": [
+        12,
+        15,
+        18,
+        21,
+        24
       ]
-    ]
+    }
   }
 }
\ No newline at end of file
diff --git a/resources/meta-sr/weapon/毁灭/在蓝天下/data.json b/resources/meta-sr/weapon/毁灭/在蓝天下/data.json
index c4ae395a..d6c75651 100644
--- a/resources/meta-sr/weapon/毁灭/在蓝天下/data.json
+++ b/resources/meta-sr/weapon/毁灭/在蓝天下/data.json
@@ -114,21 +114,21 @@
     "id": 21019,
     "name": "暖阳麦浪",
     "desc": "使装备者攻击力提高<nobr>$1[i]%</nobr>，当装备者消灭敌方目标后，暴击率提高<nobr>$2[i]%</nobr>，持续<nobr>3</nobr>回合。",
-    "tables": [
-      [
-        0.16,
-        0.2,
-        0.24,
-        0.28,
-        0.32
+    "tables": {
+      "1": [
+        16,
+        20,
+        24,
+        28.000000000000004,
+        32
       ],
-      [
-        0.12,
-        0.15,
-        0.18,
-        0.21,
-        0.24
+      "2": [
+        12,
+        15,
+        18,
+        21,
+        24
       ]
-    ]
+    }
   }
 }
\ No newline at end of file
diff --git a/resources/meta-sr/weapon/毁灭/天倾/data.json b/resources/meta-sr/weapon/毁灭/天倾/data.json
index 48444d4a..01517213 100644
--- a/resources/meta-sr/weapon/毁灭/天倾/data.json
+++ b/resources/meta-sr/weapon/毁灭/天倾/data.json
@@ -114,14 +114,14 @@
     "id": 20002,
     "name": "破灭",
     "desc": "使装备者普攻和战技造成的伤害提高<nobr>$1[i]%</nobr>。",
-    "tables": [
-      [
-        0.2,
-        0.25,
-        0.3,
-        0.35,
-        0.4
+    "tables": {
+      "1": [
+        20,
+        25,
+        30,
+        35,
+        40
       ]
-    ]
+    }
   }
 }
\ No newline at end of file
diff --git a/resources/meta-sr/weapon/毁灭/无可取代的东西/data.json b/resources/meta-sr/weapon/毁灭/无可取代的东西/data.json
index 5f5d7c27..0ca4ee63 100644
--- a/resources/meta-sr/weapon/毁灭/无可取代的东西/data.json
+++ b/resources/meta-sr/weapon/毁灭/无可取代的东西/data.json
@@ -114,28 +114,28 @@
     "id": 23002,
     "name": "家人",
     "desc": "使装备者的攻击力提高<nobr>$1[i]%</nobr>。当装备者消灭敌方目标或受到攻击后，立即回复等同于装备者攻击力<nobr>$2[i]%</nobr>的生命值，同时造成的伤害提高<nobr>$3[i]%</nobr>，持续到自身下个回合结束。该效果不可叠加，每回合只可触发1次。",
-    "tables": [
-      [
-        0.24,
-        0.28,
-        0.32,
-        0.36,
-        0.4
+    "tables": {
+      "1": [
+        24,
+        28.000000000000004,
+        32,
+        36,
+        40
       ],
-      [
-        0.08,
-        0.09,
-        0.1,
-        0.11,
-        0.12
+      "2": [
+        8,
+        9,
+        10,
+        11,
+        12
       ],
-      [
-        0.24,
-        0.28,
-        0.32,
-        0.36,
-        0.4
+      "3": [
+        24,
+        28.000000000000004,
+        32,
+        36,
+        40
       ]
-    ]
+    }
   }
 }
\ No newline at end of file
diff --git a/resources/meta-sr/weapon/毁灭/无处可逃/data.json b/resources/meta-sr/weapon/毁灭/无处可逃/data.json
index b2181079..6cc724c5 100644
--- a/resources/meta-sr/weapon/毁灭/无处可逃/data.json
+++ b/resources/meta-sr/weapon/毁灭/无处可逃/data.json
@@ -114,21 +114,21 @@
     "id": 21033,
     "name": "绝境",
     "desc": "使装备者的攻击力提高<nobr>$1[i]%</nobr>。当装备者消灭敌方目标时，回复等同于自身<nobr>$2[i]%</nobr>攻击力的生命值。",
-    "tables": [
-      [
-        0.24,
-        0.3,
-        0.36,
-        0.42,
-        0.48
+    "tables": {
+      "1": [
+        24,
+        30,
+        36,
+        42,
+        48
       ],
-      [
-        0.12,
-        0.15,
-        0.18,
-        0.21,
-        0.24
+      "2": [
+        12,
+        15,
+        18,
+        21,
+        24
       ]
-    ]
+    }
   }
 }
\ No newline at end of file
diff --git a/resources/meta-sr/weapon/毁灭/汪！散步时间！/data.json b/resources/meta-sr/weapon/毁灭/汪！散步时间！/data.json
index fd89c100..fa717639 100644
--- a/resources/meta-sr/weapon/毁灭/汪！散步时间！/data.json
+++ b/resources/meta-sr/weapon/毁灭/汪！散步时间！/data.json
@@ -114,21 +114,21 @@
     "id": 21026,
     "name": "快溜",
     "desc": "使装备者的攻击力提高<nobr>$1[i]%</nobr>，对处于灼烧或裂伤状态的敌方目标造成的伤害提高<nobr>$2[i]%</nobr>，该效果对持续伤害也会生效。",
-    "tables": [
-      [
-        0.1,
-        0.125,
-        0.15,
-        0.175,
-        0.2
+    "tables": {
+      "1": [
+        10,
+        12.5,
+        15,
+        17.5,
+        20
       ],
-      [
-        0.16,
-        0.2,
-        0.24,
-        0.28,
-        0.32
+      "2": [
+        16,
+        20,
+        24,
+        28.000000000000004,
+        32
       ]
-    ]
+    }
   }
 }
\ No newline at end of file
diff --git a/resources/meta-sr/weapon/毁灭/秘密誓心/data.json b/resources/meta-sr/weapon/毁灭/秘密誓心/data.json
index 8ad2c50b..ab372b90 100644
--- a/resources/meta-sr/weapon/毁灭/秘密誓心/data.json
+++ b/resources/meta-sr/weapon/毁灭/秘密誓心/data.json
@@ -114,21 +114,21 @@
     "id": 21012,
     "name": "竭力而为",
     "desc": "使装备者造成的伤害提高<nobr>$1[i]%</nobr>，同时对当前生命值百分比高于装备者自身当前生命值百分比的敌方目标造成的伤害额外提高<nobr>$2[i]%</nobr>。",
-    "tables": [
-      [
-        0.2,
-        0.25,
-        0.3,
-        0.35,
-        0.4
+    "tables": {
+      "1": [
+        20,
+        25,
+        30,
+        35,
+        40
       ],
-      [
-        0.2,
-        0.25,
-        0.3,
-        0.35,
-        0.4
+      "2": [
+        20,
+        25,
+        30,
+        35,
+        40
       ]
-    ]
+    }
   }
 }
\ No newline at end of file
diff --git a/resources/meta-sr/weapon/毁灭/记一位星神的陨落/data.json b/resources/meta-sr/weapon/毁灭/记一位星神的陨落/data.json
index e8618abc..aa985ab7 100644
--- a/resources/meta-sr/weapon/毁灭/记一位星神的陨落/data.json
+++ b/resources/meta-sr/weapon/毁灭/记一位星神的陨落/data.json
@@ -114,21 +114,21 @@
     "id": 24000,
     "name": "扑火",
     "desc": "当装备者施放攻击时，使装备者本场战斗中的攻击力提高<nobr>$1[i]%</nobr>，该效果最多叠加<nobr>4</nobr>层。当装备者击破敌方目标弱点后，造成的伤害提高<nobr>$2[i]%</nobr>，持续<nobr>2</nobr>回合。",
-    "tables": [
-      [
-        0.08,
-        0.1,
-        0.12,
-        0.14,
-        0.16
+    "tables": {
+      "1": [
+        8,
+        10,
+        12,
+        14.000000000000002,
+        16
       ],
-      [
-        0.12,
-        0.15,
-        0.18,
-        0.21,
-        0.24
+      "2": [
+        12,
+        15,
+        18,
+        21,
+        24
       ]
-    ]
+    }
   }
 }
\ No newline at end of file
diff --git a/resources/meta-sr/weapon/毁灭/鼹鼠党欢迎你/data.json b/resources/meta-sr/weapon/毁灭/鼹鼠党欢迎你/data.json
index 41b92de7..b19fcef7 100644
--- a/resources/meta-sr/weapon/毁灭/鼹鼠党欢迎你/data.json
+++ b/resources/meta-sr/weapon/毁灭/鼹鼠党欢迎你/data.json
@@ -114,14 +114,14 @@
     "id": 21005,
     "name": "奇妙冒险",
     "desc": "装备者施放普攻、战技或终结技攻击敌方目标后，分别获取一层【淘气值】。每层使装备者的攻击力提高<nobr>$1[i]%</nobr>。",
-    "tables": [
-      [
-        0.12,
-        0.15,
-        0.18,
-        0.21,
-        0.24
+    "tables": {
+      "1": [
+        12,
+        15,
+        18,
+        21,
+        24
       ]
-    ]
+    }
   }
 }
\ No newline at end of file
diff --git a/resources/meta-sr/weapon/虚无/calc.js b/resources/meta-sr/weapon/虚无/calc.js
new file mode 100644
index 00000000..0683e986
--- /dev/null
+++ b/resources/meta-sr/weapon/虚无/calc.js
@@ -0,0 +1,13 @@
+export default function (staticIdx) {
+  return {
+    以世界之名: [],
+    决心如汗珠般闪耀: [],
+    匿影: [],
+    后会有期: [],
+    幽邃: [],
+    延长记号: [staticIdx(1, 'stance')],
+    晚安与睡颜: [],
+    渊环: [staticIdx(1, 'dmg')],
+    猎物的视线: [staticIdx(1, 'effPct')]
+  }
+}
\ No newline at end of file
diff --git a/resources/meta-sr/weapon/虚无/以世界之名/data.json b/resources/meta-sr/weapon/虚无/以世界之名/data.json
index 18f16c58..0e231b90 100644
--- a/resources/meta-sr/weapon/虚无/以世界之名/data.json
+++ b/resources/meta-sr/weapon/虚无/以世界之名/data.json
@@ -114,28 +114,28 @@
     "id": 23004,
     "name": "传承者",
     "desc": "使装备者对陷入负面效果的敌方目标造成的伤害提高<nobr>$1[i]%</nobr>。当装备者施放战技时，装备者此次攻击的效果命中提高<nobr>$2[i]%</nobr>，攻击力提高<nobr>$3[i]%</nobr>。",
-    "tables": [
-      [
-        0.24,
-        0.28,
-        0.32,
-        0.36,
-        0.4
+    "tables": {
+      "1": [
+        24,
+        28.000000000000004,
+        32,
+        36,
+        40
       ],
-      [
-        0.18,
-        0.21,
-        0.24,
-        0.27,
-        0.3
+      "2": [
+        18,
+        21,
+        24,
+        27,
+        30
       ],
-      [
-        0.24,
-        0.28,
-        0.32,
-        0.36,
-        0.4
+      "3": [
+        24,
+        28.000000000000004,
+        32,
+        36,
+        40
       ]
-    ]
+    }
   }
 }
\ No newline at end of file
diff --git a/resources/meta-sr/weapon/虚无/决心如汗珠般闪耀/data.json b/resources/meta-sr/weapon/虚无/决心如汗珠般闪耀/data.json
index 6df6da2b..79c9b723 100644
--- a/resources/meta-sr/weapon/虚无/决心如汗珠般闪耀/data.json
+++ b/resources/meta-sr/weapon/虚无/决心如汗珠般闪耀/data.json
@@ -114,21 +114,21 @@
     "id": 21015,
     "name": "回眸",
     "desc": "当装备者击中敌方目标时，如果该目标不处于【攻陷】状态，则有<nobr>$1[i]%</nobr>的基础概率使其陷入【攻陷】状态。【攻陷】状态下的敌方目标防御力降低<nobr>$2[i]%</nobr>，持续<nobr>1</nobr>回合。",
-    "tables": [
-      [
-        0.6,
-        0.7,
-        0.8,
-        0.9,
-        1
+    "tables": {
+      "1": [
+        60,
+        70,
+        80,
+        90,
+        100
       ],
-      [
-        0.12,
-        0.13,
-        0.14,
-        0.15,
-        0.16
+      "2": [
+        12,
+        13,
+        14.000000000000002,
+        15,
+        16
       ]
-    ]
+    }
   }
 }
\ No newline at end of file
diff --git a/resources/meta-sr/weapon/虚无/匿影/data.json b/resources/meta-sr/weapon/虚无/匿影/data.json
index 7f9568a6..89313cb8 100644
--- a/resources/meta-sr/weapon/虚无/匿影/data.json
+++ b/resources/meta-sr/weapon/虚无/匿影/data.json
@@ -114,14 +114,14 @@
     "id": 20018,
     "name": "机关",
     "desc": "施放战技后，使装备者的下一次普攻对敌方目标造成等同于自身<nobr>$1[i]%</nobr>攻击力的附加伤害。",
-    "tables": [
-      [
-        0.6,
-        0.75,
-        0.9,
-        1.05,
-        1.2
+    "tables": {
+      "1": [
+        60,
+        75,
+        90,
+        105,
+        120
       ]
-    ]
+    }
   }
 }
\ No newline at end of file
diff --git a/resources/meta-sr/weapon/虚无/后会有期/data.json b/resources/meta-sr/weapon/虚无/后会有期/data.json
index 4293b0d7..40185388 100644
--- a/resources/meta-sr/weapon/虚无/后会有期/data.json
+++ b/resources/meta-sr/weapon/虚无/后会有期/data.json
@@ -114,14 +114,14 @@
     "id": 21029,
     "name": "交手如交谈",
     "desc": "装备者施放普攻或战技后，对随机1个受到攻击的敌方目标造成等同于自身<nobr>$1[i]%</nobr>攻击力的附加伤害。",
-    "tables": [
-      [
-        0.48,
-        0.6,
-        0.72,
-        0.84,
-        0.96
+    "tables": {
+      "1": [
+        48,
+        60,
+        72,
+        84,
+        96
       ]
-    ]
+    }
   }
 }
\ No newline at end of file
diff --git a/resources/meta-sr/weapon/虚无/幽邃/data.json b/resources/meta-sr/weapon/虚无/幽邃/data.json
index 4ded4d75..695cc2ff 100644
--- a/resources/meta-sr/weapon/虚无/幽邃/data.json
+++ b/resources/meta-sr/weapon/虚无/幽邃/data.json
@@ -114,14 +114,14 @@
     "id": 20004,
     "name": "沉沦",
     "desc": "战斗开始时，使装备者的效果命中提高<nobr>$1[i]%</nobr>，持续<nobr>3</nobr>回合。",
-    "tables": [
-      [
-        0.2,
-        0.25,
-        0.3,
-        0.35,
-        0.4
+    "tables": {
+      "1": [
+        20,
+        25,
+        30,
+        35,
+        40
       ]
-    ]
+    }
   }
 }
\ No newline at end of file
diff --git a/resources/meta-sr/weapon/虚无/延长记号/data.json b/resources/meta-sr/weapon/虚无/延长记号/data.json
index 6adfe360..c54cad0d 100644
--- a/resources/meta-sr/weapon/虚无/延长记号/data.json
+++ b/resources/meta-sr/weapon/虚无/延长记号/data.json
@@ -114,21 +114,21 @@
     "id": 21022,
     "name": "休止符",
     "desc": "使装备者的击破特攻提高<nobr>$1[i]%</nobr>，对处于触电或<span>风</span>化状态的敌方目标造成的伤害提高<nobr>$2[i]%</nobr>，该效果对持续伤害也会生效。",
-    "tables": [
-      [
-        0.16,
-        0.2,
-        0.24,
-        0.28,
-        0.32
+    "tables": {
+      "1": [
+        16,
+        20,
+        24,
+        28.000000000000004,
+        32
       ],
-      [
-        0.16,
-        0.2,
-        0.24,
-        0.28,
-        0.32
+      "2": [
+        16,
+        20,
+        24,
+        28.000000000000004,
+        32
       ]
-    ]
+    }
   }
 }
\ No newline at end of file
diff --git a/resources/meta-sr/weapon/虚无/晚安与睡颜/data.json b/resources/meta-sr/weapon/虚无/晚安与睡颜/data.json
index ab295793..95469fe5 100644
--- a/resources/meta-sr/weapon/虚无/晚安与睡颜/data.json
+++ b/resources/meta-sr/weapon/虚无/晚安与睡颜/data.json
@@ -114,14 +114,14 @@
     "id": 21001,
     "name": "劳碌者",
     "desc": "敌方目标每承受1个负面效果，装备者对其造成的伤害提高<nobr>$1[i]%</nobr>，最多叠加<nobr>3</nobr>层。该效果对持续伤害也会生效。",
-    "tables": [
-      [
-        0.12,
-        0.15,
-        0.18,
-        0.21,
-        0.24
+    "tables": {
+      "1": [
+        12,
+        15,
+        18,
+        21,
+        24
       ]
-    ]
+    }
   }
 }
\ No newline at end of file
diff --git a/resources/meta-sr/weapon/虚无/渊环/data.json b/resources/meta-sr/weapon/虚无/渊环/data.json
index 2ae2ef84..e6341d4f 100644
--- a/resources/meta-sr/weapon/虚无/渊环/data.json
+++ b/resources/meta-sr/weapon/虚无/渊环/data.json
@@ -114,14 +114,14 @@
     "id": 20011,
     "name": "追逼",
     "desc": "使装备者对减速状态下的敌方目标造成的伤害提高<nobr>$1[i]%</nobr>。",
-    "tables": [
-      [
-        0.24,
-        0.3,
-        0.36,
-        0.42,
-        0.48
+    "tables": {
+      "1": [
+        24,
+        30,
+        36,
+        42,
+        48
       ]
-    ]
+    }
   }
 }
\ No newline at end of file
diff --git a/resources/meta-sr/weapon/虚无/猎物的视线/data.json b/resources/meta-sr/weapon/虚无/猎物的视线/data.json
index 2d717c6b..5270f1e7 100644
--- a/resources/meta-sr/weapon/虚无/猎物的视线/data.json
+++ b/resources/meta-sr/weapon/虚无/猎物的视线/data.json
@@ -114,21 +114,21 @@
     "id": 21008,
     "name": "自信",
     "desc": "使装备者的效果命中提高<nobr>$1[i]%</nobr>，同时造成的持续伤害提高<nobr>$2[i]%</nobr>。",
-    "tables": [
-      [
-        0.2,
-        0.25,
-        0.3,
-        0.35,
-        0.4
+    "tables": {
+      "1": [
+        20,
+        25,
+        30,
+        35,
+        40
       ],
-      [
-        0.24,
-        0.3,
-        0.36,
-        0.42,
-        0.48
+      "2": [
+        24,
+        30,
+        36,
+        42,
+        48
       ]
-    ]
+    }
   }
 }
\ No newline at end of file