Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts

yyl

2026-01-14 1554540dadfe8a948ed1557e4849be7a8a994aef

 Main/System/Guild/GuildManager.cs

@@ -39,20 +39,22 @@


    public byte[] donateCntList;

    public event Action DonateCntListEvent;

    public event Action<bool> EnterOrQuitGuildEvent;   //进入或退出公会事件

    public event Action<bool> EnterOrQuitGuildEvent;   //true进入或false退出公会事件





    public override void Init()

    {

        ParseConfig();

        DTC0102_tagCDBPlayer.beforePlayerDataInitializeEvent += OnBeforePlayerDataInitialize;

        DTC0102_tagCDBPlayer.beforePlayerDataInitializeEventOnRelogin += OnBeforePlayerDataInitialize;

        DTC0102_tagCDBPlayer.beforePlayerDataInitializeEvent += OnBeforePlayerDataInitializeEx;

        DTC0403_tagPlayerLoginLoadOK.playerLoginOkEvent += OnPlayerLoginOk;

        PlayerDatas.Instance.playerDataRefreshEvent += PlayerDataRefreshEvent;

        TimeMgr.Instance.OnHourEvent += UpdateZBGRedpoint;

    }

    public override void Release()

    {

        DTC0102_tagCDBPlayer.beforePlayerDataInitializeEvent -= OnBeforePlayerDataInitialize;

        DTC0102_tagCDBPlayer.beforePlayerDataInitializeEventOnRelogin -= OnBeforePlayerDataInitialize;

        DTC0102_tagCDBPlayer.beforePlayerDataInitializeEvent -= OnBeforePlayerDataInitializeEx;

        DTC0403_tagPlayerLoginLoadOK.playerLoginOkEvent -= OnPlayerLoginOk;

        PlayerDatas.Instance.playerDataRefreshEvent -= PlayerDataRefreshEvent;

        TimeMgr.Instance.OnHourEvent -= UpdateZBGRedpoint;

@@ -62,17 +64,24 @@
    void OnBeforePlayerDataInitialize()

    {

        ClearGuildData();

        donateCntList = null;

    }



    void OnBeforePlayerDataInitializeEx()

    {

        guildChanged = false;

        isQueryZBGYet = false;

    }



    void OnPlayerLoginOk()

    {

        UpdateDonateRedPoint();

        


    }

    


    void PlayerDataRefreshEvent(PlayerDataType type)

    {

        if(type == PlayerDataType.default33)

        if (type == PlayerDataType.default33)

        {

            UpdateDonateRedPoint();

        }

@@ -80,6 +89,7 @@


    void ClearGuildData()

    {

        PlayerDatas.Instance.baseData.FamilyId = 0;

        m_FairyRequesteds.Clear();

        familyActions.Clear();

        guildChanged = false;

@@ -91,7 +101,7 @@
        familyZBGActions.Clear();

        sortPlayerCut.Clear();

    }

    


    //退出公会

    public void AfterQuitGuild()

    {

@@ -105,7 +115,7 @@
        // zhenbaogeCutState = 0;

        // familyZBGActions.Clear();

        // sortPlayerCut.Clear();

        


        UpdateZBGRedpoint();

        UpdateDonateRedPoint();

        EnterOrQuitGuildEvent?.Invoke(false);

@@ -152,7 +162,7 @@
    public int renameFairyNameMoneyType;





    




    //珍宝阁(行商)

    public int zhenbaogeCutState = 0;

@@ -161,7 +171,7 @@
    public event Action UpdateZhenbaogeEvent;

    public bool isQueryZBGYet = false;

    public float lastZBGStartTime = 0; //过天刷新用

    


    //{id:数据} 砍价行为，value1为玩家ID，特殊约定为1时为家族的数据

    public Dictionary<int, HA513_tagMCFamilyActionInfo.tagMCFamilyAction> familyZBGActions = new Dictionary<int, HA513_tagMCFamilyActionInfo.tagMCFamilyAction>();

    public List<int> sortPlayerCut = new List<int>();

@@ -436,9 +446,7 @@
    #region  公会自定义记录

    public void UpdateFamilyAction(HA513_tagMCFamilyActionInfo _package)

    {

        if (PlayerDatas.Instance.fairyData == null ||

            PlayerDatas.Instance.fairyData.fairy == null ||

            PlayerDatas.Instance.fairyData.fairy.FamilyID != _package.FamilyID)

        if (PlayerDatas.Instance.baseData.FamilyId != _package.FamilyID)

        {

            return;

        }

@@ -565,6 +573,21 @@
        GameNetSystem.Instance.SendInfo(pack);

    }



    public void SendFindGuildNoDecrypt(string msg, int pageIndex = 0, int pageSize = 20)

    {

        if (pageIndex == 0)

        {

            //默认查询第一页即代表重新开始查询，清空之前的数据

            guildsDict.Clear();

            pageIndexList.Clear();

        }

        var pack = new CA620_tagCMViewFamilyPage();

        pack.Msg = msg;

        pack.MsgLen = (byte)msg.Length;

        pack.PageIndex = (byte)pageIndex;

        pack.ShowCount = (byte)pageSize;

        GameNetSystem.Instance.SendInfo(pack);

    }



    public static void SetFairyViewData(FairyData data, HA523_tagMCFamilyViewList.tagMCFamilyView view)

    {

@@ -802,7 +825,7 @@
    #endregion



    #region 珍宝阁

        




    public void UpdateZhenbaogeInfo(HA512_tagMCFamilyZhenbaogeInfo netPack)

    {

@@ -837,8 +860,14 @@
            return false;

        }

        bool restart = false;

        if (vNetData.FamilyActionList.Length == 1 && vNetData.FamilyActionList[0].Value1 == 1)

        
        for (int i = 0; i < vNetData.FamilyActionList.Length; i++)

        {

            int playerID = (int)vNetData.FamilyActionList[i].Value1;

            if (playerID != 1)

            {

                continue;

            }

            if (familyZBGActions.ContainsKey(1) && familyZBGActions[1].Time != vNetData.FamilyActionList[0].Time)

            {

                familyZBGActions.Clear();

@@ -846,6 +875,7 @@
                restart = true;

            }

        }





        for (int i = 0; i < vNetData.FamilyActionList.Length; i++)

        {

@@ -911,7 +941,7 @@
    }





    public Dictionary <int, FairyMember> tmpNoCutMembers = new Dictionary<int, FairyMember>();

    public Dictionary<int, FairyMember> tmpNoCutMembers = new Dictionary<int, FairyMember>();



    //未议价成员

    public void CalcNoCutMembers()

@@ -923,7 +953,7 @@
            return;

        }



        foreach(var playerID in fairy.memberIDList)

        foreach (var playerID in fairy.memberIDList)

        {

            if (!familyZBGActions.ContainsKey(playerID))

            {

@@ -936,7 +966,7 @@




    #region 红点

    


    Redpoint donateRedpoint = new Redpoint(MainRedDot.guildHallRedpointID, MainRedDot.donateRedpointID);

    //珍宝阁(行商)

    Redpoint zbgRedpoint = new Redpoint(MainRedDot.MainGuildRedpoint, MainRedDot.hawkerRedpointID);

@@ -970,7 +1000,7 @@
            }

        }

    }

    


    public void UpdateZBGRedpoint()

    {

        zbgRedpoint.state = RedPointState.None;