增加面板计算逻辑开关，启用后可使用面板计算数据

CHANGELOG.md

@@ -1,7 +1,7 @@
 # 2.1.1
 
 * 部分底层结构升级
-    * 底层增加面板计算逻辑，供后续功能使用
+    * 底层增加面板计算逻辑，默认不启用，具体应用待后续升级
     * 圣遗物数据底层存储格式与处理逻辑初步升级
 * 圣遗物主词条评分规则微调，可能会影响部分角色评分
     * 元素杯属性不符会触发主词缀评分惩罚

apps/character/ProfileDetail.js

@@ -100,7 +100,7 @@ export async function renderProfile (e, char, mode = 'profile', params = {}) {
   return await Common.render('character/profile-detail', {
     save_id: uid,
     uid,
-    data: avatar.getData('name,abbr,cons,level,weapon,talent,dataSource,updateTime'),
+    data: avatar.getData('name,abbr,cons,level,weapon,talent,dataSource,updateTime,_attrCalc'),
     attr,
     elem: char.elem,
     dmgData,

config/system/cfg_system.js

@@ -47,14 +47,7 @@ export const cfgSchema = {
         key: '戳一戳',
         def: true,
         oldCfgKey: 'char.poke'
-      },
-      commaGroup: {
-        title: '数字逗号分组',
-        key: '逗号',
-        def: 3,
-        type: 'num',
-        desc: '根据语言习惯设置数字分组，如千位组设为 3，万位组设为 4。（暂不支持欧洲样式）'
-      },
+      }
     }
   },
   wiki: {
@@ -108,6 +101,19 @@ export const cfgSchema = {
         def: false,
         oldCfgKey: 'sys.help',
         desc: '开启后将使用喵喵版帮助作为Yunzai的默认帮助，默认关闭'
+      },
+      commaGroup: {
+        title: '数字逗号分组',
+        key: '逗号',
+        def: 3,
+        type: 'num',
+        desc: '根据语言习惯设置数字分组，如千位组设为3，万位组设为4'
+      },
+      attrCalc: {
+        title: '面板计算属性',
+        key: '计算',
+        def: false,
+        desc: '实验特性：#雷神面板 使用面板计算属性取代展柜属性'
       }
     }
   }

models/Character.js

@@ -316,12 +316,19 @@ class Character extends Base {
   }
 
   // 获取伤害计算配置
-  async getCalcRule () {
+  getCalcRule () {
     if (!this._calcRule && this._calcRule !== false) {
-      this._calcRule = await CharCfg.getCalcRule(this)
+      this._calcRule = CharCfg.getCalcRule(this)
     }
     return this._calcRule
   }
+
+  getArtisCfg () {
+    if (!this._artisRule && this._artisRule !== false) {
+      this._artisRule = CharCfg.getArtisCfg(this)
+    }
+    return this._artisRule
+  }
 }
 
 Character.CharId = CharId

models/ProfileAttr.js

@@ -1,7 +1,5 @@
 import lodash from 'lodash'
 import Base from './Base.js'
-import DmgMastery from './profile-lib/DmgMastery.js'
-import { Format } from '../components/index.js'
 
 const baseAttr = 'atk,def,hp,mastery,recharge,cpct,cdmg,dmg,phy,heal,shield'.split(',')
 let attrReg = new RegExp(`^(${baseAttr.join('|')})(Base|Plus|Pct|Inc)$`)
@@ -9,10 +7,10 @@ let attrReg = new RegExp(`^(${baseAttr.join('|')})(Base|Plus|Pct|Inc)$`)
 class ProfileAttr extends Base {
   constructor (data = null) {
     super()
-    this._init(data)
+    this.init(data)
   }
 
-  _init (data) {
+  init (data) {
     // 基础属性
     this._attr = {}
     let attr = this._attr
@@ -28,7 +26,7 @@ class ProfileAttr extends Base {
     }
   }
 
-  static init (data = null) {
+  static create (data = null) {
     return new ProfileAttr(data)
   }
 
@@ -71,6 +69,7 @@ class ProfileAttr extends Base {
     if (testRet && testRet[1] && testRet[2]) {
       let key = testRet[1]
       let key2 = testRet[2].toLowerCase()
+      attr[key][key2] = attr[key][key2] || 0
       attr[key][key2] += val * 1
       return true
     }
@@ -105,6 +104,7 @@ class ProfileAttr extends Base {
         ret[`${key}Base`] = this[`${key}Base`]
       }
     })
+    ret._calc = true
     return ret
   }
 }

models/ProfileData.js

@@ -1,7 +1,7 @@
 import lodash from 'lodash'
 import Base from './Base.js'
 import moment from 'moment'
-import { Data } from '../components/index.js'
+import { Data, Cfg } from '../components/index.js'
 import { Character, ProfileArtis, ProfileDmg } from './index.js'
 import AttrCalc from './profile-lib/AttrCalc.js'
 
@@ -15,18 +15,27 @@ export default class ProfileData extends Base {
     this.id = char.id
     this.char = char
     this.uid = uid || ''
-
     this.setBasic(ds)
     ds.attr && this.setAttr(ds.attr)
     ds.weapon && this.setWeapon(ds.weapon)
     ds.talent && this.setTalent(ds.talent)
     this.artis = new ProfileArtis(this.id, this.elem)
     ds.artis && this.setArtis(ds.artis)
-    if (process.argv.includes('web-debug')) {
-      AttrCalc.getAttr(this)
+    if (Cfg.get('attrCalc')) {
+      this._attr = AttrCalc.create(this)
+      this.attr = this._attr.calc()
+      this._attrCalc = true
     }
   }
 
+  static create (ds, uid) {
+    let profile = new ProfileData(ds, uid)
+    if (!profile) {
+      return false
+    }
+    return profile
+  }
+
   setBasic (ds = {}) {
     this.level = ds.lv || ds.level || 1
     this.cons = ds.cons || 0

models/character-lib/CharCfg.js

@@ -1,14 +1,50 @@
 import { Data } from '../../components/index.js'
 import lodash from 'lodash'
+import fs from 'fs'
+
+const charPath = process.cwd() + '/plugins/miao-plugin/resources/meta/character'
+let cfgMap = {
+  char: {},
+  async init () {
+    let chars = fs.readdirSync(charPath)
+    for (let char of chars) {
+      cfgMap.char[char] = {}
+      let curr = cfgMap.char[char]
+      // 评分规则
+      if (cfgMap.exists(char, 'artis_user')) {
+        curr.artis = await cfgMap.getCfg(char, 'artis_user', 'default')
+      } else if (cfgMap.exists(char, 'artis')) {
+        curr.artis = await cfgMap.getCfg(char, 'artis', 'default')
+      }
+      // 伤害计算
+      if (cfgMap.exists(char, 'calc_user')) {
+        curr.calc = await cfgMap.getCfg(char, 'calc_user')
+      } else if (cfgMap.exists(char, 'calc')) {
+        curr.calc = await cfgMap.getCfg(char, 'calc')
+      }
+    }
+  },
+  exists (char, file) {
+    return fs.existsSync(`${charPath}/${char}/${file}.js`)
+  },
+  async getCfg (char, file, module = '') {
+    let cfg = await Data.importModule(`resources/meta/character/${char}/${file}.js`)
+    if (module) {
+      return cfg[module]
+    }
+    return cfg
+  }
+}
+await cfgMap.init()
 
 /**
  * 角色相关配置
  */
 let CharCfg = {
   // 获取角色伤害计算相关配置
-  async getCalcRule (char) {
-    let cfg = await Data.importModule(`resources/meta/character/${char.name}/calc.js`)
-    if (lodash.isEmpty(cfg)) {
+  getCalcRule (char) {
+    let cfg = cfgMap.char[char.name]?.calc
+    if (!cfg || lodash.isEmpty(cfg)) {
       return false
     }
     return {
@@ -20,6 +56,9 @@ let CharCfg = {
       mainAttr: cfg.mainAttr || 'atk,cpct,cdmg', // 伤害属性
       enemyName: cfg.enemyName || '小宝' // 敌人名称
     }
+  },
+  getArtisCfg (char) {
+    return cfgMap.char[char.name]?.artis || false
   }
 }
 export default CharCfg

models/profile-lib/AttrCalc.js

@@ -18,28 +18,27 @@ class AttrCalc {
   /**
    * 静态调用入口
    * @param profile
-   * @returns {boolean|void}
+   * @returns {AttrCalc}
    */
-  static async getAttr (profile) {
-    let attr = new AttrCalc(profile)
-    return await attr.calc()
+  static create (profile) {
+    return new AttrCalc(profile)
   }
 
   /**
-   * 实例调用入口
-   * @param profile
+   * 面板属性计算
+   * @returns {{}}
    */
-  async calc (profile) {
-    this.attr = ProfileAttr.init({
+  calc () {
+    this.attr = ProfileAttr.create({
       recharge: 100,
       cpct: 5,
       cdmg: 50
     })
-    await this.setCharAttr()
+    this.setCharAttr()
     this.setWeaponAttr()
     this.setArtisAttr()
     if (process.argv.includes('web-debug')) {
-      //  console.log(this.attr, this.attr.getAttr())
+      // console.log(this.attr, this.attr.getAttr())
     }
     return this.attr.getAttr()
   }
@@ -52,7 +51,7 @@ class AttrCalc {
    * 计算角色属性
    * @param affix
    */
-  async setCharAttr (affix = '') {
+  setCharAttr (affix = '') {
     let { char, level, promote } = this.profile
     let metaAttr = char.detail?.attr || {}
     let { keys = {}, details = {} } = metaAttr
@@ -87,7 +86,7 @@ class AttrCalc {
     this.addAttr('defBase', getLvData(2))
     this.addAttr(keys[3], getLvData(3, true))
 
-    let charBuffs = await char.getCalcRule()
+    let charBuffs = char.getCalcRule()
     lodash.forEach(charBuffs.buffs, (buff) => {
       if (!buff.isStatic) {
         return true
@@ -189,7 +188,6 @@ class AttrCalc {
     if (Format.isElem(key) && char.elem === key) {
       key = 'dmg'
     }
-
     if (!key) {
       return false
     }

models/profile-lib/CharArtis.js

@@ -1,24 +1,5 @@
 import { usefulAttr } from '../../resources/meta/artifact/artis-mark.js'
-import { Data } from '../../components/index.js'
 import lodash from 'lodash'
-import fs from 'fs'
-
-let charCfg = {}
-
-async function init () {
-  let charPath = process.cwd() + '/plugins/miao-plugin/resources/meta/character'
-  let chars = fs.readdirSync(charPath)
-  for (let char of chars) {
-    // 允许自定义配置文件，会覆盖喵喵版评分规则
-    if (fs.existsSync(`${charPath}/${char}/artis_user.js`)) {
-      charCfg[char] = await Data.importModule(`resources/meta/character/${char}/artis_user.js`)
-    } else if (fs.existsSync(`${charPath}/${char}/artis.js`)) {
-      charCfg[char] = await Data.importModule(`resources/meta/character/${char}/artis.js`)
-    }
-  }
-}
-
-await init()
 
 const CharArtis = {
 
@@ -88,7 +69,7 @@ const CharArtis = {
       }
     }
 
-    let charRule = charCfg[char.name]?.default || function ({ def }) {
+    let charRule = char.getArtisCfg() || function ({ def }) {
       return def(usefulAttr[char.name] || { atk: 75, cpct: 100, cdmg: 100 })
     }
 

resources/character/profile-detail.html

@@ -42,7 +42,7 @@
     </ul>
     <div class="data-info">
       {{if data.dataSource}}
-      <span>数据源：{{ {miao:"喵喵Api",enka:"Enka.Network",input:"手工录入"}[data.dataSource]||data.dataSource }}</span>
+      <span>{{if data._attrCalc}}[ 面板属性计算：开启 ]  ·{{/if}} 数据源：{{ {miao:"喵喵Api",enka:"Enka.Network",input:"手工录入"}[data.dataSource]||data.dataSource }}</span>
       {{/if}}
       {{if data.updateTime}}
       <span class="time">{{data.updateTime}}</span>

tools/profile-calc-test.js

@@ -5,9 +5,10 @@ import lodash from 'lodash'
 
 let _path = process.cwd()
 
-async function testCalcAttr (profile) {
+function testCalcAttr (profile) {
   if (profile.hasData) {
-    let attr2 = await AttrCalc.getAttr(profile)
+    let attrCalc = AttrCalc.create(profile)
+    let attr2 = attrCalc.calc()
     let char = profile.char
     let ret = {}
     lodash.forEach(profile.attr, (val, key) => {
@@ -90,9 +91,7 @@ async function test (ignore) {
       if (ignore.includes(uid * 1)) {
         continue
       }
-
-
-      await Profile.forEach(uid, async (profile) => {
+      Profile.forEach(uid, (profile) => {
         if (count > 0) {
           return false
         }
@@ -101,7 +100,7 @@ async function test (ignore) {
           return true
         }
         console.log(profile.id)
-        let ret = await testCalcAttr(profile)
+        let ret = testCalcAttr(profile)
         if (ret === false) {
           count++
         }