From 08ae922084291712c0b2d65339a2e498b07f4aad Mon Sep 17 00:00:00 2001
From: cehua-TT <448191260@qq.com>
Date: 星期二, 13 十一月 2018 10:20:54 +0800
Subject: [PATCH] Merge branch '1.2' of http://192.168.0.87:10010/r/snxx_server into 1.2
---
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveSkill_4064.pyc | 0
CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt | 3 ++-
db/PyMongoDataServer/PySysDB/tagActWishingWell.txt | 3 ++-
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4508.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.pyc | 0
7 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt b/CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt
index be068c8..1208948 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt
@@ -1,2 +1,3 @@
CfgID ActMark PlatformList ServerIDList StartDate EndDate IsDayReset ResetType NotifyInfoStart NotifyInfoEnd NotifyInfoLoop LimitLV
-1 test1 [] [] 2018-10-1 2018-10-3 1 1 {0:["XYCOpen", []]} {} [] 110
+1 kaifu1 [] [] 3 5 1 1 {0:["XYCOpen", []]} {} [] 110
+2 kaifu2 [] [] 7 9 1 1 {0:["XYCOpen", []]} {} [] 110
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
index 3b769a4..a2fbd45 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/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.pyc
index 627aa5d..f8c174f 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/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4508.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4508.pyc
index 61f6a75..b13b4d6 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4508.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4508.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveSkill_4064.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveSkill_4064.pyc
new file mode 100644
index 0000000..b81e432
--- /dev/null
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveSkill_4064.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.pyc
index baef4a9..3dbaeb5 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagActWishingWell.txt b/db/PyMongoDataServer/PySysDB/tagActWishingWell.txt
index 3068f15..3bddeea 100644
--- a/db/PyMongoDataServer/PySysDB/tagActWishingWell.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActWishingWell.txt
@@ -1,2 +1,3 @@
CfgID StartDate EndDate IsDayReset ResetType LimitLV TemplateID
-1 2018-10-1 2018-10-3 1 1 110 1
+1 3 5 1 1 110 1
+2 7 9 1 1 110 1
--
Gitblit v1.8.0