From 9a4c438bc7d995bd24fdd484f8d6ddd9e66bd4bf Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期六, 20 四月 2019 15:18:03 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/Boss.py | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/Boss.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/Boss.py
index e9213c6..950f6b9 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/Boss.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/Boss.py
@@ -12,7 +12,7 @@
# @change: "2013-01-16 19:00" wdb 防范死亡的召唤兽被reborn
# @change: "2014-10-29 23:30" hxp 增加可刷新标识点刷新的世界boss
#------------------------------------------------------------------------------
-"""Version = 2014-10-29 23:30"""
+#"""Version = 2014-10-29 23:30"""
#---------------------------------------------------------------------
# 模块详细说明
@@ -23,6 +23,7 @@
import NPCCommon
import ShareDefine
import IpyGameDataPY
+import CrossRealmPlayer
#---------------------------------------------------------------------
#全局变量
#---------------------------------------------------------------------
@@ -46,7 +47,17 @@
if not bossID:
continue
- key = ShareDefine.Def_Notify_WorldKey_GameWorldBossReborn % bossID
+ if mapID in ChConfig.Def_CrossZoneMapTableName:
+ tableName = ChConfig.Def_CrossZoneMapTableName[mapID]
+ realMapID = GameWorld.GetGameWorld().GetRealMapID()
+ copyMapID = GameWorld.GetGameWorld().GetCopyMapID()
+ zoneIpyData = IpyGameDataPY.GetIpyGameData(tableName, realMapID, mapID, copyMapID)
+ if not zoneIpyData:
+ continue
+ zoneID = zoneIpyData.GetZoneID()
+ key = ShareDefine.Def_Notify_WorldKey_GameWorldBossRebornCross % (zoneID, bossID)
+ else:
+ key = ShareDefine.Def_Notify_WorldKey_GameWorldBossReborn % bossID
GameWorld.GetGameWorld().SetGameWorldDict(key, 1)
bossKey = ChConfig.Map_NPC_WorldBossLastReBornTick % bossID
--
Gitblit v1.8.0