From 07a5b93ce90a08c7d60cecc7c61b984ca0b2ea97 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 12 十二月 2019 16:37:17 +0800
Subject: [PATCH] 8346 【恺英】【后端】协助系统（封魔坛支持协助，去除封魔坛旧版伤血统计）
---
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerAssist.py | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerAssist.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerAssist.py
index d1dba0a..80653c9 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerAssist.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerAssist.py
@@ -223,21 +223,24 @@
GameWorld.DebugLog("非同盟玩家不能协助!")
return
+ playerMapID = curPlayer.GetMapID()
mapID = assistObj.MapID
lineID = assistObj.LineID
- gameMap = GameWorld.GetMap(mapID)
- if not gameMap:
+ playerMap = GameWorld.GetMap(playerMapID)
+ if not playerMap:
return
- if gameMap.GetMapFBType() != ChConfig.fbtNull:
- playerMapID = curPlayer.GetMapID()
- playerLineID = PlayerControl.GetFBFuncLineID(curPlayer)
+ if playerMap.GetMapFBType() != ChConfig.fbtNull:
+ playerLineID = curPlayer.GetFBID()
if playerMapID != mapID or playerLineID != lineID:
#副本中无法协助
PlayerControl.NotifyCode(curPlayer, "AssistFBLimit")
return
# 设定协助必须离开队伍
- if gameMap.GetMapFBType() != ChConfig.fbtTeam:
+ tagMap = GameWorld.GetMap(mapID)
+ if not tagMap:
+ return
+ if tagMap.GetMapFBType() != ChConfig.fbtTeam:
curTeam = curPlayer.GetTeam()
if curTeam:
PlayerTeam.DoPlayerLeaveTeam(curPlayer, curTeam, tick)
--
Gitblit v1.8.0