hch
2018-09-20 a6dea7e613db9663d62fac3028bc04842f27282f
Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode
11个文件已修改
32 ■■■■■ 已修改文件
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_DuJie.py 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTalk.py 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_ForbidTalk.py 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_ForbidTalkByIP.py 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_GMTForbidTalk.py 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_GMTUnForbidTalk.py 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_UnForbidTalk.py 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_UnForbidTalkByIP.py 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Tool/VoiceApp/webapp.py 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_DuJie.py
@@ -380,7 +380,8 @@
    lineID = FBCommon.GetFBPropertyMark()
    leaveTick = invadeCfg[Def_Time_Leave] * 1000
    overDict = {FBCommon.Over_costTime:costTime,FBCommon.Over_grade:curStar, FBCommon.Over_leaderID:leaderPlayerID}
    for i in xrange(copyMapPlayerManager.GetPlayerCount()):
    playerCnt = copyMapPlayerManager.GetPlayerCount()
    for i in xrange(playerCnt):
        
        curPlayer = copyMapPlayerManager.GetPlayerByIndex(i)
        
@@ -408,7 +409,8 @@
            if realmIpyData and realmIpyData.GetIsBigRealm():
                #成就
                PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_DujieFBHelpPass, 1)
            if playerCnt > 1: #多人组队渡劫
                EventShell.EventRespons_FBEvent(curPlayer, 'teamdujie')
    
    return
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
@@ -554,7 +554,10 @@
    tjgTime = PlayerTJG.GetTJGTime(curPlayer)
    if tjgTime:
        curPlayer.SendGameServerRefreshState(IPY_GameWorld.CDBPlayerRefresh_HappyPoint, tjgTime)
    # 如果被禁言的,上线同步前端
    if curPlayer.GetGMForbidenTalk():
        curPlayer.SendPropertyRefresh(ShareDefine.CDBPlayerRefresh_ForbidenTalk, curPlayer.GetGMForbidenTalk(), False)
    return
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py
@@ -5524,6 +5524,7 @@
def SetGMForbidenTalk(curPlayer, value):
    curPlayer.SetGMForbidenTalk(value)
    curPlayer.SendGameServerRefreshState(ShareDefine.CDBPlayerRefresh_ForbidenTalk, value)
    curPlayer.SendPropertyRefresh(ShareDefine.CDBPlayerRefresh_ForbidenTalk, value, False)
    return
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTalk.py
@@ -261,7 +261,7 @@
def __CheckTalk(curPlayer, content, length, tick, checkGMForbidenTalk = True, checkSameMsg = True):
    if checkGMForbidenTalk and GetGMToolForbidTalk(curPlayer):
        #GeRen_chenxin_921745 对不起,您已被GM禁言,发送信息失败
        PlayerControl.NotifyCode(curPlayer, "GeRen_chenxin_921745")
        #PlayerControl.NotifyCode(curPlayer, "GeRen_chenxin_921745")
        return False
    
    #间隔时间
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_ForbidTalk.py
@@ -46,7 +46,7 @@
    curFindPlayer_GMOper.Sync_SaveToDB()
    
    PlayerControl.SetGMForbidenTalk(curFindPlayer, 1)
    PlayerControl.NotifyCode(curFindPlayer, "GeRen_chenxin_80731", [lastTime])
    #PlayerControl.NotifyCode(curFindPlayer, "GeRen_chenxin_80731", [lastTime])
    return
#---------------------------------------------------------------------
#执行结果
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_ForbidTalkByIP.py
@@ -42,7 +42,7 @@
    
    #直接禁
    PlayerControl.SetGMForbidenTalk(curFindPlayer, 1)
    PlayerControl.NotifyCode(curFindPlayer , "ForbidIP_Talk" )
    #PlayerControl.NotifyCode(curFindPlayer , "ForbidIP_Talk" )
    return
#---------------------------------------------------------------------
## 执行结果
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_GMTForbidTalk.py
@@ -64,7 +64,7 @@
    curFindPlayer_GMOper.Sync_SaveToDB()
    
    PlayerControl.SetGMForbidenTalk(curFindPlayer, 1)
    PlayerControl.NotifyCode(curFindPlayer, "GeRen_chenxin_80731", [lastTime])
    #PlayerControl.NotifyCode(curFindPlayer, "GeRen_chenxin_80731", [lastTime])
    
    curFindName = curFindPlayer.GetPlayerName()
    #流向
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_GMTUnForbidTalk.py
@@ -61,7 +61,7 @@
            break
    
    PlayerControl.SetGMForbidenTalk(curFindPlayer, 0)
    PlayerControl.NotifyCode(curFindPlayer, "GeRen_liubo_97211")
    #PlayerControl.NotifyCode(curFindPlayer, "GeRen_liubo_97211")
    return ''
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_UnForbidTalk.py
@@ -50,7 +50,7 @@
    
    if result:
        PlayerControl.SetGMForbidenTalk(curFindPlayer, 0)
        PlayerControl.NotifyCode(curFindPlayer, "Player_Operate_RegainTalk")
        #PlayerControl.NotifyCode(curFindPlayer, "Player_Operate_RegainTalk")
    
    return
#---------------------------------------------------------------------
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_UnForbidTalkByIP.py
@@ -40,7 +40,7 @@
    
    #直接禁
    PlayerControl.SetGMForbidenTalk(curFindPlayer, 0)
    PlayerControl.NotifyCode(curFindPlayer , "RestoreIP_Talk" )
    #PlayerControl.NotifyCode(curFindPlayer , "RestoreIP_Talk" )
    return
#---------------------------------------------------------------------
#执行结果
Tool/VoiceApp/webapp.py
@@ -61,8 +61,7 @@
    
    keyStr = '%s_%s'%(playerID, voiceID)
    curTime = int(time.time())
    if not voiceInfoDict:
        voiceInfoDict = shelve.open('voice.db')
    if dotype == 'upload': #存储
        saveData = [curTime, content]
        voiceInfoDict[keyStr] = saveData
@@ -107,8 +106,7 @@
def __DelOldVoice():
    global voiceInfoDict
    if not voiceInfoDict:
        voiceInfoDict = shelve.open('voice.db')
    tick = int(time.time())
    for voiceKey, voiceData in voiceInfoDict.items():
        saveTime = voiceData[0]