From 7af68e9bc37cae8c42698f4bfe721c797e8f39f7 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期一, 10 九月 2018 15:06:50 +0800
Subject: [PATCH] fix:3380【主干、15】 离线流向增加参数
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FamilyRobBoss.py | 37 +++++++++++++++++++++++++++++++------
1 files changed, 31 insertions(+), 6 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FamilyRobBoss.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FamilyRobBoss.py
index 63e03d9..2c45b06 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FamilyRobBoss.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FamilyRobBoss.py
@@ -20,6 +20,7 @@
import IPY_GameWorld
import NetPackCommon
import ChPyNetSendPack
+import PlayerActivity
import PlayerControl
import IpyGameDataPY
import NPCCommon
@@ -80,6 +81,10 @@
if not g_familyOwnerBossHurt:
g_familyOwnerBossHurt = FamilyOwnerBossHurt()
return g_familyOwnerBossHurt
+
+def IsHorsePetRobBoss(bossID):
+ ## 是否骑宠争夺bossID
+ return bossID in IpyGameDataPY.GetFuncEvalCfg("FairyGrabBossID", 1)
def OnGMPrintFamilyOwnerBossHurt(curPlayer, curNPC):
## GM显示仙盟归属boss伤血信息
@@ -181,6 +186,12 @@
hurtName = familyName if hurtType == FamilyHurtObjType_Family else playerName
objHurtDict[hurtID] = FamilyHurtObj(familyID, hurtType, hurtID, hurtName)
hurtObj = objHurtDict[hurtID]
+
+ # 玩家对该boss第一次造成伤害
+ if hurtType == FamilyHurtObjType_Player and hurtObj.hurtValue == 0 and hurtValue:
+ if IsHorsePetRobBoss(curBoss.GetNPCID()):
+ PlayerActivity.AddDailyActionFinishCnt(curPlayer, ShareDefine.DailyActionID_FamilyRobBoss)
+
hurtObj.hurtValue += hurtValue
GameWorld.DebugLog(" 更新伤血%s: hurtType=%s,hurtID=%s,hurtValue=%s"
% (mark, hurtType, hurtID, hurtObj.hurtValue), playerID)
@@ -244,9 +255,11 @@
npcFamilyHisHurtDict = hurtMgr.familyHisHurtDict.get(key, {})
npcFamilyPlayerIDDict = hurtMgr.familyPlayerIDDict.get(key, {})
+ ownerFamilyName = ""
if ownerFamilyID in npcFamilyHisHurtDict:
ownerFamilyHisHurt = npcFamilyHisHurtDict[ownerFamilyID]
- PlayerControl.WorldNotify(0, "FairyGrabBossDead", [ownerFamilyHisHurt.name, bossID])
+ ownerFamilyName = ownerFamilyHisHurt.name
+ PlayerControl.WorldNotify(0, "FairyGrabBossDead", [ownerFamilyName, bossID])
# 击杀结算前强制排序历史玩家伤血
npcHisHurtPlayerList = npcPlayerHisHurtDict.values()
@@ -258,7 +271,7 @@
curNPCPlayerOrderAwardDict = ownerFamilyPlayerOrderAwardDict.get(bossID, {})
maxOrder = max(curNPCPlayerOrderAwardDict) if curNPCPlayerOrderAwardDict else 0
curOrder = 0
- #orderPlayerNameList = []
+ orderPlayerNameList = []
for hurtPlayer in npcHisHurtPlayerList:
# 只算归属仙盟的
if hurtPlayer.familyID != ownerFamilyID:
@@ -268,13 +281,14 @@
batchPlayerIDList.append([hurtPlayer.objID])
batchAddItemList.append(awardItemList)
batchParamList.append([bossID, curOrder])
- #orderPlayerNameList.append(hurtPlayer.name)
+ orderPlayerNameList.append(hurtPlayer.name)
GameWorld.Log(" 归属仙盟第%s名额外奖励: %s" % (curOrder, awardItemList))
if curOrder >= maxOrder:
break
if batchPlayerIDList:
PlayerControl.SendMailBatch("FairyGrabBoss2", batchPlayerIDList, batchAddItemList, batchParamList)
- #PlayerControl.WorldNotify(0, "FairyGrabBossRank", orderPlayerNameList + [bossID])
+ orderPlayerName = ShareDefine.Def_Space.join(orderPlayerNameList)
+ PlayerControl.WorldNotify(0, "FairyGrabBossRank", [orderPlayerName, bossID])
# 参与仙盟历史伤血奖励, 算历史伤血
joinAwardNeedHurtHPPer = IpyGameDataPY.GetFuncCfg("FairyGrabBoss", 2)
@@ -303,8 +317,12 @@
if curPlayer:
NetPackCommon.SendFakePack(curPlayer, hurtPack)
+ # 击杀时主动同步进度
+ syncMsg = str({bossID:[0, maxHP, ownerFamilyID, ownerFamilyName]})
+ GameWorld.GetPlayerManager().GameServer_QueryPlayerResult(0, 0, 0, "FamilyOwnerBossInfo", syncMsg, len(syncMsg))
+
# 伤血在NPCCommon统一清
- return
+ return ownerFamilyName
def RefreshFamilyOwnerNPCHurt(npcControl, curNPC, tick, refreshInterval):
## 仙盟归属boss刷新伤血列表
@@ -394,7 +412,7 @@
for clearHurtFamilyID in clearHurtFamilyIDList:
npcFamilyNowHurtDict.pop(clearHurtFamilyID, 0)
- npcFamilyPlayerIDDict.pop(clearHurtFamilyID, 0)
+ #npcFamilyPlayerIDDict.pop(clearHurtFamilyID, 0)
GameWorld.Log("清除仙盟伤血: lineID=%s,objID=%s,bossID=%s" % (lineID, objID, bossID))
# 排序
@@ -491,6 +509,13 @@
key = (lineID, objID, bossID)
hurtMgr = GetFamilyHurtMgr()
+
+ # 同步对骑宠争夺boss有伤血的玩家ID到GameServer
+ if IsHorsePetRobBoss(bossID):
+ familyHurtPlayerIDListDict = hurtMgr.familyPlayerIDDict.get(key, {})
+ syncMsg = str([bossID, familyHurtPlayerIDListDict])
+ GameWorld.GetPlayerManager().GameServer_QueryPlayerResult(0, 0, 0, "HorsePetRobBossHurtPlayer", syncMsg, len(syncMsg))
+
hurtMgr.ClearNPCHurt(key)
GameWorld.DebugLog("ClearFamilyOwnerBossHurt lineID=%s, objID=%s, bossID=%s" % (lineID, objID, bossID))
--
Gitblit v1.8.0