From 6c8952c8855fe40fd2451aeea703878b614b1372 Mon Sep 17 00:00:00 2001
From: Kokomi <592981798@qq.com>
Date: Thu, 8 Sep 2022 17:38:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=8E=86=E5=8F=B2=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E6=95=B0=E6=8D=AE=E5=8F=AF=E8=83=BD=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?=E9=9D=A2=E6=9D=BF=E7=BB=9F=E8=AE=A1=E9=94=99=E8=AF=AF=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/character/profile-stat.js | 7 +++++--
 models/Character.js            | 2 +-
 models/ProfileData.js          | 5 ++++-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/apps/character/profile-stat.js b/apps/character/profile-stat.js
index 72c4b094..15638f4f 100644
--- a/apps/character/profile-stat.js
+++ b/apps/character/profile-stat.js
@@ -44,8 +44,11 @@ export async function profileStat (e) {
     avatar.aeq = talent?.a?.original + talent?.e?.original + talent?.q?.original || 3
     avatarRet.push(avatar)
     if (profiles[id]) {
-      let mark = profiles[id].getArtisMark(false)
-      avatar.artisMark = Data.getData(mark, 'mark,markClass,names')
+      let profile = profiles[id]
+      if(profile.hasData) {
+        let mark = profiles[id].getArtisMark(false)
+        avatar.artisMark = Data.getData(mark, 'mark,markClass,names')
+      }
     }
   })
 
diff --git a/models/Character.js b/models/Character.js
index e16602d7..8d6be54f 100644
--- a/models/Character.js
+++ b/models/Character.js
@@ -203,7 +203,7 @@ class Character extends Base {
       if (CharId.isTraveler(avatar.id)) {
         let char = Character.get({
           id: avatar.id,
-          elem: (avatar.elem || avatar.element).toLowerCase() || 'anemo'
+          elem: (avatar.elem || avatar.element || 'anemo').toLowerCase()
         })
         char.setTraveler(uid)
         return char
diff --git a/models/ProfileData.js b/models/ProfileData.js
index 4ef5cae2..269f5262 100644
--- a/models/ProfileData.js
+++ b/models/ProfileData.js
@@ -125,7 +125,10 @@ export default class ProfileData extends Base {
 
   // 获取当前profileData的圣遗物评分，withDetail=false仅返回简略信息
   getArtisMark (withDetail = true) {
-    return this.artis.getMarkDetail(withDetail)
+    if(this.hasData) {
+      return this.artis.getMarkDetail(withDetail)
+    }
+    return {}
   }
 
   // 计算当前profileData的伤害信息