fix:更改仙盟职位增加是否GM操作判断

xdh

2018-09-07 0dc164f22556cbc0f404b03a0e9dab7b90a2d57b

 ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamily.py

@@ -38,6 +38,8 @@
import PlayerCompensation

import PlayerFamilyParty

import PlayerFamilySWRH

import PlayerViewCache

import GameWorldBoss

import PlayerTalk



import copy

@@ -663,6 +665,47 @@
    NetPackCommon.SendFakePack(curPlayer, familyViewPack)

    return



#// A4 12 搜索家族 #tagCGPySearchFamily

#

#struct    tagCGPySearchFamily

#{

#    tagHead        Head;

#    BYTE        MsgLen;        //模糊搜索家族，如果输入为空，则为不限制该条件

#    char        Msg[MsgLen];    //size = MsgLen

#    BYTE        LV;        //最低家族等级,如果为0，则不限制该条件

#    BYTE        MaxCount;    //搜索结果所需最大条数，后端限制最多返回20条

#    BYTE        IsSearching;    //默认1，如果有指定其他值，则返回指定值

#};

def PySearchFamily(index, clientData, tick):

    curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)

    
    msg = clientData.Msg

    minFamilyLV = clientData.LV

    maxCount = min(20, clientData.MaxCount)

    IsSearching = clientData.IsSearching

    
    familyMgr = GameWorld.GetFamilyManager()

    familyViewPack = ChPyNetSendPack.tagGCPyAllFamilyView()

    familyViewPack.Clear()

    familyViewPack.IsSearching = IsSearching

    familyViewPack.TotalCount = 1

    #familyViewPack.CurPage = viewPage

    familyViewPack.Family = []

    for i, familyID in enumerate(PyGameData.g_sortFamilyIDList):

        family = familyMgr.FindFamily(familyID)

        if not family:

            continue

        if msg not in family.GetName():

            continue

        if minFamilyLV and family.GetLV() < minFamilyLV:

            continue

        familyViewPack.Family.append(__GetFamilyView(i, family))

        if len(familyViewPack.Family) >= maxCount:

            break

    familyViewPack.PageCount = len(familyViewPack.Family)

    NetPackCommon.SendFakePack(curPlayer, familyViewPack)

    return



#class   IPY_CFamilyChangeBroadcast

#{

#public:

@@ -1151,10 +1194,11 @@
    if pack_FamilyLv not in ChConfig.Def_Family_MemberLVList:

        GameWorld.Log("更改家族成员等级->封包异常->等级 = %s不存在" % (pack_FamilyLv), curPlayerID)

        return

    if curMember.GetFamilyLV() != IPY_GameServer.fmlLeader:

        if tagMember.GetFamilyLV() >= curMember.GetFamilyLV() or pack_FamilyLv >= curMember.GetFamilyLV():

            GameWorld.Log("更改家族成员等级->目标职位比自己的高或者对方的当前职位比自己高", curPlayerID)

            return

    if not isGMOP:

        if curMember.GetFamilyLV() != IPY_GameServer.fmlLeader:

            if tagMember.GetFamilyLV() >= curMember.GetFamilyLV() or pack_FamilyLv >= curMember.GetFamilyLV():

                GameWorld.Log("更改家族成员等级->目标职位比自己的高或者对方的当前职位比自己高", curPlayerID)

                return

    

    familyID = curFamily.GetID()  # 家族ID

    familyName = curFamily.GetName()  # 家族名字

@@ -1362,6 +1406,10 @@
        PlayerControl.NotifyCode(curPlayer, "DungeonGuardSkyText2")

        return

    

    if GameWorld.GetGameWorld().GetDictByKey(ShareDefine.Def_Notify_WorldKey_DailyActionState % ShareDefine.DailyActionID_FamilyRobBoss):        
        PlayerControl.NotifyCode(curPlayer, "FairyGrabBossExitError")

        return

    
    tagPlayerName = curTagMember.GetName()  # 被踢玩家名

    tagPlayerID = curTagMember.GetPlayerID()  # 被踢玩家ID

    tagFamilyLV = curTagMember.GetFamilyLV()  # 被踢玩家职位

@@ -1436,6 +1484,11 @@
    if PlayerFamilySWRH.IsInFamilySWRH():

        PlayerControl.NotifyCode(curPlayer, "DungeonGuardSkyText1")

        return

    
    if GameWorld.GetGameWorld().GetDictByKey(ShareDefine.Def_Notify_WorldKey_DailyActionState % ShareDefine.DailyActionID_FamilyRobBoss):        
        PlayerControl.NotifyCode(curPlayer, "FairyGrabBossExitError")

        return

    
    #XW_JZ_LeaveFamily   <n color="0,190,255">{%S1%}</n><n color="255,255,0">退出了家族！</n>  25  -   -

    NotifyAllFamilyMemberMsg(curFamily, curPlayer, "XW_JZ_LeaveFamily", [curPlayer.GetName()])

    

@@ -1470,6 +1523,7 @@
    # 玩家战盟名变更处理

    __OnFamilyNameChange(leavePlayerID, '')

    AddFamilyIDToFightPowerChangeList(curFamily.GetID())

    PlayerViewCache.OnPlayerLeaveFamily(leavePlayerID)

    return



#//////////////////////////////////////////////////////////////

@@ -2452,13 +2506,13 @@
            

        familyMoney = family.GetMoney()

        

        useMoney = GetFamilySetting(family, ChConfig.Def_FamilySetting_SystemLostMoney)

        
        #家族资金不足, 解散

        if familyMoney < useMoney:

            family.SetMoney(0)

            delFamilyList.append(family)

            continue

#        useMoney = GetFamilySetting(family, ChConfig.Def_FamilySetting_SystemLostMoney)

#        
#        #家族资金不足, 解散

#        if familyMoney < useMoney:

#            family.SetMoney(0)

#            delFamilyList.append(family)

#            continue

        #多久没人上线，解散

        offlineDay = GetLastOnlineMemberOfflineTime(family)

        GameWorld.DebugLog('    仙盟%s %s天没人上线了'%(family.GetID(), offlineDay))

@@ -2474,10 +2528,10 @@
                                                   ChConfig.Def_Family_ClearRequestAddNote_Day)

        

        #此处不通知地图服务器家族资金变更

        family.SetMoney(familyMoney - useMoney)

        if useMoney > 0:

            #帮会日常维持消耗{%S1%}银两帮会资金

            PlayerControl.FamilyNotify(family.GetID(), 'jiazu_lhs_272921', [useMoney])

#        family.SetMoney(familyMoney - useMoney)

#        if useMoney > 0:

#            #帮会日常维持消耗{%S1%}银两帮会资金

#            PlayerControl.FamilyNotify(family.GetID(), 'jiazu_lhs_272921', [useMoney])

        #自动传位

        __AutoChangeLeader(family)