From 9a8b17b9a425c20661a7215ccb6b1f1ea243587a Mon Sep 17 00:00:00 2001
From: yoimiya-kokomi <592981798@qq.com>
Date: Sun, 26 Jun 2022 09:05:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D#=E5=9C=A3=E9=81=97=E7=89=A9?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/character/profile-artis.js | 12 ++++++------
 index.js                        |  2 +-
 resources/character/artis.html  | 13 +++++++------
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/apps/character/profile-artis.js b/apps/character/profile-artis.js
index b2d998dc..77422849 100644
--- a/apps/character/profile-artis.js
+++ b/apps/character/profile-artis.js
@@ -61,12 +61,12 @@ export async function profileArtisList(e, { render }) {
 
     let usefulMark;
 
-    let charCfg = Reliquaries2.getCharCfg(name);
+    let charCfg = Artifact.getCharCfg(name);
     usefulMark = charCfg.titleWeight;
 
     /* 处理圣遗物 */
     if (ds.artis) {
-      let newScore = Reliquaries2.getArtisMark(name, ds.artis);
+      let newScore = Artifact.getArtisMark(name, ds.artis);
 
       lodash.forEach(ds.artis, (arti, idx) => {
         if (!arti.name) {
@@ -74,12 +74,12 @@ export async function profileArtisList(e, { render }) {
         }
         idx = idx.replace("arti", "");
         let mark = newScore[idx];
-        let maxMark = Reliquaries.getMaxMark(name, arti.main[0] || "");
+        let maxMark = Artifact.getMaxMark(name, arti.main[0] || "");
         arti.mark = Format.comma(mark, 1);
         arti._mark = mark;
-        arti.markClass = Reliquaries2.getMarkClass(mark);
-        arti.main = Profile.formatArti(arti.main);
-        arti.attrs = Profile.formatArti(arti.attrs);
+        arti.markClass = Artifact.getMarkClass(mark);
+        arti.main = Artifact.formatArti(arti.main);
+        arti.attrs = Artifact.formatArti(arti.attrs);
         arti.usefulMark = usefulMark;
         arti.avatar = name;
         artis.push(arti);
diff --git a/index.js b/index.js
index 3979e064..3c318951 100644
--- a/index.js
+++ b/index.js
@@ -39,7 +39,7 @@ let rule = {
     //reg: "noCheck",
     describe: "【#角色】角色详情",
   },
-  getArtis: {
+  profileArtisList: {
     reg: "^#圣遗物列表\\s*(\\d{9})?$",
     describe: "【#角色】圣遗物列表",
   },
diff --git a/resources/character/artis.html b/resources/character/artis.html
index 5834b15a..47b04d2b 100644
--- a/resources/character/artis.html
+++ b/resources/character/artis.html
@@ -12,7 +12,7 @@
 
   {{each artis ds}}
   <div class="item arti">
-    {{if ds && ds.name && ds.main && ds.main[0] && ds.main[0]!="undefined"}}
+    {{if ds && ds.name && ds.main && ds.main.title && ds.main.title!="undefined"}}
     <div class="avatar">
       <img src="{{_res_path}}meta/character/{{ds.avatar}}/side.png" onerror="whenError(this)"/>
     </div>
@@ -23,12 +23,13 @@
       <strong>{{ds.name}}</strong>
       <span class="mark mark-{{ds.markClass}}"><span>{{ds.mark}}分</span> - {{ds.markClass}}</span>
     </div>
-    <ul class="detail">
-      <li class="arti-main"><span class="title">{{ds.main[0]}}</span><span class="val">+{{ds.main[1]}}</span></li>
+    <ul class="detail attr">
+      <li class="arti-main"><span class="title">{{ds.main.title}}</span><span class="val">+{{ds.main.val}}</span></li>
       {{each ds.attrs attr}}
-      {{if attr[0]}}
-      <li class="{{ds.usefulMark[attr[0]]*1 > 79.9 ?`great`:(ds.usefulMark[attr[0]]*1>0 ? `useful`:`nouse`)}}"><span class="title">{{attr[0]}}</span><span
-          class="val">+{{attr[1]}}</span></li>
+      {{if attr.title}}
+      <li class="{{ds.usefulMark[attr.title]*1 > 79.9 ?`great`:(ds.usefulMark[attr.title]*1>0 ? `useful`:`nouse`)}}">
+        <span class="title">{{attr.title}}</span><span
+          class="val">+{{attr.val}}</span></li>
       {{/if}}
       {{/each}}
     </ul>