From 51be1e2fac9f75823074fff58b9c24f3b61906e0 Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期四, 31 一月 2019 11:07:46 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 db/PyMongoDataServer/PySysDB/tagChests.txt      |   12 ++++++++++++
 db/PyMongoDataServer/PySysDB/tagAlchemy.txt     |    1 +
 db/PyMongoDataServer/PySysDB/tagChestsAward.txt |    1 +
 db/PyMongoDataServer/SysDB/tagChinItem.txt      |   12 ++++++------
 db/PyMongoDataServer/PySysDB/tagFuncConfig.txt  |    6 +++---
 5 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/db/PyMongoDataServer/PySysDB/tagAlchemy.txt b/db/PyMongoDataServer/PySysDB/tagAlchemy.txt
index 93e90c1..7fd78b2 100644
--- a/db/PyMongoDataServer/PySysDB/tagAlchemy.txt
+++ b/db/PyMongoDataServer/PySysDB/tagAlchemy.txt
@@ -7,3 +7,4 @@
 106	4611_6|4613_6|4612_6|4614_6|4615_6	746	[[3511,4715,1],[1193,4711,1],[1111,4720,1],[1432,4724,1],[1491,4727,1],[1193,4729,1],[69,4732,1]]	41	[]	6
 107	4611_6|4613_6|4612_6|4614_6|4615_6	895	[[4164,4781,1],[1257,4780,1],[556,4782,1],[1341,4783,1],[1397,4784,1],[1257,4785,1],[28,4733,1]]		[]	7
 108	4611_6|4613_6|4612_6|4614_6|4615_6	1074	[[4025,4787,1],[1349,4786,1],[556,4788,1],[1349,4789,1],[1349,4790,1],[1349,4791,1],[23,4742,1]]		[]	8
+109	4611_8|4613_8|4612_8|4614_8|4615_8	1719	[[4031,4792,1],[1349,4793,1],[556,4794,1],[1349,4795,1],[1349,4796,1],[1349,4797,1],[17,4798,1]]		[]	9
diff --git a/db/PyMongoDataServer/PySysDB/tagChests.txt b/db/PyMongoDataServer/PySysDB/tagChests.txt
index ba73d3b..bf6b3d7 100644
--- a/db/PyMongoDataServer/PySysDB/tagChests.txt
+++ b/db/PyMongoDataServer/PySysDB/tagChests.txt
@@ -264,3 +264,15 @@
 2473	0	0	600	0	1
 2474	0	0	0	0	1
 2475	0	0	0	0	1
+2476	0	0	0	1	0
+2477	0	0	280	1	1
+2478	0	0	0	1	0
+2479	0	0	280	1	1
+2480	0	0	0	1	0
+2481	0	0	280	1	1
+2482	0	0	0	1	0
+2483	0	0	280	1	1
+2484	0	0	0	0	0
+2485	0	0	0	0	1
+2486	0	0	0	0	1
+2487	0	0	0	0	1
diff --git a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
index 3a8d979..cbe13d0 100644
--- a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
+++ b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
@@ -272,3 +272,4 @@
 2484		5809_1|5810_1|5811_1										[5809,5810,5811]
 2485			912_1|5503_3|5513_3									[912]
 2486			913_1|5414_500|5523_3									[913,5414]
+2487		8416_1|8417_1|8418_1|8419_1										[8416,8417,8418,8419]
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index a8e7f88..305e1f9 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -1,5 +1,5 @@
 KEY	Numerical1	Numerical2	Numerical3	Numerical4	Numerical5
-GemOpen	1|3|5	0|0|0	0	0	0
+GemOpen	1|3|5	1|1|1	0	0	0
 GemOpenVip	6	0	0	0	0
 GemType1	3|4|5|6|7	可镶嵌生命翡翠	0	0	0
 GemType2	1|2|8|9|10	可镶嵌攻击炎晶	0	0	0
@@ -217,8 +217,8 @@
 XjmjFirstEnter	[5000, 25, 911]	350000			
 XjmjAddHarm	20	20061			
 AlchemyNotify	3	4716	4712|4708|4721|4713|4709|4722|4714|4710|4723|4728|4715|4724|4729		
-SpecialAlchemy	{102:{1:[[1,4707,1]],2:[[1,4716,1]]},103:{3:[[1,4717,1]],6:[[1,4740,1]]},104:{8:[[1,4730,1]]},106:{8:[[1,4732,1]],35:[[1,4732,1]]},107:{10:[[1,4733,1]],35:[[1,4733,1]]},108:{12:[[1,4742,1]],35:[[1,4742,1]]}}	{1:{2:[[1,1128,1]]},2:{3:[[1,1128,1]]},11:{2:[[1,4681,1]]},12:{5:[[1,4681,1]]},21:{1:[[1,200,1]],2:[[1,4680,1]],4:[[1,200,1]],8:[[1,200,1]]},22:{1:[[1,4680,1]],2:[[1,201,1]],5:[[1,201,1]],10:[[1,201,1]]},41:{1:[[1,4677,1]],3:[[1,4676,1]],5:[[1,4677,1]],8:[[1,4676,1]],12:[[1,4677,1]],20:[[1,4676,1]]},31:{1:[[80,4254,1],[20,4183,1]],3:[[80,4254,1],[20,4183,1]]},32:{1:[[80,225,1],[20,4185,1]],3:[[80,225,1],[20,4185,1]]}}	{4206:1,253:1}	4254|225	
-GodAlchemy	[[6075,4706,1],[12150,4707,1],[24300,4708,1],[8100,4709,1],[2700,4710,1],[900,4711,1],[24300,4712,1],[8100,4713,1],[2700,4714,1],[900,4715,1],[12150,4716,1],[24300,4717,1],[8100,4718,1],[2700,4719,1],[900,4720,1],[24300,4721,1],[8100,4722,1],[2700,4723,1],[900,4724,1],[8100,4725,1],[2700,4726,1],[900,4727,1],[2700,4728,1],[900,4729,1],[736,4730,1],[317,4731,1],[120,4732,1],[17,4733,1],[4050,4740,1],[5,4742,1],[300,4780,1],[300,4781,1],[300,4782,1],[300,4783,1],[300,4784,1],[300,4785,1],[100,4786,1],[100,4787,1],[100,4788,1],[100,4789,1],[100,4790,1],[100,4791,1]]	20	1		
+SpecialAlchemy	{102:{1:[[1,4707,1]],2:[[1,4716,1]]},103:{3:[[1,4717,1]],6:[[1,4740,1]]},104:{8:[[1,4730,1]]},106:{8:[[1,4732,1]],35:[[1,4732,1]]},107:{10:[[1,4733,1]],35:[[1,4733,1]]},108:{12:[[1,4742,1]],35:[[1,4742,1]]},109:{15:[[1,4798,1]],40:[[1,4798,1]]}}	{1:{2:[[1,1128,1]]},2:{3:[[1,1128,1]]},11:{2:[[1,4681,1]]},12:{5:[[1,4681,1]]},21:{1:[[1,200,1]],2:[[1,4680,1]],4:[[1,200,1]],8:[[1,200,1]]},22:{1:[[1,4680,1]],2:[[1,201,1]],5:[[1,201,1]],10:[[1,201,1]]},41:{1:[[1,4677,1]],3:[[1,4676,1]],5:[[1,4677,1]],8:[[1,4676,1]],12:[[1,4677,1]],20:[[1,4676,1]]},31:{1:[[80,4254,1],[20,4183,1]],3:[[80,4254,1],[20,4183,1]]},32:{1:[[80,225,1],[20,4185,1]],3:[[80,225,1],[20,4185,1]]}}	{4206:1,253:1}	4254|225	
+GodAlchemy	[[6075,4706,1],[12150,4707,1],[24300,4708,1],[8100,4709,1],[2700,4710,1],[900,4711,1],[24300,4712,1],[8100,4713,1],[2700,4714,1],[900,4715,1],[12150,4716,1],[24300,4717,1],[8100,4718,1],[2700,4719,1],[900,4720,1],[24300,4721,1],[8100,4722,1],[2700,4723,1],[900,4724,1],[8100,4725,1],[2700,4726,1],[900,4727,1],[2700,4728,1],[900,4729,1],[736,4730,1],[317,4731,1],[120,4732,1],[17,4733,1],[4050,4740,1],[5,4742,1],[300,4780,1],[300,4781,1],[300,4782,1],[300,4783,1],[300,4784,1],[300,4785,1],[100,4786,1],[100,4787,1],[100,4788,1],[100,4789,1],[100,4790,1],[100,4791,1],[30,4792,1],[30,4793,1],[30,4794,1],[30,4795,1],[30,4796,1],[30,4797,1],[1,4798,1]]	20	1		
 TreasureUpRateItem	101|105|106|107|104|102|109|110	4601|4602|4603|4604|4605			
 ClientFightEnable	1	0	0	0	0
 GodAreaExpAward	{"Exp":"int(reExp*2)"}	500	0		
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index 677eb50..81c41ab 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -1189,8 +1189,8 @@
 5504	1	0	4级诛仙生命宝石	140	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	270	0	20	0	0	0	1	225	3	4	5505	6	6880	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
 5505	1	0	5级诛仙生命宝石	140	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	810	0	50	0	0	0	1	225	3	5	5506	6	13740	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
 5506	1	0	6级诛仙生命宝石	140	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	2430	0	50	0	0	0	1	225	3	6	5507	6	27480	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
-5507	1	0	7级诛仙生命宝石	140	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	7290	0	20	0	0	0	1	225	3	7	5508	6	54940	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
-5508	1	0	8级诛仙生命宝石	140	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	21870	0	50	0	0	0	1	225	3	8	5509	6	109880	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
+5507	1	0	7级诛仙生命宝石	140	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	7290	0	20	0	0	0	1	225	3	7	0	6	54940	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
+5508	1	0	8级诛仙生命宝石	140	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	21870	0	50	0	0	0	1	225	3	8	0	6	109880	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
 5509	1	0	9级诛仙生命宝石	140	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	65610	0	50	0	0	0	1	225	3	9	0	6	219740	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
 5511	1	0	1级诛仙攻击宝石	140	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	10	0	10	0	0	0	1	225	4	1	5512	7	43	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
 5512	1	0	2级诛仙攻击宝石	140	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	30	0	10	0	0	0	1	225	4	2	5513	7	86	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
@@ -1198,8 +1198,8 @@
 5514	1	0	4级诛仙攻击宝石	140	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	270	0	20	0	0	0	1	225	4	4	5515	7	344	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
 5515	1	0	5级诛仙攻击宝石	140	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	810	0	50	0	0	0	1	225	4	5	5516	7	687	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
 5516	1	0	6级诛仙攻击宝石	140	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	2430	0	50	0	0	0	1	225	4	6	5517	7	1374	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
-5517	1	0	7级诛仙攻击宝石	140	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	7290	0	20	0	0	0	1	225	4	7	5518	7	2747	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
-5518	1	0	8级诛仙攻击宝石	140	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	21870	0	50	0	0	0	1	225	4	8	5519	7	5494	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
+5517	1	0	7级诛仙攻击宝石	140	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	7290	0	20	0	0	0	1	225	4	7	0	7	2747	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
+5518	1	0	8级诛仙攻击宝石	140	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	21870	0	50	0	0	0	1	225	4	8	0	7	5494	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
 5519	1	0	9级诛仙攻击宝石	140	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	65610	0	50	0	0	0	1	225	4	9	0	7	10987	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
 5521	1	0	1级诛仙附伤宝石	140	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	10	0	10	0	0	0	1	225	5	1	5522	35	43	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
 5522	1	0	2级诛仙附伤宝石	140	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	30	0	10	0	0	0	1	225	5	2	5523	35	86	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
@@ -1207,8 +1207,8 @@
 5524	1	0	4级诛仙附伤宝石	140	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	270	0	20	0	0	0	1	225	5	4	5525	35	344	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
 5525	1	0	5级诛仙附伤宝石	140	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	810	0	50	0	0	0	1	225	5	5	5526	35	687	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
 5526	1	0	6级诛仙附伤宝石	140	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	2430	0	50	0	0	0	1	225	5	6	5527	35	1374	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
-5527	1	0	7级诛仙附伤宝石	140	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	7290	0	20	0	0	0	1	225	5	7	5528	35	2747	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
-5528	1	0	8级诛仙附伤宝石	140	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	21870	0	50	0	0	0	1	225	5	8	5529	35	5494	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
+5527	1	0	7级诛仙附伤宝石	140	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	7290	0	20	0	0	0	1	225	5	7	0	35	2747	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
+5528	1	0	8级诛仙附伤宝石	140	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	21870	0	50	0	0	0	1	225	5	8	0	35	5494	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
 5529	1	0	9级诛仙附伤宝石	140	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	65610	0	50	0	0	0	1	225	5	9	0	35	10987	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
 5700	1	0	熊猫公仔时装碎片	82	0	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	100	0	50	0	0	0	0	244	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	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 5701	1	0	魔幻大师时装碎片	82	0	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	100	0	50	0	0	0	0	244	2	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

--
Gitblit v1.8.0