From 1dcdc238dcc09c2bb15f1637834f326ab725cc54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A5=BF=E7=93=9C=C2=B0?= Date: Thu, 27 Nov 2025 21:37:01 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E8=A3=85=E5=A4=87=E5=B1=9E=E6=80=A7?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/core/basic/character.py | 2 +- .../character/GF/mage_female/battle_mage.py | 2 +- backend/dataFiles/dcalc_0.db | Bin 1007616 -> 1007616 bytes .../EquipmentDictionary/formatData.ts | 42 ++++++++++++++++-- 4 files changed, 41 insertions(+), 5 deletions(-) diff --git a/backend/core/basic/character.py b/backend/core/basic/character.py index bcb277ec..f3f16877 100644 --- a/backend/core/basic/character.py +++ b/backend/core/basic/character.py @@ -748,7 +748,7 @@ class Character(CharacterProperty): value = 锻造计算(115, '史诗', cur.refine) self.SetStatus(AtkI=value) # 传世武器强化系数取所有武器的最高的1.12 - if cur.equInfo.categorize == '传世武器': + if '传世武器' in cur.equInfo.categorize: value = 武器强化计算(115, '史诗', cur.reinforce, cur.equInfo.itemDetailType, '物理', 1.12) self.SetStatus(AtkP=value, AtkM=value) else: diff --git a/backend/core/character/GF/mage_female/battle_mage.py b/backend/core/character/GF/mage_female/battle_mage.py index 73a90c76..e1c15198 100644 --- a/backend/core/character/GF/mage_female/battle_mage.py +++ b/backend/core/character/GF/mage_female/battle_mage.py @@ -747,7 +747,7 @@ class classChange(Character): if cur.equInfo.itemDetailType in ['矛','棍棒'] and self.GetSkillByName("战斗法师武器精通").lv > 0: cur.equInfo.AtkM = cur.equInfo.AtkP # 传世武器强化系数取所有武器的最高的1.12 - if cur.equInfo.categorize == '传世武器': + if '传世武器' in cur.equInfo.categorize: value = 武器强化计算(115, '史诗', cur.reinforce, cur.equInfo.itemDetailType, '物理', 1.12) self.SetStatus(AtkP=value, AtkM=value) else: diff --git a/backend/dataFiles/dcalc_0.db b/backend/dataFiles/dcalc_0.db index b482840e86b0d0c49b5160a34c4aa0dcff31f74d..9ed9fb5a1452266b5d26d7f258c0ec49fb246707 100644 GIT binary patch delta 25682 zcmeHv33L=y)_+y?`l`A+2_YmQEMZ>*y=7?u0e5i&Wf3E?$u@|Hh|0Jmy`=&K5(vo? z2!wrygtf@Vs?Llv<2cSZ3sK9b$3;VZivq4_dn;a$F38qtLwdY z_xro|z2dW@iqDR!$TGi0QPh|4IRc;C)(*_4-*V6J&!GJ?82=2-i5c2$wcX$wju}cN zah5LT9;V*9b?hR|yUbA3!|)qDe&=?}Pmi57RnZ!+!-yZ-uk9kdyI1R`yA5>=D{$C{ zI)_=EF1XtB^XxWPfz9c(=h=kNR_!K6x?c+)o$%;>eRZy8 zmiat3T+$!T(we_9|HJ&5`2%yne98Q0^Y6{CntyISZ%MMu73fcxFHCp;vV1(u@fCgo zTz|ojgX_=v8{qmg{yMn6%sb%v5}yOt7y15hy}`1LALyx_OmURRu6xFLNon&lGc%L=QHwlFl2TKXlG4&rM+l2A>+>YalrP2hn{-uh-nhd*L|Ufk3p#W!Z?NPQqNd^t>?6Ms@}ZNgxH;EgyB8rCot;z zuHHP)7#Ma)W@b+qc8)Jg8FnXweA2K^2N^a`x)wO|6^5KRkA6W54lVjE*NvlpN?Gzv zk8*dg1B~w)_UNC|jnN|J5A;thn_*55(88WnbeZkyz1edc4A?I+;AmyQvB{{CPKKdk z1{7XTL2uBRW*{=6-=a{8ehvLrQYTAav%_>f_kdPNDP}IvjIRi<%|Yq(2w`6ix{D!# z0s$SYa;S;}0d8DQGYon`-s-bWV0!@36gS(x$+n(+?6 zwKkNF?{Of5&|*W2Y4XOH>8a`Aw|E9BYg@wKtgNli2y{J-Z|#G6V(n^PM&_O0H885)bF;j(_tUN)zsV0wpmF8h;|0Sxc`SZxNWMk;a%s zeXX(l-n`eeoV$hX!hEhxrM^bUa9RJB?kuR*#jf7R-7^#-&-SZSYoHq~rE!f1-IYS7 zU~`cv*yV)^ArHzl_hjCpOjNy={;j#*v{1W_%|KbkEJJz{N7d{8saXaiR0#DIXeguQ z(x?sa&nm`~iQisFD2KmXhs1)b6V5Z+Js)Nlwl_;Xvm>-|3Bxxbn?#$0RQF`M7voFo zfHs|~kw&Mrd_hkF$-0*o7S^DRnk=SJqqAsUWsjjpEUy@8^Ax7gKxzNN{Db-!BzOeV z)w9_BG>q<&IkQ}C?UE0oQP;3`ukJv_48wgXjNgrR>$DU_&xFyZ(ZZBNXg`w!VjGo!V}4SFpz+VV^DM$=qwnD!zpY5kr_szDS9h2%+gbL zqj`9e$#f^osSA@;lHxW3JHpyO-JjySHR@8knb^0PzGRgJlKQ*IM66bqG7AuOfYHoY(wv1b`)0ju`VnlV zaQ_JQVM$pMs;aQW$<}I&Xe_1m405O7(>Jo+1ZM$jrV0D}Kq{|B`1wfIrAgNYDFb~S zrD?RhX09XV*Og(7VSY8C7;pyCb=p6^%OQ; zm~|i9hsgqtfr*A|9x;{$_5y`r*fO2{3}-#WUdHwZ*^hr;Mk+?CN*kFE5M4LyNpN-!u>!qQfrX zuE$xAG=*5LQl=ohw~XxpQUj3+)k;}f&2Msxv|XrHb}pK3oMgBa*!v1oG92Gi%9223 zUMc%O5}E8aB7{yWx#n3_+8~6AS(`=};A8u1g+;5_^;%B56sA6s(wEUA1ycoUr89j4 zh?5H&@&*27iWw+d&wfc0nmJsAT)C2)f$&j@sOMG^L14?7OrUofBa~IM%TRY%07q9* zN%xvRG2KH~aaky6tT!yv-=UkOO#yLu3I<&s4jT#g=kY@#gN_gywz0QLR4M@GgHq+^ z!_}c$m9TIZdoSqCR<=#pwTG?IXgszXaPdKq%lQY`_ca2$lbuE5d+XTaonNBZCylEN zy!i{$`$>B4ZS6(oC79^}M&nBxk1rhub2CEt?l{{E zqT+I@5-49T@B(XOw3h#&g7DAxGCgxhAbO*$W(z$tl_l(LV7t;d)q%S7%$Iz#%V8rg z&Xr=J0yTr)Zesgrd(!K`Sude10rN%ER_71LxSAC9WkDvo9{NT(`ky?V}(HODXf~ro-(0hQBeF z>81MlI;1PrZr7aA^kRy*iEJTy(D(ohI2C)dO#R@z@55a5wFWEGcYuICt z&MOQY+$Q?H_>)7Z>#R~fP<^QNRCTbbto78I@E;AU+VJt z3#>R4*mM*g3pQ;I)NEpNvc>Yc)}~#prw+kO#Fk2N#p=My;*hr`bY@d%TUnsG1twHE zc1u>8JY=AHUu*MD@$fO2WL{n#o{&VRRWe71;PNyS0|;X$54T+|L8f^sTWuC!Nxt<_9{D+F2KEh&EABkoM-uLGEmGY zD)|6*ZvvuYyQh#(Qi#6DGw<3&-+J~+q9^ZVjd=PmSkCN}NiUZ2;)2{9Nn6BQV6Bn^vw;om7a?tWJks9I z4U3RAg@#-!x8QvvX9}H$8p^!T|sKFEKXH6;9J0R3Y8b|hHFw;6!zk6 zO_nb0rMu#w7G3|y(x)CCZnZjWVKHA<724qeF%Ec+ww>BB4G0=o-z4%)0eq6sdi$2Z z$-MS8()sk+38IDQGZ%L3ceCoZq1E;MOd+YOK{W5KvijAOHH7r7W4yN(b`Ze zYk(~8pe67syv;>t^bM^M#M9VmwJI-R3j?t;0x{@T1oy-O z6*IG9$cPG;HCgf_a`x#ac7VoVD-b?xvh1MmjU!bqa34`G>B;7iN~+w;t|?Wx>~sAU z26M(Y`jnzPNtD7yt;{QKI&Qc2V}X#xdxP#1V);RF{myBuTCC)6TAMeDrw)m$g#g&q z#zvr?njMY^-{iMQ4@R}uX}9L*TKh=^y1dl7TU4Qt_XlkZS*+iT}_DsKC-BHT_(uwv&1i}tK*CoXnb%cJiR%NoVn+SXGm;e~B4fC*X^IV zIGVQ#UmfPOG(-13cEr?!w)>{=28AJuN~T8`k~m)Z?+$j6qj2JA=|r!gZ6mbbQlH?){V59Gy*y7-p)FVisHeXg+N6 zaQCtfu1sG_0T3?&o%)G$m5ApOz8TA1q6tD23ot5#_dIKb zpF&ANs$@vvUzqL(Zs*3uLHIu($Cc0;ckXrAIu>SMIferyF?1tWs1a_tmFr0h%kSj; z8eze0+#veocut$#$w1Gg%t3A?V)bw87HQn{Tp-+ddZ;g*?*ftrp=VEs>KFJYT}9IH z-;c7kh=?hnXVDoJ>FqXRvhlWuna=pJ6YP`t(lPd(qByQYolSe^^J$8qTIknY(@+Ig z9TRt9ap!)qbaUX)ZgIn2`HnT3Yqd6Sg&a!$4o}m|@o}djTiB)4p91X+_)5i!Qercj zcLu8=d;o(iuH6f<1u!ClzINRP{wNPa+mLG)L$-;wRVY%gR} zB^F5*Cu*F;OIionUT(3utp zp{EswcKF4eeCw$uhz8|JPh;ip+Rv?~c&OOi7&U~D7|PGVO60&vo-ssy_5!Q5AO3V3 zot`)&w1+`|t7jhH8Q3>djwfY6AYt@V*T7!aUUoV$HYfgc7uyp%8rkxqoCJo^3Fxn) zEWTlUDvSz>mYS4L%`52@5t_u|M(KXF!~{$C#}ya+pdMw&+0^Me)>!0}L|PqrhCPy; z>_f^JXsnpVw(UFJw(pSo9t);FH-2CuyCK>CyjSd&JrMj6bT zL<*v@0Iqm|Nq2(hm7s=TX$j;3;CY*N23l%bo6A9xg4iD_FB2=uK=kDAWhaZLpXAbP zt*43s0|*rF2{u&*4`b1PGPM1GES~V&7?&uEgOrXHsfP;(UkSsmuwRZ&x&3>^W{-I4 zl&l2_c^wIAe9!WoGO7N=G^K)Rk|DE%aqQV`?2z{2WyFM!jMIwy9cE_;Pi$v@O2;!v zfKRE!Ybu|j*rdfJ(<0)Po|ORX3Gtq`%B^Y%lkZ$b$j0Bob#~-Br6@PJ$`jalytUy- zsC3H@nj!a!n<1;G16gU8qSmH00pHF*@j4JzS*k!Rzn9!tJv1c7Brl#;SeXiQ_;#7G z`aRc9i=o)#OXH!HAQEmZmVCEb(o9i=k0i#r8@OmX$=a=hH{ zO`RZ~(KDAR^8~gZbJ=*=a6yl4#pbEU#*8UtviNlOZGh*8gOPb9)BGrm^NkQ*tKuHk zkVb*T`1`N6a83xca@^x^>3Xi4u(Xo9ff26Xzzx+1H5FVP)0@v(WBkP zoHZRZ9prw)e#V;6Ai%EMfDT)jiQbufmZFFYe2b%s*e(+tybEPqzf>Hi7jeG5%iog%yBKb(#cEg zsr~W;kRE_n4j!)y?x|DVmMt$f&t>`+f%@4Ad;tk>`xxQl=F;e^#qzBHq1nLZUoGXZ zxx(OU0i@FWRK9Ch1XSyH5bS<5^l~ zo(k&q&EYeF!BXg%Pc15$9c6GqwmcxN9G44EiQ(?0d1LBj;C~GtDX*~$D;J2?FZENAfFCxEdIXita_xdo&7HOqne}%y?F$D9A@|D1s8ejHDakYM~@yN$DxETqhDX@o_e4Y9$FPpTU|KhgA?BXSIwJqQ*dTYUwKE z(-rAj&=C+M_YB*!Jsu^2>mP= z|B}*E7bsJRU8*_H^f&yDx&TN+-9*oHzL(+|7kU;(3}<_EC~7#t4+cGl+j&N~qnJ!= zJJ02gl(YD7QV@Z+0EQ!h{I&y7mJqkBYCW?#uySXxWgh|IrNA&Gcp)JrCAGUN)&}=A zLZBEDj=^0pV1U^LHv^_u3<)T_Mb1IxpAlepWodBh>I7*hn}fGKO?RG>(6&UH8Hi!= zX7D|MCii4!_Jgc&v3GQYChbA*C{6HFrEEWyx=W$K$nGX{YM$&f#EORC!A)ZQTCw4{ z6bZ}K)Nm41vscCm~ss#xaA6 z>?{AK@?2x*`w|l@(ym7+R$}FQ$fmd-sptCd@eR4s*++f-qoqpvE?HtiDJIW~A9J%` z2(PSQ{d8Y4Zj3o5%?zpzA<*QDAi#gh@pt2)^(Rs`2`g6nI3qeVI^QnLI9$TA8oS*p z%s)lFocLkf$&Z6}GU6m zKc8Y+Ei`sEy%9&ANb{5mA&?W8I?B9*8*3b-zm=(@Z{vOwPGEcw@qH9wn_bd@tOWqZ z&DDx+?gW^obW4#o+-n>=2!Az+Md2ofz|m77|7n6i6-$*7b@{V>RsG{;KziS#bNJ4D ze<0F48LbO<$t5BZp6y~sMM%_Z6x)w>2rs)>UAtDg`>tIJ_CCb-QwTEMxAdCYhp(R= z)5igeABg{|WA#N~wIs*{DraJa7plH>B}≷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 TzyY|-Xs{O}VF@jkiQE4dQvWC+ delta 4136 zcmZ8kdsvlKx?i{NvM%4ZAq3o96cj`=jjedeONuwVHV9^AsitNlx-8R&upDhFJ7Yba#?dgVp*fDCiPy5THV7N%d!85eAK!Z4_51za z+gI8+wzP5VhIr=$0N}E=dTnzy_8$RH`18v1V0j)Y&%=B2$kvy8<1)ZO3-E9^#_1*c zpiOKQXt9r4zcmMvuW(s)y*Q%2d4;@y2mo+yL%qm>s$@I4fKjq73wDrb7^^1N5Wn>H)Ub%7y(PpTXJIqbP@LZQktJ!=Dd)!AGVCnsixuci9&mkFg&KwDqoO#ad zi}zQ}mXDt^&%hix_q_Q=Z+aSVl#SSP_GYV}v5U-gZ#Y-QMc#tvqilM*Au~H2sqBlU ziM)Zi5nez>c)eavDp(aL^h8B@JkilnvFc{4IUKUCd-*DNwVB#1wX4m3fW+P*QFAc_bdEWC84R!;pe1sn7sRE=S zcnYLBPl-9)LqE4)wN{zK4UAuNU(|p@PuWmekU(QKXX_GZHB^Io(c@74Hj-Xq>WH5& zgKDct z^10?J&9e6nGZO3AIH;f!UVrZws;XW1xhUf$vtgbAfOn7KEpyVFFcGG1xG8d_c0{R5f z8aF@^;DJPWtb|6ZoFeK$ab<~to*i*Qw_aWLWH`>2$7xCTG*{>;itTvlV)t|Bb@4Qx z!eY>mBnrBeT9?d!7>)W0=aS17`SZd&EGbXy@)(k2?auq;uNH~HazQaqlv@@FTNV1L z7iz)ZUo1w;BZrs=4IQFd0@UmD#w|dAIs*U4sS_)BH0w#@?RYEJ!$F;K4gEvM+o0+; z(7QBWw!c6})kzk@vBtlsE2^xjrr+I8m)nLSbpkm^U8|u9MqFUF|1o{|R;{lIEa^NP zt={|-_1#9o^3C)G9FIT6hKoOC4RodZkqw;(_+<-_6X+^9uN}XI)u*rMbVUHD?Co^B zfdcd8{Mz=yD6XYrp&OPiu+smeTv)3GDcDIjqF7@ou)%5Q3}8>t5!N+xpRtDcz-bNj zsH$zCLE`Ev4B4$m_1i~@0q>Sy*U_GKd)lwQyh^r?7bE0bDKu6#_Ggi5K|Sq{x z%TTxWr^sP?og$d3-%f=Ij&T!EGzrjc)&TMaJBcRYO>UFp7h}L#%}sx;RklAnoO8

Bx>JMq2 z9~@Sm*;)N+Vl(|WN)FTP!1J2d9{_7Mzat4)xUJ4f*al?s7XCN&;U#K9lb!&k_Wjp3 zjZ&G{Xat0l<=G4En2n3{)!X=c+&@lwex|W1{W?8?i1P(BG<*mZ|CzR-2rZ5s5-8yD zPYh+2{P~LJ8eO3n^>pkr zOu-rvDqkzp5eo@04Y5<`jxe^)U{ZM4b@n>owe}4%55BGKtdGs?5=|v~a2zcq?PFn6dW`Hcn5%9&ArMCxwUx}WOzSAaMU}KGPPDq3&Q^!&e0qi`)c^Kp2ro=h7lyE3 z-&SCU$FR{j)>;TGI11o*-OrrOVhtQco5??|7|l^1s77V7oj5*N8g#=@-Hdt zhDjA>vE1%@InN`%zIzE$&C^)28P6x{Nwyj~NoT z6Y{0|*(JGi4!f{7kHH8|zS8NChMc8ns1gM%O-tQZ4qn4T<9x~*7U+&cFH1~c(1hwt zG3&*=#0#iiv)pf;|K*_tYnC;|9A^w8X*%|&DkjK$_&@taRwe64;wlmgI=D*>wf*v6 z1qbSUXdj&FW-0p#b(_2^*RvYJSrxGHqriNYtWjbEONY87??md+YArho#>jg&vY3wc zV-!ny^WQ8(ZP>{6-zM#|&$D8hXdck3p#q*9!kl`zMU?PqjM>MmZ9o|-^}YW~F5bp| z@CKLN+LA)*E~^|Erv9z1EUWtk&+lYQpo)Bz&4z?$f)?%LTQy@l+l+Z9=KVE8O z6mxmJ^+$TvK7a<3G(4c8USO!M^x_oS{wFI|wKrv7B=0FFMDY`9KqS8g+wV}7!1ECv zSg~9t_t5cQh~XZnt2(gh{#`41?!m%d;VhCV)48beuD4jh&5v7Oc zC=9P?E`Cf7PV+ygL-{(AB)=lOmb5QJ3$x_yS@XZRiJm8ba;{U!7auOx)x zK|rxm-U#*Xwp4HRW&Cpyg=gq7wHbiT^j>2R3F2J$V;yRpn*Ac*g@jmsYw!&6PnTCW zX#{5^pMc^k4gb_|D_d4Eznpf>N>4TaHSSjMDgVs}Vf|f(7HdEYkg9r~XTX@y_HV&z z?A|cR} zi!ZRMxxt>nYU_^-!ydpPe*q?(g5VT#jBfBydy}iSK0{e(jtx*R@8f>lhn07Ltele9 z(Zt&4|2i0)-_^uU?dIFMW9t1LKL<4?yiQ{ZV&xpvg0mJ(itI;>4`7RmXyk`OG46;f zr%#2wt|&9Qd2M~4KZexu5BRnj@Xva@iXsgAYxYy(D&S-K(5+^WA6(JxP(zexM(ULq zv49RRey0n*3=zvH6_4_l;9^i_mEb$kBy*DEBYzk3_#E~yeZ-!pojxSXnpun-_l~gC z(f7nQsGN7jAt=2{e5SKr{-8uHvC;sMbM}f4<(=<{Z-_k)%+*J8I-#-UluA|*{$9F-Z!M8)Y)6=!t_wzH0*TfyvbK8QRf~vbhn?4 gRQf)53`W5*^7I}z2I`T%$4$6x2)=Q^y}$PV0jASJB>(^b diff --git a/frontend/src/pages/Character/EquipmentDictionary/formatData.ts b/frontend/src/pages/Character/EquipmentDictionary/formatData.ts index 66ca33ea..0e7a1b56 100644 --- a/frontend/src/pages/Character/EquipmentDictionary/formatData.ts +++ b/frontend/src/pages/Character/EquipmentDictionary/formatData.ts @@ -16,10 +16,44 @@ export const formatEqu = (total: IEquipment[], subweapons?: string[], curSuit?: } return b.categorize.localeCompare(a.categorize) }) - weapons.push(...weapon) + weapons.push( + ...weapon.filter((a) => !['传世武器升级', '狄瑞吉传世武器'].includes(a.categorize)), + ) const remind = weapons.length % rowCount - remind > 0 && weapons.push(...Array(rowCount - remind).fill(undefined)) + if (remind > 0) { + weapons.push(...Array(rowCount - remind).fill(undefined)) + } }) + if (item_weapon.some((a) => a.categorize === '传世武器升级')) { + const length = item_weapon.filter((a) => a.categorize === '传世武器升级').length + weapons.push(...Array(length).fill(undefined)) + weapons.push( + ...item_weapon + .filter((a) => a.categorize === '传世武器升级') + .sort((a, b) => { + return a.itemDetailType.localeCompare(b.itemDetailType) + }), + ) + } + let remind = weapons.length % rowCount + if (remind > 0) { + weapons.push(...Array(rowCount - remind).fill(undefined)) + } + if (item_weapon.some((a) => a.categorize === '狄瑞吉传世武器')) { + const length = item_weapon.filter((a) => a.categorize === '狄瑞吉传世武器').length + weapons.push(...Array(length).fill(undefined)) + weapons.push( + ...item_weapon + .filter((a) => a.categorize === '狄瑞吉传世武器') + .sort((a, b) => { + return a.itemDetailType.localeCompare(b.itemDetailType) + }), + ) + } + remind = weapons.length % rowCount + if (remind > 0) { + weapons.push(...Array(rowCount - remind).fill(undefined)) + } } // # region 副武器 @@ -205,7 +239,9 @@ export const formatStone = (total: IEquipment[], curSuit?: string) => { const temp = items_suits_rzs.filter( (item) => item.itemDetailType === part && item.rarity === rarity, ) - temp.length > 0 && rzs.push(...temp, ...Array(rowCount - temp.length).fill(undefined)) + if (temp.length > 0) { + rzs.push(...temp, ...Array(rowCount - temp.length).fill(undefined)) + } }) // const temp = items_suits_rzs.filter((item) => item.itemDetailType === part) // const remind = temp.length % rowCount