From ba042ef35292f097c0cbf1692b08f0f8c0f0268c Mon Sep 17 00:00:00 2001
From: cehua_TRX <526616766@qq.com>
Date: 星期五, 07 九月 2018 21:29:22 +0800
Subject: [PATCH] Merge branch '1.0.15' of http://192.168.0.87:10010/r/snxx_server into 1.0.15
---
CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt | 1 +
CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt | 1 +
CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt | 5 +++++
CoreServerGroup/GameServer/PySysDB/tagActRealmPoint.txt | 1 +
db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt | 5 +++++
5 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt b/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt
index 658d082..b1aee0f 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt
@@ -2,3 +2,4 @@
1 test1 [7001] 2018-9-14 2018-9-15 {0:["BossFHOpen", []]} {} 110 1
2 test2 [7002] 2018-9-15 2018-9-16 {0:["BossFHOpen", []]} {} 110 2
3 test3 [7001,7002] 2018-9-9 2018-9-10 {0:["BossFHOpen", []]} {} 110 1
+4 test4 [7003] 2018-9-16 2018-9-17 {0:["BossFHOpen", []]} {} 110 1
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt b/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt
index ae886dd..0782040 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt
@@ -1,3 +1,4 @@
CfgID ActMark ServerIDList StartDate EndDate StartTime EndTime NotifyInfoStart NotifyInfoEnd LimitLV AddExpRate
1 OpenServer [7001] 2018-9-13 2018-9-13 18:00 20:00 { 0:["ExpActivity_Start", [2]]} {-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]} 110 10000
2 OpenServer [7002] 2018-9-14 2018-9-14 18:00 20:00 { 0:["ExpActivity_Start", [2]]} {-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]} 110 10000
+3 OpenServer [7003] 2018-9-15 2018-9-15 18:00 20:00 { 0:["ExpActivity_Start", [2]]} {-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]} 110 10000
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt b/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
index fccf8fa..cd4311f 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
@@ -12,3 +12,8 @@
11 2OpenServer03 [7002] 7 2018-9-12 2018-9-12 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} 50 1 [[1]]
12 2OpenServer04 [7002] 7 2018-9-13 2018-9-13 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} 180 1 [[3]]
13 2OpenServer05 [7002] 7 2018-9-16 2018-9-16 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} 280 1 [[5]]
+14 3OpenServer01 [7003] 7 2018-9-9 2018-9-9 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} 50 1 [[2]]
+15 3OpenServer02 [7003] 7 2018-9-11 2018-9-11 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} 50 1 [[4]]
+16 3OpenServer03 [7003] 7 2018-9-13 2018-9-13 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} 50 1 [[1]]
+17 3OpenServer04 [7003] 7 2018-9-14 2018-9-14 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} 180 1 [[3]]
+18 3OpenServer05 [7003] 7 2018-9-17 2018-9-17 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} 280 1 [[5]]
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActRealmPoint.txt b/CoreServerGroup/GameServer/PySysDB/tagActRealmPoint.txt
index 70dd089..986292c 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActRealmPoint.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActRealmPoint.txt
@@ -1,3 +1,4 @@
CfgID ActMark ServerIDList StartDate EndDate NotifyInfoStart NotifyInfoEnd Multiple LimitLV
1 test1 [7001] 2018-9-12 2018-9-13 {} {} 2 110
2 test2 [7002] 2018-9-13 2018-9-14 {} {} 2 110
+3 test3 [7003] 2018-9-14 2018-9-15 {} {} 2 110
diff --git a/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt b/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
index 10c806e..e7bdabd 100644
--- a/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
@@ -12,3 +12,8 @@
11 2018-9-12 2018-9-12 50 1 [[1]]
12 2018-9-13 2018-9-13 180 1 [[3]]
13 2018-9-16 2018-9-16 280 1 [[5]]
+14 2018-9-9 2018-9-9 50 1 [[2]]
+15 2018-9-11 2018-9-11 50 1 [[4]]
+16 2018-9-13 2018-9-13 50 1 [[1]]
+17 2018-9-14 2018-9-14 180 1 [[3]]
+18 2018-9-17 2018-9-17 280 1 [[5]]
--
Gitblit v1.8.0