From 75e633ac5544c9d2546c443a80bee019ac835579 Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期一, 26 十一月 2018 20:03:50 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt | 4 ++++
db/PyMongoDataServer/PySysDB/tagActBossReborn.txt | 4 ++++
db/PyMongoDataServer/PySysDB/tagActWishingWell.txt | 4 ++++
CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt | 4 ++++
4 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt b/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt
index a0a0a9d..64fa8e7 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt
@@ -3,3 +3,7 @@
2 OpenSever2 [] [] 9 11 1 {0:["BossFHOpen", []]} {} 110 1
3 Guoqing1 [] [7001,7002,7003,8002,8003,8004] 2018-10-1 2018-10-3 1 {0:["BossFHOpen", []]} {} 110 1
4 Guoqing2 [] [7001,7002,7003,8002,8003,8004] 2018-10-5 2018-10-7 1 {0:["BossFHOpen", []]} {} 110 1
+5 yunying [] [] 2018-11-3 2018-11-5 1 {0:["BossFHOpen", []]} {} 110 1
+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
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt b/CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt
index 6fedbd4..8055be5 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt
@@ -1,3 +1,7 @@
CfgID ActMark PlatformList ServerIDList StartDate EndDate IsDayReset ResetType NotifyInfoStart NotifyInfoEnd NotifyInfoLoop LimitLV
1 kaifu1 [] [] 2 3 1 0 {0:["XYCOpen", []]} {} [] 110
2 kaifu2 [] [] 6 7 1 0 {0:["XYCOpen", []]} {} [] 110
+3 ceshi1 [] [] 2018-11-16 2018-11-18 1 0 {0:["XYCOpen", []]} {} [] 110
+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
diff --git a/db/PyMongoDataServer/PySysDB/tagActBossReborn.txt b/db/PyMongoDataServer/PySysDB/tagActBossReborn.txt
index 6a0ff47..e9a7ec8 100644
--- a/db/PyMongoDataServer/PySysDB/tagActBossReborn.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActBossReborn.txt
@@ -3,3 +3,7 @@
2 9 11 1 110 1
3 2018-10-1 2018-10-3 1 110 1
4 2018-10-5 2018-10-7 1 110 1
+5 2018-11-3 2018-11-5 1 110 1
+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
diff --git a/db/PyMongoDataServer/PySysDB/tagActWishingWell.txt b/db/PyMongoDataServer/PySysDB/tagActWishingWell.txt
index 5d4b46a..cb03319 100644
--- a/db/PyMongoDataServer/PySysDB/tagActWishingWell.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActWishingWell.txt
@@ -1,3 +1,7 @@
CfgID StartDate EndDate IsDayReset ResetType LimitLV TemplateID
1 2 3 1 0 110 1
2 6 7 1 0 110 1
+3 2018-11-16 2018-11-18 1 0 110 1
+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
--
Gitblit v1.8.0