From da666f2472eb72d68d2d1cf863a0b1afc9b2fc75 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期三, 17 四月 2019 16:22:34 +0800
Subject: [PATCH] 6539 【前端】【主干】数据事件增加设备信息
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_HorsePetBoss.py | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_HorsePetBoss.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_HorsePetBoss.py
index fd995e3..ae12159 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_HorsePetBoss.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_HorsePetBoss.py
@@ -173,7 +173,7 @@
gameWorld.SetGameWorldDict(FBDict_StartTick % lineID, 0)
gameWorld.SetGameWorldDict(FBDict_Speed % lineID, 0)
gameWorld.SetGameWorldDict(FBDict_RemainHP % lineID, 0)
-
+ PyGameData.g_horsePetBossPlayerHurtDict[lineID] = {}
gameWorld.SetPropertyID(0)
return
@@ -410,6 +410,7 @@
if not ipyDataList:
return auctionItemList, itemList
awardRateList = []
+ awardPieRateDict = {}
for ipyData in ipyDataList:
worldLVList = ipyData.GetWorldLV()
if worldLV < worldLVList[0] or worldLV > worldLVList[1]:
@@ -417,8 +418,9 @@
rankList = ipyData.GetRank()
if rank < rankList[0] or rank > rankList[1]:
continue
- awardRateList = ipyData.GetAward()
- if not awardRateList:
+ awardRateList = ipyData.GetAward1()
+ awardPieRateDict = ipyData.GetAward2()
+ if not awardRateList and not awardPieRateDict:
GameWorld.ErrLog('骑宠Boss奖励表 未配置该奖励 lineID=%s, rank=%s,worldLV=%s' % (lineID, rank, worldLV))
return auctionItemList, itemList
for rate, itemInfo in awardRateList:
@@ -432,6 +434,16 @@
else:
itemList.append(itemInfo)
+ for doCnt, awardPieRateList in awardPieRateDict.items():
+ for _ in xrange(doCnt):
+ resultItem = GameWorld.GetResultByRandomList(awardPieRateList)
+ if len(resultItem) != 3:
+ GameWorld.ErrLog('骑宠Boss奖励表配置错误 itemInfo=%s' % resultItem)
+ continue
+ if resultItem[2]:
+ auctionItemList.append(resultItem)
+ else:
+ itemList.append(resultItem)
return auctionItemList, itemList
@@ -470,7 +482,7 @@
gameFB.SetGameFBDict(FBDict_LastHPNotify, lastIndex + 1)
lineID = GameWorld.GetGameWorld().GetPropertyID() - 1
msgMark = 'QCBOSSHP1'
- PlayerControl.WorldNotify(0, msgMark, [bossID, remainPer])
+ PlayerControl.WorldNotify(0, msgMark, [bossID, notifyHPPer])
return
def UpdateHPReduceSpeed(tick, isExit=False):
@@ -550,7 +562,7 @@
remainHP = GetBossRemainHP(lineID, tick)
totalHP = __GetBossTotalHP(lineID)
if not totalHP:
- return 0
+ return 100
return remainHP * 100 / totalHP
def CurFBLineBOSSID(lineID= -1):
--
Gitblit v1.8.0