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

yyl

2026-04-03 fb0570bdb7e73e7d4dca211f365ee67b43628240

 Main/System/OpenServerActivity/OperationTimeHepler.cs

@@ -469,9 +469,9 @@
            case 10:

                opreationType = OperationType.HeroDebut;

                break;

            // case 11:

            //     opreationType = OperationType.HeroBack;

            //     break;

            case 11:

                opreationType = OperationType.HeroReturn;

                break;

        }



        if (string.IsNullOrEmpty(package.StartDate) || string.IsNullOrEmpty(package.EndtDate))

@@ -1084,5 +1084,6 @@
{

    TimeRush = 1,  //日期型活动 - 轮回殿

    HeroDebut = 2,  //日期型活动 - 武将登场

    HeroReturn = 3, //日期型活动 - 武将返场

    max,

}