hch
2018-10-09 c17e896c0b62d32bf99775b18db07d3ec4252aed
4102 【后端】混服支持
12个文件已修改
521 ■■■■ 已修改文件
ServerPython/CoreServerGroup/GameServer/Script/EventReport.py 48 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ServerPython/CoreServerGroup/GameServer/Script/GameWorld.py 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.py 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerGeTui.py 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/EventReport.py 434 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.py 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.py 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerDienstgrad.py 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFlashGiftbag.py 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGeTui.py 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerNewGuyCard.py 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerViewCacheTube.py 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ServerPython/CoreServerGroup/GameServer/Script/EventReport.py
@@ -105,7 +105,7 @@
        #                  "IP": curPlayer.GetIP(),
        #                  "Level": curPlayer.GetLV()}) 
        #=======================================================================
        OperatorID = GameWorld.GetPlayerPlatform(curPlayer.GetAccID())
        OperatorID = GameWorld.GetPlayerPlatform(curPlayer)
        RegionName = GameWorld.GetPlayerServerSID(curPlayer)
        
    else:
@@ -334,28 +334,30 @@
def WriteEvent_chat_log(curPlayer, content, cmc_name, tagName="", addinfo=""):
    return
    '''
    @todo: 写聊天监控记录
    @param content: 聊天内容
    @param cmc_name: 聊天频道标识
    @param tagName: 私聊对象
    @param addinfo: 额外信息
    '''
    chatlogEvent = chat_log()
    chatlogEvent.SetEventAgentInfo(GameWorld.GetPlayerPlatform(curPlayer.GetAccID()))
    chatlogEvent.account_id = GameWorld.GetPlatformAccID(curPlayer.GetAccID())
    chatlogEvent.chr_name = curPlayer.GetName()
    chatlogEvent.content = __GetEventChatContent(content)
    chatlogEvent.cmc_name = cmc_name
    chatlogEvent.ip = curPlayer.GetIP()
    chatlogEvent.account_name = chatlogEvent.account_id
    chatlogEvent.account_type = 0
    chatlogEvent.chr_level = 0
    chatlogEvent.object = tagName
    chatlogEvent.addinfo = addinfo
    WriteEvent(chatlogEvent)
    return
    #===========================================================================
    # '''
    # @todo: 写聊天监控记录
    # @param content: 聊天内容
    # @param cmc_name: 聊天频道标识
    # @param tagName: 私聊对象
    # @param addinfo: 额外信息
    # '''
    #
    # chatlogEvent = chat_log()
    # chatlogEvent.SetEventAgentInfo(GameWorld.GetPlayerPlatform(curPlayer))
    # chatlogEvent.account_id = GameWorld.GetPlatformAccID(curPlayer.GetAccID())
    # chatlogEvent.chr_name = curPlayer.GetName()
    # chatlogEvent.content = __GetEventChatContent(content)
    # chatlogEvent.cmc_name = cmc_name
    # chatlogEvent.ip = curPlayer.GetIP()
    # chatlogEvent.account_name = chatlogEvent.account_id
    # chatlogEvent.account_type = 0
    # chatlogEvent.chr_level = 0
    # chatlogEvent.object = tagName
    # chatlogEvent.addinfo = addinfo
    # WriteEvent(chatlogEvent)
    # return
    #===========================================================================
def __GetEventChatContent(content):
    '''
ServerPython/CoreServerGroup/GameServer/Script/GameWorld.py
@@ -483,9 +483,8 @@
    return GetServerID()
##获取玩家所属平台
def GetPlayerPlatform(gameAccID):
    infoList = gameAccID.split(Def_AccID_Split_Sign)
    return "" if len(infoList) < 3 else infoList[-2]
def GetPlayerPlatform(curPlayer):
    return curPlayer.GetAccountInfo().GetOperator()
##获取平台账号
def GetPlatformAccID(gameAccID):
ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.py
@@ -578,7 +578,7 @@
            tjgOnlineCnt += 1
            continue
        
        platform = GameWorld.GetPlayerPlatform(player.GetAccID())
        platform = GameWorld.GetPlayerPlatform(player)
        platformOLDict[platform] = platformOLDict.get(platform, 0) + 1 # 累计平台在线人数
        
#        mapID = player.GetMapID()
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerGeTui.py
@@ -281,7 +281,7 @@
            # 判断BOSS剩余次数, 避免通知频繁
            continue
        
        appID = GameWorld.GetPlayerPlatform(cacheDict.get("AccID", ""))
        appID = GameWorld.GetPlayerPlatform(cacheDict.get("AppID", ""))
        if appID not in appIDDict:
            appIDDict[appID] = []
            
@@ -314,7 +314,7 @@
        return
    
    showStr = GameWorld.GbkToCode(IpyGameDataPY.GetFuncCfg("GeTuiOffLine", 3))%(tagPlayerName)    # 文字信息
    GeTuiNotify({GameWorld.GetPlayerPlatform(cacheDict.get("AccID", "")):[[cacheDict.get("GeTuiClientID", ""), playerName]]}, showStr)
    GeTuiNotify({GameWorld.GetPlayerPlatform(cacheDict.get("AppID", "")):[[cacheDict.get("GeTuiClientID", ""), playerName]]}, showStr)
    return
# 下线时,低级玩家没有离线时间的玩家提示, 上线清空
@@ -326,7 +326,7 @@
        return
    playerID = curPlayer.GetID()
    g_NewGuyNoTJGTime[playerID] = [curPlayer.GetName(), curPlayer.GetGeTuiClientID(), tick, 
                                   GameWorld.GetPlayerPlatform(curPlayer.GetAccID())]  # curPlayer.GetGeTuiClientID()
                                   GameWorld.GetPlayerPlatform(curPlayer)]  # curPlayer.GetGeTuiClientID()
    return
# 上线清除
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/EventReport.py
@@ -124,7 +124,7 @@
                          "IP": curPlayer.GetIP(),
                          "Level": curPlayer.GetLV()}) 
        
        OperatorID = GameWorld.GetPlayerPlatform(curPlayer.GetAccID())
        OperatorID = GameWorld.GetPlayerPlatform(curPlayer)
        RegionName = GameWorld.GetPlayerServerSID(curPlayer)
        
    else:
@@ -798,26 +798,28 @@
def WriteEvent_chat_log(curPlayer, content, cmc_name, tagName="", addinfo=""):
    return
    '''
    @todo: 写聊天监控记录
    @param content: 聊天内容
    @param cmc_name: 聊天频道标识
    @param tagName: 私聊对象
    @param addinfo: 额外信息
    '''
    chatlogEvent = chat_log()
    chatlogEvent.SetEventAgentInfo(GameWorld.GetPlayerPlatform(curPlayer.GetAccID()))
    chatlogEvent.account_id = GameWorld.GetPlatformAccID(curPlayer.GetAccID())
    chatlogEvent.chr_name = curPlayer.GetName()
    chatlogEvent.content = __GetEventChatContent(content)
    chatlogEvent.cmc_name = cmc_name
    chatlogEvent.ip = curPlayer.GetIP()
    chatlogEvent.account_name = chatlogEvent.account_id
    chatlogEvent.account_type = GameWorld.GetAccountType(curPlayer)
    chatlogEvent.chr_level = GetScribeEvent_chr_level(curPlayer)
    chatlogEvent.object = tagName
    chatlogEvent.addinfo = addinfo
    WriteEvent(chatlogEvent)
    #===========================================================================
    # '''
    # @todo: 写聊天监控记录
    # @param content: 聊天内容
    # @param cmc_name: 聊天频道标识
    # @param tagName: 私聊对象
    # @param addinfo: 额外信息
    # '''
    # chatlogEvent = chat_log()
    # chatlogEvent.SetEventAgentInfo(GameWorld.GetPlayerPlatform(curPlayer.GetAccID()))
    # chatlogEvent.account_id = GameWorld.GetPlatformAccID(curPlayer.GetAccID())
    # chatlogEvent.chr_name = curPlayer.GetName()
    # chatlogEvent.content = __GetEventChatContent(content)
    # chatlogEvent.cmc_name = cmc_name
    # chatlogEvent.ip = curPlayer.GetIP()
    # chatlogEvent.account_name = chatlogEvent.account_id
    # chatlogEvent.account_type = GameWorld.GetAccountType(curPlayer)
    # chatlogEvent.chr_level = GetScribeEvent_chr_level(curPlayer)
    # chatlogEvent.object = tagName
    # chatlogEvent.addinfo = addinfo
    # WriteEvent(chatlogEvent)
    #===========================================================================
    return
def __GetEventChatContent(content):
@@ -853,19 +855,21 @@
#  @param event_name: 事件名称
#  @param comments: 备注或附加信息
def WriteEvent_custom_events(curPlayer, event_name, comments):
    customEvent = custom_events()
    customEvent.SetEventAgentInfo(GameWorld.GetPlayerPlatform(curPlayer.GetAccID()))
    customEvent.account_id = GameWorld.GetPlatformAccID(curPlayer.GetAccID())
    customEvent.event_name = event_name
    customEvent.session_id = GameWorld.GetSessionID(curPlayer)
    customEvent.ip = curPlayer.GetIP()
    customEvent.account_name = customEvent.account_id
    customEvent.account_type = GameWorld.GetAccountType(curPlayer)
    customEvent.chr_name = curPlayer.GetPlayerName()
    customEvent.chr_level = GetScribeEvent_chr_level(curPlayer)
    customEvent.comments = CommFunc.GetStrCutoff(comments, 255)
    WriteEvent(customEvent)
    #===========================================================================
    # customEvent = custom_events()
    # customEvent.SetEventAgentInfo(GameWorld.GetPlayerPlatform(curPlayer.GetAccID()))
    # customEvent.account_id = GameWorld.GetPlatformAccID(curPlayer.GetAccID())
    # customEvent.event_name = event_name
    # customEvent.session_id = GameWorld.GetSessionID(curPlayer)
    #
    # customEvent.ip = curPlayer.GetIP()
    # customEvent.account_name = customEvent.account_id
    # customEvent.account_type = GameWorld.GetAccountType(curPlayer)
    # customEvent.chr_name = curPlayer.GetPlayerName()
    # customEvent.chr_level = GetScribeEvent_chr_level(curPlayer)
    # customEvent.comments = CommFunc.GetStrCutoff(comments, 255)
    # WriteEvent(customEvent)
    #===========================================================================
    return
#// A1 01 玩家电脑信息 #tagCMPCInfo
@@ -979,16 +983,18 @@
    
def WriteEvent_horse_class(curPlayer, befClassLV, befExp, costCnt, aftClassLV, aftExp):
    ## 写坐骑进阶记录
    horseClass = horse_class()
    horseClass.SetEventAgentInfo(GameWorld.GetPlayerPlatform(curPlayer.GetAccID()))
    horseClass.account_id = GameWorld.GetPlatformAccID(curPlayer.GetAccID())
    horseClass.chr_name = curPlayer.GetPlayerName()
    horseClass.bef_class_lv = befClassLV
    horseClass.bef_exp = befExp
    horseClass.cost_item_cnt = costCnt
    horseClass.aft_class_lv = aftClassLV
    horseClass.aft_exp = aftExp
    WriteEvent(horseClass)
    #===========================================================================
    # horseClass = horse_class()
    # horseClass.SetEventAgentInfo(GameWorld.GetPlayerPlatform(curPlayer.GetAccID()))
    # horseClass.account_id = GameWorld.GetPlatformAccID(curPlayer.GetAccID())
    # horseClass.chr_name = curPlayer.GetPlayerName()
    # horseClass.bef_class_lv = befClassLV
    # horseClass.bef_exp = befExp
    # horseClass.cost_item_cnt = costCnt
    # horseClass.aft_class_lv = aftClassLV
    # horseClass.aft_exp = aftExp
    # WriteEvent(horseClass)
    #===========================================================================
    return
class wing_class(ScribeEvent):
@@ -1023,16 +1029,18 @@
    
def WriteEvent_wing_class(curPlayer, befClassLV, befExp, costCnt, aftClassLV, aftExp):
    ## 写翅膀进阶记录
    wingClass = wing_class()
    wingClass.SetEventAgentInfo(GameWorld.GetPlayerPlatform(curPlayer.GetAccID()))
    wingClass.account_id = GameWorld.GetPlatformAccID(curPlayer.GetAccID())
    wingClass.chr_name = curPlayer.GetPlayerName()
    wingClass.bef_class_lv = befClassLV
    wingClass.bef_exp = befExp
    wingClass.cost_item_cnt = costCnt
    wingClass.aft_class_lv = aftClassLV
    wingClass.aft_exp = aftExp
    WriteEvent(wingClass)
    #===========================================================================
    # wingClass = wing_class()
    # wingClass.SetEventAgentInfo(GameWorld.GetPlayerPlatform(curPlayer.GetAccID()))
    # wingClass.account_id = GameWorld.GetPlatformAccID(curPlayer.GetAccID())
    # wingClass.chr_name = curPlayer.GetPlayerName()
    # wingClass.bef_class_lv = befClassLV
    # wingClass.bef_exp = befExp
    # wingClass.cost_item_cnt = costCnt
    # wingClass.aft_class_lv = aftClassLV
    # wingClass.aft_exp = aftExp
    # WriteEvent(wingClass)
    #===========================================================================
    return
class pet_lv(ScribeEvent):
@@ -1064,15 +1072,17 @@
    
def WriteEvent_pet_lv(curPlayer, befLV, aftLV, befExp, aftExp):
    ## 写宠物升级记录
    petLV = pet_lv()
    petLV.SetEventAgentInfo(GameWorld.GetPlayerPlatform(curPlayer.GetAccID()))
    petLV.account_id = GameWorld.GetPlatformAccID(curPlayer.GetAccID())
    petLV.chr_name = curPlayer.GetPlayerName()
    petLV.bef_lv = befLV
    petLV.aft_lv = aftLV
    petLV.bef_exp = befExp
    petLV.aft_exp = aftExp
    WriteEvent(petLV)
    #===========================================================================
    # petLV = pet_lv()
    # petLV.SetEventAgentInfo(GameWorld.GetPlayerPlatform(curPlayer.GetAccID()))
    # petLV.account_id = GameWorld.GetPlatformAccID(curPlayer.GetAccID())
    # petLV.chr_name = curPlayer.GetPlayerName()
    # petLV.bef_lv = befLV
    # petLV.aft_lv = aftLV
    # petLV.bef_exp = befExp
    # petLV.aft_exp = aftExp
    # WriteEvent(petLV)
    #===========================================================================
    return
class pet_class(ScribeEvent):
@@ -1107,16 +1117,18 @@
    
def WriteEvent_pet_class(curPlayer, petName, befClassLV, befExp, aftClassLV, aftExp):
    ## 写宠物进阶记录
    petLV = pet_class()
    petLV.SetEventAgentInfo(GameWorld.GetPlayerPlatform(curPlayer.GetAccID()))
    petLV.account_id = GameWorld.GetPlatformAccID(curPlayer.GetAccID())
    petLV.chr_name = curPlayer.GetPlayerName()
    petLV.pet_name = petName
    petLV.bef_class_lv = befClassLV
    petLV.bef_exp = befExp
    petLV.aft_class_lv = aftClassLV
    petLV.aft_exp = aftExp
    WriteEvent(petLV)
    #===========================================================================
    # petLV = pet_class()
    # petLV.SetEventAgentInfo(GameWorld.GetPlayerPlatform(curPlayer.GetAccID()))
    # petLV.account_id = GameWorld.GetPlatformAccID(curPlayer.GetAccID())
    # petLV.chr_name = curPlayer.GetPlayerName()
    # petLV.pet_name = petName
    # petLV.bef_class_lv = befClassLV
    # petLV.bef_exp = befExp
    # petLV.aft_class_lv = aftClassLV
    # petLV.aft_exp = aftExp
    # WriteEvent(petLV)
    #===========================================================================
    return
class give_money(ScribeEvent):
@@ -1149,15 +1161,17 @@
    
def WriteEvent_give_money(curPlayer, source, typeName, addMoney, totalMoney):
    ## 写货币产出记录
    giveMoney = give_money()
    giveMoney.SetEventAgentInfo(GameWorld.GetPlayerPlatform(curPlayer.GetAccID()))
    giveMoney.account_id = GameWorld.GetPlatformAccID(curPlayer.GetAccID())
    giveMoney.chr_name = curPlayer.GetPlayerName()
    giveMoney.source = source
    giveMoney.type_name = typeName
    giveMoney.addMoney = addMoney
    giveMoney.total_money = totalMoney
    WriteEvent(giveMoney)
    #===========================================================================
    # giveMoney = give_money()
    # giveMoney.SetEventAgentInfo(GameWorld.GetPlayerPlatform(curPlayer.GetAccID()))
    # giveMoney.account_id = GameWorld.GetPlatformAccID(curPlayer.GetAccID())
    # giveMoney.chr_name = curPlayer.GetPlayerName()
    # giveMoney.source = source
    # giveMoney.type_name = typeName
    # giveMoney.addMoney = addMoney
    # giveMoney.total_money = totalMoney
    # WriteEvent(giveMoney)
    #===========================================================================
    return
class pay_money(ScribeEvent):
@@ -1190,15 +1204,17 @@
    
def WriteEvent_pay_money(curPlayer, reasonName, typeName, costMoney, totalMoney):
    ## 写货币消耗记录
    payMoney = pay_money()
    payMoney.SetEventAgentInfo(GameWorld.GetPlayerPlatform(curPlayer.GetAccID()))
    payMoney.account_id = GameWorld.GetPlatformAccID(curPlayer.GetAccID())
    payMoney.chr_name = curPlayer.GetPlayerName()
    payMoney.reason_name = reasonName
    payMoney.type_name = typeName
    payMoney.costmoney = costMoney
    payMoney.total_money = totalMoney
    WriteEvent(payMoney)
    #===========================================================================
    # payMoney = pay_money()
    # payMoney.SetEventAgentInfo(GameWorld.GetPlayerPlatform(curPlayer.GetAccID()))
    # payMoney.account_id = GameWorld.GetPlatformAccID(curPlayer.GetAccID())
    # payMoney.chr_name = curPlayer.GetPlayerName()
    # payMoney.reason_name = reasonName
    # payMoney.type_name = typeName
    # payMoney.costmoney = costMoney
    # payMoney.total_money = totalMoney
    # WriteEvent(payMoney)
    #===========================================================================
    return
class equip_item(ScribeEvent):
@@ -1230,14 +1246,16 @@
    
def WriteEvent_orange_equip(curPlayer, place, classLV, quality):
    ## 写玩家装备统计
    equipItem = equip_item()
    equipItem.SetEventAgentInfo(GameWorld.GetPlayerPlatform(curPlayer.GetAccID()))
    equipItem.account_id = GameWorld.GetPlatformAccID(curPlayer.GetAccID())
    equipItem.chr_name = curPlayer.GetPlayerName()
    equipItem.equip_place = place
    equipItem.class_lv = classLV
    equipItem.item_quality = quality
    WriteEvent(equipItem)
    #===========================================================================
    # equipItem = equip_item()
    # equipItem.SetEventAgentInfo(GameWorld.GetPlayerPlatform(curPlayer.GetAccID()))
    # equipItem.account_id = GameWorld.GetPlatformAccID(curPlayer.GetAccID())
    # equipItem.chr_name = curPlayer.GetPlayerName()
    # equipItem.equip_place = place
    # equipItem.class_lv = classLV
    # equipItem.item_quality = quality
    # WriteEvent(equipItem)
    #===========================================================================
    return
class item_record(ScribeEvent):
@@ -1325,17 +1343,19 @@
   
def WriteEvent_coin_to_gold(curPlayer, orderID, eventName, coin, prizeCoin, addGold):
    return
    coinToGold = coin_to_gold()
    coinToGold.SetEventAgentInfo(GameWorld.GetPlayerPlatform(curPlayer.GetAccID()))
    coinToGold.account_id = GameWorld.GetPlatformAccID(curPlayer.GetAccID())
    coinToGold.chr_name = curPlayer.GetPlayerName()
    coinToGold.order_id = orderID
    coinToGold.event_name = eventName
    coinToGold.coin = coin
    coinToGold.coin_prize = prizeCoin
    coinToGold.gold = addGold
    coinToGold.total_gold = curPlayer.GetGold()
    WriteEvent(coinToGold)
    #===========================================================================
    # coinToGold = coin_to_gold()
    # coinToGold.SetEventAgentInfo(GameWorld.GetPlayerPlatform(curPlayer.GetAccID()))
    # coinToGold.account_id = GameWorld.GetPlatformAccID(curPlayer.GetAccID())
    # coinToGold.chr_name = curPlayer.GetPlayerName()
    # coinToGold.order_id = orderID
    # coinToGold.event_name = eventName
    # coinToGold.coin = coin
    # coinToGold.coin_prize = prizeCoin
    # coinToGold.gold = addGold
    # coinToGold.total_gold = curPlayer.GetGold()
    # WriteEvent(coinToGold)
    #===========================================================================
    return
class god_weapon_lv(ScribeEvent):
@@ -1371,17 +1391,19 @@
    
def WriteEvent_god_weapon_lv(curPlayer, godWeaponName, befLV, befExp, costCnt, aftLV, aftExp):
    ## 写神兵升级记录
    godWeaponLV = god_weapon_lv()
    godWeaponLV.SetEventAgentInfo(GameWorld.GetPlayerPlatform(curPlayer.GetAccID()))
    godWeaponLV.account_id = GameWorld.GetPlatformAccID(curPlayer.GetAccID())
    godWeaponLV.chr_name = curPlayer.GetPlayerName()
    godWeaponLV.god_weapon_name = godWeaponName
    godWeaponLV.bef_lv = befLV
    godWeaponLV.bef_exp = befExp
    godWeaponLV.cost_item_cnt = costCnt
    godWeaponLV.aft_lv = aftLV
    godWeaponLV.aft_exp = aftExp
    WriteEvent(godWeaponLV)
    #===========================================================================
    # godWeaponLV = god_weapon_lv()
    # godWeaponLV.SetEventAgentInfo(GameWorld.GetPlayerPlatform(curPlayer.GetAccID()))
    # godWeaponLV.account_id = GameWorld.GetPlatformAccID(curPlayer.GetAccID())
    # godWeaponLV.chr_name = curPlayer.GetPlayerName()
    # godWeaponLV.god_weapon_name = godWeaponName
    # godWeaponLV.bef_lv = befLV
    # godWeaponLV.bef_exp = befExp
    # godWeaponLV.cost_item_cnt = costCnt
    # godWeaponLV.aft_lv = aftLV
    # godWeaponLV.aft_exp = aftExp
    # WriteEvent(godWeaponLV)
    #===========================================================================
    return
class rune_lv(ScribeEvent):
@@ -1414,15 +1436,17 @@
    
def WriteEvent_rune_lv(curPlayer, runeName, costruneMoney, aftLV, aftruneMoney):
    ## 写符印升级记录
    runeLV = rune_lv()
    runeLV.SetEventAgentInfo(GameWorld.GetPlayerPlatform(curPlayer.GetAccID()))
    runeLV.account_id = GameWorld.GetPlatformAccID(curPlayer.GetAccID())
    runeLV.chr_name = curPlayer.GetPlayerName()
    runeLV.rune_name = runeName
    runeLV.cost_rune_money = costruneMoney
    runeLV.aft_lv = aftLV
    runeLV.aft_rune_money = aftruneMoney
    WriteEvent(runeLV)
    #===========================================================================
    # runeLV = rune_lv()
    # runeLV.SetEventAgentInfo(GameWorld.GetPlayerPlatform(curPlayer.GetAccID()))
    # runeLV.account_id = GameWorld.GetPlatformAccID(curPlayer.GetAccID())
    # runeLV.chr_name = curPlayer.GetPlayerName()
    # runeLV.rune_name = runeName
    # runeLV.cost_rune_money = costruneMoney
    # runeLV.aft_lv = aftLV
    # runeLV.aft_rune_money = aftruneMoney
    # WriteEvent(runeLV)
    #===========================================================================
    return
class change_name(ScribeEvent):
@@ -1452,13 +1476,15 @@
    
def WriteEvent_change_name(curPlayer, oldName, newName):
    ## 改名记录
    changeName = change_name()
    changeName.SetEventAgentInfo(GameWorld.GetPlayerPlatform(curPlayer.GetAccID()))
    changeName.account_id = GameWorld.GetPlatformAccID(curPlayer.GetAccID())
    changeName.chr_name = curPlayer.GetPlayerName()
    changeName.old_name = oldName
    changeName.new_name = newName
    WriteEvent(changeName)
    #===========================================================================
    # changeName = change_name()
    # changeName.SetEventAgentInfo(GameWorld.GetPlayerPlatform(curPlayer.GetAccID()))
    # changeName.account_id = GameWorld.GetPlatformAccID(curPlayer.GetAccID())
    # changeName.chr_name = curPlayer.GetPlayerName()
    # changeName.old_name = oldName
    # changeName.new_name = newName
    # WriteEvent(changeName)
    #===========================================================================
    return
class add_zhenqi(ScribeEvent):
@@ -1491,20 +1517,22 @@
    
def WriteEvent_add_zhenqi(curPlayer, eventName, eventData, addValue, totalValue):
    ## 真气产出记录
    if eventData:
        eventData = str(eventData)
        eventData = eventData.replace("\"", "'")
        eventData = eventData.replace(",", "|")
    addZhenQi = add_zhenqi()
    addZhenQi.SetEventAgentInfo(GameWorld.GetPlayerPlatform(curPlayer.GetAccID()))
    addZhenQi.account_id = GameWorld.GetPlatformAccID(curPlayer.GetAccID())
    addZhenQi.chr_name = curPlayer.GetPlayerName()
    addZhenQi.eventName = eventName
    addZhenQi.eventData = eventData
    addZhenQi.addValue = addValue
    addZhenQi.totalValue = totalValue
    WriteEvent(addZhenQi)
    #===========================================================================
    # if eventData:
    #    eventData = str(eventData)
    #    eventData = eventData.replace("\"", "'")
    #    eventData = eventData.replace(",", "|")
    #
    # addZhenQi = add_zhenqi()
    # addZhenQi.SetEventAgentInfo(GameWorld.GetPlayerPlatform(curPlayer.GetAccID()))
    # addZhenQi.account_id = GameWorld.GetPlatformAccID(curPlayer.GetAccID())
    # addZhenQi.chr_name = curPlayer.GetPlayerName()
    # addZhenQi.eventName = eventName
    # addZhenQi.eventData = eventData
    # addZhenQi.addValue = addValue
    # addZhenQi.totalValue = totalValue
    # WriteEvent(addZhenQi)
    #===========================================================================
    return
class lost_zhenqi(ScribeEvent):
@@ -1537,20 +1565,22 @@
    
def WriteEvent_lost_zhenqi(curPlayer, eventName, eventData, lostValue, totalValue):
    ## 真气消耗记录
    if eventData:
        eventData = str(eventData)
        eventData = eventData.replace("\"", "'")
        eventData = eventData.replace(",", "|")
    lostZhenQi = lost_zhenqi()
    lostZhenQi.SetEventAgentInfo(GameWorld.GetPlayerPlatform(curPlayer.GetAccID()))
    lostZhenQi.account_id = GameWorld.GetPlatformAccID(curPlayer.GetAccID())
    lostZhenQi.chr_name = curPlayer.GetPlayerName()
    lostZhenQi.eventName = eventName
    lostZhenQi.eventData = eventData
    lostZhenQi.lostValue = lostValue
    lostZhenQi.totalValue = totalValue
    WriteEvent(lostZhenQi)
    #===========================================================================
    # if eventData:
    #    eventData = str(eventData)
    #    eventData = eventData.replace("\"", "'")
    #    eventData = eventData.replace(",", "|")
    #
    # lostZhenQi = lost_zhenqi()
    # lostZhenQi.SetEventAgentInfo(GameWorld.GetPlayerPlatform(curPlayer.GetAccID()))
    # lostZhenQi.account_id = GameWorld.GetPlatformAccID(curPlayer.GetAccID())
    # lostZhenQi.chr_name = curPlayer.GetPlayerName()
    # lostZhenQi.eventName = eventName
    # lostZhenQi.eventData = eventData
    # lostZhenQi.lostValue = lostValue
    # lostZhenQi.totalValue = totalValue
    # WriteEvent(lostZhenQi)
    #===========================================================================
    return
class coat_lv(ScribeEvent):
@@ -1585,18 +1615,20 @@
def WriteEvent_coat_lv(curPlayer, coatName, befLV, befExp, costItemCnt, aftLV, aftExp):
    return
    ## 写时装升级记录
    coatLV = coat_lv()
    coatLV.SetEventAgentInfo(GameWorld.GetPlayerPlatform(curPlayer.GetAccID()))
    coatLV.account_id = GameWorld.GetPlatformAccID(curPlayer.GetAccID())
    coatLV.chr_name = curPlayer.GetPlayerName()
    coatLV.coat_name = coatName
    coatLV.bef_lv = befLV
    coatLV.bef_exp = befExp
    coatLV.cost_item_cnt = costItemCnt
    coatLV.aft_lv = aftLV
    coatLV.aft_exp = aftExp
    WriteEvent(coatLV)
    return
    #===========================================================================
    # coatLV = coat_lv()
    # coatLV.SetEventAgentInfo(GameWorld.GetPlayerPlatform(curPlayer.GetAccID()))
    # coatLV.account_id = GameWorld.GetPlatformAccID(curPlayer.GetAccID())
    # coatLV.chr_name = curPlayer.GetPlayerName()
    # coatLV.coat_name = coatName
    # coatLV.bef_lv = befLV
    # coatLV.bef_exp = befExp
    # coatLV.cost_item_cnt = costItemCnt
    # coatLV.aft_lv = aftLV
    # coatLV.aft_exp = aftExp
    # WriteEvent(coatLV)
    #===========================================================================
class wingskin_lv(ScribeEvent):
@@ -1630,17 +1662,19 @@
    
def WriteEvent_wingskin_lv(curPlayer, skinName, befLV, befExp, costItemCnt, aftLV, aftExp):
    ## 写幻化翅膀升级记录
    wingskinLV = wingskin_lv()
    wingskinLV.SetEventAgentInfo(GameWorld.GetPlayerPlatform(curPlayer.GetAccID()))
    wingskinLV.account_id = GameWorld.GetPlatformAccID(curPlayer.GetAccID())
    wingskinLV.chr_name = curPlayer.GetPlayerName()
    wingskinLV.skin_name = skinName
    wingskinLV.bef_lv = befLV
    wingskinLV.bef_exp = befExp
    wingskinLV.cost_item_cnt = costItemCnt
    wingskinLV.aft_lv = aftLV
    wingskinLV.aft_exp = aftExp
    WriteEvent(wingskinLV)
    #===========================================================================
    # wingskinLV = wingskin_lv()
    # wingskinLV.SetEventAgentInfo(GameWorld.GetPlayerPlatform(curPlayer.GetAccID()))
    # wingskinLV.account_id = GameWorld.GetPlatformAccID(curPlayer.GetAccID())
    # wingskinLV.chr_name = curPlayer.GetPlayerName()
    # wingskinLV.skin_name = skinName
    # wingskinLV.bef_lv = befLV
    # wingskinLV.bef_exp = befExp
    # wingskinLV.cost_item_cnt = costItemCnt
    # wingskinLV.aft_lv = aftLV
    # wingskinLV.aft_exp = aftExp
    # WriteEvent(wingskinLV)
    #===========================================================================
    return
@@ -1675,17 +1709,19 @@
    
def WriteEvent_horseskin_lv(curPlayer, skinName, befLV, befExp, costItemCnt, aftLV, aftExp):
    ## 写幻化坐骑升级记录
    horseSkinLV = horseskin_lv()
    horseSkinLV.SetEventAgentInfo(GameWorld.GetPlayerPlatform(curPlayer.GetAccID()))
    horseSkinLV.account_id = GameWorld.GetPlatformAccID(curPlayer.GetAccID())
    horseSkinLV.chr_name = curPlayer.GetPlayerName()
    horseSkinLV.skin_name = skinName
    horseSkinLV.bef_lv = befLV
    horseSkinLV.bef_exp = befExp
    horseSkinLV.cost_item_cnt = costItemCnt
    horseSkinLV.aft_lv = aftLV
    horseSkinLV.aft_exp = aftExp
    WriteEvent(horseSkinLV)
    #===========================================================================
    # horseSkinLV = horseskin_lv()
    # horseSkinLV.SetEventAgentInfo(GameWorld.GetPlayerPlatform(curPlayer.GetAccID()))
    # horseSkinLV.account_id = GameWorld.GetPlatformAccID(curPlayer.GetAccID())
    # horseSkinLV.chr_name = curPlayer.GetPlayerName()
    # horseSkinLV.skin_name = skinName
    # horseSkinLV.bef_lv = befLV
    # horseSkinLV.bef_exp = befExp
    # horseSkinLV.cost_item_cnt = costItemCnt
    # horseSkinLV.aft_lv = aftLV
    # horseSkinLV.aft_exp = aftExp
    # WriteEvent(horseSkinLV)
    #===========================================================================
    return
## ---------------------------------------------------------------------------------------
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.py
@@ -1087,9 +1087,8 @@
    return GetServerID()
##获取玩家所属平台
def GetPlayerPlatform(gameAccID):
    infoList = gameAccID.split(Def_AccID_Split_Sign)
    return "" if len(infoList) < 3 else infoList[-2]
def GetPlayerPlatform(curPlayer):
    return curPlayer.GetAccountData().GetOperator()
##获取平台账号
def GetPlatformAccID(gameAccID):
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.py
@@ -124,7 +124,7 @@
    isAddBourseMoney = chargeInfo.GetIsAddBourseMoney()
    appID = chargeInfo.GetAppID()
    if not appID:
        appID = GameWorld.GetPlayerPlatform(curPlayer.GetAccID())
        appID = GameWorld.GetPlayerPlatform(curPlayer)
    addDRDict = {"orderCoin":orderCoin, "orderInfo":orderInfo, "orderID":orderID, 
                 "isAddBourseMoney":isAddBourseMoney, "eventName":eventName, "appID":appID}
    
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerDienstgrad.py
@@ -506,7 +506,7 @@
#  @return None
def GiveFirstLoginDienstgrad(curPlayer):
    dienstgradIDDict = ReadChConfig.GetEvalChConfig('FirstLogin_GiveDienstgrad')
    platFormName = GameWorld.GetPlayerPlatform(curPlayer.GetAccID())
    platFormName = GameWorld.GetPlayerPlatform(curPlayer)
    dienstgradIDList = dienstgradIDDict.get(platFormName)
    if not dienstgradIDList: #未配置的平台默认取key为0的内容
        dienstgradIDList = dienstgradIDDict.get(0, [])
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFlashGiftbag.py
@@ -165,7 +165,7 @@
                                             event=[ChConfig.ItemGive_CTG, True, addDRDict])
    
    # 取玩家APPID,混服使用
    appID = GameWorld.GetPlayerPlatform(curPlayer.GetAccID())
    appID = GameWorld.GetPlayerPlatform(curPlayer)
    notifyKey = giftbagIpyData.GetNotifyKey()
    if notifyKey:
        orderIpyData = GetFlashGiftbagIDOrderInfoIpyData(giftbagID, appID)
@@ -235,7 +235,7 @@
        return
    
    # 取玩家APPID,混服使用
    appID = GameWorld.GetPlayerPlatform(curPlayer.GetAccID())
    appID = GameWorld.GetPlayerPlatform(curPlayer)
    
    openServerDay = GameWorld.GetGameWorld().GetGameWorldDictByKey(ShareDefine.Def_Notify_WorldKey_ServerDay) + 1
    packInfo = ChPyNetSendPack.tagMCFlashGiftbagInfo()
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGeTui.py
@@ -231,7 +231,7 @@
        return
    
    showStr = GameWorld.GbkToCode(IpyGameDataPY.GetFuncCfg("GeTuiTJG", 4))    # 文字信息
    GeTuiNotify({GameWorld.GetPlayerPlatform(curPlayer.GetAccID()) :[[GetGeTuiClientID(curPlayer), curPlayer.GetName()]]}, showStr)
    GeTuiNotify({GameWorld.GetPlayerPlatform(curPlayer) :[[GetGeTuiClientID(curPlayer), curPlayer.GetName()]]}, showStr)
    return
@@ -269,7 +269,7 @@
    
    tjgTime = PlayerTJG.GetTJGTime(curPlayer)
    
    GeTuiNotify({GameWorld.GetPlayerPlatform(curPlayer.GetAccID()) : [[GetGeTuiClientID(curPlayer), curPlayer.GetName()]]},
    GeTuiNotify({GameWorld.GetPlayerPlatform(curPlayer) : [[GetGeTuiClientID(curPlayer), curPlayer.GetName()]]},
                GameWorld.GbkToCode(showStr%(expStr, tjgTime/60/60, tjgTime/60%60)))
    return
@@ -286,7 +286,7 @@
    showStr = GameWorld.GbkToCode(IpyGameDataPY.GetFuncCfg("GeTuiTJG", 2))    # 文字信息
    tjgTime = PlayerTJG.GetTJGTime(curPlayer)
    
    GeTuiNotify({GameWorld.GetPlayerPlatform(curPlayer.GetAccID()) : [[GetGeTuiClientID(curPlayer), curPlayer.GetName()]]},
    GeTuiNotify({GameWorld.GetPlayerPlatform(curPlayer) : [[GetGeTuiClientID(curPlayer), curPlayer.GetName()]]},
                showStr%(tagName, tjgTime/60/60, tjgTime/60%60))
    return
@@ -303,7 +303,7 @@
        return
    
    showStr = GameWorld.GbkToCode(IpyGameDataPY.GetFuncCfg("GeTuiTJG", 3))    # 文字信息
    GeTuiNotify({GameWorld.GetPlayerPlatform(curPlayer.GetAccID()) : [[GetGeTuiClientID(curPlayer), curPlayer.GetName()]]}, showStr)
    GeTuiNotify({GameWorld.GetPlayerPlatform(curPlayer) : [[GetGeTuiClientID(curPlayer), curPlayer.GetName()]]}, showStr)
    
    
    
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerNewGuyCard.py
@@ -256,7 +256,7 @@
#  @return 序号
def CheckMarkIdCardRule(curPlayer, cardCode):
    idName = curPlayer.GetAccID()
    platform = GameWorld.GetPlayerPlatform(idName)
    platform = GameWorld.GetPlayerPlatform(curPlayer)
    platFormIdName = GameWorld.GetPlatformAccID(idName)
    markIdCardData = ReadChConfig.GetEvalChConfig("IDMarkCardData")
    for cardIndex, cardInfo in markIdCardData.items():
@@ -505,7 +505,7 @@
        PlayerControl.NotifyCode(curPlayer, "GeRen_admin_327925")
        return
    
    platform = GameWorld.GetPlayerPlatform(curPlayer.GetAccID())
    platform = GameWorld.GetPlayerPlatform(curPlayer)
    MediaCardDict = ReadChConfig.GetEvalChConfig("MediaCard")
    commMediaCardDict, platformMediaCardDict = MediaCardDict
    
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerViewCacheTube.py
@@ -94,6 +94,7 @@
    curPlayerPropDict["FamilyID"] = curPlayer.GetFamilyID()
    curPlayerPropDict["FamilyName"] = curPlayer.GetFamilyName()
    curPlayerPropDict["FightPower"] = curPlayer.GetFightPower()
    curPlayerPropDict["AppID"] = GameWorld.GetPlayerPlatform(curPlayer)
    #仙魔之争所需属性
    curPlayerPropDict["MinAtk"] = curPlayer.GetMinAtk()
    curPlayerPropDict["MaxAtk"] = curPlayer.GetMaxAtk()