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

yyl

2025-10-27 aa37abe50850c34c934f8e2d17bc30632bb081f3

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

 Main/System/Arena/ArenaManager.cs

@@ -219,7 +219,7 @@

    public Dictionary<int, int[][]> GetArenaAwardDict(int functionOrder)
    {
        return functionOrder == 0 ? dailyRankRewards : seasonRankRewards;
        return functionOrder == 0 ? seasonRankRewards : dailyRankRewards;
    }

    public void SendViewGameRecPack()

 Main/System/BoneField/BoneFieldWin.cs

@@ -4,6 +4,8 @@
{
    [SerializeField] TextEx txtDifficulty;
    [SerializeField] TextEx txtBossName;
    [SerializeField] ImageEx imgMoneyCount;
    [SerializeField] TextEx txtNeedMoneyCount;
    [SerializeField] TextEx txtTodaySweepCount;
    [SerializeField] TextEx txtTodayAdsCount;
    [SerializeField] TextEx txtFirstFree;
@@ -203,7 +205,19 @@
        imgSweepRed.SetActive(isSweepCountOk && myFightPower < dungeonConfig.FightPower);
        txtFirstFree.SetActive(showSweepMaxCount == showrealRemainSweepCount);
        txtTodaySweepCount.SetActive(showSweepMaxCount > showrealRemainSweepCount);
        txtTodaySweepCount.text = UIHelper.AppendColor(isSweepCountOk ? TextColType.Green : TextColType.Red, Language.Get("BoneField08", showrealRemainSweepCount, showSweepMaxCount));
        txtTodaySweepCount.text = UIHelper.AppendColor(isSweepCountOk ? TextColType.LightGreen : TextColType.Red, Language.Get("BoneField08", showrealRemainSweepCount, showSweepMaxCount));
        imgMoneyCount.SetActive(showSweepMaxCount != showrealRemainSweepCount && isSweepCountOk);
        txtNeedMoneyCount.SetActive(showSweepMaxCount != showrealRemainSweepCount && isSweepCountOk);
        if (showSweepMaxCount != showrealRemainSweepCount && isSweepCountOk)
        {
            int dataMapID = BoneFieldManager.Instance.DataMapID;
            DungeonOpenTimeConfig config = DungeonOpenTimeConfig.Get(dataMapID);
            int index = Mathf.Min(Mathf.Max(0, showSweepMaxCount - showrealRemainSweepCount - 1), config.PayMoneyValues.Length - 1);
            int payMoneyValue = config.PayMoneyValues[index];
            int payMoneyType = config.PayMoneyType;
            imgMoneyCount.SetIconWithMoneyType(payMoneyType);
            txtNeedMoneyCount.text = payMoneyValue.ToString();
        }
    }

    public void DisplayAdsButton(ADAwardConfig aDAwardConfig)
@@ -212,7 +226,7 @@
        bool isShowAds = adsCnt < aDAwardConfig.ADCntMax;
        int remainAdsCount = aDAwardConfig.ADCntMax - adsCnt;
        btnAds.SetActive(isShowAds);
        txtTodayAdsCount.text = UIHelper.AppendColor(isShowAds ? TextColType.Green : TextColType.Red, Language.Get("BoneField09", remainAdsCount, aDAwardConfig.ADCntMax)); ;
        txtTodayAdsCount.text = UIHelper.AppendColor(isShowAds ? TextColType.LightGreen : TextColType.Red, Language.Get("BoneField09", remainAdsCount, aDAwardConfig.ADCntMax)); ;
    }

    public void DisplayItemCellList(List<ItemCell> itemCells, int[][] items)

 Main/System/Equip/ItemsOnFloor.cs

@@ -109,7 +109,8 @@
            }

            if (item.isActiveAndEnabled)

            {

                //防范一直播放掉落动画

                //防范一直播放掉落动画,某种原因被打断了后续的界面显示，这里直接触发打开界面

                EquipModel.Instance.CalcFloorEquip(i);

                continue;

            }




 Main/System/NewBieGuidance/NewBieWin.cs

@@ -32,6 +32,7 @@
    [SerializeField] Transform m_NewBieGuide;

    [SerializeField] Transform m_ContainerDialogue;

    [SerializeField] RichText m_Dialogue;

    [SerializeField] RectTransform m_DialogueBG;

    [SerializeField] Image m_ArrowUP;

    [SerializeField] Image m_ArrowDown;

    [SerializeField] Image m_ArrowLeft;

@@ -253,6 +254,8 @@
        {

            m_ContainerDialogue.SetActive(true);

            m_Dialogue.text = stepConfig.GetTipContent();

            //强制刷新一次 contentSizeFitter 的计算

            LayoutRebuilder.ForceRebuildLayoutImmediate(m_DialogueBG);

            m_ArrowUP.SetActive(stepConfig.arrowPosition == NewBieGuideScriptableObject.ArrowPosition.Top);

            m_ArrowDown.SetActive(stepConfig.arrowPosition == NewBieGuideScriptableObject.ArrowPosition.Bottom);

            m_ArrowLeft.SetActive(stepConfig.arrowPosition == NewBieGuideScriptableObject.ArrowPosition.Left);