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

---
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.pyc |    0 
 db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt                                          |    3 +++
 CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt                                    |    3 +++
 3 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt b/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt
index 48f5113..cc8168d 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt
@@ -101,3 +101,6 @@
 149	280	0	0
 150	75	0	0
 151	105	0	0
+152	110	0	0
+153	110	0	0
+154	110	0	0
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.pyc
index 499f15e..762fb4d 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt b/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt
index a474a27..c89a70a 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt
@@ -101,3 +101,6 @@
 149	280	0	0	0	0
 150	75	0	0	0	0
 151	105	0	0	0	0
+152	110	0	0	0	0
+153	110	0	0	0	0
+154	110	0	0	0	0

--
Gitblit v1.8.0