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,13 +39,14 @@


    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.beforePlayerDataInitializeEventOnRelogin += OnBeforePlayerDataInitialize;

        DTC0102_tagCDBPlayer.beforePlayerDataInitializeEvent += OnBeforePlayerDataInitializeEx;

        DTC0403_tagPlayerLoginLoadOK.playerLoginOkEvent += OnPlayerLoginOk;

        PlayerDatas.Instance.playerDataRefreshEvent += PlayerDataRefreshEvent;

        TimeMgr.Instance.OnHourEvent += UpdateZBGRedpoint;

@@ -53,6 +54,7 @@
    public override void Release()

    {

        DTC0102_tagCDBPlayer.beforePlayerDataInitializeEventOnRelogin -= OnBeforePlayerDataInitialize;

        DTC0102_tagCDBPlayer.beforePlayerDataInitializeEvent -= OnBeforePlayerDataInitializeEx;

        DTC0403_tagPlayerLoginLoadOK.playerLoginOkEvent -= OnPlayerLoginOk;

        PlayerDatas.Instance.playerDataRefreshEvent -= PlayerDataRefreshEvent;

        TimeMgr.Instance.OnHourEvent -= UpdateZBGRedpoint;

@@ -63,6 +65,12 @@
    {

        ClearGuildData();

        donateCntList = null;

    }



    void OnBeforePlayerDataInitializeEx()

    {

        guildChanged = false;

        isQueryZBGYet = false;

    }



    void OnPlayerLoginOk()

@@ -438,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;

        }

@@ -854,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();

@@ -864,6 +876,7 @@
            }

        }





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

        {

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