From af2575ee52476f0d87d69a76dca5ee1f58cf114d Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期六, 13 四月 2019 10:55:47 +0800
Subject: [PATCH] 6509 子 【2.0】五行灵根 / 【后端】【2.0】五行灵根修改

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.py |   46 +++++++++++++++++++++++++++-------------------
 1 files changed, 27 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 884e9a0..dac01df 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.py
@@ -53,14 +53,11 @@
 import FunctionNPCCommon
 import PlayerGoldGift
 import PlayerActivity
-import PlayerTeHui
 import PlayerBindJadeWheel
-import PlayerAction
 import FBCommon
 import PlayerSuccess
 import PlayerFreeGoods
 import PlayerMagicWeapon
-import ShopItemManage
 import ChItem
 import PlayerGoldInvest
 import PlayerNewGuyCard
@@ -72,6 +69,8 @@
 import PlayerFamilyRedPacket
 import GameLogic_FamilyInvade
 import GameLogic_ElderBattlefield
+import GameLogic_AllFamilyBoss
+import GameLogic_HorsePetBoss
 import GameLogic_FamilyBoss
 import GameLogic_FamilyWar
 import OpenServerCampaign
@@ -80,10 +79,13 @@
 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
@@ -1312,6 +1314,19 @@
                 
             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():
@@ -1341,14 +1356,6 @@
     #    ReloadModule.DoMapServerScriptReload(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)
-    
     # 跨服PK
     elif key == ShareDefine.Def_Notify_WorldKey_CrossPKSeasonID:
         PlayerCrossRealmPK.OnCrossRealmPKSeasonChange(value)
@@ -1365,6 +1372,15 @@
     elif key == ShareDefine.Def_Notify_WorldKey_FBFuncState % ChConfig.Def_FBMapID_ElderBattlefield:
         if gameWorldMgr.GetGameWorldDictByKey(key) != value:
             GameLogic_ElderBattlefield.OnElderBattlefieldStateChange(value, tick)
+    # 多仙盟BOSS
+    elif key in [ShareDefine.Def_Notify_WorldKey_DailyActionState % ShareDefine.DailyActionID_FamilyBoss1]:
+        if gameWorldMgr.GetGameWorldDictByKey(key) != value:
+            GameLogic_AllFamilyBoss.OnAllFamilyBossStateChange(value, tick)
+    # 骑宠BOSS
+    elif key == ShareDefine.Def_Notify_WorldKey_DailyActionState % ShareDefine.DailyActionID_HorsePetBoss:
+        if gameWorldMgr.GetGameWorldDictByKey(key) != value:
+            GameLogic_HorsePetBoss.OnHorsePetBossStateChange(value, tick)
+    
     # OnDayEx
     elif key == ShareDefine.Def_Notify_WorldKey_OnDayEx:
         if value and gameWorldMgr.GetGameWorldDictByKey(key) != value:
@@ -1407,14 +1423,6 @@
     # 王者仙盟
     elif key == ShareDefine.Def_Notify_WorldKey_ChampionFamilyID:
         GameLogic_FamilyWar.OnChampionFamilyIDChange()
-                
-    # 特惠活动
-    elif key in ShareDefine.TeHuiTypeKeyDict.values():
-        PlayerTeHui.ChangeTeHuiActionState(key)
-
-    # 活动buff状态变更
-    elif key.startswith(ShareDefine.Def_Notify_WorldKey_ActionBuffState[:-2]):            
-        PlayerAction.OnActionBuffStateChange(key, tick)
         
 #===============================================================================
 #    ---修改为上述的 统一字典处理

--
Gitblit v1.8.0