From f81909408c40cda0ea1468d81ee47902a87bad7e Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期二, 14 八月 2018 09:54:14 +0800
Subject: [PATCH] fix:2385 boss复活调整

---
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc                                 |    0 
 CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc                                                      |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc                                   |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc                                      |    0 
 CoreServerGroup/GameServer/Script/Player/PlayerBourse.pyc                                                |    0 
 CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt                                                  |    6 +++---
 CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc                                       |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTreasure.pyc                         |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_BossHome.pyc   |    0 
 CoreServerGroup/GameServer/Script/Player/ChPlayer.pyc                                                    |    0 
 CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt                                                     |    1 +
 CoreServerGroup/GameServer/Script/ShareDefine.pyc                                                        |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc                               |    0 
 CoreServerGroup/GameServer/Script/Player/PlayerDBGSEvent.pyc                                             |    0 
 CoreServerGroup/GameServer/Script/PyGameData.pyc                                                         |    0 
 CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc                                                    |    0 
 CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc                              |    0 
 db/PyMongoDataServer/PySysDB/tagBossReborn.txt                                                           |   35 +++++++++++++++++++++++------------
 CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc                                    |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_TrialTower.pyc |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBossReborn.pyc                       |    0 
 21 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt b/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt
index 5e725c3..ddb5f5c 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt
@@ -1,3 +1,3 @@
-CfgID	ActMark	ServerIDList	StartDate	EndDate	NotifyInfoStart	NotifyInfoEnd	LimitLV
-1	test1	[]	2018-7-16	2018-7-18	{0:["BossFHOpen", []]}	{}	110
-2	test2	[]	2018-7-13	2018-7-15	{0:["BossFHOpen", []]}	{}	110
+CfgID	ActMark	ServerIDList	StartDate	EndDate	NotifyInfoStart	NotifyInfoEnd	LimitLV	TemplateID
+1	test1	[]	2018-7-16	2018-7-18	{0:["BossFHOpen", []]}	{}	110	1
+2	test2	[]	2018-7-13	2018-7-15	{0:["BossFHOpen", []]}	{}	110	2
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
index 68c3a18..3831229 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
@@ -61,4 +61,5 @@
 BillBoardPlayerLoginNotify	[[0, {1:'GeRen_liubo_232930'}],[4, {1:'GeRen_liubo_148706'}],]	100	300		
 BossRebornTotalPoint	4300|4300	200|999			
 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/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc b/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc
index 889fc01..81c8997 100644
--- a/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc
+++ b/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc
index efe5aea..77c9309 100644
--- a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc
+++ b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc
index cfeb191..e3dd256 100644
--- a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc
+++ b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc
index 273ca12..f44d579 100644
--- a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc
+++ b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc b/CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc
index eafe540..ade5790 100644
--- a/CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc
+++ b/CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/Player/ChPlayer.pyc b/CoreServerGroup/GameServer/Script/Player/ChPlayer.pyc
index aa61571..101f315 100644
--- a/CoreServerGroup/GameServer/Script/Player/ChPlayer.pyc
+++ b/CoreServerGroup/GameServer/Script/Player/ChPlayer.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerBourse.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerBourse.pyc
index 0d6e1d4..2f9e4c3 100644
--- a/CoreServerGroup/GameServer/Script/Player/PlayerBourse.pyc
+++ b/CoreServerGroup/GameServer/Script/Player/PlayerBourse.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerDBGSEvent.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerDBGSEvent.pyc
index 2af9ce8..3140b02 100644
--- a/CoreServerGroup/GameServer/Script/Player/PlayerDBGSEvent.pyc
+++ b/CoreServerGroup/GameServer/Script/Player/PlayerDBGSEvent.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/PyGameData.pyc b/CoreServerGroup/GameServer/Script/PyGameData.pyc
index 6f3c2ef..9030773 100644
--- a/CoreServerGroup/GameServer/Script/PyGameData.pyc
+++ b/CoreServerGroup/GameServer/Script/PyGameData.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/ShareDefine.pyc b/CoreServerGroup/GameServer/Script/ShareDefine.pyc
index 0f31253..f34b35b 100644
--- a/CoreServerGroup/GameServer/Script/ShareDefine.pyc
+++ b/CoreServerGroup/GameServer/Script/ShareDefine.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
index 1b715ee..16977c0 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc
index a96d1e1..57b0b88 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_BossHome.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_BossHome.pyc
index f7d9da5..44377bd 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_BossHome.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_BossHome.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_TrialTower.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_TrialTower.pyc
index b6f6891..ee22a74 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_TrialTower.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_TrialTower.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc
index 425c8f5..f2f2816 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBossReborn.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBossReborn.pyc
index 801723b..ef2e337 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBossReborn.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBossReborn.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTreasure.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTreasure.pyc
index 71eebe6..be58d2f 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTreasure.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTreasure.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc
index 78869b5..d73bc80 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagBossReborn.txt b/db/PyMongoDataServer/PySysDB/tagBossReborn.txt
index e31b3f1..428f769 100644
--- a/db/PyMongoDataServer/PySysDB/tagBossReborn.txt
+++ b/db/PyMongoDataServer/PySysDB/tagBossReborn.txt
@@ -1,12 +1,23 @@
-Id	TotalTimes	SingleTimes	Reward1	RewardCount1	Reward2	RewardCount2	Reward3	RewardCount3	WorldLevel
-1	3	1	21|21	20|20	11|11	1|1	0|0	0|0	100|999
-2	4	1	21|21	20|20	11|11	1|1	0|0	0|0	100|999
-3	10	1	21|21	10|10	11|11	1|1	0|0	0|0	100|999
-4	10	1	21|21	10|10	11|11	1|1	0|0	0|0	100|999
-5	20	1	21|21	15|15	11|11	1|1	0|0	0|0	100|999
-6	3	3	21|21	50|50	1128|1128	1|1	0|0	0|0	100|999
-7	3	1	21|21	20|20	11|11	1|1	0|0	0|0	100|999
-8	30	2	21|21	10|10	11|11	1|1	0|0	0|0	100|999
-9	20	10	21|21	10|10	11|11	1|1	0|0	0|0	100|999
-10	5	1	21|21	10|10	11|11	1|1	0|0	0|0	100|999
-11	5	1	21|21	10|10	11|11	1|1	0|0	0|0	100|999
+TemplateID	Id	TotalTimes	SingleTimes	Reward
+1	1	3	1	[(21,20,1),(11,2,1)]
+1	2	4	1	[(21,20,1),(11,2,1)]
+1	3	10	1	[(21,20,1),(11,2,1)]
+1	4	10	1	[(21,20,1),(11,2,1)]
+1	5	20	1	[(21,20,1),(11,2,1)]
+1	6	3	3	[(21,20,1),(11,2,1)]
+1	7	3	1	[(21,20,1),(11,2,1)]
+1	8	30	2	[(21,20,1),(11,2,1)]
+1	9	20	10	[(21,20,1),(11,2,1)]
+1	10	5	1	[(21,20,1),(11,2,1)]
+1	11	5	1	[(21,20,1),(11,2,1)]
+2	1	3	1	[(21,20,1),(11,2,1)]
+2	2	4	1	[(21,20,1),(11,2,1)]
+2	3	10	1	[(21,20,1),(11,2,1)]
+2	4	10	1	[(21,20,1),(11,2,1)]
+2	5	20	1	[(21,20,1),(11,2,1)]
+2	6	3	3	[(21,20,1),(11,2,1)]
+2	7	3	1	[(21,20,1),(11,2,1)]
+2	8	30	2	[(21,20,1),(11,2,1)]
+2	9	20	10	[(21,20,1),(11,2,1)]
+2	10	5	1	[(21,20,1),(11,2,1)]
+2	11	5	1	[(21,20,1),(11,2,1)]

--
Gitblit v1.8.0