From 1edcc4d237c68c6de6198fe93328e10feaf78ea3 Mon Sep 17 00:00:00 2001 From: CeHua_ZWJ <ceh@163.com> Date: 星期三, 29 八月 2018 17:01:17 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server --- db/PyMongoDataServer/PySysDB/tagPetInfo.txt | 3 ++- CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt | 5 +++-- db/PyMongoDataServer/SysDB/tagChinItem.txt | 7 ++++--- db/PyMongoDataServer/SysDB/tagChinNPC.txt | 5 +++-- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt index 1dc73a9..1d61cd7 100644 --- a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt +++ b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt @@ -282,8 +282,8 @@ 11104016 神机子 350 50109001 幼龙 441 50109002 雏凤 441 -50106001 道士鼠 441 -50106002 灵狐仙 441 +50106001 雷霆幼龙 441 +50106002 道士鼠 441 50106101 冰原狼妖 441 50106102 鬼将军 441 50106201 铁壁金刚 441 @@ -295,6 +295,7 @@ 50106304 九黎妖虎 441 50106305 球球 441 50106306 荒漠梦魇 441 +50106307 灵狐仙 441 50105001 傲世神驹 1 50105002 枪元素 1 50105003 道元素 1 diff --git a/db/PyMongoDataServer/PySysDB/tagPetInfo.txt b/db/PyMongoDataServer/PySysDB/tagPetInfo.txt index 0246bf4..7e4aa50 100644 --- a/db/PyMongoDataServer/PySysDB/tagPetInfo.txt +++ b/db/PyMongoDataServer/PySysDB/tagPetInfo.txt @@ -1,6 +1,6 @@ ID Quality UnlockSys UnLockNeedItemID UnLockNeedItemCnt DecomposeExp InitRank MaxRank UseNeedRank SkillID SkillUnLock SkillUnLockSys InitFightPower 50106001 2 GetPet 4201 1 1000 1 20 1 48200|48205|48210 4|10|20 ['PetUpLv','PetUpLv','PetUpLv'] 1036 -50106002 2 GetPet1 4202 1 1000 1 20 4 48215|48220|48225 4|10|20 ['PetUpLv','PetUpLv','PetUpLv'] 1396 +50106002 2 GetPet 4202 1 1000 1 20 4 48215|48220|48225 4|10|20 ['PetUpLv','PetUpLv','PetUpLv'] 1396 50106101 3 GetPet2 4203 1 1000 1 30 6 47111|48235|48240 4|10|20 ['PetUpLv1','PetUpLv','PetUpLv'] 2476 50106102 3 GetPet3 4204 1 1000 1 30 6 48245|48250|48255 4|10|20 ['PetUpLv','PetUpLv','PetUpLv'] 2476 50106201 4 GetPet4 4205 1 1000 1 40 6 48260|48265|48270 4|10|20 ['PetUpLv','PetUpLv','PetUpLv2'] 5716 @@ -12,3 +12,4 @@ 50106304 5 GetPet10 4210 1 1000 1 50 6 48350|48355|48360 4|10|20 ['PetUpLv','PetUpLv','PetUpLv6'] 24796 50106305 3 GetPet11 4213 1 1000 1 30 6 48350|48355|48360 4|10|20 ['PetUpLv','PetUpLv','PetUpLv'] 2470 50106306 4 GetPet12 4214 1 1000 1 40 6 48350|48355|48360 4|10|20 ['PetUpLv','PetUpLv','PetUpLv'] 4608 +50106307 2 GetPet1 4215 1 1000 1 40 6 48350|48355|48360 4|10|20 ['PetUpLv','PetUpLv','PetUpLv'] 1400 diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt index e3367d8..4759951 100644 --- a/db/PyMongoDataServer/SysDB/tagChinItem.txt +++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt @@ -505,8 +505,8 @@ 4190 1 0 鸾凤之魄(天) 28 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 3050 0 20 0 1 0 0 85 5000 0 0 7 260 0 0 6 15300 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4191 1 0 鸾凤之魄(地) 28 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 2142 0 20 0 1 0 0 85 1500 0 0 7 156 0 0 6 15300 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4192 1 0 鸾凤之魄(人) 28 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 1156 0 20 0 1 0 0 7 100 0 0 6 9560 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -4201 1 0 灵宠：道士鼠 26 0 0 0 0 1 1 0 1 0 1 0 0 0 0 0 1 288 0 20 0 1 0 0 77 2000 0 0 78 2000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -4202 1 0 灵宠：灵狐仙 26 0 0 0 0 1 1 0 1 0 1 0 0 0 0 0 1 388 0 20 0 1 0 0 77 2000 0 0 78 2000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +4201 1 0 灵宠：雷霆幼龙 26 0 0 0 0 1 1 0 1 0 1 0 0 0 0 0 1 288 0 20 0 1 0 0 77 2000 0 0 78 2000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +4202 1 0 灵宠：道士鼠 26 0 0 0 0 1 1 0 1 0 1 0 0 0 0 0 1 388 0 20 0 1 0 0 77 2000 0 0 78 2000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4203 1 0 灵宠：冰原狼妖 26 0 0 0 0 1 1 0 1 0 1 0 0 0 0 0 1 688 0 50 0 1 0 0 77 8606 0 0 78 8606 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4204 1 0 灵宠：鬼将军 26 0 0 0 0 1 1 0 1 0 1 0 0 0 0 0 1 1000 0 50 0 1 0 0 77 8606 0 0 78 8606 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4205 1 0 灵宠：铁壁金刚 26 0 0 0 0 1 1 0 1 0 1 0 0 0 0 0 1 1588 0 50 0 1 0 0 77 27200 0 0 78 27200 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 @@ -519,10 +519,11 @@ 4212 1 0 灵宠：齐天小美 26 0 0 0 0 1 1 0 1 0 1 0 0 0 0 0 1 1288 0 100 0 1 0 0 77 27200 0 0 78 27200 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4213 1 0 灵宠：球球 26 0 0 0 0 1 1 0 1 0 1 0 0 0 0 0 1 1288 0 100 0 1 0 0 77 27200 0 0 78 27200 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4214 1 0 灵宠：荒漠梦魇 26 0 0 0 0 1 1 0 1 0 1 0 0 0 0 0 1 1288 0 100 0 1 0 0 77 27200 0 0 78 27200 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +4215 1 0 灵宠：灵狐仙 26 0 0 0 0 1 1 0 1 0 1 0 0 0 0 0 1 1288 0 100 0 1 0 0 77 27200 0 0 78 27200 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4250 1 0 冰火冥魂碎片 125 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 736 0 100 0 1 0 0 0 4209 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4251 1 0 九黎妖虎碎片 125 0 1 0 0 999 1 0 1 0 1 0 0 0 0 0 1 3444 0 100 0 1 0 0 0 4210 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4252 1 0 球球碎片 125 0 1 0 0 999 1 0 1 0 1 0 0 0 0 0 1 3444 0 100 0 1 0 0 0 4210 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -4253 1 0 灵狐仙碎片 125 0 1 0 0 999 1 0 1 0 1 0 0 0 0 0 1 3444 0 100 0 1 0 0 0 4210 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +4253 1 0 道士鼠碎片 125 0 1 0 0 999 1 0 1 0 1 0 0 0 0 0 1 3444 0 100 0 1 0 0 0 4210 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4301 1 0 符印精华 31 0 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 60 0 5 0 1 0 0 0 260 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4302 1 0 符印精华 31 0 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 150 0 10 0 1 0 0 0 420 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4303 1 0 符印精华 31 0 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 210 0 20 0 1 0 0 0 790 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 diff --git a/db/PyMongoDataServer/SysDB/tagChinNPC.txt b/db/PyMongoDataServer/SysDB/tagChinNPC.txt index 6a5c840..056d3b8 100644 --- a/db/PyMongoDataServer/SysDB/tagChinNPC.txt +++ b/db/PyMongoDataServer/SysDB/tagChinNPC.txt @@ -282,8 +282,8 @@ 11104016 0 1 神机子 350 0 272 283 555 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 838 104 10 300 0 6 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 0 0 0 0 200 1 1 50109001 0 0 幼龙 441 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 300 2 0 0 0 0 0 0 0 0 0 0 10 2 48189 0 0 0 0 0 0 0 1 1 1 50109002 0 0 雏凤 441 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 300 2 0 0 0 0 0 0 0 0 0 0 10 2 48189 0 0 0 0 0 0 0 1 1 1 -50106001 16 0 道士鼠 441 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 1 1 0 300 2 8 0 0 0 0 0 0 0 0 0 20 2 48189 0 0 0 0 0 0 0 105 0 1 -50106002 16 0 灵狐仙 441 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 1 1 0 300 2 8 0 0 0 0 0 0 0 0 0 20 2 48189 0 0 0 0 0 0 0 105 0 1 +50106001 16 0 雷霆幼龙 441 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 1 1 0 300 2 8 0 0 0 0 0 0 0 0 0 20 2 48189 0 0 0 0 0 0 0 105 0 1 +50106002 16 0 道士鼠 441 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 1 1 0 300 2 8 0 0 0 0 0 0 0 0 0 20 2 48189 0 0 0 0 0 0 0 105 0 1 50106101 16 0 冰原狼妖 441 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 1 1 0 300 2 8 0 0 0 0 0 0 0 0 0 20 2 48189 0 0 0 0 0 0 0 105 0 1 50106102 16 0 鬼将军 441 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 1 1 0 300 2 8 0 0 0 0 0 0 0 0 0 20 2 48189 0 0 0 0 0 0 0 105 0 1 50106201 16 0 铁壁金刚 441 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 1 1 0 300 2 8 0 0 0 0 0 0 0 0 0 20 2 48189 0 0 0 0 0 0 0 105 0 1 @@ -295,6 +295,7 @@ 50106304 16 0 九黎妖虎 441 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 1 1 0 300 2 8 0 0 0 0 0 0 0 0 0 20 2 48189 0 0 0 0 0 0 0 105 0 1 50106305 16 0 球球 441 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 1 1 0 300 2 8 0 0 0 0 0 0 0 0 0 20 2 48189 0 0 0 0 0 0 0 105 0 1 50106306 16 0 荒漠梦魇 441 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 1 1 0 300 2 8 0 0 0 0 0 0 0 0 0 20 2 48189 0 0 0 0 0 0 0 105 0 1 +50106307 16 0 灵狐仙 441 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 1 1 0 300 2 8 0 0 0 0 0 0 0 0 0 20 2 48189 0 0 0 0 0 0 0 105 0 1 50105001 16 0 傲世神驹 1 0 1 2 26 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 1200 100 0 300 0 2 0 0 0 0 0 0 0 0 0 10 2 203 0 0 0 0 0 0 0 105 1 2 50105002 3 0 枪元素 1 0 1 1 1 0 0 0 0 0 0 0 0 1 0 0 0 0 3000 1 1 0 100 0 10 50932 0 0 0 0 0 0 0 0 10 2 5 0 0 0 0 0 0 0 101 0 1 50105003 3 0 道元素 1 0 1 1 1 0 0 0 0 0 0 0 0 1 0 0 0 0 3000 1 1 0 100 0 10 55932 0 0 0 0 0 0 0 0 10 2 5 0 0 0 0 0 0 0 101 0 1 -- Gitblit v1.8.0