From 47e583801c89ba24233de12ddd4291945ef15827 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期三, 28 十一月 2018 15:46:58 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ChaosDemon.py |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ChaosDemon.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ChaosDemon.py
index fd1ba49..c84da43 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ChaosDemon.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ChaosDemon.py
@@ -30,6 +30,7 @@
 import ShareDefine
 import ItemCommon
 import PlayerSuccess
+import FBHelpBattle
 import EventReport
 
 import math
@@ -350,9 +351,9 @@
             FBCommon.Notify_FB_Over(curPlayer, {FBCommon.Over_isPass: 0})
             continue
         overDict = {FBCommon.Over_grade:star,FBCommon.Over_dataMapID:mapID,FBCommon.Over_isPass:int(isPass), FBCommon.Over_costTime:costTime}
-        #增加助战积分
+        isHelp = False
         if FBCommon.GetIsHelpFight(curPlayer):
-            FBCommon.AddFBHelpPoint(curPlayer, mapID, 1)
+            isHelp = True
         else:
             #给奖励
             needSpace = len(prizeItemList)
@@ -374,7 +375,10 @@
             expPoint = addExp / ChConfig.Def_PerPointValue
             overDict[FBCommon.Over_exp] = exp
             overDict[FBCommon.Over_expPoint] = expPoint
-
+            
+        addXianyuanCoin, reason = FBHelpBattle.DoFBAddXianyuanCoin(curPlayer, mapID, 0, isHelp)
+        overDict[FBCommon.Over_xianyuanCoin] = [addXianyuanCoin, reason]
+        
         FBCommon.Notify_FB_Over(curPlayer, overDict)
         #成就
         PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_ChaosDemon, 1, [playerCount, star])

--
Gitblit v1.8.0