From bdf2cc27637dd09a75c2a8104462db49f3f4e136 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期三, 17 十月 2018 10:23:33 +0800
Subject: [PATCH] 3335 前端删除 七天在线奖励废弃功能
---
/dev/null | 12 ------------
System/OpenServerActivity/ImpactRankModel.cs | 1 -
Core/NetworkPackage/DTCFile/ServerPack/HA3_Function/DTCA308_tagMCOnlinePrize.cs | 16 ++++++----------
System/WindowBase/ModelCenter.cs | 1 -
4 files changed, 6 insertions(+), 24 deletions(-)
diff --git a/Core/NetworkPackage/DTCFile/ServerPack/HA3_Function/DTCA308_tagMCOnlinePrize.cs b/Core/NetworkPackage/DTCFile/ServerPack/HA3_Function/DTCA308_tagMCOnlinePrize.cs
index 41a6c1a..b827555 100644
--- a/Core/NetworkPackage/DTCFile/ServerPack/HA3_Function/DTCA308_tagMCOnlinePrize.cs
+++ b/Core/NetworkPackage/DTCFile/ServerPack/HA3_Function/DTCA308_tagMCOnlinePrize.cs
@@ -6,16 +6,12 @@
-public class DTCA308_tagMCOnlinePrize : DtcBasic {
OnlineRewardsModel m_OnlineRewardsModel;
- OnlineRewardsModel onlineRewardsModel { get { return m_OnlineRewardsModel ?? (m_OnlineRewardsModel = ModelCenter.Instance.GetModel<OnlineRewardsModel>()); } }
+public class DTCA308_tagMCOnlinePrize : DtcBasic
+{
- public override void Done(GameNetPackBasic vNetPack) {
- base.Done(vNetPack);
- HA308_tagMCOnlinePrize vNetData = vNetPack as HA308_tagMCOnlinePrize;
if (vNetData == null)
- {
- return;
- }
- onlineRewardsModel.GetMCOnlinePrize(vNetData.OnlineTime, vNetData.PrizeInfo);
-
+ public override void Done(GameNetPackBasic vNetPack)
+ {
+ base.Done(vNetPack);
+ HA308_tagMCOnlinePrize vNetData = vNetPack as HA308_tagMCOnlinePrize;
}
}
diff --git a/System/OpenServerActivity/ImpactRankModel.cs b/System/OpenServerActivity/ImpactRankModel.cs
index 032f77c..1c52f3e 100644
--- a/System/OpenServerActivity/ImpactRankModel.cs
+++ b/System/OpenServerActivity/ImpactRankModel.cs
@@ -42,7 +42,6 @@
}
}
UpdateRedpoint();
- OSCEffectOpen = TimeUtility.OpenDay < ModelCenter.Instance.GetModel<OnlineRewardsModel>().onlineRewardsCloseDay;
}
private void OnFuncStateChangeEvent(int _id)
diff --git a/System/OpenServerActivity/OnlineRewards.cs b/System/OpenServerActivity/OnlineRewards.cs
deleted file mode 100644
index 3bbe9c9..0000000
--- a/System/OpenServerActivity/OnlineRewards.cs
+++ /dev/null
@@ -1,234 +0,0 @@
-锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
-// [ Date ]: Tuesday, March 06, 2018
-//--------------------------------------------------------
-using UnityEngine;
-using System.Collections;
-using UnityEngine.UI;
-using System.Collections.Generic;
-
-namespace Snxxz.UI
-{
-
- public class OnlineRewards : MonoBehaviour
- {
- [SerializeField] Text m_Award;
- [SerializeField] Transform m_Group;
- [SerializeField] Text m_NextTime;
- OnlineRewardsModel m_OnlineRewardsModel;
- OnlineRewardsModel OnlineRewardsModel { get { return m_OnlineRewardsModel ?? (m_OnlineRewardsModel = ModelCenter.Instance.GetModel<OnlineRewardsModel>()); } }
- ItemTipsModel _itemTipsModel;
- ItemTipsModel itemTipsModel { get { return _itemTipsModel ?? (_itemTipsModel = ModelCenter.Instance.GetModel<ItemTipsModel>()); } }
-
- public void IsReceiveAward(int Day)
- {
- DayText(Day);
- int NowDay = TimeUtility.CreateDays;
- if (Day < NowDay)
- {
- UsedDay(Day);
- m_NextTime.gameObject.SetActive(false);
- }
- else if (Day == NowDay)
- {
- ToDay(Day);
- m_NextTime.gameObject.SetActive(false);
- }
- else if (Day > NowDay)
- {
- NoShow(Day);
- m_NextTime.gameObject.SetActive(true);
- if (Day - NowDay == 1)
- {
- m_NextTime.text = Language.Get("Tomorrow_Draw");
- }
- else
- {
- m_NextTime.text = string.Format(Language.Get("Rest_Time"), Day - NowDay);
- }
- }
-
- }
-
- private void UsedDay(int Day)
- {
- for (int i = 0; i < m_Group.childCount; i++)
- {
- m_Group.GetChild(i).gameObject.SetActive(false);
- }
- int[] TimeMinute = OnlineRewardsModel.OnlineRewards[Day].TimeMinute;
- ImpactRankModel.RankAwardItem RankAwardItem = OnlineRewardsModel.OnlineRewards[Day].RankAwardItem;
- int type = 0;
- for (int i = 0; i < TimeMinute.Length; i++)
- {
- int Inedx = 0;
- m_Group.GetChild(i).gameObject.SetActive(true);
- type += 1;
- OnliineRewardItemCell onliineRewardItemCell = m_Group.GetChild(i).GetComponent<OnliineRewardItemCell>();
- onliineRewardItemCell.CumulativeTime.gameObject.SetActive(true);
- onliineRewardItemCell.UIeffect.SetActive(false);
- List<AwardItem> itemList = RankAwardItem.GetAwardItem(type);
- AwardItem item = itemList[0];
- ItemCell itemCell = onliineRewardItemCell.ItemCell;
- int getType = i;
- if (!OnlineRewardsModel.AcceptDrizeAllDic.ContainsKey(Day))
- {
- return;
- }
- int state = OnlineRewardsModel.AcceptDrizeAllDic[Day][TimeMinute[getType]]; ;
- if (state == -1)
- {
- onliineRewardItemCell.Image.SetActive(false);
- onliineRewardItemCell.CumulativeTime.text = Language.Get("TheCumulativeOnlineMiss");
- }
- else if (state == 0)
- {
- onliineRewardItemCell.Image.SetActive(false);
- onliineRewardItemCell.CumulativeTime.text = Language.Get("TheCumulativeOnlineMiss");
- Inedx = i + 1;
- }
- else if (state == 1)
- {
- onliineRewardItemCell.Image.SetActive(true);
- onliineRewardItemCell.CumulativeTime.text = Language.Get("RealmPractice110");
- }
- ItemCellModel cellModel = new ItemCellModel(item.item.id, true, (ulong)item.item.count, item.isBind);
- itemCell.Init(cellModel);
- itemCell.cellBtn.RemoveAllListeners();
- itemCell.cellBtn.AddListener(() =>
- {
- ItemAttrData attrData = new ItemAttrData(item.item.id, false, (ulong)item.item.count, -1, item.isBind);
- itemTipsModel.SetItemTipsModel(attrData);
- });
- }
- }
-
-
- private void NoShow(int Day)
- {
- for (int i = 0; i < m_Group.childCount; i++)
- {
- m_Group.GetChild(i).gameObject.SetActive(false);
- }
- int[] TimeMinute = OnlineRewardsModel.OnlineRewards[Day].TimeMinute;
- ImpactRankModel.RankAwardItem RankAwardItem = OnlineRewardsModel.OnlineRewards[Day].RankAwardItem;
- int type = 0;
- for (int i = 0; i < TimeMinute.Length; i++)
- {
- type += 1;
- m_Group.GetChild(i).gameObject.SetActive(true);
- OnliineRewardItemCell onliineRewardItemCell = m_Group.GetChild(i).GetComponent<OnliineRewardItemCell>();
- onliineRewardItemCell.CumulativeTime.gameObject.SetActive(true);
- onliineRewardItemCell.UIeffect.SetActive(false);
- onliineRewardItemCell.CumulativeTime.text =Language.Get("L1057");
- List<AwardItem> itemList = RankAwardItem.GetAwardItem(type);
- AwardItem item = itemList[0];
- onliineRewardItemCell.Image.SetActive(false);
- ItemCell itemCell = onliineRewardItemCell.ItemCell;
- ItemCellModel cellModel = new ItemCellModel(item.item.id, true, (ulong)item.item.count, item.isBind);
- itemCell.Init(cellModel);
- itemCell.cellBtn.RemoveAllListeners();
- itemCell.cellBtn.AddListener(() =>
- {
- ItemAttrData attrData = new ItemAttrData(item.item.id, false, (ulong)item.item.count, -1, item.isBind);
- itemTipsModel.SetItemTipsModel(attrData);
- });
- }
- }
-
-
- private void ToDay(int Day)//杩欐槸浠婂ぉ鐨�
- {
- for (int i = 0; i < m_Group.childCount; i++)
- {
- m_Group.GetChild(i).gameObject.SetActive(false);
- }
- int[] TimeMinute = OnlineRewardsModel.OnlineRewards[Day].TimeMinute;
- ImpactRankModel.RankAwardItem RankAwardItem = OnlineRewardsModel.OnlineRewards[Day].RankAwardItem;
- int type = 0;
- for (int i = 0; i < TimeMinute.Length; i++)
- {
- int Inedx = 0;
- m_Group.GetChild(i).gameObject.SetActive(true);
- type += 1;
- OnliineRewardItemCell onliineRewardItemCell = m_Group.GetChild(i).GetComponent<OnliineRewardItemCell>();
- onliineRewardItemCell.CumulativeTime.gameObject.SetActive(true);
- onliineRewardItemCell.CumulativeTime.text = string.Format(Language.Get("TheCumulativeOnline"), TimeMinute[i]);
- List<AwardItem> itemList = RankAwardItem.GetAwardItem(type);
- AwardItem item = itemList[0];
- ItemCell itemCell = onliineRewardItemCell.ItemCell;
- int getType = i;
- if (!OnlineRewardsModel.AcceptDrizeAllDic.ContainsKey(Day))
- {
- return;
- }
- int state = OnlineRewardsModel.AcceptDrizeAllDic[Day][TimeMinute[getType]];
- onliineRewardItemCell.UIeffect.SetActive(false);
- if (state == -1)
- {
- onliineRewardItemCell.Image.SetActive(false);
- } else if (state == 0)
- {
- onliineRewardItemCell.UIeffect.SetActive(true);
- onliineRewardItemCell.Image.SetActive(false);
- onliineRewardItemCell.CumulativeTime.text = Language.Get("TheCumulativeOnlineRewards");
- Inedx = i + 1;
- } else if (state == 1)
- {
- onliineRewardItemCell.Image.SetActive(true);
- onliineRewardItemCell.CumulativeTime.text = Language.Get("RealmPractice110");
- }
- ItemCellModel cellModel = new ItemCellModel(item.item.id, true, (ulong)item.item.count, item.isBind);
- itemCell.Init(cellModel);
- itemCell.cellBtn.RemoveAllListeners();
- itemCell.cellBtn.AddListener(() =>
- {
- if (state == 0)
- {
- OnlineRewardsModel.SendReceiveAward(Inedx);
- }
- else
- {
- ItemAttrData attrData = new ItemAttrData(item.item.id, false, (ulong)item.item.count, -1, item.isBind);
- itemTipsModel.SetItemTipsModel(attrData);
- }
- });
- }
- }
-
- private void DayText(int day)
- {
- switch (day)
- {
- case 1:
- m_Award.text = Language.Get("One_day");
- break;
- case 2:
- m_Award.text = Language.Get("Two_day");
- break;
- case 3:
- m_Award.text = Language.Get("Three_day");
- break;
- case 4:
- m_Award.text = Language.Get("Four_day");
- break;
- case 5:
- m_Award.text = Language.Get("Five_day");
- break;
- case 6:
- m_Award.text = Language.Get("Six_day");
- break;
- case 7:
- m_Award.text = Language.Get("Seven_day");
- break;
- }
-
-
- }
-
-
- }
-}
-
-
-
diff --git a/System/OpenServerActivity/OnlineRewards.cs.meta b/System/OpenServerActivity/OnlineRewards.cs.meta
deleted file mode 100644
index 12e1c14..0000000
--- a/System/OpenServerActivity/OnlineRewards.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: a778d4d0caa62a64cba6012908a4d682
-timeCreated: 1520327958
-licenseType: Free
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/System/OpenServerActivity/OnlineRewardsModel.cs b/System/OpenServerActivity/OnlineRewardsModel.cs
deleted file mode 100644
index ed228e4..0000000
--- a/System/OpenServerActivity/OnlineRewardsModel.cs
+++ /dev/null
@@ -1,372 +0,0 @@
-锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
-// [ Date ]: Tuesday, March 06, 2018
-//--------------------------------------------------------
-//涓冨ぉ鍦ㄧ嚎濂栧姳
-using System;
-using System.Collections.Generic;
-using TableConfig;
-using Snxxz.UI;
-using System.Linq;
-
-public class OnlineRewardsModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk
-{
- public class OnlineRewardsClass
- {
- public int RewardID;
- public int[] TimeMinute;
- public ImpactRankModel.RankAwardItem RankAwardItem;//闃舵濂栧姳鏁版嵁
- }
- public Dictionary<int, OnlineRewardsClass> OnlineRewards = new Dictionary<int, OnlineRewardsClass>();//鍦ㄧ嚎绱濂栧姳淇℃伅
- public Dictionary<int, Dictionary<int, int>> AcceptDrizeAllDic = new Dictionary<int, Dictionary<int, int>>();//棰嗗璁板綍
-
- public uint CumulativeTime;//鑾峰彇绱鐧诲叆鏃堕棿
- public DateTime DateTime;//鑾峰彇鏃堕棿
- public int GetMaximumDuration;//鑾峰彇鏈�闀块鍙栨椂闂�
- public static event Action OnlineRewardsUpdate;
- private const int Redpoint_key1 = 20901;//涓冨ぉ绱鐧诲綍绾㈢偣
- private Redpoint redPointStre1 = new Redpoint(209, Redpoint_key1);
- public Redpoint onlineRedpoint { get { return redPointStre1; } }
- private List<int> OnlineRewardsTimeList = new List<int>();//姣忓ぉ濂栧姳鎯呭喌
- private bool IsRedPointBool = false;
- public int onlineRewardsCloseDay { get; private set; }
- public bool IsOk = false;
- public override void Init()
- {
- return;//-------------------
- var _cfg = Config.Instance.Get<FuncConfigConfig>("SevenOnlineReaward");
- onlineRewardsCloseDay = int.Parse(_cfg.Numerical1);
- GetMaximumDuration = int.Parse(_cfg.Numerical1);
-
-
- }
-
- public void OnBeforePlayerDataInitialize()
- {
- return;//-------------------
- IsOk = false;
- CumulativeTime = 0;
- //AcceptDrizeAllDic.Clear();
- }
-
- public void OnPlayerLoginOk()
- {
- return;//-------------------
- TimeUtility.OnServerOpenDayRefresh -= OnStepServerDay;
- FuncOpen.Instance.OnFuncStateChangeEvent -= OnFuncStateChangeEvent;
- GlobalTimeEvent.Instance.secondEvent -= secondEvent;
- TimeUtility.OnServerOpenDayRefresh += OnStepServerDay;
- FuncOpen.Instance.OnFuncStateChangeEvent += OnFuncStateChangeEvent;
- GlobalTimeEvent.Instance.secondEvent += secondEvent;
- IsOk = true;
- //OnlineRewards.Clear();
- //AcceptDrizeAllDic.Clear();
- DateTime = DateTime.Now;
- IsOkAward();
- DataReading();
- for (int i = 0; i < OnlineRewardsTimeList.Count; i++)
- {
- ISAwardInfo(CumulativeTime, OnlineRewardsTimeList[i], i + 1);
- }
- IsRedPointBool = true;
- OnlineRewardsPoint();
-
- if (WindowCenter.Instance.IsOpen<OnlineRewardsWin>() && OnlineRewardsUpdate != null)
- {
- OnlineRewardsUpdate();
- }
- }
-
-
- private void IsOkAward()
- {
- if (AcceptDrizeAllDic.Count != 0)
- {
- foreach (var key in AcceptDrizeAllDic.Keys)
- {
- Dictionary<int, int> dic = AcceptDrizeAllDic[key];
- foreach (var key1 in dic.Keys)
- {
- dic[key1] = -1;
- }
- AcceptDrizeAllDic[key] = dic;
- }
- }
-
- }
-
- private void secondEvent()
- {
- TimeSpan date = DateTime.Now - DateTime;
- date = date.Add(new TimeSpan(TimeSpan.TicksPerMillisecond * CumulativeTime));
-
- if (TimeUtility.CreateDays <= onlineRewardsCloseDay && date.TotalHours < GetMaximumDuration)
- {
- if (!AcceptDrizeAllDic.ContainsKey(TimeUtility.CreateDays))
- {
- return;
- }
- Dictionary<int, int> dic = AcceptDrizeAllDic[TimeUtility.CreateDays];
- var keys = new List<int>(dic.Keys);
-
- foreach (var key in keys)
- {
- if (dic.Count != 0)
- {
- if (date.TotalMinutes >= key && dic[key] == -1)
- {
- AcceptDrizeAllDic[TimeUtility.CreateDays][key] = 0;
- OnlineRewardsPoint();
- if (OnlineRewardsUpdate != null)
- {
- OnlineRewardsUpdate();
- }
- }
-
- }
- }
- }
- }
-
- public override void UnInit()
- {
-
-
-
- IsRedPointBool = false;
- }
-
- private void OnFuncStateChangeEvent(int obj)
- {
- if (obj == 125)
- {
- OnlineRewardsPoint();
- }
- }
-
- private void OnlineRewardsEvent()
- {
- OnlineRewardsPoint();
- }
- private void OnlineRewardsPoint()//涓冨ぉ绱鐧诲綍绾㈢偣
- {
- return;//-------------------
- if (!IsOk)
- {
- return;
- }
- redPointStre1.state = RedPointState.None;
- if (!FuncOpen.Instance.IsFuncOpen(125))
- {
- return;
- }
- bool Bool = false;
-
- if (AcceptDrizeAllDic.Count == 0 || TimeUtility.CreateDays >= onlineRewardsCloseDay || TimeUtility.CreateDays <= 0)
- {
- return;
- }
- Dictionary<int, int> Dic = AcceptDrizeAllDic[TimeUtility.CreateDays];
- foreach (var key in Dic.Keys)
- {
- if (Dic[key] == 0)
- {
- Bool = true;
- }
- }
- if (Bool)
- {
- redPointStre1.state = RedPointState.Simple;
- }
- }
- private void OnStepServerDay()
- {
- if (TimeUtility.CreateDays <= onlineRewardsCloseDay)
- {
- DateTime = DateTime.Now;
- }
- for (int i = 0; i < OnlineRewardsTimeList.Count; i++)
- {
- ISAwardInfo(CumulativeTime, OnlineRewardsTimeList[i], i + 1);
- }
- IsRedPointBool = true;
- OnlineRewardsPoint();
- }
-
- private void DataReading()
- {
- if (OnlineRewards.Count != 0)
- {
- return;
- }
- var OnlineRewardConfig = Config.Instance.GetAllValues<OnlineAwardConfig>();
- foreach (var value in OnlineRewardConfig)
- {
- if (!OnlineRewards.ContainsKey(value.RewardID))
- {
- OnlineRewardsClass onlineRewardsClass = new OnlineRewardsClass();
- onlineRewardsClass.RewardID = value.RewardID;
- onlineRewardsClass.TimeMinute = value.Time;
- if (!AcceptDrizeAllDic.ContainsKey(value.RewardID))
- {
- Dictionary<int, int> _Dic = new Dictionary<int, int>();
- for (int i = 0; i < value.Time.Length; i++)
- {
- _Dic.Add(value.Time[i], -1);
-
- }
- AcceptDrizeAllDic.Add(value.RewardID, _Dic);
-
- }
- ImpactRankModel.RankAwardItem _award = new ImpactRankModel.RankAwardItem();
- var _jsonData = LitJson.JsonMapper.ToObject(value.Reward);
- foreach (string key in _jsonData.Keys)
- {
- var time = int.Parse(key);
- var _itemArray = LitJson.JsonMapper.ToObject<int[][]>(_jsonData[key].ToJson());
- for (int j = 0; j < _itemArray.Length; j++)
- {
- _award.Add(time, new AwardItem()
- {
- item = new Item(_itemArray[j][0], _itemArray[j][1]),
- isBind = 1,
- });
- }
-
- }
- onlineRewardsClass.RankAwardItem = _award;
- OnlineRewards.Add(value.RewardID, onlineRewardsClass);
- }
- }
- }
- public void SendReceiveAward(int Index)//鍙戦�侀鍙栧鍔�
- {
- CA506_tagCMGetOnlinePrize CA506 = new CA506_tagCMGetOnlinePrize();
- CA506.Index = (byte)Index;
- GameNetSystem.Instance.SendInfo(CA506);
- }
-
- public void GetMCOnlinePrize(uint onlineTime, uint[] prizeInfo)//鑾峰彇鍦ㄦ兂濂栧姳
- {
- return;//-------------------
- CumulativeTime = onlineTime;
- DateTime = DateTime.Now;
- OnlineRewardsTimeList.Clear();
- for (int i = 0; i < prizeInfo.Length; i++)
- {
- OnlineRewardsTimeList.Add((int)prizeInfo[i]);
- }
- if (onlineTime <= 0)
- {
- ISOpenDayCler();
- }
- if (IsRedPointBool)
- {
- for (int i = 0; i < OnlineRewardsTimeList.Count; i++)
- {
- ISAwardInfo(CumulativeTime, OnlineRewardsTimeList[i], i + 1);
- }
- OnlineRewardsPoint();
- }
- if (OnlineRewardsUpdate != null && IsOk)
- {
- OnlineRewardsUpdate();
- }
- }
-
- private void ISOpenDayCler()
- {
- foreach (var value in OnlineRewards.Values)
- {
- if (!AcceptDrizeAllDic.ContainsKey(value.RewardID))
- {
-
- Dictionary<int, int> _Dic = new Dictionary<int, int>();
- for (int i = 0; i < value.TimeMinute.Length; i++)
- {
- _Dic.Add(value.TimeMinute[i], -1);
-
- }
- AcceptDrizeAllDic.Add(value.RewardID, _Dic);
- }
- else
- {
- Dictionary<int, int> _Dic = new Dictionary<int, int>();
- for (int i = 0; i < value.TimeMinute.Length; i++)
- {
- _Dic.Add(value.TimeMinute[i], -1);
-
- }
- AcceptDrizeAllDic[value.RewardID] = _Dic;
- }
-
- }
-
- }
-
- private void ISAwardInfo(uint onlineTime, int awardInfo, int Day)
- {
- TimeSpan date = new TimeSpan(TimeSpan.TicksPerMillisecond * onlineTime);
- int type = int.Parse(System.Convert.ToString(awardInfo, 2));
- string typeStr = string.Empty;
- if (type == 0)
- {
- typeStr = "0";
- }
- else
- {
- while (type != 0)
- {
- typeStr += type % 10;
- type = type / 10;
- }
- }
- if (!AcceptDrizeAllDic.ContainsKey(Day))
- {
- return;
- }
-
- if (TimeUtility.CreateDays <= onlineRewardsCloseDay && Day <= TimeUtility.CreateDays)
- {
- var keysList = AcceptDrizeAllDic[Day].Keys.ToList();
- int NeedTimeMinute = keysList[keysList.Count - 1];
- if (date.TotalMinutes >= NeedTimeMinute)
- {
- int Typei = -1;
- var keys = AcceptDrizeAllDic[Day].Keys.ToList();
- for (int i = 0; i < keys.Count; i++)
- {
- Typei += 1;
- if (Typei < typeStr.Length)
- {
- AcceptDrizeAllDic[Day][(keys[i])] = int.Parse(typeStr[Typei].ToString());
- }
- else
- {
- AcceptDrizeAllDic[Day][(keys[i])] = 0;
- }
- }
- }
- else
- {
- if (int.Parse(typeStr) != 0)
- {
- int Typei = -1;
- var keys = AcceptDrizeAllDic[Day].Keys.ToList();
- for (int i = 0; i < keys.Count; i++)
- {
- Typei += 1;
- if (Typei < typeStr.Length)
- {
- AcceptDrizeAllDic[Day][(keys[i])] = int.Parse(typeStr[Typei].ToString());
- }
- }
- }
- }
- }
- }
-}
-
-
-
-
diff --git a/System/OpenServerActivity/OnlineRewardsModel.cs.meta b/System/OpenServerActivity/OnlineRewardsModel.cs.meta
deleted file mode 100644
index cecf40a..0000000
--- a/System/OpenServerActivity/OnlineRewardsModel.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: 59a03e28e7e60c54cb9af3a1a6dc8c20
-timeCreated: 1520328636
-licenseType: Free
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/System/OpenServerActivity/OnlineRewardsOnTime.cs b/System/OpenServerActivity/OnlineRewardsOnTime.cs
deleted file mode 100644
index 5b7ff68..0000000
--- a/System/OpenServerActivity/OnlineRewardsOnTime.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
-// [ Date ]: Friday, June 22, 2018
-//--------------------------------------------------------
-using UnityEngine;
-using System.Collections;
-using UnityEngine.UI;
-using System.Collections.Generic;
-
-namespace Snxxz.UI {
-
- public class OnlineRewardsOnTime:MonoBehaviour {
-
- [SerializeField] Text m_NeedTime;//闇�瑕佹椂闂�
- [SerializeField] Transform m_Group;
- [SerializeField] Button m_Receive;//棰嗗彇鎸夐挳
- [SerializeField] GameObject m_AlreadyReceive;//宸查鍙�
- [SerializeField] GameObject m_NotReach;//鏈揪鎴�
-
- OnlineRewardsModel m_OnlineRewardsModel;
- OnlineRewardsModel OnlineRewardsModel { get { return m_OnlineRewardsModel ?? (m_OnlineRewardsModel = ModelCenter.Instance.GetModel<OnlineRewardsModel>()); } }
- ItemTipsModel _itemTipsModel;
- ItemTipsModel itemTipsModel { get { return _itemTipsModel ?? (_itemTipsModel = ModelCenter.Instance.GetModel<ItemTipsModel>()); } }
-
- List<int> MinutesList = new List<int>();
- public void GetMinutes(int minutes)
- {
- m_Receive.gameObject.SetActive(false);
- m_AlreadyReceive.SetActive(false);
- m_NotReach.SetActive(false);
- MinutesList.Clear();
- m_NeedTime.text = string.Format(Language.Get("OnlineTime_Z"), minutes);
- if (!OnlineRewardsModel.OnlineRewards.ContainsKey(TimeUtility.CreateDays))
- {
- return;
- }
- int[] TimeMinute = OnlineRewardsModel.OnlineRewards[TimeUtility.CreateDays].TimeMinute;
-
- for (int i = 0; i < TimeMinute.Length; i++)
- {
- MinutesList.Add(TimeMinute[i]);
- }
- int typeIndex = MinutesList.IndexOf(minutes) + 1;
- ImpactRankModel.RankAwardItem RankAwardItem = OnlineRewardsModel.OnlineRewards[TimeUtility.CreateDays].RankAwardItem;
- List<AwardItem> itemList = RankAwardItem.GetAwardItem(typeIndex);
- for (int i = 0; i < m_Group.childCount; i++)
- {
- m_Group.GetChild(i).gameObject.SetActive(false);
- }
- int state = OnlineRewardsModel.AcceptDrizeAllDic[TimeUtility.CreateDays][TimeMinute[typeIndex-1]];
- for (int j = 0; j < itemList.Count; j++)
- {
- m_Group.GetChild(j).gameObject.SetActive(true);
- OnliineRewardItemCell onliineRewardItemCell = m_Group.GetChild(j).GetComponent<OnliineRewardItemCell>();
- onliineRewardItemCell.CumulativeTime.gameObject.SetActive(false);
- if (state == 1)
- {
- onliineRewardItemCell.Image.SetActive(true);
- }
- else
- {
- onliineRewardItemCell.Image.SetActive(false);
- }
- AwardItem item = itemList[j];
- ItemCell itemCell = onliineRewardItemCell.ItemCell;
- ItemCellModel cellModel = new ItemCellModel(item.item.id, true, (ulong)item.item.count, item.isBind);
- itemCell.Init(cellModel);
- itemCell.cellBtn.RemoveAllListeners();
- itemCell.cellBtn.AddListener(() => {
- ItemAttrData attrData = new ItemAttrData(item.item.id, false, (ulong)item.item.count, -1, item.isBind);
- itemTipsModel.SetItemTipsModel(attrData);
- });
- }
- if (state < 0)
- {
- m_NotReach.SetActive(true);
- }
- else if (state == 0)
- {
- m_Receive.gameObject.SetActive(true);
- m_Receive.RemoveAllListeners();
- m_Receive.AddListener(() => { OnlineRewardsModel.SendReceiveAward(typeIndex); });
- }
- else if (state > 0)
- {
- m_AlreadyReceive.SetActive(true);
- }
-
- }
- }
-
-}
-
-
-
diff --git a/System/OpenServerActivity/OnlineRewardsOnTime.cs.meta b/System/OpenServerActivity/OnlineRewardsOnTime.cs.meta
deleted file mode 100644
index 9ac4189..0000000
--- a/System/OpenServerActivity/OnlineRewardsOnTime.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: 58356a40fb5b7a44ca5f4a75eea477f4
-timeCreated: 1529674669
-licenseType: Free
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/System/OpenServerActivity/OnlineRewardsWin.cs b/System/OpenServerActivity/OnlineRewardsWin.cs
deleted file mode 100644
index 4d8b015..0000000
--- a/System/OpenServerActivity/OnlineRewardsWin.cs
+++ /dev/null
@@ -1,190 +0,0 @@
-锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
-// [ Date ]: Tuesday, March 06, 2018
-//--------------------------------------------------------
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using UnityEngine.UI;
-//鍦ㄧ嚎濂栧姳闈㈡澘
-namespace Snxxz.UI {
-
- public class OnlineRewardsWin : Window
- {
- [SerializeField] ScrollerController m_ScrollerController;
- [SerializeField] Text m_TimeText;
- [SerializeField] Text m_timeRemainingText;
- #region Built-in
- OnlineRewardsModel m_OnlineRewardsModel;
- OnlineRewardsModel OnlineRewardsModel { get { return m_OnlineRewardsModel ?? (m_OnlineRewardsModel = ModelCenter.Instance.GetModel<OnlineRewardsModel>()); } }
- public int DaysRemaining = 7;//
- protected override void BindController()
- {
-
- }
-
- protected override void AddListeners()
- {
- }
-
- protected override void OnPreOpen()
- {
- m_ScrollerController.OnRefreshCell += OnRefreshGridCellOnlineTime;
- TimeUtility.OnServerOpenDayRefresh += OnStepServerDay;
- OnlineRewardsModel.OnlineRewardsUpdate += OnlineRewardsUpdate;
- GlobalTimeEvent.Instance.secondEvent += secondEvent;
- if (DaysRemaining - TimeUtility.CreateDays >= 0)
- {
-
-
- if (DaysRemaining - TimeUtility.CreateDays == 0)
- {
-
- }
- else
- {
- m_timeRemainingText.text = string.Format(Language.Get("TimeRemainingText"), DaysRemaining - (TimeUtility.CreateDays));
- }
- }
- else
- {
- m_timeRemainingText.text = Language.Get("ActivityEnd");
- }
-
- //OnCreateGridLineCell(m_ScrollerController);
- OnCreateGridLineCellOnlineTime(m_ScrollerController);
- // m_ScrollerController.JumpIndex(Jump());
- }
-
- protected override void OnAfterOpen()
- {
- }
-
- protected override void OnPreClose()
- {
- m_ScrollerController.OnRefreshCell -= OnRefreshGridCellOnlineTime;
- TimeUtility.OnServerOpenDayRefresh -= OnStepServerDay;
- OnlineRewardsModel.OnlineRewardsUpdate -= OnlineRewardsUpdate;
- GlobalTimeEvent.Instance.secondEvent -= secondEvent;
- }
-
- private void secondEvent()
- {
- if (DaysRemaining - TimeUtility.CreateDays == 0)
- {
- m_timeRemainingText.text = (23 - DateTime.Now.Hour) + Language.Get("Hour") + (60 - DateTime.Now.Minute) + Language.Get("Minute") + (60 - DateTime.Now.Second) + Language.Get("RealmWin_Bewrite_35");
- }
- }
-
- private void OnlineRewardsEvent()
- {
- m_ScrollerController.m_Scorller.RefreshActiveCellViews();//鍒锋柊鍙
- }
-
- private void OnlineRewardsUpdate()
- {
- m_ScrollerController.m_Scorller.RefreshActiveCellViews();//鍒锋柊鍙
- }
-
- private void OnStepServerDay()
- {
- if (DaysRemaining - TimeUtility.CreateDays >= 0)
- {
-
- m_timeRemainingText.text = string.Format(Language.Get("TimeRemainingText"), DaysRemaining - (TimeUtility.CreateDays));
- }
- else
- {
- m_timeRemainingText.text = Language.Get("ActivityEnd");
- }
- if (OnlineRewardsModel.IsOk)
- {
- OnCreateGridLineCellOnlineTime(m_ScrollerController);
- // OnCreateGridLineCell(m_ScrollerController);
- }
-
- }
-
- protected override void OnAfterClose()
- {
- }
- //void OnCreateGridLineCell(ScrollerController gridCtrl)//棰勫埗浣撳垱寤�
- //{
- // gridCtrl.Refresh();
-
- // if (TimeUtility.CreateDays <= OnlineRewardsModel.onlineRewardsCloseDay)
- // {
-
- // foreach (var Key in OnlineRewardsModel.OnlineRewards.Keys)
- // {
- // gridCtrl.AddCell(ScrollerDataType.Header, Key);
- // }
- // }
-
- // gridCtrl.Restart();
- //}
- //private void OnRefreshGridCell(ScrollerDataType type, CellView cell)
- //{
- // int day = cell.index;
- // OnlineRewards onlineRewards = cell.GetComponent<OnlineRewards>();
- // onlineRewards.IsReceiveAward(day);
- //}
-//============================================
- private void OnCreateGridLineCellOnlineTime(ScrollerController gridCtrl)
- {
- gridCtrl.Refresh();
- if (OnlineRewardsModel.OnlineRewards.ContainsKey(TimeUtility.CreateDays))
- {
- int[] TimeMinute = OnlineRewardsModel.OnlineRewards[TimeUtility.CreateDays].TimeMinute;
- for (int i = 0; i < TimeMinute.Length; i++)
- {
- gridCtrl.AddCell(ScrollerDataType.Header, TimeMinute[i]);
- }
- }
- gridCtrl.Restart();
- }
-
- private void OnRefreshGridCellOnlineTime(ScrollerDataType type, CellView cell)
- {
- int minute = cell.index;
- OnlineRewardsOnTime onlineRewards = cell.GetComponent<OnlineRewardsOnTime>();
- onlineRewards.GetMinutes(minute);
- }
- protected override void LateUpdate()
- {
-
- TimeSpan date = (DateTime.Now- OnlineRewardsModel.DateTime);
- date= date.Add(new TimeSpan(TimeSpan.TicksPerMillisecond* OnlineRewardsModel.CumulativeTime));
- if (date.Hours > 0)
- {
- m_TimeText.text = date.Hours + Language.Get("RealmWin_Bewrite_33") + date.Minutes + Language.Get("Minute") + date.Seconds + Language.Get("RealmWin_Bewrite_35");
- }
- else if (date.Minutes > 0)
- {
- m_TimeText.text = date.Minutes + Language.Get("Minute") + date.Seconds + Language.Get("RealmWin_Bewrite_35");
- }
- else if (date.Seconds > 0)
- {
- m_TimeText.text =date.Seconds + Language.Get("RealmWin_Bewrite_35");
- }
- }
- private int Jump()
- {
- if (TimeUtility.CreateDays <= OnlineRewardsModel.onlineRewardsCloseDay)
- {
- return TimeUtility.CreateDays - 1;
- }
- return 0;
-
- }
- #endregion
-
- }
-
-}
-
-
-
-
diff --git a/System/OpenServerActivity/OnlineRewardsWin.cs.meta b/System/OpenServerActivity/OnlineRewardsWin.cs.meta
deleted file mode 100644
index a7e569b..0000000
--- a/System/OpenServerActivity/OnlineRewardsWin.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: fc45168d03be18546afdeb133e925bff
-timeCreated: 1520336133
-licenseType: Pro
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/System/WindowBase/ModelCenter.cs b/System/WindowBase/ModelCenter.cs
index cd10e20..0b132b5 100644
--- a/System/WindowBase/ModelCenter.cs
+++ b/System/WindowBase/ModelCenter.cs
@@ -156,7 +156,6 @@
RegisterModel<ItemUseModel>();
RegisterModel<ImpactRankModel>();
RegisterModel<InSevenDayModel>();
- RegisterModel<OnlineRewardsModel>();
RegisterModel<LevelGiftModel>();
RegisterModel<PlayerSuitModel>();
RegisterModel<CapacityDelayModel>();
--
Gitblit v1.8.0