diff --git a/models/Artifact.js b/models/Artifact.js index bf55d722..06f47247 100644 --- a/models/Artifact.js +++ b/models/Artifact.js @@ -37,7 +37,7 @@ class Artifact extends Base { } get img () { - return `meta/artifact/${this.setName}/${this.idx}.webp` + return `meta/artifact/imgs/${this.setName}/${this.idx}.webp` } static getSetNameByArti (name) { diff --git a/models/ProfileArtis.js b/models/ProfileArtis.js index ca71fa38..9a923538 100644 --- a/models/ProfileArtis.js +++ b/models/ProfileArtis.js @@ -6,7 +6,7 @@ import Base from './Base.js' import { Artifact, ArtifactSet, Character } from './index.js' import { Format, Data } from '../components/index.js' import ArtisMark from './profile-lib/ArtisMark.js' -import { attrMap, attrValue } from '../resources/meta/artifact/artis-mark.js' +import { attrMap, attrValue } from '../resources/meta/artifact/index.js' import CharArtis from './profile-lib/CharArtis.js' export default class ProfileArtis extends Base { diff --git a/models/profile-lib/ArtisMark.js b/models/profile-lib/ArtisMark.js index 1a9c1def..f94a48ea 100644 --- a/models/profile-lib/ArtisMark.js +++ b/models/profile-lib/ArtisMark.js @@ -1,6 +1,6 @@ import lodash from 'lodash' import { Format } from '../../components/index.js' -import { attrNameMap, mainAttr, subAttr, attrMap } from '../../resources/meta/artifact/artis-mark.js' +import { attrNameMap, mainAttr, subAttr, attrMap } from '../../resources/meta/artifact/index.js' let ArtisMark = { // 根据Key获取标题 diff --git a/resources/meta/artifact/artis-mark.js b/resources/meta/artifact/artis-mark.js index e20bbf17..9c3da502 100644 --- a/resources/meta/artifact/artis-mark.js +++ b/resources/meta/artifact/artis-mark.js @@ -1,46 +1,3 @@ -export const attrValue = { - cpct: 3.89, - cdmg: 7.77, - mastery: 23.31, - atk: 5.83, - hp: 5.83, - def: 7.29, - recharge: 6.48, - dmg: 5.825, - phy: 7.288, - heal: 4.487 -} -export const attrMap = { - atk: { title: '大攻击', format: 'pct', type: 'normal', value: 5.83, text: '5.83%', valueMin: 4.08 }, - atkPlus: { title: '小攻击', format: 'comma', type: 'plus', base: 'atk', value: 19.45, valueMin: 13.62 }, - def: { title: '大防御', format: 'pct', type: 'normal', value: 7.29, text: '7.29%', valueMin: 5.1 }, - defPlus: { title: '小防御', format: 'comma', type: 'plus', base: 'def', value: 23.15, valueMin: 16.2 }, - hp: { title: '大生命', format: 'pct', type: 'normal', value: 5.83, text: '5.83%', valueMin: 4.08 }, - hpPlus: { title: '小生命', format: 'comma', type: 'plus', base: 'hp', value: 298.75, valueMin: 209.13 }, - cpct: { title: '暴击率', format: 'pct', type: 'normal', value: 3.89, text: '3.89%', valueMin: 2.72 }, - cdmg: { title: '暴击伤害', format: 'pct', type: 'normal', value: 7.77, text: '7.77%', valueMin: 5.44 }, - mastery: { title: '元素精通', format: 'comma', type: 'normal', value: 23.31, text: '23.31', valueMin: 16.32 }, - recharge: { title: '充能效率', format: 'pct', type: 'normal', value: 6.48, text: '6.48%', valueMin: 4.53 }, - dmg: { title: '元素伤害', format: 'pct', type: 'normal', value: 5.825, text: '5.83%' }, - phy: { title: '物伤加成', format: 'pct', type: 'normal', value: 7.288, text: '7.29%' }, - heal: { title: '治疗加成', format: 'pct', type: 'normal', value: 4.487, text: '4.49%' } -} - -let anMap = {} -for (let attr in attrMap) { - anMap[attrMap[attr].title] = attr -} - -export const attrNameMap = anMap - -export const mainAttr = { - 3: 'atk,def,hp,mastery,recharge'.split(','), - 4: 'atk,def,hp,mastery,dmg,phy'.split(','), - 5: 'atk,def,hp,mastery,heal,cpct,cdmg'.split(',') -} - -export const subAttr = 'atk,def,hp,mastery,recharge,cpct,cdmg'.split(',') - export const usefulAttr = { 神里绫人: { hp: 50, atk: 75, def: 0, cpct: 100, cdmg: 100, mastery: 0, dmg: 100, phy: 0, recharge: 30, heal: 0 }, 八重神子: { hp: 0, atk: 75, def: 0, cpct: 100, cdmg: 100, mastery: 75, dmg: 100, phy: 0, recharge: 55, heal: 0 }, diff --git a/resources/meta/artifact/乐园遗落之花/1.webp b/resources/meta/artifact/imgs/乐园遗落之花/1.webp similarity index 100% rename from resources/meta/artifact/乐园遗落之花/1.webp rename to resources/meta/artifact/imgs/乐园遗落之花/1.webp diff --git a/resources/meta/artifact/乐园遗落之花/2.webp b/resources/meta/artifact/imgs/乐园遗落之花/2.webp similarity index 100% rename from resources/meta/artifact/乐园遗落之花/2.webp rename to resources/meta/artifact/imgs/乐园遗落之花/2.webp diff --git a/resources/meta/artifact/乐园遗落之花/3.webp b/resources/meta/artifact/imgs/乐园遗落之花/3.webp similarity index 100% rename from resources/meta/artifact/乐园遗落之花/3.webp rename to resources/meta/artifact/imgs/乐园遗落之花/3.webp diff --git a/resources/meta/artifact/乐园遗落之花/4.webp b/resources/meta/artifact/imgs/乐园遗落之花/4.webp similarity index 100% rename from resources/meta/artifact/乐园遗落之花/4.webp rename to resources/meta/artifact/imgs/乐园遗落之花/4.webp diff --git a/resources/meta/artifact/乐园遗落之花/5.webp b/resources/meta/artifact/imgs/乐园遗落之花/5.webp similarity index 100% rename from resources/meta/artifact/乐园遗落之花/5.webp rename to resources/meta/artifact/imgs/乐园遗落之花/5.webp diff --git a/resources/meta/artifact/冒险家/1.webp b/resources/meta/artifact/imgs/冒险家/1.webp similarity index 100% rename from resources/meta/artifact/冒险家/1.webp rename to resources/meta/artifact/imgs/冒险家/1.webp diff --git a/resources/meta/artifact/冒险家/2.webp b/resources/meta/artifact/imgs/冒险家/2.webp similarity index 100% rename from resources/meta/artifact/冒险家/2.webp rename to resources/meta/artifact/imgs/冒险家/2.webp diff --git a/resources/meta/artifact/冒险家/3.webp b/resources/meta/artifact/imgs/冒险家/3.webp similarity index 100% rename from resources/meta/artifact/冒险家/3.webp rename to resources/meta/artifact/imgs/冒险家/3.webp diff --git a/resources/meta/artifact/冒险家/4.webp b/resources/meta/artifact/imgs/冒险家/4.webp similarity index 100% rename from resources/meta/artifact/冒险家/4.webp rename to resources/meta/artifact/imgs/冒险家/4.webp diff --git a/resources/meta/artifact/冒险家/5.webp b/resources/meta/artifact/imgs/冒险家/5.webp similarity index 100% rename from resources/meta/artifact/冒险家/5.webp rename to resources/meta/artifact/imgs/冒险家/5.webp diff --git a/resources/meta/artifact/冰风迷途的勇士/1.webp b/resources/meta/artifact/imgs/冰风迷途的勇士/1.webp similarity index 100% rename from resources/meta/artifact/冰风迷途的勇士/1.webp rename to resources/meta/artifact/imgs/冰风迷途的勇士/1.webp diff --git a/resources/meta/artifact/冰风迷途的勇士/2.webp b/resources/meta/artifact/imgs/冰风迷途的勇士/2.webp similarity index 100% rename from resources/meta/artifact/冰风迷途的勇士/2.webp rename to resources/meta/artifact/imgs/冰风迷途的勇士/2.webp diff --git a/resources/meta/artifact/冰风迷途的勇士/3.webp b/resources/meta/artifact/imgs/冰风迷途的勇士/3.webp similarity index 100% rename from resources/meta/artifact/冰风迷途的勇士/3.webp rename to resources/meta/artifact/imgs/冰风迷途的勇士/3.webp diff --git a/resources/meta/artifact/冰风迷途的勇士/4.webp b/resources/meta/artifact/imgs/冰风迷途的勇士/4.webp similarity index 100% rename from resources/meta/artifact/冰风迷途的勇士/4.webp rename to resources/meta/artifact/imgs/冰风迷途的勇士/4.webp diff --git a/resources/meta/artifact/冰风迷途的勇士/5.webp b/resources/meta/artifact/imgs/冰风迷途的勇士/5.webp similarity index 100% rename from resources/meta/artifact/冰风迷途的勇士/5.webp rename to resources/meta/artifact/imgs/冰风迷途的勇士/5.webp diff --git a/resources/meta/artifact/勇士之心/1.webp b/resources/meta/artifact/imgs/勇士之心/1.webp similarity index 100% rename from resources/meta/artifact/勇士之心/1.webp rename to resources/meta/artifact/imgs/勇士之心/1.webp diff --git a/resources/meta/artifact/勇士之心/2.webp b/resources/meta/artifact/imgs/勇士之心/2.webp similarity index 100% rename from resources/meta/artifact/勇士之心/2.webp rename to resources/meta/artifact/imgs/勇士之心/2.webp diff --git a/resources/meta/artifact/勇士之心/3.webp b/resources/meta/artifact/imgs/勇士之心/3.webp similarity index 100% rename from resources/meta/artifact/勇士之心/3.webp rename to resources/meta/artifact/imgs/勇士之心/3.webp diff --git a/resources/meta/artifact/勇士之心/4.webp b/resources/meta/artifact/imgs/勇士之心/4.webp similarity index 100% rename from resources/meta/artifact/勇士之心/4.webp rename to resources/meta/artifact/imgs/勇士之心/4.webp diff --git a/resources/meta/artifact/勇士之心/5.webp b/resources/meta/artifact/imgs/勇士之心/5.webp similarity index 100% rename from resources/meta/artifact/勇士之心/5.webp rename to resources/meta/artifact/imgs/勇士之心/5.webp diff --git a/resources/meta/artifact/千岩牢固/1.webp b/resources/meta/artifact/imgs/千岩牢固/1.webp similarity index 100% rename from resources/meta/artifact/千岩牢固/1.webp rename to resources/meta/artifact/imgs/千岩牢固/1.webp diff --git a/resources/meta/artifact/千岩牢固/2.webp b/resources/meta/artifact/imgs/千岩牢固/2.webp similarity index 100% rename from resources/meta/artifact/千岩牢固/2.webp rename to resources/meta/artifact/imgs/千岩牢固/2.webp diff --git a/resources/meta/artifact/千岩牢固/3.webp b/resources/meta/artifact/imgs/千岩牢固/3.webp similarity index 100% rename from resources/meta/artifact/千岩牢固/3.webp rename to resources/meta/artifact/imgs/千岩牢固/3.webp diff --git a/resources/meta/artifact/千岩牢固/4.webp b/resources/meta/artifact/imgs/千岩牢固/4.webp similarity index 100% rename from resources/meta/artifact/千岩牢固/4.webp rename to resources/meta/artifact/imgs/千岩牢固/4.webp diff --git a/resources/meta/artifact/千岩牢固/5.webp b/resources/meta/artifact/imgs/千岩牢固/5.webp similarity index 100% rename from resources/meta/artifact/千岩牢固/5.webp rename to resources/meta/artifact/imgs/千岩牢固/5.webp diff --git a/resources/meta/artifact/华馆梦醒形骸记/1.webp b/resources/meta/artifact/imgs/华馆梦醒形骸记/1.webp similarity index 100% rename from resources/meta/artifact/华馆梦醒形骸记/1.webp rename to resources/meta/artifact/imgs/华馆梦醒形骸记/1.webp diff --git a/resources/meta/artifact/华馆梦醒形骸记/2.webp b/resources/meta/artifact/imgs/华馆梦醒形骸记/2.webp similarity index 100% rename from resources/meta/artifact/华馆梦醒形骸记/2.webp rename to resources/meta/artifact/imgs/华馆梦醒形骸记/2.webp diff --git a/resources/meta/artifact/华馆梦醒形骸记/3.webp b/resources/meta/artifact/imgs/华馆梦醒形骸记/3.webp similarity index 100% rename from resources/meta/artifact/华馆梦醒形骸记/3.webp rename to resources/meta/artifact/imgs/华馆梦醒形骸记/3.webp diff --git a/resources/meta/artifact/华馆梦醒形骸记/4.webp b/resources/meta/artifact/imgs/华馆梦醒形骸记/4.webp similarity index 100% rename from resources/meta/artifact/华馆梦醒形骸记/4.webp rename to resources/meta/artifact/imgs/华馆梦醒形骸记/4.webp diff --git a/resources/meta/artifact/华馆梦醒形骸记/5.webp b/resources/meta/artifact/imgs/华馆梦醒形骸记/5.webp similarity index 100% rename from resources/meta/artifact/华馆梦醒形骸记/5.webp rename to resources/meta/artifact/imgs/华馆梦醒形骸记/5.webp diff --git a/resources/meta/artifact/奇迹/1.webp b/resources/meta/artifact/imgs/奇迹/1.webp similarity index 100% rename from resources/meta/artifact/奇迹/1.webp rename to resources/meta/artifact/imgs/奇迹/1.webp diff --git a/resources/meta/artifact/奇迹/2.webp b/resources/meta/artifact/imgs/奇迹/2.webp similarity index 100% rename from resources/meta/artifact/奇迹/2.webp rename to resources/meta/artifact/imgs/奇迹/2.webp diff --git a/resources/meta/artifact/奇迹/3.webp b/resources/meta/artifact/imgs/奇迹/3.webp similarity index 100% rename from resources/meta/artifact/奇迹/3.webp rename to resources/meta/artifact/imgs/奇迹/3.webp diff --git a/resources/meta/artifact/奇迹/4.webp b/resources/meta/artifact/imgs/奇迹/4.webp similarity index 100% rename from resources/meta/artifact/奇迹/4.webp rename to resources/meta/artifact/imgs/奇迹/4.webp diff --git a/resources/meta/artifact/奇迹/5.webp b/resources/meta/artifact/imgs/奇迹/5.webp similarity index 100% rename from resources/meta/artifact/奇迹/5.webp rename to resources/meta/artifact/imgs/奇迹/5.webp diff --git a/resources/meta/artifact/如雷的盛怒/1.webp b/resources/meta/artifact/imgs/如雷的盛怒/1.webp similarity index 100% rename from resources/meta/artifact/如雷的盛怒/1.webp rename to resources/meta/artifact/imgs/如雷的盛怒/1.webp diff --git a/resources/meta/artifact/如雷的盛怒/2.webp b/resources/meta/artifact/imgs/如雷的盛怒/2.webp similarity index 100% rename from resources/meta/artifact/如雷的盛怒/2.webp rename to resources/meta/artifact/imgs/如雷的盛怒/2.webp diff --git a/resources/meta/artifact/如雷的盛怒/3.webp b/resources/meta/artifact/imgs/如雷的盛怒/3.webp similarity index 100% rename from resources/meta/artifact/如雷的盛怒/3.webp rename to resources/meta/artifact/imgs/如雷的盛怒/3.webp diff --git a/resources/meta/artifact/如雷的盛怒/4.webp b/resources/meta/artifact/imgs/如雷的盛怒/4.webp similarity index 100% rename from resources/meta/artifact/如雷的盛怒/4.webp rename to resources/meta/artifact/imgs/如雷的盛怒/4.webp diff --git a/resources/meta/artifact/如雷的盛怒/5.webp b/resources/meta/artifact/imgs/如雷的盛怒/5.webp similarity index 100% rename from resources/meta/artifact/如雷的盛怒/5.webp rename to resources/meta/artifact/imgs/如雷的盛怒/5.webp diff --git a/resources/meta/artifact/学士/1.webp b/resources/meta/artifact/imgs/学士/1.webp similarity index 100% rename from resources/meta/artifact/学士/1.webp rename to resources/meta/artifact/imgs/学士/1.webp diff --git a/resources/meta/artifact/学士/2.webp b/resources/meta/artifact/imgs/学士/2.webp similarity index 100% rename from resources/meta/artifact/学士/2.webp rename to resources/meta/artifact/imgs/学士/2.webp diff --git a/resources/meta/artifact/学士/3.webp b/resources/meta/artifact/imgs/学士/3.webp similarity index 100% rename from resources/meta/artifact/学士/3.webp rename to resources/meta/artifact/imgs/学士/3.webp diff --git a/resources/meta/artifact/学士/4.webp b/resources/meta/artifact/imgs/学士/4.webp similarity index 100% rename from resources/meta/artifact/学士/4.webp rename to resources/meta/artifact/imgs/学士/4.webp diff --git a/resources/meta/artifact/学士/5.webp b/resources/meta/artifact/imgs/学士/5.webp similarity index 100% rename from resources/meta/artifact/学士/5.webp rename to resources/meta/artifact/imgs/学士/5.webp diff --git a/resources/meta/artifact/守护之心/1.webp b/resources/meta/artifact/imgs/守护之心/1.webp similarity index 100% rename from resources/meta/artifact/守护之心/1.webp rename to resources/meta/artifact/imgs/守护之心/1.webp diff --git a/resources/meta/artifact/守护之心/2.webp b/resources/meta/artifact/imgs/守护之心/2.webp similarity index 100% rename from resources/meta/artifact/守护之心/2.webp rename to resources/meta/artifact/imgs/守护之心/2.webp diff --git a/resources/meta/artifact/守护之心/3.webp b/resources/meta/artifact/imgs/守护之心/3.webp similarity index 100% rename from resources/meta/artifact/守护之心/3.webp rename to resources/meta/artifact/imgs/守护之心/3.webp diff --git a/resources/meta/artifact/守护之心/4.webp b/resources/meta/artifact/imgs/守护之心/4.webp similarity index 100% rename from resources/meta/artifact/守护之心/4.webp rename to resources/meta/artifact/imgs/守护之心/4.webp diff --git a/resources/meta/artifact/守护之心/5.webp b/resources/meta/artifact/imgs/守护之心/5.webp similarity index 100% rename from resources/meta/artifact/守护之心/5.webp rename to resources/meta/artifact/imgs/守护之心/5.webp diff --git a/resources/meta/artifact/平息鸣雷的尊者/1.webp b/resources/meta/artifact/imgs/平息鸣雷的尊者/1.webp similarity index 100% rename from resources/meta/artifact/平息鸣雷的尊者/1.webp rename to resources/meta/artifact/imgs/平息鸣雷的尊者/1.webp diff --git a/resources/meta/artifact/平息鸣雷的尊者/2.webp b/resources/meta/artifact/imgs/平息鸣雷的尊者/2.webp similarity index 100% rename from resources/meta/artifact/平息鸣雷的尊者/2.webp rename to resources/meta/artifact/imgs/平息鸣雷的尊者/2.webp diff --git a/resources/meta/artifact/平息鸣雷的尊者/3.webp b/resources/meta/artifact/imgs/平息鸣雷的尊者/3.webp similarity index 100% rename from resources/meta/artifact/平息鸣雷的尊者/3.webp rename to resources/meta/artifact/imgs/平息鸣雷的尊者/3.webp diff --git a/resources/meta/artifact/平息鸣雷的尊者/4.webp b/resources/meta/artifact/imgs/平息鸣雷的尊者/4.webp similarity index 100% rename from resources/meta/artifact/平息鸣雷的尊者/4.webp rename to resources/meta/artifact/imgs/平息鸣雷的尊者/4.webp diff --git a/resources/meta/artifact/平息鸣雷的尊者/5.webp b/resources/meta/artifact/imgs/平息鸣雷的尊者/5.webp similarity index 100% rename from resources/meta/artifact/平息鸣雷的尊者/5.webp rename to resources/meta/artifact/imgs/平息鸣雷的尊者/5.webp diff --git a/resources/meta/artifact/幸运儿/1.webp b/resources/meta/artifact/imgs/幸运儿/1.webp similarity index 100% rename from resources/meta/artifact/幸运儿/1.webp rename to resources/meta/artifact/imgs/幸运儿/1.webp diff --git a/resources/meta/artifact/幸运儿/2.webp b/resources/meta/artifact/imgs/幸运儿/2.webp similarity index 100% rename from resources/meta/artifact/幸运儿/2.webp rename to resources/meta/artifact/imgs/幸运儿/2.webp diff --git a/resources/meta/artifact/幸运儿/3.webp b/resources/meta/artifact/imgs/幸运儿/3.webp similarity index 100% rename from resources/meta/artifact/幸运儿/3.webp rename to resources/meta/artifact/imgs/幸运儿/3.webp diff --git a/resources/meta/artifact/幸运儿/4.webp b/resources/meta/artifact/imgs/幸运儿/4.webp similarity index 100% rename from resources/meta/artifact/幸运儿/4.webp rename to resources/meta/artifact/imgs/幸运儿/4.webp diff --git a/resources/meta/artifact/幸运儿/5.webp b/resources/meta/artifact/imgs/幸运儿/5.webp similarity index 100% rename from resources/meta/artifact/幸运儿/5.webp rename to resources/meta/artifact/imgs/幸运儿/5.webp diff --git a/resources/meta/artifact/悠古的磐岩/1.webp b/resources/meta/artifact/imgs/悠古的磐岩/1.webp similarity index 100% rename from resources/meta/artifact/悠古的磐岩/1.webp rename to resources/meta/artifact/imgs/悠古的磐岩/1.webp diff --git a/resources/meta/artifact/悠古的磐岩/2.webp b/resources/meta/artifact/imgs/悠古的磐岩/2.webp similarity index 100% rename from resources/meta/artifact/悠古的磐岩/2.webp rename to resources/meta/artifact/imgs/悠古的磐岩/2.webp diff --git a/resources/meta/artifact/悠古的磐岩/3.webp b/resources/meta/artifact/imgs/悠古的磐岩/3.webp similarity index 100% rename from resources/meta/artifact/悠古的磐岩/3.webp rename to resources/meta/artifact/imgs/悠古的磐岩/3.webp diff --git a/resources/meta/artifact/悠古的磐岩/4.webp b/resources/meta/artifact/imgs/悠古的磐岩/4.webp similarity index 100% rename from resources/meta/artifact/悠古的磐岩/4.webp rename to resources/meta/artifact/imgs/悠古的磐岩/4.webp diff --git a/resources/meta/artifact/悠古的磐岩/5.webp b/resources/meta/artifact/imgs/悠古的磐岩/5.webp similarity index 100% rename from resources/meta/artifact/悠古的磐岩/5.webp rename to resources/meta/artifact/imgs/悠古的磐岩/5.webp diff --git a/resources/meta/artifact/战狂/1.webp b/resources/meta/artifact/imgs/战狂/1.webp similarity index 100% rename from resources/meta/artifact/战狂/1.webp rename to resources/meta/artifact/imgs/战狂/1.webp diff --git a/resources/meta/artifact/战狂/2.webp b/resources/meta/artifact/imgs/战狂/2.webp similarity index 100% rename from resources/meta/artifact/战狂/2.webp rename to resources/meta/artifact/imgs/战狂/2.webp diff --git a/resources/meta/artifact/战狂/3.webp b/resources/meta/artifact/imgs/战狂/3.webp similarity index 100% rename from resources/meta/artifact/战狂/3.webp rename to resources/meta/artifact/imgs/战狂/3.webp diff --git a/resources/meta/artifact/战狂/4.webp b/resources/meta/artifact/imgs/战狂/4.webp similarity index 100% rename from resources/meta/artifact/战狂/4.webp rename to resources/meta/artifact/imgs/战狂/4.webp diff --git a/resources/meta/artifact/战狂/5.webp b/resources/meta/artifact/imgs/战狂/5.webp similarity index 100% rename from resources/meta/artifact/战狂/5.webp rename to resources/meta/artifact/imgs/战狂/5.webp diff --git a/resources/meta/artifact/教官/1.webp b/resources/meta/artifact/imgs/教官/1.webp similarity index 100% rename from resources/meta/artifact/教官/1.webp rename to resources/meta/artifact/imgs/教官/1.webp diff --git a/resources/meta/artifact/教官/2.webp b/resources/meta/artifact/imgs/教官/2.webp similarity index 100% rename from resources/meta/artifact/教官/2.webp rename to resources/meta/artifact/imgs/教官/2.webp diff --git a/resources/meta/artifact/教官/3.webp b/resources/meta/artifact/imgs/教官/3.webp similarity index 100% rename from resources/meta/artifact/教官/3.webp rename to resources/meta/artifact/imgs/教官/3.webp diff --git a/resources/meta/artifact/教官/4.webp b/resources/meta/artifact/imgs/教官/4.webp similarity index 100% rename from resources/meta/artifact/教官/4.webp rename to resources/meta/artifact/imgs/教官/4.webp diff --git a/resources/meta/artifact/教官/5.webp b/resources/meta/artifact/imgs/教官/5.webp similarity index 100% rename from resources/meta/artifact/教官/5.webp rename to resources/meta/artifact/imgs/教官/5.webp diff --git a/resources/meta/artifact/昔日宗室之仪/1.webp b/resources/meta/artifact/imgs/昔日宗室之仪/1.webp similarity index 100% rename from resources/meta/artifact/昔日宗室之仪/1.webp rename to resources/meta/artifact/imgs/昔日宗室之仪/1.webp diff --git a/resources/meta/artifact/昔日宗室之仪/2.webp b/resources/meta/artifact/imgs/昔日宗室之仪/2.webp similarity index 100% rename from resources/meta/artifact/昔日宗室之仪/2.webp rename to resources/meta/artifact/imgs/昔日宗室之仪/2.webp diff --git a/resources/meta/artifact/昔日宗室之仪/3.webp b/resources/meta/artifact/imgs/昔日宗室之仪/3.webp similarity index 100% rename from resources/meta/artifact/昔日宗室之仪/3.webp rename to resources/meta/artifact/imgs/昔日宗室之仪/3.webp diff --git a/resources/meta/artifact/昔日宗室之仪/4.webp b/resources/meta/artifact/imgs/昔日宗室之仪/4.webp similarity index 100% rename from resources/meta/artifact/昔日宗室之仪/4.webp rename to resources/meta/artifact/imgs/昔日宗室之仪/4.webp diff --git a/resources/meta/artifact/昔日宗室之仪/5.webp b/resources/meta/artifact/imgs/昔日宗室之仪/5.webp similarity index 100% rename from resources/meta/artifact/昔日宗室之仪/5.webp rename to resources/meta/artifact/imgs/昔日宗室之仪/5.webp diff --git a/resources/meta/artifact/来歆余响/1.webp b/resources/meta/artifact/imgs/来歆余响/1.webp similarity index 100% rename from resources/meta/artifact/来歆余响/1.webp rename to resources/meta/artifact/imgs/来歆余响/1.webp diff --git a/resources/meta/artifact/来歆余响/2.webp b/resources/meta/artifact/imgs/来歆余响/2.webp similarity index 100% rename from resources/meta/artifact/来歆余响/2.webp rename to resources/meta/artifact/imgs/来歆余响/2.webp diff --git a/resources/meta/artifact/来歆余响/3.webp b/resources/meta/artifact/imgs/来歆余响/3.webp similarity index 100% rename from resources/meta/artifact/来歆余响/3.webp rename to resources/meta/artifact/imgs/来歆余响/3.webp diff --git a/resources/meta/artifact/来歆余响/4.webp b/resources/meta/artifact/imgs/来歆余响/4.webp similarity index 100% rename from resources/meta/artifact/来歆余响/4.webp rename to resources/meta/artifact/imgs/来歆余响/4.webp diff --git a/resources/meta/artifact/来歆余响/5.webp b/resources/meta/artifact/imgs/来歆余响/5.webp similarity index 100% rename from resources/meta/artifact/来歆余响/5.webp rename to resources/meta/artifact/imgs/来歆余响/5.webp diff --git a/resources/meta/artifact/染血的骑士道/1.webp b/resources/meta/artifact/imgs/染血的骑士道/1.webp similarity index 100% rename from resources/meta/artifact/染血的骑士道/1.webp rename to resources/meta/artifact/imgs/染血的骑士道/1.webp diff --git a/resources/meta/artifact/染血的骑士道/2.webp b/resources/meta/artifact/imgs/染血的骑士道/2.webp similarity index 100% rename from resources/meta/artifact/染血的骑士道/2.webp rename to resources/meta/artifact/imgs/染血的骑士道/2.webp diff --git a/resources/meta/artifact/染血的骑士道/3.webp b/resources/meta/artifact/imgs/染血的骑士道/3.webp similarity index 100% rename from resources/meta/artifact/染血的骑士道/3.webp rename to resources/meta/artifact/imgs/染血的骑士道/3.webp diff --git a/resources/meta/artifact/染血的骑士道/4.webp b/resources/meta/artifact/imgs/染血的骑士道/4.webp similarity index 100% rename from resources/meta/artifact/染血的骑士道/4.webp rename to resources/meta/artifact/imgs/染血的骑士道/4.webp diff --git a/resources/meta/artifact/染血的骑士道/5.webp b/resources/meta/artifact/imgs/染血的骑士道/5.webp similarity index 100% rename from resources/meta/artifact/染血的骑士道/5.webp rename to resources/meta/artifact/imgs/染血的骑士道/5.webp diff --git a/resources/meta/artifact/武人/1.webp b/resources/meta/artifact/imgs/武人/1.webp similarity index 100% rename from resources/meta/artifact/武人/1.webp rename to resources/meta/artifact/imgs/武人/1.webp diff --git a/resources/meta/artifact/武人/2.webp b/resources/meta/artifact/imgs/武人/2.webp similarity index 100% rename from resources/meta/artifact/武人/2.webp rename to resources/meta/artifact/imgs/武人/2.webp diff --git a/resources/meta/artifact/武人/3.webp b/resources/meta/artifact/imgs/武人/3.webp similarity index 100% rename from resources/meta/artifact/武人/3.webp rename to resources/meta/artifact/imgs/武人/3.webp diff --git a/resources/meta/artifact/武人/4.webp b/resources/meta/artifact/imgs/武人/4.webp similarity index 100% rename from resources/meta/artifact/武人/4.webp rename to resources/meta/artifact/imgs/武人/4.webp diff --git a/resources/meta/artifact/武人/5.webp b/resources/meta/artifact/imgs/武人/5.webp similarity index 100% rename from resources/meta/artifact/武人/5.webp rename to resources/meta/artifact/imgs/武人/5.webp diff --git a/resources/meta/artifact/沉沦之心/1.webp b/resources/meta/artifact/imgs/沉沦之心/1.webp similarity index 100% rename from resources/meta/artifact/沉沦之心/1.webp rename to resources/meta/artifact/imgs/沉沦之心/1.webp diff --git a/resources/meta/artifact/沉沦之心/2.webp b/resources/meta/artifact/imgs/沉沦之心/2.webp similarity index 100% rename from resources/meta/artifact/沉沦之心/2.webp rename to resources/meta/artifact/imgs/沉沦之心/2.webp diff --git a/resources/meta/artifact/沉沦之心/3.webp b/resources/meta/artifact/imgs/沉沦之心/3.webp similarity index 100% rename from resources/meta/artifact/沉沦之心/3.webp rename to resources/meta/artifact/imgs/沉沦之心/3.webp diff --git a/resources/meta/artifact/沉沦之心/4.webp b/resources/meta/artifact/imgs/沉沦之心/4.webp similarity index 100% rename from resources/meta/artifact/沉沦之心/4.webp rename to resources/meta/artifact/imgs/沉沦之心/4.webp diff --git a/resources/meta/artifact/沉沦之心/5.webp b/resources/meta/artifact/imgs/沉沦之心/5.webp similarity index 100% rename from resources/meta/artifact/沉沦之心/5.webp rename to resources/meta/artifact/imgs/沉沦之心/5.webp diff --git a/resources/meta/artifact/沙上楼阁史话/1.webp b/resources/meta/artifact/imgs/沙上楼阁史话/1.webp similarity index 100% rename from resources/meta/artifact/沙上楼阁史话/1.webp rename to resources/meta/artifact/imgs/沙上楼阁史话/1.webp diff --git a/resources/meta/artifact/沙上楼阁史话/2.webp b/resources/meta/artifact/imgs/沙上楼阁史话/2.webp similarity index 100% rename from resources/meta/artifact/沙上楼阁史话/2.webp rename to resources/meta/artifact/imgs/沙上楼阁史话/2.webp diff --git a/resources/meta/artifact/沙上楼阁史话/3.webp b/resources/meta/artifact/imgs/沙上楼阁史话/3.webp similarity index 100% rename from resources/meta/artifact/沙上楼阁史话/3.webp rename to resources/meta/artifact/imgs/沙上楼阁史话/3.webp diff --git a/resources/meta/artifact/沙上楼阁史话/4.webp b/resources/meta/artifact/imgs/沙上楼阁史话/4.webp similarity index 100% rename from resources/meta/artifact/沙上楼阁史话/4.webp rename to resources/meta/artifact/imgs/沙上楼阁史话/4.webp diff --git a/resources/meta/artifact/沙上楼阁史话/5.webp b/resources/meta/artifact/imgs/沙上楼阁史话/5.webp similarity index 100% rename from resources/meta/artifact/沙上楼阁史话/5.webp rename to resources/meta/artifact/imgs/沙上楼阁史话/5.webp diff --git a/resources/meta/artifact/流放者/1.webp b/resources/meta/artifact/imgs/流放者/1.webp similarity index 100% rename from resources/meta/artifact/流放者/1.webp rename to resources/meta/artifact/imgs/流放者/1.webp diff --git a/resources/meta/artifact/流放者/2.webp b/resources/meta/artifact/imgs/流放者/2.webp similarity index 100% rename from resources/meta/artifact/流放者/2.webp rename to resources/meta/artifact/imgs/流放者/2.webp diff --git a/resources/meta/artifact/流放者/3.webp b/resources/meta/artifact/imgs/流放者/3.webp similarity index 100% rename from resources/meta/artifact/流放者/3.webp rename to resources/meta/artifact/imgs/流放者/3.webp diff --git a/resources/meta/artifact/流放者/4.webp b/resources/meta/artifact/imgs/流放者/4.webp similarity index 100% rename from resources/meta/artifact/流放者/4.webp rename to resources/meta/artifact/imgs/流放者/4.webp diff --git a/resources/meta/artifact/流放者/5.webp b/resources/meta/artifact/imgs/流放者/5.webp similarity index 100% rename from resources/meta/artifact/流放者/5.webp rename to resources/meta/artifact/imgs/流放者/5.webp diff --git a/resources/meta/artifact/流浪大地的乐团/1.webp b/resources/meta/artifact/imgs/流浪大地的乐团/1.webp similarity index 100% rename from resources/meta/artifact/流浪大地的乐团/1.webp rename to resources/meta/artifact/imgs/流浪大地的乐团/1.webp diff --git a/resources/meta/artifact/流浪大地的乐团/2.webp b/resources/meta/artifact/imgs/流浪大地的乐团/2.webp similarity index 100% rename from resources/meta/artifact/流浪大地的乐团/2.webp rename to resources/meta/artifact/imgs/流浪大地的乐团/2.webp diff --git a/resources/meta/artifact/流浪大地的乐团/3.webp b/resources/meta/artifact/imgs/流浪大地的乐团/3.webp similarity index 100% rename from resources/meta/artifact/流浪大地的乐团/3.webp rename to resources/meta/artifact/imgs/流浪大地的乐团/3.webp diff --git a/resources/meta/artifact/流浪大地的乐团/4.webp b/resources/meta/artifact/imgs/流浪大地的乐团/4.webp similarity index 100% rename from resources/meta/artifact/流浪大地的乐团/4.webp rename to resources/meta/artifact/imgs/流浪大地的乐团/4.webp diff --git a/resources/meta/artifact/流浪大地的乐团/5.webp b/resources/meta/artifact/imgs/流浪大地的乐团/5.webp similarity index 100% rename from resources/meta/artifact/流浪大地的乐团/5.webp rename to resources/meta/artifact/imgs/流浪大地的乐团/5.webp diff --git a/resources/meta/artifact/海染砗磲/1.webp b/resources/meta/artifact/imgs/海染砗磲/1.webp similarity index 100% rename from resources/meta/artifact/海染砗磲/1.webp rename to resources/meta/artifact/imgs/海染砗磲/1.webp diff --git a/resources/meta/artifact/海染砗磲/2.webp b/resources/meta/artifact/imgs/海染砗磲/2.webp similarity index 100% rename from resources/meta/artifact/海染砗磲/2.webp rename to resources/meta/artifact/imgs/海染砗磲/2.webp diff --git a/resources/meta/artifact/海染砗磲/3.webp b/resources/meta/artifact/imgs/海染砗磲/3.webp similarity index 100% rename from resources/meta/artifact/海染砗磲/3.webp rename to resources/meta/artifact/imgs/海染砗磲/3.webp diff --git a/resources/meta/artifact/海染砗磲/4.webp b/resources/meta/artifact/imgs/海染砗磲/4.webp similarity index 100% rename from resources/meta/artifact/海染砗磲/4.webp rename to resources/meta/artifact/imgs/海染砗磲/4.webp diff --git a/resources/meta/artifact/海染砗磲/5.webp b/resources/meta/artifact/imgs/海染砗磲/5.webp similarity index 100% rename from resources/meta/artifact/海染砗磲/5.webp rename to resources/meta/artifact/imgs/海染砗磲/5.webp diff --git a/resources/meta/artifact/深林的记忆/1.webp b/resources/meta/artifact/imgs/深林的记忆/1.webp similarity index 100% rename from resources/meta/artifact/深林的记忆/1.webp rename to resources/meta/artifact/imgs/深林的记忆/1.webp diff --git a/resources/meta/artifact/深林的记忆/2.webp b/resources/meta/artifact/imgs/深林的记忆/2.webp similarity index 100% rename from resources/meta/artifact/深林的记忆/2.webp rename to resources/meta/artifact/imgs/深林的记忆/2.webp diff --git a/resources/meta/artifact/深林的记忆/3.webp b/resources/meta/artifact/imgs/深林的记忆/3.webp similarity index 100% rename from resources/meta/artifact/深林的记忆/3.webp rename to resources/meta/artifact/imgs/深林的记忆/3.webp diff --git a/resources/meta/artifact/深林的记忆/4.webp b/resources/meta/artifact/imgs/深林的记忆/4.webp similarity index 100% rename from resources/meta/artifact/深林的记忆/4.webp rename to resources/meta/artifact/imgs/深林的记忆/4.webp diff --git a/resources/meta/artifact/深林的记忆/5.webp b/resources/meta/artifact/imgs/深林的记忆/5.webp similarity index 100% rename from resources/meta/artifact/深林的记忆/5.webp rename to resources/meta/artifact/imgs/深林的记忆/5.webp diff --git a/resources/meta/artifact/渡过烈火的贤人/1.webp b/resources/meta/artifact/imgs/渡过烈火的贤人/1.webp similarity index 100% rename from resources/meta/artifact/渡过烈火的贤人/1.webp rename to resources/meta/artifact/imgs/渡过烈火的贤人/1.webp diff --git a/resources/meta/artifact/渡过烈火的贤人/2.webp b/resources/meta/artifact/imgs/渡过烈火的贤人/2.webp similarity index 100% rename from resources/meta/artifact/渡过烈火的贤人/2.webp rename to resources/meta/artifact/imgs/渡过烈火的贤人/2.webp diff --git a/resources/meta/artifact/渡过烈火的贤人/3.webp b/resources/meta/artifact/imgs/渡过烈火的贤人/3.webp similarity index 100% rename from resources/meta/artifact/渡过烈火的贤人/3.webp rename to resources/meta/artifact/imgs/渡过烈火的贤人/3.webp diff --git a/resources/meta/artifact/渡过烈火的贤人/4.webp b/resources/meta/artifact/imgs/渡过烈火的贤人/4.webp similarity index 100% rename from resources/meta/artifact/渡过烈火的贤人/4.webp rename to resources/meta/artifact/imgs/渡过烈火的贤人/4.webp diff --git a/resources/meta/artifact/渡过烈火的贤人/5.webp b/resources/meta/artifact/imgs/渡过烈火的贤人/5.webp similarity index 100% rename from resources/meta/artifact/渡过烈火的贤人/5.webp rename to resources/meta/artifact/imgs/渡过烈火的贤人/5.webp diff --git a/resources/meta/artifact/游医/1.webp b/resources/meta/artifact/imgs/游医/1.webp similarity index 100% rename from resources/meta/artifact/游医/1.webp rename to resources/meta/artifact/imgs/游医/1.webp diff --git a/resources/meta/artifact/游医/2.webp b/resources/meta/artifact/imgs/游医/2.webp similarity index 100% rename from resources/meta/artifact/游医/2.webp rename to resources/meta/artifact/imgs/游医/2.webp diff --git a/resources/meta/artifact/游医/3.webp b/resources/meta/artifact/imgs/游医/3.webp similarity index 100% rename from resources/meta/artifact/游医/3.webp rename to resources/meta/artifact/imgs/游医/3.webp diff --git a/resources/meta/artifact/游医/4.webp b/resources/meta/artifact/imgs/游医/4.webp similarity index 100% rename from resources/meta/artifact/游医/4.webp rename to resources/meta/artifact/imgs/游医/4.webp diff --git a/resources/meta/artifact/游医/5.webp b/resources/meta/artifact/imgs/游医/5.webp similarity index 100% rename from resources/meta/artifact/游医/5.webp rename to resources/meta/artifact/imgs/游医/5.webp diff --git a/resources/meta/artifact/炽烈的炎之魔女/1.webp b/resources/meta/artifact/imgs/炽烈的炎之魔女/1.webp similarity index 100% rename from resources/meta/artifact/炽烈的炎之魔女/1.webp rename to resources/meta/artifact/imgs/炽烈的炎之魔女/1.webp diff --git a/resources/meta/artifact/炽烈的炎之魔女/2.webp b/resources/meta/artifact/imgs/炽烈的炎之魔女/2.webp similarity index 100% rename from resources/meta/artifact/炽烈的炎之魔女/2.webp rename to resources/meta/artifact/imgs/炽烈的炎之魔女/2.webp diff --git a/resources/meta/artifact/炽烈的炎之魔女/3.webp b/resources/meta/artifact/imgs/炽烈的炎之魔女/3.webp similarity index 100% rename from resources/meta/artifact/炽烈的炎之魔女/3.webp rename to resources/meta/artifact/imgs/炽烈的炎之魔女/3.webp diff --git a/resources/meta/artifact/炽烈的炎之魔女/4.webp b/resources/meta/artifact/imgs/炽烈的炎之魔女/4.webp similarity index 100% rename from resources/meta/artifact/炽烈的炎之魔女/4.webp rename to resources/meta/artifact/imgs/炽烈的炎之魔女/4.webp diff --git a/resources/meta/artifact/炽烈的炎之魔女/5.webp b/resources/meta/artifact/imgs/炽烈的炎之魔女/5.webp similarity index 100% rename from resources/meta/artifact/炽烈的炎之魔女/5.webp rename to resources/meta/artifact/imgs/炽烈的炎之魔女/5.webp diff --git a/resources/meta/artifact/祭冰之人/5.webp b/resources/meta/artifact/imgs/祭冰之人/5.webp similarity index 100% rename from resources/meta/artifact/祭冰之人/5.webp rename to resources/meta/artifact/imgs/祭冰之人/5.webp diff --git a/resources/meta/artifact/祭水之人/5.webp b/resources/meta/artifact/imgs/祭水之人/5.webp similarity index 100% rename from resources/meta/artifact/祭水之人/5.webp rename to resources/meta/artifact/imgs/祭水之人/5.webp diff --git a/resources/meta/artifact/祭火之人/5.webp b/resources/meta/artifact/imgs/祭火之人/5.webp similarity index 100% rename from resources/meta/artifact/祭火之人/5.webp rename to resources/meta/artifact/imgs/祭火之人/5.webp diff --git a/resources/meta/artifact/祭雷之人/5.webp b/resources/meta/artifact/imgs/祭雷之人/5.webp similarity index 100% rename from resources/meta/artifact/祭雷之人/5.webp rename to resources/meta/artifact/imgs/祭雷之人/5.webp diff --git a/resources/meta/artifact/绝缘之旗印/1.webp b/resources/meta/artifact/imgs/绝缘之旗印/1.webp similarity index 100% rename from resources/meta/artifact/绝缘之旗印/1.webp rename to resources/meta/artifact/imgs/绝缘之旗印/1.webp diff --git a/resources/meta/artifact/绝缘之旗印/2.webp b/resources/meta/artifact/imgs/绝缘之旗印/2.webp similarity index 100% rename from resources/meta/artifact/绝缘之旗印/2.webp rename to resources/meta/artifact/imgs/绝缘之旗印/2.webp diff --git a/resources/meta/artifact/绝缘之旗印/3.webp b/resources/meta/artifact/imgs/绝缘之旗印/3.webp similarity index 100% rename from resources/meta/artifact/绝缘之旗印/3.webp rename to resources/meta/artifact/imgs/绝缘之旗印/3.webp diff --git a/resources/meta/artifact/绝缘之旗印/4.webp b/resources/meta/artifact/imgs/绝缘之旗印/4.webp similarity index 100% rename from resources/meta/artifact/绝缘之旗印/4.webp rename to resources/meta/artifact/imgs/绝缘之旗印/4.webp diff --git a/resources/meta/artifact/绝缘之旗印/5.webp b/resources/meta/artifact/imgs/绝缘之旗印/5.webp similarity index 100% rename from resources/meta/artifact/绝缘之旗印/5.webp rename to resources/meta/artifact/imgs/绝缘之旗印/5.webp diff --git a/resources/meta/artifact/翠绿之影/1.webp b/resources/meta/artifact/imgs/翠绿之影/1.webp similarity index 100% rename from resources/meta/artifact/翠绿之影/1.webp rename to resources/meta/artifact/imgs/翠绿之影/1.webp diff --git a/resources/meta/artifact/翠绿之影/2.webp b/resources/meta/artifact/imgs/翠绿之影/2.webp similarity index 100% rename from resources/meta/artifact/翠绿之影/2.webp rename to resources/meta/artifact/imgs/翠绿之影/2.webp diff --git a/resources/meta/artifact/翠绿之影/3.webp b/resources/meta/artifact/imgs/翠绿之影/3.webp similarity index 100% rename from resources/meta/artifact/翠绿之影/3.webp rename to resources/meta/artifact/imgs/翠绿之影/3.webp diff --git a/resources/meta/artifact/翠绿之影/4.webp b/resources/meta/artifact/imgs/翠绿之影/4.webp similarity index 100% rename from resources/meta/artifact/翠绿之影/4.webp rename to resources/meta/artifact/imgs/翠绿之影/4.webp diff --git a/resources/meta/artifact/翠绿之影/5.webp b/resources/meta/artifact/imgs/翠绿之影/5.webp similarity index 100% rename from resources/meta/artifact/翠绿之影/5.webp rename to resources/meta/artifact/imgs/翠绿之影/5.webp diff --git a/resources/meta/artifact/苍白之火/1.webp b/resources/meta/artifact/imgs/苍白之火/1.webp similarity index 100% rename from resources/meta/artifact/苍白之火/1.webp rename to resources/meta/artifact/imgs/苍白之火/1.webp diff --git a/resources/meta/artifact/苍白之火/2.webp b/resources/meta/artifact/imgs/苍白之火/2.webp similarity index 100% rename from resources/meta/artifact/苍白之火/2.webp rename to resources/meta/artifact/imgs/苍白之火/2.webp diff --git a/resources/meta/artifact/苍白之火/3.webp b/resources/meta/artifact/imgs/苍白之火/3.webp similarity index 100% rename from resources/meta/artifact/苍白之火/3.webp rename to resources/meta/artifact/imgs/苍白之火/3.webp diff --git a/resources/meta/artifact/苍白之火/4.webp b/resources/meta/artifact/imgs/苍白之火/4.webp similarity index 100% rename from resources/meta/artifact/苍白之火/4.webp rename to resources/meta/artifact/imgs/苍白之火/4.webp diff --git a/resources/meta/artifact/苍白之火/5.webp b/resources/meta/artifact/imgs/苍白之火/5.webp similarity index 100% rename from resources/meta/artifact/苍白之火/5.webp rename to resources/meta/artifact/imgs/苍白之火/5.webp diff --git a/resources/meta/artifact/行者之心/1.webp b/resources/meta/artifact/imgs/行者之心/1.webp similarity index 100% rename from resources/meta/artifact/行者之心/1.webp rename to resources/meta/artifact/imgs/行者之心/1.webp diff --git a/resources/meta/artifact/行者之心/2.webp b/resources/meta/artifact/imgs/行者之心/2.webp similarity index 100% rename from resources/meta/artifact/行者之心/2.webp rename to resources/meta/artifact/imgs/行者之心/2.webp diff --git a/resources/meta/artifact/行者之心/3.webp b/resources/meta/artifact/imgs/行者之心/3.webp similarity index 100% rename from resources/meta/artifact/行者之心/3.webp rename to resources/meta/artifact/imgs/行者之心/3.webp diff --git a/resources/meta/artifact/行者之心/4.webp b/resources/meta/artifact/imgs/行者之心/4.webp similarity index 100% rename from resources/meta/artifact/行者之心/4.webp rename to resources/meta/artifact/imgs/行者之心/4.webp diff --git a/resources/meta/artifact/行者之心/5.webp b/resources/meta/artifact/imgs/行者之心/5.webp similarity index 100% rename from resources/meta/artifact/行者之心/5.webp rename to resources/meta/artifact/imgs/行者之心/5.webp diff --git a/resources/meta/artifact/被怜爱的少女/1.webp b/resources/meta/artifact/imgs/被怜爱的少女/1.webp similarity index 100% rename from resources/meta/artifact/被怜爱的少女/1.webp rename to resources/meta/artifact/imgs/被怜爱的少女/1.webp diff --git a/resources/meta/artifact/被怜爱的少女/2.webp b/resources/meta/artifact/imgs/被怜爱的少女/2.webp similarity index 100% rename from resources/meta/artifact/被怜爱的少女/2.webp rename to resources/meta/artifact/imgs/被怜爱的少女/2.webp diff --git a/resources/meta/artifact/被怜爱的少女/3.webp b/resources/meta/artifact/imgs/被怜爱的少女/3.webp similarity index 100% rename from resources/meta/artifact/被怜爱的少女/3.webp rename to resources/meta/artifact/imgs/被怜爱的少女/3.webp diff --git a/resources/meta/artifact/被怜爱的少女/4.webp b/resources/meta/artifact/imgs/被怜爱的少女/4.webp similarity index 100% rename from resources/meta/artifact/被怜爱的少女/4.webp rename to resources/meta/artifact/imgs/被怜爱的少女/4.webp diff --git a/resources/meta/artifact/被怜爱的少女/5.webp b/resources/meta/artifact/imgs/被怜爱的少女/5.webp similarity index 100% rename from resources/meta/artifact/被怜爱的少女/5.webp rename to resources/meta/artifact/imgs/被怜爱的少女/5.webp diff --git a/resources/meta/artifact/角斗士的终幕礼/1.webp b/resources/meta/artifact/imgs/角斗士的终幕礼/1.webp similarity index 100% rename from resources/meta/artifact/角斗士的终幕礼/1.webp rename to resources/meta/artifact/imgs/角斗士的终幕礼/1.webp diff --git a/resources/meta/artifact/角斗士的终幕礼/2.webp b/resources/meta/artifact/imgs/角斗士的终幕礼/2.webp similarity index 100% rename from resources/meta/artifact/角斗士的终幕礼/2.webp rename to resources/meta/artifact/imgs/角斗士的终幕礼/2.webp diff --git a/resources/meta/artifact/角斗士的终幕礼/3.webp b/resources/meta/artifact/imgs/角斗士的终幕礼/3.webp similarity index 100% rename from resources/meta/artifact/角斗士的终幕礼/3.webp rename to resources/meta/artifact/imgs/角斗士的终幕礼/3.webp diff --git a/resources/meta/artifact/角斗士的终幕礼/4.webp b/resources/meta/artifact/imgs/角斗士的终幕礼/4.webp similarity index 100% rename from resources/meta/artifact/角斗士的终幕礼/4.webp rename to resources/meta/artifact/imgs/角斗士的终幕礼/4.webp diff --git a/resources/meta/artifact/角斗士的终幕礼/5.webp b/resources/meta/artifact/imgs/角斗士的终幕礼/5.webp similarity index 100% rename from resources/meta/artifact/角斗士的终幕礼/5.webp rename to resources/meta/artifact/imgs/角斗士的终幕礼/5.webp diff --git a/resources/meta/artifact/赌徒/1.webp b/resources/meta/artifact/imgs/赌徒/1.webp similarity index 100% rename from resources/meta/artifact/赌徒/1.webp rename to resources/meta/artifact/imgs/赌徒/1.webp diff --git a/resources/meta/artifact/赌徒/2.webp b/resources/meta/artifact/imgs/赌徒/2.webp similarity index 100% rename from resources/meta/artifact/赌徒/2.webp rename to resources/meta/artifact/imgs/赌徒/2.webp diff --git a/resources/meta/artifact/赌徒/3.webp b/resources/meta/artifact/imgs/赌徒/3.webp similarity index 100% rename from resources/meta/artifact/赌徒/3.webp rename to resources/meta/artifact/imgs/赌徒/3.webp diff --git a/resources/meta/artifact/赌徒/4.webp b/resources/meta/artifact/imgs/赌徒/4.webp similarity index 100% rename from resources/meta/artifact/赌徒/4.webp rename to resources/meta/artifact/imgs/赌徒/4.webp diff --git a/resources/meta/artifact/赌徒/5.webp b/resources/meta/artifact/imgs/赌徒/5.webp similarity index 100% rename from resources/meta/artifact/赌徒/5.webp rename to resources/meta/artifact/imgs/赌徒/5.webp diff --git a/resources/meta/artifact/辰砂往生录/1.webp b/resources/meta/artifact/imgs/辰砂往生录/1.webp similarity index 100% rename from resources/meta/artifact/辰砂往生录/1.webp rename to resources/meta/artifact/imgs/辰砂往生录/1.webp diff --git a/resources/meta/artifact/辰砂往生录/2.webp b/resources/meta/artifact/imgs/辰砂往生录/2.webp similarity index 100% rename from resources/meta/artifact/辰砂往生录/2.webp rename to resources/meta/artifact/imgs/辰砂往生录/2.webp diff --git a/resources/meta/artifact/辰砂往生录/3.webp b/resources/meta/artifact/imgs/辰砂往生录/3.webp similarity index 100% rename from resources/meta/artifact/辰砂往生录/3.webp rename to resources/meta/artifact/imgs/辰砂往生录/3.webp diff --git a/resources/meta/artifact/辰砂往生录/4.webp b/resources/meta/artifact/imgs/辰砂往生录/4.webp similarity index 100% rename from resources/meta/artifact/辰砂往生录/4.webp rename to resources/meta/artifact/imgs/辰砂往生录/4.webp diff --git a/resources/meta/artifact/辰砂往生录/5.webp b/resources/meta/artifact/imgs/辰砂往生录/5.webp similarity index 100% rename from resources/meta/artifact/辰砂往生录/5.webp rename to resources/meta/artifact/imgs/辰砂往生录/5.webp diff --git a/resources/meta/artifact/追忆之注连/1.webp b/resources/meta/artifact/imgs/追忆之注连/1.webp similarity index 100% rename from resources/meta/artifact/追忆之注连/1.webp rename to resources/meta/artifact/imgs/追忆之注连/1.webp diff --git a/resources/meta/artifact/追忆之注连/2.webp b/resources/meta/artifact/imgs/追忆之注连/2.webp similarity index 100% rename from resources/meta/artifact/追忆之注连/2.webp rename to resources/meta/artifact/imgs/追忆之注连/2.webp diff --git a/resources/meta/artifact/追忆之注连/3.webp b/resources/meta/artifact/imgs/追忆之注连/3.webp similarity index 100% rename from resources/meta/artifact/追忆之注连/3.webp rename to resources/meta/artifact/imgs/追忆之注连/3.webp diff --git a/resources/meta/artifact/追忆之注连/4.webp b/resources/meta/artifact/imgs/追忆之注连/4.webp similarity index 100% rename from resources/meta/artifact/追忆之注连/4.webp rename to resources/meta/artifact/imgs/追忆之注连/4.webp diff --git a/resources/meta/artifact/追忆之注连/5.webp b/resources/meta/artifact/imgs/追忆之注连/5.webp similarity index 100% rename from resources/meta/artifact/追忆之注连/5.webp rename to resources/meta/artifact/imgs/追忆之注连/5.webp diff --git a/resources/meta/artifact/逆飞的流星/1.webp b/resources/meta/artifact/imgs/逆飞的流星/1.webp similarity index 100% rename from resources/meta/artifact/逆飞的流星/1.webp rename to resources/meta/artifact/imgs/逆飞的流星/1.webp diff --git a/resources/meta/artifact/逆飞的流星/2.webp b/resources/meta/artifact/imgs/逆飞的流星/2.webp similarity index 100% rename from resources/meta/artifact/逆飞的流星/2.webp rename to resources/meta/artifact/imgs/逆飞的流星/2.webp diff --git a/resources/meta/artifact/逆飞的流星/3.webp b/resources/meta/artifact/imgs/逆飞的流星/3.webp similarity index 100% rename from resources/meta/artifact/逆飞的流星/3.webp rename to resources/meta/artifact/imgs/逆飞的流星/3.webp diff --git a/resources/meta/artifact/逆飞的流星/4.webp b/resources/meta/artifact/imgs/逆飞的流星/4.webp similarity index 100% rename from resources/meta/artifact/逆飞的流星/4.webp rename to resources/meta/artifact/imgs/逆飞的流星/4.webp diff --git a/resources/meta/artifact/逆飞的流星/5.webp b/resources/meta/artifact/imgs/逆飞的流星/5.webp similarity index 100% rename from resources/meta/artifact/逆飞的流星/5.webp rename to resources/meta/artifact/imgs/逆飞的流星/5.webp diff --git a/resources/meta/artifact/饰金之梦/1.webp b/resources/meta/artifact/imgs/饰金之梦/1.webp similarity index 100% rename from resources/meta/artifact/饰金之梦/1.webp rename to resources/meta/artifact/imgs/饰金之梦/1.webp diff --git a/resources/meta/artifact/饰金之梦/2.webp b/resources/meta/artifact/imgs/饰金之梦/2.webp similarity index 100% rename from resources/meta/artifact/饰金之梦/2.webp rename to resources/meta/artifact/imgs/饰金之梦/2.webp diff --git a/resources/meta/artifact/饰金之梦/3.webp b/resources/meta/artifact/imgs/饰金之梦/3.webp similarity index 100% rename from resources/meta/artifact/饰金之梦/3.webp rename to resources/meta/artifact/imgs/饰金之梦/3.webp diff --git a/resources/meta/artifact/饰金之梦/4.webp b/resources/meta/artifact/imgs/饰金之梦/4.webp similarity index 100% rename from resources/meta/artifact/饰金之梦/4.webp rename to resources/meta/artifact/imgs/饰金之梦/4.webp diff --git a/resources/meta/artifact/饰金之梦/5.webp b/resources/meta/artifact/imgs/饰金之梦/5.webp similarity index 100% rename from resources/meta/artifact/饰金之梦/5.webp rename to resources/meta/artifact/imgs/饰金之梦/5.webp diff --git a/resources/meta/artifact/index.js b/resources/meta/artifact/index.js index 528b4317..fdcd4fc1 100644 --- a/resources/meta/artifact/index.js +++ b/resources/meta/artifact/index.js @@ -1,6 +1,5 @@ import { Data } from '../../../components/index.js' import lodash from 'lodash' -import { abbr, attrMap } from './meta.js' import calc from './calc.js' let artiSetMap = {} @@ -26,4 +25,5 @@ lodash.forEach(artis, (ds) => { }) }) -export { abbr, artiMap, artiSetMap, attrMap, calc } +export { artiMap, artiSetMap, calc } +export * from './meta.js' diff --git a/resources/meta/artifact/meta.js b/resources/meta/artifact/meta.js index 34207016..5d655079 100644 --- a/resources/meta/artifact/meta.js +++ b/resources/meta/artifact/meta.js @@ -51,16 +51,16 @@ export const attrValue = { heal: 4.487 } export const attrMap = { - atk: { title: '大攻击', format: 'pct', type: 'normal', value: 5.83, text: '5.83%' }, - atkPlus: { title: '小攻击', format: 'comma', type: 'plus', base: 'atk', value: 15.56 }, - def: { title: '大防御', format: 'pct', type: 'normal', value: 7.29, text: '7.29%' }, - defPlus: { title: '小防御', format: 'comma', type: 'plus', base: 'def', value: 18.52 }, - hp: { title: '大生命', format: 'pct', type: 'normal', value: 5.83, text: '5.83%' }, - hpPlus: { title: '小生命', format: 'comma', type: 'plus', base: 'hp', value: 239.0 }, - cpct: { title: '暴击率', format: 'pct', type: 'normal', value: 3.89, text: '3.89%' }, - cdmg: { title: '暴击伤害', format: 'pct', type: 'normal', value: 7.77, text: '7.77%' }, - mastery: { title: '元素精通', format: 'comma', type: 'normal', value: 23.31, text: '23.31' }, - recharge: { title: '充能效率', format: 'pct', type: 'normal', value: 6.48, text: '6.48%' }, + atk: { title: '大攻击', format: 'pct', type: 'normal', value: 5.83, text: '5.83%', valueMin: 4.08 }, + atkPlus: { title: '小攻击', format: 'comma', type: 'plus', base: 'atk', value: 19.45, valueMin: 13.62 }, + def: { title: '大防御', format: 'pct', type: 'normal', value: 7.29, text: '7.29%', valueMin: 5.1 }, + defPlus: { title: '小防御', format: 'comma', type: 'plus', base: 'def', value: 23.15, valueMin: 16.2 }, + hp: { title: '大生命', format: 'pct', type: 'normal', value: 5.83, text: '5.83%', valueMin: 4.08 }, + hpPlus: { title: '小生命', format: 'comma', type: 'plus', base: 'hp', value: 298.75, valueMin: 209.13 }, + cpct: { title: '暴击率', format: 'pct', type: 'normal', value: 3.89, text: '3.89%', valueMin: 2.72 }, + cdmg: { title: '暴击伤害', format: 'pct', type: 'normal', value: 7.77, text: '7.77%', valueMin: 5.44 }, + mastery: { title: '元素精通', format: 'comma', type: 'normal', value: 23.31, text: '23.31', valueMin: 16.32 }, + recharge: { title: '充能效率', format: 'pct', type: 'normal', value: 6.48, text: '6.48%', valueMin: 4.53 }, dmg: { title: '元素伤害', format: 'pct', type: 'normal', value: 5.825, text: '5.83%' }, phy: { title: '物伤加成', format: 'pct', type: 'normal', value: 7.288, text: '7.29%' }, heal: { title: '治疗加成', format: 'pct', type: 'normal', value: 4.487, text: '4.49%' } diff --git a/resources/meta/character/刻晴/artis.js b/resources/meta/character/刻晴/artis.js index e8be9412..4fb47614 100644 --- a/resources/meta/character/刻晴/artis.js +++ b/resources/meta/character/刻晴/artis.js @@ -1,6 +1,6 @@ export default function ({ attr, rule, def }) { // 激化精通璃月雷神,具体数值待定 - if (attr.mastery > 40) { + if (attr.mastery >= 80) { return rule('刻晴-精通', { atk: 75, cpct: 100, cdmg: 100, mastery: 75, dmg: 100 }) } return def({ atk: 75, cpct: 100, cdmg: 100, dmg: 100, phy: 100 }) diff --git a/tools/artis-data-sprider.js b/tools/artis-data-sprider.js index 390d2cd8..02157295 100644 --- a/tools/artis-data-sprider.js +++ b/tools/artis-data-sprider.js @@ -86,7 +86,7 @@ async function down (sets = '') { } ds.sets = await getSets(ds.id) console.log(`arti ${ds.id}:${ds.name} Done`) - Data.createDir(`resources/meta/artifact/${ds.name}`) + Data.createDir(`resources/meta/artifact/imgs/${ds.name}`) lodash.forEach(ds.sets, (s, idx) => { imgs.push({ @@ -100,7 +100,7 @@ async function down (sets = '') { const _path = process.cwd() const _root = _path + '/plugins/miao-plugin/' - const _aRoot = _root + 'resources/meta/artifact/' + const _aRoot = _root + 'resources/meta/artifact/imgs/' await Data.asyncPool(5, imgs, async function (ds) { if (fs.existsSync(`${_aRoot}/${ds.file}`)) { // console.log(`已存在,跳过 ${ds.file}`)