适配enka3.3相关数据

2024-11-25 09:27:34 +00:00 · 2022-12-07 14:22:39 +08:00 · 2022-12-07 14:22:39 +08:00 · 436e9dcda2
commit 436e9dcda2
parent 8881f5a881
24 changed files with 718 additions and 522 deletions
--- a/components/profile-data/enka-meta.js
+++ b/components/profile-data/enka-meta.js
@ -29,6 +29,7 @@ export default {
  339931171: '乘胜追击',
  342097547: '辰砂之纺锤',
  346510395: '衔珠海皇',
+  359484419: '图莱杜拉的回忆',
  368014203: '斩裂晴空的龙脊',
  388272194: '多莉',
  391273955: '斫断黑翼的利齿',
@ -196,6 +197,7 @@ export default {
  2009975571: '(test)穿模测试',
  2017033267: '气定神闲',
  2025598051: '顺风而行',
+  2029582603: '怪谭·时雨心地一本足',
  2040573235: '悠古的磐岩',
  2060049099: '祭火之人',
  2108574027: '碎石',
@ -220,12 +222,14 @@ export default {
  2322648115: '粉碎',
  2324146259: '白辰之环',
  2340970067: '历练的猎弓',
+  2351445619: '堙没的蓝宝石泪滴',
  2359799475: '恶王丸',
  2364208851: '行者之心',
  2365025043: '街巷游侠',
  2375993851: '宗室长剑',
  2383998915: '驭浪的海祇民',
  2384519283: '弹弓',
+  2387711994: '珐露珊',
  2388785242: '早柚',
  2400012995: '祭礼弓',
  2410593283: '无锋剑',
@ -233,6 +237,7 @@ export default {
  2425414923: '落霞',
  2433755451: '揭旗的叛逆之歌',
  2440850563: '回响长天的诗歌',
+  2448629019: '东花坊时雨',
  2466140362: '温迪',
  2469300579: '乘胜追击',
  2470306939: '飞雷御执',
@ -244,6 +249,7 @@ export default {
  2512309395: '如雷的盛怒',
  2521338131: '试作金珀',
  2534304035: '雾切御腰物',
+  2538235187: '沙上楼阁史话',
  2539208459: '证誓之明瞳',
  2546254811: '华馆梦醒形骸记',
  2556914683: '绝弦',
@ -293,6 +299,7 @@ export default {
  3079462611: '驭浪的海祇民',
  3090373787: '暗巷的酒与诗',
  3092975658: '坎蒂丝',
+  3094139291: '乐园遗落之花',
  3097441915: '以理服人',
  3112448011: '决心',
  3112679155: '终末嗟叹之诗',
@ -303,6 +310,7 @@ export default {
  3192689683: '霜葬',
  3209694115: '林野晚星',
  3221566250: '琴',
+  3230559562: '流浪者',
  3235324891: '护摩之杖',
  3252085691: '顺风而行',
  3258658763: '嗜魔',
@ -412,24 +420,24 @@ export default {
  4267718859: '反曲弓',
  4273845410: '辛焱',
  4275754179: '如狼般狩猎者',
+  FIGHT_PROP_HP_PERCENT: '生命值',
+  FIGHT_PROP_MAX_HP: '生命值上限',
  FIGHT_PROP_ATTACK: '攻击力',
-  FIGHT_PROP_CHARGE_EFFICIENCY: '元素充能效率',
+  FIGHT_PROP_DEFENSE: '防御力',
+  FIGHT_PROP_ELEMENT_MASTERY: '元素精通',
  FIGHT_PROP_CRITICAL: '暴击率',
  FIGHT_PROP_CRITICAL_HURT: '暴击伤害',
-  FIGHT_PROP_DEFENSE: '防御力',
-  FIGHT_PROP_ELEC_ADD_HURT: '雷元素伤害加成',
-  FIGHT_PROP_ELEMENT_MASTERY: '元素精通',
-  FIGHT_PROP_FIRE_ADD_HURT: '火元素伤害加成',
-  FIGHT_PROP_GRASS_ADD_HURT: '草元素伤害加成',
-  FIGHT_PROP_HEALED_ADD: '受治疗加成',
  FIGHT_PROP_HEAL_ADD: '治疗加成',
-  FIGHT_PROP_HP_PERCENT: '生命值',
-  FIGHT_PROP_ICE_ADD_HURT: '冰元素伤害加成',
-  FIGHT_PROP_MAX_HP: '生命值上限',
-  FIGHT_PROP_PHYSICAL_ADD_HURT: '物理伤害加成',
-  FIGHT_PROP_ROCK_ADD_HURT: '岩元素伤害加成',
+  FIGHT_PROP_HEALED_ADD: '受治疗加成',
+  FIGHT_PROP_CHARGE_EFFICIENCY: '元素充能效率',
  FIGHT_PROP_SHIELD_COST_MINUS_RATIO: '护盾强效',
+  FIGHT_PROP_FIRE_ADD_HURT: '火元素伤害加成',
  FIGHT_PROP_WATER_ADD_HURT: '水元素伤害加成',
+  FIGHT_PROP_GRASS_ADD_HURT: '草元素伤害加成',
+  FIGHT_PROP_ELEC_ADD_HURT: '雷元素伤害加成',
  FIGHT_PROP_WIND_ADD_HURT: '风元素伤害加成',
+  FIGHT_PROP_ICE_ADD_HURT: '冰元素伤害加成',
+  FIGHT_PROP_ROCK_ADD_HURT: '岩元素伤害加成',
+  FIGHT_PROP_PHYSICAL_ADD_HURT: '物理伤害加成',
  level: '等级'
 }
--- a/resources/meta/artifact/calc.js
+++ b/resources/meta/artifact/calc.js
@ -345,7 +345,6 @@ const buffs = {
    2: attr('atkPct', 18),
    4: {
      title: '满层提高48%攻击力',
-
      data: {
        atkPct: 48
      }
@ -356,6 +355,7 @@ const buffs = {
    2: attr('atkPct', 18),
    4: {
      title: '触发提高普攻[aPlus]伤害',
+      sort: 0,
      data: {
        aPlus: ({ attr }) => (attr.atk.base + attr.atk.plus + attr.atk.pct * attr.atk.base / 100) * 0.35
      }
--- a/resources/meta/character/八重神子/calc_auto.js
+++ b/resources/meta/character/八重神子/calc_auto.js
@ -10,7 +10,7 @@ export const details = [{
  title: '肆阶杀生樱伤害',
  params: { team: false },
  dmg: ({ talent, attr }, dmg) => dmg(talent.e['杀生樱伤害·肆阶'], 'e')
-},{
+}, {
  check: ({ cons }) => cons < 2,
  dmgKey: 'e_t',
  params: { team: true },
@ -22,7 +22,7 @@ export const details = [{
  params: { team: true },
  title: '温三雷肆阶杀生樱伤害',
  dmg: ({ talent, attr }, dmg) => dmg(talent.e['杀生樱伤害·肆阶'], 'e')
-},  {
+}, {
  title: 'Q天狐霆雷伤害',
  params: { team: false },
  dmg: ({ talent }, dmg) => dmg(talent.q['天狐霆雷伤害'], 'q')
@ -36,10 +36,9 @@ export const mainAttr = 'atk,cpct,cdmg,mastery'
 export const defDmgKey = 'e'

 export const defParams = {
-    team:true
+  team: true
 }

-
 export const buffs = [{
  title: '被动天赋：基于元素精通提高杀生樱伤害[eDmg]%',
  data: {
@ -57,30 +56,34 @@ export const buffs = [{
  data: {
    eDef: 60
  }
-}, {check: ({ cons,params }) => ((cons < 6 && cons >1) && params.team === true),
-    title: '精5终末6命温迪：增加[atkPct]%攻击,减抗[kx]%,精通[mastery]',
-    data: {
-      atkPct:40,
-      kx:60,
-      mastery:200
-   }
-  }, {check: ({ cons,params }) =>  (cons >= 6 && params.team === true),
-    title: '精1终末0命温迪：增加[atkPct]%攻击,减抗[kx]%,精通[mastery]',
-    data: {
-      atkPct:20,
-      kx:40,
-      mastery:100
-   }
-  }, {check: ({ params }) => params.team === true,
-    title: '天空宗室九条：增加[atkPlus]点攻击力,[atkPct]%攻击与[cdmg]%爆伤',
-    data: {
-      atkPlus: 794.2,
-      atkPct:20,
-      cdmg:60
-   }
-  },{check: ({ params }) => params.team === true,
-    title: '恶曜开眼：开E元素爆发伤害提升[qDmg]%',
-    data: {
-      qDmg: 27
-    }
-  }]
+}, {
+  check: ({ cons, params }) => ((cons < 6 && cons > 1) && params.team === true),
+  title: '精5终末6命温迪：增加[atkPct]%攻击,减抗[kx]%,精通[mastery]',
+  data: {
+    atkPct: 40,
+    kx: 60,
+    mastery: 200
+  }
+}, {
+  check: ({ cons, params }) => (cons >= 6 && params.team === true),
+  title: '精1终末0命温迪：增加[atkPct]%攻击,减抗[kx]%,精通[mastery]',
+  data: {
+    atkPct: 20,
+    kx: 40,
+    mastery: 100
+  }
+}, {
+  check: ({ params }) => params.team === true,
+  title: '天空宗室九条：增加[atkPlus]点攻击力,[atkPct]%攻击与[cdmg]%爆伤',
+  data: {
+    atkPlus: 794.2,
+    atkPct: 20,
+    cdmg: 60
+  }
+}, {
+  check: ({ params }) => params.team === true,
+  title: '恶曜开眼：开E元素爆发伤害提升[qDmg]%',
+  data: {
+    qDmg: 27
+  }
+}]
--- a/resources/meta/character/刻晴/calc_auto.js
+++ b/resources/meta/character/刻晴/calc_auto.js
@ -1,18 +1,18 @@
 export const details = [{
  title: 'E后重击伤害',
-  params: { q: 1 ,team:false},
+  params: { q: 1, team: false },
  dmg: ({ talent }, dmg) => dmg(talent.a['重击伤害'], 'a2')
 }, {
  title: 'Q单段伤害',
-  params: { q: 1 ,team:false},
+  params: { q: 1, team: false },
  dmg: ({ talent }, dmg) => dmg(talent.q['连斩伤害2'][0], 'q')
 }, {
  title: 'Q总伤害',
-  params: { q: 1 ,team:false},
+  params: { q: 1, team: false },
  dmg: ({ talent }, dmg) => dmg(talent.q['技能伤害'] + talent.q['连斩伤害'] + talent.q['最后一击伤害'], 'q')
 }, {
  title: 'Q总伤害·超激化',
-  params: { q: 1 ,team:false},
+  params: { q: 1, team: false },
  dmg: ({ talent }, dmg) => {
    let t1j = dmg(talent.q['技能伤害'], 'q', '超激化')
    let t2j = dmg(talent.q['连斩伤害'] / 8, 'q', '超激化')
@ -25,7 +25,7 @@ export const details = [{
  }
 }, {
  title: '刻九万妲Q激化总伤',
-  params: { q: 1,team:true},
+  params: { q: 1, team: true },
  dmg: ({ talent }, dmg) => {
    let t1j = dmg(talent.q['技能伤害'], 'q', '超激化')
    let t2j = dmg(talent.q['连斩伤害'] / 8, 'q', '超激化')
@ -39,8 +39,8 @@ export const details = [{
 }]

 export const defParams = {
-    q: 1,
-    team:true
+  q: 1,
+  team: true
 }

 export const defDmgIdx = 4
@ -63,54 +63,60 @@ export const buffs = [{
  data: {
    dmg: 24
  }
-}, {check: ({ cons,params }) => cons <= 1 && params.team === true,
-    title: '精1苍古0命万叶：获得[dmg]%增伤(苍古普攻16增伤)，增加[atkPct]%攻击,减抗[kx]%',
-    data: {
-      aDmg:16,
-      a2Dmg:16,
-      a3Dmg:16,
-      dmg: 40,
-      atkPct:20,
-      kx:40,
-   }
-  }, {check: ({ cons,params }) => ((cons < 6 && cons >1) && params.team === true),
-    title: '精1苍古2命万叶：获得[dmg]%增伤(苍古普攻16增伤)，增加[atkPct]%攻击,减抗[kx]%,精通[mastery]',
-    data: {
-      aDmg:16,
-      a2Dmg:16,
-      a3Dmg:16,
-      dmg: 48,
-      atkPct:20,
-      kx:40,
-      mastery:200
-   }
-  }, {check: ({ cons,params }) =>  (cons >= 6 && params.team === true),
-    title: '精5苍古6命万叶：获得[dmg]%增伤(苍古普攻32增伤)，增加[atkPct]%攻击,减抗[kx]%,精通[mastery]',
-    data: {
-      aDmg:32,
-      a2Dmg:32,
-      a3Dmg:32,
-      dmg: 48,
-      atkPct:40,
-      kx:40,
-      mastery:200
-   }
-  }, {check: ({ params }) => params.team === true,
-    title: '宗室天空九条：增加[atkPlus]点攻击力与[cdmg]%爆伤,攻击[atkPct]%',
-    data: {
-      atkPlus: 794.2,
-      cdmg:60,
-      atkPct:20
-   }
-  }, {check: ({ cons,params }) =>  (cons >= 2&& params.team === true),
-    title: '千夜2命纳西妲：增加精通[mastery],减防[enemyDef]%',
-    data: {
-      mastery: 290,
-      enemyDef: 30
-   }
-  }, {check: ({ cons,params }) =>  (cons < 2&& params.team === true),
-    title: '千夜0命纳西妲：增加精通[mastery]',
-    data: {
-      mastery: 290,
-   }
-  }]
+}, {
+  check: ({ cons, params }) => cons <= 1 && params.team === true,
+  title: '精1苍古0命万叶：获得[dmg]%增伤(苍古普攻16增伤)，增加[atkPct]%攻击,减抗[kx]%',
+  data: {
+    aDmg: 16,
+    a2Dmg: 16,
+    a3Dmg: 16,
+    dmg: 40,
+    atkPct: 20,
+    kx: 40
+  }
+}, {
+  check: ({ cons, params }) => ((cons < 6 && cons > 1) && params.team === true),
+  title: '精1苍古2命万叶：获得[dmg]%增伤(苍古普攻16增伤)，增加[atkPct]%攻击,减抗[kx]%,精通[mastery]',
+  data: {
+    aDmg: 16,
+    a2Dmg: 16,
+    a3Dmg: 16,
+    dmg: 48,
+    atkPct: 20,
+    kx: 40,
+    mastery: 200
+  }
+}, {
+  check: ({ cons, params }) => (cons >= 6 && params.team === true),
+  title: '精5苍古6命万叶：获得[dmg]%增伤(苍古普攻32增伤)，增加[atkPct]%攻击,减抗[kx]%,精通[mastery]',
+  data: {
+    aDmg: 32,
+    a2Dmg: 32,
+    a3Dmg: 32,
+    dmg: 48,
+    atkPct: 40,
+    kx: 40,
+    mastery: 200
+  }
+}, {
+  check: ({ params }) => params.team === true,
+  title: '宗室天空九条：增加[atkPlus]点攻击力与[cdmg]%爆伤,攻击[atkPct]%',
+  data: {
+    atkPlus: 794.2,
+    cdmg: 60,
+    atkPct: 20
+  }
+}, {
+  check: ({ cons, params }) => (cons >= 2 && params.team === true),
+  title: '千夜2命纳西妲：增加精通[mastery],减防[enemyDef]%',
+  data: {
+    mastery: 290,
+    enemyDef: 30
+  }
+}, {
+  check: ({ cons, params }) => (cons < 2 && params.team === true),
+  title: '千夜0命纳西妲：增加精通[mastery]',
+  data: {
+    mastery: 290
+  }
+}]
--- a/resources/meta/character/夜兰/calc_auto.js
+++ b/resources/meta/character/夜兰/calc_auto.js
@ -1,17 +1,17 @@
-export const details = [ {
+export const details = [{
  title: 'E络命丝伤害',
-  params: { q: false,team:false },
+  params: { q: false, team: false },
  dmg: ({ talent, attr, calc }, { basic }) => basic(calc(attr.hp) * talent.e['技能伤害'] / 100, 'e')

 }, {
  title: 'E络命丝蒸发',
-  params: { q: false,team:false },
+  params: { q: false, team: false },
  dmg: ({ talent, attr, calc }, { basic }) => basic(calc(attr.hp) * talent.e['技能伤害'] / 100, 'e', '蒸发')

 }, {
-  
+
  title: 'Q协同单段伤害',
-  params: { q: true,team:false },
+  params: { q: true, team: false },
  dmg: ({ talent, attr, calc, cons }, { basic }) => {
    return basic(calc(attr.hp) * (talent.q['玄掷玲珑伤害'] / 3 / 100), 'q')
  }
@ -19,30 +19,30 @@ export const details = [ {
  check: ({ cons }) => cons < 6,
  dmgKey: 'q',
  title: '夜莫万EE双蒸7次连携',
-  params: { q: true,team:true },
+  params: { q: true, team: true },
  dmg: ({ talent, attr, calc, cons }, { basic }) => {
    let e_v = basic(calc(attr.hp) * talent.e['技能伤害'] / 100, 'e', '蒸发')
    let erming = basic(calc(attr.hp) * (14 / 100), 'q')
    let count = cons * 1 >= 2 ? 1 : 0
-    let q = basic(calc(attr.hp) * (talent.q['玄掷玲珑伤害'] / 3 / 100), 'q',)
+    let q = basic(calc(attr.hp) * (talent.q['玄掷玲珑伤害'] / 3 / 100), 'q')
    return {
-        dmg: 2 * e_v.dmg + 4 * erming.dmg * count+ 21 * q.dmg,
-        avg: 2 * e_v.avg + 4 * erming.avg * count+ 21 * q.avg
+      dmg: 2 * e_v.dmg + 4 * erming.dmg * count + 21 * q.dmg,
+      avg: 2 * e_v.avg + 4 * erming.avg * count + 21 * q.avg
    }
  }
 }, {
  check: ({ cons }) => cons >= 6,
  dmgKey: 'q',
  title: '夜莫万6命EaEaaaa双蒸',
-  params: { q: true,team:true },
+  params: { q: true, team: true },
  dmg: ({ talent, attr, calc, cons }, { basic }) => {
    let e_v = basic(calc(attr.hp) * talent.e['技能伤害'] / 100, 'e', '蒸发')
    let erming = basic(calc(attr.hp) * (14 / 100), 'q')
-    let q = basic(calc(attr.hp) * (talent.q['玄掷玲珑伤害'] / 3 / 100), 'q',)
-    let a = basic(calc(attr.hp) * talent.a['破局矢伤害']*1.56 / 100, 'a2')
+    let q = basic(calc(attr.hp) * (talent.q['玄掷玲珑伤害'] / 3 / 100), 'q')
+    let a = basic(calc(attr.hp) * talent.a['破局矢伤害'] * 1.56 / 100, 'a2')
    return {
-        dmg: 2*e_v.dmg + 2*erming.dmg+ 15*q.dmg+ 5*a.dmg,
-        avg: 2*e_v.avg + 2*erming.avg+ 15*q.avg+ 5*a.avg
+      dmg: 2 * e_v.dmg + 2 * erming.dmg + 15 * q.dmg + 5 * a.dmg,
+      avg: 2 * e_v.avg + 2 * erming.avg + 15 * q.avg + 5 * a.avg
    }
  }
 }]
@ -51,8 +51,8 @@ export const defDmgKey = 'q'
 export const mainAttr = 'hp,cpct,cdmg'

 export const defParams = {
-    q: true,
-    team:true
+  q: true,
+  team: true
 }


@ -72,51 +72,56 @@ export const buffs = [{
  data: {
    dmg: ({ params }) => params.q ? 50 : 0
  }
-}, {check: ({ cons,params }) => cons <= 1 && params.team === true,
-    title: '精1苍古0命万叶：获得[dmg]%增伤(苍古普攻16增伤)，增加[atkPct]%攻击,减抗[kx]%',
-    data: {
-      aDmg:16,
-      a2Dmg:16,
-      a3Dmg:16,
-      dmg: 40,
-      atkPct:20,
-      kx:40,
-   }
-  }, {check: ({ cons,params }) => ((cons < 6 && cons >1) && params.team === true),
-    title: '精1苍古2命万叶：获得[dmg]%增伤(苍古普攻16增伤)，增加[atkPct]%攻击,减抗[kx]%,精通[mastery]',
-    data: {
-      aDmg:16,
-      a2Dmg:16,
-      a3Dmg:16,
-      dmg: 48,
-      atkPct:20,
-      kx:40,
-      mastery:200
-   }
-  }, {check: ({ cons,params }) =>  (cons >= 6 && params.team === true),
-    title: '精5苍古6命万叶：获得[dmg]%增伤(苍古普攻32增伤)，增加[atkPct]%攻击,减抗[kx]%,精通[mastery]',
-    data: {
-      aDmg:32,
-      a2Dmg:32,
-      a3Dmg:32,
-      dmg: 48,
-      atkPct:40,
-      kx:40,
-      mastery:200
-   }
-  }, {check: ({ cons,params }) =>  (cons >= 2&& params.team === true),
-    title: '千夜教官满命莫娜：获得[dmg]%增伤，双水,暴击[cpct]%,精通[mastery]',
-    data: {
-      dmg: 60,
-      hpPct: 25,
-      cpct:15,
-      mastery:168
-   }
-  }, {check: ({ cons,params }) =>  (cons < 2&& params.team === true),
-    title: '千夜教官0命莫娜：获得[dmg]%增伤，双水,精通[mastery]',
-    data: {
-      dmg: 60,
-      hpPct: 25,
-      mastery:168
-   }
-  }, 'vaporize']
+}, {
+  check: ({ cons, params }) => cons <= 1 && params.team === true,
+  title: '精1苍古0命万叶：获得[dmg]%增伤(苍古普攻16增伤)，增加[atkPct]%攻击,减抗[kx]%',
+  data: {
+    aDmg: 16,
+    a2Dmg: 16,
+    a3Dmg: 16,
+    dmg: 40,
+    atkPct: 20,
+    kx: 40
+  }
+}, {
+  check: ({ cons, params }) => ((cons < 6 && cons > 1) && params.team === true),
+  title: '精1苍古2命万叶：获得[dmg]%增伤(苍古普攻16增伤)，增加[atkPct]%攻击,减抗[kx]%,精通[mastery]',
+  data: {
+    aDmg: 16,
+    a2Dmg: 16,
+    a3Dmg: 16,
+    dmg: 48,
+    atkPct: 20,
+    kx: 40,
+    mastery: 200
+  }
+}, {
+  check: ({ cons, params }) => (cons >= 6 && params.team === true),
+  title: '精5苍古6命万叶：获得[dmg]%增伤(苍古普攻32增伤)，增加[atkPct]%攻击,减抗[kx]%,精通[mastery]',
+  data: {
+    aDmg: 32,
+    a2Dmg: 32,
+    a3Dmg: 32,
+    dmg: 48,
+    atkPct: 40,
+    kx: 40,
+    mastery: 200
+  }
+}, {
+  check: ({ cons, params }) => (cons >= 2 && params.team === true),
+  title: '千夜教官满命莫娜：获得[dmg]%增伤，双水,暴击[cpct]%,精通[mastery]',
+  data: {
+    dmg: 60,
+    hpPct: 25,
+    cpct: 15,
+    mastery: 168
+  }
+}, {
+  check: ({ cons, params }) => (cons < 2 && params.team === true),
+  title: '千夜教官0命莫娜：获得[dmg]%增伤，双水,精通[mastery]',
+  data: {
+    dmg: 60,
+    hpPct: 25,
+    mastery: 168
+  }
+}, 'vaporize']
--- a/resources/meta/character/安柏/calc.js
+++ b/resources/meta/character/安柏/calc.js
@ -6,12 +6,15 @@ export const details = [{
  dmg: ({ talent }, dmg) => dmg(talent.e['爆炸伤害'], 'e')
 }, {
  title: '兔兔伯爵蒸发',
+  dmgKey: 'e',
  check: ({ cons }) => cons < 2,
  dmg: ({ talent }, dmg) => dmg(talent.e['爆炸伤害'], 'e', 'vaporize')
 }, {
  title: '引爆兔兔伯爵蒸发',
  cons: 2,
-  dmg: ({ talent }, dmg) => dmg(talent.e['爆炸伤害'] * 3, 'e', 'vaporize')
+  dmgKey: 'e',
+  params: { e: true },
+  dmg: ({ talent }, dmg) => dmg(talent.e['爆炸伤害'], 'e', 'vaporize')
 }, {
  title: 'Q箭雨总伤害',
  params: { q: true },
@ -19,6 +22,7 @@ export const details = [{
 }]

 export const mainAttr = 'atk,cpct,cdmg,mastery'
+export const defDmgKey = 'e'

 export const buffs = [{
  title: '安柏天赋：命中弱点后攻击力提升15%',
@ -32,5 +36,8 @@ export const buffs = [{
  }
 }, {
  title: '安柏2命：瞄准引爆兔兔伯爵伤害提高200%',
-  cons: 2
+  cons: 2,
+  data: {
+    eDmg: ({ params }) => params.e ? 200 : 0
+  }
 }, 'vaporize']
--- a/resources/meta/character/宵宫/calc_auto.js
+++ b/resources/meta/character/宵宫/calc_auto.js
@ -1,54 +1,54 @@
 export const details = [{
  title: '首段普攻',
-  params: { num: 1 ,team:false},
+  params: { num: 1, team: false },
  dmg: ({ talent }, dmg) => dmg(talent.a['一段伤害'], 'a')
 }, {
  title: '普攻尾箭',
-  params: { num: 10 ,team:false},
+  params: { num: 10, team: false },
  dmg: ({ talent }, dmg) => dmg(talent.a['五段伤害'], 'a')
 }, {
  title: '尾箭蒸发',
-  params: { num: 10 ,team:false},
+  params: { num: 10, team: false },
  dmg: ({ talent }, dmg) => dmg(talent.a['五段伤害'], 'a', 'vaporize')
 }, {
  title: '宵夜万班尾箭蒸发',
-  params: { num: 10 ,team:true},
+  params: { num: 10, team: true },
  dmg: ({ talent }, dmg) => dmg(talent.a['五段伤害'], 'a', 'vaporize')
 }, {
  check: ({ cons }) => cons >= 6,
  dmgKey: 'e',
  title: '宵夜万班凹双蒸',
-  params: { num: 10 ,team:true},
-  dmg: ({ talent }, dmg) =>{
-  let a0Dmg = dmg(talent.a['一段伤害']/2, 'a', 'vaporize')
-  let a1Dmg = dmg(talent.a['一段伤害']/2, 'a')
-  let a1_5Dmg = dmg(talent.a['一段伤害']/2, 'a')
-  let a2Dmg = dmg(talent.a['二段伤害'], 'a')
-  let a3Dmg = dmg(talent.a['三段伤害'], 'a', 'vaporize')
-  let a4Dmg = dmg(talent.a['四段伤害'], 'a')
-  let a4_5Dmg = dmg(talent.a['四段伤害']/2, 'a')
-  let a5Dmg = dmg(talent.a['五段伤害'], 'a', 'vaporize')
-  let a5_5Dmg = dmg(talent.a['五段伤害']/2, 'a', 'vaporize')
-  return {
-      avg: a0Dmg.avg + a1Dmg.avg+ a1_5Dmg.avg+ a2Dmg.avg+ a3Dmg.avg+ 3 * a4_5Dmg.avg+ a5_5Dmg.avg+ a5Dmg.avg,
-      dmg: a0Dmg.dmg + a1Dmg.dmg +a1_5Dmg.dmg + a2Dmg.dmg + a3Dmg.dmg + 3 * a4_5Dmg.dmg+ a5_5Dmg.dmg + a5Dmg.dmg
+  params: { num: 10, team: true },
+  dmg: ({ talent }, dmg) => {
+    let a0Dmg = dmg(talent.a['一段伤害'] / 2, 'a', 'vaporize')
+    let a1Dmg = dmg(talent.a['一段伤害'] / 2, 'a')
+    let a1_5Dmg = dmg(talent.a['一段伤害'] / 2, 'a')
+    let a2Dmg = dmg(talent.a['二段伤害'], 'a')
+    let a3Dmg = dmg(talent.a['三段伤害'], 'a', 'vaporize')
+    let a4Dmg = dmg(talent.a['四段伤害'], 'a')
+    let a4_5Dmg = dmg(talent.a['四段伤害'] / 2, 'a')
+    let a5Dmg = dmg(talent.a['五段伤害'], 'a', 'vaporize')
+    let a5_5Dmg = dmg(talent.a['五段伤害'] / 2, 'a', 'vaporize')
+    return {
+      avg: a0Dmg.avg + a1Dmg.avg + a1_5Dmg.avg + a2Dmg.avg + a3Dmg.avg + 3 * a4_5Dmg.avg + a5_5Dmg.avg + a5Dmg.avg,
+      dmg: a0Dmg.dmg + a1Dmg.dmg + a1_5Dmg.dmg + a2Dmg.dmg + a3Dmg.dmg + 3 * a4_5Dmg.dmg + a5_5Dmg.dmg + a5Dmg.dmg
    }
  }
 }, {
  check: ({ cons }) => cons < 6,
  dmgKey: 'e',
  title: '宵夜万班147蒸发',
-  params: { num: 10 ,team:true},
-  dmg: ({ talent }, dmg) =>{
-  let a0Dmg = dmg(talent.a['一段伤害'], 'a', 'vaporize')
-  let a1Dmg = dmg(talent.a['一段伤害'], 'a')
-  let a2Dmg = dmg(talent.a['二段伤害'], 'a')
-  let a3Dmg = dmg(talent.a['三段伤害'], 'a', 'vaporize')
-  let a4Dmg = dmg(talent.a['四段伤害'], 'a')
-  let a5Dmg = dmg(talent.a['一段伤害'], 'a', 'vaporize')
-  return {
-      avg: a0Dmg.avg/2 + a1Dmg.avg/2+ a2Dmg.avg+ a3Dmg.avg+ a4Dmg.avg+ a5Dmg.avg,
-      dmg: a0Dmg.dmg/2 + a1Dmg.dmg/2 + a2Dmg.dmg + a3Dmg.dmg + a4Dmg.dmg + a5Dmg.dmg
+  params: { num: 10, team: true },
+  dmg: ({ talent }, dmg) => {
+    let a0Dmg = dmg(talent.a['一段伤害'], 'a', 'vaporize')
+    let a1Dmg = dmg(talent.a['一段伤害'], 'a')
+    let a2Dmg = dmg(talent.a['二段伤害'], 'a')
+    let a3Dmg = dmg(talent.a['三段伤害'], 'a', 'vaporize')
+    let a4Dmg = dmg(talent.a['四段伤害'], 'a')
+    let a5Dmg = dmg(talent.a['一段伤害'], 'a', 'vaporize')
+    return {
+      avg: a0Dmg.avg / 2 + a1Dmg.avg / 2 + a2Dmg.avg + a3Dmg.avg + a4Dmg.avg + a5Dmg.avg,
+      dmg: a0Dmg.dmg / 2 + a1Dmg.dmg / 2 + a2Dmg.dmg + a3Dmg.dmg + a4Dmg.dmg + a5Dmg.dmg
    }
  }
 }]
@ -57,10 +57,9 @@ export const defDmgKey = 'e'
 export const mainAttr = 'atk,cpct,cdmg,mastery'

 export const defParams = {
-    num: 10 ,team:true
+  num: 10, team: true
 }

-
 export const buffs = [{
  title: '焰硝庭火舞：开启E后额外提升普通[aMulti]%伤害',
  data: {
@ -72,55 +71,63 @@ export const buffs = [{
    dmg: ({ params }) => params.num ? params.num * 2 : 20
  }
 }, {
-    title: '风鹰宗室班：增加[atkPlus]点攻击力与[atkPct]%攻击力',
-    data: {
-      atkPct: 20,
-      atkPlus: 1202.35
+  title: '风鹰宗室班：增加[atkPlus]点攻击力与[atkPct]%攻击力',
+  sort: 9,
+  data: {
+    atkPct: 20,
+    atkPlus: 1202.35
  }
-  }, {check: ({ cons,params }) => cons <= 1 && params.team === true,
-    title: '精1苍古0命万叶：获得[dmg]%增伤(苍古普攻16增伤)，增加[atkPct]%攻击,减抗[kx]%',
-    data: {
-      aDmg:16,
-      a2Dmg:16,
-      a3Dmg:16,
-      dmg: 40,
-      atkPct:20,
-      kx:40,
-   }
-  }, {check: ({ cons,params }) => ((cons < 6 && cons >1) && params.team === true),
-    title: '精1苍古2命万叶：获得[dmg]%增伤(苍古普攻16增伤)，增加[atkPct]%攻击,减抗[kx]%,精通[mastery]',
-    data: {
-      aDmg:16,
-      a2Dmg:16,
-      a3Dmg:16,
-      dmg: 48,
-      atkPct:20,
-      kx:40,
-      mastery:200
-   }
-  }, {check: ({ cons,params }) =>  (cons >= 6 && params.team === true),
-    title: '精5苍古6命万叶：获得[dmg]%增伤(苍古普攻32增伤)，增加[atkPct]%攻击,减抗[kx]%,精通[mastery]',
-    data: {
-      aDmg:32,
-      a2Dmg:32,
-      a3Dmg:32,
-      dmg: 48,
-      atkPct:40,
-      kx:40,
-      mastery:200
-   }
-  }, {check: ({ params }) => params.team === true,
-    title: '夜兰：获得[dmg]%增伤',
-    data: {
-      dmg: 35
-   }
-  }, {
+}, {
+  check: ({ cons, params }) => cons <= 1 && params.team === true,
+  title: '精1苍古0命万叶：获得[dmg]%增伤(苍古普攻16增伤)，增加[atkPct]%攻击,减抗[kx]%',
+  sort: 9,
+  data: {
+    aDmg: 16,
+    a2Dmg: 16,
+    a3Dmg: 16,
+    dmg: 40,
+    atkPct: 20,
+    kx: 40
+  }
+}, {
+  check: ({ cons, params }) => ((cons < 6 && cons > 1) && params.team === true),
+  title: '精1苍古2命万叶：获得[dmg]%增伤(苍古普攻16增伤)，增加[atkPct]%攻击,减抗[kx]%,精通[mastery]',
+  sort: 9,
+  data: {
+    aDmg: 16,
+    a2Dmg: 16,
+    a3Dmg: 16,
+    dmg: 48,
+    atkPct: 20,
+    kx: 40,
+    mastery: 200
+  }
+}, {
+  check: ({ cons, params }) => (cons >= 6 && params.team === true),
+  title: '精5苍古6命万叶：获得[dmg]%增伤(苍古普攻32增伤)，增加[atkPct]%攻击,减抗[kx]%,精通[mastery]',
+  sort: 9,
+  data: {
+    aDmg: 32,
+    a2Dmg: 32,
+    a3Dmg: 32,
+    dmg: 48,
+    atkPct: 40,
+    kx: 40,
+    mastery: 200
+  }
+}, {
+  check: ({ params }) => params.team === true,
+  title: '夜兰：获得[dmg]%增伤',
+  data: {
+    dmg: 35
+  }
+}, {
  title: '宵宫2命：宵宫造成暴击后获得25%火伤加成',
  cons: 2,
  data: {
    dmg: ({ params }) => params.num > 1 ? 25 : 0
  }
-},{
+}, {
  title: '宵宫6命：加特林(按照一轮普攻触发3次，尾箭双蒸计算)',
  cons: 6,
  data: {
--- a/resources/meta/character/枫原万叶/calc.js
+++ b/resources/meta/character/枫原万叶/calc.js
@ -23,7 +23,7 @@ export const buffs = [{
 }, {
  title: '元素精通：扩散伤害提高[swirlPlus]%',
  sort: 2,
-  data:{
-    swirlPlus: ({calc, attr}) => 1600 * calc(attr.mastery) / (calc(attr.mastery) + 2000)
+  data: {
+    swirlPlus: ({ calc, attr }) => 1600 * calc(attr.mastery) / (calc(attr.mastery) + 2000)
  }
 }]
--- a/resources/meta/character/流浪者/data.json
+++ b/resources/meta/character/流浪者/data.json
@ -10,8 +10,8 @@
  "birth": "1-3",
  "astro": "浪客座",
  "desc": "身份成谜的流浪人士。衣着打扮像是修验者，言行却并不是修验者应有的模样。",
-  "cncv": "？？？",
-  "jpcv": "？？？",
+  "cncv": "鹿喑",
+  "jpcv": "柿原彻也",
  "costume": false,
  "ver": 1,
  "baseAttr": {
@ -28,7 +28,11 @@
    "7532": "e",
    "7539": "q"
  },
-  "talentId": {},
+  "talentId": {
+    "10751": 7531,
+    "10752": 7532,
+    "10755": 7539
+  },
  "talentCons": {
    "e": 5,
    "q": 3
--- a/resources/meta/character/流浪者/detail.json
+++ b/resources/meta/character/流浪者/detail.json
@ -720,6 +720,68 @@
        1564,
        1656,
        1748
+      ],
+      "技能伤害2": [
+        [
+          147.2,
+          5
+        ],
+        [
+          158.24,
+          5
+        ],
+        [
+          169.28,
+          5
+        ],
+        [
+          184,
+          5
+        ],
+        [
+          195.04,
+          5
+        ],
+        [
+          206.08,
+          5
+        ],
+        [
+          220.8,
+          5
+        ],
+        [
+          235.52,
+          5
+        ],
+        [
+          250.24,
+          5
+        ],
+        [
+          264.96,
+          5
+        ],
+        [
+          279.68,
+          5
+        ],
+        [
+          294.4,
+          5
+        ],
+        [
+          312.8,
+          5
+        ],
+        [
+          331.2,
+          5
+        ],
+        [
+          349.6,
+          5
+        ]
      ]
    }
  },
@ -732,7 +794,7 @@
      ]
    },
    "2": {
-      "name": "二番·箙岛月白浪",
+      "name": "二番·箙岛廓白浪",
      "desc": [
        "在优风倾姿状态下，狂言·式乐五番将依据空居力上限与当前的空居力的差值，每1点使此次狂言·式乐五番造成的伤害提升4%。",
        "通过这种方式，至多使狂言·式乐五番造成的伤害提升200%。"
--- a/resources/meta/character/珊瑚宫心海/imgs/splash0.webp
+++ b/resources/meta/character/珊瑚宫心海/imgs/splash0.webp
--- a/resources/meta/character/珐露珊/data.json
+++ b/resources/meta/character/珐露珊/data.json
@ -10,8 +10,8 @@
  "birth": "8-20",
  "astro": "蔓藤花饰座",
  "desc": "来自「一百年前」的学者，喜欢以前辈自居，对各类古老文字与古典机关都颇有研究。",
-  "cncv": "？？？",
-  "jpcv": "？？？",
+  "cncv": "阎萌萌",
+  "jpcv": "堀江由衣",
  "costume": false,
  "ver": 1,
  "baseAttr": {
@ -28,7 +28,11 @@
    "7632": "e",
    "7633": "q"
  },
-  "talentId": {},
+  "talentId": {
+    "10761": 7631,
+    "10762": 7632,
+    "10765": 7639
+  },
  "talentCons": {
    "e": 3,
    "q": 5
--- a/resources/meta/character/甘雨/calc_auto.js
+++ b/resources/meta/character/甘雨/calc_auto.js
@ -1,41 +1,41 @@
 export const details = [{
  title: '蓄力总伤害',
  params: {
-      team:false,
-      alter:false,
-      q: 0
+    team: false,
+    alter: false,
+    q: 0
  },
  dmg: ({ talent }, dmg) => dmg(talent.a['霜华矢·霜华绽发伤害'] + talent.a['霜华矢命中伤害'], 'a2')
 }, {
  title: '蓄力融化',
  params: {
-      team:false,
-      alter:false,
-      q: 0
+    team: false,
+    alter: false,
+    q: 0
  },
  dmg: ({ talent }, dmg) => dmg(talent.a['霜华矢·霜华绽发伤害'] + talent.a['霜华矢命中伤害'], 'a2', 'melt')
 }, {
  title: '甘鹤万班蓄力融化',
  params: {
-      team:true,
-      alter:false,
-      q: 0
+    team: true,
+    alter: false,
+    q: 0
  },
  dmg: ({ talent }, dmg) => dmg(talent.a['霜华矢·霜华绽发伤害'] + talent.a['霜华矢命中伤害'], 'a2', 'melt')
 }, {
  title: '甘纳万班蓄力融化',
  params: {
-      team:true,
-      alter:true,
-      q: 0
+    team: true,
+    alter: true,
+    q: 0
  },
  dmg: ({ talent }, dmg) => dmg(talent.a['霜华矢·霜华绽发伤害'] + talent.a['霜华矢命中伤害'], 'a2', 'melt')
 }, {
  title: 'Q单个冰凌伤害',
  params: {
-      team:false,
-      alter:false,
-      q: 1
+    team: false,
+    alter: false,
+    q: 1
  },
  dmg: ({ talent }, dmg) => dmg(talent.q['冰棱伤害'], 'q')
 }]
@ -44,9 +44,9 @@ export const defDmgIdx = 2
 export const mainAttr = 'atk,cpct,cdmg,mastery'

 export const defParams = {
-    q: 1,
-    team:true,
-    alter:true
+  q: 1,
+  team: true,
+  alter: true
 }

 export const buffs = [{
@ -67,66 +67,80 @@ export const buffs = [{
  data: {
    dmg: ({ params }) => params.q ? 25 : 0
  }
-}, {check: ({ cons,params }) => cons <= 1 && params.team === true,
-    title: '精1苍古0命万叶：获得[dmg]%增伤(苍古普攻16增伤)，增加[atkPct]%攻击,减抗[kx]%',
-    data: {
-      aDmg:16,
-      a2Dmg:16,
-      a3Dmg:16,
-      dmg: 40,
-      atkPct:20,
-      kx:40,
-   }
-  }, {check: ({ cons,params }) => ((cons < 6 && cons >1) && params.team === true),
-    title: '精1苍古2命万叶：获得[dmg]%增伤(苍古普攻16增伤)，增加[atkPct]%攻击,减抗[kx]%,精通[mastery]',
-    data: {
-      aDmg:16,
-      a2Dmg:16,
-      a3Dmg:16,
-      dmg: 48,
-      atkPct:20,
-      kx:40,
-      mastery:200
-   }
-  }, {check: ({ cons,params }) =>  (cons >= 6 && params.team === true),
-    title: '精5苍古6命万叶：获得[dmg]%增伤(苍古普攻32增伤)，增加[atkPct]%攻击,减抗[kx]%,精通[mastery]',
-    data: {
-      aDmg:32,
-      a2Dmg:32,
-      a3Dmg:32,
-      dmg: 48,
-      atkPct:40,
-      kx:40,
-      mastery:200
-   }
-  }, {check: ({ cons,params }) =>  (cons >= 6 && params.team === true&& params.alter === false),
-    title: '精5息灾申鹤：获得[dmg]%增伤,减抗[kx]%,爆伤15%,提升冰伤害5700',
-    data: {
-      dmg: 30,
-      kx:15,
-      cdmg:15,
-      a2Plus:5700*2,
-      ePlus:5700,
-      qPlus:5700
-   }
-  }, {check: ({ cons,params }) =>  (cons < 6 && params.team === true&& params.alter === false),
-    title: '精1息灾申鹤：获得[dmg]%增伤,减抗[kx]%,提升冰伤害4300',
-    data: {
-      dmg: 30,
-      kx:15,
-      a2Plus:4300*2,
-      ePlus:4300,
-      qPlus:4300
-   }
-  }, {check: ({ params }) => (params.team === true&& params.alter === true),
-    title: '千夜命纳西妲：增加精通[mastery]',
-    data: {
-      mastery: 290,
-   }
-  },{check: ({ params }) => params.team === true,
-    title: '风鹰宗室班：增加[atkPlus]点攻击力与[atkPct]%攻击力',
-    data: {
-      atkPct: 20,
-      atkPlus: 1202.35
+}, {
+  check: ({ cons, params }) => cons <= 1 && params.team === true,
+  title: '精1苍古0命万叶：获得[dmg]%增伤(苍古普攻16增伤)，增加[atkPct]%攻击,减抗[kx]%',
+  sort: 9,
+  data: {
+    aDmg: 16,
+    a2Dmg: 16,
+    a3Dmg: 16,
+    dmg: 40,
+    atkPct: 20,
+    kx: 40
  }
-  }, 'melt']
+}, {
+  check: ({ cons, params }) => ((cons < 6 && cons > 1) && params.team === true),
+  title: '精1苍古2命万叶：获得[dmg]%增伤(苍古普攻16增伤)，增加[atkPct]%攻击,减抗[kx]%,精通[mastery]',
+  sort: 9,
+  data: {
+    aDmg: 16,
+    a2Dmg: 16,
+    a3Dmg: 16,
+    dmg: 48,
+    atkPct: 20,
+    kx: 40,
+    mastery: 200
+  }
+}, {
+  check: ({ cons, params }) => (cons >= 6 && params.team === true),
+  title: '精5苍古6命万叶：获得[dmg]%增伤(苍古普攻32增伤)，增加[atkPct]%攻击,减抗[kx]%,精通[mastery]',
+  sort: 9,
+  data: {
+    aDmg: 32,
+    a2Dmg: 32,
+    a3Dmg: 32,
+    dmg: 48,
+    atkPct: 40,
+    kx: 40,
+    mastery: 200
+  }
+}, {
+  check: ({ cons, params }) => (cons >= 6 && params.team === true && params.alter === false),
+  title: '精5息灾申鹤：获得[dmg]%增伤,减抗[kx]%,爆伤15%,提升冰伤害5700',
+  sort: 9,
+  data: {
+    dmg: 30,
+    kx: 15,
+    cdmg: 15,
+    a2Plus: 5700 * 2,
+    ePlus: 5700,
+    qPlus: 5700
+  }
+}, {
+  check: ({ cons, params }) => (cons < 6 && params.team === true && params.alter === false),
+  title: '精1息灾申鹤：获得[dmg]%增伤,减抗[kx]%,提升冰伤害4300',
+  sort: 9,
+  data: {
+    dmg: 30,
+    kx: 15,
+    a2Plus: 4300 * 2,
+    ePlus: 4300,
+    qPlus: 4300
+  }
+}, {
+  check: ({ params }) => (params.team === true && params.alter === true),
+  title: '千夜命纳西妲：增加精通[mastery]',
+  sort: 9,
+  data: {
+    mastery: 290
+  }
+}, {
+  check: ({ params }) => params.team === true,
+  title: '风鹰宗室班：增加[atkPlus]点攻击力与[atkPct]%攻击力',
+  sort: 9,
+  data: {
+    atkPct: 20,
+    atkPlus: 1202.35
+  }
+}, 'melt']
--- a/resources/meta/character/神里绫人/calc_auto.js
+++ b/resources/meta/character/神里绫人/calc_auto.js
@ -1,45 +1,51 @@
 export const details = [{
  title: '瞬水剑三段伤害',
-  params: { q: 0 ,
-    team:false},
+  params: {
+    q: 0,
+    team: false
+  },
  dmg: ({ talent }, dmg) => dmg(talent.e['三段瞬水剑伤害'], 'a')
 }, {
  title: '瞬水剑三段蒸发',
-  params: { q: 1 ,
-    team:false},
+  params: {
+    q: 1,
+    team: false
+  },
  dmg: ({ talent }, dmg) => dmg(talent.e['三段瞬水剑伤害'], 'a', 'vaporize')
 }, {
  title: '绫夜万班瞬水剑三段蒸发',
-  params: { q: 1 ,
-    team:true},
+  params: {
+    q: 1,
+    team: true
+  },
  dmg: ({ talent }, dmg) => dmg(talent.e['三段瞬水剑伤害'], 'a', 'vaporize')
 }, {
  title: 'Q每段伤害',
-  params: { q: 1  ,
-    team:false},
+  params: {
+    q: 1,
+    team: false
+  },
  dmg: ({ talent }, dmg) => dmg(talent.q['水花剑伤害'], 'q')
 }]

 export const defDmgIdx = 2
 export const mainAttr = 'hp,atk,cpct,cdmg,mastery'

-
 export const defParams = {
-    q: 1,
-    team:true
+  q: 1,
+  team: true
 }

-
 export const buffs = [{
  title: '绫人元素爆发：普通攻击伤害提升伤害提升20%',
  data: {
-    dmg:20
+    dmg: 20
  }
 }, {
  cons: 1,
  title: '绫人1命：对于生命值低于或等于50%的敌人，瞬水剑造成的伤害提升40%',
  data: {
-    dmg:40
+    dmg: 40
  }
 }, {
  cons: 2,
@ -59,48 +65,57 @@ export const buffs = [{
  data: {
    aPlus: ({ attr, calc, talent }) => calc(attr.hp) * talent.e['浪闪伤害值提高'] / 100 * 5
  }
-}, {check: ({ params }) => params.team === true,
-    title: '风鹰宗室班：增加[atkPlus]点攻击力与[atkPct]%攻击力',
-    data: {
-      atkPct: 20,
-      atkPlus: 1202.35
+}, {
+  check: ({ params }) => params.team === true,
+  title: '风鹰宗室班：增加[atkPlus]点攻击力与[atkPct]%攻击力',
+  sort: 9,
+  data: {
+    atkPct: 20,
+    atkPlus: 1202.35
  }
-  }, {check: ({ cons,params }) => cons <= 1 && params.team === true,
-    title: '精1苍古0命万叶：获得[dmg]%增伤(苍古普攻16增伤)，增加[atkPct]%攻击,减抗[kx]%',
-    data: {
-      aDmg:16,
-      a2Dmg:16,
-      a3Dmg:16,
-      dmg: 40,
-      atkPct:20,
-      kx:40,
-   }
-  }, {check: ({ cons,params }) => ((cons < 6 && cons >1) && params.team === true),
-    title: '精1苍古2命万叶：获得[dmg]%增伤(苍古普攻16增伤)，增加[atkPct]%攻击,减抗[kx]%,精通[mastery]',
-    data: {
-      aDmg:16,
-      a2Dmg:16,
-      a3Dmg:16,
-      dmg: 48,
-      atkPct:20,
-      kx:40,
-      mastery:200
-   }
-  }, {check: ({ cons,params }) =>  (cons >= 6 && params.team === true),
-    title: '精5苍古6命万叶：获得[dmg]%增伤(苍古普攻32增伤)，增加[atkPct]%攻击,减抗[kx]%,精通[mastery]',
-    data: {
-      aDmg:32,
-      a2Dmg:32,
-      a3Dmg:32,
-      dmg: 48,
-      atkPct:40,
-      kx:40,
-      mastery:200
-   }
-  }, {check: ({ params }) => params.team === true,
-    title: '夜兰：获得[dmg]%增伤,[hpPct]%生命值,双水25%生命值',
-    data: {
-      dmg: 35,
-      hpPct:65
-   }
-  }, 'vaporize']
+}, {
+  check: ({ cons, params }) => cons <= 1 && params.team === true,
+  title: '精1苍古0命万叶：获得[dmg]%增伤(苍古普攻16增伤)，增加[atkPct]%攻击,减抗[kx]%',
+  sort: 9,
+  data: {
+    aDmg: 16,
+    a2Dmg: 16,
+    a3Dmg: 16,
+    dmg: 40,
+    atkPct: 20,
+    kx: 40
+  }
+}, {
+  check: ({ cons, params }) => ((cons < 6 && cons > 1) && params.team === true),
+  title: '精1苍古2命万叶：获得[dmg]%增伤(苍古普攻16增伤)，增加[atkPct]%攻击,减抗[kx]%,精通[mastery]',
+  sort: 9,
+  data: {
+    aDmg: 16,
+    a2Dmg: 16,
+    a3Dmg: 16,
+    dmg: 48,
+    atkPct: 20,
+    kx: 40,
+    mastery: 200
+  }
+}, {
+  check: ({ cons, params }) => (cons >= 6 && params.team === true),
+  title: '精5苍古6命万叶：获得[dmg]%增伤(苍古普攻32增伤)，增加[atkPct]%攻击,减抗[kx]%,精通[mastery]',
+  sort: 9,
+  data: {
+    aDmg: 32,
+    a2Dmg: 32,
+    a3Dmg: 32,
+    dmg: 48,
+    atkPct: 40,
+    kx: 40,
+    mastery: 200
+  }
+}, {
+  check: ({ params }) => params.team === true,
+  title: '夜兰：获得[dmg]%增伤,[hpPct]%生命值,双水25%生命值',
+  data: {
+    dmg: 35,
+    hpPct: 65
+  }
+}, 'vaporize']
--- a/resources/meta/character/纳西妲/imgs/splash0.webp
+++ b/resources/meta/character/纳西妲/imgs/splash0.webp
--- a/resources/meta/character/胡桃/calc.js
+++ b/resources/meta/character/胡桃/calc.js
@ -3,7 +3,6 @@ export const details = [{
  dmg: ({ talent, attr }, dmg) => dmg(talent.a['重击伤害'], 'a2')
 }, {
  title: '半血开E重击蒸发',
-  showDetail: true,
  dmg: ({ talent, attr }, dmg) => dmg(talent.a['重击伤害'], 'a2', 'vaporize')
 }, {
  title: '半血开E后Q',
--- a/resources/meta/character/达达利亚/calc_auto.js
+++ b/resources/meta/character/达达利亚/calc_auto.js
@ -1,22 +1,22 @@
 export const details = [{
  title: '开E后重击',
-  params: { team:false},
+  params: { team: false },
  dmg: ({ talent }, dmg) => dmg(talent.e['重击伤害'], 'a2')
 }, {
  title: '万达开E后重击',
-  params: { team:true},
+  params: { team: true },
  dmg: ({ talent }, dmg) => dmg(talent.e['重击伤害'], 'a2')
-},{
+}, {
  title: '断流·斩 伤害',
-  params: { team:false},
+  params: { team: false },
  dmg: ({ talent }, dmg) => dmg(talent.e['断流·斩 伤害'], 'e')
 }, {
  title: '开E后Q伤害',
-  params: { team:false},
+  params: { team: false },
  dmg: ({ talent }, dmg) => dmg(talent.q['技能伤害·近战'], 'q')
 }, {
  title: '万达开E后Q蒸发',
-  params: { team:true},
+  params: { team: true },
  dmg: ({ talent }, dmg) => dmg(talent.q['技能伤害·近战'], 'q', 'vaporize')
 }]

@ -24,46 +24,53 @@ export const defDmgIdx = 4
 export const mainAttr = 'atk,cpct,cdmg,mastery'

 export const defParams = {
-    team:true,
+  team: true
 }

-
-export const buffs = [{check: ({ params }) => params.team === true,
-    title: '风鹰宗室班：增加[atkPlus]点攻击力与[atkPct]%攻击力',
-    data: {
-      atkPct: 20,
-      atkPlus: 1202.35
+export const buffs = [{
+  check: ({ params }) => params.team === true,
+  title: '风鹰宗室班：增加[atkPlus]点攻击力与[atkPct]%攻击力',
+  sort: 9,
+  data: {
+    atkPct: 20,
+    atkPlus: 1202.35
  }
-  }, {check: ({ cons,params }) => cons <= 1 && params.team === true,
-    title: '精1苍古0命万叶：获得[dmg]%增伤(苍古普攻16增伤)，增加[atkPct]%攻击,减抗[kx]%',
-    data: {
-      aDmg:16,
-      a2Dmg:16,
-      a3Dmg:16,
-      dmg: 40,
-      atkPct:20,
-      kx:40,
-   }
-  }, {check: ({ cons,params }) => ((cons < 6 && cons >1) && params.team === true),
-    title: '精1苍古2命万叶：获得[dmg]%增伤(苍古普攻16增伤)，增加[atkPct]%攻击,减抗[kx]%,精通[mastery]',
-    data: {
-      aDmg:16,
-      a2Dmg:16,
-      a3Dmg:16,
-      dmg: 48,
-      atkPct:20,
-      kx:40,
-      mastery:200
-   }
-  }, {check: ({ cons,params }) =>  (cons >= 6 && params.team === true),
-    title: '精5苍古6命万叶：获得[dmg]%增伤(苍古普攻32增伤)，增加[atkPct]%攻击,减抗[kx]%,精通[mastery]',
-    data: {
-      aDmg:32,
-      a2Dmg:32,
-      a3Dmg:32,
-      dmg: 48,
-      atkPct:40,
-      kx:40,
-      mastery:200
-   }
-  },'vaporize']
+}, {
+  check: ({ cons, params }) => cons <= 1 && params.team === true,
+  title: '精1苍古0命万叶：获得[dmg]%增伤(苍古普攻16增伤)，增加[atkPct]%攻击,减抗[kx]%',
+  sort: 9,
+  data: {
+    aDmg: 16,
+    a2Dmg: 16,
+    a3Dmg: 16,
+    dmg: 40,
+    atkPct: 20,
+    kx: 40
+  }
+}, {
+  check: ({ cons, params }) => ((cons < 6 && cons > 1) && params.team === true),
+  title: '精1苍古2命万叶：获得[dmg]%增伤(苍古普攻16增伤)，增加[atkPct]%攻击,减抗[kx]%,精通[mastery]',
+  sort: 9,
+  data: {
+    aDmg: 16,
+    a2Dmg: 16,
+    a3Dmg: 16,
+    dmg: 48,
+    atkPct: 20,
+    kx: 40,
+    mastery: 200
+  }
+}, {
+  check: ({ cons, params }) => (cons >= 6 && params.team === true),
+  title: '精5苍古6命万叶：获得[dmg]%增伤(苍古普攻32增伤)，增加[atkPct]%攻击,减抗[kx]%,精通[mastery]',
+  sort: 9,
+  data: {
+    aDmg: 32,
+    a2Dmg: 32,
+    a3Dmg: 32,
+    dmg: 48,
+    atkPct: 40,
+    kx: 40,
+    mastery: 200
+  }
+}, 'vaporize']
--- a/resources/meta/character/雷电将军/calc_auto.js
+++ b/resources/meta/character/雷电将军/calc_auto.js
@ -4,7 +4,7 @@ export const details = [{
    type: 1,
    num: 0,
    ban: 0,
-    team:false
+    team: false
  },
  dmg: ({ talent, attr }, dmg) => dmg(talent.q['梦想一刀基础伤害'], 'q')
 }, {
@ -13,16 +13,16 @@ export const details = [{
    type: 0,
    num: 60,
    ban: 0,
-    team:false
+    team: false
  },
  dmg: ({ talent, attr }, dmg) => dmg(talent.q['梦想一刀基础伤害'], 'q')
-},{
+}, {
  title: '雷九八万满愿力Q首刀',
  params: {
    type: 0,
    num: 60,
    ban: 0,
-    team:true
+    team: true
  },
  dmg: ({ talent, attr }, dmg) => dmg(talent.q['梦想一刀基础伤害'], 'q')
 }, {
@ -31,7 +31,7 @@ export const details = [{
    type: 0,
    num: 60,
    ban: 1,
-    team:true
+    team: true
  },
  dmg: ({ talent, attr }, dmg) => dmg(talent.q['梦想一刀基础伤害'], 'q')
 }, {
@ -40,7 +40,7 @@ export const details = [{
    type: 1,
    num: 60,
    ban: 1,
-    team:true
+    team: true
  },
  dmg: ({ talent, attr }, dmg) => dmg(talent.q['重击伤害'], 'q')
 }]
@ -49,7 +49,7 @@ export const defParams = {
  ban: 1,
  num: 60,
  type: 0,
-  team:true
+  team: true
 }

 export const defDmgIdx = 2
@ -77,55 +77,66 @@ export const buffs = [
    data: {
      dmg: ({ attr }) => Math.max(attr.recharge.base + attr.recharge.plus - 100, 0) * 0.4
    }
-  }, {check: ({ params }) => params.team === true,
+  }, {
+    check: ({ params }) => params.team === true,
    title: '风鹰宗室班：增加[atkPlus]点攻击力与[atkPct]%攻击力',
+    sort: 9,
    data: {
-      atkPct: ({ params }) =>20 * params.ban,
-      atkPlus: ({ params }) =>1202.35 * params.ban
-  }
-  }, {check: ({ cons,params }) => cons > 2 && params.team === true,
+      atkPct: ({ params }) => 20 * params.ban,
+      atkPlus: ({ params }) => 1202.35 * params.ban
+    }
+  }, {
+    check: ({ cons, params }) => cons > 2 && params.team === true,
    title: '八重4命：增加20%雷伤',
+    sort: 9,
    data: {
-      dmg: ({ params }) =>20 * (1 - params.ban)
-  }
-  }, {check: ({ cons,params }) => cons <= 1 && params.team === true,
+      dmg: ({ params }) => 20 * (1 - params.ban)
+    }
+  }, {
+    check: ({ cons, params }) => cons <= 1 && params.team === true,
    title: '精1苍古0命万叶：获得[dmg]%增伤(苍古普攻16增伤)，增加[atkPct]%攻击,减抗[kx]%',
+    sort: 9,
    data: {
-      aDmg:16,
-      a2Dmg:16,
-      a3Dmg:16,
+      aDmg: 16,
+      a2Dmg: 16,
+      a3Dmg: 16,
      dmg: 40,
-      atkPct:20,
-      kx:40,
-   }
-  }, {check: ({ cons,params }) =>  (cons < 3&& cons > 1&& params.team === true),
+      atkPct: 20,
+      kx: 40
+    }
+  }, {
+    check: ({ cons, params }) => (cons < 3 && cons > 1 && params.team === true),
    title: '精1苍古2命万叶：获得[dmg]%增伤(苍古普攻16增伤)，增加[atkPct]%攻击,减抗[kx]%,精通[mastery]',
+    sort: 9,
    data: {
-      aDmg:16,
-      a2Dmg:16,
-      a3Dmg:16,
+      aDmg: 16,
+      a2Dmg: 16,
+      a3Dmg: 16,
      dmg: 48,
-      atkPct:20,
-      kx:40,
-      mastery:200
-   }
-  }, {check: ({ cons,params }) =>  (cons >= 3 && params.team === true),
+      atkPct: 20,
+      kx: 40,
+      mastery: 200
+    }
+  }, {
+    check: ({ cons, params }) => (cons >= 3 && params.team === true),
    title: '精5苍古6命万叶：获得[dmg]%增伤(苍古普攻32增伤)，增加[atkPct]%攻击,减抗[kx]%,精通[mastery]',
+    sort: 9,
    data: {
-      aDmg:32,
-      a2Dmg:32,
-      a3Dmg:32,
+      aDmg: 32,
+      a2Dmg: 32,
+      a3Dmg: 32,
      dmg: 48,
-      atkPct:40,
-      kx:40,
-      mastery:200
-   }
-  }, {check: ({ params }) => params.team === true,
+      atkPct: 40,
+      kx: 40,
+      mastery: 200
+    }
+  }, {
+    check: ({ params }) => params.team === true,
    title: '教官天空九条：增加[atkPlus]点攻击力与[cdmg]%爆伤,精通[mastery]',
    data: {
      atkPlus: 794.2,
-      cdmg:60,
-      mastery:120
-   }
+      cdmg: 60,
+      mastery: 120
+    }
  }
-      ]
+]
--- a/resources/meta/character/香菱/calc_auto.js
+++ b/resources/meta/character/香菱/calc_auto.js
@ -1,18 +1,18 @@
 export const details = [{
  title: '锅巴单口伤害',
-  params: { team:false},
+  params: { team: false },
  dmg: ({ talent }, dmg) => dmg(talent.e['喷火伤害'], 'e')
 }, {
  title: '万达锅巴单口蒸发',
-  params: { team:true},
+  params: { team: true },
  dmg: ({ talent }, dmg) => dmg(talent.e['喷火伤害'], 'e', 'vaporize')
 }, {
  title: ' 旋火轮单次伤害',
-  params: { team:false},
+  params: { team: false },
  dmg: ({ talent }, dmg) => dmg(talent.q['旋火轮伤害'], 'q')
 }, {
  title: '万达旋火轮单次蒸发',
-  params: { team:true},
+  params: { team: true },
  dmg: ({ talent }, dmg) => dmg(talent.q['旋火轮伤害'], 'q', 'vaporize')
 }]

@ -20,7 +20,7 @@ export const defDmgIdx = 3
 export const mainAttr = 'atk,cpct,cdmg'

 export const defParams = {
-    team:true,
+  team: true
 }


@ -30,42 +30,50 @@ export const buffs = [{
  data: {
    kx: 15
  }
-}, {check: ({ params }) => params.team === true,
-    title: '风鹰宗室班：增加[atkPlus]点攻击力与[atkPct]%攻击力',
-    data: {
-      atkPct: 20,
-      atkPlus: 1202.35
+}, {
+  check: ({ params }) => params.team === true,
+  title: '风鹰宗室班：增加[atkPlus]点攻击力与[atkPct]%攻击力',
+  sort: 9,
+  data: {
+    atkPct: 20,
+    atkPlus: 1202.35
  }
-  }, {check: ({ cons,params }) => cons <= 1 && params.team === true,
-    title: '精1苍古0命万叶：获得[dmg]%增伤(苍古普攻16增伤)，增加[atkPct]%攻击,减抗[kx]%',
-    data: {
-      aDmg:16,
-      a2Dmg:16,
-      a3Dmg:16,
-      dmg: 40,
-      atkPct:20,
-      kx:40,
-   }
-  }, {check: ({ cons,params }) => ((cons < 6 && cons >1) && params.team === true),
-    title: '精1苍古2命万叶：获得[dmg]%增伤(苍古普攻16增伤)，增加[atkPct]%攻击,减抗[kx]%,精通[mastery]',
-    data: {
-      aDmg:16,
-      a2Dmg:16,
-      a3Dmg:16,
-      dmg: 48,
-      atkPct:20,
-      kx:40,
-      mastery:200
-   }
-  }, {check: ({ cons,params }) =>  (cons >= 6 && params.team === true),
-    title: '精5苍古6命万叶：获得[dmg]%增伤(苍古普攻32增伤)，增加[atkPct]%攻击,减抗[kx]%,精通[mastery]',
-    data: {
-      aDmg:32,
-      a2Dmg:32,
-      a3Dmg:32,
-      dmg: 48,
-      atkPct:40,
-      kx:40,
-      mastery:200
-   }
-  }, 'vaporize']
+}, {
+  check: ({ cons, params }) => cons <= 1 && params.team === true,
+  title: '精1苍古0命万叶：获得[dmg]%增伤(苍古普攻16增伤)，增加[atkPct]%攻击,减抗[kx]%',
+  sort: 9,
+  data: {
+    aDmg: 16,
+    a2Dmg: 16,
+    a3Dmg: 16,
+    dmg: 40,
+    atkPct: 20,
+    kx: 40
+  }
+}, {
+  check: ({ cons, params }) => ((cons < 6 && cons > 1) && params.team === true),
+  title: '精1苍古2命万叶：获得[dmg]%增伤(苍古普攻16增伤)，增加[atkPct]%攻击,减抗[kx]%,精通[mastery]',
+  sort: 9,
+  data: {
+    aDmg: 16,
+    a2Dmg: 16,
+    a3Dmg: 16,
+    dmg: 48,
+    atkPct: 20,
+    kx: 40,
+    mastery: 200
+  }
+}, {
+  check: ({ cons, params }) => (cons >= 6 && params.team === true),
+  title: '精5苍古6命万叶：获得[dmg]%增伤(苍古普攻32增伤)，增加[atkPct]%攻击,减抗[kx]%,精通[mastery]',
+  sort: 9,
+  data: {
+    aDmg: 32,
+    a2Dmg: 32,
+    a3Dmg: 32,
+    dmg: 48,
+    atkPct: 40,
+    kx: 40,
+    mastery: 200
+  }
+}, 'vaporize']
--- a/tools/char-ambr.js
+++ b/tools/char-ambr.js
--- a/tools/artis-data-sprider.js
+++ b/tools/artis-data-sprider.js
--- a/tools/char-data-sprider.js
+++ b/tools/char-data-sprider.js
@ -263,4 +263,4 @@ let eta = {
  流浪者: '2022-12-07 11:00:00',
  珐露珊: '2022-12-07 11:00:00'
 }
-await down('42', true)
+await down('75,76', true)
--- a/tools/sprider/TalentId.js
+++ b/tools/sprider/TalentId.js
@ -1157,6 +1157,42 @@ export default  {
    SideIconName: "UI_AvatarIcon_Side_Layla",
    QualityType: "QUALITY_PURPLE"
  },
+  10000075: {
+    Element: "Wind",
+    Consts: ["UI_Talent_S_Wanderer_01", "UI_Talent_S_Wanderer_02", "UI_Talent_U_Wanderer_02", "UI_Talent_S_Wanderer_03", "UI_Talent_U_Wanderer_01", "UI_Talent_S_Wanderer_04"],
+    SkillOrder: [10751, 10752, 10755],
+    Skills: {
+      10751: "Skill_A_Catalyst_MD",
+      10752: "Skill_S_Wanderer_01",
+      10755: "Skill_E_Wanderer_01"
+    },
+    ProudMap: {
+      10751: 7531,
+      10752: 7532,
+      10755: 7539
+    },
+    NameTextMapHash: 3230559562,
+    SideIconName: "UI_AvatarIcon_Side_Wanderer",
+    QualityType: "QUALITY_ORANGE"
+  },
+  10000076: {
+    Element: "Wind",
+    Consts: ["UI_Talent_S_Faruzan_01", "UI_Talent_S_Faruzan_02", "UI_Talent_U_Faruzan_01", "UI_Talent_S_Faruzan_03", "UI_Talent_U_Faruzan_02", "UI_Talent_S_Faruzan_04"],
+    SkillOrder: [10761, 10762, 10765],
+    Skills: {
+      10761: "Skill_A_02",
+      10762: "Skill_S_Faruzan_01",
+      10765: "Skill_E_Faruzan_01"
+    },
+    ProudMap: {
+      10761: 7631,
+      10762: 7632,
+      10765: 7639
+    },
+    NameTextMapHash: 2387711994,
+    SideIconName: "UI_AvatarIcon_Side_Faruzan",
+    QualityType: "QUALITY_PURPLE"
+  },
  "10000005-501": {
    Element: "None",
    Consts: ["None", "None", "None", "None", "None", "None"],
--- a/tools/weapon-data-sprider.js
+++ b/tools/weapon-data-sprider.js