From ae9f73d422020a792b2615d7f094d629d81c5123 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 15 三月 2019 19:54:27 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode

---
 ServerPython/CoreServerGroup/GameServer/Script/PyGameData.py |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/PyGameData.py b/ServerPython/CoreServerGroup/GameServer/Script/PyGameData.py
index 594be37..bf021c6 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/PyGameData.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/PyGameData.py
@@ -77,7 +77,6 @@
 g_familyPartyTopInfo = [] #仙盟宴会答题王 [playerID,名字]
 g_partyheroAnswerDict = {} #仙盟宴会玩家答题数量 {playerid:答题数量,..}
 
-g_dogzNPCRefreshTimeDict = {} # 神兽副本NPC刷新时间{npcid:剩余刷新时间}
 g_bourseItemTradingTimeDict = {} # 物品开始交易的时间记录 {guid:tick}
 
 g_fbHelpBattleCheckInPlayerDict = {} # 副本助战玩家登记缓存 {playerID:HelpBattlePlayer, ...}
@@ -85,6 +84,8 @@
 
 g_autoViceleaderDict = {}#自动安排副盟主的玩家记录{familyID:[]}
 g_forbidAutoViceleaderFamily = [] #禁止自动安排副盟主的仙盟[familyID,..]
+
+g_crossZoneName = "" # 跨服分区名
 
 g_crossPlayerViewCache = {} # 查看跨服玩家信息 {playerID:[cacheInfo, updTick], ...}
 
@@ -95,3 +96,7 @@
 
 g_crossPKUnNotifyOverInfo = {} # 跨服PK未同步的结算信息 {player:[overInfo], ...}
 
+g_crossMapNPCInfo = {} # 跨服地图NPC信息 {mapID:[tick, npcInfo], ...}
+
+g_crossSetPlayerAttr = {} # 跨服玩家更新玩家数据 {playerID:[[setType, setDict], ...], ...}
+

--
Gitblit v1.8.0