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/HeroReturn/HeroReturnStarUpWin.cs |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/Main/System/HeroReturn/HeroReturnStarUpWin.cs b/Main/System/HeroReturn/HeroReturnStarUpWin.cs
index 30c92ec..c2bcee1 100644
--- a/Main/System/HeroReturn/HeroReturnStarUpWin.cs
+++ b/Main/System/HeroReturn/HeroReturnStarUpWin.cs
@@ -37,9 +37,18 @@
         });
         lockButton.SetListener(() =>
         {
-            manager.SaveStarUpLockState(manager.GetOperationHeroAppearInfo());
-            Display();
-            manager.UpdateRedpoint();
+            ConfirmCancel.ShowPopConfirm(
+                Language.Get("Mail101"),
+                Language.Get("HeroReturnLockHero"),
+                (bool isOK) =>
+                {
+                    if (isOK)
+                    {
+                        manager.SaveStarUpLockState(manager.GetOperationHeroAppearInfo());
+                        Display();
+                        manager.UpdateRedpoint();
+                    }
+                });
         });
     }
 
@@ -111,7 +120,7 @@
 
         bool isLockStarHero = manager.IsLockStarHero(act);
         changeButton.SetActive(!isLockStarHero);
-        lockButton.interactable = !isLockStarHero;
+        lockButton.SetActive(!isLockStarHero);
 
         heroHeadBaseCell.Init(heroConfig.HeroID, skinID, 0, 0, 0, () =>
         {

--
Gitblit v1.8.0