From f5cd3e2c7831b5f7e8865475804580ec713702ad Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 26 十一月 2021 11:24:41 +0800
Subject: [PATCH] 9341 【BT5】【主干】【后端】情缘系统(吃喜糖改为随机获得一种物品)

---
 ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFB.py |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFB.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFB.py
index a3defea..a8d5e9e 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFB.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFB.py
@@ -348,8 +348,9 @@
                 break
     
     key = (mapID, copyMapID)
-    copyMapObj = PyGameData.g_crossDynamicLineCopyMapInfo.pop(key, {})
-    
+    copyMapObj = PyGameData.g_crossDynamicLineCopyMapInfo.pop(key, None)
+    if not copyMapObj:
+        return
     #GameWorld.DebugLog("    PyGameData.g_crossDynamicLineInfo=%s" % PyGameData.g_crossDynamicLineInfo)
     #GameWorld.DebugLog("    PyGameData.g_crossDynamicLineCopyMapInfo=%s" % PyGameData.g_crossDynamicLineCopyMapInfo)
     
@@ -496,6 +497,12 @@
     
     # 组队副本, 有队伍的情况才验证其他队员可否进入,否则代表单人进入
     if gameMap.GetMapFBType() == ChConfig.fbtTeam:
+        if tagMapID == ChConfig.Def_FBMapID_Love:
+            onlyDoubleTeam = IpyGameDataPY.GetFuncCfg("LoveFB", 1)
+            if onlyDoubleTeam:
+                if PlayerTeam.CheckTeamOnLineCount(curPlayer.GetTeam(), includeTJG=False) != 2:
+                    PlayerControl.NotifyCode(curPlayer, "OnlyTwoMemTeamCanEnter", [tagMapID])
+                    return
         PlayerTeam.OnEnterFBTeamAsk(curPlayer, PlayerTeam.TeamFBAskType_Enter, tagMapID, tagLineID, tick)
         return
     

--
Gitblit v1.8.0