From ee16983eafa88f339feb3ebc265731e63e3cf148 Mon Sep 17 00:00:00 2001 From: by <123456@qq.com> Date: Thu, 4 Jul 2024 10:12:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=85=8D=E7=BD=AE=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/DB_PetSkill.dat | Bin 980 -> 891 bytes data/DB_PetSkill.json | 13 ------------- data/DB_PropExchange.dat | Bin 384 -> 384 bytes data/DB_Task.dat | Bin 2441 -> 2441 bytes worldsrv/action_pets.go | 4 ++-- xlsx/DB_PetSkill.xlsx | Bin 11249 -> 11175 bytes 6 files changed, 2 insertions(+), 15 deletions(-) diff --git a/data/DB_PetSkill.dat b/data/DB_PetSkill.dat index ef33bca7cedd9a0c8207946b91aabe4acf072e4a..ab87ea126817eea78944e822b06aa0a542216ecf 100644 GIT binary patch delta 7 Ocmcb@{+n$>H8TJX1p^BJ delta 35 rcmey(c7=UIH8Vd~I0v`DL_Y~eg@Y}&8r%~PI&pA&v2y$j6<`1WzF7&! diff --git a/data/DB_PetSkill.json b/data/DB_PetSkill.json index e9f532e..10244a6 100644 --- a/data/DB_PetSkill.json +++ b/data/DB_PetSkill.json @@ -129,19 +129,6 @@ "ItemConsum": { "11001": 144 } - }, - { - "Id": 11, - "SkillId": 10001, - "SkillType": 1, - "PetId": 1000001, - "SkillLevel": 11, - "SkillName": "金鸡守卫", - "SkillDes": "在被炸弹明确攻击时{0}%概率完全免疫", - "SKillValue": 11, - "ItemConsum": { - "11001": 0 - } } ] } \ No newline at end of file diff --git a/data/DB_PropExchange.dat b/data/DB_PropExchange.dat index b2430bf826d71f5a981908a546f3538cf6aec3c0..c5c6ec9f62cb30bea8e1c0a88ce28143a05c9eab 100644 GIT binary patch literal 384 zcmd-w<6snElw#w!+{O&1uR!UmQ2H8_z7C?5I5-yevI!h$vE|a^U;?YZ0hPZArEfv$ z+i2>;IUwevn+wyAq7TVEV0(dlnE7D$DRF|`(XjRr3s)=$3yKF|7T_}Y4%C4#kD_=G TW|0y*$0DFdzc6z#&=vv!Wb!;U literal 384 zcmd-w<6snElw#w!+{O&1uR!UmQ2H8_z7C?5I5-yevI!h$vE|a^U;?YZ0hPZArEfv$ z+i2>;IUwfaRgcFVVEcjcVD~6-g5A-u_7MwLEC&nNAuxyHvfvKXVK9%uJPI=y>|mG! Rl-M~I0X_PKnTvt85CCTqJT(9S diff --git a/data/DB_Task.dat b/data/DB_Task.dat index 942b1e6a402a15b9f385e6a03e0d8ed9396cebed..e2c474b5f637b223a567a9156e69f0b58a02ad27 100644 GIT binary patch delta 405 zcmeAa?i8M2EXc;Oq?b)V#EOGsA&_3s%Qn%a9E;$Y&dFQYMPzvem?W4LST(o|7_Hbi z76ElIB6Ln}W7G-45OrYWlH(8%UUcc8@cw$N{zSYkWa?kqgOPiX6{?N>so~Ua(_vn8@Zr H4hcp8;4xyP delta 387 zcmeAa?i8M2EXcvJu$N6>K`)yX8^;nLOJt%;ITpb)oziR^i-7WsR&X6$3LLxwOcKlr ztdrNXi%o80)S0}6UC_~ikxPz4K!6n}A)vu*0Ml@w#TIA<*a)D!r~n&KUPyxrD9^@m zv5gsS@QTBeS(pq2A%ZM0+YZT1c4eA6IgMRFnF(mGumH0Jivq94fmu9Y13<>ILe(~O zR&C~Gc4Y(_0TO0{3Iml+PG*Up+`uL_`3B2L5Y4&m6{CQn1giqelkc+fP2R*P zGWkF2>B*&xf}3x%*)xVieS1g_>UdTzMUJOem<8m3+W0lTVDldrP{}i(5*4tL7wm8s MiXgeLkVAqI0LVOFK>z>% diff --git a/worldsrv/action_pets.go b/worldsrv/action_pets.go index 11a8dd4..837ae59 100644 --- a/worldsrv/action_pets.go +++ b/worldsrv/action_pets.go @@ -362,9 +362,9 @@ func (this *CSPetSkillLevelUpHandler) Process(s *netlib.Session, packetid int, d if p.Pets.SkillInfo[petId] != nil { level = p.Pets.SkillInfo[petId][skillId] } - logger.Logger.Trace("玩家升级宠物技能%v %v %v", petId, skillId, level) + logger.Logger.Tracef("玩家升级宠物技能%d %d %d", petId, skillId, level) data := srvdata.PBDB_PetSkillMgr.Datas.GetArr() - var SkillInfo = &server.DB_PetSkill{} + var SkillInfo *server.DB_PetSkill = nil for _, info := range data { if info.PetId == petId && info.SkillId == skillId && info.SkillLevel == level+1 { SkillInfo = info diff --git a/xlsx/DB_PetSkill.xlsx b/xlsx/DB_PetSkill.xlsx index 8b87dbab4d30d09709112120b75b57a6afe9202d..28bc968ecb0a8b75333b0064cd1cc953f8860bad 100644 GIT binary patch delta 2363 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