From 9a2fd2a8b061b3c876be62d397b939daccaeb69a Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 26 三月 2019 11:51:30 +0800
Subject: [PATCH] 3138 【主干】【BUG】拍卖行获得仙玉数值错误(最少收税1) 其他bug： 1. 修复一组拍品个数大于1时无法竞价、一口价的bug 2. 修复竞价后短时间内无法再竞价的bug，会提示有人正在竞价中（正常会提示该情况的一般只有两个人同时点击竞价的时候有可能出现）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.py | 191 +++++++++++++++++++++++++++++++++--------------
1 files changed, 135 insertions(+), 56 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.py
index 99e49a4..00d8e46 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.py
@@ -52,8 +52,9 @@
import PlayerTJG
import AICommon
import PlayerSuccess
+import CrossPlayerData
import PassiveBuffEffMng
-import PlayerFamilyRedPacket
+import FunctionNPCCommon
import FormulaControl
import PlayerGoldGift
import PlayerFlashSale
@@ -136,7 +137,9 @@
if not __DoClientUseSkillEx(curPlayer, useSkillData, tick):
SkillShell.AttackFailNotify(curPlayer, useSkillData)
GameWorld.DebugLog("----攻击失败 可能是技能CD %s"%skillTypeID)
-
+ # 根据策划需求 以客户端动作为标准，不可攻击状态也进入CD
+ BaseAttack.Sync_AttackResult(curPlayer, useSkillData)
+
if useSkillData and useSkillData.GetSkillID() != ChConfig.Def_SkillID_Somersault:
# 跟随玩家同频率攻击
PetControl.PetFight(curPlayer, tick)
@@ -535,7 +538,7 @@
if tick - curPlayer.GetPlayerActionTick() < curPlayer.GetPrepareTime():
#时间间隔没有到
if prepareState in [IPY_GameWorld.pstCollecting, IPY_GameWorld.pstMissionCollecting]:
- FBLogic.OnCollecting(curPlayer, tick)
+ OnCollecting(curPlayer, tick)
return
@@ -561,7 +564,7 @@
elif prepareState == IPY_GameWorld.pstMissionCollecting:
#任务采集
- PlayerMissionCollect.EndMissionCollect(curPlayer)
+ PlayerMissionCollect.EndMissionCollect(curPlayer, tick)
elif prepareState == ShareDefine.Def_PstProduce:
#生产采集（进入生产采集状态，不再重置玩家状态）
@@ -583,6 +586,44 @@
#重置玩家状态
curPlayer.SetPrepareState(0) # 成功
PlayerControl.ChangePlayerAction(curPlayer, IPY_GameWorld.paNull)
+ return
+
+def OnCollecting(curPlayer, tick):
+ ## 采集中逻辑
+ tagObj = curPlayer.GetActionObj()
+ if not tagObj:
+ return
+ if tagObj.GetGameObjType() != IPY_GameWorld.gotNPC:
+ return
+ curNPC = GameWorld.GetNPCManager().GetNPCByIndex(tagObj.GetIndex())
+ if not curNPC:
+ return
+ FBLogic.OnCollecting(curPlayer, tick)
+ npcID = curNPC.GetNPCID()
+ collectNPCIpyData = IpyGameDataPY.GetIpyGameData("CollectNPC", npcID)
+ if collectNPCIpyData:
+ DoCollectingLostHP(curPlayer, collectNPCIpyData, tick, False)
+ return
+
+def DoCollectingLostHP(curPlayer, collectNPCIpyData, tick, isEnd):
+ ## 执行采集掉血
+ if not collectNPCIpyData.GetLostHPPer():
+ return
+ lostSecond, lostHPPer = collectNPCIpyData.GetLostHPPer()
+ lastTick = curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_CollectLostHPTick)
+ lostTime = (tick - lastTick) / (lostSecond * 1000.0) # 掉血次数
+ if isEnd:
+ lostTime = int(round(lostTime)) # 采集完的时候四舍五入
+ else:
+ lostTime = int(lostTime)
+ if lostTime < 1:
+ return
+
+ curPlayer.SetDict(ChConfig.Def_PlayerKey_CollectLostHPTick, tick)
+ lostValue = int(GameObj.GetMaxHP(curPlayer) * lostHPPer / 100.0) * lostTime
+ skillTypeID, buffOwner = 0, None
+ SkillCommon.SkillLostHP(curPlayer, skillTypeID, buffOwner, lostValue, tick)
+ GameWorld.DebugLog("采集掉血: npcID=%s,lostHPPer=%s,lostTime=%s,lostValue=%s" % (collectNPCIpyData.GetNPCID(), lostHPPer, lostTime, lostValue))
return
@@ -1038,41 +1079,45 @@
# @return 布尔值
# @remarks 处理耐久计算方式为:现实时间刷新方式的物品
def ProcessTimeEquip(curPlayer, tick):
- itemManager = curPlayer.GetItemManager()
- hasItemClear = False
-
- curPack = itemManager.GetPack(IPY_GameWorld.rptEquip)
- for i in range(0, curPack.GetCount()):
- curItem = curPack.GetAt(i)
-
- #异常物品
- if not ItemCommon.CheckItemCanUse(curItem):
- continue
-
- if curItem.GetEndureReduceType() not in [ChConfig.Def_EquipReduceType_RTimeItem,
- ChConfig.Def_EquipReduceType_Time]:
- continue
-
- #处理现实时间物品逻辑
- if __DoLogic_ProcessTimeEquip(curPlayer, curItem, i):
- hasItemClear = True
-
-
- if hasItemClear:
- #装备重刷属性
- PlayerWing.CalcWingAttr(curPlayer)
- ChEquip.RefreshPlayerEquipAttribute(curPlayer)
-
-
- # 进行更新时效道具刷新时间
- curPlayer.SetDict(ChConfig.Def_PlayerKey_EquipTime, tick)
-
- return hasItemClear
+ return
+#境界装备修改，暂屏蔽，待优化
+# itemManager = curPlayer.GetItemManager()
+# hasItemClear = False
+#
+# curPack = itemManager.GetPack(IPY_GameWorld.rptEquip)
+# for i in range(0, curPack.GetCount()):
+# curItem = curPack.GetAt(i)
+#
+# #异常物品
+# if not ItemCommon.CheckItemCanUse(curItem):
+# continue
+#
+# if curItem.GetEndureReduceType() not in [ChConfig.Def_EquipReduceType_RTimeItem,
+# ChConfig.Def_EquipReduceType_Time]:
+# continue
+#
+# #处理现实时间物品逻辑
+# if __DoLogic_ProcessTimeEquip(curPlayer, curItem, i):
+# hasItemClear = True
+#
+#
+# if hasItemClear:
+# #装备重刷属性
+# PlayerWing.CalcWingAttr(curPlayer)
+# ChEquip.RefreshPlayerEquipAttribute(curPlayer)
+#
+#
+# # 进行更新时效道具刷新时间
+# curPlayer.SetDict(ChConfig.Def_PlayerKey_EquipTime, tick)
+#
+# return hasItemClear
#---------------------------------------------------------------------
## 装备有效时间到了需要脱下，有效时间物品改成不消失，但是无使用效果 可出售和续费
def __DoLogic_ProcessTimeEquip(curPlayer, curItem, equipIndex):
#验证物品是否过期
- curItemExpireTime = curItem.GetExpireTime()
+ curItemExpireTime = curItem.GetUserAttr(ShareDefine.Def_IudetExpireTime)
+ if not curItemExpireTime:
+ curItemExpireTime = curItem.GetExpireTime()
curItemPastTime = time.time() - curItem.GetUserAttr(ShareDefine.Def_IudetCreateTime)
if curItemExpireTime - curItemPastTime > 0:
return
@@ -1089,7 +1134,7 @@
return True
equipID = result[0]
equipPlace = result[1]
- if equipPlace == ShareDefine.retGuard:
+ if equipPlace in [ShareDefine.retGuard1, ShareDefine.retGuard2]:
PlayerControl.NotifyCode(curPlayer, 'Guardian_Timeout', [equipID, spaceIndex])
elif equipPlace == ShareDefine.retWing:
PlayerControl.NotifyCode(curPlayer, 'WingTiyan_Timeout')
@@ -1102,9 +1147,6 @@
PlayerControl.NotifyCode(curPlayer, 'FirstGoldWPOver')
PlayerGoldGift.FirstGoldTryItemOutTime(curPlayer)
- # 广播卸装
- if equipIndex in ChConfig.Def_SyncEquipStateByIndex:
- curPlayer.Sync_UnEquipItem(equipID, equipPlace)
return True
#---------------------------------------------------------------------
##全局定时器调用, 刷新玩家状态
@@ -1228,11 +1270,15 @@
#成就
PlayerSuccess.FinishDelayAddSuccessProgress(curPlayer, tick, False)
#开服红包处理
- PlayerFamilyRedPacket.ProcessOSRedPacket(curPlayer, tick)
+ #PlayerFamilyRedPacket.ProcessOSRedPacket(curPlayer, tick)
#限时抢购
PlayerFlashSale.ProcessFlashSaleMail(curPlayer, tick)
#地图经验
ProcessAreaExp(curPlayer, tick)
+ #神秘商店刷新
+ FunctionNPCCommon.CheckMysticalShopRefresh(curPlayer, tick)
+ #跨服数据同步，放最后
+ CrossPlayerData.ProcessCrossPlayer(curPlayer, tick)
return
@@ -1447,22 +1493,50 @@
#GameWorld.DebugLog("退出Boss状态!", curPlayer.GetPlayerID())
# 脱离PK战斗 X秒后按比例恢复
- if not IsInPKState(curPlayer):
- if tick - curPlayer.GetDictByKey("StartProDTick") < IpyGameDataPY.GetFuncCfg("MagicExterior", 2) * 1000:
- return
-
- if curPlayer.GetPlayerAction() == IPY_GameWorld.paDie:
- return
-
- # 每秒恢复
- if tick - curPlayer.GetDictByKey("restoreProDTick") < 1000:
- return
- #非PK状态恢复护盾
- PlayerControl.SetProDef(curPlayer, min(PlayerControl.GetProDef(curPlayer) + \
- IpyGameDataPY.GetFuncCfg("MagicExterior", 3)*PlayerControl.GetMaxProDef(curPlayer)/ChConfig.Def_MaxRateValue, \
- PlayerControl.GetMaxProDef(curPlayer)))
- curPlayer.SetDict("restoreProDTick", tick)
+ ProcessProDef(curPlayer, tick)
return
+
+def Sync_PKBossState(curPlayer):
+ psState = 1 if curPlayer.GetDictByKey(ChConfig.Def_PDict_PKStateTick) else 0
+ curPlayer.SendPropertyRefresh(ShareDefine.CDBPlayerRefresh_PKState, psState, False)
+
+ bossState = 1 if curPlayer.GetDictByKey(ChConfig.Def_PDict_BossStateTick) else 0
+ curPlayer.SendPropertyRefresh(ShareDefine.CDBPlayerRefresh_BossState, bossState, False)
+ return
+
+# 脱离PK战斗 X秒后按比例恢复
+def ProcessProDef(curPlayer, tick):
+ if PlayerControl.GetProDefHPPer(curPlayer) == 0:
+ # 没转化值
+ return
+
+ # 脱离PK战斗 X秒后按比例恢复
+ if IsInPKState(curPlayer):
+ return
+
+ if tick - curPlayer.GetDictByKey("StartProDTick") < IpyGameDataPY.GetFuncCfg("MagicExterior", 2) * 1000:
+ return
+
+ if curPlayer.GetPlayerAction() == IPY_GameWorld.paDie:
+ return
+
+ # 每秒恢复
+ if tick - curPlayer.GetDictByKey("restoreProDTick") < 1000:
+ return
+
+ curProDef = PlayerControl.GetProDef(curPlayer)
+ maxProDef = PlayerControl.GetMaxProDef(curPlayer)
+
+ if curProDef == maxProDef:
+ return
+
+ #非PK状态恢复护盾
+ PlayerControl.SetProDef(curPlayer, min(curProDef + \
+ IpyGameDataPY.GetFuncCfg("MagicExterior", 3)*maxProDef/ChConfig.Def_MaxRateValue, maxProDef))
+ curPlayer.SetDict("restoreProDTick", tick)
+
+ return
+
def IsInPKState(curPlayer): return curPlayer.GetDictByKey(ChConfig.Def_PDict_PKStateTick) > 0
def SetPKStateTick(curPlayer, tick):
@@ -1482,7 +1556,12 @@
def ProcessAreaExp(curPlayer, tick):
##给场景经验
- mapID = GameWorld.GetMap().GetMapID()
+ if GameWorld.IsCrossServer():
+ return
+ if curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_ClientCustomScene):
+ return
+ crossMapID = PlayerControl.GetCrossMapID(curPlayer)
+ mapID = crossMapID if crossMapID else GameWorld.GetMap().GetMapID()
neutralMapExpAwardDict = IpyGameDataPY.GetFuncEvalCfg('NeutralMapExpAward', 1, {})
expAwardInfo = GameWorld.GetDictValueByKey(neutralMapExpAwardDict, mapID)
if not expAwardInfo:
--
Gitblit v1.8.0