hxp
2019-01-24 9499a21f5be1a5b54b457a787c7df618a61d1cdc
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.py
@@ -52,6 +52,7 @@
import PlayerTJG
import AICommon
import PlayerSuccess
import CrossPlayerData
import PassiveBuffEffMng
import PlayerFamilyRedPacket
import FormulaControl
@@ -535,7 +536,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 +562,7 @@
    
    elif prepareState == IPY_GameWorld.pstMissionCollecting:
        #任务采集
        PlayerMissionCollect.EndMissionCollect(curPlayer)
        PlayerMissionCollect.EndMissionCollect(curPlayer, tick)
    elif prepareState == ShareDefine.Def_PstProduce:
        #生产采集(进入生产采集状态,不再重置玩家状态)
@@ -583,6 +584,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
@@ -1072,7 +1111,9 @@
## 装备有效时间到了需要脱下,有效时间物品改成不消失,但是无使用效果 可出售和续费
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
@@ -1233,6 +1274,8 @@
    PlayerFlashSale.ProcessFlashSaleMail(curPlayer, tick)
    #地图经验
    ProcessAreaExp(curPlayer, tick)
    #跨服数据同步,放最后
    CrossPlayerData.ProcessCrossPlayer(curPlayer, tick)
    return
@@ -1502,7 +1545,10 @@
    
def ProcessAreaExp(curPlayer, tick):
    ##给场景经验
    mapID = GameWorld.GetMap().GetMapID()
    if GameWorld.IsCrossServer():
        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: