From f5d7e43bb1a29abf17f8d371f66262c4e3de2b01 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 10 七月 2019 10:31:06 +0800
Subject: [PATCH] 4453 【主干】【2.0.200】仙盟拍品拍卖时长异常

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.py |   32 ++++++++++++++++++++++++++------
 1 files changed, 26 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 6848f41..0eb6eb3 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.py
@@ -86,9 +86,11 @@
 import PlayerNewFairyCeremony
 import PlayerFeastRedPacket
 import PlayerLuckyTreasure
+import PlayerAuctionHouse
 import PlayerRefineStove
 import PlayerFlashSale
 import PlayerWishingWell
+import PlayerFairyDomain
 import PlayerVip
 import PlayerDiceEx
 import IpyGameDataPY
@@ -523,16 +525,17 @@
         PlayerBindJadeWheel.OnDay(curPlayer)
     # 特殊时间点X点过天
     elif onEventType == ShareDefine.Def_OnEventTypeEx:
+        # 资源找回
+        PlayerRecover.RecoverOnDay(curPlayer)
         #触发每日任务重置脚本
         EventShell.EventResponse_OnDay(curPlayer)
         #购买次数清空
         Operate_PlayerBuyZhenQi.PlayerOnDay(curPlayer)
-        # 世界boss
-        BossHurtMng.OnDay(curPlayer)
+        
         #我要太极过天
         PlayerDiceEx.OnDay(curPlayer)
-        # 资源找回
-        PlayerRecover.RecoverOnDay(curPlayer)
+        # 世界boss
+        BossHurtMng.OnDay(curPlayer)
         # 仙盟过天
         PlayerFamily.FamilyPlayerOnDay(curPlayer)
         # 重置物品每日使用次数
@@ -545,6 +548,8 @@
         FBHelpBattle.DoPlayerOnDay(curPlayer)
         #跨服竞技场
         PlayerCrossRealmPK.DoPlayerOnDay(curPlayer)
+        #缥缈仙域
+        PlayerFairyDomain.OnDay(curPlayer)
         
     PlayerTJG.TJGOnDay(curPlayer, onEventType)
     # 以下为支持两种重置模式切换配置的
@@ -802,6 +807,8 @@
     
     #触发每小时任务重置脚本
     EventShell.EventResponse_OnHour(curPlayer)
+    #缥缈仙域
+    PlayerFairyDomain.OnHour(curPlayer)
     return
     
 #---------------------------------------------------------------------
@@ -1276,6 +1283,20 @@
                 PyGameData.g_familyPartyInfo = eval(msgValue)
             return
         
+        if key == ShareDefine.Def_Notify_WorldKey_AddFamilyAuctionItem:
+            mapID, familyAuctionItemDict = eval(msgValue)
+            if GameWorld.GetMap().GetMapID() == mapID:
+                PlayerAuctionHouse.DoAddFamilyAuctionItem(familyAuctionItemDict)
+            return
+        
+        if key == ShareDefine.Def_Notify_WorldKey_FairyDomainLimit:
+            isAdd, limitList = eval(msgValue)
+            if isAdd:
+                PyGameData.g_fairyDomainLimit += limitList
+            else:
+                PyGameData.g_fairyDomainLimit = limitList
+            return
+        
         if key.startswith(ShareDefine.Def_Notify_WorldKey_OperationActionInfo[:-2]): 
             keyHead = ShareDefine.Def_Notify_WorldKey_OperationActionInfo[:-2]
             actionName = key[len(keyHead):]
@@ -1373,8 +1394,7 @@
         if gameWorldMgr.GetGameWorldDictByKey(key) != value:
             GameLogic_ElderBattlefield.OnElderBattlefieldStateChange(value, tick)
     # 多仙盟BOSS
-    elif key in [ShareDefine.Def_Notify_WorldKey_DailyActionState % ShareDefine.DailyActionID_FamilyBoss1,
-                 ShareDefine.Def_Notify_WorldKey_DailyActionState % ShareDefine.DailyActionID_FamilyBoss2,]:
+    elif key in [ShareDefine.Def_Notify_WorldKey_DailyActionState % ShareDefine.DailyActionID_FamilyBoss1]:
         if gameWorldMgr.GetGameWorldDictByKey(key) != value:
             GameLogic_AllFamilyBoss.OnAllFamilyBossStateChange(value, tick)
     # 骑宠BOSS

--
Gitblit v1.8.0