From 28389cb71e12d4bec085559355d54dd72ad43e36 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期三, 05 十二月 2018 00:26:32 +0800
Subject: [PATCH] 4999 【后端】【1.3.100】血量百分比不管有没被超过，哪怕一击秒杀也会强制触发，pvp强制触发
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHorse.py | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHorse.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHorse.py
index c11de89..2b1367b 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHorse.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHorse.py
@@ -476,8 +476,9 @@
curPlayer.SetDict(ChConfig.Def_PlayerKey_SpeedHorse, maxSpeed)
# 果实对坐骑的加成, 魂石果实算附加属性层，单独计算
- PlayerAttrFruit.CalcAttrFruitAddAtrr(curPlayer, allAttrListHorseSoul, ShareDefine.Def_AttrFruitFunc_Horse)
-
+ fightPowerEx = PlayerAttrFruit.CalcAttrFruitAddAtrr(curPlayer, allAttrListHorseSoul, ShareDefine.Def_AttrFruitFunc_Horse)
+ curPlayer.SetDict(ChConfig.Def_PlayerKey_MFPEx % ShareDefine.Def_MFPType_HorseSoul, fightPowerEx)
+
#PlayerControl.CalcFuncPackItem(curPlayer, ShareDefine.Def_Pack_Type_HorseSkill, allAttrList)
# 保存计算值
@@ -631,9 +632,10 @@
skillIDList = upIpyData.GetSkillID()
if skillIDList:
+ sysMark = upIpyData.GetSysMark() or 'MountUpLv'
for skillID in skillIDList:
__GiveSkill(curPlayer, skillID, tick)
- PlayerControl.WorldNotify(0, 'MountUpLv', [playerName, horseID, updClassLV, skillID])
+ PlayerControl.WorldNotify(0, sysMark, [playerName, horseID, updClassLV, skillID])
if not skillIDList and updClassLV == maxLV:
PlayerControl.WorldNotify(0, 'MountUpLvMax', [playerName, horseID])
@@ -641,7 +643,7 @@
PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_HorseAllLV, 1, [horseID, updClassLV])
EventShell.EventRespons_HorseLV(curPlayer, updClassLV)
-
+ EventShell.EventRespons_HorseUp(curPlayer)
addLV = updClassLV - horseLV
if addLV:
@@ -682,6 +684,7 @@
#EventReport.WriteEvent_custom_mission_log(curPlayer, ChConfig.CME_Class_Horse, ChConfig.CME_Log_End, 1, cmeInfoEx=str(updateClassLV))
sumLV = GetHorseSumLV(curPlayer)
PlayerMagicWeapon.SetMWPrivilegeData(curPlayer, ChConfig.MWPrivilege_Horse, sumLV)
+
# 刷属性，更新排行榜
RefreshHorseAttr(curPlayer)
# 玩家马匹进阶
@@ -820,7 +823,8 @@
ItemCommon.ReduceItem(curPlayer, itemPack, itemList, needItemCnt, False, ChConfig.ItemDel_Horse)
#设置初始等级
PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_Horser_LV % horseID, ipyData.GetInitLV(), ChConfig.Def_PDictType_Horse)
-
+ for _ in xrange(ipyData.GetInitLV()):
+ EventShell.EventRespons_HorseUp(curPlayer)
# 记录开服活动马匹阶级
sumLV = GetHorseSumLV(curPlayer)
OpenServerCampaign.UpdOpenServerCampaignRecordData(curPlayer, ShareDefine.Def_Campaign_Type_HorseLV, sumLV)
@@ -850,7 +854,8 @@
# 刷属性，更新排行榜
RefreshHorseAttr(curPlayer)
- PlayerControl.WorldNotify(0, 'GetMount', [curPlayer.GetName(), ipyData.GetItemID()])
+ sysMark = ipyData.GetUnlockSys() or 'GetMount'
+ PlayerControl.WorldNotify(0, sysMark, [curPlayer.GetName(), ipyData.GetItemID()])
#
# HorseSkinNotifyDict = ReadChConfig.GetEvalChConfig("HorseSkinNotify")
# if horseSkinID in HorseSkinNotifyDict:
--
Gitblit v1.8.0