From aae10386f0491aaa0eabae11b35db3b9d8426db4 Mon Sep 17 00:00:00 2001
From: cehua_hzl <648597270@qq.com>
Date: 星期三, 22 八月 2018 17:35:40 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4515.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc | 0
db/PyMongoDataServer/PySysDB/tagBossReborn.txt | 48 ++++++++++++++++++++++++------------------------
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.pyc | 0
CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt | 2 +-
6 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
index e9f61da..6c8ae66 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
@@ -60,7 +60,7 @@
OpenServerRedPacketRain 200
GeTuiOffLine 您关注的封魔坛BOSS[%s LV.%s]已经复活，快前往挑战 您关注的%s的BOSS[%s LV.%s]即将复活刷新，赶快上线前往挑战 您收到来自[%s]的私聊消息，快上线回复对方 升到60级就开启离线挂机啦，角色下线也可以挂机，经验和装备一点也不落下！[再玩一会]
BillBoardPlayerLoginNotify [[0, {1:'GeRen_liubo_232930'}],[4, {1:'GeRen_liubo_148706'}],] 100 300
-BossRebornTotalPoint 1744|2616|3488|4360 26|51|101|9999
+BossRebornTotalPoint 2200|3300|4400|5500 26|51|101|9999
BossRebornNotify [50,80] [0,20,40]
ServerActivePlayerCnt 100 max(20,min(yesterdayPlayerCnt,150))
CeremonyWorldLv {"1":[[0,100],[101,200],[201,900]],"2":[[0,100],[101,200],[201,900]],"3":[[0,100],[101,200],[201,900]],"4":[[0,100],[101,200],[201,900]]}
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc
index 310a908..ac9403e 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.pyc
index 19c2b8a..d8b9e17 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4515.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4515.pyc
new file mode 100644
index 0000000..5559139
--- /dev/null
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4515.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.pyc
index 3b5c153..c1d9d41 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagBossReborn.txt b/db/PyMongoDataServer/PySysDB/tagBossReborn.txt
index 6939fb6..eb173b7 100644
--- a/db/PyMongoDataServer/PySysDB/tagBossReborn.txt
+++ b/db/PyMongoDataServer/PySysDB/tagBossReborn.txt
@@ -1,25 +1,25 @@
TemplateID Id TotalTimes SingleTimes Reward
-1 1 3 1 [(21,20,1),(11,1,1)]
-1 2 4 1 [(21,20,1),(11,1,1)]
-1 3 10 1 [(21,10,1),(11,1,1)]
-1 4 10 1 [(21,10,1),(11,1,1)]
-1 5 20 1 [(21,20,1),(11,1,1)]
-1 6 3 3 [(21,50,1),(1128,1,1)]
-1 7 3 1 [(21,20,1),(11,1,1)]
-1 8 30 2 [(21,10,1),(11,1,1)]
-1 9 20 10 [(21,10,1),(11,1,1)]
-1 10 5 1 [(21,10,1),(11,1,1)]
-1 12 3 1 [(21,10,1),(11,1,1)]
-1 13 20 1 [(21,15,1),(11,1,1)]
-2 1 3 1 [(21,20,1),(11,1,1)]
-2 2 4 1 [(21,20,1),(11,1,1)]
-2 3 10 1 [(21,10,1),(11,1,1)]
-2 4 10 1 [(21,10,1),(11,1,1)]
-2 5 20 1 [(21,20,1),(11,1,1)]
-2 6 3 3 [(21,50,1),(1128,1,1)]
-2 7 3 1 [(21,20,1),(11,1,1)]
-2 8 30 2 [(21,10,1),(11,1,1)]
-2 9 20 10 [(21,10,1),(11,1,1)]
-2 10 5 1 [(21,10,1),(11,1,1)]
-2 12 3 1 [(21,10,1),(11,1,1)]
-2 13 20 1 [(21,15,1),(11,1,1)]
+1 1 3 1 [(21,10,1),(2341,1,1)]
+1 2 5 1 [(21,10,1),(2341,1,1)]
+1 3 10 1 [(21,10,1),(2341,1,1)]
+1 4 10 1 [(21,10,1),(2341,1,1)]
+1 5 20 1 [(21,20,1),(2341,1,1)]
+1 6 3 3 [(21,100,1),(1128,1,1)]
+1 7 6 1 [(21,10,1),(2341,1,1,1)]
+1 8 28 2 [(21,10,1),(2341,1,1)]
+1 9 20 10 [(21,20,1),(2341,1,1)]
+1 10 5 1 [(21,20,1),(2341,1,1)]
+1 12 3 1 [(21,10,1),(2341,1,1)]
+1 13 20 1 [(21,20,1),(2341,1,1)]
+2 1 3 1 [(21,10,1),(2341,1,1)]
+2 2 5 1 [(21,10,1),(2341,1,1)]
+2 3 10 1 [(21,10,1),(2341,1,1)]
+2 4 10 1 [(21,10,1),(2341,1,1)]
+2 5 20 1 [(21,20,1),(2341,1,1)]
+2 6 3 3 [(21,100,1),(1128,1,1)]
+2 7 6 1 [(21,10,1),(2341,1,1,1)]
+2 8 28 2 [(21,10,1),(2341,1,1)]
+2 9 20 10 [(21,20,1),(2341,1,1)]
+2 10 5 1 [(21,20,1),(2341,1,1)]
+2 12 3 1 [(21,10,1),(2341,1,1)]
+2 13 20 1 [(21,20,1),(2341,1,1)]
--
Gitblit v1.8.0