From ebf68bc76f9419847c8199331e45695ab5c20a78 Mon Sep 17 00:00:00 2001
From: cehua_LMQ <1417318640@qq.com>
Date: 星期一, 07 一月 2019 21:20:58 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 db/PyMongoDataServer/PySysDB/tagCoat.txt   |   25 +++++++++----------------
 db/PyMongoDataServer/SysDB/tagChinItem.txt |   31 ++++++++++++++++++++++++++++++-
 2 files changed, 39 insertions(+), 17 deletions(-)

diff --git a/db/PyMongoDataServer/PySysDB/tagCoat.txt b/db/PyMongoDataServer/PySysDB/tagCoat.txt
index 0df5bf3..000e06e 100644
--- a/db/PyMongoDataServer/PySysDB/tagCoat.txt
+++ b/db/PyMongoDataServer/PySysDB/tagCoat.txt
@@ -1,17 +1,10 @@
 CoatID	EquipItemID	UnlockItemID	MaxLV	CostItemCnt	StarAttr
-1	200|300	289	3	1|2|3	{"1":{"6":1000,"7":1000},"2":{"6":2000,"7":2000},"3":{"6":3000,"7":3000}}
-2	200|301	280	3	1|2|4	{"1":{"6":1000,"7":1000},"2":{"6":2000,"7":2000},"3":{"6":3000,"7":3001}}
-3	200|302	281	3	1|2|5	{"1":{"6":1000,"7":1000},"2":{"6":2000,"7":2000},"3":{"6":3000,"7":3002}}
-4	200|303	282	3	1|2|6	{"1":{"6":1000,"7":1000},"2":{"6":2000,"7":2000},"3":{"6":3000,"7":3003}}
-5	200|304	284	3	1|2|7	{"1":{"6":1000,"7":1000},"2":{"6":2000,"7":2000},"3":{"6":3000,"7":3004}}
-6	200|305	285	3	1|2|8	{"1":{"6":1000,"7":1000},"2":{"6":2000,"7":2000},"3":{"6":3000,"7":3005}}
-7	200|306	283	3	1|2|9	{"1":{"6":1000,"7":1000},"2":{"6":2000,"7":2000},"3":{"6":3000,"7":3006}}
-8	200|307	286	3	1|2|10	{"1":{"6":1000,"7":1000},"2":{"6":2000,"7":2000},"3":{"6":3000,"7":3007}}
-9	200|308	287	3	1|2|11	{"1":{"6":1000,"7":1000},"2":{"6":2000,"7":2000},"3":{"6":3000,"7":3008}}
-10	200|309	290	3	1|2|12	{"1":{"6":1000,"7":1000},"2":{"6":2000,"7":2000},"3":{"6":3000,"7":3009}}
-11	200|310	288	3	1|2|13	{"1":{"6":1000,"7":1000},"2":{"6":2000,"7":2000},"3":{"6":3000,"7":3010}}
-12	200|311	291	3	1|2|14	{"1":{"6":1000,"7":1000},"2":{"6":2000,"7":2000},"3":{"6":3000,"7":3011}}
-13	200|312	293	3	1|2|15	{"1":{"6":1000,"7":1000},"2":{"6":2000,"7":2000},"3":{"6":3000,"7":3012}}
-14	200|313	292	3	1|2|16	{"1":{"6":1000,"7":1000},"2":{"6":2000,"7":2000},"3":{"6":3000,"7":3013}}
-15	200|314	295	3	1|2|17	{"1":{"6":1000,"7":1000},"2":{"6":2000,"7":2000},"3":{"6":3000,"7":3014}}
-16	200|315	294	3	1|2|18	{"1":{"6":1000,"7":1000},"2":{"6":2000,"7":2000},"3":{"6":3000,"7":3015}}
+1	6000|6200	5800	3	1|2|3	{"1":{"6":1000,"7":1000},"2":{"6":2000,"7":2000},"3":{"6":3000,"7":3000}}
+2	6001|6201	5801	3	1|2|4	{"1":{"6":1000,"7":1000},"2":{"6":2000,"7":2000},"3":{"6":3000,"7":3001}}
+3	6002|6202	5802	3	1|2|5	{"1":{"6":1000,"7":1000},"2":{"6":2000,"7":2000},"3":{"6":3000,"7":3002}}
+4	6003|6203	5803	3	1|2|6	{"1":{"6":1000,"7":1000},"2":{"6":2000,"7":2000},"3":{"6":3000,"7":3003}}
+5	6004|6204	5804	3	1|2|7	{"1":{"6":1000,"7":1000},"2":{"6":2000,"7":2000},"3":{"6":3000,"7":3004}}
+6	6005|6205	5805	3	1|2|8	{"1":{"6":1000,"7":1000},"2":{"6":2000,"7":2000},"3":{"6":3000,"7":3005}}
+7	6006|6206	5806	3	1|2|9	{"1":{"6":1000,"7":1000},"2":{"6":2000,"7":2000},"3":{"6":3000,"7":3006}}
+8	6007|6207	5807	3	1|2|10	{"1":{"6":1000,"7":1000},"2":{"6":2000,"7":2000},"3":{"6":3000,"7":3007}}
+9	6008|6208	5808	3	1|2|11	{"1":{"6":1000,"7":1000},"2":{"6":2000,"7":2000},"3":{"6":3000,"7":3008}}
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index b6a5df5..a9eece0 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -406,7 +406,7 @@
 2203	1	0	洗炼宝箱	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	100	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
 2204	1	0	潜力宝箱	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	800	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
 2205	1	0	套装石宝箱	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	200	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
-2206	1	0	超值铜钱礼包	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	400	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	20	0	0	0	0	0	0	0	0
+2206	1	0	2级随机宝石	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	90	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	0	0	0	0	0	0	0	0	0
 2207	1	0	护法礼包	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	6	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
 2208	1	0	橙色符印选择宝箱	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	500	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
 2209	1	0	红色符印选择宝箱	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	1000	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
@@ -1042,6 +1042,35 @@
 5410	1	0	红2合成幸运草	126	0	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	50	0	50	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
 5411	1	0	红3合成幸运草	126	0	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	100	0	50	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
 5412	1	0	洗炼必增符	126	0	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	5	0	50	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
+5700	1	0	熊猫时装碎片	82	0	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	100	0	50	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
+5701	1	0	熊猫时装碎片	82	0	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	100	0	50	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
+5800	1	0	熊猫武器激活	83	0	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	100	0	50	0	1	0	0	243	1	10	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
+5801	1	0	熊猫副手激活	83	0	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	100	0	50	0	1	0	0	243	2	10	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
+5802	1	0	熊猫衣服激活	83	0	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	100	0	50	0	1	0	0	243	3	10	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
+5803	1	0	魔术师武器激活	83	0	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	100	0	50	0	1	0	0	243	4	10	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
+5804	1	0	魔术师副手激活	83	0	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	100	0	50	0	1	0	0	243	5	10	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
+5805	1	0	魔术师衣服激活	83	0	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	100	0	50	0	1	0	0	243	6	10	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
+5806	1	0	夏日武器激活	83	0	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	100	0	50	0	1	0	0	243	4	10	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
+5807	1	0	夏日副手激活	83	0	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	100	0	50	0	1	0	0	243	5	10	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
+5808	1	0	夏日衣服激活	83	0	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	100	0	50	0	1	0	0	243	6	10	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
+6000	1	0	男熊猫武器	91	20	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	100	0	50	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
+6001	1	0	男熊猫副手	92	22	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	100	0	50	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
+6002	1	0	男熊猫衣服	93	21	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	100	0	50	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
+6003	1	0	男魔术师武器	91	20	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	100	0	50	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
+6004	1	0	男魔术师副手	92	22	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	100	0	50	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
+6005	1	0	男魔术师衣服	93	21	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	100	0	50	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
+6006	1	0	男魔术师武器	91	20	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	100	0	50	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
+6007	1	0	男魔术师副手	92	22	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	100	0	50	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
+6008	1	0	男魔术师衣服	93	21	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	100	0	50	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
+6200	1	0	女熊猫武器	91	20	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	100	0	50	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
+6201	1	0	女熊猫副手	92	22	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	100	0	50	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
+6202	1	0	女熊猫衣服	93	21	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	100	0	50	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
+6203	1	0	女魔术师武器	91	20	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	100	0	50	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
+6204	1	0	女魔术师副手	92	22	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	100	0	50	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
+6205	1	0	女魔术师衣服	93	21	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	100	0	50	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
+6206	1	0	女魔术师武器	91	20	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	100	0	50	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
+6207	1	0	女魔术师副手	92	22	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	100	0	50	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
+6208	1	0	女魔术师衣服	93	21	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	100	0	50	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
 6501	1	0	虬龙	102	2	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	10	0	1744	0	0	0	0	220	10142	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	0	0	4	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 6502	5	0	奔雷铁鞋	107	7	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	10	0	11456	0	0	0	0	220	10587	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	0	0	5	3	0	0	0	0	0	0	0	0	0	0	0	0	105	0	0	0	0	0
 6601	9	1	绝世龙枪	101	1	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	25560	0	1	0	0	0	0	220	9001	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0

--
Gitblit v1.8.0