From b9973c07a10b0c50f6c887530fc51e8cd776a868 Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期一, 24 十二月 2018 19:55:29 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 db/PyMongoDataServer/PySysDB/tagSuccess.txt                                        |    1 +
 db/PyMongoDataServer/SysDB/tagChinItem.txt                                         |    1 +
 db/PyMongoDataServer/PySysDB/tagTreasure.txt                                       |    1 +
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGatherSoul.pyc |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/BuffSkill.pyc         |    0 
 5 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGatherSoul.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGatherSoul.pyc
index a6031ee..fcb68d3 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGatherSoul.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGatherSoul.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/BuffSkill.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/BuffSkill.pyc
index 3ff99c0..4d57e0e 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/BuffSkill.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/BuffSkill.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagSuccess.txt b/db/PyMongoDataServer/PySysDB/tagSuccess.txt
index 7ed27b6..875be0f 100644
--- a/db/PyMongoDataServer/PySysDB/tagSuccess.txt
+++ b/db/PyMongoDataServer/PySysDB/tagSuccess.txt
@@ -483,3 +483,4 @@
 1137	127	48	8	0		3_50000	0		0	112	10
 1138	127	54	8	0		3_50000	0		0	112	10
 1139	127	60	8	0		3_50000	0		0	112	10
+1201	112	1	2139	0	0	0	0		0		
diff --git a/db/PyMongoDataServer/PySysDB/tagTreasure.txt b/db/PyMongoDataServer/PySysDB/tagTreasure.txt
index 721669a..4478889 100644
--- a/db/PyMongoDataServer/PySysDB/tagTreasure.txt
+++ b/db/PyMongoDataServer/PySysDB/tagTreasure.txt
@@ -33,3 +33,4 @@
 306	3	0	0			
 307	3	0	0			
 308	3	0	0			
+401	4	0	1201			
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index eab630e..75c4874 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -358,6 +358,7 @@
 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
 2138	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	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+2139	1	0	宝莲灯	53	0	0	0	0	1	1	1	1	0	1	0	0	1	0	0	1	1	0	5	0	0	0	0	232	302	0	0	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
 2150	1	0	星级装备	15	0	0	0	0	1	1	0	0	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	3	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	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	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	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	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0

--
Gitblit v1.8.0