Merge branch 'master' into h5version

yyl

2026-05-11 51b0f6ed9f4e1d3bb6f8144470b46908c7699a96

 Main/System/TimeRush/TimeRushManager.cs

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

public class TimeRushManager : GameSystemManager<TimeRushManager>, IOpenServerActivity
{
@@ -25,8 +26,7 @@
        }
    }

    public const int activityType = (int)OpenServerActivityCenter.ActivityType.AT_DateActivity;
    public const int activityID = (int)NewDayActivityID.TimeRushAct;
    public const int activityID = (int)OperationType.TimeRush;
    public int actNum = 10;
    public static OperationType operaType = OperationType.TimeRush;
    public Redpoint redPoint = new Redpoint(MainRedDot.TimeRushRepoint);
@@ -67,7 +67,7 @@
        OperationTimeHepler.Instance.operationAdvanceEvent += OperationAdvanceEvent;
        StoreModel.Instance.RefreshBuyShopLimitEvent += RefreshBuyShopLimitEvent;
        //storeModel.RefreshBuyShopLimitEvent += RefreshBuyShopLimitEvent;
        OpenServerActivityCenter.Instance.Register(activityID, this, activityType);
        OpenServerActivityCenter.Instance.Register(activityID, this);

        var config = FuncConfigConfig.Get("TimeRush");
        windowIDDict = ConfigParse.ParseIntDict(config.Numerical1);
@@ -250,6 +250,9 @@
    public event Action OnNewAwardHaveEvent;
    public void CheckNewAwardHave(int roundType, int curRound, int curValue)
    {
        if (!IsFuncOpen())
            return;

        if (lastCurRoundDict.ContainsKey(roundType) && lastCurValueDict.ContainsKey(roundType))
        {
            int lastCurRound = lastCurRoundDict[roundType];
@@ -278,7 +281,7 @@
                            newAwardIndex = Award.AwardIndex;
                            if (!UIManager.Instance.IsOpened<TimeRushTipWin>())
                            {
                                UIManager.Instance.OpenWindow<TimeRushTipWin>();
                                UIManager.Instance.OpenWindowAsync<TimeRushTipWin>().Forget();
                            }
                            OnNewAwardHaveEvent?.Invoke();
                        }