From 62134a5a51fc9742512f97e6994c8920adb8d7f5 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 20 二月 2019 17:12:34 +0800
Subject: [PATCH] 6250 【后端】【2.0】拍卖行开发单（拍卖物品表修改）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ChaosDemon.py | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 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 c84da43..e25fdf0 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:
@@ -175,7 +176,8 @@
curPlayer.Sync_TimeTick(IPY_GameWorld.tttTowerTake, 0, max(notify_tick, 0), True)
__UpdChaosDemonFBStar(tick, True, curPlayer)
- DoFBHelp(curPlayer, tick)
+ FBHelpBattle.RefershTeamFBMemRelation(tick)
+ #DoFBHelp(curPlayer, tick)
return
## 诅咒城堡刷怪
@@ -220,6 +222,9 @@
# @return 返回值无意义
def DoExitFB(curPlayer, tick):
GameWorld.DebugLog("ChaosDemon DoExitFB...", curPlayer.GetPlayerID())
+ fbStep = GameWorld.GetGameFB().GetFBStep()
+ if fbStep <= FB_Step_Fight:
+ FBHelpBattle.RefershTeamFBMemRelation(tick, curPlayer.GetPlayerID())
return
##玩家主动离开副本.
@@ -279,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()):
@@ -511,6 +517,7 @@
# @return 无意义
# @remarks 用于通知阵营比分条
def DoFBHelp(curPlayer, tick):
+ playerID = curPlayer.GetPlayerID()
gameFB = GameWorld.GetGameFB()
star = gameFB.GetGameFBDictByKey(ChaosDemon_FBStar)
wheelNum = gameFB.GetGameFBDictByKey(ChaosDemon_FBNextRefreshStep)
@@ -519,9 +526,12 @@
KillNPCCnt = max(0, needKillCnt - remainNPCCnt)
data = [KillNPCCnt, needKillCnt]
lineID = FBCommon.GetFBPropertyMark()
- fbHelpDict = {FBCommon.Help_step:wheelNum, FBCommon.Help_grade:star, FBCommon.Help_npcTotal:KillNPCCnt, FBCommon.Help_lineID:lineID}
-
+ isHelp = FBCommon.GetIsHelpFight(curPlayer)
+ helpCount = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_FBRealHelpCount % ChConfig.Def_FBMapID_ChaosDemon)
+ fbHelpDict = {FBCommon.Help_step:wheelNum, FBCommon.Help_grade:star, FBCommon.Help_npcTotal:KillNPCCnt, FBCommon.Help_lineID:lineID,
+ FBCommon.Help_isHelp:isHelp, FBCommon.Help_helpCount:helpCount, FBCommon.Help_relation:FBHelpBattle.GetTeamFBMemRelationInfo(playerID)}
FBCommon.Notify_FBHelp(curPlayer, fbHelpDict)
+ GameWorld.DebugLog("DoFBHelp %s" % str(fbHelpDict), playerID)
return
--
Gitblit v1.8.0