From 3d81c6890e9c068e522a50212a9aca4881e38996 Mon Sep 17 00:00:00 2001
From: cehua_hzl <648597270@qq.com>
Date: 星期四, 13 九月 2018 19:06:56 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 db/PyMongoDataServer/SysDB/tagChinSkill.txt                   |    2 +-
 CoreServerGroup/GameServer/Script/Player/PlayerSealDemon.pyc  |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip |    0 
 3 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerSealDemon.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerSealDemon.pyc
index 9278554..05d76e3 100644
--- a/CoreServerGroup/GameServer/Script/Player/PlayerSealDemon.pyc
+++ b/CoreServerGroup/GameServer/Script/Player/PlayerSealDemon.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
index 25cfe07..2df0159 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
Binary files differ
diff --git a/db/PyMongoDataServer/SysDB/tagChinSkill.txt b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
index d82fc0a..ed6604c 100644
--- a/db/PyMongoDataServer/SysDB/tagChinSkill.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
@@ -761,7 +761,7 @@
 49175	潜心	49175	1	1	0	5	0	7	3	0	0	0	0	0	0	0	0	0	0	0	0	4002	2000	3000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	63339	0	0	0	0	0	0	0	4	0	0	0	0	0	0
 49180	旺盛	49180	1	1	0	5	0	20	0	0	0	0	0	0	0	0	0	0	0	0	0	510	307	6	1000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	3598	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 49185	强攻	49185	1	1	0	5	0	20	0	0	0	0	0	0	0	0	0	0	0	0	0	511	3	7	500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	8995	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-49190	必杀	49190	1	1	0	5	0	7	0	0	0	0	41	0	0	10000	0	0	0	0	0	4007	100	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	31482	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+49190	必杀	49190	1	1	0	5	0	7	0	0	0	0	41	0	0	10000	0	0	0	0	0	4051	1500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	31482	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 50000	金箍幻灭	50000	1	1	2	1	0	1	0	0	2	8	40	4	0	8000	0	0	0	0	0	1010	25000	0	0	1200	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	692	0	0	0	0	0	0	0	2	0	0	0	0	0	0
 50100	皓月腾空	50100	1	1	2	1	0	1	0	0	2	6	41	10	0	16000	0	0	0	0	0	1010	30000	0	0	1200	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	50101	0	0	0	0	0	0	0	0	0	0	2	879	0	0	0	0	0	0	0	2	0	0	0	0	0	0
 50101	加速	50101	1	1	0	0	0	5	0	0	0	0	10	0	0	0	0	0	0	0	0	16	1000	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	3000	0	0	0	0	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0	0	0	0	0	50100	0	0	0	0

--
Gitblit v1.8.0