From 6ccc82cff0bc5ecd2734253d4c5ef1ae2bb748da Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 17 九月 2020 12:24:13 +0800
Subject: [PATCH] 8483 【后端】【主干】【changwei】【bt】协助方和被协助方任何模式不会互相造成伤害(优化协助同一玩家的情况)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ChaosDemon.py |    9 ++++-----
 1 files changed, 4 insertions(+), 5 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 d6fbb77..ef07e1a 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
@@ -32,6 +32,7 @@
 import PlayerSuccess
 import FBHelpBattle
 import EventReport
+import PlayerWeekParty
 
 import math
 
@@ -162,7 +163,7 @@
         FBCommon.AddEnterFBCount(curPlayer, mapID, 1)
         joinType = FBCommon.GetFBJoinType(curPlayer, isHelpFight)
         EventReport.WriteEvent_FB(curPlayer, ChConfig.Def_FBMapID_ChaosDemon, 0, ChConfig.CME_Log_Start, joinType)
-       
+        PlayerWeekParty.AddWeekPartyActionCnt(curPlayer, ChConfig.Def_WPAct_ChaosDemon, 1)
     
     fbStep = gameFB.GetFBStep()
     if fbStep <= FB_Step_Prepare:
@@ -283,6 +284,7 @@
     # 间隔未到
     if tick - GameWorld.GetGameFB().GetFBStepTick() < fbCfg[Def_PrepareTime] * 1000:
         return
+    FBHelpBattle.RefershTeamFBMemRelation(tick)
     __RefreshChaosDemonNextNPC()
     playerManager = GameWorld.GetMapCopyPlayerManager()
     for i in range(playerManager.GetPlayerCount()):
@@ -368,7 +370,7 @@
                 GameWorld.DebugLog("背包空间不够,发送邮件: mailItemList=%s" % str(prizeItemList), curPlayer.GetPlayerID())
             else:
                 for itemID, itemCnt, isBind in prizeItemList:
-                    ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, isBind, [IPY_GameWorld.rptItem], event=["ChaosDemon", False, {}])
+                    ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0, [IPY_GameWorld.rptItem], event=["ChaosDemon", False, {}])
             
             reExp = PlayerControl.GetPlayerReExp(curPlayer)
             addExp = int(eval(giveExp) * rate/100)
@@ -379,9 +381,6 @@
             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)
         #成就

--
Gitblit v1.8.0