From dc925938d150b82d50bcbdfd6b0b860be31ba53a Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 20 十月 2022 17:06:12 +0800
Subject: [PATCH] 9739 【越南】【BT7】【主干】运营活动下发时间优化（优化累计充值、消费返利活动开始日期与开服定制天交叉时下发开始日期为第8天）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCHurtMgr.py | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCHurtMgr.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCHurtMgr.py
index b6503ea..ca14f08 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCHurtMgr.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCHurtMgr.py
@@ -23,12 +23,14 @@
import IPY_GameWorld
import IpyGameDataPY
import PlayerBossReborn
+import PlayerActHorsePetFeast
import ChPyNetSendPack
import NetPackCommon
import ShareDefine
import PlayerTeam
import NPCCommon
import ChConfig
+import GameObj
class HurtValueObj():
@@ -237,7 +239,7 @@
'''第一个可攻击的最大伤血对象
@return: atkPlayer, hurtType, hurtID
'''
-
+ import AttackCommon
atkPlayer, atkHurtType, atkHurtID = None, 0, 0
curNPC = self.curNPC
refreshPoint = curNPC.GetRefreshPosAt(curNPC.GetCurRefreshPointIndex())
@@ -256,11 +258,11 @@
if player == None:
continue
- if player.GetHP() <= 0 or player.GetPlayerAction() == IPY_GameWorld.paDie:
+ if GameObj.GetHP(player) <= 0 or player.GetPlayerAction() == IPY_GameWorld.paDie:
playerDisableReason[playerID] = "dead"
continue
- if not player.GetVisible() or player.GetSightLevel() != curNPC.GetSightLevel():
+ if not player.GetVisible() or not AttackCommon.CheckSightLevel(player, curNPC):
playerDisableReason[playerID] = "no visible or sightLevel different"
continue
@@ -355,6 +357,8 @@
if self.npcID == IpyGameDataPY.GetFuncCfg("BossRebornServerBoss", 3):
PlayerBossReborn.DoBossRebornActionBossOnKilledLogic(self)
+ PlayerActHorsePetFeast.DoActBossOnKilledLogic(self)
+
## 同样榜单逻辑的不同功能奖励处理 ...
return
--
Gitblit v1.8.0