From e3171a52706f5863bf9a14c7588db3b2dca9ab5f Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期三, 13 二月 2019 09:53:12 +0800
Subject: [PATCH] 5819 【后端】【1.6】运营活动支持对应不同的职业和世界等级(消费返利报错修改)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.py |   31 ++++++++++++++++++++++++-------
 1 files changed, 24 insertions(+), 7 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 1ca199f..6ea266d 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.py
@@ -74,15 +74,18 @@
 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 PlayerRefineStove
 import PlayerFlashSale
 import PlayerWishingWell
@@ -1222,7 +1225,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))
     #---接收世界服务器发来的消息---
 
@@ -1296,7 +1299,10 @@
             
             elif actionName == ShareDefine.OperationActionName_FairyCeremony:
                 PlayerFairyCeremony.RefreshOperationAction_FairyCeremony()
-            
+                
+            elif actionName == ShareDefine.OperationActionName_NewFairyCeremony:
+                PlayerNewFairyCeremony.RefreshOperationAction_NewFairyCeremony()
+                
             elif actionName == ShareDefine.OperationActionName_FlashSale:
                 PlayerFlashSale.RefreshflashSaleActionInfo()
                 
@@ -1305,7 +1311,20 @@
                 
             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()
+                
+            return
+        
+        if key == ShareDefine.Def_Notify_WorldKey_CrossZoneName:
+            PyGameData.g_crossZoneName = msgValue
             return
         
         if msgValue.isdigit():
@@ -1409,9 +1428,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