From 33b3a3ca2a65f9988417d387a78e63378f824302 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期四, 30 五月 2019 18:13:20 +0800
Subject: [PATCH] 6603 【后端】【2.0】增加新版的sp和被动技能 - 重击回血
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_SealDemon.py | 213 +++++++++++++++++-----------------------------------
1 files changed, 70 insertions(+), 143 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_SealDemon.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_SealDemon.py
index 8cb7cbb..4716952 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_SealDemon.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_SealDemon.py
@@ -33,20 +33,27 @@
import PlayerActivity
import NetPackCommon
import PlayerVip
-import PlayerMagicWeapon
+import GameObj
import PlayerBossReborn
import PlayerFairyCeremony
+import PlayerNewFairyCeremony
+import PlayerWeekParty
+import PlayerActLogin
import EventReport
-FBDict_StartTick = 'FBDict_StartTick%s' #开始时间
-FBDict_Speed = 'FBDict_Speed%s' #掉血速度 /s
-FBDict_RemainHP = 'FBDict_RemainHP%s' #剩余时间
+
FBPlayerDict_EncourageLV = 'FBPlayerDict_EncourageLV' # 鼓舞等级
FBDict_IsOver = 'FBDict_IsOver' #是否已结算, 结算时的tick
FBPlayerDict_Rank = "FBPlayerDict_Rank" # 玩家排名
g_npcHurtDict = {}
+
+
+def OnFBPlayerOnLogin(curPlayer):
+ NotifyFMTDouble(curPlayer)
+ return
+
## 是否能够通过活动查询进入
# @param curPlayer 玩家实例
@@ -61,6 +68,12 @@
enterCnt = curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_EnterFbCntDay % mapID)
maxCnt = FBCommon.GetEnterFBMaxCnt(curPlayer, mapID)
if enterCnt + 2 > maxCnt:
+ return False
+ if lineID in newbielineList:
+ hasEnter = GameWorld.GetDictValueByBit(curPlayer, ChConfig.Def_Player_Dict_PlayerFBStar_MapId, lineID, False,
+ [ChConfig.Def_FBMapID_SealDemon])
+ if hasEnter:
+ GameWorld.DebugLog(" 已进入过该新手线路 %s" % lineID)
return False
return True
@@ -151,8 +164,7 @@
PlayerControl.PlayerLeaveFB(curPlayer)
return
UpdateHurtInfo(curPlayer, 0, True)
-
- UpdateHPReduceSpeed(tick)
+
gameFB = GameWorld.GetGameFB()
# 上鼓舞buff
encourageLV = gameFB.GetPlayerGameFBDictByKey(playerID, FBPlayerDict_EncourageLV)
@@ -161,7 +173,7 @@
else:
FBCommon.SendFBEncourageInfo(curPlayer, encourageLV)
- #DoFBHelp(curPlayer, tick)
+ DoFBHelp(curPlayer, tick)
return
##关闭副本
@@ -170,11 +182,7 @@
# @remarks
def OnCloseFB(tick):
gameWorld = GameWorld.GetGameWorld()
- lineID = gameWorld.GetPropertyID() - 1
- gameWorld.SetGameWorldDict(FBDict_StartTick % lineID, 0)
- gameWorld.SetGameWorldDict(FBDict_Speed % lineID, 0)
- gameWorld.SetGameWorldDict(FBDict_RemainHP % lineID, 0)
-
+
gameWorld.SetPropertyID(0)
return
@@ -194,13 +202,10 @@
lineID = gameWorld.GetPropertyID() - 1
PyGameData.g_sealDemonPlayerHurtDict[lineID] = {}
g_npcHurtDict[lineID] = {}
- gameWorld.SetGameWorldDict(FBDict_StartTick % lineID, 0)
GameWorld.GetGameFB().ClearGameFBDict()
GameWorldProcess.CloseFB(tick)
return
- UpdateHPReduceSpeed(tick, True)
-
return
##玩家主动离开副本.
@@ -261,12 +266,8 @@
hurtDict["hurtEx"] = hurt / ChConfig.Def_PerPointValue
hurtInfo.append(hurtDict)
- curSpeed = GameWorld.GetGameWorld().GetGameWorldDictByKey(FBDict_Speed % lineID)
- remainHP = GetBossRemainHP(lineID, tick)
- totalHP = __GetBossTotalHP()
- hpReduceSpeed = curSpeed * 10000 / totalHP if totalHP else 0
- remainHPPer = min(100, remainHP * 100 / totalHP) if totalHP else 0
- fbHelpDict = {FBCommon.Help_lineID:lineID, "hurtInfo":hurtInfo, 'hpReduceSpeed':hpReduceSpeed, 'remainHPPer':remainHPPer}
+
+ fbHelpDict = {FBCommon.Help_lineID:lineID, "hurtInfo":hurtInfo}
GameWorld.DebugLog("DoFBHelp: %s" % fbHelpDict, curPlayer.GetPlayerID())
FBCommon.Notify_FBHelp(curPlayer, fbHelpDict)
return
@@ -375,50 +376,43 @@
lineID = GameWorld.GetGameWorld().GetPropertyID() - 1
if lineID <0:
return
- gameWorld = GameWorld.GetGameWorld()
- startTick = gameWorld.GetGameWorldDictByKey(FBDict_StartTick % lineID)
- if not startTick:
- return
+
FBCommon.NotifyCopyMapPlayerFBHelp(tick, DoFBHelp, 5000)
- __CheckBossHP(tick)
-
return
-def __CheckBossHP(tick):
- gameFB = GameWorld.GetGameFB()
- isOver = gameFB.GetGameFBDictByKey(FBDict_IsOver)
+def DoFB_Npc_KillNPC(attacker, curNPC, tick):
+ __FBNPCOnKilled(curNPC, tick)
+ return
+def DoFB_Player_KillNPC(curPlayer, curNPC, tick):
+ __FBNPCOnKilled(curNPC, tick)
+ return
+
+## 执行副本杀怪逻辑
+def __FBNPCOnKilled(curNPC, tick):
lineID = GameWorld.GetGameWorld().GetPropertyID() - 1
+ bossID = CurFBLineBOSSID(lineID)
+ if curNPC.GetNPCID() != bossID:
+ return
+
+ dropPosX, dropPosY = curNPC.GetPosX(), curNPC.GetPosY()
+
+ FBCommon.NotifyCopyMapPlayerFBHelp(tick, DoFBHelp, 0)
+ GameWorld.DebugLog('结束 设置BOSS死亡 lineID=%s' % lineID)
newbielineList = IpyGameDataPY.GetFuncEvalCfg('SealDemonNewbieLine')
isNewbieLine = lineID in newbielineList
- if not isOver and GetBossRemainHP(lineID, tick) == 0:
- guardNPCIDList = __GetGuardNPCIDList(lineID)
- bossID = CurFBLineBOSSID(lineID)
- curBoss = GameWorld.FindNPCByNPCID(bossID)
- dropPosX, dropPosY = 0, 0
- if curBoss:
- dropPosX, dropPosY = curBoss.GetPosX(), curBoss.GetPosY()
-
- #结束 设置BOSS死亡
- FBCommon.ClearFBNPC(guardNPCIDList)
- FBCommon.NotifyCopyMapPlayerFBHelp(tick, DoFBHelp, 0)
- GameWorld.DebugLog('结束 设置BOSS死亡 lineID=%s' % lineID)
+ if not isNewbieLine:
playerHurtList = __GetSortHurtList(lineID)
- if not isNewbieLine:
- if playerHurtList:
- killerName, hurtValue = playerHurtList[0][1]
- NPCCommon.GameServer_KillGameWorldBoss(bossID, killerName, hurtValue)
+ if playerHurtList:
+ killerName, hurtValue = playerHurtList[0][1]
+ NPCCommon.GameServer_KillGameWorldBoss(bossID, killerName, hurtValue)
- msgList = [bossID, 0]
- GameWorld.GetPlayerManager().GameServer_QueryPlayerResult(0, 0, 0, 'GameWorldBossState',
- '%s' % (msgList), len(str(msgList)))
- bosskey = ShareDefine.Def_Notify_WorldKey_GameWorldBossReborn % bossID
- GameWorld.GetGameWorld().SetGameWorldDict(bosskey, 0)
-
- __DoLogicSealDemonOver(1, tick, dropPosX, dropPosY)
- gameFB.SetGameFBDict(FBDict_IsOver, tick)
+ NPCCommon.GameServe_GameWorldBossState(bossID, 0)
+ __DoLogicSealDemonOver(1, tick, dropPosX, dropPosY)
+ GameWorld.GetGameFB().SetGameFBDict(FBDict_IsOver, tick)
return
+
def __GetSortHurtList(lineID):
playerHurtDict = PyGameData.g_sealDemonPlayerHurtDict.get(lineID, {})
@@ -451,6 +445,8 @@
curPlayer.Sync_TimeTick(ChConfig.tttPickupItem, 0, ChConfig.Def_FBPickupItemTime, True)
else:
leaveTick = PlayerControl.GetPlayerLeaveServerTick(playerID)
+ if not leaveTick:
+ continue
if tick - leaveTick > ChConfig.Def_PlayerOfflineProtectTime:
#离线超过3分钟的不给奖励
continue
@@ -481,7 +477,7 @@
#for _ in xrange(addCnt):
jsonItemList, totalExp, totalMoney = NPCCommon.GiveKillNPCDropPrize(curPlayer, ChConfig.Def_FBMapID_SealDemon, {bossID:addCnt},
mailTypeKey="SealDemonMail", isMail=isMail, prizeMultiple=prizeMultiple,
- dropItemMapInfo=dropItemMapInfo)
+ dropItemMapInfo=dropItemMapInfo,isVirtualDrop=isClientSend)
for jsonItem in jsonItemList:
if 'UserData' in jsonItem:
equipList.append(jsonItem)
@@ -493,21 +489,6 @@
% (lineID, bossID, rank, totalExp, totalMoney, jsonItemList), curPlayer.GetPlayerID())
prizeItemList = equipList + FBCommon.GetJsonItemList(prizeItemDict.items())
- #===============================================================================================
- # if not isMail:
- # for itemDict in prizeItemList:
- # itemID = itemDict["ItemID"]
- # itemData = GameWorld.GetGameData().GetItemByTypeID(itemID)
- # if not itemData:
- # continue
- # userData = itemDict.get("UserData", '')
- # equipInfo = [itemData.GetEquipPlace(), ItemCommon.GetItemClassLV(itemData), itemData.GetItemColor(),
- # itemData.GetItemQuality(), userData]
- # mapID = ChConfig.Def_FBMapID_SealDemon
- # NPCCommon.SendGameServerGoodItemRecord(mapID, bossID, curPlayer.GetName(),
- # curPlayer.GetPlayerID(), itemID, equipInfo)
- #===============================================================================================
-
if rank == 1:
PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_FMTFirst, addCnt)
@@ -533,9 +514,12 @@
if rank == 1 and lineID >= 4:
EventShell.EventRespons_SealDemon(curPlayer)
- PlayerMagicWeapon.SetMWPrivilegeData(curPlayer, ChConfig.MWPrivilege_SealDemonAddAttr, addCnt, True)
+
PlayerBossReborn.AddBossRebornActionCnt(curPlayer, ChConfig.Def_BRAct_FMT, addCnt)
PlayerFairyCeremony.AddFCPartyActionCnt(curPlayer, ChConfig.Def_PPAct_FMT, addCnt)
+ PlayerNewFairyCeremony.AddFCPartyActionCnt(curPlayer, ChConfig.Def_PPAct_FMT, addCnt)
+ PlayerWeekParty.AddWeekPartyActionCnt(curPlayer, ChConfig.Def_WPAct_FMT, addCnt)
+ PlayerActLogin.AddLoginAwardActionCnt(curPlayer, ChConfig.Def_LoginAct_FMT, addCnt)
return prizeItemList
def OnPickUpItem(curPlayer, curItem, tick):
@@ -592,81 +576,24 @@
GameWorld.DebugLog('封魔坛 客户端副本发送结束mapID=%s,lineID=%s,dataList=%s' % (mapID,lineID,dataList), curPlayer.GetPlayerID())
rank, hurt = dataList[:2]
prizeItemList = GiveSealDemonAward(curPlayer, lineID, rank, False, True, [curPlayer.GetPosX(), curPlayer.GetPosY(), True])
- if rank == 1:
+ if rank == 1 and prizeItemList:
bossID = CurFBLineBOSSID(lineID)
NPCCommon.GameServer_KillGameWorldBoss(bossID, curPlayer.GetName(), hurt, False)
-
- if not prizeItemList:
- leaveTick = FBCommon.GetFBLineStepTime(mapID, lineID) * 1000
- GameWorld.Log("没有奖励，直接通知前端结算!mapID=%s,lineID=%s" % (mapID, lineID), curPlayer.GetPlayerID())
- curPlayer.Sync_TimeTick(IPY_GameWorld.tttLeaveMap, 0, leaveTick, True)
- overDict = {FBCommon.Over_rank:rank, FBCommon.Over_itemInfo:prizeItemList}
- FBCommon.NotifyFBOver(curPlayer, ChConfig.Def_FBMapID_SealDemon, lineID, 1, overDict)
- return
-
- gameFB = GameWorld.GetGameFB()
- tick = GameWorld.GetGameWorld().GetTick()
- gameFB.SetGameFBDict(FBDict_IsOver, tick)
- gameFB.SetPlayerGameFBDict(curPlayer.GetPlayerID(), FBPlayerDict_Rank, rank)
- curPlayer.Sync_TimeTick(ChConfig.tttPickupItem, 0, ChConfig.Def_FBPickupItemTime, True)
+
+ #GameWorld.Log("通知前端结算!mapID=%s,lineID=%s" % (mapID, lineID), curPlayer.GetPlayerID())
+ overDict = {FBCommon.Over_rank:rank, FBCommon.Over_itemInfo:prizeItemList}
+ FBCommon.NotifyFBOver(curPlayer, mapID, lineID, 1, overDict)
+ PlayerControl.SetCustomMap(curPlayer, 0, 0)
return
-
-
-def UpdateHPReduceSpeed(tick, isExit=False):
- mapID = GameWorld.GetMap().GetMapID()
- if mapID == ChConfig.Def_FBMapID_SealDemonEx:
- return
- playerCnt = GameWorld.GetGameWorld().GetMapCopyPlayerManager().GetPlayerCount()
- playerCnt = playerCnt - 1 if isExit else playerCnt
- if playerCnt <=0:
- return
- lineID = GameWorld.GetGameWorld().GetPropertyID() - 1
- if lineID < 0:
- return
- gameWorld = GameWorld.GetGameWorld()
- startTick = gameWorld.GetGameWorldDictByKey(FBDict_StartTick % lineID)
- lastSpeed = gameWorld.GetGameWorldDictByKey(FBDict_Speed % lineID)
- remainHP = gameWorld.GetGameWorldDictByKey(FBDict_RemainHP % lineID)
- curSpeed = int(min(1 + 0.08 * (playerCnt - 1), 1.8) * 1000)
- if not startTick:
- startTick = tick
- lastSpeed = curSpeed
- remainHP = __GetBossTotalHP()
- remainHP = max(0, int((remainHP - (tick - startTick) / 1000.0 * lastSpeed)))
- gameWorld.SetGameWorldDict(FBDict_StartTick % lineID, tick)
- gameWorld.SetGameWorldDict(FBDict_Speed % lineID, curSpeed)
- gameWorld.SetGameWorldDict(FBDict_RemainHP % lineID, remainHP)
- GameWorld.DebugLog(' curSpeed=%s, remainHP=%s, passTime=%s, lastSpeed=%s' % (curSpeed, remainHP, tick - startTick, lastSpeed))
- FBCommon.NotifyCopyMapPlayerFBHelp(tick, DoFBHelp, 0)
- return
-
-def __GetBossTotalHP():
- lineID = GameWorld.GetGameWorld().GetPropertyID() - 1
- bossID = CurFBLineBOSSID(lineID)
- ipyData = IpyGameDataPY.GetIpyGameData('SealDemon', bossID)
- if not ipyData:
- return 0
- return ipyData.GetKillTime() * 1000
-
-def GetBossRemainHP(lineID, tick):
- gameWorld = GameWorld.GetGameWorld()
- startTick = gameWorld.GetGameWorldDictByKey(FBDict_StartTick % lineID)
- lastSpeed = gameWorld.GetGameWorldDictByKey(FBDict_Speed % lineID)
- remainHP = gameWorld.GetGameWorldDictByKey(FBDict_RemainHP % lineID)
- if not startTick:
- startTick = tick
- remainHP = __GetBossTotalHP()
- else:
- remainHP = max(0, int((remainHP - (tick - startTick) / 1000.0 * lastSpeed)))
- return remainHP
-def GetBossRemainHPPer(lineID, tick):
- remainHP = GetBossRemainHP(lineID, tick)
- totalHP = __GetBossTotalHP()
- if not totalHP:
- return 0
- return remainHP * 100 / totalHP
+def GetBossRemainHPPer(copyMapID, funcLineID, tick):
+ bossID = CurFBLineBOSSID(funcLineID)
+ curBoss = GameWorld.FindNPCByNPCIDEx(copyMapID, bossID)
+ if not curBoss:
+ return 100
+ return GameObj.GetHP(curBoss) * 100 / GameObj.GetMaxHP(curBoss)
+
def CurFBLineBOSSID(lineID= -1):
#该分线刷的BOSSID
@@ -700,7 +627,7 @@
curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(playerIndex)
if GameWorld.GetMap().GetMapID() == ChConfig.Def_FBMapID_SealDemon:
return
- if not PlayerVip.GetPrivilegeValue(curPlayer, ChConfig.VIPPrivilege_FMTDouble):
+ if not curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_FMTOldDouble) and not PlayerVip.GetPrivilegeValue(curPlayer, ChConfig.VIPPrivilege_FMTDouble):
return
PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_Player_Dict_FMTDouble, clientData.IsDouble)
NotifyFMTDouble(curPlayer)
@@ -709,6 +636,6 @@
def NotifyFMTDouble(curPlayer):
packData = ChPyNetSendPack.tagMCFMTDoubleState()
packData.IsDouble = curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_FMTDouble)
+ packData.OldDouble = curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_FMTOldDouble)
NetPackCommon.SendFakePack(curPlayer, packData)
return
-
--
Gitblit v1.8.0