From c0c4a0880e9a0fc5d1482c1260e02ddd1b554bc9 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 12 十月 2022 14:09:02 +0800
Subject: [PATCH] 9719 【越南】【BT7】【主干】跨服全民充值
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCRealmRefresh.py | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCRealmRefresh.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCRealmRefresh.py
index 7073fd2..faf9446 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCRealmRefresh.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCRealmRefresh.py
@@ -72,10 +72,12 @@
def GetTagNPCRefresh(curNPC):
realmDiff = curNPC.GetSightLevel()
refreshID = curNPC.GetDictByKey(ChConfig.Def_NPC_Dict_SummonRefreshID)
+ lineID = GameWorld.GetGameWorld().GetLineID()
+ key = (lineID, realmDiff)
obj = None
- if realmDiff in PyGameData.g_realmDiffNPCRefresh:
- mapNPCRefresh = PyGameData.g_realmDiffNPCRefresh[realmDiff]
+ if key in PyGameData.g_realmDiffNPCRefresh:
+ mapNPCRefresh = PyGameData.g_realmDiffNPCRefresh[key]
if refreshID in mapNPCRefresh:
obj = mapNPCRefresh[refreshID]
else:
@@ -88,8 +90,11 @@
''' 加载本地图 tagNPCRefresh.txt 刷怪规则
'''
- if realm in PyGameData.g_realmDiffNPCRefresh:
- return PyGameData.g_realmDiffNPCRefresh[realm]
+ lineID = GameWorld.GetGameWorld().GetLineID()
+ key = (lineID, realm)
+
+ if key in PyGameData.g_realmDiffNPCRefresh:
+ return PyGameData.g_realmDiffNPCRefresh[key]
filePath = os.path.join(ChConfig.GetDBPath(), "SysDB", "tagNPCRefresh.txt")
if not os.path.isfile(filePath):
@@ -139,8 +144,8 @@
GameWorld.ErrLog("tagNPCRefresh.txt line(%s) error." % (line + 1))
continue
- PyGameData.g_realmDiffNPCRefresh[realm] = mapNPCRefresh
- GameWorld.Log("LoadMapRealmNPCRefresh mapID=%s,realm=%s,refreshIDList=%s" % (curMapID, realm, mapNPCRefresh.keys()))
+ PyGameData.g_realmDiffNPCRefresh[key] = mapNPCRefresh
+ GameWorld.Log("LoadMapRealmNPCRefresh mapID=%s,lineID=%s,realm=%s,refreshIDList=%s" % (curMapID, lineID, realm, mapNPCRefresh.keys()))
return mapNPCRefresh
def ProcessRealmNPCRefresh(gameWorld, tick):
--
Gitblit v1.8.0