From 5a4e34c8a85737c0fa5b5775122da31155cbaef3 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期一, 09 二月 2026 14:46:01 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
---
Main/System/Main/RightFuncInHome.cs | 47 +++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 43 insertions(+), 4 deletions(-)
diff --git a/Main/System/Main/RightFuncInHome.cs b/Main/System/Main/RightFuncInHome.cs
index ea5cd24..4eb474d 100644
--- a/Main/System/Main/RightFuncInHome.cs
+++ b/Main/System/Main/RightFuncInHome.cs
@@ -15,6 +15,9 @@
[SerializeField] Button monthCardBtn;
[SerializeField] Button dayMissionBtn;
[SerializeField] Button battlePassBtn;
+ [SerializeField] Button llmjBtn; //鍘嗙粌绉樼瑘
+ [SerializeField] Button signBtn;
+ [SerializeField] Button previewBtn;
static string listenWindowName = ""; //鐩戝惉鍏抽棴鏃跺啀鏄剧ず
@@ -24,8 +27,8 @@
monthCardBtn.AddListener(() =>
{
//鐢ㄤ簬鐩戝惉鐣岄潰锛屾墦寮�鏃剁缉杩涘彸杈瑰姛鑳芥爮锛屽叧闂椂鏄剧ず
- // ListenWindow("");
- InvestModel.Instance.BuyInvest(InvestModel.monthCardType);
+ ListenWindow("PrivilegeCardWin");
+ UIManager.Instance.OpenWindow<PrivilegeCardWin>();
});
storeBtn.AddListener(() =>
{
@@ -47,7 +50,7 @@
ShowFuncCol(false);
});
- UIManager.Instance.OnCloseWindow -= OnCloseWindow;
+
UIManager.Instance.OnCloseWindow += OnCloseWindow;
dayMissionBtn.AddListener(() =>
@@ -63,13 +66,44 @@
ListenWindow("BattlePassBaseWin");
UIManager.Instance.OpenWindow<BattlePassBaseWin>();
});
+
+ llmjBtn.AddListener(() =>
+ {
+ //鐢ㄤ簬鐩戝惉鐣岄潰锛屾墦寮�鏃剁缉杩涘彸杈瑰姛鑳芥爮锛屽叧闂椂鏄剧ず
+ ListenWindow("ExpSecretCollectionWin");
+ UIManager.Instance.OpenWindow<ExpSecretCollectionWin>();
+ });
+
+ signBtn.AddListener(() =>
+ {
+ //鐢ㄤ簬鐩戝惉鐣岄潰锛屾墦寮�鏃剁缉杩涘彸杈瑰姛鑳芥爮锛屽叧闂椂鏄剧ず
+ ListenWindow("SignWin");
+ UIManager.Instance.OpenWindow<SignWin>();
+ });
+
+ previewBtn.AddListener(() =>
+ {
+ //鐢ㄤ簬鐩戝惉鐣岄潰锛屾墦寮�鏃剁缉杩涘彸杈瑰姛鑳芥爮锛屽叧闂椂鏄剧ず
+ ListenWindow("FunctionPreviewWin");
+ UIManager.Instance.OpenWindow<FunctionPreviewWin>();
+ });
}
+
+ void OnDestroy()
+ {
+ UIManager.Instance.OnCloseWindow -= OnCloseWindow;
+ }
+
void ShowBtns()
{
storeBtn.SetActive(FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.Store));
dayMissionBtn.SetActive(FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.DayMission));
battlePassBtn.SetActive(FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.BattlePass));
+ llmjBtn.SetActive(FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.LLMJ));
+ signBtn.SetActive(FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.DaySign));
+ monthCardBtn.SetActive(FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.PrivilegeCard));
+ previewBtn.SetActive(FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.FunctionPreview));
}
@@ -77,7 +111,7 @@
public void ShowFuncCol(bool _isShow)
{
isShow = _isShow;
- funcCol.DOLocalMove(isShow ? showPoint.localPosition : hidePoint.localPosition, 0.3f);
+ funcCol?.DOLocalMove(isShow ? showPoint.localPosition : hidePoint.localPosition, 0.3f);
if (isShow)
{
ShowBtns();
@@ -105,5 +139,10 @@
listenWindowName = "";
}
+ //澶栭儴浣跨敤
+ public static void ListenWindowEx(string _listenWindowName)
+ {
+ listenWindowName = _listenWindowName;
+ }
}
--
Gitblit v1.8.0