From ea7e0a29b513349442a0a9c9346d8845a0db822d Mon Sep 17 00:00:00 2001 From: sk <123456@qq.com> Date: Mon, 15 Jul 2024 15:55:46 +0800 Subject: [PATCH] update develop --- data/DB_PropExchange.dat | Bin 384 -> 384 bytes data/DB_Task.dat | Bin 5299 -> 5299 bytes public | 2 +- worldsrv/action_pets.go | 10 +++++----- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/data/DB_PropExchange.dat b/data/DB_PropExchange.dat index c1efe95d3403881301372d315336b2f188fe6407..773eddb9fc3419587c4511e9150b4f52eaa35838 100644 GIT binary patch literal 384 zcmd-w<6snElw#w!-o^~3FGJ}oQ2HvAz6PR|I5-yevI!h$vE|a^U;?YZ0hPZArEfv$ z+i2>;IUwf4%!Szp(~qJL=pL9mQ0xbagY8k`1iPbQ?IRYhSPm8xhl4E!D!hZ{AehDI W2BJFzVgWnHBA`dVFmo}`76JfevOF~a literal 384 zcmd-w<6snElw#w!+Qtl~uR-bSQ2H{Iz5=3^I5-yevI!h$vE|a^U;?YZ0hPZArEfv$ z+i2>;IUwevs|TyYV?WG1RCjQK-O;f25eru=2MgFCUAi+~>e!py}$TL=JV>O3_7 diff --git a/data/DB_Task.dat b/data/DB_Task.dat index e169847821fd44088fb42f1162252a04f725628b..5ed821d30db562a102d9bf8cf7863c69b55e14ea 100644 GIT binary patch delta 248 zcmdn2xmk09p&$px!d^Ck1&8Fk*f^E|S*#nK1Q-P&Y&kEeY%km7WJVjPs0c!I^9II1 zCIL2%i*3vTj8Nefhc^qdJOLT82xuG=RP;cL?PfN%JSM0xO!0zVw#}^^Cm1Jh=MbBm z%%uyJW`^o|uv}>JLN4RUi`Ydbzu+pLyqr&Pasl_b$rHFlHV5&9!c2p?sG+lJ@(#Y- j$s+8699-5MkFPKb2u)_>7n>Zye|oYphu~%dfo2u}B{4;_ delta 263 zcmdn2xmk09p&%Q_l3q3eRxb{Yg+O}2A-RoC0*r!CUN4&$L|$%kGNTQKsL19GjDbu7 z5XCDFGXfP~Y-1MKEXeYNaq@K@0Y;|HY;1Wn!KD(aB>0nxyci_L^cQUgfdN5lJ+1%xIu@{3Il;Xe&EPy}juLub`y1A%510Bd_mc>n+a diff --git a/public b/public index 6419023..085f01d 160000 --- a/public +++ b/public @@ -1 +1 @@ -Subproject commit 64190233130f2868d1cf6ecd2be04d9b13073ae2 +Subproject commit 085f01d57005ff2e025bb0bb40740ac170620cdf diff --git a/worldsrv/action_pets.go b/worldsrv/action_pets.go index 3c3b277..ee9b9b4 100644 --- a/worldsrv/action_pets.go +++ b/worldsrv/action_pets.go @@ -578,6 +578,11 @@ func SkinUnLock(p *Player, id int32) (*pets.SkinInfo, pets.OpResultCode) { } p.SendToClient(int(pets.PetsPacketID_PACKET_SC_SKIN_UNLOCK), pack) logger.Logger.Tracef("SCSkinUnlock: %v", pack) + + // 自动使用 + if srvdata.PBDB_SkinMgr.GetData(id).GetUnlockType() == common.SkinGetAuto { + CSSkinUse(p.gateSess, int(pets.PetsPacketID_PACKET_CS_SKIN_USE), &pets.CSSkinUse{Id: id}, p.sid) + } return pack.Info, pets.OpResultCode_OPRC_Sucess } @@ -605,11 +610,6 @@ func CSSKinUnLock(s *netlib.Session, packetid int, data interface{}, sid int64) pack.Info, pack.RetCode = SkinUnLock(p, msg.GetId()) if pack.GetRetCode() != pets.OpResultCode_OPRC_Sucess { send() - } else { - // 自动使用 - if srvdata.PBDB_SkinMgr.GetData(msg.GetId()).GetUnlockType() == common.SkinGetAuto { - CSSkinUse(s, int(pets.PetsPacketID_PACKET_CS_SKIN_USE), new(pets.CSSkinUse), sid) - } } return nil }