From 3388684ebcff99ed043e5fbc795750dbfba6c8d0 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期四, 13 九月 2018 17:06:42 +0800
Subject: [PATCH] 3466 【主干】【1.0.15】会心时增加会心伤害
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FamilyRobBoss.py | 93 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 90 insertions(+), 3 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 5113087..c9c2859 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FamilyRobBoss.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FamilyRobBoss.py
@@ -20,8 +20,13 @@
import IPY_GameWorld
import NetPackCommon
import ChPyNetSendPack
+import PlayerActivity
import PlayerControl
import IpyGameDataPY
+import SkillCommon
+import PyGameData
+import BuffSkill
+import PlayerTJG
import NPCCommon
import ChConfig
import GameObj
@@ -80,6 +85,15 @@
if not g_familyOwnerBossHurt:
g_familyOwnerBossHurt = FamilyOwnerBossHurt()
return g_familyOwnerBossHurt
+
+def OnPlayerLogin(curPlayer):
+ if GameWorld.GetGameWorld().GetGameWorldDictByKey(ShareDefine.Def_Notify_WorldKey_DailyActionState % ShareDefine.DailyActionID_FamilyRobBoss):
+ __DoCheckHorsePetRobBossKillCntBuff(curPlayer, GameWorld.GetGameWorld().GetTick())
+ return
+
+def IsHorsePetRobBoss(bossID):
+ ## 是否骑宠争夺bossID
+ return bossID in IpyGameDataPY.GetFuncEvalCfg("FairyGrabBossID", 1)
def OnGMPrintFamilyOwnerBossHurt(curPlayer, curNPC):
## GM显示仙盟归属boss伤血信息
@@ -181,6 +195,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 +264,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()
@@ -304,8 +326,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刷新伤血列表
@@ -395,7 +421,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))
# 排序
@@ -492,6 +518,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))
@@ -553,4 +586,58 @@
return hurtPack
+def OnFamilyKillHorsePetRobBossCntChange(tick):
+ ## 仙盟击杀骑宠boss个数变更
+
+ playerManager = GameWorld.GetPlayerManager()
+ for i in xrange(playerManager.OnlineCount()):
+ curPlayer = playerManager.OnlineAt(i)
+ if curPlayer.IsEmpty():
+ continue
+ __DoCheckHorsePetRobBossKillCntBuff(curPlayer, tick)
+
+ return
+
+def __DoCheckHorsePetRobBossKillCntBuff(curPlayer, tick):
+ familyID = curPlayer.GetFamilyID()
+ if not familyID:
+ return
+
+ if PlayerTJG.GetIsTJG(curPlayer):
+ return
+
+ killCount = PyGameData.g_familyKillHorsePetRobBossCntDict.get(familyID, 0)
+ skillTypeID = ChConfig.Def_SkillID_HorsePetRobBossKillCntBuff
+
+ skillInfo = SkillCommon.FindBuffByID(curPlayer, skillTypeID)
+ findBuff, buffManager, buffType, findSkill = skillInfo
+ if not findSkill:
+ return
+ killLV = min(killCount, findSkill.GetSkillMaxLV())
+
+ if findBuff:
+ buffSkill = findBuff.GetSkill()
+ if not buffSkill:
+ return
+ curBuffLV = buffSkill.GetSkillLV()
+ if curBuffLV == killLV:
+ #GameWorld.DebugLog("骑宠怨念buff等级不变: familyID=%s,killLV=%s,curBuffLV=%s" % (familyID, killLV, curBuffLV), curPlayer.GetPlayerID())
+ return
+
+ elif not killLV:
+ #GameWorld.DebugLog("无骑宠怨念buff: familyID=%s,killLV=%s" % (familyID, killLV), curPlayer.GetPlayerID())
+ return
+
+ if not killLV:
+ #GameWorld.DebugLog("删除骑宠怨念buff: familyID=%s,killLV=%s" % (familyID, killLV), curPlayer.GetPlayerID())
+ BuffSkill.DelBuffBySkillID(curPlayer, skillTypeID, tick)
+ else:
+ #GameWorld.DebugLog("变更骑宠怨念buff等级: familyID=%s,killLV=%s" % (familyID, killLV), curPlayer.GetPlayerID())
+ curSkill = GameWorld.GetGameData().FindSkillByType(skillTypeID, killLV)
+ BuffSkill.AddBuffNoRefreshState(curPlayer, buffType, curSkill, tick, [], curPlayer)
+
+ return
+
+
+
--
Gitblit v1.8.0