From f97b6ae94c6acdaacf6adf140416df901d1caf6c Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期一, 15 四月 2019 11:56:41 +0800
Subject: [PATCH] 6515 【测试】【主干】新增游戏警报邮件
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_AllFamilyBoss.py | 205 +++++++++++++++++++++++++++++++-------------------
1 files changed, 126 insertions(+), 79 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_AllFamilyBoss.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_AllFamilyBoss.py
index 33fe2a7..8a91e67 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_AllFamilyBoss.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_AllFamilyBoss.py
@@ -36,22 +36,25 @@
FBPlayerDict_EncourageLV = 'FBPlayerDict_EncourageLV' # 鼓舞等级
FBDict_IsOver = 'FBDict_IsOver' #是否已结算, 结算时的tick
FBDict_IsReduceing = 'FBDict_IsReduceing' #是否掉血中
-FBPlayerDict_Rank = "FBPlayerDict_Rank" # 玩家排名
FBDict_BossTotalHP = 'FBDict_BossTotalHP' #BOSS血量
FBDict_LastHurtTick = 'FBDict_LastHurtTick' #上次伤害时间
+FBDict_IsEncourage = 'FBDict_IsEncourage' #是否鼓舞过
+FBDict_LastHPNotify = 'FBDict_LastHPNotify' #上一个血量广播
(
- Def_BossTime, #BOSS时间
- Def_LeaveTime,#离开时间
- ) = range(2)
+ Def_BossTime, #BOSS时间
+ Def_LeaveTime, #离开时间
+ Def_HPSpeed, #掉血速度公式
+ ) = range(3)
#当前副本地图的状态
(
-FB_Step_Open, # 副本开启
-FB_Step_Fighting, # 副本进行中
-FB_Step_Over, # 副本结束
-FB_Step_Close, # 副本关闭
+FB_Step_Open, # 副本开启
+FB_Step_Fighting, # 副本进行中
+FB_Step_Over, # 副本结束
+FB_Step_Close, # 副本关闭
) = range(4)
+
def OnFBPlayerOnLogin(curPlayer):
@@ -142,35 +145,38 @@
playerCnt = GameWorld.GetGameWorld().GetMapCopyPlayerManager().GetPlayerCount()
GameWorld.DebugLog("DoEnterFB...playerCnt=%s,lineID=%s" % (playerCnt, lineID), playerID)
-
+ familyID = curPlayer.GetFamilyID()
+ fbStep = GameWorld.GetGameFB().GetFBStep()
hadDelTicket = FBCommon.GetHadDelTicket(curPlayer)
if not hadDelTicket:
FBCommon.SetHadDelTicket(curPlayer)
FBCommon.AddEnterFBCount(curPlayer, ChConfig.Def_FBMapID_AllFamilyBoss, 1)
- if lineID == 0:
- PlayerActivity.AddDailyActionFinishCnt(curPlayer, ShareDefine.DailyActionID_FamilyBoss1, 1)
- else:
- PlayerActivity.AddDailyActionFinishCnt(curPlayer, ShareDefine.DailyActionID_FamilyBoss2, 1)
- if GameWorld.GetGameFB().GetFBStep() == FB_Step_Open:
+
+ PlayerActivity.AddDailyActionFinishCnt(curPlayer, ShareDefine.DailyActionID_FamilyBoss1, 1)
+
+ if fbStep == FB_Step_Open:
FBCommon.SetFBStep(FB_Step_Fighting, tick)
- familyID = curPlayer.GetFamilyID()
- if familyID not in PyGameData.g_allfamilyBossDict:
- PyGameData.g_allfamilyBossDict[familyID] = [curPlayer.GetFamilyName(), 0, [playerID]]
- elif playerID not in PyGameData.g_allfamilyBossDict[familyID][2]:
- PyGameData.g_allfamilyBossDict[familyID][2].append(playerID)
EventReport.WriteEvent_FB(curPlayer, ChConfig.Def_FBMapID_AllFamilyBoss, 0, ChConfig.CME_Log_Start)
+ if fbStep >= FB_Step_Over:
+ PlayerControl.PlayerLeaveFB(curPlayer)
+ return
+
+ if familyID not in PyGameData.g_allfamilyBossDict:
+ PyGameData.g_allfamilyBossDict[familyID] = [curPlayer.GetFamilyName(), 0, [playerID]]
+ elif playerID not in PyGameData.g_allfamilyBossDict[familyID][2]:
+ PyGameData.g_allfamilyBossDict[familyID][2].append(playerID)
UpdateHPReduceSpeed(tick)
gameFB = GameWorld.GetGameFB()
# 上鼓舞buff
- encourageLV = gameFB.GetPlayerGameFBDictByKey(playerID, FBPlayerDict_EncourageLV)
+ encourageLV = gameFB.GetPlayerGameFBDictByKey(familyID, FBPlayerDict_EncourageLV)
if encourageLV > 0:
- FBCommon.AddFbEncourageBuff(curPlayer, FBPlayerDict_EncourageLV, tick)
+ FBCommon.AddFbEncourageBuff(curPlayer, FBPlayerDict_EncourageLV, tick, familyID)
else:
- FBCommon.SendFBEncourageInfo(curPlayer, encourageLV)
+ FBCommon.SendFBEncourageInfo(curPlayer, encourageLV, familyID)
- #DoFBHelp(curPlayer, tick)
+ DoFBHelp(curPlayer, tick)
return
@@ -184,7 +190,7 @@
gameWorld.SetGameWorldDict(FBDict_StartTick, 0)
gameWorld.SetGameWorldDict(FBDict_Speed, 0)
gameWorld.SetGameWorldDict(FBDict_RemainHP, 0)
-
+ gameWorld.SetGameWorldDict(FBDict_IsReduceing, 0)
gameWorld.SetPropertyID(0)
PyGameData.g_allfamilyBossDict = {}
return
@@ -217,19 +223,20 @@
# @return 返回值无意义
def DoPlayerLeaveFB(curPlayer, tick):
# FBCommon.SetHadDelTicket(curPlayer, 0)
-# #主动退出的去掉排行榜信息
-# lineID = GameWorld.GetGameWorld().GetPropertyID() - 1
-# playerHurtDict = PyGameData.g_AllFamilyBossPlayerHurtDict.get(lineID, {})
-# playerHurtDict.pop(curPlayer.GetPlayerID(), 0)
-# PyGameData.g_AllFamilyBossPlayerHurtDict[lineID] = playerHurtDict
-# if not playerHurtDict: #榜上没人，停止掉血
-# StopReduceHP(lineID, tick)
+ #主动退出的去掉排行榜信息
+ familyHurtInfo = PyGameData.g_allfamilyBossDict.get(curPlayer.GetFamilyID(), [])
+ if familyHurtInfo:
+ playerID = curPlayer.GetPlayerID()
+ if playerID in familyHurtInfo[2]:
+ familyHurtInfo[2].remove(playerID)
+ FBCommon.NotifyCopyMapPlayerFBHelp(tick, DoFBHelp, 0)
return
##玩家切换地图
def DoPlayerChangeMapLogic(curPlayer):
#FBCommon.SetHadDelTicket(curPlayer, 0)
+
return
@@ -271,12 +278,13 @@
totalHP = __GetBossTotalHP()
hpReduceSpeed = curSpeed * 10000 / totalHP if totalHP else 0
remainHPPer = min(1000000, remainHP * 1000000 / totalHP) if totalHP else 0
-
- fbHelpDict = {"hurtInfo":hurtInfo, 'hpReduceSpeed':hpReduceSpeed,
+ playerID = curPlayer.GetPlayerID()
+ IsEncourage = GameWorld.GetGameFB().GetPlayerGameFBDictByKey(playerID, FBDict_IsEncourage)
+ fbHelpDict = {"hurtInfo":hurtInfo, 'hpReduceSpeed':hpReduceSpeed, 'IsEncourage':IsEncourage,
'remainHPPer':remainHPPer, 'isReduceing':isReduceing, 'myHurt':myHurt % ChConfig.Def_PerPointValue,
'myHurtEx':myHurt / ChConfig.Def_PerPointValue, 'myRank':myRank, 'myMenberCnt':myMenberCnt
}
- GameWorld.DebugLog("DoFBHelp: %s" % fbHelpDict, curPlayer.GetPlayerID())
+ GameWorld.DebugLog("DoFBHelp: %s" % fbHelpDict, playerID)
FBCommon.Notify_FBHelp(curPlayer, fbHelpDict)
return
@@ -289,7 +297,17 @@
# @return None
def DoFBAction(curPlayer, actionType, actionInfo, tick):
if actionType == 0:
- FBCommon.FbEncourageBuff(curPlayer, FBPlayerDict_EncourageLV, actionInfo, tick)
+ playerID = curPlayer.GetID()
+ gameFB = GameWorld.GetGameFB()
+ if gameFB.GetPlayerGameFBDictByKey(playerID, FBDict_IsEncourage):
+ GameWorld.DebugLog('只能鼓舞一次！', playerID)
+ return
+ if FBCommon.FbEncourageBuff(curPlayer, FBPlayerDict_EncourageLV, actionInfo, tick, curPlayer.GetFamilyID()):
+ gameFB.SetPlayerGameFBDict(playerID, FBDict_IsEncourage, 1)
+ #给鼓舞奖励
+ itemList = IpyGameDataPY.GetFuncEvalCfg('LeagueBOSSReward1')
+ giveItemList = [[itemID, itemCnt, 0] for itemID, itemCnt in itemList]
+ ItemControler.GivePlayerItemOrMail(curPlayer, giveItemList)
return
@@ -339,7 +357,6 @@
GameWorldProcess.CloseFB(tick)
FBCommon.SetFBStep(FB_Step_Close, tick)
return
-
elif fbStep == FB_Step_Fighting:
startTick = gameWorld.GetGameWorldDictByKey(FBDict_StartTick)
@@ -379,42 +396,44 @@
if isPass:
worldLV = GameWorld.GetGameWorld().GetGameWorldDictByKey(ShareDefine.Def_Notify_WorldKey_WorldAverageLv)
- familyAuctionItemDict = {} #{仙盟ID:[[享受收益的成员ID, ...], [[拍品ID,总个数,拍品组数], ...]], ...}
+ familyAuctionItemDict = {} #{仙盟ID:[[享受收益的成员ID, ...], [[拍品ID,总个数,拍品组数], ...]], ...}
batchPlayerIDList, batchAddItemList, batchParamList, batchDetailList = [], [], [], []
- event=["AllFamilyBoss", False, {}]
+ event = ["AllFamilyBoss", False, {}]
needMemberCnt = IpyGameDataPY.GetFuncCfg('LeagueBOSSNumber1')
for rank, hurtInfo in enumerate(playerHurtList, 1):
familyID = hurtInfo[0]
memberIDList = hurtInfo[1][2]
memberCnt = len(memberIDList)
familyAuctionItemList, menberItemList = __GetFamilyBossAward(rank, worldLV)
- GameWorld.Log('rank=%s,worldLV=%s,familyAuctionItemList=%s,menberItemList=%s,memberCnt=%s'%(rank, worldLV,familyAuctionItemList,menberItemList, memberCnt), familyID)
- if memberCnt >= needMemberCnt and familyAuctionItemList:#仙盟拍品
+ GameWorld.Log('rank=%s,worldLV=%s,familyAuctionItemList=%s,menberItemList=%s,memberCnt=%s' % (rank, worldLV, familyAuctionItemList, menberItemList, memberCnt), familyID)
+
+ overDict = {FBCommon.Over_rank:rank, 'memberCnt':len(memberIDList)}
+ if memberCnt >= needMemberCnt and familyAuctionItemList: #仙盟拍品
familyAuctionItemDict[familyID] = [memberIDList, familyAuctionItemList]
- if menberItemList: #成员奖励
- overDict = {FBCommon.Over_rank:rank,
- FBCommon.Over_itemInfo:FBCommon.GetJsonItemList(menberItemList),
- 'AuctionItem':FBCommon.GetJsonItemList(familyAuctionItemList),
- 'memberCnt':len(memberIDList)}
- mailPlayerIDList = []
- for memberID in memberIDList:
- member = playerManager.FindPlayerByID(memberID)
- if member:
+ overDict['AuctionItem'] = FBCommon.GetJsonItemList(familyAuctionItemList)
+ if menberItemList: #成员奖励
+ overDict[FBCommon.Over_itemInfo] = FBCommon.GetJsonItemList(menberItemList)
+
+ mailPlayerIDList = []
+ for memberID in memberIDList:
+ member = playerManager.FindPlayerByID(memberID)
+ if member:
+ if menberItemList:
ItemControler.GivePlayerItemOrMail(member, menberItemList, 'LeagueBOSS1', event)
- member.Sync_TimeTick(IPY_GameWorld.tttLeaveMap, 0, leaveTick, True)
- FBCommon.NotifyFBOver(member, ChConfig.Def_FBMapID_AllFamilyBoss, lineID, isPass, overDict)
- else:
- mailPlayerIDList.append(memberID)
- if mailPlayerIDList:
- batchPlayerIDList.append(mailPlayerIDList)
- batchAddItemList.append(menberItemList)
- batchParamList.append([])
- batchDetailList.append({'rank':rank})
+ member.Sync_TimeTick(IPY_GameWorld.tttLeaveMap, 0, leaveTick, True)
+ FBCommon.NotifyFBOver(member, ChConfig.Def_FBMapID_AllFamilyBoss, lineID, isPass, overDict)
+ elif menberItemList:
+ mailPlayerIDList.append(memberID)
+ if mailPlayerIDList:
+ batchPlayerIDList.append(mailPlayerIDList)
+ batchAddItemList.append(menberItemList)
+ batchParamList.append([])
+ batchDetailList.append({'rank':rank})
if batchPlayerIDList:
PlayerControl.SendMailBatch("LeagueBOSS2", batchPlayerIDList, batchAddItemList, batchParamList, batchDetail=batchDetailList)
if familyAuctionItemDict:
- GameWorld.Log('familyAuctionItemDict=%s'%familyAuctionItemDict)
+ GameWorld.Log('familyAuctionItemDict=%s' % familyAuctionItemDict)
PlayerAuctionHouse.DoAddFamilyAuctionItem(familyAuctionItemDict)
else:
playerCount = playerManager.GetPlayerCount()
@@ -422,14 +441,16 @@
curPlayer = playerManager.GetPlayerByIndex(index)
if not curPlayer:
continue
- member.Sync_TimeTick(IPY_GameWorld.tttLeaveMap, 0, leaveTick, True)
- FBCommon.NotifyFBOver(member, ChConfig.Def_FBMapID_AllFamilyBoss, lineID, isPass)
+ curPlayer.Sync_TimeTick(IPY_GameWorld.tttLeaveMap, 0, leaveTick, True)
+ FBCommon.NotifyFBOver(curPlayer, ChConfig.Def_FBMapID_AllFamilyBoss, lineID, isPass)
return
+
def __GetFamilyBossAward(rank, worldLV):
familyAuctionItemList, menberItemList = [], []
awardRateList = []
+ awardPieRateDict = {}
ipyMgr = IpyGameDataPY.IPY_Data()
for i in xrange(ipyMgr.GetFamilyBossAwardCount()):
ipyData = ipyMgr.GetFamilyBossAwardByIndex(i)
@@ -439,20 +460,31 @@
rankList = ipyData.GetRank()
if rank < rankList[0] or rank > rankList[1]:
continue
- awardRateList = ipyData.GetAward()
- if not awardRateList:
- GameWorld.ErrLog('仙盟Boss奖励表 未配置该奖励 rank=%s,worldLV=%s'%(rank, worldLV))
+ awardRateList = ipyData.GetAward1()
+ awardPieRateDict = ipyData.GetAward2()
+ if not awardRateList and not awardPieRateDict:
+ GameWorld.ErrLog('仙盟Boss奖励表 未配置该奖励 rank=%s,worldLV=%s' % (rank, worldLV))
return familyAuctionItemList, menberItemList
for rate, itemInfo in awardRateList:
if not GameWorld.CanHappen(rate, 10000):
continue
if len(itemInfo) != 3:
- GameWorld.ErrLog('仙盟Boss奖励表配置错误 itemInfo=%s'%itemInfo)
+ GameWorld.ErrLog('仙盟Boss奖励表配置错误 itemInfo=%s' % itemInfo)
continue
if itemInfo[2]:
familyAuctionItemList.append(itemInfo)
else:
menberItemList.append(itemInfo)
+ for doCnt, awardPieRateList in awardPieRateDict.items():
+ for _ in xrange(doCnt):
+ resultItem = GameWorld.GetResultByRandomList(awardPieRateList)
+ if len(resultItem) != 3:
+ GameWorld.ErrLog('仙盟Boss奖励表配置错误 itemInfo=%s' % resultItem)
+ continue
+ if resultItem[2]:
+ familyAuctionItemList.append(resultItem)
+ else:
+ menberItemList.append(resultItem)
return familyAuctionItemList, menberItemList
@@ -461,17 +493,31 @@
gameFB = GameWorld.GetGameFB()
isOver = gameFB.GetGameFBDictByKey(FBDict_IsOver)
- if not isOver and GetBossRemainHP(tick) == 0:
-
- #结束 设置BOSS死亡
- FBCommon.ClearFBNPC()
- FBCommon.NotifyCopyMapPlayerFBHelp(tick, DoFBHelp, 0)
- GameWorld.DebugLog('结束 设置BOSS死亡')
+ if not isOver:
+ if GetBossRemainHP(tick) == 0:
+ #结束 设置BOSS死亡
+ FBCommon.ClearFBNPC()
+ FBCommon.NotifyCopyMapPlayerFBHelp(tick, DoFBHelp, 0)
+ GameWorld.DebugLog('结束 设置BOSS死亡')
+
+ gameFB.SetGameFBDict(FBDict_IsOver, tick)
+
+ __DoLogicAllFamilyBossOver(1, tick)
+ else:
+ #血量广播
+ needNotifyHPPerList = [50, 20]
+ lastIndex = gameFB.GetGameFBDictByKey(FBDict_LastHPNotify)
+ if lastIndex >= len(needNotifyHPPerList):
+ return
+ remainPer = GetBossRemainHPPer(tick)
+ notifyHPPer = needNotifyHPPerList[lastIndex]
+ if remainPer == notifyHPPer or remainPer - 1 == notifyHPPer:
+ gameFB.SetGameFBDict(FBDict_LastHPNotify, lastIndex + 1)
+ lineID = GameWorld.GetGameWorld().GetPropertyID() - 1
+ bossID = CurFBLineBOSSID(lineID)
+ msgMark = 'AllianceBossHP1' if lineID == 0 else 'AllianceBossHP2'
+ PlayerControl.WorldNotify(0, msgMark, [bossID, notifyHPPer])
- gameFB.SetGameFBDict(FBDict_IsOver, tick)
-
- __DoLogicAllFamilyBossOver(1, tick)
-
return
@@ -484,8 +530,9 @@
lineID = GameWorld.GetGameWorld().GetPropertyID() - 1
if lineID < 0:
return
-
- curSpeed = int(min(1 + 0.08 * (playerCnt - 1), 1.8) * 1000)
+
+
+ curSpeed = eval(FBCommon.GetFBLineStepTime(ChConfig.Def_FBMapID_AllFamilyBoss, lineID)[Def_HPSpeed])
gameWorld.SetGameWorldDict(FBDict_Speed, curSpeed)
if not gameWorld.GetGameWorldDictByKey(FBDict_IsReduceing):
return
@@ -543,7 +590,7 @@
lastSpeed = gameWorld.GetGameWorldDictByKey(FBDict_Speed)
remainHP = gameWorld.GetGameWorldDictByKey(FBDict_RemainHP)
if not gameWorld.GetGameWorldDictByKey(FBDict_IsReduceing):
- return remainHP
+ return remainHP if startTick else __GetBossTotalHP()
if not startTick:
startTick = tick
remainHP = __GetBossTotalHP()
@@ -556,7 +603,7 @@
remainHP = GetBossRemainHP(tick)
totalHP = __GetBossTotalHP()
if not totalHP:
- return 0
+ return 100
return remainHP * 100 / totalHP
--
Gitblit v1.8.0