From 4c6786e17ef724a0dfdfeca8cf4a36bc4a7b9898 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 15 二月 2019 15:17:26 +0800
Subject: [PATCH] 6211 【后端】【1.6】合服任务单（合服邮件、重置首充双倍、重置商店购买次数、设置合服命令SetMixServer）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBHelpBattle.py | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBHelpBattle.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBHelpBattle.py
index 62afad7..f9d5821 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBHelpBattle.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBHelpBattle.py
@@ -641,9 +641,12 @@
familyID = curPlayer.GetFamilyID()
if isHelp:
# 助战的随便取一位优先级最高的即可
+ defaultRelationPlayerID = 0
for memPlayerID, memFamilyID in memFamilyIDDict.items():
memRelation, relationPlayerID = __GetTemMemRelation(playerManager, playerID, familyID, memPlayerID, memFamilyID, relationList, friendList, leavePlayerID)
if not memRelation:
+ if not defaultRelationPlayerID and relationPlayerID:
+ defaultRelationPlayerID = relationPlayerID
continue
relation = memRelation
relationAddList = relationCoinAddDict.get(str(memRelation), [])
@@ -651,6 +654,9 @@
relationPlayerName = memNameDict[relationPlayerID]
return relation, relationAdd, relationPlayerID, relationPlayerName
+ relationPlayerID = defaultRelationPlayerID
+ relationPlayerName = memNameDict.get(relationPlayerID, "")
+ GameWorld.DebugLog("助战默认无关系队员： relationPlayerID=%s,relationPlayerName=%s" % (relationPlayerID, relationPlayerName), playerID)
else:
# 非助战享受所有队员加成
for memPlayerID, memFamilyID in memFamilyIDDict.items():
@@ -670,6 +676,8 @@
## 离线玩家不算社交关系
if leavePlayerID and memPlayerID == leavePlayerID:
return 0, 0
+ if playerID == memPlayerID:
+ return 0, 0
memPlayer = playerManager.FindPlayerByID(memPlayerID)
if memPlayer == None or memPlayer.IsEmpty():
return 0, 0
@@ -680,7 +688,7 @@
if checkRelation == 2:
if playerID != memPlayerID and familyID and familyID == memFamilyID:
return checkRelation, memPlayerID
- return 0, 0
+ return 0, memPlayerID
def RefershTeamFBMemRelation(tick, leavePlayerID=0):
## 刷新组队副本队员关系
--
Gitblit v1.8.0