From b655efe2e7c78d66cdcc7dbc4a7d13029fdd5871 Mon Sep 17 00:00:00 2001
From: cehua_ZWJ <123456>
Date: 星期一, 25 二月 2019 15:03:52 +0800
Subject: [PATCH] 6212 子 【后端】【1.6】合服开发单 / 【测试】【1.6】合服
---
CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt | 1 +
db/PyMongoDataServer/PySysDB/tagActBossReborn.txt | 1 +
db/PyMongoDataServer/PySysDB/tagActWishingWell.txt | 1 +
CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt | 1 +
CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt | 1 +
db/PyMongoDataServer/PySysDB/tagActExpRate.txt | 1 +
6 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt b/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt
index 32143d3..c648162 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt
@@ -19,3 +19,4 @@
19 [] [] 2019-2-12 2019-2-14 1 {0:["BossFHOpen", []]} {} 110 1
20 [] [] 2019-2-17 2019-2-20 1 {0:["BossFHOpen", []]} {} 110 1
21 [] [] 2019-2-22 2019-2-24 1 {0:["BossFHOpen", []]} {} 110 1
+22 [] [] Mix1 Mix1 1 {0:["BossFHOpen", []]} {} 110 1
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt b/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt
index 68fde7b..1566d97 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt
@@ -10,3 +10,4 @@
9 [] [] 2019-2-7 2019-2-7 18:00 20:00 { 0:["ExpActivity_Start", [2]]} {-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]} [30, "ExpActivity_Goahead", [2]] 110 10000
10 [] [] 2019-2-16 2019-2-16 18:00 20:00 { 0:["ExpActivity_Start", [2]]} {-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]} [30, "ExpActivity_Goahead", [2]] 110 10000
11 [] [] 2019-2-24 2019-2-24 18:00 20:00 { 0:["ExpActivity_Start", [2]]} {-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]} [30, "ExpActivity_Goahead", [2]] 110 10000
+12 [] [] Mix1 Mix5 19:00 20:00 { 0:["ExpActivity_Start", [2]]} {-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]} [30, "ExpActivity_Goahead", [2]] 110 10000
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt b/CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt
index 21eb510..9445bbd 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt
@@ -26,3 +26,4 @@
25 [] [] 2019-2-14 2019-2-15 1 0 {0:["XYCOpen", []]} {} [] 110
26 [] [] 2019-2-20 2019-2-21 1 0 {0:["XYCOpen", []]} {} [] 110
28 [] [] 2019-2-25 2019-2-25 1 0 {0:["XYCOpen", []]} {} [] 110
+29 [] [] Mix1 Mix3 1 0 {0:["XYCOpen", []]} {} [] 110
diff --git a/db/PyMongoDataServer/PySysDB/tagActBossReborn.txt b/db/PyMongoDataServer/PySysDB/tagActBossReborn.txt
index b29c2d1..3e54fb5 100644
--- a/db/PyMongoDataServer/PySysDB/tagActBossReborn.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActBossReborn.txt
@@ -19,3 +19,4 @@
19 2019-2-12 2019-2-14 1 110 1
20 2019-2-17 2019-2-20 1 110 1
21 2019-2-22 2019-2-24 1 110 1
+22 Mix1 Mix1 1 110 1
diff --git a/db/PyMongoDataServer/PySysDB/tagActExpRate.txt b/db/PyMongoDataServer/PySysDB/tagActExpRate.txt
index f99578c..a23676c 100644
--- a/db/PyMongoDataServer/PySysDB/tagActExpRate.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActExpRate.txt
@@ -10,3 +10,4 @@
9 110 10000
10 110 10000
11 110 10000
+12 110 10000
diff --git a/db/PyMongoDataServer/PySysDB/tagActWishingWell.txt b/db/PyMongoDataServer/PySysDB/tagActWishingWell.txt
index 35719c3..f2d1f5a 100644
--- a/db/PyMongoDataServer/PySysDB/tagActWishingWell.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActWishingWell.txt
@@ -26,3 +26,4 @@
25 2019-2-14 2019-2-15 1 0 110 1
26 2019-2-20 2019-2-21 1 0 110 1
28 2019-2-25 2019-2-25 1 0 110 1
+29 Mix1 Mix3 1 0 110 1
--
Gitblit v1.8.0