66 【公会】基础主体-服务端（退出公会时间根据当前是否互通取对应的本服或跨服时间；）

hxp

1 天以前 c280ced8be799a899efc78b21cc807d435ab6609

 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.py

@@ -807,12 +807,17 @@
            joinCDMinute = joinCDMinuteList[kickedCnt - 1] if len(joinCDMinuteList) >= kickedCnt else joinCDMinuteList[-1]

    if joinCDMinute:

        cdTimes = joinCDMinute * 60

        passTimes = int(time.time()) - leaveFamilyTime

        passTimes = GetFamilyTime() - leaveFamilyTime

        if passTimes < cdTimes:

            GameWorld.DebugLog("加入公会CD中: leaveCnt=%s,kickedCnt=%s,lastVoluntarily=%s,leaveFamilyTime=%s(%s),passTimes=%s < %s" 

                   % (leaveCnt, kickedCnt, lastVoluntarily, leaveFamilyTime, GameWorld.ChangeTimeNumToStr(leaveFamilyTime), passTimes, cdTimes))

            return True

    return False



def GetFamilyTime():

    if GameWorld.IsMainServer() and DBFamily.IsFamilyCross():

        return CrossMgr.GetSSServerMgr().GetCrossTime()

    return int(time.time())



def AutoJoinFamily(crossPlayer):

    if crossPlayer.GetFamilyID():

@@ -1596,13 +1601,19 @@
    if CheckFamilyNameExists(crossPlayer, newName, fromServerID):

        return

    

    zoneMgr = familyMgr.GetZoneFamilyMgrByFamilyID(familyID)

    if not zoneMgr:

        return

    
    if not zoneMgr.FamilyRemainName(family, newName):

        return

    
    if cdHours:

        SetRenameTime(family, curTime)

        
    moneyType, moneyValue = IpyGameDataPY.GetFuncEvalCfg("FamilyRename", 1)

    if moneyType and moneyValue:

        CrossPlayer.CostPlayerResources(crossPlayer, "FamilyRename", costMoneyDict={moneyType:moneyValue})

        
    family.SetName(newName)        
    if cdHours:

        SetRenameTime(family, curTime)

        

    crossPlayerMgr = CrossPlayer.GetCrossPlayerMgr()

    for index in xrange(family.GetCount()):

@@ -2181,7 +2192,7 @@
    curPlayer.SetFamilyActiveValue(0)

    curPlayer.SetLastWeekFamilyActiveValue(0)

    curPlayer.SetFamilyLV(0)

    PlayerControl.SetLeaveFamilyTimeEx(curPlayer, int(time.time()))

    PlayerControl.SetLeaveFamilyTimeEx(curPlayer, GetFamilyTime())

    leaveCnt, kickedCnt, _ = PlayerControl.GetLeaveFamilyInfo(curPlayer)

    GameWorld.DebugLog("__OnLeaveFamily: isVoluntarily=%s,leaveCnt=%s,kickedCnt=%s" % (isVoluntarily, leaveCnt, kickedCnt))

    delMoneyType, delMoneyPer = IpyGameDataPY.GetFuncCfg("FamilyLeave", 3), 0