From 87ff7a25ee2ba7d5ea045e5bd8de6c7ccaa4d096 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A5=BF=E7=93=9C=C2=B0?= Date: Fri, 18 Apr 2025 00:48:31 +0800 Subject: [PATCH] dev --- backend/core/basic/character.py | 24 +++++++++++------- .../GF/priest_female/crusader_female.py | 18 +++++++++++++ backend/dataFiles/dcalc_0.db | Bin 1007616 -> 1007616 bytes frontend/src/assets/img/active.png | Bin 0 -> 1663 bytes .../Character/EquipmentDictionary/Index.vue | 14 ++++++++-- .../characters/crusader_female/skill/净化.png | Bin 0 -> 1320 bytes .../crusader_female/skill/复苏之光.png | Bin 0 -> 1280 bytes .../crusader_female/skill/守护祝福.png | Bin 0 -> 1082 bytes 8 files changed, 45 insertions(+), 11 deletions(-) create mode 100644 frontend/src/assets/img/active.png create mode 100644 images/characters/crusader_female/skill/净化.png create mode 100644 images/characters/crusader_female/skill/复苏之光.png create mode 100644 images/characters/crusader_female/skill/守护祝福.png diff --git a/backend/core/basic/character.py b/backend/core/basic/character.py index 0932755c..a840ac47 100644 --- a/backend/core/basic/character.py +++ b/backend/core/basic/character.py @@ -116,6 +116,8 @@ class Character(CharacterProperty): # endregion + BindAwake : int + """绑定觉醒等级""" skills: list['Skill'] = [] # """技能列表""" skills_dict: dict[str, 'Skill'] = {} @@ -405,6 +407,7 @@ class Character(CharacterProperty): # region 计算相关 def SetDetail(self, info: dict[str, dict]) -> None: self.charEquipInfo = {} + self.bindAwake = info.get('bindAwake', 50) """打造信息导入""" for key in info['equips']: # 导入部位打造信息、装备信息、贴膜信息 @@ -940,7 +943,7 @@ class Character(CharacterProperty): value1 = (info[1][0] + info[1][2])*info[1][1]*buff_ratio_old + info[1][0]*buff_ratio_new value2 = (info[2][0] + info[2][2])*info[2][1]*buff_ratio_old + info[2][0]*buff_ratio_new # 觉醒技能 - elif i.buffType == 'awake': + elif i.buffType == 'awake' or i.buffType == 'awakeSub': value1 = (info[1][0] + info[1][2])*info[1][1]*awake_ratio_old + info[1][0]*awake_ratio_new value2 = (info[2][0] + info[2][2])*info[2][1]*awake_ratio_old + info[2][0]*awake_ratio_new else: @@ -948,14 +951,17 @@ class Character(CharacterProperty): value2 = (info[2][0] + info[2][2])*info[2][1] value3 = info[3] value4 = info[4] - skillInfos.append({ - "name":i.name, - "cd":value4, - "icon":i.icon, - "lv": i.lv, - # 对自己的加成 三攻 力智 伤害直接加成 - "buff":[value, value1, value2, value3], - }) + if i.buffType == 'awake' and self.bindAwake == 50: + pass + else: + skillInfos.append({ + "name":i.name, + "cd":value4, + "icon":i.icon, + "lv": i.lv, + # 对自己的加成 三攻 力智 伤害直接加成 + "buff":[value, value1, value2, value3], + }) return skillInfos def get_buffer_info(self): diff --git a/backend/core/character/GF/priest_female/crusader_female.py b/backend/core/character/GF/priest_female/crusader_female.py index afdb1712..040e7ad1 100644 --- a/backend/core/character/GF/priest_female/crusader_female.py +++ b/backend/core/character/GF/priest_female/crusader_female.py @@ -591,6 +591,7 @@ class Skill31(ActiveBufferSkill): cube = 15 cd = 290 mp = [4025, 8055] + buffType = 'awakeSub' data0 = [0, 22510, 27730, 32950, 38170, 43390, 48610, 53829, 59049, 64269, 69489, 74709, 79929, 85149, 90368, 95588, 100808, 106028, 111248, 116468, 121688, 126907, 132127, 137347, 142567, 147787, 153007, 158227, 163446, 168666, 173886, 179106, 184326, 189546, 194766, 199985, 205205, 210425, 215645, 220865, 226085, 231305, 236524, 241744, 246964, 252184, 257404, 262624, 267844, 273063, 278283]# noqa: E501 hit0 = 1 #TODO @@ -598,6 +599,23 @@ class Skill31(ActiveBufferSkill): data2 = [0, 337659, 415956, 494254, 572552, 650851, 729149, 807447, 885745, 964042, 1042340, 1120638, 1198936, 1277234, 1355532, 1433829, 1512127, 1590425, 1668723, 1747021, 1825319, 1903616, 1981914, 2060212, 2138510, 2216808, 2295106, 2373404, 2451701, 2529999, 2608297, 2686595, 2764893, 2843190, 2921488, 2999786, 3078085, 3156382, 3234680, 3312978, 3391276, 3469574, 3547872, 3626170, 3704467, 3782766, 3861064, 3939361, 4017659, 4095957, 4174255]# noqa: E501 hit2 = 1 #TODO + # 绑定1觉时数据 + data3 = [0, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158]# noqa: E501 + + # 绑定2觉时数据 + data4 = [0, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73]# noqa: E501 + + def skillInfo(self): + """技能信息""" + prep = self.char.AwakeSkill.skillInfo() + ratio = 0 + # 绑定一觉时,替代一觉 + if self.char.bindAwake == 50: + ratio = self.data3[self.lv] / 100 + if self.char.bindAwake == 85: + ratio = self.data4[self.lv] / 100 + return prep[0] * ratio, [prep[1][0]*ratio,prep[1][1],prep[1][2]*ratio], [prep[2][0]*ratio,prep[2][1],prep[2][2]*ratio],0,self.getSkillCD() + class classChange(Character): def __init__(self, equVersion=''): diff --git a/backend/dataFiles/dcalc_0.db b/backend/dataFiles/dcalc_0.db index 2749a28615e5a35552bc4f064e1fdab137953da1..95a9b30eb2f1c816fc858db2ff029de0734d3369 100644 GIT binary patch delta 355 zcmWNJ&nts*9LM`&Kfcei=QG=$EOEe$#KGE_lpI!)gWo?&$v5(&ap2%)*~$|xMyWSW z`+>u>=A!Sx!Ai?TYEG{F0TOX>@f=>KSFcyR*cUJM9o4b&aeai96T%S85EX`~G(?pl zEQYWe!e$8jt>A}g)``YTzKp31FW@81SFxVuIaFo&3St*L4gG>g<^Cm)=2;I|3vWil zw^heYjB8kXR9qO%a0`Yf6jX$|F*?TmD9kH<8JJYsx==bbgH)0??WGPB6V=2aQwLhs z2Nou;oXu-rgXZ}yKs8XFv<{j4)!v*eC^xO-uwcVV7L;;oGw!a{A^E9Nv=uKQ^2u0` zCK*0UnvR_ls+K? delta 333 zcmZoTVB2uOc7inH`H3>ljOQB@S`!#s6PQ{Pm|GKAS`%1X6WCf4*jp1gwkB})Eu7A> zm@{K~*doq#)5Vr>rccja%(;5H!cw4E-4f0P)BV?TvTs*i%6WF}bmuQ@meV)Xa`H~k zKF%dLJzxvX?huIY>x)BOWE)uykH=ThBn7{aA#I=!KrE35rTCl?TN12NC`Bb~hU z%F}f|@y2YQzm|8c$MpTnd7ZcSf8%|~&uF^6kd2Rrb$S6CAM5m^tGHFB?_SOAwfzG( zUzYlGA2UAT>Gf0i1h&^2^Mx=@k2K~}+5XjpFPw2YqdA}O_INYCa~#tT&jvCb?D-^> zr>kc0iA+CW&L_0JK8Y`kae8kijQ=~CFP3rofi$3jVENiqzEb1q;&VZKXFiebk~8_- U7^j=h2l9bN32kqg#aD9_09ToL2mk;8 diff --git a/frontend/src/assets/img/active.png b/frontend/src/assets/img/active.png new file mode 100644 index 0000000000000000000000000000000000000000..710f8a001ec6d74b56e5f86aff15a7927c66ade7 GIT binary patch literal 1663 zcmYL}c{tnI9>#wOf`}HaEsd&*lv;+XC^{0ZCCMY)q}oJlx@p4<)im~4##T$}cElQu zC2CaEJ~c+FR71@aBWi2ZR+LU?S`{T`N+;&&(>dpP&-Ec>SvGNK4 zsM4_h;Q*jxvMUgdgj@vxrF@*bs~<&GLY}_n=dm9h9`ts)G3x9Y{6LBuha&JwO48Ie z=0a9Mh88D+=go=p=$Cm9i)GY1s7^MIXrqqO14CS2=wY@zp#tzJ;+bGplsIw5Il6b2 z-#%GSx#O~SogplDpggi zE23sY+YD03s&v;^}KcZ!M^OpuQ-)VB-xR|d!t?xaP)Cu{k zoNrgD_DQF5PIRDoY&Ly8DoncMk+L2I&!!KAuPQ+`bZoeld^d(~A_Lf!e zbwOkIc@V4@c4W%5@g`knth*3BLAdttC+3-vr@RVEwDTcPWUqIm-LMuRw7Cp>dY@ic za3(CRu3M!az(8GwQ{b(a4x}!6*k|6=w9Reas}Yp(0XzyW7Wigr5DYFYSOop0(ci79 zWwfOJ)CnG&Od#xu8#g}1LP#I$1d41u;C3fHvr_$@Th7QfoR@op#W&q*4)c^sNoyfB z-g)!{;!)*i$E{8FJ9;cKbuL!Ck>S1Q+A)IX>?6r|NQDYp8M_GeHCtJ^H$9+l6Kd~T zcBDSP;sRWnU-}!lq)_K=s^Y15OO13CRJ$Z_N-xnAQSYAA#*fF{BIEC|&H0sqTQX7o zA(nXosUWvJ?L2}Xoq`cUTh3+mI6A==dPR4K*wnfj?Re-@GI7M%-;{G>p!H|u6`@)` zi8KC{v@jy*kN#^uBZJ#PILBOT%jL)I7X?>Fk3FhQZS8!>Jb3n_^>$*y!1tRAJF}3+ z>?uDyzClY@?f;jN>8oqkL!0#Xcas2)DV#}nEcH1^FgfK|%GABhnO}_Y7N@PZto!Nx zz&D}?4iiKj5kuQnvKThLC;K&ivV>VoFCG#Fc-_&WE(UnQViuI9vRDF!6$N+wZq;FJ z8$kf;0R=NL@7lx35#Hurp1Oa-t!z0`XzcCQZl6s)-2UUn8|;Lxq@IwD3L~;tLr?xk zN8B5(SyP=&rjcDgcy<#X-_zH>om7gM@rQ|Ep$e@Ed6+57XJ!pa-*L;CeCg8Qw=1#V zd61XJbPYFiRg3<-6>wM5?)%L5b>qpSVlDV>Y73GVG=1qsTa@PSUG?kJb7}?hbJ#cf zof8g>`!t|gW-Qe@j7C+`l_T1`?_;%O8Xiy7Uk?cd$4bKr`vzIY|@ouZ&76; zwLO+ti!Dz`h?p036)Y&|HcI^P+jT#?r0Gp{mGsyA7Cy@2q(`2x0&iX7ADKHB!uxa< z8FuX9n;P?_zUPGlo9uZDkE z*jL~?H=_KClQ9e1%Pj;YMotO493Y+8;Nz&Vv07tC+Z=-p=?yydbliQ$MpoFc%;9}) zNA+4qoKJ~hg_cnpTx2MkUNr;w6$iWWVN>ta?TVRQY+`(MxmjWAd1Wiu?;jUlP+mT0 zSVl9%MVl^SG;KjB*mG6l6^z<}%)e_=wkAM!z;TkgHeJ3QZTIuWdHA?DxLrv38^ikG AO8@`> literal 0 HcmV?d00001 diff --git a/frontend/src/pages/Character/EquipmentDictionary/Index.vue b/frontend/src/pages/Character/EquipmentDictionary/Index.vue index 63defd49..519c5e9d 100644 --- a/frontend/src/pages/Character/EquipmentDictionary/Index.vue +++ b/frontend/src/pages/Character/EquipmentDictionary/Index.vue @@ -21,7 +21,7 @@
-
+
部位: @@ -386,7 +386,7 @@ const chooseEqu = (item?: IEquipment) => { .active { color: #ccc088; - &::after { + &::before { content: ''; position: absolute; width: 60px; @@ -395,6 +395,16 @@ const chooseEqu = (item?: IEquipment) => { background: #bf8d20; filter: blur(7px); } + + &::after { + content: ''; + position: absolute; + background: url('@/assets/img/active.png') no-repeat; + width: 148px; + height:16px; + top:69px; + transform: translate(0, 0%); + } } .item-head { diff --git a/images/characters/crusader_female/skill/净化.png b/images/characters/crusader_female/skill/净化.png new file mode 100644 index 0000000000000000000000000000000000000000..d82aab83629c9f7073187a7c69ea84b43c026519 GIT binary patch literal 1320 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 literal 0 HcmV?d00001