From ad3ac1661daaf4b445914f87009d3d88c990f040 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期二, 28 四月 2026 11:45:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into h5version
---
Main/System/Main/HomeWin.cs | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/Main/System/Main/HomeWin.cs b/Main/System/Main/HomeWin.cs
index 50b0424..4e1ad8d 100644
--- a/Main/System/Main/HomeWin.cs
+++ b/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;//褰撳墠閰嶇疆鐨勫潗楠戝瑙侷D瀛樺偍鍦紙鏈�澶ф敮鎸� 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()
{
--
Gitblit v1.8.0