From f9fbb4895b53c1d5d082e40c533f67bf1bc1e241 Mon Sep 17 00:00:00 2001
From: CeHua_ZWJ <ceh@163.com>
Date: 星期五, 21 九月 2018 19:36:24 +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/tagActRealmPoint.txt | 1 +
2 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt b/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt
index f293df1..10e9d0a 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt
@@ -2,3 +2,4 @@
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-18 2018-9-18 18:00 20:00 { 0:["ExpActivity_Start", [2]]} {-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]} 110 10000
+4 DoubleExp [(7001,7003)] 2018-9-23 2018-9-23 18:00 20:00 { 0:["ExpActivity_Start", [3]]} {-5:["ExpActivity_End", [3]], 0:["ExpActivity_Close", [3]]} 110 20000
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActRealmPoint.txt b/CoreServerGroup/GameServer/PySysDB/tagActRealmPoint.txt
index f2f317e..d33e751 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActRealmPoint.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActRealmPoint.txt
@@ -2,3 +2,4 @@
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-17 2018-9-18 {} {} 2 110
+4 test4 [7001,7002,7003] 2018-9-24 2018-9-25 {} {} 2 110
--
Gitblit v1.8.0