From 7a58a47083cb8c7920733c8378ca41964e9330e4 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 02 三月 2020 20:07:26 +0800
Subject: [PATCH] 8389 【后端开发】天星塔挑战榜
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MunekadoTrial.py | 272 +++++++++++++++++++++++++++++++++--------------------
1 files changed, 168 insertions(+), 104 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MunekadoTrial.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MunekadoTrial.py
index 29e13f3..6ad5125 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MunekadoTrial.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MunekadoTrial.py
@@ -34,6 +34,8 @@
import PyGameData
import EventShell
import NPCCommon
+import FBHelpBattle
+import PlayerActLogin
import math
@@ -50,7 +52,7 @@
# 副本状态
(
-FB_Step_Open, #开启
+FB_Step_CallHelp, # 助战召唤
FB_Step_Prepare, #准备中
FB_Step_Fight, # 战斗中
FB_Step_PickItem, # 拾取物品中
@@ -84,8 +86,9 @@
##---获得副本刷怪配置---
# @param None
# @return 配置信息
-def __GetZMSLnpcCfg(lineID):
- mapID = GameWorld.GetMap().GetMapID()
+def __GetZMSLnpcCfg(lineID, mapID=0):
+ if not mapID:
+ mapID = GameWorld.GetMap().GetMapID()
return FBCommon.GetFBLineRefreshNPC(mapID, lineID)
def GetMTFBLineStepTime(lineID=-1):
@@ -116,13 +119,12 @@
# @param tick 时间戳
# @return 布尔值
def OnEnterFBEvent(curPlayer, mapID, lineID, tick):
- if lineID == 0:
- return True
- historyStar = GameWorld.GetDictValueByBit(curPlayer, ChConfig.Def_Player_Dict_PlayerFBStar_MapId, lineID-1, False, [mapID])
- needStar = IpyGameDataPY.GetFuncCfg('MunekadoLockLimit')
- if historyStar < needStar:
- GameWorld.DebugLog(' 上一层评级未达到%s，无法挑战本层！' % needStar)
- return False
+ if lineID != 0:
+ historyStar = GameWorld.GetDictValueByBit(curPlayer, ChConfig.Def_Player_Dict_PlayerFBStar_MapId, lineID-1, False, [mapID])
+ needStar = IpyGameDataPY.GetFuncCfg('MunekadoLockLimit')
+ if historyStar < needStar:
+ GameWorld.DebugLog(' 上一层评级未达到%s，无法挑战本层！' % needStar)
+ return False
return True
@@ -157,16 +159,16 @@
mapID = FBCommon.GetRecordMapID(mapID)
gameFB = GameWorld.GetGameFB()
-
# 设置副本公共属性的单独处理，防止队员进入后被修改
if not FBCommon.GetHadSetFBPropertyMark():
lineID = curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_ReqFBFuncLine)
FBCommon.SetFBPropertyMark(lineID)
- if gameFB.GetFBStep() == FB_Step_Open:
- FBCommon.SetFBStep(FB_Step_Prepare, tick)
- gameFB.SetGameFBDict(ZMSL_FBNextRefreshStep, 0)
- gameFB.SetGameFBDict(ZMSL_FBNPCCnt, 0)
- gameFB.SetGameFBDict(ZMSL_FBNPCRefreshCnt, 0)
+# if gameFB.GetFBStep() == FB_Step_Open:
+# FBCommon.SetFBStep(FB_Step_Prepare, tick)
+# gameFB.SetGameFBDict(ZMSL_FBNextRefreshStep, 0)
+# gameFB.SetGameFBDict(ZMSL_FBNPCCnt, 0)
+# gameFB.SetGameFBDict(ZMSL_FBNPCRefreshCnt, 0)
+
lineID = FBCommon.GetFBPropertyMark()
GameWorld.DebugLog("ZMSL DoEnterFB lineID=%s！" % lineID, curPlayer.GetID())
# 进入消耗处理
@@ -174,12 +176,15 @@
FBCommon.SetHadDelTicket(curPlayer)
PyGameData.g_fbPickUpItemDict.pop(curPlayer.GetPlayerID(), 0)
curPlayer.SetDict(ChConfig.Def_PlayerKey_IsInFBOnDay, 0)
- isHelpFight = False
- if FBCommon.SetIsHelpFight(curPlayer):
- isHelpFight = True
- GameWorld.DebugLog("ZMSL 助战进入副本！", curPlayer.GetID())
- joinType = FBCommon.GetFBJoinType(curPlayer, isHelpFight)
- EventReport.WriteEvent_FB(curPlayer, mapID, lineID, ChConfig.CME_Log_Start, joinType)
+# isHelpFight = False
+# if FBCommon.SetIsHelpFight(curPlayer):
+# isHelpFight = True
+# GameWorld.DebugLog("ZMSL 助战进入副本！", curPlayer.GetID())
+# joinType = FBCommon.GetFBJoinType(curPlayer, isHelpFight)
+# EventReport.WriteEvent_FB(curPlayer, mapID, lineID, ChConfig.CME_Log_Start, joinType)
+ if gameFB.GetFBStep() == FB_Step_CallHelp:
+ FBHelpBattle.SendGameServer_RefreshHelpBattlePlayer(curPlayer, mapID, lineID)
+ return
ZMSLCfg = GetMTFBLineStepTime()
fbStep = gameFB.GetFBStep()
if fbStep <= FB_Step_Prepare:
@@ -191,8 +196,18 @@
notify_tick = ZMSLCfg[Def_FightTime] * 1000 - (tick - GameWorld.GetGameFB().GetFBStepTick())
curPlayer.Sync_TimeTick(IPY_GameWorld.tttTowerTake, 0, max(notify_tick, 0), True)
- __UpdZMSLFBStar(tick, True, curPlayer)
+ __UpdZMSLFBStar(tick, True, curPlayer)
DoFBHelp(curPlayer, tick)
+ return
+
+## 召唤助战完成
+def OnCallHelpBattleOK(curPlayer, tick):
+ ZMSLCfg = GetMTFBLineStepTime()
+ FBCommon.SetFBStep(FB_Step_Prepare, tick)
+ notify_tick = ZMSLCfg[Def_PrepareTime] * 1000 - (tick - GameWorld.GetGameFB().GetFBStepTick())
+ curPlayer.Sync_TimeTick(IPY_GameWorld.tttWaitStart, 0, max(notify_tick, 0), True)
+ lineID = FBCommon.GetFBPropertyMark()
+ EventReport.WriteEvent_FB(curPlayer, ChConfig.Def_FBMapID_MunekadoTrial, lineID, ChConfig.CME_Log_Start)
return
## 刷怪
@@ -229,7 +244,7 @@
gameFB.SetGameFBDict(ZMSL_FBNextRefreshStep, refreshStep + 1)
gameFB.SetGameFBDict(ZMSL_FBStepStartTick, tick)
gameFB.SetGameFBDict(ZMSL_FBStepStar, gameFB.GetGameFBDictByKey(ChConfig.Def_FB_Grade))
- __UpdZMSLFBStar(tick, True)
+
return
@@ -283,8 +298,8 @@
if fbStep == FB_Step_Prepare:
__DoLogic_FB_Prepare(tick)
elif fbStep == FB_Step_Fight:
- __ProcessOverFight(tick)
__UpdZMSLFBStar(tick)
+ __ProcessOverFight(tick)
elif fbStep == FB_Step_PickItem:
__DoLogic_FB_PickItem(tick)
elif fbStep == FB_Step_Over:
@@ -368,7 +383,8 @@
costTime = tick - GameWorld.GetGameFB().GetFBStepTick()
gameFB = GameWorld.GetGameFB()
gameFB.SetGameFBDict(ZMSL_CostTime, costTime)
- GameWorld.DebugLog("__DoZMSLOver isPass=%s,killNPCID=%s" % (isPass, killNPCID))
+ star = GameWorld.GetGameFB().GetGameFBDictByKey(ChConfig.Def_FB_Grade)
+ GameWorld.DebugLog("__DoZMSLOver isPass=%s,killNPCID=%s,star=%s" % (isPass, killNPCID, star))
#===============================================================================================
# canDropPlayerList = GetCanDropPlayerList()
# if isPass and canDropPlayerList:
@@ -383,7 +399,7 @@
mapID = GameWorld.GetMap().GetMapID()
mapID = FBCommon.GetRecordMapID(mapID)
lineID = FBCommon.GetFBPropertyMark()
- star = GameWorld.GetGameFB().GetGameFBDictByKey(ChConfig.Def_FB_Grade)
+
#awardDict = FBCommon.GetFBLineReward(mapID, lineID)
#prizeItemList = awardDict.get(star, [])
overDict = {FBCommon.Over_grade:star,FBCommon.Over_dataMapID:mapID,FBCommon.Over_isPass:int(isPass), FBCommon.Over_costTime:costTime}
@@ -407,28 +423,21 @@
GameWorld.SetDictValueByBit(curPlayer, ChConfig.Def_Player_Dict_PlayerFBStar_MapId, lineID, star, False, [mapID])
needSyncFBData = True
isInFBOnDay = curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_IsInFBOnDay)
- isHelpFight = FBCommon.GetIsHelpFight(curPlayer)
-
+
if star == 5:
- joinType = FBCommon.GetFBJoinType(curPlayer, isHelpFight)
-
- EventReport.WriteEvent_FB(curPlayer, mapID, lineID, ChConfig.CME_Log_End, joinType, 1)
+ EventReport.WriteEvent_FB(curPlayer, mapID, lineID, ChConfig.CME_Log_End, 0, 1)
EventShell.EventRespons_FBEvent(curPlayer, "zmsl_%s_%s" % (lineID, star))
PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_MunekadoTrial, 1, [playerCount, star, lineID+1])
EventShell.EventRespons_FBEvent(curPlayer, "passzmsl")
- #增加助战积分
- if isHelpFight:
- FBCommon.AddFBHelpPoint(curPlayer, mapID, 1)
- overDict.pop(FBCommon.Over_itemInfo, 0)
+ # 如果在副本中过天，则只给物品奖励，不变更过关信息
+ if not isInFBOnDay:
+ FBCommon.AddEnterFBCount(curPlayer, mapID, 1)
+ needSyncFBData = False
else:
- # 如果在副本中过天，则只给物品奖励，不变更过关信息
- if not isInFBOnDay:
- FBCommon.AddEnterFBCount(curPlayer, mapID, 1)
- needSyncFBData = False
- else:
- curPlayer.SetDict(ChConfig.Def_PlayerKey_IsInFBOnDay, 0)
- PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_MunekadoTrialEx, 1)
-
+ curPlayer.SetDict(ChConfig.Def_PlayerKey_IsInFBOnDay, 0)
+ FBHelpBattle.DoFBHelpBattleFinish(curPlayer, mapID, lineID)
+ PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_MunekadoTrialEx, 1)
+ PlayerActLogin.AddLoginAwardActionCnt(curPlayer, ChConfig.Def_LoginAct_MunekadoTrial, 1)
#=======================================================================================
# #给奖励
# needSpace = len(prizeItemList)
@@ -439,13 +448,13 @@
# 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=["MunekadoTrial", False, {}])
+ # ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0, [IPY_GameWorld.rptItem], event=["MunekadoTrial", False, {}])
#overDict[FBCommon.Over_itemInfo] = FBCommon.GetJsonItemList(prizeItemList)
#=======================================================================================
- jsonItemList, totalExp, totalMoney = NPCCommon.GiveKillNPCDropPrize(curPlayer, ChConfig.Def_FBMapID_MunekadoTrial, {killNPCID:1})
- # 通知结果
- overDict[FBCommon.Over_itemInfo] = jsonItemList
+ jsonItemList, totalExp, totalMoney = NPCCommon.GiveKillNPCDropPrize(curPlayer, ChConfig.Def_FBMapID_MunekadoTrial, {killNPCID:1})
+ # 通知结果
+ overDict[FBCommon.Over_itemInfo] = jsonItemList
if needSyncFBData:
FBCommon.Sync_FBPlayerFBInfoData(curPlayer, mapID)
@@ -455,6 +464,52 @@
GameWorld.DebugLog(' overDict=%s'%overDict, curPlayer.GetID())
FBCommon.Notify_FB_Over(curPlayer, overDict)
return
+
+## 可否扫荡
+def OnPlayerFBSweepAsk(curPlayer, mapID, lineID, sweepCnt, isFinish, dataEx):
+ if mapID != ChConfig.Def_FBMapID_MunekadoTrial:
+ return
+ # 暂写死，前两层不能扫
+ if lineID < 2:
+ GameWorld.DebugLog("前两层不能扫荡!")
+ return
+ historyStar = GameWorld.GetDictValueByBit(curPlayer, ChConfig.Def_Player_Dict_PlayerFBStar_MapId, lineID, False, [mapID])
+ if historyStar < 5:
+ GameWorld.DebugLog("没有S级不能扫荡!")
+ return
+
+ return True
+
+## 助战扫荡结果
+def OnPlayerFBHelpBattleSweepResult(curPlayer, mapID, lineID, helpBattlePlayerDict):
+ #扣门票要在公共逻辑中完成
+
+ refreshNPCList = __GetZMSLnpcCfg(lineID, mapID)[0]
+ if not refreshNPCList:
+ return
+ lastNPCList = refreshNPCList[-1]
+ if not lastNPCList:
+ return
+ killNPCID = lastNPCList[0][0] # 默认最后一波的NPCID为通关boss奖励ID
+ GameWorld.DebugLog("扫荡宗门试炼: killNPCID=%s,helpBattlePlayerDict=%s"
+ % (killNPCID, helpBattlePlayerDict))
+
+ star = 5
+ EventReport.WriteEvent_FB(curPlayer, mapID, lineID, ChConfig.CME_Log_End, 0, 1)
+
+ EventShell.EventRespons_FBEvent(curPlayer, "zmsl_%s_%s" % (lineID, star))
+ EventShell.EventRespons_FBEvent(curPlayer, "passzmsl")
+ PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_MunekadoTrialEx, 1)
+ PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_MunekadoTrial, 1, [1, star, lineID+1])
+ PlayerActLogin.AddLoginAwardActionCnt(curPlayer, ChConfig.Def_LoginAct_MunekadoTrial, 1)
+ jsonItemList, totalExp, totalMoney = NPCCommon.GiveKillNPCDropPrize(curPlayer, ChConfig.Def_FBMapID_MunekadoTrial, {killNPCID:1}, curGrade=star)
+
+ # 通知结果
+ overDict = {FBCommon.Over_grade:star,FBCommon.Over_dataMapID:mapID,FBCommon.Over_isPass:1, FBCommon.Over_isSweep:1}
+ overDict[FBCommon.Over_helpPlayer] = helpBattlePlayerDict
+ overDict[FBCommon.Over_itemInfo] = jsonItemList
+ FBCommon.Notify_FB_Over(curPlayer, overDict)
+ return True
## 检查是否可攻击， 主判定不可攻击的情况，其他逻辑由外层决定
# @param attacker 攻击方
@@ -496,6 +551,10 @@
npcIDList.append(npcid)
return npcIDList
+def DoFB_Npc_KillNPC(attacker, curNPC, tick):
+ __FBNPCOnKilled(curNPC, tick)
+ return
+
##玩家杀死NPC
# @param curPlayer:玩家实例
# @param curNPC:当前被杀死的NPC
@@ -503,6 +562,10 @@
# @return 返回值无意义
# @remarks 玩家主动离开副本.
def DoFB_Player_KillNPC(curPlayer, curNPC, tick):
+ __FBNPCOnKilled(curNPC, tick)
+ return
+
+def __FBNPCOnKilled(curNPC, tick):
if curNPC.GetNPCID() not in __GetAllNPCIDList():
return
gameFB = GameWorld.GetGameFB()
@@ -514,8 +577,6 @@
GameWorld.DebugLog("DoFB_Player_KillNPC, npcID=%s,ZMSL_FBNPCCnt=%s,needRefreshCnt=%s"
% (curNPC.GetNPCID(), npcCnt, needRefreshCnt))
-
-
if npcCnt <= 0 and needRefreshCnt <= 0:
GameWorld.DebugLog("本波所有怪物已被击杀！")
@@ -582,60 +643,63 @@
## 更新当前副本星级
def __UpdZMSLFBStar(tick, isEnter=False, curPlayer=None):
- #1-D 2-C 3-B 4-A 5-S
- gameFB = GameWorld.GetGameFB()
- curStar = gameFB.GetGameFBDictByKey(ChConfig.Def_FB_Grade)
- if curStar == 1:
- return curStar
- stepStartTick = gameFB.GetGameFBDictByKey(ZMSL_FBStepStartTick)
- if not stepStartTick:
- return curStar
- useSecond = int(math.ceil((tick - stepStartTick) / 1000.0))
lineID = FBCommon.GetFBPropertyMark()
- starTimeList = IpyGameDataPY.GetFuncEvalCfg('MunekadoTrialStarTime').get(lineID,[])
- wheelNum = gameFB.GetGameFBDictByKey(ZMSL_FBNextRefreshStep)
- if wheelNum > len(starTimeList):
- GameWorld.DebugLog(" MunekadoTrialStarTime 配置错误 与波数不等")
- return
- stepStar = gameFB.GetGameFBDictByKey(ZMSL_FBStepStar)
- starTimeInfo = starTimeList[wheelNum-1]
- updStar = stepStar if stepStar else 5
- totalStarTime = 0
- for starTime in starTimeInfo:
- if updStar == 1:
- break
- totalStarTime +=starTime
- if useSecond >= totalStarTime:
- updStar = max(1, updStar-1)
- else:
- break
-
- diffSecond =max(0, totalStarTime -useSecond)
-
- if curStar == updStar and not isEnter:
- return curStar
-
- gameFB.SetGameFBDict(ChConfig.Def_FB_Grade, updStar)
-
- GameWorld.DebugLog("__UpdFBStar useSecond=%s,curStar=%s,updStar=%s, diffSecond=%s"
- % (useSecond, curStar, updStar, diffSecond))
-
- if curPlayer:
- DoFBHelp(curPlayer, tick)
- if updStar != 1:
- curPlayer.Sync_TimeTick(IPY_GameWorld.tttFlagTake, 0, diffSecond * 1000, True)
- else:
- playerManager = GameWorld.GetMapCopyPlayerManager()
- for index in xrange(playerManager.GetPlayerCount()):
- curPlayer = playerManager.GetPlayerByIndex(index)
- if not curPlayer:
- continue
- DoFBHelp(curPlayer, tick)
- if updStar != 1:
- curPlayer.Sync_TimeTick(IPY_GameWorld.tttFlagTake, 0, diffSecond * 1000, True)
-
-
- return updStar
+ FBCommon.UpdateFBGrade(tick, FBCommon.GetFBLineGrade(GameWorld.GetGameWorld().GetMapID(), lineID), curPlayer)
+ return
+ #1-D 2-C 3-B 4-A 5-S
+# gameFB = GameWorld.GetGameFB()
+# curStar = gameFB.GetGameFBDictByKey(ChConfig.Def_FB_Grade)
+# if curStar == 1:
+# return curStar
+# stepStartTick = gameFB.GetGameFBDictByKey(ZMSL_FBStepStartTick)
+# if not stepStartTick:
+# return curStar
+# useSecond = int(math.ceil((tick - stepStartTick) / 1000.0))
+# lineID = FBCommon.GetFBPropertyMark()
+# starTimeList = IpyGameDataPY.GetFuncEvalCfg('MunekadoTrialStarTime').get(lineID,[])
+# wheelNum = gameFB.GetGameFBDictByKey(ZMSL_FBNextRefreshStep)
+# if wheelNum > len(starTimeList):
+# GameWorld.DebugLog(" MunekadoTrialStarTime 配置错误 与波数不等")
+# return
+# stepStar = gameFB.GetGameFBDictByKey(ZMSL_FBStepStar)
+# starTimeInfo = starTimeList[wheelNum-1]
+# updStar = stepStar if stepStar else 5
+# totalStarTime = 0
+# for starTime in starTimeInfo:
+# if updStar == 1:
+# break
+# totalStarTime +=starTime
+# if useSecond >= totalStarTime:
+# updStar = max(1, updStar-1)
+# else:
+# break
+#
+# diffSecond =max(0, totalStarTime -useSecond)
+#
+# if curStar == updStar and not isEnter:
+# return curStar
+#
+# gameFB.SetGameFBDict(ChConfig.Def_FB_Grade, updStar)
+#
+# GameWorld.DebugLog("__UpdFBStar useSecond=%s,curStar=%s,updStar=%s, diffSecond=%s"
+# % (useSecond, curStar, updStar, diffSecond))
+#
+# if curPlayer:
+# DoFBHelp(curPlayer, tick)
+# if updStar != 1:
+# curPlayer.Sync_TimeTick(IPY_GameWorld.tttFlagTake, 0, diffSecond * 1000, True)
+# else:
+# playerManager = GameWorld.GetMapCopyPlayerManager()
+# for index in xrange(playerManager.GetPlayerCount()):
+# curPlayer = playerManager.GetPlayerByIndex(index)
+# if not curPlayer:
+# continue
+# DoFBHelp(curPlayer, tick)
+# if updStar != 1:
+# curPlayer.Sync_TimeTick(IPY_GameWorld.tttFlagTake, 0, diffSecond * 1000, True)
+#
+#
+# return updStar
##副本帮助信息
# @param curPlayer 玩家实例
@@ -726,7 +790,7 @@
ItemCommon.DelCostItem(curPlayer, itemPack, delInfoDict)
#给物品
- ItemControler.GivePlayerItem(curPlayer, exchangeItemID, exchangeItemCount, exchangeItemIsBind, [IPY_GameWorld.rptItem],
+ ItemControler.GivePlayerItem(curPlayer, exchangeItemID, exchangeItemCount, 0, [IPY_GameWorld.rptItem],
event=[ChConfig.ItemGive_TrialExchange, False, {}])
#任务
EventShell.EventRespons_TrialExchange(curPlayer, costItemID)
--
Gitblit v1.8.0