From ffa712ccb40c10649679297b36ef7fb8697aae16 Mon Sep 17 00:00:00 2001
From: CeHua_TRX <526616766@qq.com>
Date: 星期二, 11 十二月 2018 19:46:08 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt | 5 +++++
db/PyMongoDataServer/PySysDB/tagActBossReborn.txt | 2 ++
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc | 0
db/PyMongoDataServer/PySysDB/tagActWishingWell.txt | 5 +++++
CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt | 2 ++
CoreServerGroup/GameServer/Script/ShareDefine.pyc | 0
CoreServerGroup/GameServer/PySysDB/tagActFairyCeremony.txt | 2 +-
7 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt b/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt
index 64fa8e7..edcae35 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt
@@ -7,3 +7,5 @@
6 yunying2 [] [] 2018-11-14 2018-11-16 1 {0:["BossFHOpen", []]} {} 110 1
7 yunying3 [] [] 2018-11-21 2018-11-23 1 {0:["BossFHOpen", []]} {} 110 1
8 xiaoxuefh18 [] [] 2018-11-30 2018-12-2 1 {0:["BossFHOpen", []]} {} 110 1
+9 daxuefh18 [] [] 2018-12-5 2018-12-7 1 {0:["BossFHOpen", []]} {} 110 1
+10 sdq1211 [] [] 2018-12-13 2018-12-15 1 {0:["BossFHOpen", []]} {} 110 1
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActFairyCeremony.txt b/CoreServerGroup/GameServer/PySysDB/tagActFairyCeremony.txt
index 178a1ec..da1aa1c 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActFairyCeremony.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActFairyCeremony.txt
@@ -1,2 +1,2 @@
CfgID ActMark PlatformList ServerIDList StartDate EndDate ResetType NotifyInfoStart NotifyInfoEnd LimitLV
-1 test1 [] [] 2018-11-28 2018-11-28 2 {0:["CeremonyStart", []],30:["CeremonyStart", []],60:["CeremonyStart", []],180:["CeremonyStart", []],360:["CeremonyStart", []]} {-60:["CeremonyEnd", []],-30:["CeremonyEnd", []],0:["CeremonyOver", []]} 110
+1 test1 [] [] 2018-12-19 2018-12-19 2 {0:["CeremonyStart", []],30:["CeremonyStart", []],60:["CeremonyStart", []],180:["CeremonyStart", []],360:["CeremonyStart", []]} {-60:["CeremonyEnd", []],-30:["CeremonyEnd", []],0:["CeremonyOver", []]} 110
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt b/CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt
index 8055be5..a5e60d2 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt
@@ -5,3 +5,8 @@
4 yunying1 [] [] 2018-11-23 2018-11-24 1 0 {0:["XYCOpen", []]} {} [] 110
5 yunying2 [] [] 2018-11-26 2018-11-26 1 0 {0:["XYCOpen", []]} {} [] 110
6 xiaoxuexy18 [] [] 2018-12-3 2018-12-3 1 0 {0:["XYCOpen", []]} {} [] 110
+7 kaifu3 [] [] 12 13 1 0 {0:["XYCOpen", []]} {} [] 110
+8 daxuexy1 [] [] 2018-12-7 2018-12-7 1 0 {0:["XYCOpen", []]} {} [] 110
+9 daxuexy2 [] [] 2018-12-11 2018-12-11 1 0 {0:["XYCOpen", []]} {} [] 110
+10 sdq1215 [] [] 2018-12-15 2018-12-15 1 0 {0:["XYCOpen", []]} {} [] 110
+11 sdq1217 [] [] 2018-12-17 2018-12-17 1 0 {0:["XYCOpen", []]} {} [] 110
diff --git a/CoreServerGroup/GameServer/Script/ShareDefine.pyc b/CoreServerGroup/GameServer/Script/ShareDefine.pyc
index a5a8160..c4e9468 100644
--- a/CoreServerGroup/GameServer/Script/ShareDefine.pyc
+++ b/CoreServerGroup/GameServer/Script/ShareDefine.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc
index 40de330..cbcd473 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagActBossReborn.txt b/db/PyMongoDataServer/PySysDB/tagActBossReborn.txt
index e9a7ec8..40507cf 100644
--- a/db/PyMongoDataServer/PySysDB/tagActBossReborn.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActBossReborn.txt
@@ -7,3 +7,5 @@
6 2018-11-14 2018-11-16 1 110 1
7 2018-11-21 2018-11-23 1 110 1
8 2018-11-30 2018-12-2 1 110 1
+9 2018-12-5 2018-12-7 1 110 1
+10 2018-12-13 2018-12-15 1 110 1
diff --git a/db/PyMongoDataServer/PySysDB/tagActWishingWell.txt b/db/PyMongoDataServer/PySysDB/tagActWishingWell.txt
index cb03319..41b4143 100644
--- a/db/PyMongoDataServer/PySysDB/tagActWishingWell.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActWishingWell.txt
@@ -5,3 +5,8 @@
4 2018-11-23 2018-11-24 1 0 110 1
5 2018-11-26 2018-11-26 1 0 110 1
6 2018-12-3 2018-12-3 1 0 110 1
+7 12 13 1 0 110 1
+8 2018-12-7 2018-12-7 1 0 110 1
+9 2018-12-11 2018-12-11 1 0 110 1
+10 2018-12-15 2018-12-15 1 0 110 1
+11 2018-12-17 2018-12-17 1 0 110 1
--
Gitblit v1.8.0