From 84fba9533cc9a0f1a3400bbc3f9a36cca94a1fbc Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期五, 26 十二月 2025 18:30:16 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
---
Main/System/Main/RightFuncInHome.cs | 77 ++++++++++++++++++++++++++++++++++++--
1 files changed, 72 insertions(+), 5 deletions(-)
diff --git a/Main/System/Main/RightFuncInHome.cs b/Main/System/Main/RightFuncInHome.cs
index dd251c1..d8f3617 100644
--- a/Main/System/Main/RightFuncInHome.cs
+++ b/Main/System/Main/RightFuncInHome.cs
@@ -13,19 +13,26 @@
[SerializeField] Button closeBtn;
[SerializeField] Button storeBtn;
[SerializeField] Button monthCardBtn;
+ [SerializeField] Button dayMissionBtn;
+ [SerializeField] Button battlePassBtn;
+ [SerializeField] Button llmjBtn; //鍘嗙粌绉樼瑘
+ [SerializeField] Button signBtn;
+ [SerializeField] Button previewBtn;
- string listenWindowName = ""; //鐩戝惉鍏抽棴鏃跺啀鏄剧ず
+ static string listenWindowName = ""; //鐩戝惉鍏抽棴鏃跺啀鏄剧ず
bool isShow = false;
void Awake()
{
monthCardBtn.AddListener(() =>
{
- ListenWindow("");
- InvestModel.Instance.BuyInvest(InvestModel.monthCardType);
+ //鐢ㄤ簬鐩戝惉鐣岄潰锛屾墦寮�鏃剁缉杩涘彸杈瑰姛鑳芥爮锛屽叧闂椂鏄剧ず
+ ListenWindow("PrivilegeCardWin");
+ UIManager.Instance.OpenWindow<PrivilegeCardWin>();
});
storeBtn.AddListener(() =>
{
+ //鐢ㄤ簬鐩戝惉鐣岄潰锛屾墦寮�鏃剁缉杩涘彸杈瑰姛鑳芥爮锛屽叧闂椂鏄剧ず
ListenWindow("StoreBaseWin");
UIManager.Instance.OpenWindow<StoreBaseWin>();
});
@@ -45,6 +52,52 @@
UIManager.Instance.OnCloseWindow -= OnCloseWindow;
UIManager.Instance.OnCloseWindow += OnCloseWindow;
+
+ dayMissionBtn.AddListener(() =>
+ {
+ //鐢ㄤ簬鐩戝惉鐣岄潰锛屾墦寮�鏃剁缉杩涘彸杈瑰姛鑳芥爮锛屽叧闂椂鏄剧ず
+ ListenWindow("DayMissionBaseWin");
+ UIManager.Instance.OpenWindow<DayMissionBaseWin>();
+ });
+
+ battlePassBtn.AddListener(() =>
+ {
+ //鐢ㄤ簬鐩戝惉鐣岄潰锛屾墦寮�鏃剁缉杩涘彸杈瑰姛鑳芥爮锛屽叧闂椂鏄剧ず
+ 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 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));
}
@@ -52,7 +105,11 @@
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();
+ }
}
void OnCloseWindow(UIBase win)
@@ -64,12 +121,22 @@
}
}
-
+ //鐢ㄤ簬鐩戝惉鐣岄潰锛屾墦寮�鏃剁缉杩涘彸杈瑰姛鑳芥爮锛屽叧闂椂鏄剧ず
void ListenWindow(string _listenWindowName)
{
ShowFuncCol(false);
listenWindowName = _listenWindowName;
}
+ public static void RemoveListenWindow()
+ {
+ listenWindowName = "";
+ }
+
+ //澶栭儴浣跨敤
+ public static void ListenWindowEx(string _listenWindowName)
+ {
+ listenWindowName = _listenWindowName;
+ }
}
--
Gitblit v1.8.0