hxp
2022-03-30 abfb87afcf590170481eb42de60a27dd04afd921
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerLove.py
@@ -778,6 +778,10 @@
    tagPlayerID = dataMsg[0]
    playerID = curPlayer.GetPlayerID()
    
    if not PlayerControl.GetDBPlayerAccIDByID(tagPlayerID):
        PlayerControl.NotifyCode(curPlayer, "NoInDBPlayer")
        return
    # 黑名单检查
    if PyDataManager.GetBlacklistManager().CheckBlacklistBoth(playerID, tagPlayerID, curPlayer):
        return
@@ -796,8 +800,8 @@
    if not ipyData:
        return
    
    addCharmSelf = ipyData.GetAddCharmSelf() * giftCount
    addCharmTag = ipyData.GetAddCharmTag() * giftCount
    addCharmSelf = int(ipyData.GetAddCharmSelf() * giftCount)
    addCharmTag = int(ipyData.GetAddCharmTag() * giftCount)
    addIntimacy = ipyData.GetAddIntimacy() * giftCount
    worldNotifyKey = ipyData.GetWorldNotifyKey()
    
@@ -857,6 +861,10 @@
    
    playerID = curPlayer.GetPlayerID()
    
    if not PlayerControl.GetDBPlayerAccIDByID(tagPlayerID):
        PlayerControl.NotifyCode(curPlayer, "NoInDBPlayer")
        return
    # 黑名单检查
    if PyDataManager.GetBlacklistManager().CheckBlacklistBoth(playerID, tagPlayerID, curPlayer):
        return
@@ -910,6 +918,10 @@
            GameWorld.Log("已成亲伴侣ID不一致,无法提亲! tagPlayerID(%s) != coupleID(%s)" % (tagPlayerID, coupleID), playerID)
            return
        
        if couple.GetBreakRequestID():
            PlayerControl.NotifyCode(curPlayer, "LimitByMarryBroke") # 和离中无法操作
            return
        ipyData = IpyGameDataPY.GetIpyGameData("Marry", bridePriceID)
        if not ipyData:
            return