From 1ea73e1885835466265ce788d93556b7030ee0e8 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期日, 30 十二月 2018 18:42:00 +0800
Subject: [PATCH] 5424 【后端】【1.4】跨服竞技场开发(GM工具增加子服服务器维护,文字翻译版)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.py |   36 +++++++++---------------------------
 1 files changed, 9 insertions(+), 27 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.py
index f38e738..2abd246 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.py
@@ -38,9 +38,7 @@
 import GameLogInfo
 import GameServerRefresh
 import ShareDefine
-import ReadCaptchaImage
 import PlayerGameWallow
-import ItemCommon
 import Operate_PlayerBuyZhenQi
 import PlayerSignDay
 import PlayerCoin
@@ -52,29 +50,22 @@
 import PlayerHorse
 import PlayerLoginDayAward
 import NPCCommon
-import GameLogic_MergeBoss
-import GameLogic_ManorWar
 import FunctionNPCCommon
 import PlayerGoldGift
 import PlayerActivity
 import PlayerTeHui
 import PlayerBindJadeWheel
 import PlayerAction
-import PlayerTruck
 import FBCommon
-import PlayerDienstgrad
 import PlayerSuccess
-import PlayerMixLoginDayAward
 import PlayerFreeGoods
 import PlayerMagicWeapon
 import ShopItemManage
 import ChItem
 import PlayerGoldInvest
 import PlayerNewGuyCard
-import PlayerMergeKing
-import PlayerMergePK
+import PlayerCrossRealmPK
 import PlayerPet
-import ReloadModule
 import BossHurtMng
 import PlayerRecover
 import GameLogic_FamilyParty
@@ -162,9 +153,6 @@
     
     #副本OnDay事件响应
     FBLogic.OnDay(tick)
-    
-    #重置跨服活动副本人数分配情况信息
-    PlayerControl.ResetMergeFBPlayerCntInfo(0)
     
     #删除所有的任务发布
     missionPubManager = GameWorld.GetGameWorld().GetDBMissionPubManager()
@@ -548,6 +536,8 @@
         NPCCommon.CollNPCTimeOnDay(curPlayer)
         #副本助战
         FBHelpBattle.DoPlayerOnDay(curPlayer)
+        #跨服竞技场
+        PlayerCrossRealmPK.DoPlayerOnDay(curPlayer)
         
     PlayerTJG.TJGOnDay(curPlayer, onEventType)
     # 以下为支持两种重置模式切换配置的
@@ -1334,24 +1324,16 @@
     #===============================================================================================
     
     #领地争夺战
-    elif key == ShareDefine.Def_Notify_WorldKey_ManorWar:
-        GameLogic_ManorWar.OnManorWarStateChange(value, tick)
+    #elif key == ShareDefine.Def_Notify_WorldKey_ManorWar:
+    #    GameLogic_ManorWar.OnManorWarStateChange(value, tick)
 
     #定时商店刷新
     elif key.startswith(ShareDefine.Def_Notify_WorldKey_TimeShopRefreshTime[:-2]):
         ShopItemManage.OnTimeShopRefresh(key, value, tick)
-        
-    #跨服boss
-    elif key == ShareDefine.Def_Notify_WorldKey_MergeBoss:
-        GameLogic_MergeBoss.OnMergeBossStateChange(value, tick)
-        
-    # 跨服PK, 赛季开始时间不用处理,仅存储即可
-    elif key in [ShareDefine.Def_Notify_WorldKey_MergePKDayID, ShareDefine.Def_Notify_WorldKey_MergePKSeasonID]:
-        PlayerMergePK.OnMergePKActionChange(key, value)
-        
-    # 跨服王者争霸
-    elif key in [ShareDefine.Def_Notify_WorldKey_Merge_KingStartID, ShareDefine.Def_Notify_WorldKey_Merge_KingOverID]:
-        PlayerMergeKing.OnMergeKingActionChange(key, value)
+    
+    # 跨服PK
+    elif key == ShareDefine.Def_Notify_WorldKey_CrossPKSeasonID:
+        PlayerCrossRealmPK.OnCrossRealmPKSeasonChange(value)
         
     # 仙盟宴会
     elif key == ShareDefine.Def_Notify_WorldKey_FBFuncState % ChConfig.Def_FBMapID_FamilyParty:

--
Gitblit v1.8.0