From a06e45e2085994e6bd7eedfab5007f88cf0941f3 Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期六, 22 十二月 2018 10:16:20 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc |    0 
 db/PyMongoDataServer/SysDB/tagChinItem.txt                          |   10 +++++-----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
index 6ab0762..0dd9893 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index 12c2408..7338d08 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -1097,11 +1097,11 @@
 7001	5	0	5阶1星红色项链	108	8	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	30060	0	1	0	0	0	0	220	8056	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	301	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 7002	5	0	5阶2星橙色项链	108	8	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	30060	0	1	0	0	0	0	220	8055	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	301	0	0	4	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 7003	7	0	7阶2星红色项链	108	8	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	30060	0	1	0	0	0	0	220	8077	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	301	0	0	5	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-7101	1	0	聚魂精华	61	0	1	0	0	1	1	0	0	0	1	0	0	0	0	0	1	10	0	5	0	0	0	0	0	100	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-7102	1	0	聚魂精华	61	0	1	0	0	1	1	0	0	0	1	0	0	0	0	0	1	10	0	5	0	0	0	0	0	200	0	0	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
-7103	1	0	聚魂精华	61	0	1	0	0	1	1	0	0	0	1	0	0	0	0	0	1	10	0	5	0	0	0	0	0	300	0	0	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
-7104	1	0	聚魂精华	61	0	1	0	0	1	1	0	0	0	1	0	0	0	0	0	1	10	0	5	0	0	0	0	0	400	0	0	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
-7105	1	0	聚魂精华	61	0	1	0	0	1	1	0	0	0	1	0	0	0	0	0	1	10	0	5	0	0	0	0	0	500	0	0	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
+7101	1	0	聚魂精华	61	0	1	0	0	1	1	0	0	0	1	0	0	0	0	0	1	10	0	5	0	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+7102	1	0	聚魂精华	61	0	1	0	0	1	1	0	0	0	1	0	0	0	0	0	1	10	0	5	0	0	0	0	0	3000	0	0	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
+7103	1	0	聚魂精华	61	0	1	0	0	1	1	0	0	0	1	0	0	0	0	0	1	10	0	5	0	0	0	0	0	4500	0	0	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
+7104	1	0	聚魂精华	61	0	1	0	0	1	1	0	0	0	1	0	0	0	0	0	1	10	0	5	0	0	0	0	0	6000	0	0	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
+7105	1	0	聚魂精华	61	0	1	0	0	1	1	0	0	0	1	0	0	0	0	0	1	10	0	5	0	0	0	0	0	7500	0	0	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
 7106	1	0	力量核心	63	0	1	0	0	1	1	0	0	0	1	0	0	0	0	0	1	10	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	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 7107	1	0	力量核心	63	0	1	0	0	1	1	0	0	0	1	0	0	0	0	0	1	10	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	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 7108	1	0	力量核心	63	0	1	0	0	1	1	0	0	0	1	0	0	0	0	0	1	10	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	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0

--
Gitblit v1.8.0