Merge remote-tracking branch 'origin/master' into h5version

yyl

2026-04-03 fb0570bdb7e73e7d4dca211f365ee67b43628240

 Main/System/OSActivity/OSMainLevelBaseWin.cs

@@ -7,6 +7,7 @@
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
using Cysharp.Threading.Tasks;


////开服活动-主线关卡活动
@@ -30,15 +31,15 @@
        }
    }

    protected override void OpenSubUIByTabIndex()
    protected override async void OpenSubUIByTabIndex()
    {
        switch (functionOrder)
        {
            case 0:
                currentSubUI = UIManager.Instance.OpenWindow<OSRankWin>(3);
                currentSubUI = await UIManager.Instance.OpenWindowAsync<OSRankWin>(3);
                break;
            case 1:
                currentSubUI = UIManager.Instance.OpenWindow<OSRankMainLeveAwardWin>();
                currentSubUI = await UIManager.Instance.OpenWindowAsync<OSRankMainLeveAwardWin>();
                break;
        }
    }