From 6c6f51da2504cb008a025f2e94f4c64e03710fb0 Mon Sep 17 00:00:00 2001
From: cehua_lgq <cehua_lgq@163.com>
Date: 星期三, 07 十一月 2018 11:34:51 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/OpenServerCampaign.pyc |    0 
 db/PyMongoDataServer/SysDB/tagChinItem.txt                                           |    6 +++---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/OpenServerCampaign.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/OpenServerCampaign.pyc
index 0b236a3..ad76fa9 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/OpenServerCampaign.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/OpenServerCampaign.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index 2cb6fcc..b7483ba 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -1219,9 +1219,9 @@
 9062	6	0	仙器玉佩	109	9	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	1000	0	3688	0	0	0	0	67	0	0	0	68	0	0	0	11	1000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 9073	7	0	仙器玉佩	109	9	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	2000	0	7472	0	0	0	0	67	0	0	0	68	0	0	0	11	1500	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
 9074	7	0	仙器玉佩	109	9	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	2500	0	7472	0	0	0	0	67	0	0	0	68	0	0	0	11	1500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	4	1	0	0	0	0	0	0	0	0	0	0	0	0	405	0	0	0	0	0
-9075	7	0	仙器玉佩	109	9	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	10000	0	7472	0	0	0	0	67	0	0	0	68	0	0	0	11	1500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	4	2	0	0	0	0	0	0	0	0	0	0	0	0	405	0	0	0	0	0
-9077	7	0	仙器玉佩	109	9	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	30000	0	15136	0	0	0	0	67	0	0	0	68	0	0	0	11	2000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	13	0	5	2	0	0	0	0	0	0	0	0	0	0	0	0	405	0	0	0	0	0
-9078	7	0	仙器玉佩	109	9	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	100000	0	15136	0	0	0	0	67	0	0	0	68	0	0	0	11	2000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	13	0	5	3	0	0	0	0	0	0	0	0	0	0	0	0	405	0	0	0	0	0
+9075	8	0	仙器玉佩	109	9	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	10000	0	7472	0	0	0	0	67	0	0	0	68	0	0	0	11	1500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	4	2	0	0	0	0	0	0	0	0	0	0	0	0	405	0	0	0	0	0
+9077	9	0	仙器玉佩	109	9	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	30000	0	15136	0	0	0	0	67	0	0	0	68	0	0	0	11	2000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	13	0	5	2	0	0	0	0	0	0	0	0	0	0	0	0	405	0	0	0	0	0
+9078	10	0	仙器玉佩	109	9	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	100000	0	15136	0	0	0	0	67	0	0	0	68	0	0	0	11	2000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	13	0	5	3	0	0	0	0	0	0	0	0	0	0	0	0	405	0	0	0	0	0
 9995	0	0	GM法师帽子	103	3	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	5	0	47	0	0	0	0	6	999999	0	0	8	999999	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	0
 9996	0	0	GM之翼	111	11	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	280	0	5	0	0	0	0	6	50000	0	0	19	800	0	0	23	200	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 9997	0	0	GM仙器	109	9	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	200	0	1548	0	0	0	0	67	0	0	0	68	0	0	0	11	15000	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

--
Gitblit v1.8.0