From b6ba2976a06e9d288c740e8ab83186b7feb5dcea Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期三, 26 十二月 2018 08:03:05 +0800
Subject: [PATCH] 860312 buff封包补齐

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.py |   40 +++++++++++++++++++++-------------------
 1 files changed, 21 insertions(+), 19 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 d479a12..6f7e2d2 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
@@ -86,6 +77,7 @@
 import GameLogic_Dogz
 import OpenServerCampaign
 import PlayerCostRebate
+import PlayerActTotalRecharge
 import PlayerSpringSale
 import PlayerBossReborn
 import PlayerFlashGiftbag
@@ -97,6 +89,7 @@
 import PlayerDiceEx
 import IpyGameDataPY
 import FamilyRobBoss
+import FBHelpBattle
 import QuestManager
 import PyGameData
 import PlayerTJG
@@ -544,6 +537,10 @@
         PlayerFreeGoods.OnDay(curPlayer)
         #采集次数重置
         NPCCommon.CollNPCTimeOnDay(curPlayer)
+        #副本助战
+        FBHelpBattle.DoPlayerOnDay(curPlayer)
+        #跨服竞技场
+        PlayerCrossRealmPK.DoPlayerOnDay(curPlayer)
         
     PlayerTJG.TJGOnDay(curPlayer, onEventType)
     # 以下为支持两种重置模式切换配置的
@@ -1280,7 +1277,8 @@
                 
             elif actionName == ShareDefine.OperationActionName_CostRebate:
                 PlayerCostRebate.RefreshCostRebateActionInfo()
-
+            elif actionName == ShareDefine.OperationActionName_TotalRecharge:
+                PlayerActTotalRecharge.RefreshTotalRechargeActionInfo()
             elif actionName == ShareDefine.OperationActionName_SpringSale:
                 PlayerSpringSale.RefreshSpringSaleActionInfo()
 
@@ -1329,24 +1327,28 @@
     #===============================================================================================
     
     #领地争夺战
-    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)
+    #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_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)
+    #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