From 86d3ff3ed721a050042f0011014c91c32701e5ce Mon Sep 17 00:00:00 2001
From: cehua_LC <tingame100@163.com>
Date: 星期五, 21 九月 2018 21:57:28 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagLVAward.txt | 2 +-
db/PyMongoDataServer/PySysDB/tagResourcesBack.txt | 2 +-
db/PyMongoDataServer/SysDB/tagChinNPC.txt | 14 +++++++-------
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/db/PyMongoDataServer/PySysDB/tagLVAward.txt b/db/PyMongoDataServer/PySysDB/tagLVAward.txt
index a496403..cf878f7 100644
--- a/db/PyMongoDataServer/PySysDB/tagLVAward.txt
+++ b/db/PyMongoDataServer/PySysDB/tagLVAward.txt
@@ -2,7 +2,7 @@
1 60 0 {"1":[[922,1],[4151,2],[911,1],[2,1]],"2":[[922,1],[4151,2],[911,1],[2,1]],"3":[[922,1],[4151,2],[911,1],[2,1]]} 2 [[4151,10]]
2 80 0 {"1":[[3511,1],[1500,1],[2,1],[2107,1]],"2":[[3511,1],[1500,1],[2,1],[2107,1]],"3":[[3511,1],[1500,1],[2,1],[2107,1]]} 2 [[181,10]]
3 100 0 {"1":[[4151,5],[1502,1],[4001,1],[2107,1]],"2":[[4151,5],[1502,1],[4001,1],[2107,1]],"3":[[4151,5],[1502,1],[4001,1],[2107,1]]} 2 [[194,1]]
-4 120 0 {"1":[[105,2],[102,5],[141,10],[911,1]],"2":[[105,2],[102,5],[141,10],[911,1]],"3":[[105,2],[102,5],[141,10],[911,1]]} 2 [[1001,1]]
+4 120 0 {"1":[[105,2],[102,5],[141,15],[911,1]],"2":[[105,2],[102,5],[141,15],[911,1]],"3":[[105,2],[102,5],[141,15],[911,1]]} 2 [[1001,1]]
5 150 0 {"1":[[1501,1],[142,20],[151,1],[30,100]],"2":[[1501,1],[142,20],[151,1],[30,100]],"3":[[1501,1],[142,20],[151,1],[30,100]]} 3 [[5,1]]
6 180 0 {"1":[[3801,1],[181,5],[4151,5],[911,1]],"2":[[3801,1],[181,5],[4151,5],[911,1]],"3":[[3801,1],[181,5],[4151,5],[911,1]]} 3 [[199,1]]
7 200 0 {"1":[[2241,1],[3503,1],[912,1],[181,10]],"2":[[2241,1],[3503,1],[912,1],[181,10]],"3":[[2241,1],[3503,1],[912,1],[181,10]]} 4 [[1002,1]]
diff --git a/db/PyMongoDataServer/PySysDB/tagResourcesBack.txt b/db/PyMongoDataServer/PySysDB/tagResourcesBack.txt
index cd2e39b..fdd2726 100644
--- a/db/PyMongoDataServer/PySysDB/tagResourcesBack.txt
+++ b/db/PyMongoDataServer/PySysDB/tagResourcesBack.txt
@@ -9,6 +9,6 @@
8 14 0 8 0 {"exp":"4000*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":105,"ItemCount":"2"}]} 50000 {"exp":"2200*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":105,"ItemCount":"1"}]}
9 8 0 25 0 {"exp":"12000*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":103,"ItemCount":"1"},{"ItemID":181,"ItemCount":"8"},{"ItemID":102,"ItemCount":"2"}]} 150000 {"exp":"6600*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":181,"ItemCount":"4"},{"ItemID":102,"ItemCount":"4"}]}
10 7 0 50 0 {"exp":"72000*reExp", "item":[{"ItemID":24,"ItemCount":"100"},{"ItemID":26,"ItemCount":"33000"}]} 167000 {"exp":"39600*reExp", "item":[{"ItemID":24,"ItemCount":"100"},{"ItemID":26,"ItemCount":"18150"}]}
-11 11 0 25 50 {"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":29,"ItemCount":"max(min(1,extraData),0)*634828+max(min(2,extraData)-1,0)*665472+max(min(3,extraData)-2,0)*814080+max(min(4,extraData)-3,0)*935424+max(min(5,extraData)-4,0)*1123776+max(min(6,extraData)-5,0)*1332864+max(min(7,extraData)-6,0)*1562688+max(min(8,extraData)-7,0)*1812672"},{"ItemID":141,"ItemCount":"max(min(1,extraData),0)*24+max(min(2,extraData)-1,0)*28+max(min(3,extraData)-2,0)*7"},{"ItemID":142,"ItemCount":"max(min(2,extraData)-1,0)*7+max(min(3,extraData)-2,0)*14+max(min(4,extraData)-3,0)*28+max(min(5,extraData)-4,0)*7"},{"ItemID":143,"ItemCount":"max(min(3,extraData)-2,0)*2+max(min(4,extraData)-2,0)*7+max(min(5,extraData)-3,0)*14+max(min(6,extraData)-4,0)*28"},{"ItemID":144,"ItemCount":"max(min(5,extraData)-4,0)*2+max(min(6,extraData)-5,0)*7+max(min(7,extraData)-6,0)*36"},{"ItemID":153,"ItemCount":"max(min(8,extraData)-7,0)*24"}]} 33000 {"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":29,"ItemCount":"max(min(1,extraData),0)*+max(min(2,extraData)-1,0)*634828+max(min(3,extraData)-2,0)*665472+max(min(4,extraData)-3,0)*814080+max(min(5,extraData)-4,0)*935424+max(min(6,extraData)-5,0)*1123776+max(min(7,extraData)-6,0)*1332864+max(min(8,extraData)-7,0)*1562688"},{"ItemID":141,"ItemCount":"max(min(1,extraData),0)*24+max(min(2,extraData)-1,0)*28+max(min(3,extraData)-2,0)*7"},{"ItemID":142,"ItemCount":"max(min(2,extraData),0)*7+max(min(3,extraData)-2,0)*14+max(min(4,extraData)-3,0)*28+max(min(5,extraData)-4,0)*7"},{"ItemID":143,"ItemCount":"max(min(3,extraData),0)*2+max(min(4,extraData)-2,0)*7+max(min(5,extraData)-3,0)*14+max(min(6,extraData)-4,0)*28"},{"ItemID":144,"ItemCount":"max(min(5,extraData),0)*2+max(min(6,extraData)-1,0)*7+max(min(7,extraData)-2,0)*36"},{"ItemID":153,"ItemCount":"max(min(8,extraData)-7,0)*24"}]}
+11 11 0 25 50 {"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":29,"ItemCount":"max(min(1,extraData),0)*634828+max(min(2,extraData)-1,0)*665472+max(min(3,extraData)-2,0)*814080+max(min(4,extraData)-3,0)*935424+max(min(5,extraData)-4,0)*1123776+max(min(6,extraData)-5,0)*1332864+max(min(7,extraData)-6,0)*1562688+max(min(8,extraData)-7,0)*1812672"},{"ItemID":141,"ItemCount":"max(min(1,extraData),0)*24+max(min(2,extraData)-1,0)*28+max(min(3,extraData)-2,0)*7"},{"ItemID":142,"ItemCount":"max(min(2,extraData)-1,0)*7+max(min(3,extraData)-2,0)*14+max(min(4,extraData)-3,0)*28+max(min(5,extraData)-4,0)*7"},{"ItemID":143,"ItemCount":"max(min(3,extraData)-2,0)*2+max(min(4,extraData)-2,0)*7+max(min(5,extraData)-3,0)*14+max(min(6,extraData)-4,0)*28"},{"ItemID":144,"ItemCount":"max(min(5,extraData)-4,0)*2+max(min(6,extraData)-5,0)*7+max(min(7,extraData)-6,0)*36"},{"ItemID":153,"ItemCount":"max(min(8,extraData)-7,0)*24"}]} 33000 {"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":29,"ItemCount":"max(min(1,extraData),0)*436444+max(min(2,extraData)-1,0)*457512+max(min(3,extraData)-2,0)*559680+max(min(4,extraData)-3,0)*643104+max(min(5,extraData)-4,0)*772596+max(min(6,extraData)-5,0)*916344+max(min(7,extraData)-6,0)*1074348+max(min(8,extraData)-7,0)*1246212"},{"ItemID":141,"ItemCount":"max(min(1,extraData),0)*16+max(min(2,extraData)-1,0)*19+max(min(3,extraData)-2,0)*4"},{"ItemID":142,"ItemCount":"max(min(2,extraData)-1,0)*4+max(min(3,extraData)-2,0)*9+max(min(4,extraData)-3,0)*19+max(min(5,extraData)-4,0)*4"},{"ItemID":143,"ItemCount":"max(min(3,extraData)-2,0)*1+max(min(4,extraData)-2,0)*4+max(min(5,extraData)-3,0)*9+max(min(6,extraData)-4,0)*19"},{"ItemID":144,"ItemCount":"max(min(5,extraData)-4,0)*1+max(min(6,extraData)-5,0)*4+max(min(7,extraData)-6,0)*24"},{"ItemID":153,"ItemCount":"max(min(8,extraData)-7,0)*16"}]}
12 9 0 25 0 {"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":1021,"ItemCount":"1"},{"ItemID":1131,"ItemCount":"(3*max(min(3,dataEx)-2,0)+2*max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(1,extraData),0)-max(min(2,extraData)-1,0))"},{"ItemID":1132,"ItemCount":"(3*max(min(3,dataEx)-2,0)+2*max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(2,extraData)-1,0)-max(min(3,extraData)-2,0))"},{"ItemID":1133,"ItemCount":"(3*max(min(3,dataEx)-2,0)+2*max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(3,extraData)-2,0)-max(min(4,extraData)-3,0))"},{"ItemID":1134,"ItemCount":"(2*max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(4,dataEx)-3,0))*(max(min(1,extraData),0)-max(min(2,extraData)-1,0))"},{"ItemID":1135,"ItemCount":"(2*max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(4,dataEx)-3,0))*(max(min(2,extraData)-1,0)-max(min(3,extraData)-2,0))"},{"ItemID":1136,"ItemCount":"(2*max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(4,dataEx)-3,0))*(max(min(3,extraData)-2,0)-max(min(4,extraData)-3,0))"}]} 200000 {"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":1020,"ItemCount":"1"},{"ItemID":1131,"ItemCount":"(2*max(min(3,dataEx)-2,0)+max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(1,extraData),0)-max(min(2,extraData)-1,0))"},{"ItemID":1132,"ItemCount":"(2*max(min(3,dataEx)-2,0)+max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(2,extraData)-1,0)-max(min(3,extraData)-2,0))"},{"ItemID":1133,"ItemCount":"(2*max(min(3,dataEx)-2,0)+max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(3,extraData)-2,0)-max(min(4,extraData)-3,0))"},{"ItemID":1134,"ItemCount":"(max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(4,dataEx)-3,0))*(max(min(1,extraData),0)-max(min(2,extraData)-1,0))"},{"ItemID":1135,"ItemCount":"(max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(4,dataEx)-3,0))*(max(min(2,extraData)-1,0)-max(min(3,extraData)-2,0))"},{"ItemID":1136,"ItemCount":"(max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(4,dataEx)-3,0))*(max(min(3,extraData)-2,0)-max(min(4,extraData)-3,0))"}]}
13 12 0 20 0 {"exp":"3000*reExp", "item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":2211,"ItemCount":"6"}], "money":"500000"} 200000 {"exp":"1650*reExp", "item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":2211,"ItemCount":"3"}]}
diff --git a/db/PyMongoDataServer/SysDB/tagChinNPC.txt b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
index fcb7816..6af5628 100644
--- a/db/PyMongoDataServer/SysDB/tagChinNPC.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
@@ -797,13 +797,13 @@
61203007 2 0 境界·组队 350 2 56972 56972 8165 19 0 0 10000 13133 0 0 0 0 0 0 11647263 0 2500 2118168 46 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 98289581 2 0 0 0 3 0 34 186 1 1
61203008 2 0 境界·组队 380 2 88206 88206 10460 22 0 0 10000 15783 0 0 0 0 0 0 16005454 0 2500 2167516 50 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 39063550 4 0 0 0 3 0 35 186 1 1
61303001 14 0 仙盟采集桌 1 0 1 1 1 13 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 15 2 3000 0 0 0 0 0 0 0 214 0 1
-30601001 2 0 暗影剑士 105 0 638 638 0 0 0 0 0 161 0 0 0 0 0 0 0 0 2500 40420 17 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 25376 0 0 0 0 1 0 0 1 1 1
-30601002 2 0 剑魂 105 0 605 605 0 0 0 0 0 130 0 0 0 0 0 0 0 0 2500 40420 17 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 38064 0 0 0 0 1 0 0 1 1 1
-30603001 2 0 御剑尊者 105 0 1916 1916 0 0 0 0 0 1354 0 0 0 0 0 0 0 0 2500 40420 17 0 300 2 6 10041 23030 10042 0 0 0 0 0 0 15 2 232621 0 0 0 0 5 0 0 186 1 1
-30601003 2 0 魔化哨兵 150 0 1167 1167 0 0 0 0 0 406 0 0 0 0 0 0 0 0 2500 51605 20 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 124505 0 0 0 0 1 0 0 1 1 1
-30601004 2 0 狂暴妖兵 150 0 1077 1077 0 0 0 0 0 325 0 0 0 0 0 0 0 0 2500 51605 20 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 160079 0 0 0 0 1 0 0 1 1 1
-30601005 2 0 魔界冥魂 150 0 2857 2857 0 0 0 0 0 1925 0 0 0 0 0 0 0 0 2500 51605 20 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 711463 0 0 0 0 1 0 0 1 1 1
-30603002 2 0 逍遥城主 150 0 4999 4999 0 0 0 0 0 3850 0 0 0 0 0 0 0 0 2500 51605 20 0 300 2 6 10043 23030 10044 0 0 0 0 0 0 15 2 1245062 0 0 0 0 5 0 0 186 1 1
+30601001 2 0 暗影剑士 105 0 725 725 0 0 0 0 0 171 0 0 0 0 0 0 0 0 2500 46530 18 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 41145 0 0 0 0 1 0 0 1 1 1
+30601002 2 0 剑魂 105 0 689 689 0 0 0 0 0 139 0 0 0 0 0 0 0 0 2500 46530 18 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 61719 0 0 0 0 1 0 0 1 1 1
+30603001 2 0 御剑尊者 105 0 2117 2117 0 0 0 0 0 1450 0 0 0 0 0 0 0 0 2500 46530 18 0 300 2 6 10041 23030 10042 0 0 0 0 0 0 15 2 377177 0 0 0 0 5 0 0 186 1 1
+30601003 2 0 魔化哨兵 150 0 1889 1889 0 0 0 0 0 757 0 0 0 0 0 0 0 0 2500 73131 25 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 152832 0 0 0 0 1 0 0 1 1 1
+30601004 2 0 狂暴妖兵 150 0 1708 1708 0 0 0 0 0 606 0 0 0 0 0 0 0 0 2500 73131 25 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 196499 0 0 0 0 1 0 0 1 1 1
+30601005 2 0 魔界冥魂 150 0 5241 5241 0 0 0 0 0 3549 0 0 0 0 0 0 0 0 2500 73131 25 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 873334 0 0 0 0 1 0 0 1 1 1
+30603002 2 0 逍遥城主 150 0 9503 9503 0 0 0 0 0 7098 0 0 0 0 0 0 0 0 2500 73131 25 0 300 2 6 10043 23030 10044 0 0 0 0 0 0 15 2 1528336 0 0 0 0 5 0 0 186 1 1
30601006 2 0 冰霜巨蝎 200 0 2697 2697 0 0 0 0 0 837 0 0 0 0 0 0 0 0 2500 90803 28 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 474364 0 0 0 0 1 0 0 1 1 1
30601007 2 0 冰川蛮兽 200 0 2772 2772 0 0 0 0 0 886 0 0 0 0 0 0 0 0 2500 90803 28 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 569237 0 0 0 0 1 0 0 1 1 1
30601008 2 0 雪山巨猿 200 0 8180 8180 0 0 0 0 0 4869 0 0 0 0 0 0 0 0 2500 90803 28 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 2466700 0 0 0 0 1 0 0 1 1 1
--
Gitblit v1.8.0