From 8935bd57b82479c12ca2fdbbdce8ccdd9f55b34b Mon Sep 17 00:00:00 2001 From: yoimiya-kokomi <592981798@qq.com> Date: Sat, 24 Sep 2022 20:19:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=AD=A6=E5=99=A8=E3=80=81=E5=9C=A3=E9=81=97?= =?UTF-8?q?=E7=89=A9=E8=B5=84=E6=BA=90=E9=87=87=E7=94=A8webp=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=EF=BC=8C=E8=B5=84=E6=BA=90=E5=BC=95=E7=94=A8=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 7 +- apps/character/profile-detail.js | 8 +- apps/wiki/CharWiki.js | 15 +- components/profile-data/miao-meta.js | 2 +- models/Artifact.js | 84 +- models/ArtifactSet.js | 60 + models/Avatar.js | 37 +- models/ProfileArtis.js | 48 +- models/Weapon.js | 23 +- models/index.js | 2 + models/profile-lib/ArtisMark.js | 2 +- models/profile-lib/CharArtis.js | 2 +- models/profile-lib/DmgBuffs.js | 4 +- resources/character/artis-list.html | 2 +- resources/character/artis-mark.html | 2 +- resources/character/character-card.html | 141 +- resources/character/profile-detail.css | 10 +- resources/character/profile-detail.html | 17 +- resources/character/profile-detail.less | 10 +- resources/character/profile-stat.html | 15 +- resources/common/tpl.css | 3 +- resources/common/tpl/avatar-card.html | 7 +- resources/common/tpl/item-card.less | 3 +- resources/meta/artifact/index.js | 28 + resources/meta/artifact/meta.js | 82 ++ resources/meta/reliquaries/abbr.js | 39 - resources/meta/reliquaries/artis-mark.js | 97 -- resources/meta/reliquaries/calc.js | 220 --- resources/meta/reliquaries/data.json | 1197 ----------------- .../reliquaries/icon/不动玄石之相.png | Bin 16693 -> 0 bytes .../meta/reliquaries/icon/乐团的晨光.png | Bin 20964 -> 0 bytes .../meta/reliquaries/icon/众生之谣.png | Bin 16433 -> 0 bytes .../meta/reliquaries/icon/停摆之刻.png | Bin 15776 -> 0 bytes .../meta/reliquaries/icon/冒险家之花.png | Bin 13763 -> 0 bytes .../meta/reliquaries/icon/冒险家头带.png | Bin 16193 -> 0 bytes .../meta/reliquaries/icon/冒险家尾羽.png | Bin 9939 -> 0 bytes .../meta/reliquaries/icon/冒险家怀表.png | Bin 12357 -> 0 bytes .../meta/reliquaries/icon/冒险家金杯.png | Bin 11298 -> 0 bytes .../icon/冰雪故园的终期.png | Bin 21923 -> 0 bytes .../meta/reliquaries/icon/切落之羽.png | Bin 11330 -> 0 bytes .../meta/reliquaries/icon/勇士的冠冕.png | Bin 17818 -> 0 bytes .../meta/reliquaries/icon/勇士的勋章.png | Bin 11065 -> 0 bytes .../meta/reliquaries/icon/勇士的坚毅.png | Bin 15891 -> 0 bytes .../meta/reliquaries/icon/勇士的壮行.png | Bin 16549 -> 0 bytes .../meta/reliquaries/icon/勇士的期许.png | Bin 11602 -> 0 bytes .../meta/reliquaries/icon/勋绩之花.png | Bin 18135 -> 0 bytes .../meta/reliquaries/icon/华饰之兜.png | Bin 17195 -> 0 bytes .../meta/reliquaries/icon/华馆之羽.png | Bin 10771 -> 0 bytes .../icon/历经风雪的思念.png | Bin 20328 -> 0 bytes .../meta/reliquaries/icon/吟游者之壶.png | Bin 19052 -> 0 bytes .../meta/reliquaries/icon/唤雷的头冠.png | Bin 17397 -> 0 bytes .../meta/reliquaries/icon/嗤笑之面.png | Bin 17682 -> 0 bytes .../meta/reliquaries/icon/坚铜罗盘.png | Bin 17748 -> 0 bytes .../meta/reliquaries/icon/垂玉之叶.png | Bin 11801 -> 0 bytes .../meta/reliquaries/icon/夏祭之刻.png | Bin 24317 -> 0 bytes .../meta/reliquaries/icon/夏祭之花.png | Bin 23070 -> 0 bytes .../meta/reliquaries/icon/夏祭之面.png | Bin 18744 -> 0 bytes .../meta/reliquaries/icon/夏祭水玉.png | Bin 20606 -> 0 bytes .../meta/reliquaries/icon/夏祭终末.png | Bin 20529 -> 0 bytes .../meta/reliquaries/icon/奇迹之杯.png | Bin 9718 -> 0 bytes .../meta/reliquaries/icon/奇迹之沙.png | Bin 13818 -> 0 bytes .../meta/reliquaries/icon/奇迹之羽.png | Bin 9895 -> 0 bytes .../meta/reliquaries/icon/奇迹之花.png | Bin 13091 -> 0 bytes .../meta/reliquaries/icon/奇迹耳坠.png | Bin 8584 -> 0 bytes .../meta/reliquaries/icon/如蜜的终宴.png | Bin 39484 -> 0 bytes .../meta/reliquaries/icon/学士的书签.png | Bin 12566 -> 0 bytes .../meta/reliquaries/icon/学士的墨杯.png | Bin 9483 -> 0 bytes .../meta/reliquaries/icon/学士的时钟.png | Bin 14943 -> 0 bytes .../meta/reliquaries/icon/学士的羽笔.png | Bin 9467 -> 0 bytes .../meta/reliquaries/icon/学士的镜片.png | Bin 13021 -> 0 bytes .../meta/reliquaries/icon/守护之皿.png | Bin 11340 -> 0 bytes .../meta/reliquaries/icon/守护之花.png | Bin 10656 -> 0 bytes .../meta/reliquaries/icon/守护座钟.png | Bin 13829 -> 0 bytes .../meta/reliquaries/icon/守护徽印.png | Bin 10367 -> 0 bytes .../meta/reliquaries/icon/守护束带.png | Bin 14888 -> 0 bytes .../meta/reliquaries/icon/宗室之翎.png | Bin 16362 -> 0 bytes .../meta/reliquaries/icon/宗室之花.png | Bin 19550 -> 0 bytes .../meta/reliquaries/icon/宗室时计.png | Bin 18693 -> 0 bytes .../meta/reliquaries/icon/宗室银瓮.png | Bin 18589 -> 0 bytes .../meta/reliquaries/icon/宗室面具.png | Bin 17890 -> 0 bytes .../meta/reliquaries/icon/将帅兜鍪.png | Bin 19646 -> 0 bytes .../icon/少女易逝的芳颜.png | Bin 19897 -> 0 bytes .../icon/少女片刻的闲暇.png | Bin 18858 -> 0 bytes .../icon/少女苦短的良辰.png | Bin 20450 -> 0 bytes .../icon/少女飘摇的思念.png | Bin 16689 -> 0 bytes .../reliquaries/icon/嵯峨群峰之翼.png | Bin 15044 -> 0 bytes .../reliquaries/icon/巉岩琢塑之樽.png | Bin 16324 -> 0 bytes .../meta/reliquaries/icon/平雷之冠.png | Bin 15106 -> 0 bytes .../meta/reliquaries/icon/平雷之刻.png | Bin 21299 -> 0 bytes .../meta/reliquaries/icon/平雷之器.png | Bin 15541 -> 0 bytes .../meta/reliquaries/icon/平雷之心.png | Bin 22653 -> 0 bytes .../meta/reliquaries/icon/平雷之羽.png | Bin 17213 -> 0 bytes .../meta/reliquaries/icon/幸运儿之杯.png | Bin 11466 -> 0 bytes .../meta/reliquaries/icon/幸运儿沙漏.png | Bin 16325 -> 0 bytes .../meta/reliquaries/icon/幸运儿绿花.png | Bin 11412 -> 0 bytes .../meta/reliquaries/icon/幸运儿银冠.png | Bin 10785 -> 0 bytes .../meta/reliquaries/icon/幸运儿鹰羽.png | Bin 10912 -> 0 bytes .../meta/reliquaries/icon/异国之盏.png | Bin 9582 -> 0 bytes .../meta/reliquaries/icon/归乡之羽.png | Bin 11446 -> 0 bytes .../meta/reliquaries/icon/形骸之笠.png | Bin 14973 -> 0 bytes .../meta/reliquaries/icon/思忆之矢.png | Bin 14609 -> 0 bytes .../meta/reliquaries/icon/感别之冠.png | Bin 16899 -> 0 bytes .../meta/reliquaries/icon/战狂的时计.png | Bin 14603 -> 0 bytes .../meta/reliquaries/icon/战狂的翎羽.png | Bin 10130 -> 0 bytes .../meta/reliquaries/icon/战狂的蔷薇.png | Bin 11995 -> 0 bytes .../meta/reliquaries/icon/战狂的骨杯.png | Bin 14335 -> 0 bytes .../meta/reliquaries/icon/战狂的鬼面.png | Bin 15135 -> 0 bytes .../meta/reliquaries/icon/指挥的礼帽.png | Bin 19112 -> 0 bytes .../icon/摧冰而行的执望.png | Bin 16292 -> 0 bytes .../meta/reliquaries/icon/故人之心.png | Bin 11276 -> 0 bytes .../meta/reliquaries/icon/教官的帽子.png | Bin 10487 -> 0 bytes .../meta/reliquaries/icon/教官的怀表.png | Bin 15374 -> 0 bytes .../meta/reliquaries/icon/教官的羽饰.png | Bin 10236 -> 0 bytes .../meta/reliquaries/icon/教官的胸花.png | Bin 10836 -> 0 bytes .../meta/reliquaries/icon/教官的茶杯.png | Bin 12330 -> 0 bytes .../meta/reliquaries/icon/无垢之花.png | Bin 18885 -> 0 bytes .../meta/reliquaries/icon/无常之面.png | Bin 17922 -> 0 bytes .../meta/reliquaries/icon/明威之镡.png | Bin 15952 -> 0 bytes .../reliquaries/icon/星罗圭璧之晷.png | Bin 15818 -> 0 bytes .../meta/reliquaries/icon/昭武翎羽.png | Bin 14184 -> 0 bytes .../meta/reliquaries/icon/月桂的宝冠.png | Bin 49287 -> 0 bytes .../meta/reliquaries/icon/朝露之时.png | Bin 19904 -> 0 bytes .../reliquaries/icon/染血的铁之心.png | Bin 19874 -> 0 bytes .../reliquaries/icon/染血的铁假面.png | Bin 19963 -> 0 bytes .../reliquaries/icon/染血的黑之羽.png | Bin 14651 -> 0 bytes .../reliquaries/icon/染血骑士之杯.png | Bin 17106 -> 0 bytes .../meta/reliquaries/icon/梦中的铁花.png | Bin 50975 -> 0 bytes .../meta/reliquaries/icon/梦醒之瓢.png | Bin 13256 -> 0 bytes .../meta/reliquaries/icon/武人的头巾.png | Bin 14678 -> 0 bytes .../meta/reliquaries/icon/武人的水漏.png | Bin 15271 -> 0 bytes .../meta/reliquaries/icon/武人的红花.png | Bin 12133 -> 0 bytes .../meta/reliquaries/icon/武人的羽饰.png | Bin 10249 -> 0 bytes .../meta/reliquaries/icon/武人的酒杯.png | Bin 9620 -> 0 bytes .../meta/reliquaries/icon/沉波之盏.png | Bin 15406 -> 0 bytes .../meta/reliquaries/icon/沉金的岁月.png | Bin 49538 -> 0 bytes .../meta/reliquaries/icon/沙王的投影.png | Bin 47389 -> 0 bytes .../meta/reliquaries/icon/流放者之杯.png | Bin 12063 -> 0 bytes .../meta/reliquaries/icon/流放者之羽.png | Bin 10018 -> 0 bytes .../meta/reliquaries/icon/流放者之花.png | Bin 15560 -> 0 bytes .../meta/reliquaries/icon/流放者头冠.png | Bin 12831 -> 0 bytes .../meta/reliquaries/icon/流放者怀表.png | Bin 12834 -> 0 bytes .../meta/reliquaries/icon/浮溯之珏.png | Bin 14851 -> 0 bytes .../meta/reliquaries/icon/海染之花.png | Bin 17605 -> 0 bytes .../meta/reliquaries/icon/海祇之冠.png | Bin 19009 -> 0 bytes .../meta/reliquaries/icon/涌泉之盏.png | Bin 17748 -> 0 bytes .../meta/reliquaries/icon/渊宫之羽.png | Bin 14947 -> 0 bytes .../reliquaries/icon/渡火者的决绝.png | Bin 19167 -> 0 bytes .../reliquaries/icon/渡火者的智慧.png | Bin 15258 -> 0 bytes .../reliquaries/icon/渡火者的煎熬.png | Bin 21057 -> 0 bytes .../reliquaries/icon/渡火者的解脱.png | Bin 15847 -> 0 bytes .../reliquaries/icon/渡火者的醒悟.png | Bin 17547 -> 0 bytes .../meta/reliquaries/icon/游医的怀钟.png | Bin 13462 -> 0 bytes .../meta/reliquaries/icon/游医的方巾.png | Bin 13100 -> 0 bytes .../meta/reliquaries/icon/游医的枭羽.png | Bin 9578 -> 0 bytes .../meta/reliquaries/icon/游医的药壶.png | Bin 13093 -> 0 bytes .../meta/reliquaries/icon/游医的银莲.png | Bin 14097 -> 0 bytes .../meta/reliquaries/icon/潜光片羽.png | Bin 14727 -> 0 bytes .../reliquaries/icon/焦灼的魔女帽.png | Bin 20287 -> 0 bytes .../icon/猎人青翠的箭羽.png | Bin 14507 -> 0 bytes .../meta/reliquaries/icon/琴师的箭羽.png | Bin 16965 -> 0 bytes .../meta/reliquaries/icon/生灵之华.png | Bin 20559 -> 0 bytes .../meta/reliquaries/icon/盟誓金爵.png | Bin 17162 -> 0 bytes .../meta/reliquaries/icon/真珠之笼.png | Bin 18420 -> 0 bytes .../icon/破冰踏雪的回音.png | Bin 15692 -> 0 bytes .../reliquaries/icon/磐陀裂生之花.png | Bin 21324 -> 0 bytes .../meta/reliquaries/icon/祈望之心.png | Bin 16035 -> 0 bytes .../meta/reliquaries/icon/祝祀之凭.png | Bin 17803 -> 0 bytes .../meta/reliquaries/icon/祭冰礼冠.png | Bin 12086 -> 0 bytes .../meta/reliquaries/icon/祭水礼冠.png | Bin 11904 -> 0 bytes .../meta/reliquaries/icon/祭火礼冠.png | Bin 11906 -> 0 bytes .../meta/reliquaries/icon/祭雷礼冠.png | Bin 11974 -> 0 bytes .../meta/reliquaries/icon/离别之贝.png | Bin 19486 -> 0 bytes .../meta/reliquaries/icon/终幕的时计.png | Bin 17266 -> 0 bytes .../meta/reliquaries/icon/结契之刻.png | Bin 16959 -> 0 bytes .../meta/reliquaries/icon/绯花之壶.png | Bin 13972 -> 0 bytes .../meta/reliquaries/icon/羁缠之花.png | Bin 17400 -> 0 bytes .../icon/翠绿猎人的容器.png | Bin 18065 -> 0 bytes .../icon/翠绿猎人的笃定.png | Bin 20181 -> 0 bytes .../icon/翠绿的猎人之冠.png | Bin 18577 -> 0 bytes .../meta/reliquaries/icon/翠蔓的智者.png | Bin 45420 -> 0 bytes .../meta/reliquaries/icon/荣花之期.png | Bin 15766 -> 0 bytes .../meta/reliquaries/icon/虺雷之姿.png | Bin 19022 -> 0 bytes .../meta/reliquaries/icon/裁断的翎羽.png | Bin 34778 -> 0 bytes .../reliquaries/icon/角斗士的凯旋.png | Bin 19956 -> 0 bytes .../reliquaries/icon/角斗士的希冀.png | Bin 19353 -> 0 bytes .../reliquaries/icon/角斗士的归宿.png | Bin 15150 -> 0 bytes .../reliquaries/icon/角斗士的留恋.png | Bin 20655 -> 0 bytes .../reliquaries/icon/角斗士的酣醉.png | Bin 19354 -> 0 bytes .../meta/reliquaries/icon/贤医之羽.png | Bin 13130 -> 0 bytes .../meta/reliquaries/icon/贤智的定期.png | Bin 51075 -> 0 bytes .../meta/reliquaries/icon/赌徒的怀表.png | Bin 14863 -> 0 bytes .../meta/reliquaries/icon/赌徒的羽饰.png | Bin 9776 -> 0 bytes .../meta/reliquaries/icon/赌徒的耳环.png | Bin 10496 -> 0 bytes .../meta/reliquaries/icon/赌徒的胸花.png | Bin 14000 -> 0 bytes .../meta/reliquaries/icon/赌徒的骰盅.png | Bin 11662 -> 0 bytes .../meta/reliquaries/icon/超越之盏.png | Bin 17008 -> 0 bytes .../icon/远方的少女之心.png | Bin 21481 -> 0 bytes .../meta/reliquaries/icon/迷宫的游人.png | Bin 58800 -> 0 bytes .../meta/reliquaries/icon/迷误者之灯.png | Bin 51438 -> 0 bytes .../meta/reliquaries/icon/追忆之风.png | Bin 11407 -> 0 bytes .../meta/reliquaries/icon/逐光之石.png | Bin 13589 -> 0 bytes .../icon/遍结寒霜的傲骨.png | Bin 16799 -> 0 bytes .../meta/reliquaries/icon/酒渍船帽.png | Bin 14278 -> 0 bytes .../icon/野花记忆的绿野.png | Bin 19703 -> 0 bytes .../meta/reliquaries/icon/金铜时晷.png | Bin 16863 -> 0 bytes .../meta/reliquaries/icon/阳辔之遗.png | Bin 20039 -> 0 bytes .../meta/reliquaries/icon/降雷的凶兆.png | Bin 15863 -> 0 bytes .../meta/reliquaries/icon/雷云之笼.png | Bin 14809 -> 0 bytes .../meta/reliquaries/icon/雷灾的孑遗.png | Bin 14828 -> 0 bytes .../meta/reliquaries/icon/雷霆的时计.png | Bin 21680 -> 0 bytes .../meta/reliquaries/icon/雷鸟的怜悯.png | Bin 22881 -> 0 bytes .../meta/reliquaries/icon/饰金胸花.png | Bin 21209 -> 0 bytes .../reliquaries/icon/骑士染血之时.png | Bin 21168 -> 0 bytes .../meta/reliquaries/icon/魂香之花.png | Bin 21722 -> 0 bytes .../reliquaries/icon/魔女常燃之羽.png | Bin 19962 -> 0 bytes .../reliquaries/icon/魔女的心之火.png | Bin 20451 -> 0 bytes .../reliquaries/icon/魔女的炎之花.png | Bin 21955 -> 0 bytes .../reliquaries/icon/魔女破灭之时.png | Bin 21870 -> 0 bytes resources/meta/weapon/bow/calc.js | 186 +++ resources/meta/weapon/catalyst/calc.js | 133 ++ resources/meta/weapon/claymore/calc.js | 140 ++ resources/meta/weapon/index.js | 36 + .../meta/{weapons/abbr.js => weapon/meta.js} | 10 +- resources/meta/weapon/polearm/calc.js | 125 ++ resources/meta/weapon/sword/calc.js | 178 +++ resources/meta/weapons/calc.js | 769 ----------- resources/meta/weapons/data.json | 757 ----------- resources/meta/weapons/icon/「渔获」.png | Bin 8681 -> 0 bytes .../meta/weapons/icon/万国诸海图谱.png | Bin 18894 -> 0 bytes resources/meta/weapons/icon/不灭月华.png | Bin 18647 -> 0 bytes resources/meta/weapons/icon/以理服人.png | Bin 13412 -> 0 bytes resources/meta/weapons/icon/佣兵重剑.png | Bin 12586 -> 0 bytes resources/meta/weapons/icon/信使.png | Bin 9002 -> 0 bytes resources/meta/weapons/icon/冬极白星.png | Bin 16824 -> 0 bytes resources/meta/weapons/icon/决斗之枪.png | Bin 13186 -> 0 bytes resources/meta/weapons/icon/冷刃.png | Bin 12040 -> 0 bytes resources/meta/weapons/icon/匣里日月.png | Bin 15833 -> 0 bytes resources/meta/weapons/icon/匣里灭辰.png | Bin 10548 -> 0 bytes resources/meta/weapons/icon/匣里龙吟.png | Bin 9659 -> 0 bytes resources/meta/weapons/icon/千岩古剑.png | Bin 15480 -> 0 bytes resources/meta/weapons/icon/千岩长枪.png | Bin 10904 -> 0 bytes .../meta/weapons/icon/历练的猎弓.png | Bin 9605 -> 0 bytes resources/meta/weapons/icon/原木刀.png | Bin 45618 -> 0 bytes resources/meta/weapons/icon/反曲弓.png | Bin 13278 -> 0 bytes .../meta/weapons/icon/口袋魔导书.png | Bin 17662 -> 0 bytes resources/meta/weapons/icon/吃虎鱼刀.png | Bin 9292 -> 0 bytes resources/meta/weapons/icon/和璞鸢.png | Bin 12139 -> 0 bytes .../meta/weapons/icon/喜多院十文字.png | Bin 12646 -> 0 bytes .../meta/weapons/icon/嘟嘟可故事集.png | Bin 18267 -> 0 bytes resources/meta/weapons/icon/四风原典.png | Bin 19223 -> 0 bytes .../meta/weapons/icon/天目影打刀.png | Bin 8596 -> 0 bytes resources/meta/weapons/icon/天空之傲.png | Bin 15605 -> 0 bytes resources/meta/weapons/icon/天空之刃.png | Bin 14421 -> 0 bytes resources/meta/weapons/icon/天空之卷.png | Bin 17317 -> 0 bytes resources/meta/weapons/icon/天空之翼.png | Bin 17319 -> 0 bytes resources/meta/weapons/icon/天空之脊.png | Bin 11459 -> 0 bytes resources/meta/weapons/icon/学徒笔记.png | Bin 16714 -> 0 bytes resources/meta/weapons/icon/宗室大剑.png | Bin 16541 -> 0 bytes resources/meta/weapons/icon/宗室猎枪.png | Bin 12760 -> 0 bytes .../meta/weapons/icon/宗室秘法录.png | Bin 22359 -> 0 bytes resources/meta/weapons/icon/宗室长剑.png | Bin 9946 -> 0 bytes resources/meta/weapons/icon/宗室长弓.png | Bin 10726 -> 0 bytes resources/meta/weapons/icon/尘世之锁.png | Bin 17826 -> 0 bytes .../meta/weapons/icon/幽夜华尔兹.png | Bin 15862 -> 0 bytes .../meta/weapons/icon/异世界行记.png | Bin 17141 -> 0 bytes resources/meta/weapons/icon/弓藏.png | Bin 18000 -> 0 bytes resources/meta/weapons/icon/弹弓.png | Bin 10079 -> 0 bytes resources/meta/weapons/icon/忍冬之果.png | Bin 16294 -> 0 bytes resources/meta/weapons/icon/息灾.png | Bin 10709 -> 0 bytes resources/meta/weapons/icon/恶王丸.png | Bin 14034 -> 0 bytes resources/meta/weapons/icon/护摩之杖.png | Bin 13276 -> 0 bytes resources/meta/weapons/icon/掠食者.png | Bin 13493 -> 0 bytes resources/meta/weapons/icon/斫峰之刃.png | Bin 10673 -> 0 bytes resources/meta/weapons/icon/断浪长鳍.png | Bin 8278 -> 0 bytes resources/meta/weapons/icon/新手长枪.png | Bin 7121 -> 0 bytes resources/meta/weapons/icon/旅行剑.png | Bin 9944 -> 0 bytes resources/meta/weapons/icon/无工之剑.png | Bin 18285 -> 0 bytes resources/meta/weapons/icon/无锋剑.png | Bin 9555 -> 0 bytes resources/meta/weapons/icon/昭心.png | Bin 16129 -> 0 bytes resources/meta/weapons/icon/暗巷猎手.png | Bin 12509 -> 0 bytes .../meta/weapons/icon/暗巷的酒与诗.png | Bin 19325 -> 0 bytes resources/meta/weapons/icon/暗巷闪光.png | Bin 10951 -> 0 bytes resources/meta/weapons/icon/暗铁剑.png | Bin 8449 -> 0 bytes resources/meta/weapons/icon/曚云之月.png | Bin 12601 -> 0 bytes .../meta/weapons/icon/松籁响起之时.png | Bin 14710 -> 0 bytes .../meta/weapons/icon/桂木斩长正.png | Bin 14549 -> 0 bytes resources/meta/weapons/icon/森林王器.png | Bin 50245 -> 0 bytes .../meta/weapons/icon/沐浴龙血的剑.png | Bin 14880 -> 0 bytes .../meta/weapons/icon/波乱月白经津.png | Bin 5378 -> 0 bytes resources/meta/weapons/icon/流月针.png | Bin 7976 -> 0 bytes resources/meta/weapons/icon/流浪乐章.png | Bin 16045 -> 0 bytes resources/meta/weapons/icon/狼的末路.png | Bin 17589 -> 0 bytes resources/meta/weapons/icon/猎人之径.png | Bin 48727 -> 0 bytes resources/meta/weapons/icon/猎弓.png | Bin 9594 -> 0 bytes resources/meta/weapons/icon/王下近侍.png | Bin 40614 -> 0 bytes resources/meta/weapons/icon/甲级宝珏.png | Bin 16026 -> 0 bytes resources/meta/weapons/icon/白影剑.png | Bin 17683 -> 0 bytes resources/meta/weapons/icon/白缨枪.png | Bin 9045 -> 0 bytes resources/meta/weapons/icon/白辰之环.png | Bin 18128 -> 0 bytes resources/meta/weapons/icon/白铁大剑.png | Bin 15599 -> 0 bytes resources/meta/weapons/icon/盈满之实.png | Bin 53435 -> 0 bytes resources/meta/weapons/icon/破魔之弓.png | Bin 11670 -> 0 bytes resources/meta/weapons/icon/磐岩结绿.png | Bin 9427 -> 0 bytes .../meta/weapons/icon/神乐之真意.png | Bin 5421 -> 0 bytes .../meta/weapons/icon/神射手之誓.png | Bin 13301 -> 0 bytes resources/meta/weapons/icon/祭礼剑.png | Bin 9591 -> 0 bytes resources/meta/weapons/icon/祭礼大剑.png | Bin 16984 -> 0 bytes resources/meta/weapons/icon/祭礼弓.png | Bin 9969 -> 0 bytes resources/meta/weapons/icon/祭礼残章.png | Bin 20830 -> 0 bytes resources/meta/weapons/icon/竭泽.png | Bin 70088 -> 0 bytes resources/meta/weapons/icon/笛剑.png | Bin 9625 -> 0 bytes .../meta/weapons/icon/笼钓瓶一心.png | Bin 12529 -> 0 bytes .../meta/weapons/icon/终末嗟叹之诗.png | Bin 18686 -> 0 bytes resources/meta/weapons/icon/绝弦.png | Bin 15997 -> 0 bytes resources/meta/weapons/icon/翡玉法球.png | Bin 15271 -> 0 bytes resources/meta/weapons/icon/腐殖之剑.png | Bin 11832 -> 0 bytes .../meta/weapons/icon/苍古自由之誓.png | Bin 9583 -> 0 bytes resources/meta/weapons/icon/苍翠猎弓.png | Bin 15213 -> 0 bytes resources/meta/weapons/icon/若水.png | Bin 31360 -> 0 bytes resources/meta/weapons/icon/落霞.png | Bin 27403 -> 0 bytes .../meta/weapons/icon/薙草之稻光.png | Bin 8575 -> 0 bytes resources/meta/weapons/icon/螭骨剑.png | Bin 19376 -> 0 bytes resources/meta/weapons/icon/衔珠海皇.png | Bin 12894 -> 0 bytes resources/meta/weapons/icon/西风剑.png | Bin 11181 -> 0 bytes resources/meta/weapons/icon/西风大剑.png | Bin 15522 -> 0 bytes resources/meta/weapons/icon/西风猎弓.png | Bin 15107 -> 0 bytes resources/meta/weapons/icon/西风秘典.png | Bin 17979 -> 0 bytes resources/meta/weapons/icon/西风长枪.png | Bin 9853 -> 0 bytes .../meta/weapons/icon/讨龙英杰谭.png | Bin 17682 -> 0 bytes resources/meta/weapons/icon/训练大剑.png | Bin 11951 -> 0 bytes .../meta/weapons/icon/证誓之明瞳.png | Bin 5663 -> 0 bytes resources/meta/weapons/icon/试作古华.png | Bin 14730 -> 0 bytes resources/meta/weapons/icon/试作斩岩.png | Bin 11774 -> 0 bytes resources/meta/weapons/icon/试作星镰.png | Bin 8542 -> 0 bytes resources/meta/weapons/icon/试作澹月.png | Bin 10870 -> 0 bytes resources/meta/weapons/icon/试作金珀.png | Bin 13280 -> 0 bytes resources/meta/weapons/icon/贯月矢.png | Bin 41680 -> 0 bytes resources/meta/weapons/icon/贯虹之槊.png | Bin 11158 -> 0 bytes .../meta/weapons/icon/赤角石溃杵.png | Bin 19040 -> 0 bytes .../meta/weapons/icon/辰砂之纺锤.png | Bin 14112 -> 0 bytes resources/meta/weapons/icon/钟剑.png | Bin 18932 -> 0 bytes resources/meta/weapons/icon/钢轮弓.png | Bin 13616 -> 0 bytes resources/meta/weapons/icon/钺矛.png | Bin 12762 -> 0 bytes resources/meta/weapons/icon/铁尖枪.png | Bin 7443 -> 0 bytes resources/meta/weapons/icon/铁影阔剑.png | Bin 14399 -> 0 bytes resources/meta/weapons/icon/铁蜂刺.png | Bin 9156 -> 0 bytes resources/meta/weapons/icon/银剑.png | Bin 10140 -> 0 bytes .../meta/weapons/icon/阿莫斯之弓.png | Bin 15497 -> 0 bytes resources/meta/weapons/icon/降临之剑.png | Bin 19699 -> 0 bytes resources/meta/weapons/icon/雨裁.png | Bin 17603 -> 0 bytes .../meta/weapons/icon/雪葬的星银.png | Bin 16482 -> 0 bytes .../meta/weapons/icon/雾切之回光.png | Bin 12694 -> 0 bytes resources/meta/weapons/icon/风花之颂.png | Bin 14007 -> 0 bytes resources/meta/weapons/icon/风鹰剑.png | Bin 12022 -> 0 bytes .../meta/weapons/icon/飞天大御剑.png | Bin 16286 -> 0 bytes resources/meta/weapons/icon/飞天御剑.png | Bin 9329 -> 0 bytes .../meta/weapons/icon/飞雷之弦振.png | Bin 15812 -> 0 bytes resources/meta/weapons/icon/魔导绪论.png | Bin 14803 -> 0 bytes resources/meta/weapons/icon/鸦羽弓.png | Bin 13428 -> 0 bytes resources/meta/weapons/icon/黎明神剑.png | Bin 11820 -> 0 bytes resources/meta/weapons/icon/黑剑.png | Bin 11679 -> 0 bytes resources/meta/weapons/icon/黑岩刺枪.png | Bin 8095 -> 0 bytes resources/meta/weapons/icon/黑岩战弓.png | Bin 10363 -> 0 bytes resources/meta/weapons/icon/黑岩斩刀.png | Bin 15183 -> 0 bytes resources/meta/weapons/icon/黑岩绯玉.png | Bin 12581 -> 0 bytes resources/meta/weapons/icon/黑岩长剑.png | Bin 11520 -> 0 bytes resources/meta/weapons/icon/黑缨枪.png | Bin 10601 -> 0 bytes resources/meta/weapons/icon/龙脊长枪.png | Bin 10637 -> 0 bytes resources/stat/abyss-pct.html | 2 +- resources/stat/abyss-team.html | 2 +- resources/stat/character.html | 3 +- resources/stat/common.css | 4 +- resources/stat/common.less | 4 +- resources/wiki/character-wiki.css | 7 +- resources/wiki/character-wiki.html | 6 +- resources/wiki/character-wiki.less | 8 +- tools/weapon-data-sprider.js | 2 +- 377 files changed, 1248 insertions(+), 3291 deletions(-) create mode 100644 models/ArtifactSet.js create mode 100644 resources/meta/artifact/index.js create mode 100644 resources/meta/artifact/meta.js delete mode 100644 resources/meta/reliquaries/abbr.js delete mode 100644 resources/meta/reliquaries/artis-mark.js delete mode 100644 resources/meta/reliquaries/calc.js delete mode 100644 resources/meta/reliquaries/data.json delete mode 100644 resources/meta/reliquaries/icon/不动玄石之相.png delete mode 100644 resources/meta/reliquaries/icon/乐团的晨光.png delete mode 100644 resources/meta/reliquaries/icon/众生之谣.png delete mode 100644 resources/meta/reliquaries/icon/停摆之刻.png delete mode 100644 resources/meta/reliquaries/icon/冒险家之花.png delete mode 100644 resources/meta/reliquaries/icon/冒险家头带.png delete mode 100644 resources/meta/reliquaries/icon/冒险家尾羽.png delete mode 100644 resources/meta/reliquaries/icon/冒险家怀表.png delete mode 100644 resources/meta/reliquaries/icon/冒险家金杯.png delete mode 100644 resources/meta/reliquaries/icon/冰雪故园的终期.png delete mode 100644 resources/meta/reliquaries/icon/切落之羽.png delete mode 100644 resources/meta/reliquaries/icon/勇士的冠冕.png delete mode 100644 resources/meta/reliquaries/icon/勇士的勋章.png delete mode 100644 resources/meta/reliquaries/icon/勇士的坚毅.png delete mode 100644 resources/meta/reliquaries/icon/勇士的壮行.png delete mode 100644 resources/meta/reliquaries/icon/勇士的期许.png delete mode 100644 resources/meta/reliquaries/icon/勋绩之花.png delete mode 100644 resources/meta/reliquaries/icon/华饰之兜.png delete mode 100644 resources/meta/reliquaries/icon/华馆之羽.png delete mode 100644 resources/meta/reliquaries/icon/历经风雪的思念.png delete mode 100644 resources/meta/reliquaries/icon/吟游者之壶.png delete mode 100644 resources/meta/reliquaries/icon/唤雷的头冠.png delete mode 100644 resources/meta/reliquaries/icon/嗤笑之面.png delete mode 100644 resources/meta/reliquaries/icon/坚铜罗盘.png delete mode 100644 resources/meta/reliquaries/icon/垂玉之叶.png delete mode 100644 resources/meta/reliquaries/icon/夏祭之刻.png delete mode 100644 resources/meta/reliquaries/icon/夏祭之花.png delete mode 100644 resources/meta/reliquaries/icon/夏祭之面.png delete mode 100644 resources/meta/reliquaries/icon/夏祭水玉.png delete mode 100644 resources/meta/reliquaries/icon/夏祭终末.png delete mode 100644 resources/meta/reliquaries/icon/奇迹之杯.png delete mode 100644 resources/meta/reliquaries/icon/奇迹之沙.png delete mode 100644 resources/meta/reliquaries/icon/奇迹之羽.png delete mode 100644 resources/meta/reliquaries/icon/奇迹之花.png delete mode 100644 resources/meta/reliquaries/icon/奇迹耳坠.png delete mode 100644 resources/meta/reliquaries/icon/如蜜的终宴.png delete mode 100644 resources/meta/reliquaries/icon/学士的书签.png delete mode 100644 resources/meta/reliquaries/icon/学士的墨杯.png delete mode 100644 resources/meta/reliquaries/icon/学士的时钟.png delete mode 100644 resources/meta/reliquaries/icon/学士的羽笔.png delete mode 100644 resources/meta/reliquaries/icon/学士的镜片.png delete mode 100644 resources/meta/reliquaries/icon/守护之皿.png delete mode 100644 resources/meta/reliquaries/icon/守护之花.png delete mode 100644 resources/meta/reliquaries/icon/守护座钟.png delete mode 100644 resources/meta/reliquaries/icon/守护徽印.png delete mode 100644 resources/meta/reliquaries/icon/守护束带.png delete mode 100644 resources/meta/reliquaries/icon/宗室之翎.png delete mode 100644 resources/meta/reliquaries/icon/宗室之花.png delete mode 100644 resources/meta/reliquaries/icon/宗室时计.png delete mode 100644 resources/meta/reliquaries/icon/宗室银瓮.png delete mode 100644 resources/meta/reliquaries/icon/宗室面具.png delete mode 100644 resources/meta/reliquaries/icon/将帅兜鍪.png delete mode 100644 resources/meta/reliquaries/icon/少女易逝的芳颜.png delete mode 100644 resources/meta/reliquaries/icon/少女片刻的闲暇.png delete mode 100644 resources/meta/reliquaries/icon/少女苦短的良辰.png delete mode 100644 resources/meta/reliquaries/icon/少女飘摇的思念.png delete mode 100644 resources/meta/reliquaries/icon/嵯峨群峰之翼.png delete mode 100644 resources/meta/reliquaries/icon/巉岩琢塑之樽.png delete mode 100644 resources/meta/reliquaries/icon/平雷之冠.png delete mode 100644 resources/meta/reliquaries/icon/平雷之刻.png delete mode 100644 resources/meta/reliquaries/icon/平雷之器.png delete mode 100644 resources/meta/reliquaries/icon/平雷之心.png delete mode 100644 resources/meta/reliquaries/icon/平雷之羽.png delete mode 100644 resources/meta/reliquaries/icon/幸运儿之杯.png delete mode 100644 resources/meta/reliquaries/icon/幸运儿沙漏.png delete mode 100644 resources/meta/reliquaries/icon/幸运儿绿花.png delete mode 100644 resources/meta/reliquaries/icon/幸运儿银冠.png delete mode 100644 resources/meta/reliquaries/icon/幸运儿鹰羽.png delete mode 100644 resources/meta/reliquaries/icon/异国之盏.png delete mode 100644 resources/meta/reliquaries/icon/归乡之羽.png delete mode 100644 resources/meta/reliquaries/icon/形骸之笠.png delete mode 100644 resources/meta/reliquaries/icon/思忆之矢.png delete mode 100644 resources/meta/reliquaries/icon/感别之冠.png delete mode 100644 resources/meta/reliquaries/icon/战狂的时计.png delete mode 100644 resources/meta/reliquaries/icon/战狂的翎羽.png delete mode 100644 resources/meta/reliquaries/icon/战狂的蔷薇.png delete mode 100644 resources/meta/reliquaries/icon/战狂的骨杯.png delete mode 100644 resources/meta/reliquaries/icon/战狂的鬼面.png delete mode 100644 resources/meta/reliquaries/icon/指挥的礼帽.png delete mode 100644 resources/meta/reliquaries/icon/摧冰而行的执望.png delete mode 100644 resources/meta/reliquaries/icon/故人之心.png delete mode 100644 resources/meta/reliquaries/icon/教官的帽子.png delete mode 100644 resources/meta/reliquaries/icon/教官的怀表.png delete mode 100644 resources/meta/reliquaries/icon/教官的羽饰.png delete mode 100644 resources/meta/reliquaries/icon/教官的胸花.png delete mode 100644 resources/meta/reliquaries/icon/教官的茶杯.png delete mode 100644 resources/meta/reliquaries/icon/无垢之花.png delete mode 100644 resources/meta/reliquaries/icon/无常之面.png delete mode 100644 resources/meta/reliquaries/icon/明威之镡.png delete mode 100644 resources/meta/reliquaries/icon/星罗圭璧之晷.png delete mode 100644 resources/meta/reliquaries/icon/昭武翎羽.png delete mode 100644 resources/meta/reliquaries/icon/月桂的宝冠.png delete mode 100644 resources/meta/reliquaries/icon/朝露之时.png delete mode 100644 resources/meta/reliquaries/icon/染血的铁之心.png delete mode 100644 resources/meta/reliquaries/icon/染血的铁假面.png delete mode 100644 resources/meta/reliquaries/icon/染血的黑之羽.png delete mode 100644 resources/meta/reliquaries/icon/染血骑士之杯.png delete mode 100644 resources/meta/reliquaries/icon/梦中的铁花.png delete mode 100644 resources/meta/reliquaries/icon/梦醒之瓢.png delete mode 100644 resources/meta/reliquaries/icon/武人的头巾.png delete mode 100644 resources/meta/reliquaries/icon/武人的水漏.png delete mode 100644 resources/meta/reliquaries/icon/武人的红花.png delete mode 100644 resources/meta/reliquaries/icon/武人的羽饰.png delete mode 100644 resources/meta/reliquaries/icon/武人的酒杯.png delete mode 100644 resources/meta/reliquaries/icon/沉波之盏.png delete mode 100644 resources/meta/reliquaries/icon/沉金的岁月.png delete mode 100644 resources/meta/reliquaries/icon/沙王的投影.png delete mode 100644 resources/meta/reliquaries/icon/流放者之杯.png delete mode 100644 resources/meta/reliquaries/icon/流放者之羽.png delete mode 100644 resources/meta/reliquaries/icon/流放者之花.png delete mode 100644 resources/meta/reliquaries/icon/流放者头冠.png delete mode 100644 resources/meta/reliquaries/icon/流放者怀表.png delete mode 100644 resources/meta/reliquaries/icon/浮溯之珏.png delete mode 100644 resources/meta/reliquaries/icon/海染之花.png delete mode 100644 resources/meta/reliquaries/icon/海祇之冠.png delete mode 100644 resources/meta/reliquaries/icon/涌泉之盏.png delete mode 100644 resources/meta/reliquaries/icon/渊宫之羽.png delete mode 100644 resources/meta/reliquaries/icon/渡火者的决绝.png delete mode 100644 resources/meta/reliquaries/icon/渡火者的智慧.png delete mode 100644 resources/meta/reliquaries/icon/渡火者的煎熬.png delete mode 100644 resources/meta/reliquaries/icon/渡火者的解脱.png delete mode 100644 resources/meta/reliquaries/icon/渡火者的醒悟.png delete mode 100644 resources/meta/reliquaries/icon/游医的怀钟.png delete mode 100644 resources/meta/reliquaries/icon/游医的方巾.png delete mode 100644 resources/meta/reliquaries/icon/游医的枭羽.png delete mode 100644 resources/meta/reliquaries/icon/游医的药壶.png delete mode 100644 resources/meta/reliquaries/icon/游医的银莲.png delete mode 100644 resources/meta/reliquaries/icon/潜光片羽.png delete mode 100644 resources/meta/reliquaries/icon/焦灼的魔女帽.png delete mode 100644 resources/meta/reliquaries/icon/猎人青翠的箭羽.png delete mode 100644 resources/meta/reliquaries/icon/琴师的箭羽.png delete mode 100644 resources/meta/reliquaries/icon/生灵之华.png delete mode 100644 resources/meta/reliquaries/icon/盟誓金爵.png delete mode 100644 resources/meta/reliquaries/icon/真珠之笼.png delete mode 100644 resources/meta/reliquaries/icon/破冰踏雪的回音.png delete mode 100644 resources/meta/reliquaries/icon/磐陀裂生之花.png delete mode 100644 resources/meta/reliquaries/icon/祈望之心.png delete mode 100644 resources/meta/reliquaries/icon/祝祀之凭.png delete mode 100644 resources/meta/reliquaries/icon/祭冰礼冠.png delete mode 100644 resources/meta/reliquaries/icon/祭水礼冠.png delete mode 100644 resources/meta/reliquaries/icon/祭火礼冠.png delete mode 100644 resources/meta/reliquaries/icon/祭雷礼冠.png delete mode 100644 resources/meta/reliquaries/icon/离别之贝.png delete mode 100644 resources/meta/reliquaries/icon/终幕的时计.png delete mode 100644 resources/meta/reliquaries/icon/结契之刻.png delete mode 100644 resources/meta/reliquaries/icon/绯花之壶.png delete mode 100644 resources/meta/reliquaries/icon/羁缠之花.png delete mode 100644 resources/meta/reliquaries/icon/翠绿猎人的容器.png delete mode 100644 resources/meta/reliquaries/icon/翠绿猎人的笃定.png delete mode 100644 resources/meta/reliquaries/icon/翠绿的猎人之冠.png delete mode 100644 resources/meta/reliquaries/icon/翠蔓的智者.png delete mode 100644 resources/meta/reliquaries/icon/荣花之期.png delete mode 100644 resources/meta/reliquaries/icon/虺雷之姿.png delete mode 100644 resources/meta/reliquaries/icon/裁断的翎羽.png delete mode 100644 resources/meta/reliquaries/icon/角斗士的凯旋.png delete mode 100644 resources/meta/reliquaries/icon/角斗士的希冀.png delete mode 100644 resources/meta/reliquaries/icon/角斗士的归宿.png delete mode 100644 resources/meta/reliquaries/icon/角斗士的留恋.png delete mode 100644 resources/meta/reliquaries/icon/角斗士的酣醉.png delete mode 100644 resources/meta/reliquaries/icon/贤医之羽.png delete mode 100644 resources/meta/reliquaries/icon/贤智的定期.png delete mode 100644 resources/meta/reliquaries/icon/赌徒的怀表.png delete mode 100644 resources/meta/reliquaries/icon/赌徒的羽饰.png delete mode 100644 resources/meta/reliquaries/icon/赌徒的耳环.png delete mode 100644 resources/meta/reliquaries/icon/赌徒的胸花.png delete mode 100644 resources/meta/reliquaries/icon/赌徒的骰盅.png delete mode 100644 resources/meta/reliquaries/icon/超越之盏.png delete mode 100644 resources/meta/reliquaries/icon/远方的少女之心.png delete mode 100644 resources/meta/reliquaries/icon/迷宫的游人.png delete mode 100644 resources/meta/reliquaries/icon/迷误者之灯.png delete mode 100644 resources/meta/reliquaries/icon/追忆之风.png delete mode 100644 resources/meta/reliquaries/icon/逐光之石.png delete mode 100644 resources/meta/reliquaries/icon/遍结寒霜的傲骨.png delete mode 100644 resources/meta/reliquaries/icon/酒渍船帽.png delete mode 100644 resources/meta/reliquaries/icon/野花记忆的绿野.png delete mode 100644 resources/meta/reliquaries/icon/金铜时晷.png delete mode 100644 resources/meta/reliquaries/icon/阳辔之遗.png delete mode 100644 resources/meta/reliquaries/icon/降雷的凶兆.png delete mode 100644 resources/meta/reliquaries/icon/雷云之笼.png delete mode 100644 resources/meta/reliquaries/icon/雷灾的孑遗.png delete mode 100644 resources/meta/reliquaries/icon/雷霆的时计.png delete mode 100644 resources/meta/reliquaries/icon/雷鸟的怜悯.png delete mode 100644 resources/meta/reliquaries/icon/饰金胸花.png delete mode 100644 resources/meta/reliquaries/icon/骑士染血之时.png delete mode 100644 resources/meta/reliquaries/icon/魂香之花.png delete mode 100644 resources/meta/reliquaries/icon/魔女常燃之羽.png delete mode 100644 resources/meta/reliquaries/icon/魔女的心之火.png delete mode 100644 resources/meta/reliquaries/icon/魔女的炎之花.png delete mode 100644 resources/meta/reliquaries/icon/魔女破灭之时.png create mode 100644 resources/meta/weapon/bow/calc.js create mode 100644 resources/meta/weapon/catalyst/calc.js create mode 100644 resources/meta/weapon/claymore/calc.js create mode 100644 resources/meta/weapon/index.js rename resources/meta/{weapons/abbr.js => weapon/meta.js} (83%) create mode 100644 resources/meta/weapon/polearm/calc.js create mode 100644 resources/meta/weapon/sword/calc.js delete mode 100644 resources/meta/weapons/calc.js delete mode 100644 resources/meta/weapons/data.json delete mode 100644 resources/meta/weapons/icon/「渔获」.png delete mode 100644 resources/meta/weapons/icon/万国诸海图谱.png delete mode 100644 resources/meta/weapons/icon/不灭月华.png delete mode 100644 resources/meta/weapons/icon/以理服人.png delete mode 100644 resources/meta/weapons/icon/佣兵重剑.png delete mode 100644 resources/meta/weapons/icon/信使.png delete mode 100644 resources/meta/weapons/icon/冬极白星.png delete mode 100644 resources/meta/weapons/icon/决斗之枪.png delete mode 100644 resources/meta/weapons/icon/冷刃.png delete mode 100644 resources/meta/weapons/icon/匣里日月.png delete mode 100644 resources/meta/weapons/icon/匣里灭辰.png delete mode 100644 resources/meta/weapons/icon/匣里龙吟.png delete mode 100644 resources/meta/weapons/icon/千岩古剑.png delete mode 100644 resources/meta/weapons/icon/千岩长枪.png delete mode 100644 resources/meta/weapons/icon/历练的猎弓.png delete mode 100644 resources/meta/weapons/icon/原木刀.png delete mode 100644 resources/meta/weapons/icon/反曲弓.png delete mode 100644 resources/meta/weapons/icon/口袋魔导书.png delete mode 100644 resources/meta/weapons/icon/吃虎鱼刀.png delete mode 100644 resources/meta/weapons/icon/和璞鸢.png delete mode 100644 resources/meta/weapons/icon/喜多院十文字.png delete mode 100644 resources/meta/weapons/icon/嘟嘟可故事集.png delete mode 100644 resources/meta/weapons/icon/四风原典.png delete mode 100644 resources/meta/weapons/icon/天目影打刀.png delete mode 100644 resources/meta/weapons/icon/天空之傲.png delete mode 100644 resources/meta/weapons/icon/天空之刃.png delete mode 100644 resources/meta/weapons/icon/天空之卷.png delete mode 100644 resources/meta/weapons/icon/天空之翼.png delete mode 100644 resources/meta/weapons/icon/天空之脊.png delete mode 100644 resources/meta/weapons/icon/学徒笔记.png delete mode 100644 resources/meta/weapons/icon/宗室大剑.png delete mode 100644 resources/meta/weapons/icon/宗室猎枪.png delete mode 100644 resources/meta/weapons/icon/宗室秘法录.png delete mode 100644 resources/meta/weapons/icon/宗室长剑.png delete mode 100644 resources/meta/weapons/icon/宗室长弓.png delete mode 100644 resources/meta/weapons/icon/尘世之锁.png delete mode 100644 resources/meta/weapons/icon/幽夜华尔兹.png delete mode 100644 resources/meta/weapons/icon/异世界行记.png delete mode 100644 resources/meta/weapons/icon/弓藏.png delete mode 100644 resources/meta/weapons/icon/弹弓.png delete mode 100644 resources/meta/weapons/icon/忍冬之果.png delete mode 100644 resources/meta/weapons/icon/息灾.png delete mode 100644 resources/meta/weapons/icon/恶王丸.png delete mode 100644 resources/meta/weapons/icon/护摩之杖.png delete mode 100644 resources/meta/weapons/icon/掠食者.png delete mode 100644 resources/meta/weapons/icon/斫峰之刃.png delete mode 100644 resources/meta/weapons/icon/断浪长鳍.png delete mode 100644 resources/meta/weapons/icon/新手长枪.png delete mode 100644 resources/meta/weapons/icon/旅行剑.png delete mode 100644 resources/meta/weapons/icon/无工之剑.png delete mode 100644 resources/meta/weapons/icon/无锋剑.png delete mode 100644 resources/meta/weapons/icon/昭心.png delete mode 100644 resources/meta/weapons/icon/暗巷猎手.png delete mode 100644 resources/meta/weapons/icon/暗巷的酒与诗.png delete mode 100644 resources/meta/weapons/icon/暗巷闪光.png delete mode 100644 resources/meta/weapons/icon/暗铁剑.png delete mode 100644 resources/meta/weapons/icon/曚云之月.png delete mode 100644 resources/meta/weapons/icon/松籁响起之时.png delete mode 100644 resources/meta/weapons/icon/桂木斩长正.png delete mode 100644 resources/meta/weapons/icon/森林王器.png delete mode 100644 resources/meta/weapons/icon/沐浴龙血的剑.png delete mode 100644 resources/meta/weapons/icon/波乱月白经津.png delete mode 100644 resources/meta/weapons/icon/流月针.png delete mode 100644 resources/meta/weapons/icon/流浪乐章.png delete mode 100644 resources/meta/weapons/icon/狼的末路.png delete mode 100644 resources/meta/weapons/icon/猎人之径.png delete mode 100644 resources/meta/weapons/icon/猎弓.png delete mode 100644 resources/meta/weapons/icon/王下近侍.png delete mode 100644 resources/meta/weapons/icon/甲级宝珏.png delete mode 100644 resources/meta/weapons/icon/白影剑.png delete mode 100644 resources/meta/weapons/icon/白缨枪.png delete mode 100644 resources/meta/weapons/icon/白辰之环.png delete mode 100644 resources/meta/weapons/icon/白铁大剑.png delete mode 100644 resources/meta/weapons/icon/盈满之实.png delete mode 100644 resources/meta/weapons/icon/破魔之弓.png delete mode 100644 resources/meta/weapons/icon/磐岩结绿.png delete mode 100644 resources/meta/weapons/icon/神乐之真意.png delete mode 100644 resources/meta/weapons/icon/神射手之誓.png delete mode 100644 resources/meta/weapons/icon/祭礼剑.png delete mode 100644 resources/meta/weapons/icon/祭礼大剑.png delete mode 100644 resources/meta/weapons/icon/祭礼弓.png delete mode 100644 resources/meta/weapons/icon/祭礼残章.png delete mode 100644 resources/meta/weapons/icon/竭泽.png delete mode 100644 resources/meta/weapons/icon/笛剑.png delete mode 100644 resources/meta/weapons/icon/笼钓瓶一心.png delete mode 100644 resources/meta/weapons/icon/终末嗟叹之诗.png delete mode 100644 resources/meta/weapons/icon/绝弦.png delete mode 100644 resources/meta/weapons/icon/翡玉法球.png delete mode 100644 resources/meta/weapons/icon/腐殖之剑.png delete mode 100644 resources/meta/weapons/icon/苍古自由之誓.png delete mode 100644 resources/meta/weapons/icon/苍翠猎弓.png delete mode 100644 resources/meta/weapons/icon/若水.png delete mode 100644 resources/meta/weapons/icon/落霞.png delete mode 100644 resources/meta/weapons/icon/薙草之稻光.png delete mode 100644 resources/meta/weapons/icon/螭骨剑.png delete mode 100644 resources/meta/weapons/icon/衔珠海皇.png delete mode 100644 resources/meta/weapons/icon/西风剑.png delete mode 100644 resources/meta/weapons/icon/西风大剑.png delete mode 100644 resources/meta/weapons/icon/西风猎弓.png delete mode 100644 resources/meta/weapons/icon/西风秘典.png delete mode 100644 resources/meta/weapons/icon/西风长枪.png delete mode 100644 resources/meta/weapons/icon/讨龙英杰谭.png delete mode 100644 resources/meta/weapons/icon/训练大剑.png delete mode 100644 resources/meta/weapons/icon/证誓之明瞳.png delete mode 100644 resources/meta/weapons/icon/试作古华.png delete mode 100644 resources/meta/weapons/icon/试作斩岩.png delete mode 100644 resources/meta/weapons/icon/试作星镰.png delete mode 100644 resources/meta/weapons/icon/试作澹月.png delete mode 100644 resources/meta/weapons/icon/试作金珀.png delete mode 100644 resources/meta/weapons/icon/贯月矢.png delete mode 100644 resources/meta/weapons/icon/贯虹之槊.png delete mode 100644 resources/meta/weapons/icon/赤角石溃杵.png delete mode 100644 resources/meta/weapons/icon/辰砂之纺锤.png delete mode 100644 resources/meta/weapons/icon/钟剑.png delete mode 100644 resources/meta/weapons/icon/钢轮弓.png delete mode 100644 resources/meta/weapons/icon/钺矛.png delete mode 100644 resources/meta/weapons/icon/铁尖枪.png delete mode 100644 resources/meta/weapons/icon/铁影阔剑.png delete mode 100644 resources/meta/weapons/icon/铁蜂刺.png delete mode 100644 resources/meta/weapons/icon/银剑.png delete mode 100644 resources/meta/weapons/icon/阿莫斯之弓.png delete mode 100644 resources/meta/weapons/icon/降临之剑.png delete mode 100644 resources/meta/weapons/icon/雨裁.png delete mode 100644 resources/meta/weapons/icon/雪葬的星银.png delete mode 100644 resources/meta/weapons/icon/雾切之回光.png delete mode 100644 resources/meta/weapons/icon/风花之颂.png delete mode 100644 resources/meta/weapons/icon/风鹰剑.png delete mode 100644 resources/meta/weapons/icon/飞天大御剑.png delete mode 100644 resources/meta/weapons/icon/飞天御剑.png delete mode 100644 resources/meta/weapons/icon/飞雷之弦振.png delete mode 100644 resources/meta/weapons/icon/魔导绪论.png delete mode 100644 resources/meta/weapons/icon/鸦羽弓.png delete mode 100644 resources/meta/weapons/icon/黎明神剑.png delete mode 100644 resources/meta/weapons/icon/黑剑.png delete mode 100644 resources/meta/weapons/icon/黑岩刺枪.png delete mode 100644 resources/meta/weapons/icon/黑岩战弓.png delete mode 100644 resources/meta/weapons/icon/黑岩斩刀.png delete mode 100644 resources/meta/weapons/icon/黑岩绯玉.png delete mode 100644 resources/meta/weapons/icon/黑岩长剑.png delete mode 100644 resources/meta/weapons/icon/黑缨枪.png delete mode 100644 resources/meta/weapons/icon/龙脊长枪.png diff --git a/CHANGELOG.md b/CHANGELOG.md index b1a792d6..13002b6f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,10 @@ -# 2.0 Alpha.6 +# 2.0 Alpha.7 +* 武器、圣遗物资源采用webp格式 + * 资源引用逻辑更新,可能会导致一些展示异常,如遇问题请反馈 * 一些已知Bug修复 -* `#面板练度统计` 样式微调 -# 2.0 Alpha.1~5 +# 2.0 Alpha.1~6 * `#面板练度统计` 功能调整 * 在未绑定CK时,使用本地面板数据展示练度信息 diff --git a/apps/character/profile-detail.js b/apps/character/profile-detail.js index c8a9cd1a..33f21dbb 100644 --- a/apps/character/profile-detail.js +++ b/apps/character/profile-detail.js @@ -1,7 +1,7 @@ import lodash from 'lodash' import { autoRefresh } from './profile-common.js' import { Common, Format, Profile } from '../../components/index.js' -import { MysApi } from '../../models/index.js' +import { MysApi, Avatar } from '../../models/index.js' export async function renderProfile (e, char, mode = 'profile', params = {}) { let selfUser = await MysApi.initUser(e) @@ -22,6 +22,7 @@ export async function renderProfile (e, char, mode = 'profile', params = {}) { } let profile = Profile.get(uid, char.id) + if (!profile || !profile.hasData) { if (await refresh()) { return true @@ -30,6 +31,7 @@ export async function renderProfile (e, char, mode = 'profile', params = {}) { } return true } + let avatar = new Avatar(profile) char = profile.char || char let a = profile.attr let c = Format.comma @@ -86,11 +88,9 @@ export async function renderProfile (e, char, mode = 'profile', params = {}) { return await Common.render('character/profile-detail', { save_id: uid, uid, - data: profile.getData('cons,level,weapon,dataSource,updateTime'), + data: avatar.getData('name,cons,level,weapon,talent,dataSource,updateTime'), attr, - name: char.name, elem: char.elem, - talent: char.getAvatarTalent(profile.talent, profile.cons), dmgData, dmgMsg, dmgRet: dmgCalc.dmgRet || false, diff --git a/apps/wiki/CharWiki.js b/apps/wiki/CharWiki.js index e5ed1cef..2025a695 100644 --- a/apps/wiki/CharWiki.js +++ b/apps/wiki/CharWiki.js @@ -1,7 +1,7 @@ import HutaoApi from '../stat/HutaoApi.js'; import lodash from 'lodash'; import { Format } from '../../components/index.js'; -import { Artifact, Weapon } from '../../models/index.js'; +import { Artifact, ArtifactSet, Weapon } from '../../models/index.js'; let CharWiki = { // 命座持有 @@ -46,22 +46,21 @@ let CharWiki = { let au = (await HutaoApi.getArtisUsage()).data || {} let artis = [] if (au[id]) { - let sets = {} lodash.forEach(au[id], (ds) => { - let names = [] + let imgs = [] let abbrs = [] let ss = ds.sets.split(',') lodash.forEach(ss, (t) => { t = t.split(':') - let tmp = Artifact.getArtiBySet(t[0]) - if (tmp) { - names.push(tmp) - abbrs.push(Artifact.getAbbrBySet(t[0]) + (ss.length === 1 ? t[1] : '')) + let artiSet = ArtifactSet.get(t[0]) + if (artiSet) { + imgs.push(artiSet.img) + abbrs.push(artiSet.abbr + (ss.length === 1 ? t[1] : '')) } }) artis.push({ - sets: names, + imgs, title: abbrs.join('+'), value: ds.value }) diff --git a/components/profile-data/miao-meta.js b/components/profile-data/miao-meta.js index 60b9e1d4..745f1722 100644 --- a/components/profile-data/miao-meta.js +++ b/components/profile-data/miao-meta.js @@ -11,7 +11,7 @@ export const artiIdx = { 理之冠: 5 } -let relis = Data.readJSON('resources/meta/reliquaries/data.json') +let relis = Data.readJSON('resources/meta/artifact/data.json') let setMap = {} lodash.forEach(relis, (ds) => { diff --git a/models/Artifact.js b/models/Artifact.js index a03b0ec1..4d534e48 100644 --- a/models/Artifact.js +++ b/models/Artifact.js @@ -1,51 +1,63 @@ -import { attrMap } from '../resources/meta/reliquaries/artis-mark.js' -import lodash from 'lodash' -import { Data } from '../components/index.js' +import Base from './Base.js' +import { ArtifactSet } from './index.js' +import { abbr, artiMap, attrMap } from '../resources/meta/artifact/index.js' -let artisMap = {} -const abbr = await Data.importDefault('resources/meta/reliquaries/abbr.js') +class Artifact extends Base { + constructor (name) { + super() + let cache = this._getCache(`arti:${name}`) + if (cache) { + return cache + } + let data = artiMap[name] + if (!data) { + return false + } + this.name = name + this.meta = data + return this._cache() + } -async function init () { - let artis = Data.readJSON('resources/meta/reliquaries/data.json') + get artiSet () { + return ArtifactSet.get(this.set) + } - lodash.forEach(artis, (ds) => { - artisMap[ds.name] = ds - }) -} + get setName () { + return this.set + } -await init() - -let Artifact = { - - // 根据圣遗物名称获取套装 - getSetByArti (name) { - for (let idx in artisMap) { - for (let idx2 in artisMap[idx].sets) { - if (artisMap[idx].sets[idx2].name === name) { - return artisMap[idx] - } - } + static get (name) { + if (artiMap[name]) { + return new Artifact(name) } return false - }, + } - // 获取指定圣遗物套装指定位置的名字 - getArtiBySet (name, idx = 1) { - let set = artisMap[name] - if (!set) { - return '' + get img () { + return `meta/artifact/${this.setName}/${this.idx}.webp` + } + + static getSetNameByArti (name) { + let arti = Artifact.get(name) + if (arti) { + return arti.setName } - return set.sets[`arti${idx}`].name - }, + return '' + } - getAbbrBySet (name) { - return abbr[name] || name.split(0, 2) - }, - - getMeta () { + static getMeta () { return { attrMap } } } + +// 根据圣遗物名称获取套装 +// getSetByArti + +// 获取指定圣遗物套装指定位置的名字 +// getArtiBySet + +// getAbbrBySet +// getMeta export default Artifact diff --git a/models/ArtifactSet.js b/models/ArtifactSet.js new file mode 100644 index 00000000..143e5b86 --- /dev/null +++ b/models/ArtifactSet.js @@ -0,0 +1,60 @@ +import Base from './Base.js' +import { abbr, artiMap, artiSetMap } from '../resources/meta/artifact/index.js' +import { Artifact } from './index.js' + +class ArtifactSet extends Base { + constructor (name) { + super() + let cache = this._getCache(`arti-set:${name}`) + if (cache) { + return cache + } + let data = artiSetMap[name] + if (!data) { + return false + } + this.meta = data + return this._cache() + } + + get img () { + let arti = Artifact.get(this.sets[1]) + return arti ? arti.img : '' + } + + get abbr () { + return abbr[this.name] || this.name + } + + static getByArti (name) { + if (artiMap[name]) { + return ArtifactSet.get(artiMap[name].set) + } + return false + } + + static get (name) { + if (artiSetMap[name]) { + return new ArtifactSet(name) + } + return false + } + + getArtiName (idx = 1) { + return this.sets[idx] + } + + getArti (idx = 1) { + return Artifact.get(this.getArtiName(idx)) + } + + static getArtiNameBySet (set, idx = 1) { + let artiSet = ArtifactSet.get(set) + if (artiSet) { + return artiSet.getArti(idx) + } + return '' + } +} + +export default ArtifactSet diff --git a/models/Avatar.js b/models/Avatar.js index b637c57f..c45af450 100644 --- a/models/Avatar.js +++ b/models/Avatar.js @@ -5,7 +5,7 @@ import Base from './Base.js' import lodash from 'lodash' import { Profile } from '../components/index.js' -import { Artifact, Character, Weapon } from './index.js' +import { Artifact, Character, Weapon, ArtifactSet } from './index.js' import moment from 'moment' const charKey = 'name,abbr,sName,star,imgs,face,side,weaponType,elem'.split(',') @@ -79,25 +79,19 @@ export default class Avatar extends Base { get artis () { let ret = {} if (!this.isProfile) { - const posIdx = { - 生之花: 1, - 死之羽: 2, - 时之沙: 3, - 空之杯: 4, - 理之冠: 5 - } lodash.forEach(this.meta.reliquaries, (ds) => { - let idx = posIdx[ds.pos_name] - ret[idx] = { - name: ds.name, - set: Artifact.getSetByArti(ds.name), + let arti = Artifact.get(ds.name) + ret[arti.idx] = { + name: arti.name, + set: arti.setName, + img: arti.img, level: ds.level } }) return ret } if (this.profile && this.profile?.artis) { - return this.profile.artis.toJSON() + return this.profile.artis.getArtisData() } return false } @@ -175,7 +169,7 @@ export default class Avatar extends Base { let artis = this.artis let setCount = {} lodash.forEach(artis, (arti, idx) => { - let set = arti?.set?.name + let set = arti?.set if (set) { setCount[set] = (setCount[set] || 0) + 1 } @@ -184,20 +178,23 @@ export default class Avatar extends Base { let names = [] let abbrs = [] let abbrs2 = [] + let imgs = [] for (let set in setCount) { if (setCount[set] >= 2) { - sets[set] = setCount[set] >= 4 ? 4 : 2 - names.push(Artifact.getArtiBySet(set)) + let value = setCount[set] >= 4 ? 4 : 2 + sets[set] = value + let artiSet = ArtifactSet.get(set) + names.push(artiSet.name) + abbrs.push(artiSet.abbr + value) + abbrs2.push(artiSet.name + value) + imgs.push(artiSet.img) } } - lodash.forEach(sets, (v, k) => { - abbrs.push(Artifact.getAbbrBySet(k) + v) - abbrs2.push(k + v) - }) this._artisSet = { sets, names, abbrs: [...abbrs, ...abbrs2], + imgs, name: abbrs.length > 1 ? abbrs.join('+') : abbrs2[0] } } diff --git a/models/ProfileArtis.js b/models/ProfileArtis.js index 20767bfd..8da5b1fc 100644 --- a/models/ProfileArtis.js +++ b/models/ProfileArtis.js @@ -3,10 +3,10 @@ * */ import lodash from 'lodash' import Base from './Base.js' -import { Artifact, Character } from './index.js' +import { Artifact, ArtifactSet, Character } from './index.js' import { Format, Data } from '../components/index.js' import ArtisMark from './profile-lib/ArtisMark.js' -import { attrMap, attrNameMap, attrValue } from '../resources/meta/reliquaries/artis-mark.js' +import { attrMap, attrNameMap, attrValue } from '../resources/meta/artifact/artis-mark.js' import CharArtis from './profile-lib/CharArtis.js' export default class ProfileArtis extends Base { @@ -33,8 +33,8 @@ export default class ProfileArtis extends Base { setArtis (idx = 1, ds = {}) { idx = idx.toString().replace('arti', '') let ret = {} - ret.name = ds.name || Artifact.getArtiBySet(ds.set, idx) || '' - ret.set = ds.set || Artifact.getSetByArti(ret.title) || '' + ret.name = ds.name || ArtifactSet.getArtiNameBySet(ds.set, idx) || '' + ret.set = ds.set || Artifact.getSetNameByArti(ret.title) || '' ret.level = ds.level || 1 ret.main = ArtisMark.formatAttr(ds.main || {}) ret.attrs = [] @@ -128,6 +128,19 @@ export default class ProfileArtis extends Base { return check } + getArtisData () { + let ret = {} + this.forEach((ds, idx) => { + let arti = Artifact.get(ds.name) + ret[idx] = { + ...ds, + name: arti.name, + img: arti.img + } + }) + return ret + } + getSetData () { if (this._setData) { return this._setData @@ -138,21 +151,24 @@ export default class ProfileArtis extends Base { }) let sets = {} let names = [] + let imgs = [] let abbrs = [] let abbrs2 = [] for (let set in setCount) { if (setCount[set] >= 2) { - sets[set] = setCount[set] >= 4 ? 4 : 2 - names.push(Artifact.getArtiBySet(set)) + let count = setCount[set] >= 4 ? 4 : 2 + sets[set] = count + let artiSet = ArtifactSet.get(set) + names.push(artiSet.name) + imgs.push(artiSet.img) + abbrs.push(artiSet.abbr + count) + abbrs2.push(artiSet.name + count) } } - lodash.forEach(sets, (v, k) => { - abbrs.push(Artifact.getAbbrBySet(k) + v) - abbrs2.push(k + v) - }) this._setData = { sets, names, + imgs, abbrs: [...abbrs, ...abbrs2], name: abbrs.length > 1 ? abbrs.join('+') : abbrs2[0] } @@ -217,9 +233,11 @@ export default class ProfileArtis extends Base { markClass: ArtisMark.getMarkClass(mark) } } else { + let artifact = Artifact.get(arti.name) artis[idx] = { - name: arti.name, - set: arti.set, + name: artifact.name, + set: artifact.setName, + img: artifact.img, level: arti.level, _mark: mark, mark: Format.comma(mark, 1), @@ -231,10 +249,13 @@ export default class ProfileArtis extends Base { }) let sets = {} let names = [] + let imgs = [] for (let set in setCount) { if (setCount[set] >= 2) { sets[set] = setCount[set] >= 4 ? 4 : 2 - names.push(Artifact.getArtiBySet(set)) + let artiSet = ArtifactSet.get(set) + imgs.push(artiSet.img) + names.push(artiSet.name) } } this.mark = totalMark @@ -246,6 +267,7 @@ export default class ProfileArtis extends Base { artis, sets, names, + imgs, classTitle: charCfg.classTitle } if (withDetail) { diff --git a/models/Weapon.js b/models/Weapon.js index cd58401d..48312ad0 100644 --- a/models/Weapon.js +++ b/models/Weapon.js @@ -1,19 +1,13 @@ -import lodash from 'lodash' import Base from './Base.js' import { Data } from '../components/index.js' -let data = Data.readJSON('resources/meta/weapons/data.json') -let abbr = await Data.importDefault('resources/meta/weapon/abbr.js') - -let wData = {} -lodash.forEach(data, (ds) => { - wData[ds.name] = ds -}) +let data = {} +let abbr = {} class Weapon extends Base { constructor (name) { super(name) - let meta = wData[name] + let meta = data[name] if (!meta) { return false } @@ -37,7 +31,7 @@ class Weapon extends Base { } get img () { - return `meta/weapons/icon/${this.name}.png` + return `meta/weapon/${this.type}/${this.name}/icon.webp` } get icon () { @@ -46,10 +40,17 @@ class Weapon extends Base { } Weapon.get = function (name) { - if (wData[name]) { + if (data[name]) { return new Weapon(name) } return false } export default Weapon + +// lazy load +setTimeout(async function init () { + let ret = await Data.importModule('resources/meta/weapon/index.js') + data = ret.data + abbr = ret.abbr +}) diff --git a/models/index.js b/models/index.js index d6721fbc..9a270cd3 100644 --- a/models/index.js +++ b/models/index.js @@ -1,6 +1,7 @@ import Base from './Base.js' import Character from './Character.js' import Artifact from './Artifact.js' +import ArtifactSet from './ArtifactSet.js' import Avatar from './Avatar.js' import AvatarList from './AvatarList.js' import Abyss from './Abyss.js' @@ -19,6 +20,7 @@ export { Abyss, Character, Artifact, + ArtifactSet, Avatar, AvatarList, ProfileServ, diff --git a/models/profile-lib/ArtisMark.js b/models/profile-lib/ArtisMark.js index 31602e69..d4ccdc92 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 } from '../../resources/meta/reliquaries/artis-mark.js' +import { attrNameMap, mainAttr, subAttr } from '../../resources/meta/artifact/artis-mark.js' let ArtisMark = { formatAttr (ds) { diff --git a/models/profile-lib/CharArtis.js b/models/profile-lib/CharArtis.js index ab74c88d..1df824fc 100644 --- a/models/profile-lib/CharArtis.js +++ b/models/profile-lib/CharArtis.js @@ -1,4 +1,4 @@ -import { usefulAttr } from '../../resources/meta/reliquaries/artis-mark.js' +import { usefulAttr } from '../../resources/meta/artifact/artis-mark.js' import { Data } from '../../components/index.js' import fs from 'fs' diff --git a/models/profile-lib/DmgBuffs.js b/models/profile-lib/DmgBuffs.js index 8ea70b98..008533bb 100644 --- a/models/profile-lib/DmgBuffs.js +++ b/models/profile-lib/DmgBuffs.js @@ -68,8 +68,8 @@ let DmgBuffs = { async function init () { const _path = `file://${process.cwd()}/plugins/miao-plugin/resources/meta` - weaponBuffs = (await import(`${_path}/weapons/calc.js`)).weapons || {} - artisBuffs = (await import(`${_path}/reliquaries/calc.js`)).buffs || {} + weaponBuffs = {} || (await import(`${_path}/weapon/index.js`)).calc || {} + artisBuffs = (await import(`${_path}/artifact/calc.js`)).buffs || {} } await init() diff --git a/resources/character/artis-list.html b/resources/character/artis-list.html index 55cdc357..21459421 100644 --- a/resources/character/artis-list.html +++ b/resources/character/artis-list.html @@ -17,7 +17,7 @@