Merge branch 'master' of gitee.com:yoimiya-kokomi/miao-plugin

# Conflicts:
#	resources/meta/artifact/artis-mark.js

resources/character/profile-detail.css

@@ -108,7 +108,7 @@ body {
   display: inline-block;
   height: 16px;
   width: 16px;
-  background-image: url("./imgs/icon.png");
+  background-image: url("imgs/icon.png");
   background-size: auto 16px;
 }
 .char-attr li .title {
@@ -260,18 +260,6 @@ 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;
@@ -613,7 +601,7 @@ body {
   top: 9px;
   height: 8px;
   width: 50px;
-  background-image: url('./imgs/up-num-icon1.png');
+  background-image: url('imgs/up-num-icon1.png');
   background-position: 0 0;
   background-repeat: no-repeat;
   background-size: auto 500%;
@@ -642,14 +630,14 @@ body {
   color: #ffe699;
 }
 .artis ul.detail li.great span.title i.up-num {
-  background-image: url("./imgs/up-num-icon2.png");
+  background-image: url("imgs/up-num-icon2.png");
   background-size: auto 500%;
 }
 .artis ul.detail li.nouse span {
   color: #888;
 }
 .artis ul.detail li.nouse span i.up-num {
-  background-image: url("./imgs/up-num-icon0.png");
+  background-image: url("imgs/up-num-icon0.png");
   background-size: auto 500%;
 }
 .artis ul.detail li.arti-main {
@@ -855,7 +843,7 @@ body {
   margin-bottom: 25px;
 }
 .game-sr .char-attr .icon i {
-  background-image: url('./imgs/icon-sr.png');
+  background-image: url('imgs/icon-sr.png');
 }
 .sr-weapon {
   margin: 0 15px 5px 10px;
@@ -1049,4 +1037,3 @@ body {
 .copyright.ad {
   font-size: 12px;
 }
-/*# sourceMappingURL=profile-detail.css.map */

resources/character/profile-detail.html

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

resources/character/profile-detail.less

@@ -310,19 +310,6 @@ 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

@@ -16,7 +16,7 @@ body {
 .group-rank-icon {
   width: 16px;
   height: 16px;
-  background: url("./imgs/mark-icon.png");
+  background: url("imgs/mark-icon.png");
   background-size: auto 100%;
   display: inline-block;
   vertical-align: bottom;
@@ -55,7 +55,7 @@ body {
   width: 24px;
   height: 24px;
   margin: 13px 12px;
-  background: url('./imgs/mark-icon.png');
+  background: url('imgs/mark-icon.png');
   background-size: auto 100%;
   text-align: center;
   font-size: 12px;
@@ -66,7 +66,7 @@ body {
 .char-idx .idx-icon.mode-dmg.idx-1 {
   width: 48px;
   margin: 13px 0;
-  background-image: url('./imgs/mark-icon2.png');
+  background-image: url('imgs/mark-icon2.png');
   color: rgba(0, 0, 0, 0);
   text-shadow: none;
 }
@@ -197,12 +197,12 @@ body {
   top: -2px;
   margin-left: -9px;
 }
-.char-talent .talent-icon.talent-destiny:after {
+.char-talent .talent-icon.talent-crown-sr:after {
   content: "";
   display: block;
   width: 22px;
   height: 22px;
-  background: url("../character/imgs/destiny.webp") no-repeat;
+  background: url("../character/imgs/crown-sr.webp") no-repeat;
   background-size: contain;
   position: absolute;
   left: 50%;
@@ -342,4 +342,3 @@ body {
   font-size: 12px;
   color: #aaa;
 }
-/*# sourceMappingURL=rank-profile-list.css.map */

resources/character/rank-profile-list.html

@@ -87,7 +87,7 @@
         <div class="talent-icon
            {{talent.level > talent.original ? `talent-plus`:``}}
             {{talent.original >= 10 && game === 'gs' ? `talent-crown`:``}}
-            {{talent.original >= 10 && game === 'sr' ? `talent-destiny`:``}}">
+            {{talent.original >= 10 && game === 'sr' ? `talent-crown-sr`:``}}">
           <div class="talent-icon-img"
                style="background-image:url({{_res_path}}{{ds.imgs[key]}})"></div>
           <span>{{talent.level}}</span>
@@ -98,15 +98,17 @@
 
     <div class="char-item char-weapon line">
       {{set w = ds.weapon }}
-      <div class="item item-icon star{{w.star}}">
+      <div class="item item-icon star{{w?.star}}">
-        <div class="img" style="background-image:url({{_res_path}}{{w.img}})"></div>
+        <div class="img" style="background-image:url({{_res_path}}{{w?.img}})"></div>
       </div>
       <div class="char-info weapon-info">
         <div class="name">
-          <strong> {{w.name?.length > 4 ? (w.abbr||w.name) : w.name}}</strong>
+          <strong> {{w?.name?.length > 4 ? (w?.abbr||w?.name) : w?.name}}</strong>
         </div>
         <div class="info">
+          {{if w}}
           <span class="cons cons-{{w.affix+1}}">精{{w.affix}}</span> Lv.{{w.leve || w.level}}
+          {{/if}}
         </div>
       </div>
     </div>

resources/character/rank-profile-list.less

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

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

@@ -33,8 +33,14 @@ export const mainAttr = 'atk,cpct,cdmg'
 
 export const buffs = [{
   title: '行迹-军势：布洛妮娅在场时，我方全体造成的伤害提高10%',
-  check: ({ trees }) => trees[103],
+  tree: 3,
   data: {
     dmg: 10
   }
+}, {
+  title: '行迹-号令：普攻的暴击率提高至[aCpct]%',
+  tree: 1,
+  data: {
+    aCpct: 100
+  }
 }]

resources/meta/artifact/artis-mark.js

@@ -71,5 +71,5 @@ export const usefulAttr = {
   林尼: { hp: 0, atk: 75, def: 0, cpct: 100, cdmg: 100, mastery: 0, dmg: 100, phy: 0, recharge: 55, heal: 0 },
   琳妮特: { hp: 0, atk: 75, def: 0, cpct: 100, cdmg: 100, mastery: 0, dmg: 100, phy: 0, recharge: 55, heal: 0 },
   菲米尼: { hp: 0, atk: 75, def: 0, cpct: 100, cdmg: 100, mastery: 0, dmg: 100, phy: 100, recharge: 55, heal: 0 },
-  那维莱特: { hp: 100, atk: 0, def: 0, cpct: 100, cdmg: 100, mastery: 75, dmg: 100, phy: 100, recharge: 75, heal: 0 }
+  那维莱特: { hp: 100, atk: 0, def: 0, cpct: 100, cdmg: 100, mastery: 75, dmg: 100, phy: 0, recharge: 75, heal: 0 }
 }

resources/meta/artifact/meta.js

@@ -42,7 +42,9 @@ export const abbr = {
   沙上楼阁史话: '沙套',
   乐园遗落之花: '乐园',
   水仙之梦: '水仙',
-  花海甘露之光: '花海'
+  花海甘露之光: '花海',
+  逐影猎人: '猎人',
+  黄金剧团: '剧团'
 }
 
 export const mainAttr = {
@@ -351,4 +353,4 @@ export const attrIdMap = {
   501222: { key: 'cdmg', value: 0.062199998646974564 },
   501223: { key: 'cdmg', value: 0.06989999860525131 },
   501224: { key: 'cdmg', value: 0.07769999653100967 }
-}
+}

resources/meta/character/莱欧斯利/detail.json

@@ -224,8 +224,8 @@
         "·提高莱欧斯利的抗打断能力；",
         "·生命值高于50%时，强化「普通攻击·迅烈倾霜拳」的斥逐拳，使其造成的伤害提升；命中时莱欧斯利将损失一定的生命值，每0.1秒至多因此损失一次生命值；",
         "效果将在莱欧斯利退场时解除。",
-        "<i>「过去的裁罚已成定局，未来的选择犹在掌握。」",
+        "<i>「过去的裁罚已成定局，未来的选择犹在掌握。」</i>",
-        "「若是不愿命运被一时的罪恶吞尽，还请珍重此刻的光阴。」</i>"
+        "<i>「若是不愿命运被一时的罪恶吞尽，还请珍重此刻的光阴。」</i>"
       ],
       "tables": [
         {

resources/meta/character/那维莱特/calc.js

@@ -0,0 +1,58 @@
+export const details = [{
+  title: '重击伤害',
+  dmg: ({ talent, attr, calc, cons }, { basic }) => {
+    const a2Multi = cons >= 1 ? 1.6 : 1.25
+    return basic(a2Multi * talent.a['重击·衡平推裁持续伤害'] * calc(attr.hp) / 100, 'a2')
+  }
+}, {
+  title: 'E伤害',
+  dmg: ({ talent, attr, calc }, { basic }) => basic(talent.e['技能伤害'] * calc(attr.hp) / 100, 'e')
+}, {
+  title: 'Q释放伤害',
+  dmg: ({ talent, attr, calc }, { basic }) => basic(talent.q['技能伤害'] * calc(attr.hp) / 100, 'q')
+}, {
+  title: 'Q总伤害',
+  dmg: ({ talent, attr, calc }, { basic }) => {
+    const td = talent.q['技能伤害'] + talent.q['水瀑伤害'] * 2
+    return basic(td * calc(attr.hp) / 100, 'q')
+  }
+}, {
+  title: '满水滴一轮重击总伤害',
+  dmg: ({ talent, attr, calc, cons }, { basic }) => {
+    const count = cons >= 6 ? 30 : 8
+    const td = talent.a['重击·衡平推裁持续伤害'] * count
+    const extraTd = cons >= 6 ? 20 * 6 : 0
+    const a2Multi = cons >= 1 ? 1.6 : 1.25
+    return basic(a2Multi * (td + extraTd) * calc(attr.hp) / 100, 'a2')
+  }
+}]
+
+export const defDmgIdx = 4
+export const mainAttr = 'hp,dmg,cpct,cdmg'
+
+export const buffs = [{
+  title: '天赋-古海孑遗的权柄：按两层计算，重击·衡平推裁造成原本125%的伤害',
+  check: ({ cons }) => cons < 1
+}, {
+  title: '天赋-古海孑遗的权柄：按三层计算，重击·衡平推裁造成原本160%的伤害',
+  cons: 1
+}, {
+  title: '天赋-至高仲裁的纪律：基于当前生命值超出生命值上限30%的部分，提升[dmg]%水元素伤害',
+  data: {
+    dmg: 30
+  }
+}, {
+  title: '那维2命：重击·衡平推裁的暴击伤害提升[cdmg]%',
+  cons: 2,
+  data: {
+    a2Cdmg: 42
+  }
+}, {
+  title: '那维6命：延长重击持续时间至12s，同时每2s，额外造成20%生命倍率的视为重击·衡平推裁的伤害',
+  cons: 6
+}, {
+  title: '双水Buff：生命值提高[hpPct]%',
+  data: {
+    hpPct: 25
+  }
+}]

resources/meta/character/那维莱特/data.json

@@ -1,7 +1,7 @@
 {
   "id": 10000087,
   "name": "那维莱特",
-  "abbr": "那维莱特",
+  "abbr": "那维",
   "title": "谕告的潮音",
   "star": 5,
   "elem": "hydro",

resources/meta/weapon/catalyst/calc.js

@@ -186,7 +186,7 @@ export default function (step, staticStep) {
     }],
     万世流涌大典: [staticStep('hpPct', 16), {
       title: '生命值提升[_hpPct]%',
-      refile: {
+      refine: {
         _hpPct: step(16)
       }
     }, {

resources/meta/weapon/meta.js

@@ -43,7 +43,9 @@ export const abbr = {
   图莱杜拉的回忆: '图莱杜拉',
   流浪的晚星: '流浪晚星',
   '「一心传」名刀': '一心传',
-  东花坊时雨: '伞剑'
+  东花坊时雨: '伞剑',
+  最初的大魔术: '大魔术',
+  万世流涌大典: '万世大典'
 }
 
 export const alias = {
@@ -147,6 +149,7 @@ export const alias = {
   流浪的晚星: '流浪的晚星,晚星',
   证誓之明瞳: '证誓,明瞳,证誓明瞳',
   嘟嘟可故事集: '嘟嘟可,故事集,故事书',
+  万世流涌大典: '流涌大典,万世大典,万世流涌,万世涌流大典,万世涌流',
 
   // 弓
   天空之翼: '天空弓',
@@ -156,7 +159,7 @@ export const alias = {
   终末嗟叹之诗: '终末,终末弓,叹气弓,乐团弓',
   飞雷之弦振: '飞雷,飞雷弓,弦振',
   猎人之径: '猎人',
-  最初的大魔术: '大魔术',
+  最初的大魔术: '大魔术,魔术弓',
   曚云之月: '曚云弓',
   祭礼弓: '祭礼弓箭',
   黑岩战弓: '黑岩弓',