Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode

hxp

2019-03-13 d3bf825fd42fb9327cd653331342fceb938147b8

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

@@ -55,7 +55,7 @@
#import PlayerFamilyTech

import PlayerFamilyRedPacket

import PlayerFBHelpBattle

import PlayerFamilyStore

#import PlayerFamilyStore

import PlayerFamilySWRH

import GameWorldProcess

import PlayerLVAward

@@ -851,6 +851,10 @@
    if callName =="AddBossRebornPoint":

        GameWorldBoss.AddBossRebornPoint(eval(resultName))

        return

    #多仙盟BOSS结束

    if callName =="AllFamilyBossOver":

        PlayerFamilyBoss.AllFamilyBossKilled()

        return

    

#---return分割线-----------------------------------------------------------------



@@ -921,12 +925,12 @@
            return

        resultName = '%s' % ret

        

    # 战盟仓库

    if callName == "FamilyStore":

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

        if not curPlayer:

            return

        resultName = '%s' % PlayerFamilyStore.DoMapServerFamilyStore(curPlayer, eval(resultName), tick)

#    # 战盟仓库

#    if callName == "FamilyStore":

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

#        if not curPlayer:

#            return

#        resultName = '%s' % PlayerFamilyStore.DoMapServerFamilyStore(curPlayer, eval(resultName), tick)

    

    # 自定义商店物品

    if callName == "ShopItem":