From eeb8dd49deaf2353fc4a1b238bdb542b64c0737e Mon Sep 17 00:00:00 2001
From: Kokomi <102026640+yoimiya-kokomi@users.noreply.github.com>
Date: Sat, 27 May 2023 06:10:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=98=9F=E9=93=81=E9=9D=A2?=
 =?UTF-8?q?=E6=9D=BF=E5=9C=A3=E9=81=97=E7=89=A9=E5=B1=95=E7=A4=BA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/profile/ProfileList.js                      | 3 +--
 config/system/profile_system.js                  | 1 +
 models/AvatarArtis.js                            | 1 +
 resources/meta-sr/character/丹恒/calc.js       | 6 +++---
 resources/meta-sr/character/停云/calc.js       | 4 ++--
 resources/meta-sr/character/克拉拉/calc.js    | 8 ++++----
 resources/meta-sr/character/姬子/calc.js       | 6 +++---
 resources/meta-sr/character/布洛妮娅/calc.js | 6 +++---
 resources/meta-sr/character/希儿/calc.js       | 6 +++---
 resources/meta-sr/character/彦卿/calc.js       | 8 ++++----
 resources/meta-sr/character/景元/calc.js       | 6 +++---
 resources/meta-sr/character/杰帕德/calc.js    | 2 +-
 resources/meta-sr/character/瓦尔特/calc.js    | 4 ++--
 resources/meta-sr/character/白露/calc.js       | 4 ++--
 resources/meta-sr/weapon/index.js                | 1 -
 15 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/apps/profile/ProfileList.js b/apps/profile/ProfileList.js
index a413968a..5f9cfa04 100644
--- a/apps/profile/ProfileList.js
+++ b/apps/profile/ProfileList.js
@@ -80,8 +80,7 @@ const ProfileList = {
       await player.refresh({ profile: true })
     }
     if (!player.hasProfile) {
-      console.log(player.game)
-      e.reply(`本地暂无uid${uid}的面板数据...`)
+      e.reply(`本地暂无uid${uid}[${player.game}]的面板数据...`)
       return true
     }
     let profiles = player.getProfiles()
diff --git a/config/system/profile_system.js b/config/system/profile_system.js
index bccfe06b..598b37f5 100644
--- a/config/system/profile_system.js
+++ b/config/system/profile_system.js
@@ -38,6 +38,7 @@ export const hutaoApi = {
 
 export const homoApi = {
   url: 'https://api.mihomo.me/sr_info',
+  userAgent: 'Miao-Plugin/3.1',
   listApi: ({ url, uid, diyCfg }) => {
     return `${url}/${uid}`
   }
diff --git a/models/AvatarArtis.js b/models/AvatarArtis.js
index 78a3d921..4deb0b6f 100644
--- a/models/AvatarArtis.js
+++ b/models/AvatarArtis.js
@@ -80,6 +80,7 @@ export default class AvatarArtis extends Base {
         let attr = artiObj.getAttrData(ds.mainId, attrIds, arti.level, arti.star, idx)
         if (attr) {
           arti.mainId = ds.mainId
+          arti.attrIds = attrIds
           arti.main = attr.main || arti.main || {}
           arti.attrs = attr.attrs || arti.attrs || {}
         } else {
diff --git a/resources/meta-sr/character/丹恒/calc.js b/resources/meta-sr/character/丹恒/calc.js
index 29514ccd..cac8354c 100644
--- a/resources/meta-sr/character/丹恒/calc.js
+++ b/resources/meta-sr/character/丹恒/calc.js
@@ -1,11 +1,11 @@
 export const details = [{
-  title: 'A普攻伤害',
+  title: '普攻伤害',
   dmg: ({ talent }, dmg) => dmg(talent.a['技能伤害'], 'a')
 }, {
-  title: 'E战技主目标伤害',
+  title: '战技主目标伤害',
   dmg: ({ talent }, dmg) => dmg(talent.e['技能伤害'], 'e')
 }, {
-  title: 'Q终结技伤害',
+  title: '终结技伤害',
   dmg: ({ talent }, dmg) => dmg(talent.q['技能伤害'], 'q')
 }, {
   title: '减速目标终结技伤害',
diff --git a/resources/meta-sr/character/停云/calc.js b/resources/meta-sr/character/停云/calc.js
index 8eed7482..b8706665 100644
--- a/resources/meta-sr/character/停云/calc.js
+++ b/resources/meta-sr/character/停云/calc.js
@@ -4,14 +4,14 @@ export const details = [{
   title: '普攻伤害',
   dmg: ({ talent }, dmg) => dmg(talent.a['技能伤害'], 'a')
 }, {
-  title: 'E赐福提高攻击力上限',
+  title: '赐福提高攻击力上限',
   dmg: ({ attr, calc, talent }) => {
     return {
       avg: calc(attr.atk) * talent.e['攻击力上限']
     }
   }
 }, {
-  title: 'Q伤害提高',
+  title: '终结技伤害提高',
   dmg: ({ talent }) => {
     return {
       avg: Format.percent(talent.q['伤害提高']),
diff --git a/resources/meta-sr/character/克拉拉/calc.js b/resources/meta-sr/character/克拉拉/calc.js
index 69b77aed..b6bf59ae 100644
--- a/resources/meta-sr/character/克拉拉/calc.js
+++ b/resources/meta-sr/character/克拉拉/calc.js
@@ -1,14 +1,14 @@
 export const details = [{
-  title: 'A普攻伤害',
+  title: '普攻伤害',
   dmg: ({ talent }, dmg) => dmg(talent.a['技能伤害'], 'a')
 }, {
-  title: 'E战技伤害',
+  title: '战技伤害',
   dmg: ({ talent }, dmg) => dmg(talent.e['技能伤害'], 'e')
 }, {
-  title: 'E反击伤害',
+  title: '反击伤害',
   dmg: ({ talent }, dmg) => dmg(talent.e['反击伤害'], 'e')
 }, {
-  title: 'Q反击伤害',
+  title: '反击伤害',
   dmg: ({ talent }, dmg) => dmg(talent.q['伤害倍率提高'] + talent.t['反击伤害'], 't')
 }]
 
diff --git a/resources/meta-sr/character/姬子/calc.js b/resources/meta-sr/character/姬子/calc.js
index 3fdc8f88..98553c6f 100644
--- a/resources/meta-sr/character/姬子/calc.js
+++ b/resources/meta-sr/character/姬子/calc.js
@@ -1,11 +1,11 @@
 export const details = [{
-  title: 'A普攻伤害',
+  title: '普攻伤害',
   dmg: ({ talent }, dmg) => dmg(talent.a['技能伤害'], 'a')
 }, {
-  title: 'E战技主目标伤害',
+  title: '战技主目标伤害',
   dmg: ({ talent }, dmg) => dmg(talent.e['主目标伤害'], 'e')
 }, {
-  title: 'Q终结技伤害',
+  title: '终结技伤害',
   dmg: ({ talent }, dmg) => dmg(talent.q['技能伤害'], 'q')
 }, {
   title: '天赋追击伤害',
diff --git a/resources/meta-sr/character/布洛妮娅/calc.js b/resources/meta-sr/character/布洛妮娅/calc.js
index c9373d17..4eed918d 100644
--- a/resources/meta-sr/character/布洛妮娅/calc.js
+++ b/resources/meta-sr/character/布洛妮娅/calc.js
@@ -4,7 +4,7 @@ export const details = [{
   title: '普攻伤害',
   dmg: ({ talent }, dmg) => dmg(talent.a['技能伤害'], 'a')
 }, {
-  title: 'E-Buff加伤',
+  title: '战技Buff加伤',
   dmg: ({ talent }) => {
     return {
       avg: Format.percent(talent.e['伤害提高']),
@@ -12,7 +12,7 @@ export const details = [{
     }
   }
 }, {
-  title: 'Q-Buff攻击力提高',
+  title: '终结技Buff攻击力提高',
   dmg: ({ talent }) => {
     return {
       avg: Format.percent(talent.q['攻击力提高']),
@@ -20,7 +20,7 @@ export const details = [{
     }
   }
 }, {
-  title: 'Q-Buff爆伤提高',
+  title: '终结技Buff爆伤提高',
   dmg: ({ attr, calc, talent }) => {
     return {
       avg: Format.percent(calc(attr.cdmg) * talent.q['百分比暴伤'] / 100 + talent.q['固定暴伤']),
diff --git a/resources/meta-sr/character/希儿/calc.js b/resources/meta-sr/character/希儿/calc.js
index 908918c6..3217c529 100644
--- a/resources/meta-sr/character/希儿/calc.js
+++ b/resources/meta-sr/character/希儿/calc.js
@@ -1,11 +1,11 @@
 export const details = [{
-  title: 'A普攻伤害',
+  title: '普攻伤害',
   dmg: ({ talent }, dmg) => dmg(talent.a['技能伤害'], 'a')
 }, {
-  title: 'E战技伤害',
+  title: '战技伤害',
   dmg: ({ talent }, dmg) => dmg(talent.e['技能伤害'], 'e')
 }, {
-  title: 'Q终结技伤害',
+  title: '终结技伤害',
   dmg: ({ talent }, dmg) => dmg(talent.q['技能伤害'], 'q')
 }]
 
diff --git a/resources/meta-sr/character/彦卿/calc.js b/resources/meta-sr/character/彦卿/calc.js
index 85cbd9b1..b46caf61 100644
--- a/resources/meta-sr/character/彦卿/calc.js
+++ b/resources/meta-sr/character/彦卿/calc.js
@@ -1,11 +1,11 @@
 export const details = [{
-  title: 'A普攻伤害',
+  title: '普攻伤害',
   dmg: ({ talent }, dmg) => dmg(talent.a['技能伤害'], 'a')
 }, {
-  title: 'E战技伤害',
+  title: '战技伤害',
   dmg: ({ talent }, dmg) => dmg(talent.e['技能伤害'], 'e')
 }, {
-  title: 'Q终结技伤害',
+  title: '终结技伤害',
   dmg: ({ talent }, dmg) => dmg(talent.q['技能伤害'], 'q')
 }]
 
@@ -18,7 +18,7 @@ export const buffs = [{
     cdmg: ({ talent }) => talent.t['爆伤提高'] * 100
   }
 }, {
-  title: '彦卿Q：释放终结技提高60%暴击率，智剑连心提高爆伤[qCdmg]%',
+  title: '终结技：释放终结技提高60%暴击率，智剑连心提高爆伤[qCdmg]%',
   data: {
     qCpct: 60,
     qCdmg: ({ talent }) => talent.q['暴伤提高'] * 100
diff --git a/resources/meta-sr/character/景元/calc.js b/resources/meta-sr/character/景元/calc.js
index 6efcb735..0e958485 100644
--- a/resources/meta-sr/character/景元/calc.js
+++ b/resources/meta-sr/character/景元/calc.js
@@ -1,11 +1,11 @@
 export const details = [{
-  title: 'A普攻伤害',
+  title: '普攻伤害',
   dmg: ({ talent }, dmg) => dmg(talent.a['技能伤害'], 'a')
 }, {
-  title: 'E战技伤害',
+  title: '战技伤害',
   dmg: ({ talent }, dmg) => dmg(talent.e['技能伤害'], 'e')
 }, {
-  title: 'Q终结技伤害',
+  title: '终结技伤害',
   dmg: ({ talent }, dmg) => dmg(talent.q['技能伤害'], 'q')
 }, {
   title: '10层神君单体伤害',
diff --git a/resources/meta-sr/character/杰帕德/calc.js b/resources/meta-sr/character/杰帕德/calc.js
index 21eea431..c7661db2 100644
--- a/resources/meta-sr/character/杰帕德/calc.js
+++ b/resources/meta-sr/character/杰帕德/calc.js
@@ -5,7 +5,7 @@ export const details = [{
   title: '战技伤害',
   dmg: ({ talent }, dmg) => dmg(talent.e['技能伤害'], 'e')
 }, {
-  title: 'Q护盾量',
+  title: '终结技护盾量',
   dmg: ({ attr, calc, talent }, { shield }) => shield(calc(attr.def) * talent.q['百分比防御力'] + talent.q['固定数值'])
 }, {
   title: '秘技护盾量',
diff --git a/resources/meta-sr/character/瓦尔特/calc.js b/resources/meta-sr/character/瓦尔特/calc.js
index 564c8cc7..22cf8018 100644
--- a/resources/meta-sr/character/瓦尔特/calc.js
+++ b/resources/meta-sr/character/瓦尔特/calc.js
@@ -2,10 +2,10 @@ export const details = [{
   title: '普攻伤害',
   dmg: ({ talent }, dmg) => dmg(talent.a['技能伤害'], 'a')
 }, {
-  title: 'E战技主目标伤害',
+  title: '战技主目标伤害',
   dmg: ({ talent }, dmg) => dmg(talent.e['技能伤害'], 'e')
 }, {
-  title: 'Q终结技伤害',
+  title: '终结技伤害',
   dmg: ({ talent }, dmg) => dmg(talent.q['技能伤害'], 'q')
 }, {
   title: '天赋附加伤害',
diff --git a/resources/meta-sr/character/白露/calc.js b/resources/meta-sr/character/白露/calc.js
index dff78d73..3d513a73 100644
--- a/resources/meta-sr/character/白露/calc.js
+++ b/resources/meta-sr/character/白露/calc.js
@@ -2,10 +2,10 @@ export const details = [{
   title: '普攻伤害',
   dmg: ({ talent }, dmg) => dmg(talent.a['技能伤害'], 'a')
 }, {
-  title: 'E主目标生命恢复',
+  title: '战技主目标生命恢复',
   dmg: ({ calc, attr, talent }, { heal }) => heal(calc(attr.hp) * talent.e['百分比生命'] + talent.e['固定值'])
 }, {
-  title: 'Q生命恢复',
+  title: '终结技生命恢复',
   dmg: ({ calc, attr, talent }, { heal }) => heal(calc(attr.hp) * talent.q['百分比生命'] + talent.q['固定值'])
 }, {
   title: '天赋生息恢复',
diff --git a/resources/meta-sr/weapon/index.js b/resources/meta-sr/weapon/index.js
index e23b4060..2bb3b30d 100644
--- a/resources/meta-sr/weapon/index.js
+++ b/resources/meta-sr/weapon/index.js
@@ -34,7 +34,6 @@ let loadBuffs = async function () {
             lodash.forEach(key, (idx, k) => {
               data[k] = tables[idx]
             })
-            console.log(data)
             return {
               title,
               data