From 609e16921fd14b577cb7e4f56777a839b408b311 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期一, 20 八月 2018 20:13:04 +0800
Subject: [PATCH] Merge commit '444a48bf8875c1c4295871d48eee7433ac700734'

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py
index 6c82da8..bf03785 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py
@@ -1160,8 +1160,12 @@
 #    3. 如果没有玩家存在, 副本回收
     if GameWorld.GetMap().GetMapFBType() != 0:
         #离开副本
+        fbIndex = GameWorld.GetGameWorld().GetCurGameWorldIndex()
+        exitFBType = 1 if isDisconnect else 2
+        PyGameData.g_lastExitFBType[fbIndex] = [exitFBType, tick]
+        #GameWorld.DebugLog("玩家离开副本:fbIndex=%s,exitFBType=%s, %s" % (fbIndex, exitFBType, PyGameData.g_lastExitFBType), curPlayer.GetPlayerID())
         FBLogic.DoExitFBLogic(curPlayer, tick)
-
+        
     GameLogic_ManorWar.DoExitFB(curPlayer, tick)
     
     #清空所有不属于自己的光环
@@ -3950,6 +3954,7 @@
         PlayerPet.CalcPetItemAddPlayerAttr(curPlayer)
         PlayerRune.RefreshRuneAttr(curPlayer)
         PlayerMagicWeapon.CalcMagicWeaponAttr(curPlayer)
+        PlayerMagicWeapon.CalcMagicWeaponSoulAttr(curPlayer)
         PlayerSuccess.CalcSuccessAttr(curPlayer)
         PlayerVip.CalcVIPAttr(curPlayer)
         PlayerRefineStove.CalcStoveAttr(curPlayer)

--
Gitblit v1.8.0