From 9b28aeef919a5e010a3b294ef43cb112f118f04c Mon Sep 17 00:00:00 2001 From: cehua_LC <tingame100@163.com> Date: 星期二, 25 九月 2018 16:01:53 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server --- db/PyMongoDataServer/PySysDB/tagPetClassCost.txt | 160 ++++++++++++++++++++++++++++++++++++++++ ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc | 0 db/PyMongoDataServer/PySysDB/tagHorse.txt | 3 db/PyMongoDataServer/PySysDB/tagPetInfo.txt | 4 + CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt | 4 + ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.pyc | 0 db/PyMongoDataServer/SysDB/tagChinItem.txt | 6 + db/PyMongoDataServer/SysDB/tagChinNPC.txt | 4 + ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.pyc | 0 10 files changed, 180 insertions(+), 1 deletions(-) diff --git a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt index 5d600d7..0a53f45 100644 --- a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt +++ b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt @@ -300,6 +300,10 @@ 50106309 荒古巨兽 441 50106310 熊猫斗士 441 50106311 海牛侍卫 441 +50106312 雷震子 1 +50106313 冰剑士 1 +50106314 双头火狼 1 +50106315 雷蛟 441 50105001 傲世神驹 1 50105002 枪元素 1 50105003 道元素 1 diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip index 88d2bae..653b910 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc index 1f41cce..8f64043 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.pyc index e65cbdb..415992a 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.pyc index 9797070..6a94f16 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.pyc Binary files differ diff --git a/db/PyMongoDataServer/PySysDB/tagHorse.txt b/db/PyMongoDataServer/PySysDB/tagHorse.txt index f28c72f..a48cb35 100644 --- a/db/PyMongoDataServer/PySysDB/tagHorse.txt +++ b/db/PyMongoDataServer/PySysDB/tagHorse.txt @@ -11,3 +11,6 @@ 305 290 260 1 1 40 1 4 13968 GetMount7 306 288 258 1 1 50 1 5 21168 GetMount8 307 291 261 1 1 30 1 3 2116 GetMount11 +308 292 262 1 1 50 1 5 13968 GetMount12 +309 293 263 1 1 30 1 3 21168 GetMount13 +310 294 264 1 1 50 1 5 2116 GetMount14 diff --git a/db/PyMongoDataServer/PySysDB/tagPetClassCost.txt b/db/PyMongoDataServer/PySysDB/tagPetClassCost.txt index cb23ec8..c8ef5e2 100644 --- a/db/PyMongoDataServer/PySysDB/tagPetClassCost.txt +++ b/db/PyMongoDataServer/PySysDB/tagPetClassCost.txt @@ -609,3 +609,163 @@ 50106311 28 5726 8551 50106311 29 5980 9043 50106311 30 0 9541 +50106312 1 987 139 +50106312 2 1071 277 +50106312 3 1163 425 +50106312 4 1261 582 +50106312 5 1367 749 +50106312 6 1480 927 +50106312 7 1599 1116 +50106312 8 1726 1318 +50106312 9 1859 1532 +50106312 10 2000 1759 +50106312 11 2147 1999 +50106312 12 2302 2254 +50106312 13 2463 2526 +50106312 14 2632 2814 +50106312 15 2807 3120 +50106312 16 2990 3443 +50106312 17 3180 3784 +50106312 18 3376 4143 +50106312 19 3580 4521 +50106312 20 3790 4918 +50106312 21 4008 5335 +50106312 22 4232 5764 +50106312 23 4464 6205 +50106312 24 4702 6655 +50106312 25 4948 7116 +50106312 26 5200 7586 +50106312 27 5460 8065 +50106312 28 5726 8551 +50106312 29 5980 9043 +50106312 30 0 9541 +50106313 1 2468 1440 +50106313 2 2679 1785 +50106313 3 2908 2154 +50106313 4 3154 2546 +50106313 5 3418 2964 +50106313 6 3700 3409 +50106313 7 3999 3882 +50106313 8 4315 4386 +50106313 9 4649 4921 +50106313 10 5000 5489 +50106313 11 5369 6089 +50106313 12 5755 6728 +50106313 13 6159 7407 +50106313 14 6581 8127 +50106313 15 7019 8891 +50106313 16 7476 9698 +50106313 17 7950 10551 +50106313 18 8441 11449 +50106313 19 8950 12394 +50106313 20 9476 13388 +50106313 21 10020 14430 +50106313 22 10581 15502 +50106313 23 11160 16603 +50106313 24 11756 17730 +50106313 25 12370 18882 +50106313 26 13001 20057 +50106313 27 13650 21254 +50106313 28 14316 22469 +50106313 29 15000 23700 +50106313 30 15701 24945 +50106313 31 16420 26201 +50106313 32 17157 27482 +50106313 33 17910 28786 +50106313 34 18682 30111 +50106313 35 19470 31456 +50106313 36 20277 32819 +50106313 37 21100 34198 +50106313 38 21941 35591 +50106313 39 22800 36995 +50106313 40 23676 38409 +50106314 1 2468 1440 +50106314 2 2679 1785 +50106314 3 2908 2154 +50106314 4 3154 2546 +50106314 5 3418 2964 +50106314 6 3700 3409 +50106314 7 3999 3882 +50106314 8 4315 4386 +50106314 9 4649 4921 +50106314 10 5000 5489 +50106314 11 5369 6089 +50106314 12 5755 6728 +50106314 13 6159 7407 +50106314 14 6581 8127 +50106314 15 7019 8891 +50106314 16 7476 9698 +50106314 17 7950 10551 +50106314 18 8441 11449 +50106314 19 8950 12394 +50106314 20 9476 13388 +50106314 21 10020 14430 +50106314 22 10581 15502 +50106314 23 11160 16603 +50106314 24 11756 17730 +50106314 25 12370 18882 +50106314 26 13001 20057 +50106314 27 13650 21254 +50106314 28 14316 22469 +50106314 29 15000 23700 +50106314 30 15701 24945 +50106314 31 16420 26201 +50106314 32 17157 27482 +50106314 33 17910 28786 +50106314 34 18682 30111 +50106314 35 19470 31456 +50106314 36 20277 32819 +50106314 37 21100 34198 +50106314 38 21941 35591 +50106314 39 22800 36995 +50106314 40 23676 38409 +50106315 1 2468 1440 +50106315 2 2679 1785 +50106315 3 2908 2154 +50106315 4 3154 2546 +50106315 5 3418 2964 +50106315 6 3700 3409 +50106315 7 3999 3882 +50106315 8 4315 4386 +50106315 9 4649 4921 +50106315 10 5000 5489 +50106315 11 5369 6089 +50106315 12 5755 6728 +50106315 13 6159 7407 +50106315 14 6581 8127 +50106315 15 7019 8891 +50106315 16 7476 9698 +50106315 17 7950 10551 +50106315 18 8441 11449 +50106315 19 8950 12394 +50106315 20 9476 13388 +50106315 21 10020 14430 +50106315 22 10581 15502 +50106315 23 11160 16603 +50106315 24 11756 17730 +50106315 25 12370 18882 +50106315 26 13001 20057 +50106315 27 13650 21254 +50106315 28 14316 22469 +50106315 29 15000 23700 +50106315 30 15701 24945 +50106315 31 16420 26201 +50106315 32 17157 27482 +50106315 33 17910 28786 +50106315 34 18682 30111 +50106315 35 19470 31456 +50106315 36 20277 32819 +50106315 37 21100 34198 +50106315 38 21941 35591 +50106315 39 22800 36995 +50106315 40 23676 38409 +50106315 41 24570 39829 +50106315 42 25481 41304 +50106315 43 26410 42832 +50106315 44 27356 44417 +50106315 45 28320 46058 +50106315 46 29301 47758 +50106315 47 30300 49516 +50106315 48 31316 51334 +50106315 49 32392 53213 +50106315 50 0 55154 diff --git a/db/PyMongoDataServer/PySysDB/tagPetInfo.txt b/db/PyMongoDataServer/PySysDB/tagPetInfo.txt index ae3ded2..e189fe9 100644 --- a/db/PyMongoDataServer/PySysDB/tagPetInfo.txt +++ b/db/PyMongoDataServer/PySysDB/tagPetInfo.txt @@ -16,3 +16,7 @@ 50106309 5 GetPet14 4217 1 1000 1 50 6 48440|48445|48450 4|10|20 ['PetUpLv','PetUpLv','PetUpLv'] 14400 50106310 4 GetPet15 4218 1 1000 1 40 6 48425|48430|48435 4|10|20 ['PetUpLv','PetUpLv','PetUpLv'] 7200 50106311 3 GetPet16 4219 1 1000 1 30 6 48455|48460|48465 4|10|20 ['PetUpLv','PetUpLv','PetUpLv'] 1396 +50106312 3 GetPet17 4220 1 1000 1 30 6 48395|48400|48405 4|10|20 ['PetUpLv','PetUpLv','PetUpLv'] 1440 +50106313 4 GetPet18 4221 1 1000 1 40 6 48440|48445|48450 4|10|20 ['PetUpLv','PetUpLv','PetUpLv'] 14400 +50106314 4 GetPet19 4222 1 1000 1 40 6 48425|48430|48435 4|10|20 ['PetUpLv','PetUpLv','PetUpLv'] 7200 +50106315 5 GetPet20 4223 1 1000 1 50 6 48455|48460|48465 4|10|20 ['PetUpLv','PetUpLv','PetUpLv'] 1396 diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt index 01d39a7..ffaa46a 100644 --- a/db/PyMongoDataServer/SysDB/tagChinItem.txt +++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt @@ -267,7 +267,7 @@ 1139 1 0 混乱妖域经验丹 13 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 4 0 50 0 1 0 0 215 9600 400 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 1140 1 0 混乱妖域经验丹 13 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 4 0 50 0 1 0 0 215 10800 400 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 1141 1 0 混乱妖域经验丹 13 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 4 0 50 0 1 0 0 215 12000 400 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 -1142 1 0 麒麟之府经验丹 13 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 4 0 50 0 1 0 0 215 3600 400 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 +1142 1 0 麒麟之府经验丹 13 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 4 0 50 0 1 0 0 215 1800 400 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 1143 1 0 麒麟之府经验丹 13 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 4 0 50 0 1 0 0 215 600 400 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 1500 1 0 麒麟魂魄 76 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 10 0 10 0 1 0 0 233 31190 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 1501 1 0 宗门令牌 76 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 25 0 10 0 1 0 0 233 60010 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 @@ -588,6 +588,10 @@ 4217 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 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4218 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 4219 1 0 灵宠：海牛侍卫 26 0 1 0 0 1 1 0 1 0 1 0 0 0 0 0 1 388 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 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +4220 1 0 灵宠：雷震子 26 0 1 0 0 1 1 0 1 0 1 0 0 0 0 0 1 1000 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 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +4221 1 0 灵宠：冰剑士 26 0 1 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 +4222 1 0 灵宠：双头火狼 26 0 1 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 +4223 1 0 灵宠：雷蛟 26 0 1 0 0 1 1 0 1 0 1 0 0 0 0 0 1 388 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 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4250 1 0 冰火冥魂碎片 125 0 1 0 0 999 1 0 1 0 1 0 0 0 0 0 1 200 0 100 0 0 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 200 0 100 0 0 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 200 0 100 0 0 0 0 0 4213 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 6523df4..9a90070 100644 --- a/db/PyMongoDataServer/SysDB/tagChinNPC.txt +++ b/db/PyMongoDataServer/SysDB/tagChinNPC.txt @@ -300,6 +300,10 @@ 50106309 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 50106310 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 50106311 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 +50106312 16 0 雷震子 1 0 3 3 3 1 0 0 3 3 3 0 0 0 0 0 0 0 0 3 3 0 300 2 8 0 0 0 0 0 0 0 0 0 20 2 3 3 0 0 0 0 0 0 105 0 1 +50106313 16 0 冰剑士 1 0 3 3 3 1 0 0 3 3 3 0 0 0 0 0 0 0 0 3 3 0 300 2 8 0 0 0 0 0 0 0 0 0 20 2 3 3 0 0 0 0 0 0 105 0 1 +50106314 16 0 双头火狼 1 0 3 3 3 1 0 0 3 3 3 0 0 0 0 0 0 0 0 3 3 0 300 2 8 0 0 0 0 0 0 0 0 0 20 2 3 3 0 0 0 0 0 0 105 0 1 +50106315 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