From 14661edf6156dbc38b2fe4bdf0a15cceacc52897 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 31 五月 2019 16:04:19 +0800
Subject: [PATCH] 6805 【后端】【2.0】副本前端化(去除木桩非自定义场景召唤限制,最大同时存在木桩数改为3个,设置玩家血量改为玩家掉血)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ZhuXianBoss.py |  243 ++++++++++++++----------------------------------
 1 files changed, 71 insertions(+), 172 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ZhuXianBoss.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ZhuXianBoss.py
index 19c2e58..9fb347b 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ZhuXianBoss.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ZhuXianBoss.py
@@ -28,19 +28,15 @@
 import ChPyNetSendPack
 import ShareDefine
 import PlayerSuccess
-import PlayerActivity
+import GameObj
 import NetPackCommon
 import ItemControler
+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
-FBDict_IsReduceing = 'FBDict_IsReduceing%s' #是否掉血中
 FBPlayerDict_Rank = "FBPlayerDict_Rank" # 玩家排名
-FBDict_BossTotalHP = 'FBDict_BossTotalHP%s' #BOSS血量
 
 g_heroHurtDict = {} #{playerID:hurt}
 
@@ -136,8 +132,6 @@
     key = ShareDefine.Def_Notify_WorldKey_GameWorldBossReborn % bossID
     GameWorld.GetGameWorld().SetGameWorldDict(key, 1)
     GameWorld.DebugLog('    刷BOSSbossID=%s' % bossID)
-    ipyData = IpyGameDataPY.GetIpyGameData('ZhuXianBoss', lineID)
-    GameWorld.GetGameWorld().SetGameWorldDict(FBDict_BossTotalHP%lineID, ipyData.GetKillTime() * 1000)
     return
 
 ## 进副本
@@ -167,8 +161,7 @@
         EventReport.WriteEvent_FB(curPlayer, ChConfig.Def_FBMapID_ZhuXianBoss, 0, ChConfig.CME_Log_Start)
 
         UpdateHurtInfo(curPlayer, 0, True)
-    
-    UpdateHPReduceSpeed(tick)        
+           
     gameFB = GameWorld.GetGameFB()
     # 上鼓舞buff
     encourageLV = gameFB.GetPlayerGameFBDictByKey(playerID, FBPlayerDict_EncourageLV)
@@ -177,7 +170,7 @@
     else:
         FBCommon.SendFBEncourageInfo(curPlayer, encourageLV)
         
-    #DoFBHelp(curPlayer, tick)
+    DoFBHelp(curPlayer, tick)
     return
 
 ##关闭副本
@@ -186,11 +179,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
 
@@ -206,13 +195,11 @@
     if gameWorld.GetMapCopyPlayerManager().GetPlayerCount() == 1:
         lineID = gameWorld.GetPropertyID() - 1
         PyGameData.g_ZhuXianBossPlayerHurtDict[lineID] = {}
-        gameWorld.SetGameWorldDict(FBDict_StartTick % lineID, 0)
+
         GameWorld.GetGameFB().ClearGameFBDict()
         GameWorldProcess.CloseFB(tick)
         return
-        
-    UpdateHPReduceSpeed(tick, True)
-    
+
     return
 
 ##玩家主动离开副本.
@@ -226,8 +213,6 @@
     playerHurtDict = PyGameData.g_ZhuXianBossPlayerHurtDict.get(lineID, {})
     playerHurtDict.pop(curPlayer.GetPlayerID(), 0)
     PyGameData.g_ZhuXianBossPlayerHurtDict[lineID] = playerHurtDict
-    if not playerHurtDict: #榜上没人,停止掉血
-        StopReduceHP(lineID, tick)
     return
 
 ##玩家切换地图
@@ -265,26 +250,11 @@
         hurtDict["hurt"] = hurt % ChConfig.Def_PerPointValue
         hurtDict["hurtEx"] = hurt / ChConfig.Def_PerPointValue
         hurtInfo.append(hurtDict)
-#    myRank = __GetSelfHurtRank(curPlayer)
-#    if myRank and myRank > 5:
-#        hurtDict = {}
-#        hurtDict["rank"] = myRank
-#        info = playerHurtList[myRank - 1]
-#        playerName, hurt = info[1][:2]
-#        hurtDict["playerName"] = playerName
-#        hurtDict["hurt"] = hurt % ChConfig.Def_PerPointValue
-#        hurtDict["hurtEx"] = hurt / ChConfig.Def_PerPointValue
-#        hurtInfo.append(hurtDict)
+
     
-    curSpeed = GameWorld.GetGameWorld().GetGameWorldDictByKey(FBDict_Speed % lineID) 
-    isReduceing = GameWorld.GetGameWorld().GetGameWorldDictByKey(FBDict_IsReduceing % lineID) 
-    remainHP = GetBossRemainHP(lineID, tick)
-    totalHP = __GetBossTotalHP(lineID)
-    hpReduceSpeed = curSpeed * 10000 / totalHP if totalHP else 0
-    remainHPPer = min(100, remainHP * 100 / totalHP) if totalHP else 0
     myHurt = g_heroHurtDict.get(curPlayer.GetID(), 0)
-    fbHelpDict = {FBCommon.Help_lineID:lineID, "hurtInfo":hurtInfo, 'hpReduceSpeed':hpReduceSpeed, 
-                  'remainHPPer':remainHPPer, 'isReduceing':isReduceing,'myHurt':myHurt % ChConfig.Def_PerPointValue,
+    fbHelpDict = {FBCommon.Help_lineID:lineID, "hurtInfo":hurtInfo, 
+                  'myHurt':myHurt % ChConfig.Def_PerPointValue,
                   'myHurtEx':myHurt / ChConfig.Def_PerPointValue
                   }
     GameWorld.DebugLog("DoFBHelp: %s" % fbHelpDict, curPlayer.GetPlayerID())
@@ -347,8 +317,6 @@
     else:
         playerHurtDict[playerID][1] += hurtHP
     PyGameData.g_ZhuXianBossPlayerHurtDict[lineID] = playerHurtDict
-    #有人上榜开始掉血
-    StartReduceHP(lineID, GameWorld.GetGameWorld().GetTick())
     return
 
 ##---副本总逻辑计时器---
@@ -367,14 +335,12 @@
     lineID = GameWorld.GetGameWorld().GetPropertyID() - 1
     if lineID <0:
         return
-    gameWorld = GameWorld.GetGameWorld()
-    startTick = gameWorld.GetGameWorldDictByKey(FBDict_StartTick % lineID)
-    if not startTick or overTick:
+
+    if overTick:
         return
+    
     FBCommon.NotifyCopyMapPlayerFBHelp(tick, DoFBHelp, 5000)
-    __CheckBossHP(tick)
-    
-    
+
     return
 
 
@@ -409,7 +375,7 @@
         gameFB.SetPlayerGameFBDict(firstPlayerID, FBPlayerDict_Rank, 1)
         if not dropPosX or not dropPosY:
             dropPosX, dropPosY = firstPlayer.GetPosX(), firstPlayer.GetPosY()
-        prizeItemList = GiveZhuXianBossAward(firstPlayer, lineID, dropItemMapInfo=[dropPosX, dropPosY, True])
+        prizeItemList = GiveZhuXianBossAward(firstPlayer, lineID, dropItemMapInfo=[dropPosX, dropPosY, True, True])
         if not prizeItemList:
             # 没有掉落时直接通知结算,防止卡副本
             firstPlayer.Sync_TimeTick(IPY_GameWorld.tttLeaveMap, 0, leaveTick, True)
@@ -422,11 +388,10 @@
         if leaveServerTick and tick - leaveServerTick < ChConfig.Def_PlayerOfflineProtectTime:
             #离线超过3分钟的不给奖励
             msgStr = str([ShareDefine.Def_UniversalGameRecType_ZhuXianBossRecord, [firstPlayerID, lineID], [], 0, 0])
-            playerManager.GameServer_QueryPlayerResult(0, 0, 0, 'AddUniversalGameRec', msgStr, len(msgStr))
+            GameWorld.GetPlayerManager().GameServer_QueryPlayerResult(0, 0, 0, 'AddUniversalGameRec', msgStr, len(msgStr))
             
     helpItemList = FBCommon.GetFBLineReward(mapID, lineID)
     if helpItemList: #同盟协助奖励
-        needSpace = len(helpItemList)
         jsonItemList = FBCommon.GetJsonItemList(helpItemList)
         for index in range(0 , playerManager.GetPlayerCount()):
             curPlayer = playerManager.GetPlayerByIndex(index)
@@ -435,24 +400,18 @@
                 continue
             if curPlayerID == firstPlayerID:
                 continue
-            if curPlayer.GetFamilyID() != firstPlayerFamilyID:
-                continue
-            remainCnt = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_ZhuXianBossHelpCnt)
-            if not remainCnt:
-                continue
-            PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_ZhuXianBossHelpCnt, remainCnt-1)
-            NotifyZXHelpCnt(curPlayer)
             curPlayer.Sync_TimeTick(IPY_GameWorld.tttLeaveMap, 0, leaveTick, True)
-            overDict = {FBCommon.Over_rank:0, FBCommon.Over_itemInfo:jsonItemList}
-            FBCommon.NotifyFBOver(curPlayer, ChConfig.Def_FBMapID_ZhuXianBoss, lineID, isPass, overDict)
-            
-            packSpace = ItemCommon.GetItemPackSpace(curPlayer, IPY_GameWorld.rptItem, needSpace)
-            if needSpace > packSpace:
-                PlayerControl.SendMailByKey('ZXBossHelperReward', [curPlayerID], helpItemList)
+            remainCnt = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_ZhuXianBossHelpCnt)
+            if curPlayer.GetFamilyID() == firstPlayerFamilyID and remainCnt:
+                PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_ZhuXianBossHelpCnt, remainCnt-1)
+                NotifyZXHelpCnt(curPlayer)
+                ItemControler.GivePlayerItemOrMail(curPlayer, helpItemList, 'ZXBossHelperReward')
+                overDict = {FBCommon.Over_rank:0, FBCommon.Over_itemInfo:jsonItemList}
+                FBCommon.NotifyFBOver(curPlayer, ChConfig.Def_FBMapID_ZhuXianBoss, lineID, isPass, overDict)
             else:
-                for itemID, itemCount, isBind in helpItemList:
-                    ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, isBind, [IPY_GameWorld.rptItem])
-    
+                overDict = {FBCommon.Over_rank:0}
+                FBCommon.NotifyFBOver(curPlayer, ChConfig.Def_FBMapID_ZhuXianBoss, lineID, 0, overDict)
+            
     return
 
 def GiveZhuXianBossAward(curPlayer, lineID, isMail=False, dropItemMapInfo=[]):
@@ -482,7 +441,8 @@
     PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_KillSpecificNPC, addCnt, [bossID])
     FBCommon.AddEnterFBCount(curPlayer, ChConfig.Def_FBMapID_ZhuXianBoss, addCnt)
     # 每日活动
-    PlayerActivity.AddDailyActionFinishCnt(curPlayer, ShareDefine.DailyActionID_ZhuXianBoss, addCnt)
+    #PlayerActivity.AddDailyActionFinishCnt(curPlayer, ShareDefine.DailyActionID_ZhuXianBoss, addCnt)
+    PlayerActLogin.AddLoginAwardActionCnt(curPlayer, ChConfig.Def_LoginAct_ZhuXianBOSS, addCnt)
     return prizeItemList
 
 def OnPickUpItem(curPlayer, curItem, tick):
@@ -534,114 +494,43 @@
     FBCommon.NotifyFBOver(curPlayer, ChConfig.Def_FBMapID_ZhuXianBoss, lineID, isPass, overDict)
     return
 
-
-def __CheckBossHP(tick):
-    gameFB = GameWorld.GetGameFB()
-    isOver = gameFB.GetGameFBDictByKey(FBDict_IsOver)
-    lineID = GameWorld.GetGameWorld().GetPropertyID() - 1
-   
-    if not isOver and GetBossRemainHP(lineID, tick) == 0:
-
-        bossID = CurFBLineBOSSID(lineID)
-        curBoss = GameWorld.FindNPCByNPCID(bossID)
-        dropPosX, dropPosY = 0, 0
-        if curBoss:
-            dropPosX, dropPosY = curBoss.GetPosX(), curBoss.GetPosY()
-        
-        #结束 设置BOSS死亡
-        FBCommon.ClearFBNPC()
-        FBCommon.NotifyCopyMapPlayerFBHelp(tick, DoFBHelp, 0)
-        GameWorld.DebugLog('结束 设置BOSS死亡 lineID=%s' % lineID)
-        playerHurtList = __GetSortHurtList(lineID)
-       
-        if playerHurtList:
-            killerName, hurtValue = playerHurtList[0][1][:2]
-            NPCCommon.GameServer_KillGameWorldBoss(bossID, killerName, hurtValue)
-            
-        NPCCommon.GameServe_GameWorldBossState(bossID, 0)
-            
-        __DoLogicZhuXianBossOver(1, tick, dropPosX, dropPosY)
-        gameFB.SetGameFBDict(FBDict_IsOver, tick)
+def DoFB_Npc_KillNPC(attacker, curNPC, tick):
+    __FBNPCOnKilled(curNPC, tick)
+    return
+def DoFB_Player_KillNPC(curPlayer, curNPC, tick):
+    __FBNPCOnKilled(curNPC, tick)
     return
 
-def UpdateHPReduceSpeed(tick, isExit=False):
-    gameWorld = GameWorld.GetGameWorld()
-    playerCnt = gameWorld.GetMapCopyPlayerManager().GetPlayerCount()
-    playerCnt = playerCnt - 1 if isExit else playerCnt
-    if playerCnt <=0:
-        return
+## 执行副本杀怪逻辑
+def __FBNPCOnKilled(curNPC, tick):
     lineID = GameWorld.GetGameWorld().GetPropertyID() - 1
-    if lineID < 0:
+    bossID = CurFBLineBOSSID(lineID)
+    if curNPC.GetNPCID() != bossID:
         return
 
-    curSpeed = int(min(1 + 0.08 * (playerCnt - 1), 1.8) * 1000)
-    gameWorld.SetGameWorldDict(FBDict_Speed % lineID, curSpeed)
-    if not gameWorld.GetGameWorldDictByKey(FBDict_IsReduceing%lineID):
-        return
+    dropPosX, dropPosY = curNPC.GetPosX(), curNPC.GetPosY()
     
-    startTick = gameWorld.GetGameWorldDictByKey(FBDict_StartTick % lineID)
-    remainHP = gameWorld.GetGameWorldDictByKey(FBDict_RemainHP % lineID)
-    lastSpeed = gameWorld.GetGameWorldDictByKey(FBDict_Speed % lineID)
-    if not startTick:
-        startTick = tick 
-        lastSpeed = curSpeed
-        remainHP = __GetBossTotalHP(lineID)
-    remainHP = max(0, int((remainHP - (tick - startTick) / 1000.0 * lastSpeed)))
-    gameWorld.SetGameWorldDict(FBDict_StartTick % lineID, tick)
-    
-    gameWorld.SetGameWorldDict(FBDict_RemainHP % lineID, remainHP)
-    GameWorld.DebugLog('    curSpeed=%s, remainHP=%s, passTime=%s, lastSpeed=%s' % (curSpeed, remainHP, tick - startTick, lastSpeed))
+    #结束 设置BOSS死亡
     FBCommon.NotifyCopyMapPlayerFBHelp(tick, DoFBHelp, 0)
+    GameWorld.DebugLog('结束 设置BOSS死亡 lineID=%s' % lineID)
+    playerHurtList = __GetSortHurtList(lineID)
+   
+    if playerHurtList:
+        killerName, hurtValue = playerHurtList[0][1][:2]
+        NPCCommon.GameServer_KillGameWorldBoss(bossID, killerName, hurtValue)
+        
+    NPCCommon.GameServe_GameWorldBossState(bossID, 0)
+        
+    __DoLogicZhuXianBossOver(1, tick, dropPosX, dropPosY)
+    GameWorld.GetGameFB().SetGameFBDict(FBDict_IsOver, tick)
     return
 
-def StopReduceHP(lineID, tick):
-    ##暂停BOSS血量减少
-    gameWorld = GameWorld.GetGameWorld()
-    if not gameWorld.GetGameWorldDictByKey(FBDict_IsReduceing%lineID):
-        return
-    remainHP = GetBossRemainHP(lineID, tick)
-    if not remainHP:
-        return
-    gameWorld.SetGameWorldDict(FBDict_IsReduceing % lineID, 0)
-    gameWorld.SetGameWorldDict(FBDict_RemainHP % lineID, remainHP)
-    return
-
-def StartReduceHP(lineID, tick):
-    ##开始BOSS掉血
-    gameWorld = GameWorld.GetGameWorld()
-    if gameWorld.GetGameWorldDictByKey(FBDict_IsReduceing%lineID):
-        return
-    gameWorld.SetGameWorldDict(FBDict_IsReduceing % lineID, 1)
-    startTick = gameWorld.GetGameWorldDictByKey(FBDict_StartTick % lineID)
-    if not startTick:
-        gameWorld.SetGameWorldDict(FBDict_RemainHP % lineID, __GetBossTotalHP(lineID))
-    gameWorld.SetGameWorldDict(FBDict_StartTick % lineID, tick)
-    return
-
-def __GetBossTotalHP(lineID):return GameWorld.GetGameWorld().GetGameWorldDictByKey(FBDict_BossTotalHP%lineID)
-    
-
-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 gameWorld.GetGameWorldDictByKey(FBDict_IsReduceing%lineID):
-        return remainHP
-    if not startTick:
-        startTick = tick
-        remainHP = __GetBossTotalHP(lineID)
-    else:
-        remainHP = max(0, int((remainHP - (tick - startTick) / 1000.0 * lastSpeed)))
-    return remainHP
-
-def GetBossRemainHPPer(lineID, tick):
-    remainHP = GetBossRemainHP(lineID, tick)
-    totalHP = __GetBossTotalHP(lineID)
-    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
@@ -670,10 +559,20 @@
 def CheckCanAttackTagObjInFB(attacker, defender):
     atkObjType = attacker.GetGameObjType()
     defObjType = defender.GetGameObjType()
-    if atkObjType == IPY_GameWorld.gotPlayer and defObjType == IPY_GameWorld.gotNPC:
-        gameWorld = GameWorld.GetGameWorld()
-        lineID = gameWorld.GetPropertyID() - 1
-        if not gameWorld.GetGameWorldDictByKey(FBDict_IsReduceing%lineID):
-            PlayerControl.NotifyCode(attacker, 'TryEnterJadeDynastyBossError_7')
+    gameWorld = GameWorld.GetGameWorld()
+    lineID = gameWorld.GetPropertyID() - 1
+    if defObjType == IPY_GameWorld.gotNPC and defender.GetNPCID() == CurFBLineBOSSID(lineID):
+        if not PyGameData.g_ZhuXianBossPlayerHurtDict.get(lineID, {}):
+            if atkObjType == IPY_GameWorld.gotPlayer:
+                PlayerControl.NotifyCode(attacker, 'TryEnterJadeDynastyBossError_7')
             return False
     return True
+
+##处理副本中杀死玩家逻辑
+# @param curPlayer 玩家实例
+# @param defender 防守者
+# @param tick 时间戳
+# @return 布尔值
+# @remarks 处理副本中杀死玩家逻辑
+def DoFBOnKill_Player(atkobj, defender, tick):
+    return True
\ No newline at end of file

--
Gitblit v1.8.0