From 64b880036b055d91fcede2a797ecdcc3d577730d Mon Sep 17 00:00:00 2001
From: Kokomi <1379177109@qq.com>
Date: Sat, 28 Oct 2023 18:05:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=8E=9F=E7=A5=9E=E9=9D=A2?=
=?UTF-8?q?=E6=9D=BF=E5=9C=A3=E9=81=97=E7=89=A9=E8=AF=84=E7=BA=A7=E5=BC=82?=
=?UTF-8?q?=E5=B8=B8=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
models/artis/ArtisMark.js | 4 ++--
resources/meta-gs/weapon/desc.js | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/models/artis/ArtisMark.js b/models/artis/ArtisMark.js
index 918483f7..0d95ffad 100644
--- a/models/artis/ArtisMark.js
+++ b/models/artis/ArtisMark.js
@@ -196,7 +196,7 @@ let ArtisMark = {
if (withDetail) {
let artifact = Artifact.get(arti, game)
artisRet[idx] = {
- ...Data.getData(artifact, 'name,abbr,set:setName,img'),
+ ...artifact.getData('name,abbr,set:setName,img'),
level: arti.level,
main: ArtisMark.formatArti(arti.main, charCfg.attrs, true, game),
attrs: ArtisMark.formatArtiAttrs(arti.attrs, charCfg.attrs, game),
@@ -206,7 +206,7 @@ let ArtisMark = {
})
let setData = artis.getSetData()
artis.mark = totalMark
- artis.markClass = ArtisMark.getMarkClass(totalMark / (this.isGs ? 5 : 6))
+ artis.markClass = ArtisMark.getMarkClass(totalMark / (profile.isGs ? 5 : 6))
let ret = {
classTitle: charCfg.classTitle,
artis: artisRet,
diff --git a/resources/meta-gs/weapon/desc.js b/resources/meta-gs/weapon/desc.js
index ab4ecab9..212e7764 100644
--- a/resources/meta-gs/weapon/desc.js
+++ b/resources/meta-gs/weapon/desc.js
@@ -37,7 +37,8 @@ export const descFix = {
// 长柄武器
勘探钻机: '受到或进行治疗时，获得标记，最多3层，处于后台也能获得。施放战技或爆发时，消耗标记：每枚标记提高$[0]攻击力与$[1]元素伤害加成。',
贯月矢: '触发草元素反应后，每20秒产生至多存在10秒的种识之叶，后台也能触发。拾取提升攻击力32%，持续12秒。',
- 护摩之杖:'生命值提升$[0]。
获得$[1]生命值上限的攻击力提升，生命值低于50%时，进一步获得$[2]生命值上限的攻击力提升。',
+ 护摩之杖: '生命值提升$[0]。
获得$[1]生命值上限的攻击力提升，生命值低于50%时，进一步获得$[2]生命值上限的攻击力提升。',
+ 薙草之稻光: '攻击力获得提升，提升程度相当于充能效率超出100%部分的$[0]，至多提升$[1]。
施放爆发后的12秒内，充能效率提升$[2]。',
// 弓
终末嗟叹之诗: '精通提高$[0]点；战技或爆发命中敌人时，获得追思之符，后台也能触发。4枚时消耗所有追思之符：精通提高$[1]点，攻击力提升$[2]，持续12秒。',