From 319b8cbde941629e4459fc27520159879c8ba59b Mon Sep 17 00:00:00 2001
From: Kokomi <1379177109@qq.com>
Date: Sat, 14 Oct 2023 17:20:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=98=9F=E9=93=81=E9=9D=A2=E6=9D=BF=E5=8F=98?=
 =?UTF-8?q?=E6=8D=A2=E6=94=AF=E6=8C=81=E4=BF=9D=E7=95=99=E8=A1=8C=E8=BF=B9?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                            | 17 ++++-----
 models/ProfileAttr.js                   |  2 +-
 models/profile/AttrCalc.js              |  2 +-
 resources/character/profile-detail.css  | 47 ++++++++++++++++++++++---
 resources/character/profile-detail.less | 46 ++++++++++++++++++++++++
 resources/meta-sr/weapon/meta.js        |  7 ++--
 6 files changed, 103 insertions(+), 18 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8fdfc0b9..738d4154 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,10 @@
-# 2.4.7
+# 2.4.8
 
-* 增加菲米尼、符玄、玲可、三月七、娜塔莎、罗刹、黑塔的伤害计算 **@Aluxes**
-* 初步增加星铁的排名功能 **@Simplxss**
-* 增加芙宁娜、夏洛蒂的角色信息
+* 星铁面板支持面板变换功能
+* 面板变换支持更换圣遗物套装，例如`#甘雨换乐团`、`#镜流换快枪手封印站`
+* 微调面板页面的部分样式
 
-# 2.4.1 ~ 2.4.6
+# 2.4.1 ~ 2.4.7
 
 * 初步支持星铁面板数据获取与展示
   * 可使用`#星铁更新面板`来获取面板信息，通过`#希儿面板`来进行查看
@@ -15,12 +15,13 @@
   * Miao-Yunzai可使用`*`来代填`#星铁`前缀，能区分游戏使用不同UID
   * 其他Yunzai版本出现原神与星铁UID混淆情况为正常情况，请手动切换UID或命令后附加UID查询
 * 角色数据及资源更新
-  * 增加林尼、琳妮特、菲米尼的角色信息，可通过`#林尼天赋`、`#林尼图鉴`查看
-  * 更新卡芙卡、卢卡的角色数据与资源
-  * 增加原神4.0、星铁1.3的角色数据与资源
+  * 增加原神4.0~4.2的角色信息，可通过`#水神天赋`、`#水神图鉴`查看
+  * 更新星铁1.2~1.3的角色数据与资源
 * 伤害计算更新
   * 增加林尼、卡夫卡、银狼的伤害计算**@Aluxes**
   * 增加原神4.0相关的武器计算 **@SmallK111407**
+  * 增加菲米尼、符玄、玲可、三月七、娜塔莎、罗刹、黑塔的伤害计算 **@Aluxes**
+* 初步增加星铁的排名功能 **@Simplxss**
 * 增加`#喵喵api`命令，用于查看喵ApiToken的有效期
 * 增加`#星铁日历`功能 **@Aluxes**
 * 增加`#重载面板`功能，用于手工修改面板数据后主动读取
diff --git a/models/ProfileAttr.js b/models/ProfileAttr.js
index 6a5c9bdd..75d57b77 100644
--- a/models/ProfileAttr.js
+++ b/models/ProfileAttr.js
@@ -134,7 +134,7 @@ class ProfileAttr extends Base {
     let ret = {}
     lodash.forEach(baseAttr[this.game], (key) => {
       ret[key] = this[key]
-      if (['hp', 'atk', 'def'].includes(key)) {
+      if (['hp', 'atk', 'def', 'speed'].includes(key)) {
         ret[`${key}Base`] = this[`${key}Base`]
       }
     })
diff --git a/models/profile/AttrCalc.js b/models/profile/AttrCalc.js
index 075cc030..05a90147 100644
--- a/models/profile/AttrCalc.js
+++ b/models/profile/AttrCalc.js
@@ -90,7 +90,7 @@ class AttrCalc {
       // 星铁面板属性
       let attr = char.getLvAttr(level, promote)
       lodash.forEach(attr, (v, k) => {
-        k = k + (['hp', 'atk', 'def'].includes(k) ? 'Base' : '')
+        k = k + (['hp', 'atk', 'def', 'speed'].includes(k) ? 'Base' : '')
         self.addAttr(k, v, true)
       })
 
diff --git a/resources/character/profile-detail.css b/resources/character/profile-detail.css
index 11621229..2d6b34c0 100644
--- a/resources/character/profile-detail.css
+++ b/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 {
@@ -601,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%;
@@ -630,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 {
@@ -843,7 +843,43 @@ body {
   margin-bottom: 25px;
 }
 .game-sr .char-attr .icon i {
-  background-image: url('imgs/icon-sr.png');
+  background-image: url('./imgs/icon-sr.png');
+}
+.artis .item.arti {
+  overflow: visible;
+}
+.artis .item.arti .head {
+  position: relative;
+  border-radius: 10px 10px 0 0;
+  text-shadow: 0 0 1px #000, 1px 1px 2px rgba(0, 0, 0, 0.7);
+  padding: 17px 10px 3px 15px;
+  background: linear-gradient(to right, rgba(0, 0, 0, 0.7), rgba(0, 0, 0, 0.7), rgba(25, 25, 25, 0.3), rgba(25, 25, 25, 0.3), rgba(25, 25, 25, 0));
+}
+.artis .item.arti .arti-icon {
+  left: auto;
+  right: -5px;
+  top: -10px;
+  width: 100px;
+  height: 100px;
+}
+.artis .item.arti .arti-icon .img {
+  width: 100%;
+  height: 100%;
+  margin: 0;
+}
+.artis .item.arti .arti-icon span {
+  bottom: 35px;
+  right: 15px;
+  background: rgba(0, 0, 0, 0.8);
+}
+.artis ul.detail {
+  backdrop-filter: blur(2px);
+}
+.artis ul.detail li.arti-main {
+  background: rgba(25, 25, 25, 0.5);
+}
+.artis ul.detail li.arti-main .title {
+  padding-left: 15px;
 }
 .sr-weapon {
   margin: 0 15px 5px 10px;
@@ -1037,3 +1073,4 @@ body {
 .copyright.ad {
   font-size: 12px;
 }
+/*# sourceMappingURL=profile-detail.css.map */
\ No newline at end of file
diff --git a/resources/character/profile-detail.less b/resources/character/profile-detail.less
index 6b3ef083..a3c97c75 100644
--- a/resources/character/profile-detail.less
+++ b/resources/character/profile-detail.less
@@ -1069,6 +1069,52 @@ body {
   }
 }
 
+.artis {
+  .item.arti {
+    overflow: visible;
+
+    .head {
+      position: relative;
+      border-radius: 10px 10px 0 0;
+      text-shadow: 0 0 1px #000, 1px 1px 2px rgba(0, 0, 0, 0.7);
+      padding: 17px 10px 3px 15px;
+      background: linear-gradient(to right, rgba(0, 0, 0, .7), rgba(0, 0, 0, .7), rgba(25, 25, 25, .3), rgba(25, 25, 25, .3), rgba(25, 25, 25, 0));
+    }
+
+    .arti-icon {
+      left: auto;
+      right: -5px;
+      top: -10px;
+      width: 100px;
+      height: 100px;
+
+      .img {
+        width: 100%;
+        height: 100%;
+        margin: 0;
+      }
+
+      span {
+        bottom: 35px;
+        right: 15px;
+        background: rgba(0, 0, 0, .8);
+      }
+    }
+  }
+
+  ul.detail {
+    backdrop-filter: blur(2px);
+
+    li.arti-main {
+      background: rgba(25, 25, 25, .5);
+
+      .title {
+        padding-left: 15px;
+      }
+    }
+  }
+}
+
 .sr-weapon {
   margin: 0 15px 5px 10px;
   border-radius: 10px;
diff --git a/resources/meta-sr/weapon/meta.js b/resources/meta-sr/weapon/meta.js
index 15dc32dd..b10db1f4 100644
--- a/resources/meta-sr/weapon/meta.js
+++ b/resources/meta-sr/weapon/meta.js
@@ -1,4 +1,5 @@
 import lodash from 'lodash'
+
 export const abbr = {
   // 巡猎
   '烦恼着，幸福着': '烦恼着幸福着',
@@ -41,7 +42,7 @@ let aliasCfg = {
   '一场术后对话': '一场术后对话,术后对话',
   '同一种心情': '',
   '此时恰好': '',
-  '等价交换': '交换',
+  '等价交换': '',
   '暖夜不会漫长': '暖夜不漫长',
   '棺的回响': '棺一直响,棺响',
   '时节不居': '时节',
@@ -56,8 +57,8 @@ let aliasCfg = {
   '汪！散步时间！': '散步时间,散步',
   '无处可逃': '',
   '无可取代的东西': '无可取代',
-  '到不了的彼岸': '岸一直到,人一直活,彼岸一直到不了,到彼岸,彼岸',
-  '此身为剑': '',
+  '到不了的彼岸': '岸一直到,人一直活,到彼岸,彼岸',
+  '此身为剑': '以身为剑,手一直摸',
   '比阳光更明亮的': '比阳光更明亮,比阳的,阳光明亮,比阳光,比阳,阳光',
   '记一位星神的陨落': '星神的陨落,星神陨落',