hxp
2020-09-10 7e06869336c92b048f91426af490a1a1399edc1a
8477 【主干】【长尾】【BT】屏蔽个推
7个文件已修改
61 ■■■■ 已修改文件
ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.py 39 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.py 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ServerPython/CoreServerGroup/GameServer/Script/Player/ChPlayer.py 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerTalk.py 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BaseAttack.py 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.py 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.py
@@ -456,7 +456,7 @@
            break
        
        #此处只处理复活的
        PlayerGeTui.GeTuiBossReborn(bossID)
        #PlayerGeTui.GeTuiBossReborn(bossID)
        __SetIsAlive(bossID, 1)
        syncBOSSIDList.append(bossID)
        
@@ -471,24 +471,25 @@
#BOSS个推提前倒计时通知处理,   复活由DoCheckWorldBossReborn处理
def ProcessBossGeTui(tick):
    if not GameWorld.SetWorldDictKey(ChConfig.TYPE_WorldBossGeTuiTick, tick):
        #间隔未到
        return
    if GameWorld.IsCrossServer():
        return
    curTime = int(time.time())
    for bossInfo in PyGameData.g_sortBOSSRefreshList:
        bossID, killedTime, refreshTime = bossInfo
        isAlive = __GetIsAlive(bossID)
        if isAlive:
            #GameWorld.DebugLog("    bossID=%s,未被击杀!" % bossID)
            continue
        rebornSecond = max(0, refreshTime - (curTime - killedTime))
        if not rebornSecond:
            #不处理复活BOSS
            continue
        PlayerGeTui.GeTuiBoss(bossID, rebornSecond)
    return
#    if not GameWorld.SetWorldDictKey(ChConfig.TYPE_WorldBossGeTuiTick, tick):
#        #间隔未到
#        return
#    if GameWorld.IsCrossServer():
#        return
#    curTime = int(time.time())
#    for bossInfo in PyGameData.g_sortBOSSRefreshList:
#        bossID, killedTime, refreshTime = bossInfo
#        isAlive = __GetIsAlive(bossID)
#        if isAlive:
#            #GameWorld.DebugLog("    bossID=%s,未被击杀!" % bossID)
#            continue
#        rebornSecond = max(0, refreshTime - (curTime - killedTime))
#        if not rebornSecond:
#            #不处理复活BOSS
#            continue
#
#        PlayerGeTui.GeTuiBoss(bossID, rebornSecond)
def GetBossIsAliveOrCanReborn(bossID):
ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.py
@@ -164,7 +164,7 @@
    #GameWorld.SendMapServerMsgEx(ShareDefine.Def_Notify_WorldKey_ServerDay, openServerDay)
    #清理过期补偿
    PlayerCompensation.ClearUpTimeOutCompensation()
    PlayerGeTui.ClearFMTGeTuiLimit()
    #PlayerGeTui.ClearFMTGeTuiLimit()
    import PlayerBourse
    PlayerBourse.OverTimeItemsDeal()
    # 仙盟联赛
@@ -296,8 +296,8 @@
    CrossRealmPK.OnPKMatchProcess(tick)
    
    GameWorldBoss.DoCheckWorldBossReborn(tick)
    GameWorldBoss.ProcessBossGeTui(tick)
    PlayerGeTui.ProcessNewGuyCallBackGeTui(tick)
    #GameWorldBoss.ProcessBossGeTui(tick)
    #PlayerGeTui.ProcessNewGuyCallBackGeTui(tick)
    #组队副本版本
    PlayerTeam.DoTeamProcess(tick)
    
ServerPython/CoreServerGroup/GameServer/Script/Player/ChPlayer.py
@@ -178,7 +178,7 @@
        PlayerFamilySWRH.OnLogin(curPlayer)
        PlayerTalk.LoginChatMi(curPlayer)
        PlayerTalk.NotifyTalkCache(curPlayer)
        PlayerGeTui.CleanNewGuyCallBackGeTui(curPlayer.GetID())
        #PlayerGeTui.CleanNewGuyCallBackGeTui(curPlayer.GetID())
        #活动
        GameWorldActionControl.OnPlayerLogin(curPlayer)
        #玩家等级记录
@@ -546,7 +546,7 @@
    PlayerFriend.OnPlayerDisconnect(curPlayer, tick)
    
    __UpdOnedayJobPlayerLoginoffTime(curPlayer)
    PlayerGeTui.NewGuyCallBackGeTui(curPlayer, tick)
    #PlayerGeTui.NewGuyCallBackGeTui(curPlayer, tick)
    # 设置家族成员离线时间
    SetPlayerOfflineTime(curPlayer)
    #拍卖行
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerTalk.py
@@ -147,7 +147,7 @@
                g_ChatMi[tagPlayerID].pop(0)
                return
        
        PlayerGeTui.ChatMiGeTui(tagPlayerID, tagPlayerName, curPlayer.GetName())
        #PlayerGeTui.ChatMiGeTui(tagPlayerID, tagPlayerName, curPlayer.GetName())
# 登录时将离线消息下发
def LoginChatMi(curPlayer):
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BaseAttack.py
@@ -362,7 +362,7 @@
    if GameObj.GetHP(defender) <= 0:
        defender.SetDict(ChConfig.Def_NPCDead_KillerType, attacker.GetGameObjType())
        defender.SetDict(ChConfig.Def_NPCDead_KillerID, attacker.GetID())
        PlayerGeTui.TJGDead(defender, attacker.GetName())
        #PlayerGeTui.TJGDead(defender, attacker.GetName())
        if defender.GetGameObjType() == IPY_GameWorld.gotNPC:
            skillID = 0 if not useSkill else useSkill.GetSkillID()
            # 记录死亡原因
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
@@ -669,7 +669,7 @@
    # 通知脱机挂信息
    PlayerTJG.NotifyTJGInfo(curPlayer)
    # 推送提醒
    PlayerGeTui.LoginNotifySetting(curPlayer)
    #PlayerGeTui.LoginNotifySetting(curPlayer)
    # 极品白拿
    PlayerFreeGoods.OnLogin(curPlayer)
    # BOSS复活活动
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.py
@@ -284,8 +284,8 @@
    ChangeGuard(curPlayer, tick)
    times, finalAddExp = CalcPlayerTJG(curPlayer, tick)
    
    PlayerGeTui.TJGEfficiency(curPlayer, times, finalAddExp)
    PlayerGeTui.TJGTimeLess(curPlayer)
    #PlayerGeTui.TJGEfficiency(curPlayer, times, finalAddExp)
    #PlayerGeTui.TJGTimeLess(curPlayer)
    return
def GetTJGTime(curPlayer): return curPlayer.GetHappyPoint()
@@ -596,7 +596,7 @@
def CheckPackFull(curPlayer):
    if not ItemCommon.CheckPackHasSpace(curPlayer, IPY_GameWorld.rptItem):
        curPlayer.SetDict(ChConfig.Def_PlayerKey_TJGPackFullAfterEat, 1)
        PlayerGeTui.FullPack(curPlayer)
        #PlayerGeTui.FullPack(curPlayer)
# 可执行吞噬操作
def CanEatItemsOper(curPlayer):