From 540fa0572be76e01bc39411f5a44b4b2e50a3d00 Mon Sep 17 00:00:00 2001
From: cehua-TT <448191260@qq.com>
Date: 星期一, 19 十一月 2018 21:12:02 +0800
Subject: [PATCH] Merge branch '1.2' of http://192.168.0.87:10010/r/snxx_server into 1.2
---
CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt | 2 ++
db/PyMongoDataServer/PySysDB/tagActBossReborn.txt | 1 +
db/PyMongoDataServer/PySysDB/tagActWishingWell.txt | 2 ++
CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt | 1 +
4 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt b/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt
index a351835..bf3cb71 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt
@@ -5,3 +5,4 @@
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
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt b/CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt
index 210b7b8..7bff72e 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt
@@ -2,3 +2,5 @@
1 kaifu1 [] [] 3 4 1 0 {0:["XYCOpen", []]} {} [] 110
2 kaifu2 [] [] 7 8 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
diff --git a/db/PyMongoDataServer/PySysDB/tagActBossReborn.txt b/db/PyMongoDataServer/PySysDB/tagActBossReborn.txt
index 3db2d01..ce541bb 100644
--- a/db/PyMongoDataServer/PySysDB/tagActBossReborn.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActBossReborn.txt
@@ -5,3 +5,4 @@
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
diff --git a/db/PyMongoDataServer/PySysDB/tagActWishingWell.txt b/db/PyMongoDataServer/PySysDB/tagActWishingWell.txt
index 24cf249..695c9e2 100644
--- a/db/PyMongoDataServer/PySysDB/tagActWishingWell.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActWishingWell.txt
@@ -2,3 +2,5 @@
1 3 4 1 0 110 1
2 7 8 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
--
Gitblit v1.8.0