|
@@ -9,7 +9,7 @@ using UI.DressUp;
|
|
|
|
|
|
namespace GFGGame
|
|
namespace GFGGame
|
|
{
|
|
{
|
|
- public class LimitedTimeGiftBoxDataManager : SingletonBase<EnduringGiftBoxDataManager>
|
|
|
|
|
|
+ public class LimitedTimeGiftBoxDataManager : SingletonBase<LimitedTimeGiftBoxDataManager>
|
|
{
|
|
{
|
|
//测试数据定义--等之后搞好活动有效期组件之后,再替换成真实数据 <活动id,活动结束时间戳精确到秒> --假设这个就是我排好序的活动列表
|
|
//测试数据定义--等之后搞好活动有效期组件之后,再替换成真实数据 <活动id,活动结束时间戳精确到秒> --假设这个就是我排好序的活动列表
|
|
private Dictionary<int, ActivityOpenData> _activityOpenEndTimeDic = new Dictionary<int, ActivityOpenData>();
|
|
private Dictionary<int, ActivityOpenData> _activityOpenEndTimeDic = new Dictionary<int, ActivityOpenData>();
|
|
@@ -18,12 +18,15 @@ namespace GFGGame
|
|
|
|
|
|
//列表数据3--等级条件的数据
|
|
//列表数据3--等级条件的数据
|
|
private List<LimitedTimeGiftBoxItemData> _ltgGbItemData3 = new List<LimitedTimeGiftBoxItemData>();
|
|
private List<LimitedTimeGiftBoxItemData> _ltgGbItemData3 = new List<LimitedTimeGiftBoxItemData>();
|
|
|
|
+ public List<LimitedTimeGiftBoxItemData> LtgGbItemData3 => _ltgGbItemData3;
|
|
|
|
|
|
- //圆形样式数据4--等级条件的数据
|
|
|
|
- private List<LimitedTimeGiftBoxItemData2> _ltgGbItemData4 = new List<LimitedTimeGiftBoxItemData2>();
|
|
|
|
|
|
+ //圆形样式数据4--等级条件的数据
|
|
|
|
+ private List<LimitedTimeGiftBoxItemYxData> _ltgGbItemData4 = new List<LimitedTimeGiftBoxItemYxData>();
|
|
|
|
+ public List<LimitedTimeGiftBoxItemYxData> LtgGbItemData4 => _ltgGbItemData4;
|
|
|
|
|
|
//圆形样式数据5--时间条件的数据
|
|
//圆形样式数据5--时间条件的数据
|
|
- private List<LimitedTimeGiftBoxItemData2> _ltgGbItemData5 = new List<LimitedTimeGiftBoxItemData2>();
|
|
|
|
|
|
+ private List<LimitedTimeGiftBoxItemYxData> _ltgGbItemData5 = new List<LimitedTimeGiftBoxItemYxData>();
|
|
|
|
+ public List<LimitedTimeGiftBoxItemYxData> LtgGbItemData5 => _ltgGbItemData5;
|
|
|
|
|
|
// public void InitData()
|
|
// public void InitData()
|
|
// {
|
|
// {
|
|
@@ -32,7 +35,7 @@ namespace GFGGame
|
|
// _ltgGbItemData4.Clear();
|
|
// _ltgGbItemData4.Clear();
|
|
// _ltgGbItemData5.Clear();
|
|
// _ltgGbItemData5.Clear();
|
|
// }
|
|
// }
|
|
-
|
|
|
|
|
|
+
|
|
public void UpAllData()
|
|
public void UpAllData()
|
|
{
|
|
{
|
|
//UpActivityOpenEndTimeDic(); //等之后搞好活动有效期组件之后,再替换成真实数据的更新
|
|
//UpActivityOpenEndTimeDic(); //等之后搞好活动有效期组件之后,再替换成真实数据的更新
|
|
@@ -40,19 +43,21 @@ namespace GFGGame
|
|
UpLtgGbItemData4();
|
|
UpLtgGbItemData4();
|
|
UpLtgGbItemData5();
|
|
UpLtgGbItemData5();
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
public void UpLtgGbItemData3()
|
|
public void UpLtgGbItemData3()
|
|
{
|
|
{
|
|
_ltgGbItemData3.Clear();
|
|
_ltgGbItemData3.Clear();
|
|
foreach (var itemKv in _activityOpenEndTimeDic)
|
|
foreach (var itemKv in _activityOpenEndTimeDic)
|
|
{
|
|
{
|
|
- if (itemKv.Value.ActivityEndTime >= 0) //当前服务器时间戳---稍迟再从原来的代码里找个获取当前服务器时间戳的代码copy过来
|
|
|
|
|
|
+ if (itemKv.Value.ActivityEndTime >= TimeInfo.Instance.ServerNow())
|
|
{
|
|
{
|
|
ActivityOpenCfg activityOpenCfg = itemKv.Value.ActivityOpenCfgData;
|
|
ActivityOpenCfg activityOpenCfg = itemKv.Value.ActivityOpenCfgData;
|
|
//判断是否是类型3的数据
|
|
//判断是否是类型3的数据
|
|
- if (activityOpenCfg.type == 3)
|
|
|
|
|
|
+ if (activityOpenCfg.type == ConstActivityType.ActLimitGiftShByLevel)
|
|
{
|
|
{
|
|
- foreach (var shopCfgId in activityOpenCfg.paramsArr)
|
|
|
|
|
|
+ var paramsArr = activityOpenCfg.paramsArr;
|
|
|
|
+ Array.Sort(paramsArr);
|
|
|
|
+ foreach (var shopCfgId in paramsArr)
|
|
{
|
|
{
|
|
ShopCfg shopCfg = ShopCfgArray.Instance.GetCfg(shopCfgId);
|
|
ShopCfg shopCfg = ShopCfgArray.Instance.GetCfg(shopCfgId);
|
|
|
|
|
|
@@ -78,6 +83,7 @@ namespace GFGGame
|
|
ltgGbItemData.ShopCfgIds = new List<int> { shopCfgId };
|
|
ltgGbItemData.ShopCfgIds = new List<int> { shopCfgId };
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ ltgGbItemData.EndTime = itemKv.Value.ActivityEndTime;
|
|
_ltgGbItemData3.Add(ltgGbItemData);
|
|
_ltgGbItemData3.Add(ltgGbItemData);
|
|
}
|
|
}
|
|
else
|
|
else
|
|
@@ -85,7 +91,8 @@ namespace GFGGame
|
|
ltgGbItemData = new LimitedTimeGiftBoxItemData
|
|
ltgGbItemData = new LimitedTimeGiftBoxItemData
|
|
{
|
|
{
|
|
IndexType = shopCfg.menu2,
|
|
IndexType = shopCfg.menu2,
|
|
- ShopCfgIds = new List<int> { shopCfgId }
|
|
|
|
|
|
+ ShopCfgIds = new List<int> { shopCfgId },
|
|
|
|
+ EndTime = itemKv.Value.ActivityEndTime
|
|
};
|
|
};
|
|
|
|
|
|
_ltgGbItemData3.Add(ltgGbItemData);
|
|
_ltgGbItemData3.Add(ltgGbItemData);
|
|
@@ -94,6 +101,8 @@ namespace GFGGame
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ _ltgGbItemData3 = _ltgGbItemData3.OrderBy(a => a.IndexType).ToList();
|
|
}
|
|
}
|
|
|
|
|
|
public void UpLtgGbItemData4()
|
|
public void UpLtgGbItemData4()
|
|
@@ -101,15 +110,15 @@ namespace GFGGame
|
|
_ltgGbItemData4.Clear();
|
|
_ltgGbItemData4.Clear();
|
|
foreach (var itemKv in _activityOpenEndTimeDic)
|
|
foreach (var itemKv in _activityOpenEndTimeDic)
|
|
{
|
|
{
|
|
- if (itemKv.Value.ActivityEndTime >= 0) //当前服务器时间戳---稍迟再从原来的代码里找个获取当前服务器时间戳的代码copy过来
|
|
|
|
|
|
+ if (itemKv.Value.ActivityEndTime >= TimeInfo.Instance.ServerNow())
|
|
{
|
|
{
|
|
ActivityOpenCfg activityOpenCfg = itemKv.Value.ActivityOpenCfgData;
|
|
ActivityOpenCfg activityOpenCfg = itemKv.Value.ActivityOpenCfgData;
|
|
//判断是否是类型4的数据
|
|
//判断是否是类型4的数据
|
|
- if (activityOpenCfg.type == 4)
|
|
|
|
|
|
+ if (activityOpenCfg.type == ConstActivityType.ActLimitGiftYxByLevel)
|
|
{
|
|
{
|
|
foreach (var shopCfgId in activityOpenCfg.paramsArr)
|
|
foreach (var shopCfgId in activityOpenCfg.paramsArr)
|
|
{
|
|
{
|
|
- FillData(_ltgGbItemData4, shopCfgId);
|
|
|
|
|
|
+ FillData(_ltgGbItemData4, shopCfgId, itemKv.Value.ActivityEndTime);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -123,13 +132,13 @@ namespace GFGGame
|
|
_ltgGbItemData5.Clear();
|
|
_ltgGbItemData5.Clear();
|
|
foreach (var itemKv in _activityOpenEndTimeDic)
|
|
foreach (var itemKv in _activityOpenEndTimeDic)
|
|
{
|
|
{
|
|
- if (itemKv.Value.ActivityEndTime >= 0) //当前服务器时间戳---稍迟再从原来的代码里找个获取当前服务器时间戳的代码copy过来
|
|
|
|
|
|
+ if (itemKv.Value.ActivityEndTime >= TimeInfo.Instance.ServerNow())
|
|
{
|
|
{
|
|
ActivityOpenCfg activityOpenCfg = itemKv.Value.ActivityOpenCfgData;
|
|
ActivityOpenCfg activityOpenCfg = itemKv.Value.ActivityOpenCfgData;
|
|
//判断是否是类型4的数据
|
|
//判断是否是类型4的数据
|
|
- if (activityOpenCfg.type == 5)
|
|
|
|
|
|
+ if (activityOpenCfg.type == ConstActivityType.ActLimitGiftYxByTime)
|
|
{
|
|
{
|
|
- FillData(_ltgGbItemData5, activityOpenCfg.paramsArr[0]);
|
|
|
|
|
|
+ FillData(_ltgGbItemData5, activityOpenCfg.paramsArr[0], itemKv.Value.ActivityEndTime);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -137,7 +146,7 @@ namespace GFGGame
|
|
_ltgGbItemData5 = _ltgGbItemData5.OrderBy(a => a.ShopCfgId).ToList();
|
|
_ltgGbItemData5 = _ltgGbItemData5.OrderBy(a => a.ShopCfgId).ToList();
|
|
}
|
|
}
|
|
|
|
|
|
- private void FillData(List<LimitedTimeGiftBoxItemData2> listData, int shopCfgId)
|
|
|
|
|
|
+ private void FillData(List<LimitedTimeGiftBoxItemYxData> listData, int shopCfgId, long endTime)
|
|
{
|
|
{
|
|
ShopCfg shopCfg = ShopCfgArray.Instance.GetCfg(shopCfgId);
|
|
ShopCfg shopCfg = ShopCfgArray.Instance.GetCfg(shopCfgId);
|
|
|
|
|
|
@@ -150,8 +159,9 @@ namespace GFGGame
|
|
var ltgGbItemData = listData.FirstOrDefault(a => a.ShopCfgId == shopCfgId);
|
|
var ltgGbItemData = listData.FirstOrDefault(a => a.ShopCfgId == shopCfgId);
|
|
if (ltgGbItemData == null)
|
|
if (ltgGbItemData == null)
|
|
{
|
|
{
|
|
- listData.Add(new LimitedTimeGiftBoxItemData2
|
|
|
|
|
|
+ listData.Add(new LimitedTimeGiftBoxItemYxData
|
|
{
|
|
{
|
|
|
|
+ EndTime = endTime,
|
|
ShopCfgId = shopCfg.id,
|
|
ShopCfgId = shopCfg.id,
|
|
IndexType = shopCfg.menu2
|
|
IndexType = shopCfg.menu2
|
|
});
|
|
});
|
|
@@ -160,40 +170,9 @@ namespace GFGGame
|
|
{
|
|
{
|
|
var index = listData.IndexOf(ltgGbItemData);
|
|
var index = listData.IndexOf(ltgGbItemData);
|
|
ltgGbItemData.IndexType = shopCfg.menu2;
|
|
ltgGbItemData.IndexType = shopCfg.menu2;
|
|
|
|
+ ltgGbItemData.EndTime = endTime;
|
|
listData[index] = ltgGbItemData;
|
|
listData[index] = ltgGbItemData;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
-
|
|
|
|
- public class ActivityOpenData
|
|
|
|
- {
|
|
|
|
- //活动开启配置
|
|
|
|
- public ActivityOpenCfg ActivityOpenCfgData;
|
|
|
|
-
|
|
|
|
- //活动结束时间戳
|
|
|
|
- public long ActivityEndTime;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- /// <summary>
|
|
|
|
- /// 限时礼包列表数据模型
|
|
|
|
- /// </summary>
|
|
|
|
- public class LimitedTimeGiftBoxItemData
|
|
|
|
- {
|
|
|
|
- //限时礼包_ShopCfg的menu2
|
|
|
|
- public int IndexType;
|
|
|
|
-
|
|
|
|
- //只存同一个menu2的3条数据,超出忽略
|
|
|
|
- public List<int> ShopCfgIds;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- /// <summary>
|
|
|
|
- /// 圆形样式数据模型
|
|
|
|
- /// </summary>
|
|
|
|
- public class LimitedTimeGiftBoxItemData2
|
|
|
|
- {
|
|
|
|
- public int ShopCfgId;
|
|
|
|
-
|
|
|
|
- //限时礼包_ShopCfg的menu2
|
|
|
|
- public int IndexType;
|
|
|
|
- }
|
|
|
|
}
|
|
}
|