From 3c3b4e0878ee25a4705af75cdd4b8562be3d477c Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期一, 17 九月 2018 16:55:36 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Vip/VipInvest/VipInvestModel.cs | 57 ++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 46 insertions(+), 11 deletions(-)
diff --git a/System/Vip/VipInvest/VipInvestModel.cs b/System/Vip/VipInvest/VipInvestModel.cs
index 16dfe9d..21c8e53 100644
--- a/System/Vip/VipInvest/VipInvestModel.cs
+++ b/System/Vip/VipInvest/VipInvestModel.cs
@@ -5,7 +5,7 @@
namespace Snxxz.UI
{
- public class VipInvestModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk
+ public class VipInvestModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk, IOpenServerActivity
{
private Dictionary<string, Dictionary<string, List<InvestReward>>> vipInvestDict = new Dictionary<string, Dictionary<string, List<InvestReward>>>();
private Dictionary<int, List<InvestConfig>> investCycleDict = new Dictionary<int, List<InvestConfig>>(); //姣忓懆鏈熸暟鎹�
@@ -13,6 +13,39 @@
private Dictionary<int, int[]> investGoldDict = new Dictionary<int, int[]>();
private Dictionary<int, int> investMaxDayDict = new Dictionary<int, int>();
public int NeedVipLv { get; private set; }
+
+ public bool IsOpen
+ {
+ get
+ {
+ return FuncOpen.Instance.IsFuncOpen(120);
+ }
+ }
+
+ public bool priorityOpen
+ {
+ get
+ {
+ if (redPointStre1.state == RedPointState.None)
+ {
+ return false;
+ }
+ else
+ {
+ return true;
+ }
+ }
+
+ }
+
+ public bool IsAdvance
+ {
+ get
+ {
+ return false;
+ }
+ }
+
private bool IsOkBool = false;
public bool IsRedpoint = false;
@@ -26,6 +59,7 @@
vipInvestLvlimitDict.Clear();
investGoldDict.Clear();
investMaxDayDict.Clear();
+ OpenServerActivityCenter.Instance.Register(11, this);
var InvestRedPoint = Config.Instance.Get<FuncConfigConfig>("InvestRedPoint");
DisplayLevel = int.Parse(InvestRedPoint.Numerical1);
DisplayDays = int.Parse(InvestRedPoint.Numerical3);
@@ -205,6 +239,7 @@
#region 澶勭悊鏈嶅姟绔殑鏁版嵁
private Dictionary<int, ServerInvestInfo> serverInvestDict = new Dictionary<int, ServerInvestInfo>();
public event Action<int> RefreshInvestAct;
+ public event Action<int> onStateUpate;
public void SetServerInvestInfo(HA337_tagMCGoldInvestInfo info)
{
@@ -374,12 +409,12 @@
ServerInvestInfo InvestInfo;
int cycle = 0;
private List<InvestConfig> configlist;
- private const int Redpoint_key1 = 3501;
- public Redpoint redPointStre1 = new Redpoint(MainRedDot.RedPoint_VipDot, Redpoint_key1);//Vip 鎶曡祫绾㈢偣
- private const int Redpoint_key1_Week1 = 350101;
- private const int Redpoint_key1_Week2 = 350102;
- private const int Redpoint_key1_Week3 = 350103;
- private const int Redpoint_key1_Week4 = 350104;
+ private const int Redpoint_key1 = 20911;
+ public Redpoint redPointStre1 = new Redpoint(209, Redpoint_key1);//Vip 鎶曡祫绾㈢偣
+ private const int Redpoint_key1_Week1 = 2091101;
+ private const int Redpoint_key1_Week2 = 2091102;
+ private const int Redpoint_key1_Week3 = 2091103;
+ private const int Redpoint_key1_Week4 = 2091104;
public Redpoint redPointStre1_v1 = new Redpoint(Redpoint_key1, Redpoint_key1_Week1);
public Redpoint redPointStre1_v2 = new Redpoint(Redpoint_key1, Redpoint_key1_Week2);
public Redpoint redPointStre1_v3 = new Redpoint(Redpoint_key1, Redpoint_key1_Week3);
@@ -413,16 +448,16 @@
switch (cycle)
{
case 1:
- redPointStre1_v1.state = RedPointState.Simple;
+ redPointStre1_v1.state = RedPointState.GetReward;
break;
case 2:
- redPointStre1_v2.state = RedPointState.Simple;
+ redPointStre1_v2.state = RedPointState.GetReward;
break;
case 3:
- redPointStre1_v3.state = RedPointState.Simple;
+ redPointStre1_v3.state = RedPointState.GetReward;
break;
case 4:
- redPointStre1_v4.state = RedPointState.Simple;
+ redPointStre1_v4.state = RedPointState.GetReward;
break;
default:
break;
--
Gitblit v1.8.0