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

yyl

2026-04-28 ad3ac1661daaf4b445914f87009d3d88c990f040

 Main/System/Main/HomeWin.cs

@@ -342,7 +342,10 @@
        {
            DisplayHeroReturn();
        }

        else if (type == OperationType.TotalRecharge || type == OperationType.TotDayRecharge)
        {
            DisplayGalaBtn();
        }
    }

    private void OpenServerActivityStateChange()
@@ -350,6 +353,7 @@
        DisplayTimeRush();
        DisplayHeroDebut();
        DisplayHeroReturn();
        DisplayGalaBtn();
    }

    private void OnShowGiftIdListAddEvent()
@@ -898,7 +902,17 @@
            horseBGImg.SetActive(true);
            //equipShowSwitch;//当前配置的坐骑外观ID存储在（最大支持 1~999）
            var skinConfig = HorseSkinConfig.Get(HorseManager.Instance.GetUsingHorseSkinID(true));
            horseImg.Create(skinConfig.SkinID, 0, 0.6f).Forget();
            if (skinConfig.SkinID == 999)
            {
                int nowhorseID = HorseManager.Instance.horseID;
                HorseSkinConfig.horseIDTohorseSkinIDDict.TryGetValue(nowhorseID, out int horseSkinID);
                var horseIdSkinConfig = HorseSkinConfig.Get(horseSkinID);
                horseImg.Create(horseIdSkinConfig.SkinID, 0, 0.6f).Forget();
            }
            else
            {
                horseImg.Create(skinConfig.SkinID, 0, 0.6f).Forget();
            }
            horseLVText.text = Language.Get("Horse8", HorseManager.Instance.classLV, HorseManager.Instance.horseLV);
        }
        else
@@ -922,7 +936,7 @@
        osHeroTrainBtn.SetActive(OSActivityManager.Instance.IsOpened(7));
        osBeautyMMBtn.SetActive(OSActivityManager.Instance.IsOpened(8));
        osMinggeBtn.SetActive(OSActivityManager.Instance.IsOpened(9));
        osGalaBtn.SetActive(OSActivityManager.Instance.IsOpenedOSGala());
        DisplayGalaBtn();
    }

    void OnDayEvent()
@@ -930,6 +944,11 @@
        DisplayOSActivity();
    }

    void DisplayGalaBtn()
    {
        bool isGalaOpen = TotDayRechargeManager.Instance.IsOpen || TotalRechargeManager.Instance.IsOpen;
        osGalaBtn.SetActive(OSActivityManager.Instance.IsOpenedOSGala() || isGalaOpen);
    }

    void DisplayTimeRush()
    {