From 2a1039feedbd432ddadb8bc7d01bf1a173b77142 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 31 一月 2019 14:09:50 +0800
Subject: [PATCH] 6087 【后端】【1.5.200】春节红包雨活动（增加配置未用完的次数过天可否累加）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBLogic.py | 28 +++++++++++++++++++---------
1 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBLogic.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBLogic.py
index 24fb0bf..455d613 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBLogic.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBLogic.py
@@ -18,7 +18,7 @@
import IPY_GameWorld
import PlayerControl
import GameWorldProcess
-import PlayerMergeEvent
+import PlayerSuccess
import ReadChConfig
import ShareDefine
import FBCommon
@@ -325,13 +325,13 @@
return
-## 副本中召唤兽死亡(被击杀或者时间到等)
+## 副本中NPC死亡(被击杀或者时间到等)
# @param curNPC
# @return None.
-def DoFB_SummonNPCDead(curNPC):
+def DoFB_NPCDead(curNPC):
do_FBLogic_ID = __GetFBLogic_MapID(GameWorld.GetMap().GetMapID())
- callFunc = GameWorld.GetExecFunc(FBProcess, "GameLogic_%s.%s" % (do_FBLogic_ID, "DoFB_SummonNPCDead"))
+ callFunc = GameWorld.GetExecFunc(FBProcess, "GameLogic_%s.%s" % (do_FBLogic_ID, "DoFB_NPCDead"))
if callFunc:
callFunc(curNPC)
@@ -495,7 +495,7 @@
gameMapID = gameMap.GetMapID()
#如果已经设置过副本功能线路属性，则进入时同步玩家，一般下线重登或者非第一个进入该副本的玩家（如队友）会收到该包
- if FBCommon.GetHadSetFBPropertyMark():
+ if FBCommon.GetHadSetFBPropertyMark() and gameMap.GetMapFBType() != IPY_GameWorld.fbtSingle:
PlayerControl.SetFBFuncLineID(curPlayer, FBCommon.GetFBPropertyMark())
#成长NPC所需数据初始化
@@ -523,6 +523,8 @@
#注册进入这个副本的玩家
gameFBMgr.AddFBPlayer(curPlayerID)
+
+ PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_FeastRedPack_EnterMap, 1, [gameMapID])
return
def DoEnterFB(curPlayer, tick):
@@ -695,9 +697,6 @@
if callFunc:
#GameWorld.Log("副本逻辑不可使用 GameLogic_%d"%(mapID))
callFunc(curPlayer , tick)
-
- #有玩家离开副本广播一次
- PlayerMergeEvent.BroadcastMergePlayerEvent()
#如果是最后一个人离开副本, 那么设置副本的离开时间, 5分钟后副本关闭
__PlayerLeaveSetPlayerLogoffTick(curPlayer, tick)
@@ -1229,7 +1228,7 @@
def PlayerLoginInFBCheck(curPlayer, tick):
gameMap = GameWorld.GetMap()
#如果此地图是自动释放的, 需要检查这个玩家
- if gameMap.GetMapFBType() == 0:
+ if gameMap.GetMapFBType() in [IPY_GameWorld.fbtNull, IPY_GameWorld.fbtCrossVSRoom]:
return False
#玩家 在副本中，并且副本不踢出玩家下线
@@ -1474,6 +1473,17 @@
return callFunc(curPlayer, mapID, lineID, cnt, isFinish, dataEx)
+## 副本助战扫荡结果
+def OnPlayerFBHelpBattleSweepResult(curPlayer, mapID, lineID, helpBattlePlayerDict, addXianyuanCoin, reason):
+ do_FBLogic_ID = __GetFBLogic_MapID(mapID)
+
+ callFunc = GameWorld.GetExecFunc(FBProcess, "GameLogic_%s.%s" % (do_FBLogic_ID, "OnPlayerFBHelpBattleSweepResult"))
+
+ if callFunc == None:
+ return False
+
+ return callFunc(curPlayer, mapID, lineID, helpBattlePlayerDict, addXianyuanCoin, reason)
+
## 开始公共CD副本扫荡
def OnStartPubCDFBSweep(curPlayer, mapID, lineID, cnt, dataEx):
do_FBLogic_ID = __GetFBLogic_MapID(mapID)
--
Gitblit v1.8.0