From 33ef8c0c0e630b83ded24e591de3ca671ddccd04 Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期二, 27 十一月 2018 10:42:27 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagDailyQuest.txt | 1 -
CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt | 1 +
db/PyMongoDataServer/PySysDB/tagActExpRate.txt | 1 +
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.pyc | 0
4 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt b/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt
index 20bc285..7b11762 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt
@@ -4,3 +4,4 @@
3 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
4 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
5 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
+6 NovemberExp25 [] [] 2018-12-2 2018-12-2 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/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.pyc
index fc355ef..0a92076 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagActExpRate.txt b/db/PyMongoDataServer/PySysDB/tagActExpRate.txt
index 0579fac..c89f02d 100644
--- a/db/PyMongoDataServer/PySysDB/tagActExpRate.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActExpRate.txt
@@ -4,3 +4,4 @@
3 110 10000
4 110 10000
5 110 10000
+6 110 10000
diff --git a/db/PyMongoDataServer/PySysDB/tagDailyQuest.txt b/db/PyMongoDataServer/PySysDB/tagDailyQuest.txt
index 2dc259e..b2240dc 100644
--- a/db/PyMongoDataServer/PySysDB/tagDailyQuest.txt
+++ b/db/PyMongoDataServer/PySysDB/tagDailyQuest.txt
@@ -20,7 +20,6 @@
19 1 11 80 1 15 0
21 1 13 80 1 10 0
22 1 14 0 1 20 0
-
24 1 16 23 1 20 40
25 2 31240 22 1 30 0
26 2 31150 92 1 30 0
--
Gitblit v1.8.0