From 7577e420ae88bc68662eb7eee72153d260a07f4f Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 17 五月 2019 09:48:14 +0800
Subject: [PATCH] 6805 【后端】【2.0】副本前端化（有地图ID时才进行自定义场景通用判断）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.py | 32 ++++++++++++++++++++------------
1 files changed, 20 insertions(+), 12 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 f1e68e5..80f6d40 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.py
@@ -54,7 +54,6 @@
import PlayerGoldGift
import PlayerActivity
import PlayerBindJadeWheel
-import PlayerAction
import FBCommon
import PlayerSuccess
import PlayerFreeGoods
@@ -71,6 +70,7 @@
import GameLogic_FamilyInvade
import GameLogic_ElderBattlefield
import GameLogic_AllFamilyBoss
+import GameLogic_HorsePetBoss
import GameLogic_FamilyBoss
import GameLogic_FamilyWar
import OpenServerCampaign
@@ -89,6 +89,7 @@
import PlayerRefineStove
import PlayerFlashSale
import PlayerWishingWell
+import PlayerFairyDomain
import PlayerVip
import PlayerDiceEx
import IpyGameDataPY
@@ -545,6 +546,8 @@
FBHelpBattle.DoPlayerOnDay(curPlayer)
#跨服竞技场
PlayerCrossRealmPK.DoPlayerOnDay(curPlayer)
+ #缥缈仙域
+ PlayerFairyDomain.OnDay(curPlayer)
PlayerTJG.TJGOnDay(curPlayer, onEventType)
# 以下为支持两种重置模式切换配置的
@@ -802,6 +805,8 @@
#触发每小时任务重置脚本
EventShell.EventResponse_OnHour(curPlayer)
+ #缥缈仙域
+ PlayerFairyDomain.OnHour(curPlayer)
return
#---------------------------------------------------------------------
@@ -1276,6 +1281,14 @@
PyGameData.g_familyPartyInfo = eval(msgValue)
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):]
@@ -1356,10 +1369,6 @@
# ReloadModule.DoMapServerScriptReload(value, tick)
#===============================================================================================
- #领地争夺战
- #elif key == ShareDefine.Def_Notify_WorldKey_ManorWar:
- # GameLogic_ManorWar.OnManorWarStateChange(value, tick)
-
# 跨服PK
elif key == ShareDefine.Def_Notify_WorldKey_CrossPKSeasonID:
PlayerCrossRealmPK.OnCrossRealmPKSeasonChange(value)
@@ -1377,11 +1386,14 @@
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
+ 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:
@@ -1424,10 +1436,6 @@
# 王者仙盟
elif key == ShareDefine.Def_Notify_WorldKey_ChampionFamilyID:
GameLogic_FamilyWar.OnChampionFamilyIDChange()
-
- # 活动buff状态变更
- elif key.startswith(ShareDefine.Def_Notify_WorldKey_ActionBuffState[:-2]):
- PlayerAction.OnActionBuffStateChange(key, tick)
#===============================================================================
# ---修改为上述的 统一字典处理
--
Gitblit v1.8.0