From f8e30b43a4228e1231debfd6f2758218a2675654 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 16 九月 2019 18:44:30 +0800
Subject: [PATCH] 8260 【主干】【400】跨服匹配优化
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.py | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 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 0eb6eb3..370b4f4 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.py
@@ -550,6 +550,8 @@
PlayerCrossRealmPK.DoPlayerOnDay(curPlayer)
#缥缈仙域
PlayerFairyDomain.OnDay(curPlayer)
+ #仙盟宴会
+ GameLogic_FamilyParty.OnDayFamilyPartyPlayer(curPlayer)
PlayerTJG.TJGOnDay(curPlayer, onEventType)
# 以下为支持两种重置模式切换配置的
@@ -1283,10 +1285,22 @@
PyGameData.g_familyPartyInfo = eval(msgValue)
return
+ if key == ShareDefine.Def_Notify_WorldKey_FamilyPartyAddFamilyActivity:
+ mapID, familyID, addFamilyActivity = eval(msgValue)
+ if GameWorld.GetMap().GetMapID() == mapID:
+ GameLogic_FamilyParty.DoAddFamilyMemberFamilyActivity(familyID, addFamilyActivity)
+ 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_AddSystemAuctionItem:
+ mapID, sysAuctionItemList = eval(msgValue)
+ if GameWorld.GetMap().GetMapID() == mapID:
+ PlayerAuctionHouse.DoAddSystemAuctionItem(sysAuctionItemList)
return
if key == ShareDefine.Def_Notify_WorldKey_FairyDomainLimit:
@@ -1381,10 +1395,6 @@
elif key == ShareDefine.Def_Notify_WorldKey_CrossPKSeasonID:
PlayerCrossRealmPK.OnCrossRealmPKSeasonChange(value)
- # 仙盟宴会
- elif key == ShareDefine.Def_Notify_WorldKey_FBFuncState % ChConfig.Def_FBMapID_FamilyParty:
- if gameWorldMgr.GetGameWorldDictByKey(key) != value:
- GameLogic_FamilyParty.OnFamilyPartyStateChange(value, tick)
# 守卫人皇
elif key == ShareDefine.Def_Notify_WorldKey_FBFuncState % ChConfig.Def_FBMapID_FamilyInvade:
if gameWorldMgr.GetGameWorldDictByKey(key) != value:
@@ -1434,6 +1444,7 @@
NPCCustomRefresh.ResetActivityBossRefreshCount()
#通用设置
+ befValue = gameWorldMgr.GetGameWorldDictByKey(key)
gameWorldMgr.SetGameWorldDict(key, value)
#-------在设置了字典值以后处理---------------------------------
@@ -1445,6 +1456,11 @@
elif key == ShareDefine.Def_Notify_WorldKey_ChampionFamilyID:
GameLogic_FamilyWar.OnChampionFamilyIDChange()
+ # 仙盟宴会
+ elif key == ShareDefine.Def_Notify_WorldKey_DailyActionState % ShareDefine.DailyActionID_FamilyParty:
+ if befValue != value:
+ GameLogic_FamilyParty.OnFamilyPartyStateChange(value, tick)
+
#===============================================================================
# ---修改为上述的 统一字典处理
# if msg == ChConfig.Def_Notify_Key_PurTalk:
--
Gitblit v1.8.0