From 164aea41b28fb20dd6cb47ec67ccf39451d1c701 Mon Sep 17 00:00:00 2001
From: cehua_LC <tingame100@163.com>
Date: 星期五, 28 九月 2018 15:38:45 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagMapEventPoint.txt | 13 +++++++------
db/PyMongoDataServer/PySysDB/tagHorse.txt | 4 ----
db/PyMongoDataServer/PySysDB/tagPetInfo.txt | 5 -----
CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt | 14 +++++++-------
db/PyMongoDataServer/SysDB/tagChinItem.txt | 2 ++
db/PyMongoDataServer/SysDB/tagChinNPC.txt | 14 +++++++-------
db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt | 4 ++--
7 files changed, 25 insertions(+), 31 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
index 4be9a81..b751c86 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
@@ -436,13 +436,13 @@
20203007 荒漠巨兽 405
20302001 小宝箱 1
20302002 大宝箱 1
-20302003 秘境守卫 265
-20302004 黄金狮 275
-20302005 金甲蛮牛 285
-20302006 灵鲛斗士 295
-20302007 紫炎灵狮 305
-20302008 金甲剑士 1
-20302009 黄金战将 1
+20302003 秘境守卫 260
+20302004 黄金狮 270
+20302005 金甲蛮牛 280
+20302006 灵鲛斗士 290
+20302007 紫炎灵狮 300
+20302008 金甲剑士 310
+20302009 黄金战将 320
20303001 残暴古熊王 265
20303002 魅影蛛皇 275
20303003 紫金貔貅 285
diff --git a/db/PyMongoDataServer/PySysDB/tagHorse.txt b/db/PyMongoDataServer/PySysDB/tagHorse.txt
index 9ca9f7a..f28c72f 100644
--- a/db/PyMongoDataServer/PySysDB/tagHorse.txt
+++ b/db/PyMongoDataServer/PySysDB/tagHorse.txt
@@ -11,7 +11,3 @@
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 40 1 4 13968 GetMount12
-309 293 263 1 1 30 1 3 21168 GetMount13
-310 294 264 1 1 40 1 4 2116 GetMount14
-311 295 265 1 1 20 1 2 2116 GetMount15
diff --git a/db/PyMongoDataServer/PySysDB/tagMapEventPoint.txt b/db/PyMongoDataServer/PySysDB/tagMapEventPoint.txt
index 953d11e..a43abc6 100644
--- a/db/PyMongoDataServer/PySysDB/tagMapEventPoint.txt
+++ b/db/PyMongoDataServer/PySysDB/tagMapEventPoint.txt
@@ -103,12 +103,13 @@
21100 20203005 0 0 0
21100 20203006 0 0 0
21100 20203007 0 0 0
-21110 20302001 110 130 767
-21110 20302002 120 140 867
-21110 20302003 160 180 1336
-21110 20302004 170 190 1507
-21110 20302005 220 240 2470
-21110 20302006 230 250 2797
+21110 20302003 250 260 4016
+21110 20302004 260 270 4327
+21110 20302005 270 280 4729
+21110 20302006 280 290 5235
+21110 20302007 290 300 5931
+21110 20302008 300 310 6891
+21110 20302009 310 320 7225
21110 20303001 0 0 0
21110 20303002 0 0 0
21110 20303003 0 0 0
diff --git a/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt b/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt
index 5ca77c1..4477168 100644
--- a/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt
+++ b/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt
@@ -210,13 +210,13 @@
30603002 0 0 0 0 [] 0 {} 0 {} {} [] [] {} {} {} {} {} 0 0 0 0 [] []
30603003 0 0 0 0 [] 0 {} 0 {} {} [] [] {} {} {} {} {} 0 0 0 0 [] []
30603004 0 0 0 0 [] 0 {} 0 {} {} [] [] {} {} {} {} {} 0 0 0 0 [] []
-20302001 0 0 0 0 [] 0 {} 0 {} {} [] [] {} {} {1000:700000,2000:50000,2001:0,2002:0} {} {} 0 0 0 0 [] []
-20302002 0 0 0 0 [] 0 {} 0 {} {} [] [] {} {} {1000:700000,2000:50000,2001:0,2002:0} {} {} 0 0 0 0 [] []
20302003 0 0 0 0 [] 0 {} 0 {} {} [] [] {} {} {1000:700000,2000:50000,2001:0,2002:0} {} {} 0 0 0 0 [] []
20302004 0 0 0 0 [] 0 {} 0 {} {} [] [] {} {} {1000:700000,2000:50000,2001:0,2002:0} {} {} 0 0 0 0 [] []
20302005 0 0 0 0 [] 0 {} 0 {} {} [] [] {} {} {1000:700000,2000:50000,2001:0,2002:0} {} {} 0 0 0 0 [] []
20302006 0 0 0 0 [] 0 {} 0 {} {} [] [] {} {} {1000:700000,2000:50000,2001:0,2002:0} {} {} 0 0 0 0 [] []
20302007 0 0 0 0 [] 0 {} 0 {} {} [] [] {} {} {1000:700000,2000:50000,2001:0,2002:0} {} {} 0 0 0 0 [] []
+20302008 0 0 0 0 [] 0 {} 0 {} {} [] [] {} {} {1000:700000,2000:50000,2001:0,2002:0} {} {} 0 0 0 0 [] []
+20302009 0 0 0 0 [] 0 {} 0 {} {} [] [] {} {} {1000:700000,2000:50000,2001:0,2002:0} {} {} 0 0 0 0 [] []
20303001 0 0 0 0 [(394309,0),(537642,(6,2,107)),(1000000,(6,3,107))] 20 {(6,4,102):1000000,(6,5,102):2000} 1 {4:2,5:1} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {} {} {1000:0,2000:1800000,2001:1000000,2002:200000,3001:50000,3002:0,3003:0} {} {} 25 800 1123 1685 [] [1144]
20303002 0 0 0 0 [(394309,0),(537642,(6,2,107)),(1000000,(6,3,107))] 20 {(6,4,102):1000000,(6,5,102):2000} 1 {4:2,5:1} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {} {} {1000:0,2000:1750000,2001:1000000,2002:250000,3001:100000,3002:0,3003:0} {} {} 25 800 1123 1685 [] [1144]
20303003 0 0 0 0 [(394309,0),(537642,(6,2,107)),(1000000,(6,3,107))] 20 {(6,4,102):1000000,(6,5,102):2000} 1 {4:2,5:1} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {} {} {1000:0,2000:1700000,2001:1000000,2002:300000,3001:112500,3002:37500,3003:0} {} {} 25 800 1129 1694 [] [1144]
diff --git a/db/PyMongoDataServer/PySysDB/tagPetInfo.txt b/db/PyMongoDataServer/PySysDB/tagPetInfo.txt
index 31293b7..ae3ded2 100644
--- a/db/PyMongoDataServer/PySysDB/tagPetInfo.txt
+++ b/db/PyMongoDataServer/PySysDB/tagPetInfo.txt
@@ -13,11 +13,6 @@
50106305 3 GetPet11 4213 1 1000 1 30 6 48380|48385|48390 4|10|20 ['PetUpLv','PetUpLv','PetUpLv'] 2476
50106306 4 GetPet12 4214 1 1000 1 40 6 48410|48415|48420 4|10|20 ['PetUpLv','PetUpLv','PetUpLv8'] 4608
50106307 2 GetPet1 4215 1 1000 1 20 6 48395|48400|48405 4|10|20 ['PetUpLv','PetUpLv','PetUpLv'] 1440
-50106308 2 GetPet13 4216 1 1000 1 20 6 48395|48400|48405 4|10|20 ['PetUpLv','PetUpLv','PetUpLv'] 1440
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 4 GetPet20 4223 1 1000 1 40 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 e7fd45e..46a6dc8 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -276,6 +276,7 @@
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
1502 1 0 封魔令牌 76 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 20 0 10 0 1 0 0 233 52010 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
1503 1 0 娲皇卷轴 76 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 20 0 10 0 1 0 0 233 51010 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
+1504 1 0 矿脉地图 76 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 20 0 10 0 1 0 0 233 51010 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
2050 1 0 世界喇叭 48 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 50 0 5 0 0 0 0 2700 1 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
2100 1 0 铜钱 43 0 0 0 0 1 1 1 1 0 1 0 0 1 0 0 1 1 0 5 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 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
2101 1 0 铜钱 43 0 0 0 0 1 1 1 1 0 1 0 0 1 0 0 1 1 0 5 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 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
@@ -498,6 +499,7 @@
2387 1 0 神兽大宝箱 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 150 0 5 0 1 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 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0
2388 1 0 神兽小宝箱 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 150 0 5 0 1 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 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 20 0 0 0 0 0 0 0 0
2389 1 0 神兽祝福宝箱 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 150 0 5 0 1 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 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+2390 1 0 神兽紫装宝箱 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 150 0 5 0 1 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 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
3501 1 0 1级生命翡翠 25 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 10 0 10 0 0 0 1 225 1 1 3502 6 190 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
3502 1 0 2级生命翡翠 25 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 30 0 10 0 0 0 1 225 1 2 3503 6 465 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
3503 1 0 3级生命翡翠 25 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 90 0 20 0 0 0 1 225 1 3 3504 6 1160 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
diff --git a/db/PyMongoDataServer/SysDB/tagChinNPC.txt b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
index 7680fa8..6227c88 100644
--- a/db/PyMongoDataServer/SysDB/tagChinNPC.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
@@ -436,13 +436,13 @@
20203007 2 0 荒漠巨兽 405 0 69721 69721 0 22 0 0 10000 42694 0 1 0 0 0 0 0 3 3000 2765386 51 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 78954133 16 10000 0 0 5 0 0 186 1 1
20302001 14 0 小宝箱 1 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 0 0 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 0 0 0 0 214 0 1
20302002 14 0 大宝箱 1 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 0 0 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 0 0 0 0 214 0 1
-20302003 2 0 秘境守卫 265 0 4016 4016 0 10 0 0 0 1030 0 0 0 0 0 0 0 3 3000 1674985 34 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 6628003 0 0 0 0 1 51649324 0 1 1 1
-20302004 2 0 黄金狮 275 0 4327 4327 0 11 0 0 0 1042 0 0 0 0 0 0 0 3 3000 1771783 35 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 8675718 0 0 0 0 1 59423628 0 1 1 1
-20302005 2 0 金甲蛮牛 285 0 4729 4729 0 12 0 0 0 1052 0 0 0 0 0 0 0 3 3000 1868581 36 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 12152033 0 0 0 0 1 68578949 0 1 1 1
-20302006 2 0 灵鲛斗士 295 0 5235 5235 0 12 0 0 0 1059 0 0 0 0 0 0 0 3 3000 1965379 37 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 14581350 0 0 0 0 1 79339802 0 1 1 1
-20302007 2 0 紫炎灵狮 305 0 5931 5931 0 13 0 0 0 1071 0 0 0 0 0 0 0 3 3000 2062177 38 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 17833603 0 0 0 0 1 91963645 0 1 1 1
-20302008 2 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 6 0 0 0 0 0 0 0 0 0 10 2 3 3 0 0 0 1 0 0 1 1 1
-20302009 2 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 6 0 0 0 0 0 0 0 0 0 10 2 3 3 0 0 0 1 0 0 1 1 1
+20302003 2 0 秘境守卫 260 0 4016 4016 0 10 0 0 0 1030 0 0 0 0 0 0 0 3 3000 1674985 34 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 6628003 0 0 0 0 1 435165 22 1 1 1
+20302004 2 0 黄金狮 270 0 4327 4327 0 11 0 0 0 1042 0 0 0 0 0 0 0 3 3000 1771783 35 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 8675718 0 0 0 0 1 528050 25 1 1 1
+20302005 2 0 金甲蛮牛 280 0 4729 4729 0 12 0 0 0 1052 0 0 0 0 0 0 0 3 3000 1868581 36 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 12152033 0 0 0 0 1 539535 29 1 1 1
+20302006 2 0 灵鲛斗士 290 0 5235 5235 0 12 0 0 0 1059 0 0 0 0 0 0 0 3 3000 1965379 37 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 14581350 0 0 0 0 1 546410 33 1 1 1
+20302007 2 0 紫炎灵狮 300 0 5931 5931 0 13 0 0 0 1071 0 0 0 0 0 0 0 3 3000 2062177 38 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 17833603 0 0 0 0 1 602510 38 1 1 1
+20302008 2 0 金甲剑士 310 0 6891 6891 0 14 0 0 0 1234 0 0 0 0 0 0 0 3 3000 2158975 39 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 21140553 0 0 0 0 1 809985 22 1 1 1
+20302009 2 0 黄金战将 320 0 7225 7225 0 15 0 0 0 1247 0 0 0 0 0 0 0 3 3000 2255773 40 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 26177276 0 0 0 0 1 1036030 25 1 1 1
20303001 2 0 残暴古熊王 265 0 12593 12593 0 10 0 0 10000 12579 0 1 0 0 0 0 0 3 3000 1674985 34 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 77326719 0 10000 0 0 5 0 0 186 1 1
20303002 2 0 魅影蛛皇 275 0 14450 14450 0 11 0 0 10000 14264 0 1 0 0 0 0 0 3 3000 1771783 35 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 1216726 1 10000 0 0 5 0 0 186 1 1
20303003 2 0 紫金貔貅 285 0 16750 16750 0 12 0 0 10000 16268 0 1 0 0 0 0 0 3 3000 1868581 36 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 41773740 1 10000 0 0 5 0 0 186 1 1
--
Gitblit v1.8.0