From d110a8c8b54887f175c35aaf0f543334e563cf8c Mon Sep 17 00:00:00 2001 From: Aluxes <39981645+AshenAshes@users.noreply.github.com> Date: Mon, 4 Sep 2023 11:17:27 +0800 Subject: [PATCH] =?UTF-8?q?fix=E4=B8=80=E4=BA=9B=E4=BC=A4=E5=AE=B3?= =?UTF-8?q?=E8=AE=A1=E7=AE=97=E5=92=8C=E6=95=B0=E6=8D=AE=EF=BC=8C=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E7=90=B3=E5=A6=AE=E7=89=B9=E4=BC=A4=E5=AE=B3=E8=AE=A1?= =?UTF-8?q?=E7=AE=97=20(#636)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix：星铁日历显示 * fix：神子 提纳里 林尼 赛诺 伤害计算 * fix：部分武器特效数据 * 新增琳妮特及烟绯四命伤害计算 * fix：星铁数据 --- apps/wiki/CalendarSr.js | 6 ++-- resources/meta-sr/artifact/artis-mark.js | 1 + resources/meta-sr/character/data.json | 2 +- .../data.json | 6 ++-- .../imgs/cons-1.webp | Bin .../imgs/cons-2.webp | Bin .../imgs/cons-4.webp | Bin .../imgs/cons-6.webp | Bin .../imgs/face.webp | Bin .../imgs/preview.webp | Bin .../imgs/splash.webp | Bin .../imgs/talent-a.webp | Bin .../丹恒•饮月/imgs/talent-a2.webp | Bin 0 -> 13038 bytes .../imgs/talent-e.webp | Bin .../丹恒•饮月/imgs/talent-e2.webp | Bin 0 -> 5434 bytes .../imgs/talent-q.webp | Bin .../imgs/talent-t.webp | Bin .../imgs/talent-z.webp | Bin .../imgs/tree-1.webp | Bin .../imgs/tree-2.webp | Bin .../imgs/tree-3.webp | Bin resources/meta-sr/character/玲可/data.json | 10 +++--- resources/meta-sr/character/符玄/data.json | 4 +-- resources/meta-sr/character/素裳/data.json | 26 ++++++++++++-- .../存护/她已闭上双眼/data.json | 2 +- .../今日亦是和平的一日/data.json | 2 +- resources/meta-sr/weapon/毁灭/calc.js | 16 +++++++-- .../毁灭/比阳光更明亮的/data.json | 2 +- resources/meta/character/八重神子/calc.js | 1 + .../meta/character/八重神子/calc_auto.js | 1 + .../meta/character/提纳里/calc_auto.js | 9 ++--- resources/meta/character/林尼/calc.js | 18 +++++++--- resources/meta/character/烟绯/calc.js | 4 +++ resources/meta/character/琳妮特/calc.js | 34 ++++++++++++++++++ resources/meta/character/赛诺/calc.js | 1 + resources/meta/weapon/catalyst/calc.js | 6 ++-- resources/meta/weapon/polearm/calc.js | 6 ++-- resources/meta/weapon/sword/calc.js | 10 +++--- 38 files changed, 124 insertions(+), 43 deletions(-) rename resources/meta-sr/character/{丹恒饮月 => 丹恒•饮月}/data.json (98%) rename resources/meta-sr/character/{丹恒饮月 => 丹恒•饮月}/imgs/cons-1.webp (100%) rename resources/meta-sr/character/{丹恒饮月 => 丹恒•饮月}/imgs/cons-2.webp (100%) rename resources/meta-sr/character/{丹恒饮月 => 丹恒•饮月}/imgs/cons-4.webp (100%) rename resources/meta-sr/character/{丹恒饮月 => 丹恒•饮月}/imgs/cons-6.webp (100%) rename resources/meta-sr/character/{丹恒饮月 => 丹恒•饮月}/imgs/face.webp (100%) rename resources/meta-sr/character/{丹恒饮月 => 丹恒•饮月}/imgs/preview.webp (100%) rename resources/meta-sr/character/{丹恒饮月 => 丹恒•饮月}/imgs/splash.webp (100%) rename resources/meta-sr/character/{丹恒饮月 => 丹恒•饮月}/imgs/talent-a.webp (100%) create mode 100644 resources/meta-sr/character/丹恒•饮月/imgs/talent-a2.webp rename resources/meta-sr/character/{丹恒饮月 => 丹恒•饮月}/imgs/talent-e.webp (100%) create mode 100644 resources/meta-sr/character/丹恒•饮月/imgs/talent-e2.webp rename resources/meta-sr/character/{丹恒饮月 => 丹恒•饮月}/imgs/talent-q.webp (100%) rename resources/meta-sr/character/{丹恒饮月 => 丹恒•饮月}/imgs/talent-t.webp (100%) rename resources/meta-sr/character/{丹恒饮月 => 丹恒•饮月}/imgs/talent-z.webp (100%) rename resources/meta-sr/character/{丹恒饮月 => 丹恒•饮月}/imgs/tree-1.webp (100%) rename resources/meta-sr/character/{丹恒饮月 => 丹恒•饮月}/imgs/tree-2.webp (100%) rename resources/meta-sr/character/{丹恒饮月 => 丹恒•饮月}/imgs/tree-3.webp (100%) create mode 100644 resources/meta/character/琳妮特/calc.js diff --git a/apps/wiki/CalendarSr.js b/apps/wiki/CalendarSr.js index d05077ed..f90a320b 100644 --- a/apps/wiki/CalendarSr.js +++ b/apps/wiki/CalendarSr.js @@ -15,7 +15,7 @@ const ignoreIds = [ 171 // 《崩坏：星穹铁道》社区专属工具一览 ] -const ignoreReg = /(更新概览|游戏优化|内容专题页|版本更新说明|循星归程|调研|防沉迷|米游社|专项意见|更新修复与优化|问卷调查|版本更新通知|更新时间说明|预下载功能|周边限时|周边上新|角色演示|角色PV|bilibili)/ +const ignoreReg = /(更新概览|游戏优化|优化说明|内容专题页|版本更新说明|循星归程|调研|防沉迷|米游社|专项意见|更新修复与优化|问卷调查|版本更新通知|更新时间说明|预下载功能|周边限时|周边上新|角色演示|角色PV|版本PV|动画短片|bilibili|激励计划|调整说明|攻略征集)/ let CalSr = { async reqCalData () { @@ -38,7 +38,7 @@ let CalSr = { 1.1: '2022-06-07 11:00:00' } lodash.forEach(detailData.data.list, (ds) => { - let vRet = /(\d\.\d)版本\S*更新概览/.exec(ds.title) + let vRet = /(\d\.\d)版本\S*更新(概览|说明)/.exec(ds.title) if (vRet && vRet[1]) { let content = /■(?:更新时间)\s*([^■]+)(?:■|$)/.exec(ds.content) if (content && content[1]) { @@ -229,7 +229,7 @@ let CalSr = { let versionStartTime lodash.forEach(listData.data.list[0].list, (ds) => { - if (/版本更新概览/.test(ds.title)) { + if (/版本更新(概览|说明)/.test(ds.title)) { versionStartTime = ds.start_time } }) diff --git a/resources/meta-sr/artifact/artis-mark.js b/resources/meta-sr/artifact/artis-mark.js index d52ab351..9cbfc0d5 100644 --- a/resources/meta-sr/artifact/artis-mark.js +++ b/resources/meta-sr/artifact/artis-mark.js @@ -3,6 +3,7 @@ * 如character/${name}/artis.js下有角色自定义规则优先使用自定义 */ export const usefulAttr = { + '丹恒•饮月': { hp: 0, atk: 75, def: 0, speed: 100, cpct: 100, cdmg: 100, stance: 0, heal: 0, recharge: 50, effPct: 0, effDef: 0, dmg: 100 }, 卡芙卡: { hp: 0, atk: 100, def: 0, speed: 100, cpct: 0, cdmg: 0, stance: 50, heal: 0, recharge: 50, effPct: 75, effDef: 0, dmg: 100 }, 刃: { hp: 100, atk: 50, def: 0, speed: 100, cpct: 100, cdmg: 100, stance: 0, heal: 0, recharge: 50, effPct: 0, effDef: 0, dmg: 100 }, 罗刹: { hp: 0, atk: 100, def: 0, speed: 100, cpct: 100, cdmg: 100, stance: 0, heal: 100, recharge: 100, effPct: 0, effDef: 50, dmg: 100 }, diff --git a/resources/meta-sr/character/data.json b/resources/meta-sr/character/data.json index e9b72dbd..5dda6b26 100644 --- a/resources/meta-sr/character/data.json +++ b/resources/meta-sr/character/data.json @@ -759,7 +759,7 @@ "id": 1213, "key": "danhengil", "name": "丹恒•饮月", - "name2": "丹恒饮月", + "name2": "丹恒•饮月", "abbr": "饮月君", "star": 5, "elem": "虚数", diff --git a/resources/meta-sr/character/丹恒饮月/data.json b/resources/meta-sr/character/丹恒•饮月/data.json similarity index 98% rename from resources/meta-sr/character/丹恒饮月/data.json rename to resources/meta-sr/character/丹恒•饮月/data.json index 7c305fbf..cdb12b21 100644 --- a/resources/meta-sr/character/丹恒饮月/data.json +++ b/resources/meta-sr/character/丹恒•饮月/data.json @@ -2,7 +2,7 @@ "id": 1213, "key": "danhengil", "name": "丹恒•饮月", - "name2": "丹恒饮月", + "name2": "丹恒•饮月", "abbr": "饮月君", "star": 5, "elem": "虚数", @@ -76,7 +76,7 @@ "name": "龙力自在", "type": "战技", "tag": "强化", - "desc": "使普攻的效果得到强化，最多可连续强化3次，施放本技能不消耗战技点且不视为使用战技。
强化1次，【泽芝】变为【瞬华】。
强化2次，【泽芝】变为【天矢阴】。
强化3次，【泽芝】变为【盘拏耀跃】。
施放【天矢阴】或【盘拏耀跃】时，从第4段攻击开始每段攻击前获得1层【叱咤】，使丹恒•饮月的暴击伤害提高$1[f1]%，该效果最多叠加4层，持续至自身回合结束。", + "desc": "使普攻的效果得到强化，最多可连续强化3次，施放本技能不消耗战技点且不视为使用战技。
强化1次，【泽芝】变为【瞬华】。
强化2次，【泽芝】变为【天矢阴】。
强化3次，【泽芝】变为【盘拏耀跃】。
施放【天矢阴】或【盘拏耀跃】时，从第4段攻击开始每段攻击前获得1层【叱咤】，使丹恒•饮月的暴击伤害提高$1[i]%，该效果最多叠加4层，持续至自身回合结束。", "tables": { "1": { "name": "暴击伤害提高", @@ -157,7 +157,7 @@ "name": "亢心", "type": "天赋", "tag": "强化", - "desc": "丹恒•饮月施放每段攻击后获得1层【亢心】，使自身造成的伤害提高$1[f1]%，该效果可以叠加6层，持续至自身回合结束。", + "desc": "丹恒•饮月施放每段攻击后获得1层【亢心】，使自身造成的伤害提高$1[i]%，该效果可以叠加6层，持续至自身回合结束。", "tables": { "1": { "name": "伤害提高", diff --git a/resources/meta-sr/character/丹恒饮月/imgs/cons-1.webp b/resources/meta-sr/character/丹恒•饮月/imgs/cons-1.webp similarity index 100% rename from resources/meta-sr/character/丹恒饮月/imgs/cons-1.webp rename to resources/meta-sr/character/丹恒•饮月/imgs/cons-1.webp diff --git a/resources/meta-sr/character/丹恒饮月/imgs/cons-2.webp b/resources/meta-sr/character/丹恒•饮月/imgs/cons-2.webp similarity index 100% rename from resources/meta-sr/character/丹恒饮月/imgs/cons-2.webp rename to resources/meta-sr/character/丹恒•饮月/imgs/cons-2.webp diff --git a/resources/meta-sr/character/丹恒饮月/imgs/cons-4.webp b/resources/meta-sr/character/丹恒•饮月/imgs/cons-4.webp similarity index 100% rename from resources/meta-sr/character/丹恒饮月/imgs/cons-4.webp rename to resources/meta-sr/character/丹恒•饮月/imgs/cons-4.webp diff --git a/resources/meta-sr/character/丹恒饮月/imgs/cons-6.webp b/resources/meta-sr/character/丹恒•饮月/imgs/cons-6.webp similarity index 100% rename from resources/meta-sr/character/丹恒饮月/imgs/cons-6.webp rename to resources/meta-sr/character/丹恒•饮月/imgs/cons-6.webp diff --git a/resources/meta-sr/character/丹恒饮月/imgs/face.webp b/resources/meta-sr/character/丹恒•饮月/imgs/face.webp similarity index 100% rename from resources/meta-sr/character/丹恒饮月/imgs/face.webp rename to resources/meta-sr/character/丹恒•饮月/imgs/face.webp diff --git a/resources/meta-sr/character/丹恒饮月/imgs/preview.webp b/resources/meta-sr/character/丹恒•饮月/imgs/preview.webp similarity index 100% rename from resources/meta-sr/character/丹恒饮月/imgs/preview.webp rename to resources/meta-sr/character/丹恒•饮月/imgs/preview.webp diff --git a/resources/meta-sr/character/丹恒饮月/imgs/splash.webp b/resources/meta-sr/character/丹恒•饮月/imgs/splash.webp similarity index 100% rename from resources/meta-sr/character/丹恒饮月/imgs/splash.webp rename to resources/meta-sr/character/丹恒•饮月/imgs/splash.webp diff --git a/resources/meta-sr/character/丹恒饮月/imgs/talent-a.webp b/resources/meta-sr/character/丹恒•饮月/imgs/talent-a.webp similarity index 100% rename from resources/meta-sr/character/丹恒饮月/imgs/talent-a.webp rename to resources/meta-sr/character/丹恒•饮月/imgs/talent-a.webp diff --git a/resources/meta-sr/character/丹恒•饮月/imgs/talent-a2.webp b/resources/meta-sr/character/丹恒•饮月/imgs/talent-a2.webp new file mode 100644 index 0000000000000000000000000000000000000000..64d0177310c9817b383ac7e6193e13103a2944c9 GIT binary patch literal 13038 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 literal 0 HcmV?d00001 diff --git a/resources/meta-sr/character/丹恒饮月/imgs/talent-e.webp b/resources/meta-sr/character/丹恒•饮月/imgs/talent-e.webp similarity index 100% rename from resources/meta-sr/character/丹恒饮月/imgs/talent-e.webp rename to resources/meta-sr/character/丹恒•饮月/imgs/talent-e.webp diff --git a/resources/meta-sr/character/丹恒•饮月/imgs/talent-e2.webp b/resources/meta-sr/character/丹恒•饮月/imgs/talent-e2.webp new file mode 100644 index 0000000000000000000000000000000000000000..fa7ebe24d613309413e4f72ad7d6766c94970480 GIT binary patch literal 5434 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�--CVG*3z2wv_k)M^j-m?UV1C()KWgNQ;=!cVO3;<&?R$XHjPooBR&)^RP-te)>o&Q9!UHBz zYXwzIzI^oA^&L$A`@g?!4+ctdWu`y;<LG5u z>52vxCEXqz0kXI4xgwA(mc!*dqsfvCgWB#9dYYI@MeTM_Fc1ms%>8v1>*atl(?k0Q z=ket`8%)iV_Uivd23AlwAS?&~01zqwodGJ60EYko001SV09#nJTkSuHf3W?W-Wl~D z_DB4WGDwqrhwKN@KO?_x|GxV;bE^IzeSv-<{A>Bg;}`9p_%2|;0r{Ga%mpYLD){&s(={DA)f?(^rL^#9@i zV!wa?0Y8ubE&kX2oAz`2r~hB8KVhG-9>u?{X{3Ttopa%WbBB8p=vHq&dqxGlR8M=v z^pN`H`c@e&jHlX2|q;5*PM_zmlo{+?aXN2{(-K zTWf;(VZdNi&?T1@NQruPb72jfxT1NR>@?L6nO^@{4RA{w?$AF{*scX2={Pa#?wV5*IS%tQ)Ws!Jqfzes`N_)l9x*mf!tBE@14tfO@n@3ZRAH*3x8H z6w%^;0k^fqQ-FV3emmQ#KIH&M;@^)E=+aLn1vY9IKs)05?kyZ-HX8Xit^2L#>yvvL zrNG~uzP9lnfZO?zX-oW(d8tLMNu@JvbE>B5K5R~)N`G$9e`ew0pM5<}f>Th?>0-Eu zuTGFDpvJJjF*pu~@#$#wLaE*jU((MSn{o=pFgu!IJ61~-2fkA>=~d127z%dh*xob$ z{$=l+IUw_n1}GK}+`bYAZFyiyWMg1Cy-Lo)5rsNDz@9~>ci@+YXNQMdRzz!X;C5wg zrz!r-HJ)$B3@x40gk+RJvAtDd6W5eX8QxFLMoI?QBFSBQyA)hKaSfXNA6gUCKkHz}dkOhF^rx|5SszA_ ze4GMXC#MvMa4CRQoWKNy^N6NgQ|5pGySU3K zEKmcGFE~3Rxtu<@3@dr1S2!Yg>AS{&%U1j0pzzv)hA!h0t-#Cw{}v0d z{q6-P?;j!mInDZjn9Y#TsE+kL?&(S4$BJ)N?^6}F+qs16CAe$|u~a2d+4Td?C+JDc z1W3?zpJMt71Re{e*xrW{iIvVY8A%l3BIL_gaFpg+jDHceLfifH z8N=|{Hl;%HyMzy=qH_h9X(5<0d*#Z@@xDbHQ{PMmFf~QgY9X)|G_hh!{;L(L`2Iy* zZzj%Sar0?+8_0>z3PO2GaD>f@-*(b->7103WnN+j`Xk1ohPG=@`f9R^6oCxm*V+=J z6PS{>2fEV07qtb*Xx^?^uR6+ak1yaG^(ri%O(YpNI&@rls71uwbKyAqc%#E)GW-8P>=06 zdhEbw`=AK4pdmpj?l2-hoA{8dbmmI(<0jz>xRoD8ebtA>i}5OD&vj^9&;QU+VPk?8 zdHrg&h>2X1u-v&sFL_JM9aJR6n0v-ySAD~pyFOR@lg!*2`*7TEfB*5G@x;<8j&QB2AM?+DTg^_AGVEHIfwoac#(ku*L_)9SJ z5v#Ot;-;D{d-BLOgWv%hBRUyg-wJudL(n%Pj60`CEaUyn|MraHEt1_bOZ;-QYq1+RmO%Z z0Ev!NR3F`^gl)^`@K#D#V3n>W8exui|1R~I&uc$n!ZbEmO}nt$qdK80D0c8=a07?N zKA8CI#TXLWMTPSjq>~Q)h7I){GgO|n?U~0K87CTfAPYfo@r@7xhv^^{?N&h+T=9)_ zd)b#g)OJpotOpa4_?k-~jYNOwW?MD5Bh2`eGKxC&b7S!#y{a(a5hewDpb~%p06%JmkpKVy literal 0 HcmV?d00001 diff --git a/resources/meta-sr/character/丹恒饮月/imgs/talent-q.webp b/resources/meta-sr/character/丹恒•饮月/imgs/talent-q.webp similarity index 100% rename from resources/meta-sr/character/丹恒饮月/imgs/talent-q.webp rename to resources/meta-sr/character/丹恒•饮月/imgs/talent-q.webp diff --git a/resources/meta-sr/character/丹恒饮月/imgs/talent-t.webp b/resources/meta-sr/character/丹恒•饮月/imgs/talent-t.webp similarity index 100% rename from resources/meta-sr/character/丹恒饮月/imgs/talent-t.webp rename to resources/meta-sr/character/丹恒•饮月/imgs/talent-t.webp diff --git a/resources/meta-sr/character/丹恒饮月/imgs/talent-z.webp b/resources/meta-sr/character/丹恒•饮月/imgs/talent-z.webp similarity index 100% rename from resources/meta-sr/character/丹恒饮月/imgs/talent-z.webp rename to resources/meta-sr/character/丹恒•饮月/imgs/talent-z.webp diff --git a/resources/meta-sr/character/丹恒饮月/imgs/tree-1.webp b/resources/meta-sr/character/丹恒•饮月/imgs/tree-1.webp similarity index 100% rename from resources/meta-sr/character/丹恒饮月/imgs/tree-1.webp rename to resources/meta-sr/character/丹恒•饮月/imgs/tree-1.webp diff --git a/resources/meta-sr/character/丹恒饮月/imgs/tree-2.webp b/resources/meta-sr/character/丹恒•饮月/imgs/tree-2.webp similarity index 100% rename from resources/meta-sr/character/丹恒饮月/imgs/tree-2.webp rename to resources/meta-sr/character/丹恒•饮月/imgs/tree-2.webp diff --git a/resources/meta-sr/character/丹恒饮月/imgs/tree-3.webp b/resources/meta-sr/character/丹恒•饮月/imgs/tree-3.webp similarity index 100% rename from resources/meta-sr/character/丹恒饮月/imgs/tree-3.webp rename to resources/meta-sr/character/丹恒•饮月/imgs/tree-3.webp diff --git a/resources/meta-sr/character/玲可/data.json b/resources/meta-sr/character/玲可/data.json index bcb16ed2..3ce63c62 100644 --- a/resources/meta-sr/character/玲可/data.json +++ b/resources/meta-sr/character/玲可/data.json @@ -72,7 +72,7 @@ "name": "盐渍野营罐头", "type": "战技", "tag": "回复", - "desc": "为指定我方单体附上【求生反应】，提高等同于玲可$1[f1]%生命上限+$2[i]的生命上限，若该目标为「毁灭」或「存护」命途，被敌方攻击的概率大幅提高，【求生反应】持续2回合。
使该目标回复等同于玲可$3[f1]%生命上限+$4[i]的生命值。", + "desc": "为指定我方单体附上【求生反应】，提高等同于玲可$1[i]%生命上限+$2[i]的生命上限，若该目标为「毁灭」或「存护」命途，被敌方攻击的概率大幅提高，【求生反应】持续2回合。
使该目标回复等同于玲可$3[i]%生命上限+$4[i]的生命值。", "tables": { "1": { "name": "治疗·百分比生命", @@ -165,7 +165,7 @@ "name": "雪原急救方案", "type": "终结技", "tag": "回复", - "desc": "解除我方全体的1个负面效果，立即为我方全体回复等同于玲可$1[f1]%生命上限+$2[i]的生命值。", + "desc": "解除我方全体的1个负面效果，立即为我方全体回复等同于玲可$1[i]%生命上限+$2[i]的生命值。", "tables": { "1": { "name": "治疗·百分比生命", @@ -216,7 +216,7 @@ "name": "户外生存经验", "type": "天赋", "tag": "回复", - "desc": "施放战技或终结技时，使我方目标获得2回合的持续治疗效果，目标每回合开始时回复等同于玲可$1[f1]%生命上限+$2[i]的生命值。若该目标持有【求生反应】，则持续治疗效果额外回复等同于玲可$3[f1]%生命上限+$4[i]的生命值。", + "desc": "施放战技或终结技时，使我方目标获得2回合的持续治疗效果，目标每回合开始时回复等同于玲可$1[i]%生命上限+$2[i]的生命值。若该目标持有【求生反应】，则持续治疗效果额外回复等同于玲可$3[i]%生命上限+$4[i]的生命值。", "tables": { "1": { "name": "治疗·百分比生命", @@ -328,7 +328,7 @@ }, "4": { "name": "露营篝火的薄暮", - "desc": "获得【求生反应】时，使该目标攻击力提高，提高数值等同于玲可#1[f1]%生命上限的攻击力，持续1回合。" + "desc": "获得【求生反应】时，使该目标攻击力提高，提高数值等同于玲可3%生命上限的攻击力，持续1回合。" }, "5": { "name": "极光红茶的新夜", @@ -336,7 +336,7 @@ }, "6": { "name": "测绘图纸的黎明", - "desc": "【求生反应】的生命上限提高效果额外提高，提高数值等同于玲可#1[f1]%的生命上限，并使其效果抵抗提高30.0%。" + "desc": "【求生反应】的生命上限提高效果额外提高，提高数值等同于玲可6%的生命上限，并使其效果抵抗提高30.0%。" } }, "attr": { diff --git a/resources/meta-sr/character/符玄/data.json b/resources/meta-sr/character/符玄/data.json index 237d78e2..ceed8afa 100644 --- a/resources/meta-sr/character/符玄/data.json +++ b/resources/meta-sr/character/符玄/data.json @@ -72,7 +72,7 @@ "name": "太微行棋，灵台示影", "type": "战技", "tag": "防御", - "desc": "开启【穷观阵】，使符玄队友所承受的未受护盾抵挡之前的伤害的65.0%分摊给符玄，持续3回合。
处于【穷观阵】的我方全体获得【鉴知】。【鉴知】状态下的我方目标生命上限提高，提高数值等同于符玄生命上限的$1[f1]%，暴击率提高$2[f1]%。
当符玄陷入无法战斗状态时，【穷观阵】也会被解除。", + "desc": "开启【穷观阵】，使符玄队友所承受的未受护盾抵挡之前的伤害的65.0%分摊给符玄，持续3回合。
处于【穷观阵】的我方全体获得【鉴知】。【鉴知】状态下的我方目标生命上限提高，提高数值等同于符玄生命上限的$1[i]%，暴击率提高$2[i]%。
当符玄陷入无法战斗状态时，【穷观阵】也会被解除。", "tables": { "1": { "name": "生命上限提高", @@ -153,7 +153,7 @@ "name": "乾清坤夷，否极泰来", "type": "天赋", "tag": "回复", - "desc": "当符玄处于可战斗状态时，为我方全体附加【避厄】。【避厄】状态下的我方目标受到的伤害降低$1[f1]%。
当符玄当前生命值百分比小于等于50.0%时触发生命回复，使自身回复等同于已损失生命值$2[i]%的生命值，受到致命攻击时无法触发该效果。该效果初始拥有1次触发次数，最多可拥有2次触发次数。", + "desc": "当符玄处于可战斗状态时，为我方全体附加【避厄】。【避厄】状态下的我方目标受到的伤害降低$1[i]%。
当符玄当前生命值百分比小于等于50.0%时触发生命回复，使自身回复等同于已损失生命值$2[i]%的生命值，受到致命攻击时无法触发该效果。该效果初始拥有1次触发次数，最多可拥有2次触发次数。", "tables": { "1": { "name": "受到的伤害降低", diff --git a/resources/meta-sr/character/素裳/data.json b/resources/meta-sr/character/素裳/data.json index 0b110a33..343cdc07 100644 --- a/resources/meta-sr/character/素裳/data.json +++ b/resources/meta-sr/character/素裳/data.json @@ -173,8 +173,30 @@ "name": "游刃若水", "type": "天赋", "tag": "强化", - "desc": "当场上有敌方目标的弱点被击破，素裳的速度提高#1[f2]%，持续2回合。", - "tables": {} + "desc": "当场上有敌方目标的弱点被击破，素裳的速度提高$1[i]%，持续2回合。", + "tables": { + "1":{ + "name":"速度提高", + "isSame":false, + "values":[ + 0.15, + 0.155, + 0.16, + 0.165, + 0.17, + 0.175, + 0.18125, + 0.1875, + 0.19375, + 0.2, + 0.205, + 0.21, + 0.215, + 0.22, + 0.225 + ] + } + } }, "z": { "id": 663042, diff --git a/resources/meta-sr/weapon/存护/她已闭上双眼/data.json b/resources/meta-sr/weapon/存护/她已闭上双眼/data.json index a4b58b70..16b3d04f 100644 --- a/resources/meta-sr/weapon/存护/她已闭上双眼/data.json +++ b/resources/meta-sr/weapon/存护/她已闭上双眼/data.json @@ -113,7 +113,7 @@ "skill": { "id": 23011, "name": "视界", - "desc": "使装备者的生命上限提高$1[i]%，能量恢复效率提高$2[i]%。当装备者的生命值降低时，使我方全体造成的伤害提高$3[f1]%，持续2回合。
每个波次开始时，为我方全体回复等同于各自已损失生命值$4[i]%的生命值。", + "desc": "使装备者的生命上限提高$1[i]%，能量恢复效率提高$2[i]%。当装备者的生命值降低时，使我方全体造成的伤害提高$3[i]%，持续2回合。
每个波次开始时，为我方全体回复等同于各自已损失生命值$4[i]%的生命值。", "tables": { "1": [ 24, diff --git a/resources/meta-sr/weapon/智识/今日亦是和平的一日/data.json b/resources/meta-sr/weapon/智识/今日亦是和平的一日/data.json index f91f8270..8fad3b3b 100644 --- a/resources/meta-sr/weapon/智识/今日亦是和平的一日/data.json +++ b/resources/meta-sr/weapon/智识/今日亦是和平的一日/data.json @@ -113,7 +113,7 @@ "skill": { "id": 21034, "name": "风雨将至", - "desc": "进入战斗后，根据装备者的能量上限，提高装备者造成的伤害：每点能量提高$1[f2]%，最多计入160点。", + "desc": "进入战斗后，根据装备者的能量上限，提高装备者造成的伤害：每点能量提高$1[i]%，最多计入160点。", "tables": { "1": [ 0.19999999, diff --git a/resources/meta-sr/weapon/毁灭/calc.js b/resources/meta-sr/weapon/毁灭/calc.js index 3e798935..e65bd8d6 100644 --- a/resources/meta-sr/weapon/毁灭/calc.js +++ b/resources/meta-sr/weapon/毁灭/calc.js @@ -45,10 +45,22 @@ export default function (staticIdx, keyIdx) { } } }], - 到不了的彼岸:[ + 到不了的彼岸: [ staticIdx(1, 'cpct'), staticIdx(2, 'hpPct'), keyIdx('受到攻击或装备者消耗自身生命值，伤害提高[dmg]%', 'dmg', 3) + ], + 比阳光更明亮的: [ + staticIdx(1, 'cpct'), + (tables) => { + return { + title: '2层Buff提高攻击力[atkPct]%，能量恢复效率提高[recharge]%', + data: { + atkPct: tables[2] * 2, + recharge: tables[3] * 2 + } + } + } ] } -} \ No newline at end of file +} diff --git a/resources/meta-sr/weapon/毁灭/比阳光更明亮的/data.json b/resources/meta-sr/weapon/毁灭/比阳光更明亮的/data.json index 83654f69..e98a9973 100644 --- a/resources/meta-sr/weapon/毁灭/比阳光更明亮的/data.json +++ b/resources/meta-sr/weapon/毁灭/比阳光更明亮的/data.json @@ -113,7 +113,7 @@ "skill": { "id": 23015, "name": "抵死", - "desc": "使装备者的暴击率提高$1[i]%。当装备者施放普攻时，获得1层【龙吟】，持续2回合。每层【龙吟】使装备者的攻击力提高$2[i]%，能量恢复效率提高$3[f1]%。【龙吟】最多叠加2层。", + "desc": "使装备者的暴击率提高$1[i]%。当装备者施放普攻时，获得1层【龙吟】，持续2回合。每层【龙吟】使装备者的攻击力提高$2[i]%，能量恢复效率提高$3[i]%。【龙吟】最多叠加2层。", "tables": { "1": [ 18, diff --git a/resources/meta/character/八重神子/calc.js b/resources/meta/character/八重神子/calc.js index 752daa3f..9334de25 100644 --- a/resources/meta/character/八重神子/calc.js +++ b/resources/meta/character/八重神子/calc.js @@ -36,6 +36,7 @@ export const defDmgKey = 'e' export const buffs = [{ title: '被动天赋：基于元素精通提高杀生樱伤害[eDmg]%', + sort: 5, data: { eDmg: ({ attr, calc }) => calc(attr.mastery) * 0.15 } diff --git a/resources/meta/character/八重神子/calc_auto.js b/resources/meta/character/八重神子/calc_auto.js index 5ad13d93..5fc0d793 100644 --- a/resources/meta/character/八重神子/calc_auto.js +++ b/resources/meta/character/八重神子/calc_auto.js @@ -176,6 +176,7 @@ export const buffs = [{ } }, { title: '被动天赋：基于元素精通提高杀生樱伤害[eDmg]%', + sort: 5, data: { eDmg: ({ attr, calc }) => calc(attr.mastery) * 0.15 } diff --git a/resources/meta/character/提纳里/calc_auto.js b/resources/meta/character/提纳里/calc_auto.js index 022469bf..b7390481 100644 --- a/resources/meta/character/提纳里/calc_auto.js +++ b/resources/meta/character/提纳里/calc_auto.js @@ -106,9 +106,8 @@ export const buffs = [{ cons: 6 }, { check: ({ cons, params }) => cons <= 1 && params.team === true, - title: '精1苍古0命万叶：获得[dmg]%增伤(苍古普攻16增伤)，增加[atkPct]%攻击', + title: '精1苍古0命万叶：苍古普攻16增伤，增加[atkPct]%攻击', data: { - dmg: 40, aDmg: 16, a2Dmg: 16, a3Dmg: 16, @@ -116,9 +115,8 @@ export const buffs = [{ } }, { check: ({ cons, params }) => ((cons < 6 && cons > 1) && params.team === true), - title: '精1苍古2命万叶：获得[dmg]%增伤(苍古普攻16增伤)，增加[atkPct]%攻击,精通[mastery]', + title: '精1苍古2命万叶：苍古普攻16增伤，增加[atkPct]%攻击,精通[mastery]', data: { - dmg: 40, aDmg: 16, a2Dmg: 16, a3Dmg: 16, @@ -127,9 +125,8 @@ export const buffs = [{ } }, { check: ({ cons, params }) => (cons >= 6 && params.team === true), - title: '精5苍古6命万叶：获得[dmg]%增伤(苍古普攻32增伤)，增加[atkPct]%攻击,精通[mastery]', + title: '精5苍古6命万叶：苍古普攻32增伤，增加[atkPct]%攻击,精通[mastery]', data: { - dmg: 40, aDmg: 32, a2Dmg: 32, a3Dmg: 32, diff --git a/resources/meta/character/林尼/calc.js b/resources/meta/character/林尼/calc.js index ab8d74cb..66c4b629 100644 --- a/resources/meta/character/林尼/calc.js +++ b/resources/meta/character/林尼/calc.js @@ -4,7 +4,12 @@ export const details = [{ dmg: ({ talent }, dmg) => dmg(talent.a['隐具魔术箭伤害'], 'a2') }, { title: '礼花术弹伤害', - dmg: ({ talent }, dmg) => dmg(talent.a['礼花术弹伤害'], 'a2') + params: { catcathat: true }, + dmg: ({ talent, attr, calc }, { basic }) => { + const atk = calc(attr.atk) + const a2dmg = atk * 0.8 + atk * talent.a['礼花术弹伤害'] / 100 + return basic(a2dmg, 'a2') + } }, { title: '满层E伤害', dmg: ({ talent }, dmg) => { @@ -24,15 +29,18 @@ export const defDmgIdx = 0 export const mainAttr = 'atk,cpct,cdmg' export const buffs = [{ - title: '天赋-惊险演出：基于攻击力的80%，满蓄力重击伤害提高[a2Plus]', - data: { - a2Plus: ({ attr, calc }) => calc(attr.atk) * 0.8 - } + check: ({ params }) => params.catcathat === true, + title: '天赋-惊险演出：基于攻击力的80%，提高怪笑猫猫帽造成的伤害' }, { title: '天赋-完场喝彩：队伍有三名火元素角色时，对处于火元素影响下的敌人造成的伤害提升[dmg]%', data: { dmg: 100 } +}, { + title: '双火共鸣：攻击力提高[atkPct]%', + data: { + atkPct: 25 + } }, { title: '林尼2命：在场6秒后，暴击伤害提高60%', cons: 2, diff --git a/resources/meta/character/烟绯/calc.js b/resources/meta/character/烟绯/calc.js index 92d635da..d4f2b39b 100644 --- a/resources/meta/character/烟绯/calc.js +++ b/resources/meta/character/烟绯/calc.js @@ -9,6 +9,10 @@ export const details = [{ }, { title: 'E伤害', dmg: ({ talent }, dmg) => dmg(talent.e['技能伤害'], 'e') +}, { + title: '4命护盾量', + check: ({ cons }) => cons >= 4, + dmg: ({ attr, calc }, { shield }) => shield(calc(attr.hp) * 0.45) }] export const defDmgIdx = 1 export const mainAttr = 'atk,cpct,cdmg,mastery' diff --git a/resources/meta/character/琳妮特/calc.js b/resources/meta/character/琳妮特/calc.js new file mode 100644 index 00000000..7834d1f7 --- /dev/null +++ b/resources/meta/character/琳妮特/calc.js @@ -0,0 +1,34 @@ +export const details = [{ + title: 'E技能伤害', + dmg: ({ talent }, dmg) => dmg(talent.e['谜影突刺伤害'], 'e') +}, { + title: 'Q释放伤害', + dmg: ({ talent }, dmg) => dmg(talent.q['技能伤害'], 'q') +}, { + title: 'Q每段风伤', + dmg: ({ talent }, dmg) => dmg(talent.q['惊奇猫猫盒伤害'], 'q') +}, { + title: 'Q转化元素每段伤害', + dmg: ({ talent }, dmg) => dmg(talent.q['彩练术弹伤害'], 'q', 'phy')// 以物伤近似 +}] + +export const defDmgIdx = 0 +export const mainAttr = 'atk,cpct,cdmg' + +export const buffs = [{ + title: '天赋-巧施协同：开Q后，队伍中所有角色攻击力提升20%（按四色队计算）', + data: { + atkPct: 20 + } +}, { + title: '天赋-道具完备：Q发生元素转化后，Q造成伤害提升15%', + data: { + qDmg: 15 + } +}, { + title: '琳妮特6命：释放E突刺时，风元素伤害加成提升20%', + cons: 6, + data: { + dmg: 20 + } +}] diff --git a/resources/meta/character/赛诺/calc.js b/resources/meta/character/赛诺/calc.js index e6ee8b1b..991bcb58 100644 --- a/resources/meta/character/赛诺/calc.js +++ b/resources/meta/character/赛诺/calc.js @@ -103,6 +103,7 @@ export const buffs = [{ } }, { title: '赛诺被动：基于元素精通提升普攻[aPlus]点伤害值，渡荒之雷提升[_ePlus]伤害值', + sort: 5, data: { aPlus: ({ attr, calc }) => calc(attr.mastery) * 1.5, _ePlus: ({ attr, calc }) => calc(attr.mastery) * 2.5 diff --git a/resources/meta/weapon/catalyst/calc.js b/resources/meta/weapon/catalyst/calc.js index 435fafbf..b679c458 100644 --- a/resources/meta/weapon/catalyst/calc.js +++ b/resources/meta/weapon/catalyst/calc.js @@ -154,15 +154,15 @@ export default function (step, staticStep) { dmg: ({ attr, calc, refine }) => Math.min(Math.floor(calc(attr.hp) / 1000) * step(0.3, 0.2)[refine], step(12, 8)[refine]) } }, - 纯水流华: [staticStep('hpPct', 20), { + 纯水流华: [{ title: '生命之契提升[dmg]%全部元素伤害加成', data: { dmg: ({ attr, calc, refine }) => Math.min(Math.floor(calc(attr.hp) / 1000) * 2 * step(0.24)[refine], step(12)[refine]) - }, + } }, { title: '释放元素战技全部元素伤害加成提升[dmg]%', refine: { - dmg: step(8), + dmg: step(8) } }], 金流监督: [{ diff --git a/resources/meta/weapon/polearm/calc.js b/resources/meta/weapon/polearm/calc.js index c80ff3a9..afa3664b 100644 --- a/resources/meta/weapon/polearm/calc.js +++ b/resources/meta/weapon/polearm/calc.js @@ -76,14 +76,14 @@ export default function (step, staticStep) { shield: step(20) } }], - 和璞鸢: [staticStep(), { + 和璞鸢: { title: '满层攻击力提高[atkPct]%，伤害提升[dmg]%', refine: { atkPct: [3.2 * 7, 3.9 * 7, 4.6 * 7, 5.3 * 7, 6 * 7], dmg: step(12), phy: step(12) } - }], + }, 护摩之杖: [staticStep('hpPct', 20), { title: '角色生命低于50%时额外获得[atkPlus]攻击力', data: { @@ -152,6 +152,6 @@ export default function (step, staticStep) { dmg: step(7 * 3) } }, - 公义的酬报: false, + 公义的酬报: false } } diff --git a/resources/meta/weapon/sword/calc.js b/resources/meta/weapon/sword/calc.js index f8a866bd..cbdec0b3 100644 --- a/resources/meta/weapon/sword/calc.js +++ b/resources/meta/weapon/sword/calc.js @@ -200,15 +200,15 @@ export default function (step, staticStep) { rechargePlus: [16, 20, 24, 28, 32] } }, - 海渊终曲: [staticStep('hpPct', 20), { + 海渊终曲: { title: '释放元素战技攻击力提升[atkPct]%，生命之契提升[atkPlus]点攻击力', data: { atkPlus: ({ attr, calc, refine }) => Math.min(Math.floor(calc(attr.hp) * 0.25 * step(0.24)[refine] / 10, step(150))) }, refine: { - atkPct: step(12), + atkPct: step(12) } - }], + }, 船坞长剑: { title: '满层提高[mastery]点元素精通', refine: { @@ -224,8 +224,8 @@ export default function (step, staticStep) { }, { title: '满层下，元素战技与元素爆发命中敌人，其暴击率提升[eCpct]%', refine: { - eCpct: step(2), - qCpct: step(2) + eCpct: step(8), + qCpct: step(8) } }] }