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

yyl

2026-01-22 f451fbfbd49717de57628a878e4500e50b38e5fc

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

 Main/System/Guild/GuildBaseWin.cs

@@ -67,6 +67,8 @@
    {
        if (PlayerDatas.Instance.fairyData.fairy == null)
            return;
            
        GuildManager.Instance.RequestGuildData();
        GlobalTimeEvent.Instance.secondEvent += OnSecondEvent;
        GlobalTimeEvent.Instance.fiveSecondEvent += OnFiveSecondEvent;
        ChatManager.Instance.OnUpdateTalkEvent += OnUpdateTalkEvent;

 Main/System/Guild/GuildBossManager.cs

@@ -305,7 +305,7 @@
        var playerInfo = PlayerDatas.Instance.fairyData.GetMember(playerId);

        if (playerInfo == null)

        {

            return taofaPlayerData.ContainsKey(playerId) ? taofaPlayerData[playerId] : null;

            return taofaPlayerData.ContainsKey(playerId) ? taofaPlayerData[playerId] : new MemberData();

        }



        return new MemberData()


 Main/System/Guild/GuildChangeBroadcastWin.cs

@@ -27,6 +27,10 @@

    protected override void OnPreOpen()
    {
        var guildInfo = PlayerDatas.Instance.fairyData.fairy;
        if (guildInfo == null)
            return;
        inputField.placeholder.GetComponent<Text>().text = string.IsNullOrEmpty(guildInfo.Broadcast) ? Language.Get("Guild_62") : guildInfo.Broadcast; ;
        inputField.text = string.Empty;
    }


 Main/System/Guild/GuildManager.cs

@@ -741,7 +741,7 @@
            return;

        }

        lastChangeMarkTime = Time.time;

        if (UIManager.Instance.IsOpened<GuildHallWin>())

        if ((netPack.Type == 1 || netPack.Type == 2) && UIManager.Instance.IsOpened<GuildBaseWin>())

        {

            RequestGuildData();

        }


 Main/System/LineupRecommend/LineupRecommendCell.cs

@@ -53,7 +53,16 @@
        txtLineupDesc.text = GetDesc(recommendID);
        btnUse.SetListener(() =>
        {
            ConfirmCancel.ShowPopConfirm(Language.Get("L1003"), Language.Get("LineupRecommend06"),
            bool hasHeroAll = manager.HasHeroAll(recommendID);
            if (hasHeroAll)
            {
                manager.UseTeam(recommendID);
                return;
            }

            ConfirmCancel.ShowPopConfirm(
                Language.Get("L1003"),
                Language.Get("LineupRecommend06"),
                (bool isOK) =>
                {
                    if (isOK)

 Main/System/LineupRecommend/LineupRecommendManager.cs

@@ -175,6 +175,19 @@
        return false;
    }

    // 拥有所有推荐武将
    public bool HasHeroAll(int recommendID)
    {
        if (!TryGetHeroIDListByRecommendID(recommendID, out int[] heroIDArr) || heroIDArr.IsNullOrEmpty())
            return false;
        foreach (var heroID in heroIDArr)
        {
            if (!HeroManager.Instance.HasHero(heroID))
                return false;
        }
        return true;
    }

    public void UseTeam(int recommendID)
    {
        if (!LineupRecommendConfig.HasKey(recommendID))