Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts

yyl

9 小时以前 71365e5c15d81759c04d7aab953fa757fb183f9b

 Main/System/Main/RightFuncInHome.cs

@@ -13,19 +13,25 @@
    [SerializeField] Button closeBtn;
    [SerializeField] Button storeBtn;
    [SerializeField] Button monthCardBtn;
    [SerializeField] Button dayMissionBtn;
    [SerializeField] Button battlePassBtn;
    [SerializeField] Button llmjBtn; //历练秘笈
    [SerializeField] Button signBtn;

    string listenWindowName = "";   //监听关闭时再显示
    static string listenWindowName = "";   //监听关闭时再显示

    bool isShow = false;
    void Awake()
    {
        monthCardBtn.AddListener(() =>
        {
            ListenWindow("");
            //用于监听界面，打开时缩进右边功能栏，关闭时显示
            // ListenWindow("");
            InvestModel.Instance.BuyInvest(InvestModel.monthCardType);
        });
        storeBtn.AddListener(() =>
        {
            //用于监听界面，打开时缩进右边功能栏，关闭时显示
            ListenWindow("StoreBaseWin");
            UIManager.Instance.OpenWindow<StoreBaseWin>();
        });
@@ -45,11 +51,44 @@

        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>();
        });
    }

    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.MonthCard));
    }


@@ -73,12 +112,17 @@
        }
    }


    //用于监听界面，打开时缩进右边功能栏，关闭时显示
    void ListenWindow(string _listenWindowName)
    {
        ShowFuncCol(false);
        listenWindowName = _listenWindowName;
    }

    public static void RemoveListenWindow()
    {
        listenWindowName = "";
    }

}