From 25cf879262f09241dcc027a93c107a147d9ddfd0 Mon Sep 17 00:00:00 2001
From: cehua_TRX <526616766@qq.com>
Date: 星期五, 28 九月 2018 23:46:16 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/SysDB/tagChinSkill.txt | 4 ++--
CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt | 2 ++
db/PyMongoDataServer/PySysDB/tagActExpRate.txt | 2 ++
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt b/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt
index c1e3bd5..c0b06ce 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt
@@ -1,2 +1,4 @@
CfgID ActMark ServerIDList StartDate EndDate StartTime EndTime NotifyInfoStart NotifyInfoEnd LimitLV AddExpRate
1 OpenServer [] 6 6 18:00 20:00 { 0:["ExpActivity_Start", [2]]} {-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]} 110 10000
+2 NationalDay [] 2018-10-3 2018-10-3 18:00 20:00 { 0:["ExpActivity_Start", [2]]} {-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]} 110 10000
+3 NationalDay [] 2018-10-7 2018-10-7 18:00 20:00 { 0:["ExpActivity_Start", [2]]} {-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]} 110 10000
diff --git a/db/PyMongoDataServer/PySysDB/tagActExpRate.txt b/db/PyMongoDataServer/PySysDB/tagActExpRate.txt
index e6701b0..5a988cb 100644
--- a/db/PyMongoDataServer/PySysDB/tagActExpRate.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActExpRate.txt
@@ -1,2 +1,4 @@
CfgID LimitLV AddExpRate
1 110 10000
+2 110 10000
+3 110 10000
diff --git a/db/PyMongoDataServer/SysDB/tagChinSkill.txt b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
index 0bdc4c4..5a36324 100644
--- a/db/PyMongoDataServer/SysDB/tagChinSkill.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
@@ -1656,7 +1656,7 @@
51187 折光 51165 23 25 2 3 0 7 0 0 0 0 0 0 0 0 0 0 0 0 0 4019 1410 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 51135 10 0 0 0 0 0 2 62100 0 0 0 0 0 0 0 4 0 51101 0 0 0 0
51188 折光 51165 24 25 2 3 0 7 0 0 0 0 0 0 0 0 0 0 0 0 0 4019 1455 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 51135 10 0 0 0 0 0 2 66000 0 0 0 0 0 0 0 4 0 51101 0 0 0 0
51189 折光 51165 25 25 2 3 0 7 0 0 0 0 0 0 0 0 0 0 0 0 0 4019 1500 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 51135 10 0 0 0 0 0 2 70000 0 0 0 0 0 0 0 4 0 51101 0 0 0 0
-50900 烈焰之怒 50900 1 1 2 2 0 16 0 0 0 0 10 0 0 0 0 0 0 0 0 4039 10 0 0 4508 0 0 0 1011 1 1 0 74 35000 3 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 2 3051 0 0 0 0 0 0 0 4 0 0 0 0 0 0
+50900 烈焰之怒 50900 1 1 2 2 0 16 0 0 0 0 10 0 0 0 0 0 0 0 0 4039 10 0 0 4508 0 0 0 1011 1 1 0 74 35000 1 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 2 3051 0 0 0 0 0 0 0 4 0 0 0 0 0 0
50901 清心诀 50901 1 1 2 2 0 20 0 0 0 0 0 0 0 0 0 0 0 0 0 500 1200 50 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 2 6543 0 0 0 0 0 0 0 4 0 0 0 0 0 0
50902 乾元雷 50902 1 1 2 2 0 7 0 0 3 8 41 8 0 12000 0 0 0 0 0 1010 50000 0 0 1056 100 0 0 1200 5 0 0 4004 2000 0 0 1062 100000 0 1 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 2 9280 0 0 0 0 0 0 0 4 0 0 0 0 0 0
50903 狂暴怒意 50903 1 1 2 2 0 16 0 0 0 0 10 0 0 20000 0 0 0 0 0 4004 4500 0 0 17 3000 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 5000 0 0 0 0 0 0 0 0 0 0 0 0 2 12623 0 0 0 0 0 0 0 4 0 0 0 0 0 0
@@ -2577,7 +2577,7 @@
56188 折光 56165 24 25 4 3 0 7 0 0 0 0 0 0 0 0 0 0 0 0 0 4019 1455 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 56135 10 0 0 0 0 0 2 66000 0 0 0 0 0 0 0 4 0 56100 0 0 0 0
56189 折光 56165 25 25 4 3 0 7 0 0 0 0 0 0 0 0 0 0 0 0 0 4019 1500 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 56135 10 0 0 0 0 0 2 70000 0 0 0 0 0 0 0 4 0 56100 0 0 0 0
55890 爆破key 55890 1 1 4 3 0 1 0 0 39 0 10 0 0 0 0 0 0 0 0 1014 55865 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 6000 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0
-55900 烈焰之怒 55900 1 1 4 2 0 16 0 0 0 0 10 0 0 0 0 0 0 0 0 4039 10 0 0 4508 0 0 0 1011 1 1 0 74 35000 3 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 2 3051 0 0 0 0 0 0 0 4 0 0 0 0 0 0
+55900 烈焰之怒 55900 1 1 4 2 0 16 0 0 0 0 10 0 0 0 0 0 0 0 0 4039 10 0 0 4508 0 0 0 1011 1 1 0 74 35000 1 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 2 3051 0 0 0 0 0 0 0 4 0 0 0 0 0 0
55901 清心诀 55901 1 1 4 2 0 20 0 0 0 0 0 0 0 0 0 0 0 0 0 500 1200 50 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 2 6543 0 0 0 0 0 0 0 4 0 0 0 0 0 0
55902 乾元雷 55902 1 1 4 2 0 7 0 0 3 8 41 8 0 12000 0 0 0 0 0 1010 50000 0 0 1056 100 0 0 1200 5 0 0 4004 2000 0 0 1062 100000 0 1 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 2 9280 0 0 0 0 0 0 0 4 0 0 0 0 0 0
55903 狂暴怒意 55903 1 1 4 2 0 16 0 0 0 0 10 0 0 20000 0 0 0 0 0 4004 4500 0 0 17 3000 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 5000 0 0 0 0 0 0 0 0 0 0 0 0 2 12623 0 0 0 0 0 0 0 4 0 0 0 0 0 0
--
Gitblit v1.8.0