From 023ac4a624af7205b7c295f47f73091c218cbf8d Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期二, 27 十一月 2018 21:53:21 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBHelpBattle.py |   28 +++++++++-------------------
 1 files changed, 9 insertions(+), 19 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 845519d..64f8809 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
@@ -501,7 +501,15 @@
         PlayerControl.AddTodayXianyuanCoin(curPlayer, coinAddReal)
         
     # 通知自己获得仙缘币
-    Sync_AddXianyuanCoinMsg(curPlayer, mapID, lineID, coinAddReal, relationPlayerID, relationPlayerName)
+    msgPack = ChPyNetSendPack.tagMCAddXianyuanCoinMsg()
+    msgPack.MapID = mapID
+    msgPack.FuncLineID = lineID
+    msgPack.XianyuanCoinAdd = coinAddReal
+    msgPack.CallPlayerID = relationPlayerID
+    msgPack.CallPlayerName = relationPlayerName
+    msgPack.NameLen = len(msgPack.CallPlayerName)
+    msgPack.Reason = reason
+    NetPackCommon.SendFakePack(curPlayer, msgPack)
     return coinAddReal, reason
 
 def __GetTeamFBMemRelationInfo(curPlayer, relationCoinAddDict, isHelp):
@@ -554,22 +562,4 @@
             relationAdd += relationAddList[0] if len(relationAddList) == 2 else 0
             
     return relationAdd, relationPlayerID, relationPlayerName
-
-def Sync_AddXianyuanCoinMsg(curPlayer, mapID, funcLineID, addXianyuanCoin, callPlayerID=0, callPlayerName=""):
-    '''同步自己主动战斗获得仙缘币信息
-    1. 主动发起通关镜像助战副本,此时 callPlayerID 及 name 为空
-    2. 参与通关真实助战的副本,次数如果自己是助战的,则 callPlayer 及 name 有值
-    @param addXianyuanCoin: 增加的仙缘币,可能为0,代表已达本日上限,但是前端扔需要展示记录
-    @param callPlayerID: 助战别人时,对方玩家的playerID
-    @param callPlayerName: 助战别人时,对方玩家的名字   
-    '''
-    msgPack = ChPyNetSendPack.tagMCAddXianyuanCoinMsg()
-    msgPack.MapID = mapID
-    msgPack.FuncLineID = funcLineID
-    msgPack.XianyuanCoinAdd = addXianyuanCoin
-    msgPack.CallPlayerID = callPlayerID
-    msgPack.CallPlayerName = callPlayerName
-    msgPack.NameLen = len(msgPack.CallPlayerName)
-    NetPackCommon.SendFakePack(curPlayer, msgPack)
-    return
 

--
Gitblit v1.8.0