From 65fb6364670f86e21adfab1ae0b42a7be8dc07f4 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期六, 08 十二月 2018 15:52:37 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Store/StoreWin.cs | 19 ++++++++-----------
1 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/System/Store/StoreWin.cs b/System/Store/StoreWin.cs
index fa7204b..659d604 100644
--- a/System/Store/StoreWin.cs
+++ b/System/Store/StoreWin.cs
@@ -73,7 +73,6 @@
private FuncConfigConfig _tagFuncModel1;
private FuncConfigConfig _tagFuncModel2;
private int shopId = 0;
-
#region Built-in
protected override void BindController()
{
@@ -147,7 +146,7 @@
protected override void OnPreClose()
{
- m_storeModel.ClearAllPetAndMountRedpoint(StoreFunc.WeekStore);
+ m_storeModel.CloseAllRedpoint(StoreFunc.WeekStore);
m_storeModel.storeFuncType = StoreFunc.WeekStore;
m_storeModel.RefreshBuyShopLimitEvent -= OnCreate;
GlobalTimeEvent.Instance.secondEvent -= RefreshResetTime;
@@ -198,6 +197,7 @@
{
if (_tagStoreModellist[i].shopId == m_storeModel.jumpShopId)
{
+ shopId = _tagStoreModellist[i].shopId;
int index = i / 2 ;
_shopCtrl.JumpIndex(index > 2 ? index - 1 : index);
_shopCtrl.m_Scorller.RefreshActiveCellViews();
@@ -409,8 +409,6 @@
shopItemCell.LoadGuidEffectCtrl(shopInfo.ID, shopId);
}
-
-
shopItemCell.ShopCellBtn.RemoveAllListeners();
shopItemCell.ShopCellBtn.AddListener(()=> {
if(shopInfo.ID == shopId)
@@ -418,8 +416,7 @@
shopId = 0;
shopItemCell.LoadGuidEffectCtrl(shopInfo.ID, shopId);
}
- m_storeModel.ClearMustBuyRedpoint(shopInfo);
- m_storeModel.ClearPetAndMountRedpoint(shopInfo);
+ m_storeModel.CloseRedPoint(shopInfo);
m_storeModel.OnClickShopCell(shopInfo);
});
}
@@ -434,7 +431,7 @@
private void OnClickIntegralStore()
{
- m_storeModel.ClearAllPetAndMountRedpoint(StoreFunc.IntegralStore);
+ m_storeModel.CloseAllRedpoint(StoreFunc.IntegralStore);
m_storeModel.storeFuncType = StoreFunc.IntegralStore;
OnCreate();
RefreshResetTime();
@@ -443,7 +440,7 @@
private void OnClickBindStore()
{
- m_storeModel.ClearAllPetAndMountRedpoint(StoreFunc.BindStore);
+ m_storeModel.CloseAllRedpoint(StoreFunc.BindStore);
m_storeModel.storeFuncType = StoreFunc.BindStore;
OnCreate();
RefreshResetTime();
@@ -452,7 +449,7 @@
private void OnClickStrengthStore()
{
- m_storeModel.ClearAllPetAndMountRedpoint(StoreFunc.GrowStrongerStore);
+ m_storeModel.CloseAllRedpoint(StoreFunc.GrowStrongerStore);
m_storeModel.storeFuncType = StoreFunc.GrowStrongerStore;
OnCreate();
RefreshResetTime();
@@ -461,7 +458,7 @@
private void OnClickCommonStore()
{
- m_storeModel.ClearAllPetAndMountRedpoint(StoreFunc.CommonStore);
+ m_storeModel.CloseAllRedpoint(StoreFunc.CommonStore);
m_storeModel.storeFuncType = StoreFunc.CommonStore;
OnCreate();
RefreshResetTime();
@@ -470,7 +467,7 @@
private void OnClickWeekStore()
{
- m_storeModel.ClearAllPetAndMountRedpoint(StoreFunc.WeekStore);
+ m_storeModel.CloseAllRedpoint(StoreFunc.WeekStore);
m_storeModel.storeFuncType = StoreFunc.WeekStore;
OnCreate();
RefreshResetTime();
--
Gitblit v1.8.0