From 16b5bba98e72935fce39ea5d8403605cfa27c1ec Mon Sep 17 00:00:00 2001
From: CH_wcy <781813756@qq.com>
Date: 星期五, 10 八月 2018 20:12:46 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 db/PyMongoDataServer/PySysDB/tagRealm.txt  |   40 ++++++++++++++++++++--------------------
 db/PyMongoDataServer/SysDB/tagChinItem.txt |   10 +++++-----
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/db/PyMongoDataServer/PySysDB/tagRealm.txt b/db/PyMongoDataServer/PySysDB/tagRealm.txt
index 31e3bfc..cc64945 100644
--- a/db/PyMongoDataServer/PySysDB/tagRealm.txt
+++ b/db/PyMongoDataServer/PySysDB/tagRealm.txt
@@ -1,23 +1,23 @@
 Lv	IsBigRealm	NeedPoint	NeedGood	NeedNum	NeedActiveTreasure	AddAttrType	AddAttrNum	BossID	SitTime	TeamAward
 0	0	300	0	0	0	6|7	0|0	61103000	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
 1	0	360	0	0	0	6|7	4700|230	61103001	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
-2	1	1200	0	0	0	6|7	9900|490	61103002	{"1":0,"2":0,"3":0,"4":0,"5":0}	{0:[(105,1,1),(102,3,1)]}
-3	0	1000	0	0	0	6|7|19	18700|940|1000	61203001	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
-4	1	1400	0	0	0	6|7|19	25100|1260|1000	61103003	{"1":0,"2":0,"3":0,"4":0,"5":0}	{0:[(105,3,1),(103,1,1)]}
-5	0	1280	0	0	0	6|7|19	35900|1800|3000	61103004	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
-6	1	2090	0	0	0	6|7|19	43900|2200|3000	61103005	{"1":0,"2":0,"3":0,"4":0,"5":0}	{0:[(105,3,1),(103,1,1)]}
-7	0	1400	0	0	0	6|7|19|18	57400|2870|3000|2000	61203002	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
-8	1	2980	0	0	0	6|7|19|18	67300|3360|3000|2000	61103006	{"1":0,"2":0,"3":0,"4":0,"5":0}	{0:[(106,1,1),(103,3,1)]}
-9	0	2380	0	0	0	6|7|19|18	83900|4200|3000|5000	61103007	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
-10	0	3570	0	0	0	6|7|19|18	96100|4810|3000|5000	61103008	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
-11	1	7140	0	0	0	6|7|19|18	109800|5490|3000|5000	61203003	{"1":0,"2":0,"3":0,"4":0,"5":0}	{0:[(106,1,1),(103,3,1)]}
-12	0	4170	0	0	0	6|7|19|18|49	132500|6630|3000|5000|3000	61103009	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
-13	0	4760	0	0	0	6|7|19|18|49	149200|7460|3000|5000|3000	61103010	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
-14	1	9520	0	0	0	6|7|19|18|49	167700|8390|3000|5000|3000	61103011	{"1":0,"2":0,"3":0,"4":0,"5":0}	{0:[(106,2,1),(103,5,1)]}
-15	0	5360	0	0	0	6|7|19|18|49	198300|9920|7000|5000|3000	61203004	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
-16	0	5950	0	0	0	6|7|19|18|49	220700|11030|7000|5000|3000	61103012	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
-17	1	11890	0	0	0	6|7|19|18|49	245300|12260|7000|5000|3000	61103013	{"1":0,"2":0,"3":0,"4":0,"5":0}	{0:[(106,2,1),(103,5,1)]}
-18	0	6540	0	0	0	6|7|19|18|49|20	285800|14290|7000|5000|3000|2000	61203005	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
-19	0	7140	0	0	0	6|7|19|18|49|20	315400|15770|7000|5000|3000|2000	61103014	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
-20	1	14270	0	0	0	6|7|19|18|49|20	347800|17390|7000|5000|3000|2000	61103015	{"1":0,"2":0,"3":0,"4":0,"5":0}	{0:[(106,2,1),(103,5,1)]}
-21	0	8320	0	0	0	6|7|19|18|49|20	400600|20030|7000|10000|3000|2000	61203006	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
+2	1	1200	0	0	0	6|7	9900|490	61203001	{"1":0,"2":0,"3":0,"4":0,"5":0}	{0:[(105,1,1),(102,3,1)]}
+3	0	1000	0	0	0	6|7|19	18700|940|1000	61103002	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
+4	1	1400	0	0	0	6|7|19	25100|1260|1000	61203002	{"1":0,"2":0,"3":0,"4":0,"5":0}	{0:[(105,3,1),(103,1,1)]}
+5	0	1280	0	0	0	6|7|19	35900|1800|3000	61103003	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
+6	1	2090	0	0	0	6|7|19	43900|2200|3000	61203003	{"1":0,"2":0,"3":0,"4":0,"5":0}	{0:[(105,3,1),(103,1,1)]}
+7	0	1400	0	0	0	6|7|19|18	57400|2870|3000|2000	61103004	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
+8	1	2980	0	0	0	6|7|19|18	67300|3360|3000|2000	61203004	{"1":0,"2":0,"3":0,"4":0,"5":0}	{0:[(106,1,1),(103,3,1)]}
+9	0	2380	0	0	0	6|7|19|18	83900|4200|3000|5000	61103005	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
+10	0	3570	0	0	0	6|7|19|18	96100|4810|3000|5000	61103006	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
+11	1	7140	0	0	0	6|7|19|18	109800|5490|3000|5000	61203005	{"1":0,"2":0,"3":0,"4":0,"5":0}	{0:[(106,1,1),(103,3,1)]}
+12	0	4170	0	0	0	6|7|19|18|49	132500|6630|3000|5000|3000	61103007	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
+13	0	4760	0	0	0	6|7|19|18|49	149200|7460|3000|5000|3000	61103008	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
+14	1	9520	0	0	0	6|7|19|18|49	167700|8390|3000|5000|3000	61203006	{"1":0,"2":0,"3":0,"4":0,"5":0}	{0:[(106,2,1),(103,5,1)]}
+15	0	5360	0	0	0	6|7|19|18|49	198300|9920|7000|5000|3000	61103009	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
+16	0	5950	0	0	0	6|7|19|18|49	220700|11030|7000|5000|3000	61103010	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
+17	1	11890	0	0	0	6|7|19|18|49	245300|12260|7000|5000|3000	61203007	{"1":0,"2":0,"3":0,"4":0,"5":0}	{0:[(106,2,1),(103,5,1)]}
+18	0	6540	0	0	0	6|7|19|18|49|20	285800|14290|7000|5000|3000|2000	61103011	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
+19	0	7140	0	0	0	6|7|19|18|49|20	315400|15770|7000|5000|3000|2000	61103012	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
+20	1	14270	0	0	0	6|7|19|18|49|20	347800|17390|7000|5000|3000|2000	61203008	{"1":0,"2":0,"3":0,"4":0,"5":0}	{0:[(106,2,1),(103,5,1)]}
+21	0	8320	0	0	0	6|7|19|18|49|20	400600|20030|7000|10000|3000|2000	61103013	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index ccaa25b..40286c9 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -300,11 +300,11 @@
 2130	1	0	玄龙丹	15	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	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 2131	1	0	神速丹	15	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	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 2132	1	0	一品丹药	15	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	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-2133	1	0	二品丹药	15	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	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-2134	1	0	三品丹药	15	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	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-2135	1	0	四品丹药	15	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	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-2136	1	0	五品丹药	15	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	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-2137	1	0	六品丹药	15	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	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+2133	1	0	二品丹药	15	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	3	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+2134	1	0	三品丹药	15	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	4	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+2135	1	0	四品丹药	15	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	7	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+2136	1	0	五品丹药	15	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	10	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+2137	1	0	六品丹药	15	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	12	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 2200	1	0	生命神兵石宝箱	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	160	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
 2201	1	0	攻击神兵石宝箱	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	160	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
 2202	1	0	符印精华超值宝箱	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	140	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	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0

--
Gitblit v1.8.0