From f97b6ae94c6acdaacf6adf140416df901d1caf6c Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期一, 15 四月 2019 11:56:41 +0800
Subject: [PATCH] 6515 【测试】【主干】新增游戏警报邮件
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_AllFamilyBoss.py | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_AllFamilyBoss.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_AllFamilyBoss.py
index fb61300..8a91e67 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_AllFamilyBoss.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_AllFamilyBoss.py
@@ -151,10 +151,9 @@
if not hadDelTicket:
FBCommon.SetHadDelTicket(curPlayer)
FBCommon.AddEnterFBCount(curPlayer, ChConfig.Def_FBMapID_AllFamilyBoss, 1)
- if lineID == 0:
- PlayerActivity.AddDailyActionFinishCnt(curPlayer, ShareDefine.DailyActionID_FamilyBoss1, 1)
- else:
- PlayerActivity.AddDailyActionFinishCnt(curPlayer, ShareDefine.DailyActionID_FamilyBoss2, 1)
+
+ PlayerActivity.AddDailyActionFinishCnt(curPlayer, ShareDefine.DailyActionID_FamilyBoss1, 1)
+
if fbStep == FB_Step_Open:
FBCommon.SetFBStep(FB_Step_Fighting, tick)
@@ -517,7 +516,7 @@
lineID = GameWorld.GetGameWorld().GetPropertyID() - 1
bossID = CurFBLineBOSSID(lineID)
msgMark = 'AllianceBossHP1' if lineID == 0 else 'AllianceBossHP2'
- PlayerControl.WorldNotify(0, msgMark, [bossID, remainPer])
+ PlayerControl.WorldNotify(0, msgMark, [bossID, notifyHPPer])
return
@@ -604,7 +603,7 @@
remainHP = GetBossRemainHP(tick)
totalHP = __GetBossTotalHP()
if not totalHP:
- return 0
+ return 100
return remainHP * 100 / totalHP
--
Gitblit v1.8.0