9341 【BT5】【主干】【后端】情缘系统（增加情缘副本；AB相互提亲优化聘礼ID取较高的; 主干冲突）

hxp

2021-11-24 2b59c17039cf4bcccc79a714f96ffea659a0e730

 ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py

@@ -78,6 +78,7 @@
import GameWorldArena

import GameWorldItem

import PlayerAssist

import PlayerLove



import time

import datetime

@@ -955,6 +956,16 @@
        ret = GameWorldArena.MapServer_Arena(curPlayer, eval(resultName))

        resultName = '%s' % ret if ret != None else '' # 需要重置间隔，每次都回复

        

    # 情缘

    if callName =="Love":

        curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID)

        if not curPlayer:

            return

        ret = PlayerLove.MapServer_Love(curPlayer, eval(resultName))

        if ret == None:

            return

        resultName = '%s' % ret

        
    # 天星塔

    if callName == "SkyTower":

        ret = GameWorldSkyTower.MapServer_SkyTowerInfo(eval(resultName))