From d5e9bbcf96cf98d767ba073774b1ee287569659d Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期六, 24 十一月 2018 18:20:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FamilyRobBoss.py | 8 +++++---
1 files changed, 5 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 a9ab98c..d02f52a 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FamilyRobBoss.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FamilyRobBoss.py
@@ -136,7 +136,6 @@
def OnPlayerHurtFamilyOwnerBoss(curPlayer, curBoss, hurtValue):
## 仙盟玩家对仙盟归属boss造成伤害
- GameWorld.DebugLog("OnPlayerHurtFamilyOwnerBoss hurtValue=%s" % hurtValue)
if hurtValue <= 0:
return
@@ -154,6 +153,7 @@
if NPCCommon.GetDropOwnerType(curBoss) != ChConfig.DropOwnerType_Family:
return
+ GameWorld.DebugLog("OnPlayerHurtFamilyOwnerBoss hurtValue=%s" % hurtValue)
lineID = GameWorld.GetGameWorld().GetLineID()
objID = curBoss.GetID()
bossID = curBoss.GetNPCID()
@@ -297,8 +297,10 @@
break
if batchPlayerIDList:
PlayerControl.SendMailBatch("FairyGrabBoss2", batchPlayerIDList, batchAddItemList, batchParamList, batchDetail=batchDetailList)
- orderPlayerName = ShareDefine.Def_Space.join(orderPlayerNameList)
- PlayerControl.WorldNotify(0, "FairyGrabBossRank", [orderPlayerName, bossID])
+ for order, orderPlayerName in enumerate(orderPlayerNameList, 1):
+ PlayerControl.WorldNotify(0, "FairyGrabBossRank", [orderPlayerName, bossID, order])
+ if order >= 3:
+ break
# 参与仙盟历史伤血奖励, 算历史伤血
joinAwardNeedHurtHPPer = IpyGameDataPY.GetFuncCfg("FairyGrabBoss", 2)
--
Gitblit v1.8.0