From 252d46b8642ad4ecebe1a8b9d3a0678913413ebf Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期三, 14 十一月 2018 15:30:58 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/HappyXB/HappyXBModel.cs | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/System/HappyXB/HappyXBModel.cs b/System/HappyXB/HappyXBModel.cs
index 03b8408..5b3e30a 100644
--- a/System/HappyXB/HappyXBModel.cs
+++ b/System/HappyXB/HappyXBModel.cs
@@ -954,7 +954,7 @@
XBStoreRedPoint();
}
- private List<StoreConfig> storelist = null;
+ private List<StoreModel.StoreData> storelist = null;
public void XBStoreRedPoint()
{
if (!FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.HappyFindTreasure)) return;
@@ -962,13 +962,13 @@
ulong moneyNum = UIHelper.GetMoneyCnt(25);
for(int i = 11; i < 14; i++)
{
- storelist = StoreConfig.GetTypeStoreModel(i);
+ storelist = m_storeModel.TryGetStoreDatas(i);
if(storelist.Count > 0)
{
- List<StoreConfig> orderlist = new List<StoreConfig>();
+ List<StoreModel.StoreData> orderlist = new List<StoreModel.StoreData>();
orderlist.AddRange(storelist);
orderlist.Sort(CompareByMoney);
- if(moneyNum >= (ulong)orderlist[0].MoneyNumber)
+ if(moneyNum >= (ulong)orderlist[0].storeConfig.MoneyNumber)
{
xbStoreRed.state = RedPointState.Simple;
return;
@@ -978,10 +978,10 @@
xbStoreRed.state = RedPointState.None;
}
- public int CompareByMoney(StoreConfig start, StoreConfig end)
+ public int CompareByMoney(StoreModel.StoreData start, StoreModel.StoreData end)
{
- int money1 = start.MoneyNumber;
- int money2 = end.MoneyNumber;
+ int money1 = start.storeConfig.MoneyNumber;
+ int money2 = end.storeConfig.MoneyNumber;
if (money1.CompareTo(money2) != 0) return money1.CompareTo(money2);
int index1 = storelist.IndexOf(start);
int index2 = storelist.IndexOf(end);
--
Gitblit v1.8.0