fix星铁伤害排名

models/ArtifactSet.js

@@ -4,7 +4,7 @@
 import lodash from 'lodash'
 import Base from './Base.js'
 import { abbr, artiMap, artiSetMap, calc as artisBuffs } from '../resources/meta/artifact/index.js'
-import { artiMap as artiMapSR, artisBuffs as artisBuffsSR, artiSetMap as artiSetMapSR } from '../resources/meta-sr/artifact/index.js'
+import { abbr as abbrSR, artiMap as artiMapSR, artisBuffs as artisBuffsSR, artiSetMap as artiSetMapSR } from '../resources/meta-sr/artifact/index.js'
 
 import { Artifact } from './index.js'
 
@@ -30,12 +30,12 @@ class ArtifactSet extends Base {
   }
 
   get img () {
-    let arti = Artifact.get(this.sets[1])
+    let arti = Artifact.get(this.sets[1] || this.sets[5], this.game)
     return arti ? arti.img : ''
   }
 
   get abbr () {
-    return abbr[this.name] || this.name
+    return this.game === 'gs' ? (abbr[this.name] || this.name) : (abbrSR[this.name] || this.name)
   }
 
   static getByArti (name) {

models/AvatarArtis.js

@@ -302,8 +302,8 @@ export default class AvatarArtis extends Base {
       names,
       imgs,
       abbrs: [...abbrs, ...abbrs2],
-      name: (abbrs.length > 1 || abbrs2[0]?.length > 7) ? abbrs.join('+') : abbrs2[0],
+      name: (abbrs.length > 1 || abbrs2[0]?.length > 7) ? abbrs.slice(0, 2).join('+') : abbrs2[0],
-      sName: abbrs.join('+')
+      sName: abbrs.slice(0, 2).join('+')
     }
   }
 

resources/character/profile-detail.css

@@ -257,6 +257,18 @@ body {
   top: 0;
   margin-left: -14px;
 }
+.talent-icon.talent-destiny:after {
+  content: "";
+  display: block;
+  width: 37px;
+  height: 37px;
+  background: url("../character/imgs/destiny.webp") no-repeat;
+  background-size: contain;
+  position: absolute;
+  left: 50%;
+  top: 0;
+  margin-left: -14px;
+}
 .char-talents {
   display: flex;
   width: 300px;

resources/character/profile-detail.html

@@ -29,7 +29,8 @@
           <div class="talent-item">
             <div class="talent-icon
                {{talent.level > talent.original ? `talent-plus`:``}}
-                {{talent.original >= 10 ? `talent-crown`:``}}">
+                {{talent.original >= 10 && game === 'gs' ? `talent-crown`:``}}
+                {{talent.original >= 10 && game === 'sr' ? `talent-destiny`:``}}">
               <div class="talent-icon-img"
                    style="background-image:url({{_res_path}}{{imgs[key]}})"></div>
               <span>{{talent.level}}</span>

resources/character/profile-detail.less

@@ -306,6 +306,19 @@ body {
     top: 0;
     margin-left: -14px;
   }
+
+  &.talent-destiny:after {
+    content: "";
+    display: block;
+    width: 37px;
+    height: 37px;
+    background: url("../character/imgs/destiny.webp") no-repeat;
+    background-size: contain;
+    position: absolute;
+    left: 50%;
+    top: 0;
+    margin-left: -14px;
+  }
 }
 
 .char-talents {

resources/character/rank-profile-list.css

@@ -197,6 +197,18 @@ body {
   top: -2px;
   margin-left: -9px;
 }
+.char-talent .talent-icon.talent-destiny:after {
+  content: "";
+  display: block;
+  width: 22px;
+  height: 22px;
+  background: url("../character/imgs/destiny.webp") no-repeat;
+  background-size: contain;
+  position: absolute;
+  left: 50%;
+  top: -2px;
+  margin-left: -9px;
+}
 .char-item {
   vertical-align: middle;
   height: 50px;

resources/character/rank-profile-list.html

@@ -86,7 +86,8 @@
       <div class="talent-item">
         <div class="talent-icon
            {{talent.level > talent.original ? `talent-plus`:``}}
-            {{talent.original >= 10 ? `talent-crown`:``}}">
+            {{talent.original >= 10 && game === 'gs' ? `talent-crown`:``}}
+            {{talent.original >= 10 && game === 'sr' ? `talent-destiny`:``}}">
           <div class="talent-icon-img"
                style="background-image:url({{_res_path}}{{ds.imgs[key]}})"></div>
           <span>{{talent.level}}</span>
@@ -116,9 +117,11 @@
     {{set aImgs = ds?.artisSet?.imgs || []}}
     <div class="char-item char-artis class-{{mark?.markClass||'D'}}">
       <div
-          class="item artis item-icon avatar-artis  {{aImgs.length>0?'star5':'no-artis'}} artis{{aImgs.length}}">
+          class="item artis item-icon avatar-artis  {{aImgs.length>0?'star5':'no-artis'}} artis{{aImgs.length>2 ? 2 : aImgs.length}}">
-        {{each aImgs img}}
+        {{each aImgs img idx}}
+          {{if idx < 2}}
           <div class="img" style="background-image:url({{_res_path}}{{img}})"></div>
+          {{/if}}
         {{/each}}
         {{if aImgs.length === 0}}
         <span class="img no-artis"></span>

resources/character/rank-profile-list.less

@@ -222,6 +222,19 @@ body {
       top: -2px;
       margin-left: -9px;
     }
+
+    &.talent-destiny:after {
+      content: "";
+      display: block;
+      width: 22px;
+      height: 22px;
+      background: url("../character/imgs/destiny.webp") no-repeat;
+      background-size: contain;
+      position: absolute;
+      left: 50%;
+      top: -2px;
+      margin-left: -9px;
+    }
   }
 }
 

resources/meta-sr/artifact/meta.js

@@ -1,6 +1,5 @@
 import lodash from 'lodash'
 import { Format } from '#miao'
-import { attrPct, basicNum } from '../../meta/artifact/index.js'
 
 export const mainAttr = {
   3: 'atk,def,hp,cpct,cdmg,heal,effPct'.split(','),
@@ -50,7 +49,6 @@ lodash.forEach(attrMap, (attr, key) => {
 
   // 设置展示文字
   attr.text = Format[attr.format](attr.value, 2)
-
 })
 
 export { attrMap }
@@ -78,8 +76,33 @@ export const abbr = {
   塔利亚的裸皮电线: '塔利亚的电线',
   翁瓦克的诞生之岛: '翁瓦克的诞生岛',
   翁瓦克的环岛海岸: '翁瓦克的海岸',
-  泰科铵的镭射球场:'泰科铵的球场',
+  泰科铵的镭射球场: '泰科铵的球场',
-  泰科铵的弧光赛道:'泰科铵的赛道',
+  泰科铵的弧光赛道: '泰科铵的赛道',
-  伊须磨洲的残船鲸落:'伊须磨洲的鲸落',
+  伊须磨洲的残船鲸落: '伊须磨洲的鲸落',
-  伊须磨洲的坼裂缆索:'伊须磨洲的缆索'
+  伊须磨洲的坼裂缆索: '伊须磨洲的缆索',
+
+  盗匪荒漠的废土客: '虚数套',
+  繁星璀璨的天才: '繁星',
+  激奏雷电的乐队: '雷套',
+  熔岩锻铸的火匠: '火套',
+  晨昏交界的翔鹰: '风套',
+  野穗伴行的快枪手: '快枪手',
+  密林卧雪的猎人: '冰套',
+  流星追迹的怪盗: '怪盗',
+  街头出身的拳王: '拳王',
+  云无留迹的过客: '过客',
+  戍卫风雪的铁卫: '铁卫',
+  净庭教宗的圣骑士: '圣骑士',
+  筑城者的贝洛伯格: '筑城者',
+  星体差分机: '差分机',
+  停转的萨尔索图: '停转',
+  不老者的仙舟: '仙舟',
+  盗贼公国塔利亚: '盗贼',
+  泛银河商业公司: '泛银河',
+  太空封印站: '太空',
+  生命的翁瓦克: '翁瓦克',
+  繁星竞技场: '竞技场',
+  折断的龙骨: '龙骨',
+  宝命长存的莳者: '莳者',
+  骇域漫游的信使: '信使'
 }

resources/meta-sr/character/丹恒/calc.js

@@ -12,6 +12,7 @@ export const details = [{
   dmg: ({ talent }, dmg) => dmg(talent.q['技能伤害'] + talent.q['减速目标q伤害倍率提高'], 'q')
 }]
 
+export const defDmgIdx = 2
 export const mainAttr = 'atk,cpct,cdmg'
 
 export const buffs = [{

resources/meta-sr/character/停云/calc.js

@@ -20,6 +20,7 @@ export const details = [{
   }
 }]
 
+export const defDmgIdx = 1
 export const mainAttr = 'atk,cpct,cdmg'
 
 export const buffs = [{

resources/meta-sr/character/姬子/calc.js

@@ -12,6 +12,7 @@ export const details = [{
   dmg: ({ talent }, dmg) => dmg(talent.t['技能伤害'], 't')
 }]
 
+export const defDmgIdx = 2
 export const mainAttr = 'atk,cpct,cdmg,speed'
 
 export const buffs = [{

resources/meta-sr/character/布洛妮娅/calc.js

@@ -29,6 +29,7 @@ export const details = [{
   }
 }]
 
+export const defDmgIdx = 3
 export const mainAttr = 'atk,cpct,cdmg'
 
 export const buffs = [{

resources/meta-sr/character/希儿/calc.js

@@ -9,6 +9,7 @@ export const details = [{
   dmg: ({ talent }, dmg) => dmg(talent.q['技能伤害'], 'q')
 }]
 
+export const defDmgIdx = 2
 export const mainAttr = 'atk,cpct,cdmg,speed'
 
 export const buffs = [{

resources/meta-sr/character/景元/calc.js

@@ -12,6 +12,7 @@ export const details = [{
   dmg: ({ talent }, dmg) => dmg(talent.t['技能伤害'] * 10, 'a3')
 }]
 
+export const defDmgIdx = 3
 export const mainAttr = 'atk,cpct,cdmg,speed'
 
 export const buffs = [{

resources/meta-sr/character/杰帕德/calc.js

@@ -9,9 +9,10 @@ export const details = [{
   dmg: ({ attr, calc, talent }, { shield }) => shield(calc(attr.def) * talent.q['百分比防御力'] + talent.q['固定数值'])
 }, {
   title: '秘技护盾量',
-  dmg: ({ attr, calc, talent }, { shield }) => shield(calc(attr.def) * 0.24 + 150)
+  dmg: ({ attr, calc }, { shield }) => shield(calc(attr.def) * 0.24 + 150)
 }]
 
+export const defDmgIdx = 2
 export const mainAttr = 'atk,cpct,cdmg,def'
 
 export const buffs = [{

resources/meta-sr/character/桑博/calc.js

@@ -30,7 +30,7 @@ export const details = [{
   }
 }]
 
-export const defDmgIdx = 1
+export const defDmgIdx = 4
 export const mainAttr = 'atk,cpct,cdmg'
 
 export const buffs = [{

resources/meta-sr/character/瓦尔特/calc.js

@@ -12,6 +12,7 @@ export const details = [{
   dmg: ({ talent }, dmg) => dmg(talent.t['附加伤害'], 't')
 }]
 
+export const defDmgIdx = 1
 export const mainAttr = 'atk,cpct,cdmg'
 
 export const buffs = [{

resources/meta-sr/character/银狼/calc.js

@@ -19,7 +19,8 @@ export const details = [{
   }
 }]
 
-export const mainAttr = 'atk,cpct,cdmg,effPct'
+export const defDmgIdx = 2
+export const mainAttr = 'atk,cpct,cdmg'
 
 export const buffs = [{
   title: '银狼天赋：防御力缺陷降低敌方防御力[enemyDef]%',