From f80be5ffb4b0552ced8dc51aded6a914b6cbd3ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A5=BF=E7=93=9C=C2=B0?= Date: Tue, 3 Jun 2025 00:34:04 +0800 Subject: [PATCH] dev --- backend/core/basic/character.py | 2 + backend/core/basic/skill.py | 39 +++++- .../GF/priest_female/crusader_female.py | 123 ++++++++++++++++++ frontend/src/api/info/type.ts | 2 + .../Skill/components/SkillUP/index.tsx | 22 +++- frontend/src/pages/Character/Skill/index.vue | 1 + 6 files changed, 184 insertions(+), 5 deletions(-) diff --git a/backend/core/basic/character.py b/backend/core/basic/character.py index aeb25d7e..bdb4fbfe 100644 --- a/backend/core/basic/character.py +++ b/backend/core/basic/character.py @@ -441,6 +441,7 @@ class Character(CharacterProperty): info['name'] = self.nameCN info['weapons'] = self.武器选项 info['subweapons'] = self.副武器选项 + info['buffer'] = self.buffer if self.buffer: info['properties'] = self.防具精通属性 info['properties'] = self.输出类型选项 @@ -473,6 +474,7 @@ class Character(CharacterProperty): 'bind': skill.bind, 'hasVP': skill.hasVP, 'hasUP': skill.hasUP, + 'upType': skill.upType, 'vps': [{"name":i["name"],"desc":i["desc"]} for i in skill.vps], } ) diff --git a/backend/core/basic/skill.py b/backend/core/basic/skill.py index 37f5f49b..f1c2b936 100644 --- a/backend/core/basic/skill.py +++ b/backend/core/basic/skill.py @@ -77,6 +77,7 @@ class Skill: """是否有VP形态""" hasUP: bool = None """是否有技能强化""" + upType: Literal['damage','buff', 'heal'] = 'damage' vps: list = [] def __init__(self, char): @@ -234,6 +235,8 @@ class ActiveSkill(Skill): def setUP(self): if not self.hasUP: return + if self.char.buffer: + self.char.SetStatus(四维=40) if self.up == 1: if self.learnLv < 35: self.skillRation *= 1.6 @@ -341,6 +344,20 @@ class BuffSkill(Skill): CarryRatio: list[float] = [] """对C的额外增伤倍率""" + vp:int = 0 + """技能VP形态""" + up:int = 0 + """技能强化""" + def __init__(self, char): + super().__init__(char) + keys = [key.replace("data","") for key in dir(self) if key.startswith('data') and not key.startswith('plus')] + for i in keys: + power = getattr(self, f'power{i}', None) + if power is None: + setattr(self, f'power{i}', 1) + hit = getattr(self, f'hit{i}', None) + if hit is None: + setattr(self, f'hit{i}', 0) def getSkillCD(self,mode=None): return '-' @@ -355,6 +372,8 @@ class BuffSkill(Skill): value1 = 0 if lv > len(self.ATK) else self.ATK[lv] value2 = 0 if lv > len(self.STRINT) else self.STRINT[lv] value3 = 0 if lv > len(self.CarryRatio) else self.CarryRatio[lv] + self.setUP() + self.setVP() if self.char.适用属性 == '智力': value = 0 if lv > len(self.INT) else self.INT[lv] elif self.char.适用属性 == '力量': @@ -365,6 +384,25 @@ class BuffSkill(Skill): value = 0 if lv > len(self.Spirit) else self.Spirit[lv] return value,[value1,self.ATKRatio,self.ATKPLUS],[value2,self.STRINTRatio,self.STRINTPLUS],value3,self.getSkillCD(mode) + def setVP(self): + if self.vp == 1: + self.vp_1() + elif self.vp == 2: + self.vp_2() + + def setUP(self): + if not self.hasUP: + return + if self.char.buffer and self.up > 0: + self.char.SetStatus(四维=40) + if self.up == 1: + ... + elif self.up == 2: + if self.upType == 'damage': + self.cdReduce *= 1 - 0.15 + elif self.upType == 'heal': + self.cdReduce *= 1 - 0.1 + class PassiveBufferSkill(BuffSkill): type: str = 'passive' @@ -372,7 +410,6 @@ class PassiveBufferSkill(BuffSkill): class ActiveBufferSkill(BuffSkill): type: str = 'active' - def getWeaponCDRatio(self): weapon = self.char.charEquipInfo['武器'].equInfo if weapon is None or '传世武器' in weapon.categorize: diff --git a/backend/core/character/GF/priest_female/crusader_female.py b/backend/core/character/GF/priest_female/crusader_female.py index 3668844c..6430fcc5 100644 --- a/backend/core/character/GF/priest_female/crusader_female.py +++ b/backend/core/character/GF/priest_female/crusader_female.py @@ -47,6 +47,8 @@ class Skill2(ActiveBufferSkill): mp = [15, 154] buffer = True uuid = "0969cd4054d93da07708108c0cc1c4b5" + hasUP = True + upType = "heal" data0 = [0, 468, 1170, 1824, 2433, 3135, 3743, 4444, 5052, 5707, 6363, 7018, 7672, 8328, 8983, 9637, 10292, 10948, 11603, 12257, 12912, 13568, 14222, 14877, 15533, 16140, 16842, 17451, 18105, 18807, 19929, 21099, 21894, 22738, 23531, 24375, 25216, 26059, 26901, 27742, 28586, 29427, 30223, 31064, 31907, 32749, 33590, 34434, 35275, 36117, 36912, 37755, 38597, 39438, 40282, 41123, 41965, 42808, 43603, 44445, 45286, 46130, 46971, 47813, 48656, 49497, 50293, 51134, 51978, 52819, 53661]# noqa: E501 hit0 = 1 #TODO @@ -157,6 +159,7 @@ class Skill8(ActiveSkill): cd = 10 mp = [35, 392] uuid = "ade01c1d6afc8a05055225045e89fe49" + hasUP = False data0 = [0, 300, 300, 300, 300, 300, 300, 300, 300, 300, 300, 300, 300, 300, 300, 300, 300, 300, 300, 300, 300]# noqa: E501 hit0 = 1 #TODO @@ -202,6 +205,7 @@ class Skill10(ActiveBufferSkill): mp = [15, 154] buffer = True uuid = "547ab2b2bd860d3e37355a9cfbc1077c" + hasUP = True data0 = [0, 19695, 22833, 25973, 29113, 32252, 35392, 38532, 41670, 44810, 47950, 51090, 54230, 57368, 60508, 63648, 66788, 69928, 73066, 76206, 79346, 82486, 85626, 88766, 91904, 95044, 98184, 101323, 104463, 107602, 110741, 113881, 117021, 120161, 123299, 126439, 129579, 132719, 135859, 138999, 142137, 145277, 148417, 151557, 154697, 157835, 160975, 164115, 167255, 170394, 173533, 176673, 179812, 182952, 186092, 189230, 192370, 195510, 198650, 201790, 204930]# noqa: E501 hit0 = 1 #TODO @@ -283,6 +287,21 @@ class Skill14(ActiveBufferSkill): buffer = True buffType = "buffSub" uuid = "506e7ed77d517419a6e1c437a2cedb17" + hasVP = True + + hasVP = True + vps = [ + { + "name": "圣音协奏", + "desc": "施放时间减少", + "explain": "[勇气颂歌]
大天使米迦勒代替施放[勇气颂歌]
- 多段攻击间隔 -15%
- 多段攻击次数 +2次
- 总攻击力相同

[新生圣歌]
大天使乌列尔出现， 和光明骑士一起施放[新生颂歌]
- 每秒生命值恢复量 +35%" + }, + { + "name": "天堂进行曲", + "desc": "范围增加
移动速度增加
所受伤害减少", + "explain": "[勇气颂歌]
范围 +40%

施放过程中适用以下效果
- 移动速度 +200%
- 所受伤害减少量额外 +40%
- 所有状态异常抗性增加量额外 +30%

[新生圣歌]
大天使乌列尔出现， 和光明骑士一起施放[新生颂歌]
- 每秒生命值恢复量 +35%" + } + ] data0 = [0, 2069, 2399, 2727, 3059, 3389, 3717, 4049, 4379, 4707, 5039, 5367, 5697, 6029, 6357, 6687, 7019, 7347, 7677, 8007, 8337, 8667, 8997, 9327, 9656, 9987, 10317, 10646, 10977, 11306, 11636, 11967, 12296, 12626, 12957, 13286, 13616, 13946, 14276, 14606, 14936, 15266, 15594, 15926, 16256, 16584, 16916, 17244, 17574, 17906, 18234, 18564, 18893, 19224, 19554, 19883, 20214, 20544, 20873, 21204, 21533, 21863, 22194, 22523, 22853, 23183, 23513, 23843, 24173, 24503, 24831]# noqa: E501 hit0 = 1 #TODO @@ -309,6 +328,20 @@ class Skill15(ActiveSkill): mp = [150, 1260] uuid = "8ee0099656df08a0b39225f8a21d514b" + hasVP = True + vps = [ + { + "name": "天使佑光", + "desc": "范围增加
攻击时间减少
赋予[圣洁之光]强化增益", + "explain": "[神圣锁环]
拉贵尔在前方进行大范围攻击后， 为光明骑士赋予一定时间的惩恶天使增益效果
- 删除强制控制效果
- 攻击次数 : 10次
- 总攻击力相同
- 增益持续时间 : 15秒

[圣洁之光]
惩恶天使增益效果
- 范围 +25%
- 穿过敌人并移动200px后爆炸
- 光移动速度增加
- 击退光移动路径上的敌人

[圣光守护]
保护罩功能强化
- 保护罩持续时间 +50%
- 通过再次按下技能键进行爆炸攻击时， 保护罩不会消失
- 物理、 魔法伤害减少效果与[圣佑之阵]重叠" + }, + { + "name": "神圣召唤", + "desc": "变更为范围攻击
可以在颂歌过程中施放", + "explain": "[神圣锁环]
对周围的敌人施放[神圣锁环]
- 攻击范围 : 600px
- 范围内存在敌人时可以施放技能

可以在施放以下技能过程中施放该技能
- [勇气颂歌]
- [新生颂歌]

[圣光守护]
保护罩功能强化
- 保护罩持续时间 +50%
- 通过再次按下技能键进行爆炸攻击时， 保护罩不会消失
- 物理、 魔法伤害减少效果与[圣佑之阵]重叠" + } + ] + data0 = [0, 368, 405, 443, 479, 516, 555, 593, 629, 666, 705, 741, 779, 816, 852, 891, 929, 965, 1002, 1041, 1079, 1115, 1152, 1191, 1227, 1265, 1302, 1338, 1377, 1415, 1451, 1488, 1527, 1565, 1601, 1638, 1676, 1713, 1751, 1788, 1824, 1863, 1901, 1937, 1974, 2012, 2049, 2087, 2124, 2160, 2199, 2237, 2274, 2310, 2348, 2387, 2423, 2460, 2498, 2535, 2573, 2610, 2646, 2685, 2723, 2760, 2796, 2834, 2873, 2909, 2946]# noqa: E501 hit0 = 13 @@ -343,6 +376,19 @@ class Skill17(ActiveSkill): cd = 18 mp = [160, 1344] uuid = "da6e37c1e3f0e8867f70007d89c239ff" + hasVP = True + vps = [ + { + "name": "奇迹之光", + "desc": "施放时间减少
变更为单次攻击
范围增加", + "explain": "[忏悔之雷]
直接施放最终闪电
- 删除多段闪电
- 总攻击力相同
- 最终闪电大小 +35%

[复苏之光]
大天使拉法尔降临， 和光明骑士一起施放[复苏之光]
- [复苏之光]有效范围变更为全地图
- [复苏之光]复活对象的生命值/魔法值恢复量 +15%" + }, + { + "name": "救赎之歌", + "desc": "攻击时间减少
可以在施放颂歌时使用", + "explain": "[忏悔之雷]
删除终结攻击， 多段攻击次数 +5次
- 总攻击力相同

可以在施放以下技能过程中施放该技能
- [勇气颂歌]
- [新生颂歌]

施放颂歌时， 雷米尔会进行闪电攻击
- 攻击范围 : 与[勇气颂歌]相同
- 多段攻击次数 : 10次
- 总攻击力相同

[复苏之光]
大天使拉法尔降临， 和光明骑士一起施放[复苏之光]
- [复苏之光]有效范围变更为全地图
- [复苏之光]复活对象的生命值/魔法值恢复量 +15%" + } + ] data0 = [0, 2289, 2523, 2753, 2987, 3219, 3452, 3684, 3915, 4148, 4380, 4613, 4845, 5076, 5309, 5543, 5775, 6008, 6239, 6471, 6704, 6936, 7169, 7400, 7632, 7865, 8099, 8331, 8562, 8795, 9027, 9260, 9492, 9723, 9956, 10188, 10421, 10655, 10886, 11118, 11351, 11583, 11816, 12047, 12279, 12512, 12744, 12977, 13208, 13442, 13674, 13907, 14139, 14370, 14603, 14835, 15068, 15300, 15531, 15764, 15998, 16230, 16463, 16694, 16926, 17159, 17391, 17624, 17855, 18087, 18320]# noqa: E501 hit0 = 5 @@ -362,6 +408,8 @@ class Skill18(ActiveSkill): cube = 2 mp = [200, 1680] uuid = "a6c8f69107f8c4f5d1a0c7a57d000290" + hasUP = False + hasVP = False def getSkillCD(self,mode=None): return 0 @@ -381,6 +429,20 @@ class Skill19(ActiveBufferSkill): damage = True uuid = "3829c15bf5f520c13998a3479ba0ce7b" + hasVP = True + vps = [ + { + "name": "十字庇护", + "desc": "范围增加
变更为单次攻击
附加眩晕效果
队员生命值和魔法值恢复量增加", + "explain": "[神光十字]
神光十字攻击强化
- 大小 +50%
- 生成神光十字时击退附近敌人
- 删除撞击攻击
- 总攻击力相同
- 冲击波攻击使敌人进入眩晕状态3秒

光之气息流出的裂痕功能强化
- 光杖地面裂痕使队友恢复20%的生命值和魔法值
- 光杖地面裂痕持续时间 +5秒" + }, + { + "name": "代理者的收割", + "desc": "施放时间减少
取消僵直
队员生命值和魔法值恢复量增加", + "explain": "[神光十字]
施放前僵直 -20%

可以强制中断转职技能的施放后僵直并施放 (觉醒技能除外)

光之气息流出的裂痕功能强化
- 光杖地面裂痕使队友恢复20%的生命值和魔法值
- 光杖地面裂痕持续时间 +5秒" + } + ] + data0 = [0, 18954, 20876, 22800, 24722, 26646, 28568, 30491, 32414, 34337, 36260, 38183, 40104, 42029, 43950, 45875, 47796, 49719, 51642, 53565, 55488, 57411, 59333, 61257, 63179, 65103, 67025, 68949, 70871, 72794, 74717, 76640, 78561, 80486, 82407, 84332, 86253, 88178, 90099, 92022, 93945, 95868, 97791, 99714, 101636, 103560, 105483, 107406, 109329, 111251, 113175, 115097, 117021, 118943, 120867, 122789, 124712, 126635, 128558, 130479, 132404, 134325, 136250, 138171, 140096, 142017, 143940, 145863, 147786, 149709, 151632]# noqa: E501 hit0 = 1 #TODO @@ -402,6 +464,8 @@ class Skill20(ActiveBufferSkill): cd = 40 mp = [350, 2940] uuid = "03bb5314ffd41e9458d67ef924fef38f" + hasUP = True + upType = "heal" # 虔诚信念 신실한 열정 @@ -464,12 +528,31 @@ class Skill23(ActiveSkill): mp = [400, 1000] uuid = "27bade584bb42fef68148d3a0b72bace" + hasVP = True + vps = [ + { + "name": "光之祈祷", + "desc": "可多次发动
范围增加
强化聚集敌人效果", + "explain": "[忏悔重击]
变更为可填充2次的技能
- 每次填充冷却时间 : 15秒
- 单次攻击力 -50%

神光十字攻击强化
- 光杖大小 +30%
- 即使是无法抓取的敌人也会被吸附过来
- 第二次挥击命中时， 引发光之爆炸
- 光之爆炸攻击力 : 第二次挥击攻击力的11%
- 总攻击力相同

[圣光天启]
满足以下条件时当前冷却时间减少1秒 (最多25秒)
- [圣光灌注] : 属性伤害量增加效果持续5秒时
- [虔诚信念] : 增益效果持续时间更新效果发动时
- [新生颂歌] : 对队友施加恢复效果时
- [圣光普照] : 对队友施加恢复效果时" + }, + { + "name": "命途终章", + "desc": "施放时间减少
取消僵直", + "explain": "[忏悔重击]
只进行第2次挥击攻击
- 不再吸附敌人
- 总攻击力相同

可以强制中断施放后僵直并施放转职技能 (觉醒技能除外)

[圣光天启]
满足以下条件时当前冷却时间减少1秒 (最多25秒)
- [圣光灌注] : 属性伤害量增加效果持续5秒时
- [虔诚信念] : 增益效果持续时间更新效果发动时
- [新生颂歌] : 对队友施加恢复效果时
- [圣光普照] : 对队友施加恢复效果时" + } + ] + data0 = [0, 16059, 17690, 19319, 20948, 22575, 24204, 25835, 27464, 29093, 30722, 32351, 33981, 35610, 37239, 38868, 40497, 42128, 43757, 45386, 47015, 48644, 50274, 51903, 53532, 55161, 56790, 58421, 60050, 61679, 63308, 64937, 66567, 68196, 69824, 71453, 73082, 74712, 76341, 77970, 79599, 81228, 82859, 84488, 86117, 87746, 89375, 91005, 92634, 94263, 95892]# noqa: E501 hit0 = 1 #TODO data1 = [0, 24089, 26532, 28977, 31421, 33864, 36308, 38753, 41196, 43641, 46083, 48527, 50972, 53415, 55860, 58302, 60747, 63191, 65636, 68079, 70521, 72966, 75410, 77855, 80298, 82742, 85185, 87630, 90074, 92519, 94961, 97404, 99849, 102293, 104738, 107180, 109625, 112068, 114513, 116957, 119399, 121844, 124287, 126732, 129176, 131619, 134063, 136508, 138951, 141396, 143838]# noqa: E501 hit1 = 1 #TODO + def effect(self, old, new): + if self.vp > 0: + self.associate = [{"type":"+cdCut","data":[0]+[25]*self.maxLv,"skills":["圣光天启"],"ratio":1}] + return super().effect(old, new) + # 圣洁之翼 대천사의 축복 # https://api.neople.co.kr/df/skills/0c1b401bb09241570d364420b3ba3fd7/04883563896fe1adac7505c6146b5f59?apikey=fdvit1Kj64EAJm0qfB3JEAD8FLExLDD0 class Skill24(ActiveBufferSkill): @@ -483,6 +566,20 @@ class Skill24(ActiveBufferSkill): cd = 50 mp = [860, 1500] uuid = "04883563896fe1adac7505c6146b5f59" + hasUP = True + hasVP = True + vps = [ + { + "name": "神明祝言", + "desc": "范围增加
攻击次数增加", + "explain": "[圣洁之翼]
以大天使的气息最大叠加的状态施放
- 爆炸范围 +40%

受到祝福的队友获得以下效果
- 生成光电护盾， 持续10秒
- 对周围的敌人造成光属性多段伤害
- 光电护盾的攻击力 : 爆炸攻击力的1%
- 总攻击力相同

[神之教诲]
增益持续效果强化
- 切换房间后效果也不会消失
- 增益效果持续时间 +2秒" + }, + { + "name": "吉布里尔的圣翼", + "desc": "追踪
可以再次跳跃
可以减少下降速度", + "explain": "[圣洁之翼]
删除追加输入技能键功能和爆炸攻击

受到祝福的状态下攻击时， 吉普莉尔发动大天使的审判
- 大天使的审判发动次数 : 总共10次
- 大天使的审判发动冷却时间 : 0.5秒
- 总攻击力相同

强化自身增益效果
- 在空中按跳跃键可再跳跃一次
- 在空中长按技能键时， 下降速度减少

[神之教诲]
增益持续效果强化
- 切换房间后效果也不会消失
- 增益效果持续时间 +2秒" + } + ] data0 = [0, 68789, 75767, 82745, 89723, 96704, 103682, 110660, 117638, 124616, 131597, 138575, 145553, 152531, 159509, 166488, 173468, 180446, 187424, 194402, 201381, 208359, 215339, 222317, 229295, 236274, 243252, 250230, 257210, 264188, 271167, 278145, 285123, 292103, 299081, 306060, 313038, 320016, 326994, 333975, 340953, 347931, 354909, 361887, 368868, 375846, 382824, 389802, 396780, 403760, 410739]# noqa: E501 hit0 = 1 @@ -520,6 +617,19 @@ class Skill26(ActiveBufferSkill): mp = [580, 4500] damage = True uuid = "5152480fdde81362575a488d4cec4af9" + hasVP = True + vps = [ + { + "name": "乌列尔的夙愿", + "desc": "范围增加
取消僵直
为队员赋予无敌效果", + "explain": "[圣佑之阵]
结界范围 +35%

可以强制中断结界生成后僵直并移动或施放技能

结界内的队友获得以下效果
- 进入无敌状态1.5秒
- 每次技能仅发动1次" + }, + { + "name": "崇高誓言", + "desc": "可以在其他动作中施放
强化自身速度增益
为队员赋予无敌效果", + "explain": "[圣佑之阵]
施放转职技能时可以发动 (觉醒技能除外)

结界持续时间变更为1.5秒

自身适用的攻击/移动/施放速度增加量 +200%

结界内的队友获得以下效果
- 进入无敌状态1.5秒
- 每次技能仅发动1次" + } + ] data0 = [0, 86713, 95510, 104307, 113104, 121901, 130698, 139495, 148292, 157089, 165887, 174683, 183481, 192277, 201075, 209871, 218669, 227465, 236263, 245059, 253857, 262653, 271451, 280248, 289045, 297842, 306639, 315436, 324233, 333030, 341827, 350624, 359421, 368218, 377016, 385812, 394610, 403406, 412204, 421000, 429798, 438594, 447392, 456188, 464986, 473782, 482580, 491377, 500174, 508971, 517768]# noqa: E501 hit0 = 1 #TODO @@ -537,6 +647,19 @@ class Skill27(ActiveBufferSkill): cd = 40 mp = [860, 1500] uuid = "2391a27457b5a8c6fa4b4670a91bdd11" + hasVP = True + vps = [ + { + "name": "光耀加身", + "desc": "施放时间减少
范围增加", + "explain": "[圣光普照]
施放时， 召唤米迦勒的圣光球
- 持续3秒， 向范围内的敌人与队友发射1次奇迹之光
- 奇迹之光命中的敌人与队友适用圣光普照效果
- 删除攻击个体限制， 删除仅为1名敌人时的伤害增幅功能

范围 +45%" + }, + { + "name": "米迦勒的奏鸣", + "desc": "施放时间减少
可以在施放颂歌时使用", + "explain": "[圣光普照]
施放时， 召唤米迦勒的圣光球
- 持续3秒， 向范围内的敌人与队友发射1次奇迹之光
- 奇迹之光命中的敌人与队友适用圣光普照效果
- 删除攻击个体限制， 删除仅为1名敌人时的伤害增幅功能

攻击和恢复次数上限 -50%
- 总攻击力/恢复量相同

可以在施放以下技能过程中施放该技能
- [勇气颂歌]
- [新生颂歌]" + } + ] data0 = [0, 8237, 9073, 9909, 10745, 11580, 12416, 13251, 14087, 14923, 15759, 16595, 17431, 18266, 19101, 19937, 20773, 21609, 22445, 23281, 24116, 24951, 25787, 26623, 27459, 28295, 29131, 29966, 30801, 31637, 32473, 33309, 34145, 34981, 35817, 36651, 37487, 38323, 39159, 39995, 40831, 41667, 42501, 43337, 44173, 45009, 45845, 46681, 47517, 48352, 49187]# noqa: E501 hit0 = 1 diff --git a/frontend/src/api/info/type.ts b/frontend/src/api/info/type.ts index 22e9d098..7ba13a57 100644 --- a/frontend/src/api/info/type.ts +++ b/frontend/src/api/info/type.ts @@ -24,6 +24,7 @@ export interface ICharacterInfo { role: string alter: string name: string + buffer: boolean equVersion: string equips: IEquipment[] properties: string[] @@ -89,6 +90,7 @@ export interface ISkill { name: string desc: string }[] + upType:'damage' |'heal'` } export interface ISuit { diff --git a/frontend/src/pages/Character/Skill/components/SkillUP/index.tsx b/frontend/src/pages/Character/Skill/components/SkillUP/index.tsx index acfc9191..6707acc2 100644 --- a/frontend/src/pages/Character/Skill/components/SkillUP/index.tsx +++ b/frontend/src/pages/Character/Skill/components/SkillUP/index.tsx @@ -19,6 +19,10 @@ export default defineComponent({ type: Object as PropType>, default: () => ({}), }, + buffer:{ + type: Boolean, + default: false, + } }, setup(props) { const lvInfo = useVModel(props, 'lvInfo') @@ -107,7 +111,7 @@ export default defineComponent({ columnNum={4} > { - +
} @@ -170,13 +174,23 @@ export default defineComponent({ let tooltip = '' if (skill) { if (lvInfo.value[skill.id.toString()].up == 1) { - tooltip = `技能攻击力 +${skill.learnLv < 35 ? '60' : 55}%` + if(skill.upType == 'damage') { + tooltip = `技能攻击力 +${skill.learnLv < 35 ? '60' : 55}%` + }else{ + tooltip = `生命值恢复量 +20%` + } } if (lvInfo.value[skill.id.toString()].up == 2) { - tooltip = `技能冷却时间 -15%
技能攻击力 +${skill.learnLv < 35 ? '43' : 38}%` + if(skill.upType == 'damage') { + tooltip = `技能冷却时间 -15%
技能攻击力 +${skill.learnLv < 35 ? '43' : 38}%` + }else{ + tooltip = `技能冷却时间 -10%
生命值恢复量 +5%` + } } } - + if (props.buffer) { + tooltip += ` / 主属性 +40` + } return skill ? (
diff --git a/frontend/src/pages/Character/Skill/index.vue b/frontend/src/pages/Character/Skill/index.vue index 2c44cb56..25543d25 100644 --- a/frontend/src/pages/Character/Skill/index.vue +++ b/frontend/src/pages/Character/Skill/index.vue @@ -45,6 +45,7 @@ :skills="infoStore.skills" v-model:lvInfo="configStore.config.skills" v-model:bindAwake="configStore.config.bindAwake" + :buffer="infoStore.infos?.buffer" >
技能突破[形态爆料演示戳我]