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

yyl

2025-10-23 12bd4418f3bf340c81c202eede008414984be0ce

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

 Main/System/Guild/GuildBaseWin.cs

@@ -54,7 +54,7 @@

    void ShowGuildInfo()
    {
        emblemCell.Display(PlayerDatas.Instance.fairyData.fairy.EmblemID, PlayerDatas.Instance.fairyData.fairy.EmblemWord);
        emblemCell.Display(PlayerDatas.Instance.fairyData.fairy.EmblemID, PlayerDatas.Instance.fairyData.fairy.EmblemWord, 0.5f);
        guildNameText.text = PlayerDatas.Instance.fairyData.fairy.FamilyName;
        var config = FamilyConfig.Get(PlayerDatas.Instance.fairyData.fairy.FamilyLV);
        guildMemberCountText.text = PlayerDatas.Instance.fairyData.fairy.MemberCount + "/" + config.MemberMax;

 Main/System/Guild/GuildCreateWin.cs

@@ -43,7 +43,7 @@

    void Display()
    {
        emblemCell.Display(GuildEmblemModel.Instance.createSelectEmblemId, GuildEmblemModel.Instance.createEmblemWord, 1.5f);
        emblemCell.Display(GuildEmblemModel.Instance.createSelectEmblemId, GuildEmblemModel.Instance.createEmblemWord, 0.8f);
        moneyIcon.SetIconWithMoneyType(GuildManager.Instance.createMoneyType);
        moneyText.text = UIHelper.ShowUseMoney(GuildManager.Instance.createMoneyType, GuildManager.Instance.createFairyCost);
    }

 Main/System/Guild/GuildEmblemSelectCell.cs

@@ -16,7 +16,7 @@
    public void Display(int index)
    {
        var id = GuildEmblemModel.Instance.showList[index];
        emblemIcon.Display(id, "");
        emblemIcon.Display(id, "", 0.5f);
        if (PlayerDatas.Instance.fairyData.fairy == null)
        {
            useImg.SetActive(false);

 Main/System/Guild/GuildEmblemWin.cs

@@ -76,7 +76,7 @@

    void Display()
    {
        guildEmblem.Display(GuildEmblemModel.Instance.nowChooseEmblemId, emblemWord, 2f);
        guildEmblem.Display(GuildEmblemModel.Instance.nowChooseEmblemId, emblemWord);
        emblemScroller.m_Scorller.RefreshActiveCellViews();
        var config = FamilyEmblemConfig.Get(GuildEmblemModel.Instance.nowChooseEmblemId);
        emblemInfoText.text = config.Descriptive;
@@ -125,7 +125,7 @@
    void OnFlagNameChange(string value)
    {
        emblemWord = value;
        guildEmblem.Display(GuildEmblemModel.Instance.nowChooseEmblemId, emblemWord, 2f);
        guildEmblem.Display(GuildEmblemModel.Instance.nowChooseEmblemId, emblemWord);
    }

    void ChooseEmblemEvent()

 Main/System/Guild/GuildHallWin.cs

@@ -91,7 +91,7 @@
        CreateMemberScroller();

        var config = FamilyConfig.Get(guildInfo.FamilyLV);
        guildEmblem.Display(guildInfo.EmblemID, guildInfo.EmblemWord, 1.3f);
        guildEmblem.Display(guildInfo.EmblemID, guildInfo.EmblemWord, 0.7f);
        guildMemberCountText.text = guildInfo.MemberCount + "/" + config.MemberMax;
        totalFightPowerText.text = UIHelper.ReplaceLargeArtNum(guildInfo.totalFightPower);
        guildLevelText.text = Language.Get("L1094") + guildInfo.FamilyLV;

 Main/System/Guild/GuildOPWin.cs

@@ -68,7 +68,7 @@
        if (guildInfo == null) return;


        guildEmblem.Display(guildInfo.EmblemID, guildInfo.EmblemWord, 1.4f);
        guildEmblem.Display(guildInfo.EmblemID, guildInfo.EmblemWord, 0.7f);

        guildNameText.text = guildInfo.FamilyName;


 Main/System/Guild/GuildPreviewWin.cs

@@ -74,7 +74,7 @@
        OtherPlayerDetailManager.Instance.ViewPlayerDetail(leaderID, (int)ViewPlayerType.viewGuildLeader);

        var config = FamilyConfig.Get(guildInfo.FamilyLV);
        guildEmblem.Display(guildInfo.EmblemID, guildInfo.EmblemWord, 1.3f);
        guildEmblem.Display(guildInfo.EmblemID, guildInfo.EmblemWord, 0.7f);
        guildMemberCountText.text = guildInfo.MemberCount + "/" + config.MemberMax;
        totalFightPowerText.text = UIHelper.ReplaceLargeArtNum(guildInfo.totalFightPower);
        guildLevelText.text = Language.Get("L1094") + guildInfo.FamilyLV;

 Main/System/Guild/GuildViewListCell.cs

@@ -37,7 +37,7 @@
            rankTextTf.SetActive(true);
            rankText.text = guildInfo.Rank.ToString();
        }
        guildEmblem.Display(guildInfo.EmblemID, guildInfo.EmblemWord);
        guildEmblem.Display(guildInfo.EmblemID, guildInfo.EmblemWord, 0.5f);
        guildLevelText.text = Language.Get("L1094") + guildInfo.FamilyLV;
        guildNameText.text = guildInfo.FamilyName;
        leaderNameText.text = guildInfo.LeaderName;

 Main/System/HeroUI/HeroPosWin.cs

@@ -474,21 +474,9 @@
        team.RemoveAllHeroes();
        if (NewBieCenter.Instance.inGuiding && NewBieCenter.Instance.currentGuide == HeroUIManager.Instance.onekeyGuideID)
        {
            //第二个强制排在5号位
            if (guidList.Count > 1)
            {
                team.AddHero(HeroManager.Instance.GetHero(guidList[1]), 4, true);
                guidList.RemoveAt(1);
            }

            for (int i = 0; i < guidList.Count; i++)
            {
                int index = i;
                if (i >= 4)
                {
                    index = i + 1;
                }
                team.AddHero(HeroManager.Instance.GetHero(guidList[i]), index, true);
                team.AddHero(HeroManager.Instance.GetHero(guidList[i]), HeroUIManager.Instance.onekeyGuidePosList[i] - 1, true);
            }

        }

 Main/System/HeroUI/HeroUIManager.OnTeam.cs

@@ -384,7 +384,7 @@

    public int[] teamSortByJob;
    public int onekeyGuideID;
    public int onekeyGuideFirstPos; //一键上阵在引导下的最优先推荐位置
    public int[] onekeyGuidePosList; //一键上阵在引导下的顺序

    public Action OnUnLockHeroCountEvent;
    public int lockState

 Main/System/HeroUI/HeroUIManager.cs

@@ -71,7 +71,7 @@
        lockHeroCountLimit = JsonMapper.ToObject<int[][]>(config.Numerical1);
        teamSortByJob = JsonMapper.ToObject<int[]>(config.Numerical2);
        onekeyGuideID = int.Parse(config.Numerical3);
        onekeyGuideFirstPos = int.Parse(config.Numerical4);
        onekeyGuidePosList = JsonMapper.ToObject<int[]>(config.Numerical4);
        
    }


 Main/System/NewBieGuidance/NewBieCenter.cs

@@ -24,7 +24,8 @@


    public bool inGuiding

    {

        get { return currentGuide != 0; }

        // 当前有引导，并且不是暂停状态，则在引导中

        get { return currentGuide != 0 && IsPauseStoryBattleState(); }

    }



    List<int> allGuides = new List<int>();