From 4440cae9a947827004016e2cd486b639b3dca7e8 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期五, 30 十一月 2018 17:54:23 +0800
Subject: [PATCH] 860312 神兵去除等级广播提示
---
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFBHelpBattle.py | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFBHelpBattle.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFBHelpBattle.py
index 77afcd7..492fbc7 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFBHelpBattle.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFBHelpBattle.py
@@ -85,7 +85,7 @@
helpBattlePlayer.playerName = recData.GetStrValue1()
helpBattlePlayer.todayXianyuanCoin = int(recData.GetStrValue2())
helpCountDictStr = recData.GetStrValue3()
- if helpCountDictStr.startswith("{") and helpCountDictStr.endswith("{"):
+ if helpCountDictStr.startswith("{") and helpCountDictStr.endswith("}"):
helpBattlePlayer.todayHelpCountDict = eval(helpCountDictStr)
else:
GameWorld.ErrLog("LoadCheckInPlayerError: helpCountDictStr=%s" % helpCountDictStr, playerID)
@@ -297,13 +297,14 @@
% (curPlayer.GetLV(), fightPower, curPlayer.GetFamilyID(), curPlayer.GetVIPLv(), todayXianyuanCoin, checkInCount + 1, haveViewCache), playerID)
return [isOK, haveViewCache]
-def UpdateCheckInPlayerInfo(playerID, fightPower, familyID):
+def UpdateCheckInPlayerInfo(playerID, fightPower, familyID, playerName):
## 更新登记的助战玩家等级战力
if playerID not in PyGameData.g_fbHelpBattleCheckInPlayerDict:
return
helpBattlePlayer = PyGameData.g_fbHelpBattleCheckInPlayerDict[playerID]
helpBattlePlayer.fightPower = fightPower
helpBattlePlayer.familyID = familyID
+ helpBattlePlayer.playerName = playerName
GameWorld.DebugLog("更新助战玩家等级战力: fightPower=%s,familyID=%s" % (fightPower, familyID), playerID)
return
@@ -446,7 +447,7 @@
if PlayerFriend.IsFriend(playerID, tagPlayerID):
return checkRelation
if checkRelation == 2:
- if curPlayer.GetFamilyID() == tagFamilyID:
+ if tagFamilyID and curPlayer.GetFamilyID() == tagFamilyID:
return checkRelation
return 0
@@ -516,7 +517,8 @@
coinAdd = int((baseHelpPoint + relationAdd) * addCoinRate / 10000.0)
canAddMax = max(playerXianyuanCoinUpper - todayXianyuanCoin, 0)
coinAddReal = min(coinAdd, canAddMax) # 实际加仙缘币
- GameWorld.DebugLog(" 助战增加仙缘币: coinAddReal=%s, todayMapHelpCount=%s" % (coinAddReal, todayMapHelpCount), calledPlayerID)
+ GameWorld.DebugLog(" 助战增加仙缘币: todayXianyuanCoin=%s,coinUpper=%s,canAddMax=%s,coinAdd=%s,coinAddReal=%s, todayMapHelpCount=%s"
+ % (todayXianyuanCoin, playerXianyuanCoinUpper, canAddMax, coinAdd, coinAddReal, todayMapHelpCount), calledPlayerID)
# GameServer 直接先加
helpBattlePlayer.todayXianyuanCoin += coinAddReal
--
Gitblit v1.8.0