Merge remote-tracking branch 'origin/master'

# Conflicts:
#	resources/character/profile-stat.less

apps/character/profile-stat.js

@@ -4,7 +4,6 @@ import { Artifact, Avatars } from '../../components/models.js'
 
 export async function profileStat (e, { render }) {
   // 缓存时间，单位小时
-  let cacheCd = 6
 
   let msg = e.msg.replace('#', '').trim()
   if (msg === '角色统计' || msg === '武器统计') {
@@ -25,6 +24,10 @@ export async function profileStat (e, { render }) {
     return true
   }
 
+  if (!await Avatars.hasTalentCache(uid)) {
+    e.reply('正在获取角色信息，请稍候...')
+  }
+
   let avatars = new Avatars(uid, resIndex.avatars)
   let ids = avatars.getIds()
 

components/models/Artifact.js

@@ -170,7 +170,6 @@ let Artifact = {
         sets[setName] = (sets[setName] || 0) + 1
       }
     })
-    console.log(charName, sets)
     for (let set in sets) {
       if (sets[set] >= 4) {
         setMap[set] = 4