8691 【主干】GM后台增加流向查询（上架拍品增加记录流向类型）；

hxp

2021-01-16 4e1ba1b146b389e6bb0fdf84ed09c751688b43a9

8691 【主干】GM后台增加流向查询（上架拍品增加记录流向类型）；

# Conflicts:
#	ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerAuctionHouse.py

 ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossBoss.py

@@ -393,7 +393,7 @@
        for playerID in killerIDList:

            killer = GameWorld.GetPlayerManager().FindPlayerByID(playerID)

            if not killer:

                GameWorld.ErrLog("击杀跨服boss时主服玩家不在线, playerID=%s,mapID=%s,bossID=%s" % (playerID, mapID, bossID))

                #GameWorld.ErrLog("击杀跨服boss时主服玩家不在线, playerID=%s,mapID=%s,bossID=%s" % (playerID, mapID, bossID))

                #DataRecordPack.SendEventPack("CrossBoss_Error", {"PlayerID":playerID, "Error":"MainServerOffline"})

                killTime = int(time.time())

                PyGameData.g_unNotifyKillCrossBossDict[playerID] = [killTime, mapID, bossID]


 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py

@@ -5000,7 +5000,8 @@
ItemDel_LingQiEquipBreak, # 灵器突破 40

ItemDel_HorsePetAwake, # 骑宠觉醒 

ItemDel_ActivityPlace, # 活跃放置

) = range(2000, 2000 + 43)

ItemDel_AuctionHouse, # 拍卖

) = range(2000, 2000 + 44)



# 物品扣除类型对应信息 {类型:eventName, ...}

ItemDelTypeDict = {

@@ -5047,6 +5048,7 @@
                   ItemDel_LingQiEquipBreak:"LingQiEquipBreak",

                   ItemDel_HorsePetAwake:"HorsePetAwake",

                   ItemDel_ActivityPlace:"ActivityPlace",

                   ItemDel_AuctionHouse:"AuctionHouse",

                   }



##==================================================================================================