From f089bf39d557fc228f7bd3b2eb8c85c7b402e7dc Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期五, 02 十一月 2018 18:40:13 +0800
Subject: [PATCH] 4575 脱机挂测试

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

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
index fe318e1..1fc2d40 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
@@ -2562,8 +2562,7 @@
                 GameWorld.DebugLog("    未购买VIP礼包,无法使用该气泡框!needVIPLVGift=%s" % needVIPLVGift, curPlayer.GetPlayerID())
                 return
             
-    PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_ChatBubbleBoxUseID, useBoxID)
-    SyncChatBubbleBoxState(curPlayer)
+    PlayerControl.SetChatBubbleBox(curPlayer, useBoxID)
     return
 
 def DoActivateChatBubbleBox(curPlayer, boxID):
@@ -2577,12 +2576,10 @@
 
 def SyncChatBubbleBoxState(curPlayer):
     ## 同步聊天气泡框状态
-    useBoxID = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_ChatBubbleBoxUseID)
     boxState = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_ChatBubbleBoxState % 0)
-    if not useBoxID and not boxState:
+    if not boxState:
         return
     boxStatePack = ChPyNetSendPack.tagMCChatBubbleBoxState()
-    boxStatePack.UseBoxID = useBoxID
     boxStatePack.BoxState = boxState
     NetPackCommon.SendFakePack(curPlayer, boxStatePack)
     return
@@ -3569,7 +3566,7 @@
 #@return 返回值无意义
 #@remarks 客户端封包响应 //03 10 退出副本#tagCExitFB
 def __Func_ExitFB(curPlayer, tick):
-    if GameWorld.GetMap().GetMapFBType() == IPY_GameWorld.fbtNull:
+    if GameWorld.GetMap().GetMapFBType() == IPY_GameWorld.fbtNull and curPlayer.GetMapID() not in IpyGameDataPY.GetFuncEvalCfg("MapLine", 4):
         return
     
     GameWorld.Log('玩家 = %s , 主动离开副本' % (curPlayer.GetName()) , curPlayer.GetID())

--
Gitblit v1.8.0