From 68d62a4a937984598feff32868bf8214f41ab968 Mon Sep 17 00:00:00 2001
From: cehua_LC <tingame100@163.com>
Date: 星期二, 21 八月 2018 14:27:33 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 db/PyMongoDataServer/PySysDB/tagStore.txt       |   22 ++++++++++------------
 db/PyMongoDataServer/PySysDB/tagFuncConfig.txt  |    2 +-
 db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt |   12 ++++++++++++
 3 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 63c5ad4..832eb8d 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -109,7 +109,7 @@
 MapDropBindRule	{52010:1}	0	0	0	0
 MapDropItemNoBind	{52010:[3801,4606,4608]}	0	0	0	0
 MapDropItemBind	{}	0	0	0	0
-JobItemDropSets	{2:[5012,5022],5:[4611,4612,4613,4614,4615]}				
+JobItemDropSets	{2:[5012,5022],5:[4611,4612,4613,4614,4615],1000:[8201,8214,8227,8240,8253],2000:[8202,8215,8228,8241,8254],2001:[8203,8216,8229,8242,8255],2002:[8204,8217,8230,8243,8256],3001:[8205,8218,8231,8244,8257],3002:[8205,8218,8231,8244,8257],3003:[8205,8218,8231,8244,8257],4001:[8208,8221,8234,8247,8260],4002:[8209,8222,8235,8248,8261],4003:[8210,8223,8236,8249,8262],5002:[8211,8224,8237,8250,8263],5003:[8212,8225,8238,8251,8264],6003:[8213,8226,8239,8252,8265]}				
 EquipDropPartSets	{102:[1,2],105:[3,4,5,6,7],107:[1,2,3,4,5,6,7],108:[8],204:[4],205:[5],206:[6]}				
 FamilyBOSSDropRule	6000+grade*800	min(2*playerCount,50)			
 FBGradeEquipDropRate	{}	{}	{30603001:{1:[[1019,1],[1134,3]], 2:[[1018,1],[1134,4]], 3:[[1017,1],[1134,5]], 4:[[1016,1],[1131,3],[1134,5]], 5:[[1015,1],[1131,6],[1134,5]]},30603002:{1:[[1019,1],[1135,3]], 2:[[1018,1],[1135,4]], 3:[[1017,1],[1135,5]], 4:[[1016,1],[1132,4],[1135,5]], 5:[[1015,1],[1132,8],[1135,5]]},30603003:{1:[[1019,1],[1136,3]], 2:[[1018,1],[1136,4]], 3:[[1017,1],[1136,5]], 4:[[1016,1],[1133,4],[1136,5]], 5:[[1015,1],[1133,8],[1136,5]]}}		
diff --git a/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt b/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt
index 3997cff..b7df290 100644
--- a/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt
+++ b/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt
@@ -211,3 +211,15 @@
 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	[]	[]
+20302003	0	0	0	0	[]	0	{}	0	{}	{}	[]	[]	{}	{}	{1000:500000,2000:100000,2001:50000,2002:10000}	{}	{}	0	0	0	0	[]	[]
+20302004	0	0	0	0	[]	0	{}	0	{}	{}	[]	[]	{}	{}	{1000:500000,2000:100000,2001:50000,2002:10000}	{}	{}	0	0	0	0	[]	[]
+20302005	0	0	0	0	[]	0	{}	0	{}	{}	[]	[]	{}	{}	{1000:500000,2000:100000,2001:50000,2002:10000}	{}	{}	0	0	0	0	[]	[]
+20302006	0	0	0	0	[]	0	{}	0	{}	{}	[]	[]	{}	{}	{1000:500000,2000:100000,2001:50000,2002:10000}	{}	{}	0	0	0	0	[]	[]
+20302007	0	0	0	0	[]	0	{}	0	{}	{}	[]	[]	{}	{}	{1000:500000,2000:100000,2001:50000,2002:10000}	{}	{}	0	0	0	0	[]	[]
+20303001	0	0	0	0	[]	0	{}	0	{}	{}	[]	[]	{}	{}	{1000:3000000,2000:1000000,2001:200000,2002:40000,3001:800000,3002:160000,3003:32000}	{}	{}	25	800	1123	1685	[]	[958]
+20303002	0	0	0	0	[]	0	{}	0	{}	{}	[]	[]	{}	{}	{1000:4000000,2000:1200000,2001:200000,2002:40000,3001:850000,3002:170000,3003:34000}	{}	{}	25	800	1123	1685	[]	[958]
+20303003	0	0	0	0	[]	0	{}	0	{}	{}	[]	[]	{}	{}	{1000:5000000,2000:1400000,2001:200000,2002:40000,3001:900000,3002:180000,3003:36000,4001:500000,4002:100000,4003:20000}	{}	{}	25	800	1129	1694	[]	[958]
+20303004	0	0	0	0	[]	0	{}	0	{}	{}	[]	[]	{}	{}	{1000:5000000,2000:1600000,2001:200000,2002:40000,3001:950000,3002:190000,3003:38000,4001:550000,4002:110000,4003:22000}	{}	{}	25	800	1129	1694	[]	[958]
+20303005	0	0	0	0	[]	0	{}	0	{}	{}	[]	[]	{}	{}	{1000:5000000,2000:1800000,2001:200000,2002:40000,3001:1000000,3002:200000,3003:40000,4001:600000,4002:120000,4003:24000,5002:80000}	{}	{}	25	800	1129	1694	[]	[958]
+20303006	0	0	0	0	[]	0	{}	0	{}	{}	[]	[]	{}	{}	{1000:5000000,2000:2000000,2001:200000,2002:40000,3001:1000000,3002:200000,3003:40000,4001:650000,4002:130000,4003:26000,5002:100000}	{}	{}	25	800	1356	1824	[]	[958]
+20303007	0	0	0	0	[]	0	{}	0	{}	{}	[]	[]	{}	{}	{1000:5000000,2000:2000000,2001:200000,2002:40000,3001:1000000,3002:200000,3003:40000,4001:700000,4002:140000,4003:28000,5002:120000}	{}	{}	25	800	1356	1824	[]	[958]
diff --git a/db/PyMongoDataServer/PySysDB/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt
index 109558e..776e548 100644
--- a/db/PyMongoDataServer/PySysDB/tagStore.txt
+++ b/db/PyMongoDataServer/PySysDB/tagStore.txt
@@ -55,21 +55,19 @@
 252	6	0	902	100	1	[]	0		0	0	0	0	3	6000	0	0	
 253	6	0	903	100	1	[]	0		0	0	0	0	3	15000	0	0	
 254	6	0	904	100	1	[]	0		0	0	0	0	3	30000	0	0	
-351	8	0	4611	1	1	[]	0		6	0	0	10	15	2	0	2	
-352	8	0	4612	1	1	[]	0		6	0	0	10	15	2	0	2	
-353	8	0	4613	1	1	[]	0		6	0	0	10	15	2	0	2	
-354	8	0	4614	1	1	[]	0		6	0	0	10	15	2	0	2	
-355	8	0	4615	1	1	[]	0		6	0	0	10	15	2	0	2	
+351	8	0	4611	1	1	[]	0		6	0	0	10	15	5	0	2	
+352	8	0	4612	1	1	[]	0		6	0	0	10	15	5	0	2	
+353	8	0	4613	1	1	[]	0		6	0	0	10	15	5	0	2	
+354	8	0	4614	1	1	[]	0		6	0	0	10	15	5	0	2	
+355	8	0	4615	1	1	[]	0		6	0	0	10	15	5	0	2	
 356	8	0	4609	1	1	[]	0		6	0	0	2	15	50	0	3	
 357	8	0	4610	1	1	[]	0		6	0	0	2	15	100	0	3	
 358	8	0	912	1	1	[]	0		6	0	0	4	15	30	0	4	
-359	8	0	252	1	1	[]	0		6	0	0	1	15	500	0	5	
-401	9	0	191	1	1	[]	0		6	0	0	1	15	50	0	2	
-402	9	0	192	1	1	[]	0		6	0	0	1	15	100	0	3	
-403	9	0	193	1	1	[]	0		6	0	0	1	15	120	0	4	
-404	9	0	194	1	1	[]	0		6	0	0	1	15	125	0	5	
-405	9	0	195	1	1	[]	0		6	0	0	1	15	150	0	6	
-406	9	0	196	1	1	[]	0		6	0	0	1	15	440	0	7	
+359	8	0	252	1	1	[]	0		6	0	0	1	15	1000	0	5	
+401	9	0	191	1	1	[]	0		6	0	0	1	15	40	0	2	
+402	9	0	192	1	1	[]	0		6	0	0	1	15	60	0	3	
+403	9	0	193	1	1	[]	0		6	0	0	1	15	115	0	4	
+406	9	0	196	1	1	[]	0		6	0	0	1	15	500	0	5	
 501	11	0	6934	1	0	[]	0		0	0	0	0	25	3000	0	0	ShopBuyBroadcast_2
 502	11	0	10451	1	0	[]	0	[[10451,20451]]	0	0	0	0	25	50	0	0	ShopBuyBroadcast_2
 503	11	0	10452	1	0	[]	0	[[10452,20452]]	0	0	0	0	25	50	0	0	ShopBuyBroadcast_2

--
Gitblit v1.8.0