diff --git a/data/DB_PetSkill.dat b/data/DB_PetSkill.dat index ef33bca..ab87ea1 100644 Binary files a/data/DB_PetSkill.dat and b/data/DB_PetSkill.dat differ 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 c2977e8..8a642d9 100644 Binary files a/data/DB_PropExchange.dat and b/data/DB_PropExchange.dat differ diff --git a/data/DB_Task.dat b/data/DB_Task.dat index 95a8eab..1271acc 100644 Binary files a/data/DB_Task.dat and b/data/DB_Task.dat differ 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 8b87dba..28bc968 100644 Binary files a/xlsx/DB_PetSkill.xlsx and b/xlsx/DB_PetSkill.xlsx differ