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 | 149 +++++++++++++++++++++++++------------------------
1 files changed, 75 insertions(+), 74 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 e3a89f0..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
@@ -119,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
@@ -197,7 +196,7 @@
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
@@ -245,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
@@ -299,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:
@@ -384,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:
@@ -399,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}
@@ -432,11 +432,10 @@
# 如果在副本中过天，则只给物品奖励，不变更过关信息
if not isInFBOnDay:
FBCommon.AddEnterFBCount(curPlayer, mapID, 1)
- addXianyuanCoin, reason = FBHelpBattle.DoFBAddXianyuanCoin(curPlayer, mapID, lineID)
- overDict[FBCommon.Over_xianyuanCoin] = [addXianyuanCoin, reason]
needSyncFBData = False
else:
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)
#=======================================================================================
@@ -449,7 +448,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=["MunekadoTrial", False, {}])
+ # ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0, [IPY_GameWorld.rptItem], event=["MunekadoTrial", False, {}])
#overDict[FBCommon.Over_itemInfo] = FBCommon.GetJsonItemList(prizeItemList)
#=======================================================================================
@@ -474,7 +473,7 @@
if lineID < 2:
GameWorld.DebugLog("前两层不能扫荡!")
return
- historyStar = GameWorld.GetDictValueByBit(curPlayer, ChConfig.Def_Player_Dict_PlayerFBStar_MapId, lineID-1, False, [mapID])
+ historyStar = GameWorld.GetDictValueByBit(curPlayer, ChConfig.Def_Player_Dict_PlayerFBStar_MapId, lineID, False, [mapID])
if historyStar < 5:
GameWorld.DebugLog("没有S级不能扫荡!")
return
@@ -482,7 +481,7 @@
return True
## 助战扫荡结果
-def OnPlayerFBHelpBattleSweepResult(curPlayer, mapID, lineID, helpBattlePlayerDict, addXianyuanCoin, reason):
+def OnPlayerFBHelpBattleSweepResult(curPlayer, mapID, lineID, helpBattlePlayerDict):
#扣门票要在公共逻辑中完成
refreshNPCList = __GetZMSLnpcCfg(lineID, mapID)[0]
@@ -492,8 +491,8 @@
if not lastNPCList:
return
killNPCID = lastNPCList[0][0] # 默认最后一波的NPCID为通关boss奖励ID
- GameWorld.DebugLog("扫荡宗门试炼: killNPCID=%s,addXianyuanCoin=%s,reason=%s,helpBattlePlayerDict=%s"
- % (killNPCID, addXianyuanCoin, reason, helpBattlePlayerDict))
+ GameWorld.DebugLog("扫荡宗门试炼: killNPCID=%s,helpBattlePlayerDict=%s"
+ % (killNPCID, helpBattlePlayerDict))
star = 5
EventReport.WriteEvent_FB(curPlayer, mapID, lineID, ChConfig.CME_Log_End, 0, 1)
@@ -508,7 +507,6 @@
# 通知结果
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_xianyuanCoin] = [addXianyuanCoin, reason]
overDict[FBCommon.Over_itemInfo] = jsonItemList
FBCommon.Notify_FB_Over(curPlayer, overDict)
return True
@@ -645,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 玩家实例
@@ -789,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