Merge branch 'master' into h5version

yyl

2026-05-11 51b0f6ed9f4e1d3bb6f8144470b46908c7699a96

 Main/System/BattlePass/BattlePassManager.Common.cs

@@ -19,6 +19,8 @@
        {3, 40},
        {4, 28},
        {5, 27},
        {7, 53},
        {8, 54}
    };

    public int[] battlePassTypeSortList;
@@ -59,7 +61,7 @@
                }
            case BattlePassType.GuBao:
                {
                    totalValue = (int)battlePassData.value1;
                    totalValue = GubaoManager.Instance.GetGubaoTotalCnt();
                    break;
                }
            case BattlePassType.Arena:
@@ -67,6 +69,19 @@
                    totalValue = (int)battlePassData.value1;
                    break;
                }
            case BattlePassType.BetterMainLine:
                {
                    //通关的 找上一关值
                    totalValue = MainLevelConfig.GetPassedLevel();
                    break;
                }
            case BattlePassType.DJG:
                {
                    WarlordPavilionManager.Instance.TryGetHistoryMaxFinishProgress(out int layerNum, out int levelNum);
                    //通关
                    totalValue = layerNum*100 + levelNum;
                    break;
                }
        }

        if (HasAnyAward(_type, totalValue))