From 25036e09b325d77dcc2b774b980ddd182f0a6bd4 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期三, 22 五月 2019 17:33:06 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Store/StoreWin.cs | 43 +++++++++++++++++++++++++++----------------
1 files changed, 27 insertions(+), 16 deletions(-)
diff --git a/System/Store/StoreWin.cs b/System/Store/StoreWin.cs
index 4840184..d6cff19 100644
--- a/System/Store/StoreWin.cs
+++ b/System/Store/StoreWin.cs
@@ -15,10 +15,11 @@
{
public class StoreWin : Window
{
+ [SerializeField] FunctionButton m_DayStoreTitle;
[SerializeField] FunctionButton m_WeekStoreTitle;
[SerializeField] FunctionButton m_CommonStoreTitle;
[SerializeField] FunctionButton m_GrowStrongerStoreTitle;
- [SerializeField] FunctionButton m_BindStoreTitle;
+ //[SerializeField] FunctionButton m_BindStoreTitle;
[SerializeField] FunctionButton m_IntegralStoreTitle;
[SerializeField] FunctionButtonGroup m_FuncBtnGroup;
[SerializeField] Button m_LeftBtn;
@@ -51,10 +52,11 @@
m_ShopCtrl.OnRefreshCell += RefreshShopCell;
m_ShopCtrl.lockType = EnhanceLockType.KeepVertical;
+ m_DayStoreTitle.SetListener(OpenDayStore);
m_WeekStoreTitle.SetListener(OpenMysteryStore);
m_CommonStoreTitle.SetListener(OpenCommonStore);
m_GrowStrongerStoreTitle.SetListener(OpenStrengthStore);
- m_BindStoreTitle.SetListener(OpenBindGoldStore);
+ //m_BindStoreTitle.SetListener(OpenBindGoldStore);
m_IntegralStoreTitle.SetListener(OpenIntegralStore);
m_AssistBtn.SetListener(ViewAssistRecorders);
m_RefreshCommodities.SetListener(RefreshCommondities);
@@ -82,19 +84,19 @@
{
if (model.storeFunc1Point.state == RedPointState.Simple)
{
- functionOrder = m_WeekStoreTitle.order;
+ functionOrder = m_DayStoreTitle.order;
}
else if (model.storeFunc2Point.state == RedPointState.Simple)
{
- functionOrder = m_CommonStoreTitle.order;
+ functionOrder = m_WeekStoreTitle.order;
}
else if (model.storeFunc3Point.state == RedPointState.Simple)
{
- functionOrder = m_GrowStrongerStoreTitle.order;
+ functionOrder = m_CommonStoreTitle.order;
}
else if (model.storeFunc4Point.state == RedPointState.Simple)
{
- functionOrder = m_BindStoreTitle.order;
+ functionOrder = m_GrowStrongerStoreTitle.order;
}
else if (model.storeFunc5Point.state == RedPointState.Simple)
{
@@ -117,8 +119,8 @@
protected override void OnPreClose()
{
- model.CloseAllRedpoint(StoreFunc.MysteryStore);
- model.storeFuncType = StoreFunc.MysteryStore;
+ model.CloseAllRedpoint(StoreFunc.DayStore);
+ model.storeFuncType = StoreFunc.DayStore;
model.RefreshBuyShopLimitEvent -= OnCreate;
model.mysteryShopRefreshEvent -= OnCreate;
GlobalTimeEvent.Instance.secondEvent -= UpdateRefreshTime;
@@ -441,14 +443,14 @@
functionOrder = m_IntegralStoreTitle.order;
}
- private void OpenBindGoldStore()
- {
- model.CloseAllRedpoint(StoreFunc.BindStore);
- model.storeFuncType = StoreFunc.BindStore;
- OnCreate();
- UpdateRefreshTime();
- functionOrder = m_BindStoreTitle.order;
- }
+ //private void OpenBindGoldStore()
+ //{
+ // model.CloseAllRedpoint(StoreFunc.BindStore);
+ // model.storeFuncType = StoreFunc.BindStore;
+ // OnCreate();
+ // UpdateRefreshTime();
+ // functionOrder = m_BindStoreTitle.order;
+ //}
private void OpenStrengthStore()
{
@@ -477,6 +479,15 @@
functionOrder = m_WeekStoreTitle.order;
}
+ private void OpenDayStore()
+ {
+ model.CloseAllRedpoint(StoreFunc.DayStore);
+ model.storeFuncType = StoreFunc.DayStore;
+ OnCreate();
+ UpdateRefreshTime();
+ functionOrder = m_DayStoreTitle.order;
+ }
+
private void ViewAssistRecorders()
{
WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.DungeonAssitCheckIn);
--
Gitblit v1.8.0