From d67e53ae6cb3136b8e1836978b93a3021460ba29 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期四, 25 十二月 2025 16:56:16 +0800
Subject: [PATCH] Merge branch 'master' of http://mobile.secondworld.net.cn:10010/r/Project_SG_scripts
---
Main/System/Main/RightFuncInHome.cs | 30 +++++++++++++++++++++++++++---
1 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/Main/System/Main/RightFuncInHome.cs b/Main/System/Main/RightFuncInHome.cs
index 3972326..d8f3617 100644
--- a/Main/System/Main/RightFuncInHome.cs
+++ b/Main/System/Main/RightFuncInHome.cs
@@ -16,6 +16,8 @@
[SerializeField] Button dayMissionBtn;
[SerializeField] Button battlePassBtn;
[SerializeField] Button llmjBtn; //鍘嗙粌绉樼瑘
+ [SerializeField] Button signBtn;
+ [SerializeField] Button previewBtn;
static string listenWindowName = ""; //鐩戝惉鍏抽棴鏃跺啀鏄剧ず
@@ -25,8 +27,8 @@
monthCardBtn.AddListener(() =>
{
//鐢ㄤ簬鐩戝惉鐣岄潰锛屾墦寮�鏃剁缉杩涘彸杈瑰姛鑳芥爮锛屽叧闂椂鏄剧ず
- // ListenWindow("");
- InvestModel.Instance.BuyInvest(InvestModel.monthCardType);
+ ListenWindow("PrivilegeCardWin");
+ UIManager.Instance.OpenWindow<PrivilegeCardWin>();
});
storeBtn.AddListener(() =>
{
@@ -71,6 +73,20 @@
ListenWindow("ExpSecretCollectionWin");
UIManager.Instance.OpenWindow<ExpSecretCollectionWin>();
});
+
+ signBtn.AddListener(() =>
+ {
+ //鐢ㄤ簬鐩戝惉鐣岄潰锛屾墦寮�鏃剁缉杩涘彸杈瑰姛鑳芥爮锛屽叧闂椂鏄剧ず
+ ListenWindow("SignWin");
+ UIManager.Instance.OpenWindow<SignWin>();
+ });
+
+ previewBtn.AddListener(() =>
+ {
+ //鐢ㄤ簬鐩戝惉鐣岄潰锛屾墦寮�鏃剁缉杩涘彸杈瑰姛鑳芥爮锛屽叧闂椂鏄剧ず
+ ListenWindow("FunctionPreviewWin");
+ UIManager.Instance.OpenWindow<FunctionPreviewWin>();
+ });
}
void ShowBtns()
@@ -79,6 +95,9 @@
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));
}
@@ -86,7 +105,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();
@@ -114,5 +133,10 @@
listenWindowName = "";
}
+ //澶栭儴浣跨敤
+ public static void ListenWindowEx(string _listenWindowName)
+ {
+ listenWindowName = _listenWindowName;
+ }
}
--
Gitblit v1.8.0