From bd59ce1c79d42c60f726df8f7deab5a3e7583881 Mon Sep 17 00:00:00 2001
From: cehua_LC <tingame100@163.com>
Date: 星期一, 19 十一月 2018 21:10:41 +0800
Subject: [PATCH] Merge branch '1.2' of http://192.168.0.87:10010/r/snxx_server into 1.2

---
 CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt |    1 +
 db/PyMongoDataServer/PySysDB/tagActExpRate.txt       |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt b/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt
index 42ae72a..7966623 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt
@@ -3,3 +3,4 @@
 3	DoubleExp10	[]	[]	2018-11-10	2018-11-10	18:00	20:00	{ 0:["ExpActivity_Start", [2]]}	{-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]}	[30, "ExpActivity_Goahead", [2]]	110	10000
 4	DoubleExp11	[]	[]	2018-11-11	2018-11-11	18:00	20:00	{ 0:["ExpActivity_Start", [2]]}	{-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]}	[30, "ExpActivity_Goahead", [2]]	110	10000
 5	NovemberExp17	[]	[]	2018-11-17	2018-11-17	18:00	20:00	{ 0:["ExpActivity_Start", [2]]}	{-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]}	[30, "ExpActivity_Goahead", [2]]	110	10000
+6	NovemberExp25	[]	[]	2018-11-25	2018-11-25	18:00	20:00	{ 0:["ExpActivity_Start", [2]]}	{-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]}	[30, "ExpActivity_Goahead", [2]]	110	10000
diff --git a/db/PyMongoDataServer/PySysDB/tagActExpRate.txt b/db/PyMongoDataServer/PySysDB/tagActExpRate.txt
index 79d3e6b..ab8e89f 100644
--- a/db/PyMongoDataServer/PySysDB/tagActExpRate.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActExpRate.txt
@@ -3,3 +3,4 @@
 3	110	10000
 4	110	10000
 5	110	10000
+6	110	10000

--
Gitblit v1.8.0