From 5f8ccc76dfba57aae160480d593e02a4a3085d28 Mon Sep 17 00:00:00 2001
From: cehua_hzl <648597270@qq.com>
Date: 星期五, 28 九月 2018 20:53:32 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagActBossReborn.txt | 3 ++-
CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt | 2 +-
CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt | 3 ++-
webbottle/Config.ini | 8 ++++----
4 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt b/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt
index 933f06c..9dbef24 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt
@@ -1,2 +1,3 @@
CfgID ActMark ServerIDList StartDate EndDate ResetType NotifyInfoStart NotifyInfoEnd LimitLV TemplateID
-1 OpenSever [] 9 10 1 {0:["BossFHOpen", []]} {} 110 1
+1 OpenSever [] 3 4 1 {0:["BossFHOpen", []]} {} 110 1
+2 OpenSever [] 9 10 1 {0:["BossFHOpen", []]} {} 110 1
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt b/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt
index a6f9dbf..c1e3bd5 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt
@@ -1,2 +1,2 @@
CfgID ActMark ServerIDList StartDate EndDate StartTime EndTime NotifyInfoStart NotifyInfoEnd LimitLV AddExpRate
-1 OpenServer [] 8 8 18:00 20:00 { 0:["ExpActivity_Start", [2]]} {-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]} 110 10000
+1 OpenServer [] 6 6 18:00 20:00 { 0:["ExpActivity_Start", [2]]} {-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]} 110 10000
diff --git a/db/PyMongoDataServer/PySysDB/tagActBossReborn.txt b/db/PyMongoDataServer/PySysDB/tagActBossReborn.txt
index d0cc53a..a335753 100644
--- a/db/PyMongoDataServer/PySysDB/tagActBossReborn.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActBossReborn.txt
@@ -1,2 +1,3 @@
CfgID StartDate EndDate ResetType LimitLV TemplateID
-1 9 10 1 110 1
+1 3 4 1 110 1
+2 9 10 1 110 1
diff --git a/webbottle/Config.ini b/webbottle/Config.ini
index cf5c66b..f62ac04 100644
--- a/webbottle/Config.ini
+++ b/webbottle/Config.ini
@@ -1,10 +1,10 @@
[GeTuiConfig]
# 一个自由APPID对应一对app_key和master_secret为极光推送应用生成
-app_key_822055139 = 1c060648058afe0b5faf72ca
-master_secret_822055139 = 568ae9f1a2a7650220af3921
+app_key_8220539 = 1c060658ab5faf72ca
+master_secret_825139 = 568ae50220af3921
-app_key_828115704 = 1c060648058afe0b5faf72ca
-master_secret_828115704 = 568ae9f1a2a7650220af3921
+app_key_828704 = 1c06064805b5faf72ca
+master_secret_828104 = 568aef1650220af3921
--
Gitblit v1.8.0