From 07d1d607ef08d0e455064a0cb30f7c623cf32085 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 26 二月 2019 10:53:14 +0800
Subject: [PATCH] 6250 【后端】【2.0】拍卖行开发单(封包)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.py |   44 ++++++++++++++++++++++++++++++++++++++------
 1 files changed, 38 insertions(+), 6 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 2abd246..e60c28b 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.py
@@ -74,14 +74,19 @@
 import GameLogic_ElderBattlefield
 import GameLogic_FamilyBoss
 import GameLogic_FamilyWar
-import GameLogic_Dogz
 import OpenServerCampaign
 import PlayerCostRebate
 import PlayerActTotalRecharge
 import PlayerSpringSale
 import PlayerBossReborn
+import PlayerWeekParty
+import PlayerFeastWeekParty
+import PlayerActLogin
 import PlayerFlashGiftbag
 import PlayerFairyCeremony
+import PlayerNewFairyCeremony
+import PlayerFeastRedPacket
+import PlayerLuckyTreasure
 import PlayerRefineStove
 import PlayerFlashSale
 import PlayerWishingWell
@@ -467,6 +472,9 @@
     
 def __DoPlayerOnDay(curPlayer, onEventType):
     
+    if GameWorld.IsCrossServer():
+        return
+    
     # 常规过天
     if onEventType == ShareDefine.Def_OnEventType:
         
@@ -640,6 +648,9 @@
 
 def __DoPlayerOnWeek(curPlayer, onEventType):
     
+    if GameWorld.IsCrossServer():
+        return
+    
     if onEventType == ShareDefine.Def_OnEventType:
         #记录上周工资相关流向
         lastWeekOnlineTime = curPlayer.GetLastWeekOnlineTime()
@@ -717,6 +728,8 @@
 
 def __DoPlayerOnMonth(curPlayer, onEventType):
     
+    if GameWorld.IsCrossServer():
+        return
     
     if onEventType == ShareDefine.Def_OnEventType:
         pass
@@ -1213,7 +1226,7 @@
     pack = IPY_GameWorld.IPY_MBroadcastMsg()
     msg = pack.GetMsg()
     
-    if not msg.startswith(ShareDefine.Def_Notify_WorldKey_GameWorldBossReborn[:-2]):
+    if not msg.startswith(ShareDefine.Def_Notify_WorldKey_GameWorldBossReborn[:-3]):
         GameWorld.Log('GameServer_BroadcastMsg msg = %s'%(msg))
     #---接收世界服务器发来的消息---
 
@@ -1287,13 +1300,34 @@
             
             elif actionName == ShareDefine.OperationActionName_FairyCeremony:
                 PlayerFairyCeremony.RefreshOperationAction_FairyCeremony()
-            
+                
+            elif actionName == ShareDefine.OperationActionName_NewFairyCeremony:
+                PlayerNewFairyCeremony.RefreshOperationAction_NewFairyCeremony()
+                
             elif actionName == ShareDefine.OperationActionName_FlashSale:
                 PlayerFlashSale.RefreshflashSaleActionInfo()
                 
             elif actionName == ShareDefine.OperationActionName_WishingWell:
                 PlayerWishingWell.RefreshWishingWellAction()
                 
+            elif actionName == ShareDefine.OperationActionName_WeekParty:
+                PlayerWeekParty.RefreshOperationAction_WeekParty()
+                
+            elif actionName == ShareDefine.OperationActionName_LoginAward:
+                PlayerActLogin.RefreshOperationAction_LoginAward()
+                
+            elif actionName == ShareDefine.OperationActionName_FeastWeekParty:
+                PlayerFeastWeekParty.RefreshOperationAction_FeastWeekParty()
+                
+            elif actionName == ShareDefine.OperationActionName_FeastRedPacket:
+                PlayerFeastRedPacket.RefreshOperationAction_FeastRedPacket()
+                
+            elif actionName == ShareDefine.OperationActionName_LuckyTreasure:
+                PlayerLuckyTreasure.RefreshLuckyTreasureAction()
+            return
+        
+        if key == ShareDefine.Def_Notify_WorldKey_CrossZoneName:
+            PyGameData.g_crossZoneName = msgValue
             return
         
         if msgValue.isdigit():
@@ -1397,9 +1431,7 @@
     # 活动buff状态变更
     elif key.startswith(ShareDefine.Def_Notify_WorldKey_ActionBuffState[:-2]):            
         PlayerAction.OnActionBuffStateChange(key, tick)
-    #boss刷新时间参数
-    elif key.startswith(ShareDefine.Def_Notify_WorldKey_BossOnlineHeroCnt[:-2]):
-        GameLogic_Dogz.OnOnlineCntChange(key, tick)
+        
 #===============================================================================
 #    ---修改为上述的 统一字典处理
 #    if msg == ChConfig.Def_Notify_Key_PurTalk:

--
Gitblit v1.8.0