From 3d6760a212bb7e9a25b68675d668579ba50dc36f Mon Sep 17 00:00:00 2001
From: cehua-TT <448191260@qq.com>
Date: 星期四, 06 九月 2018 14:19:18 +0800
Subject: [PATCH] Merge branch '1.0.15' of http://192.168.0.87:10010/r/snxx_server into 1.0.15

---
 db/PyMongoDataServer/SysDB/tagChinItem.txt |   28 ++++++++++++++--------------
 1 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index c75c5f0..753776c 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -1220,13 +1220,13 @@
 10335	3	0	点钢虎符	105	5	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	15	0	728	0	0	0	0	6	575	0	0	8	46	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	2	0	3	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 10336	3	0	点钢腿甲	106	6	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	15	0	1032	0	0	0	0	6	1062	0	0	8	84	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	2	0	3	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 10337	3	0	点钢铁鞋	107	7	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	15	0	1012	0	0	0	0	6	708	0	0	8	56	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	2	0	3	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-10341	3	0	轻语者	101	1	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	268	0	3616	0	0	0	0	67	270	0	0	68	404	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	3	0	4	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-10342	3	0	暗影	102	2	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	268	0	3568	0	0	0	0	67	180	0	0	68	270	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	3	0	4	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-10343	3	0	点钢缨冠	103	3	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	268	0	2840	0	0	0	0	6	1298	0	0	8	81	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	3	0	4	1	0	0	0	0	0	0	0	0	0	0	0	0	103	0	0	0	0	0
-10344	3	0	点钢战袍	104	4	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	268	0	2880	0	0	0	0	6	1752	0	0	8	109	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	3	0	4	1	0	0	0	0	0	0	0	0	0	0	0	0	103	0	0	0	0	0
-10345	3	0	点钢虎符	105	5	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	268	0	2104	0	0	0	0	6	843	0	0	8	52	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	3	0	4	1	0	0	0	0	0	0	0	0	0	0	0	0	103	0	0	0	0	0
-10346	3	0	点钢腿甲	106	6	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	268	0	2864	0	0	0	0	6	1557	0	0	8	97	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	3	0	4	1	0	0	0	0	0	0	0	0	0	0	0	0	103	0	0	0	0	0
-10347	3	0	点钢铁鞋	107	7	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	268	0	2824	0	0	0	0	6	1038	0	0	8	64	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	3	0	4	1	0	0	0	0	0	0	0	0	0	0	0	0	103	0	0	0	0	0
+10341	3	0	轻语者	101	1	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	268	0	3616	0	0	0	0	67	270	0	0	68	404	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	2	0	4	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+10342	3	0	暗影	102	2	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	268	0	3568	0	0	0	0	67	180	0	0	68	270	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	2	0	4	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+10343	3	0	点钢缨冠	103	3	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	268	0	2840	0	0	0	0	6	1298	0	0	8	81	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	2	0	4	1	0	0	0	0	0	0	0	0	0	0	0	0	103	0	0	0	0	0
+10344	3	0	点钢战袍	104	4	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	268	0	2880	0	0	0	0	6	1752	0	0	8	109	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	2	0	4	1	0	0	0	0	0	0	0	0	0	0	0	0	103	0	0	0	0	0
+10345	3	0	点钢虎符	105	5	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	268	0	2104	0	0	0	0	6	843	0	0	8	52	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	2	0	4	1	0	0	0	0	0	0	0	0	0	0	0	0	103	0	0	0	0	0
+10346	3	0	点钢腿甲	106	6	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	268	0	2864	0	0	0	0	6	1557	0	0	8	97	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	2	0	4	1	0	0	0	0	0	0	0	0	0	0	0	0	103	0	0	0	0	0
+10347	3	0	点钢铁鞋	107	7	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	268	0	2824	0	0	0	0	6	1038	0	0	8	64	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	2	0	4	1	0	0	0	0	0	0	0	0	0	0	0	0	103	0	0	0	0	0
 10351	3	0	轻语者	101	1	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	268	0	3616	0	0	0	0	67	270	0	0	68	404	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	3	0	4	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 10352	3	0	暗影	102	2	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	268	0	3568	0	0	0	0	67	180	0	0	68	270	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	3	0	4	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 10353	3	0	点钢缨冠	103	3	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	268	0	2840	0	0	0	0	6	1298	0	0	8	81	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	3	0	4	2	0	0	0	0	0	0	0	0	0	0	0	0	103	0	0	0	0	0
@@ -1922,13 +1922,13 @@
 20335	3	0	蝶舞长绦	105	5	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	15	0	728	0	0	0	0	6	460	0	0	8	46	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	2	0	3	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 20336	3	0	蝶舞朱裳	106	6	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	15	0	1032	0	0	0	0	6	849	0	0	8	84	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	2	0	3	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 20337	3	0	蝶舞云靴	107	7	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	15	0	1012	0	0	0	0	6	566	0	0	8	56	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	2	0	3	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-20341	3	0	魔龙	101	1	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	268	0	3616	0	0	0	0	67	286	0	0	68	428	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	3	0	4	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-20342	3	0	断蛟	102	2	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	268	0	3568	0	0	0	0	67	190	0	0	68	286	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	3	0	4	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-20343	3	0	蝶舞发簪	103	3	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	268	0	2840	0	0	0	0	6	1121	0	0	8	81	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	3	0	4	1	0	0	0	0	0	0	0	0	0	0	0	0	203	0	0	0	0	0
-20344	3	0	蝶舞道袍	104	4	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	268	0	2880	0	0	0	0	6	1513	0	0	8	109	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	3	0	4	1	0	0	0	0	0	0	0	0	0	0	0	0	203	0	0	0	0	0
-20345	3	0	蝶舞长绦	105	5	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	268	0	2104	0	0	0	0	6	728	0	0	8	52	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	3	0	4	1	0	0	0	0	0	0	0	0	0	0	0	0	203	0	0	0	0	0
-20346	3	0	蝶舞朱裳	106	6	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	268	0	2864	0	0	0	0	6	1345	0	0	8	97	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	3	0	4	1	0	0	0	0	0	0	0	0	0	0	0	0	203	0	0	0	0	0
-20347	3	0	蝶舞云靴	107	7	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	268	0	2824	0	0	0	0	6	896	0	0	8	64	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	3	0	4	1	0	0	0	0	0	0	0	0	0	0	0	0	203	0	0	0	0	0
+20341	3	0	魔龙	101	1	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	268	0	3616	0	0	0	0	67	286	0	0	68	428	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	2	0	4	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+20342	3	0	断蛟	102	2	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	268	0	3568	0	0	0	0	67	190	0	0	68	286	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	2	0	4	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+20343	3	0	蝶舞发簪	103	3	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	268	0	2840	0	0	0	0	6	1121	0	0	8	81	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	2	0	4	1	0	0	0	0	0	0	0	0	0	0	0	0	203	0	0	0	0	0
+20344	3	0	蝶舞道袍	104	4	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	268	0	2880	0	0	0	0	6	1513	0	0	8	109	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	2	0	4	1	0	0	0	0	0	0	0	0	0	0	0	0	203	0	0	0	0	0
+20345	3	0	蝶舞长绦	105	5	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	268	0	2104	0	0	0	0	6	728	0	0	8	52	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	2	0	4	1	0	0	0	0	0	0	0	0	0	0	0	0	203	0	0	0	0	0
+20346	3	0	蝶舞朱裳	106	6	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	268	0	2864	0	0	0	0	6	1345	0	0	8	97	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	2	0	4	1	0	0	0	0	0	0	0	0	0	0	0	0	203	0	0	0	0	0
+20347	3	0	蝶舞云靴	107	7	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	268	0	2824	0	0	0	0	6	896	0	0	8	64	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	2	0	4	1	0	0	0	0	0	0	0	0	0	0	0	0	203	0	0	0	0	0
 20351	3	0	魔龙	101	1	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	268	0	3616	0	0	0	0	67	286	0	0	68	428	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	3	0	4	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 20352	3	0	断蛟	102	2	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	268	0	3568	0	0	0	0	67	190	0	0	68	286	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	3	0	4	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 20353	3	0	蝶舞发簪	103	3	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	268	0	2840	0	0	0	0	6	1121	0	0	8	81	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	3	0	4	2	0	0	0	0	0	0	0	0	0	0	0	0	203	0	0	0	0	0

--
Gitblit v1.8.0