|
|
@@ -162,23 +162,24 @@ namespace GFGGame
|
|
|
|
|
|
public List<GiftBagCfg> GetGiftBagCfgs()
|
|
|
{
|
|
|
- List<GiftBagCfg> giftBagCfgs = new List<GiftBagCfg>();
|
|
|
+ // List<GiftBagCfg> giftBagCfgs = new List<GiftBagCfg>();
|
|
|
|
|
|
- List<GiftBagCfg> noneGiftBagCfgs = GetNoneGiftCfg();
|
|
|
- giftBagCfgs = giftBagCfgs.Concat(noneGiftBagCfgs).ToList<GiftBagCfg>();
|
|
|
+ // List<GiftBagCfg> noneGiftBagCfgs = GetNoneGiftCfg();
|
|
|
+ // giftBagCfgs = giftBagCfgs.Concat(noneGiftBagCfgs).ToList<GiftBagCfg>();
|
|
|
|
|
|
- GiftBagCfg StoryLvGiftCfg = GetStoryLvGiftCfg();
|
|
|
- if (StoryLvGiftCfg != null) giftBagCfgs.Add(StoryLvGiftCfg);
|
|
|
- GiftBagCfg RoleLvGiftCfg = GetRoleLvGiftCfg();
|
|
|
- if (RoleLvGiftCfg != null) giftBagCfgs.Add(RoleLvGiftCfg);
|
|
|
- giftBagCfgs = RemoveNotOpenCfg(giftBagCfgs);
|
|
|
- SortGiftBagCfgs(giftBagCfgs);
|
|
|
- return giftBagCfgs;
|
|
|
+ // GiftBagCfg StoryLvGiftCfg = GetStoryLvGiftCfg();
|
|
|
+ // if (StoryLvGiftCfg != null) giftBagCfgs.Add(StoryLvGiftCfg);
|
|
|
+ // GiftBagCfg RoleLvGiftCfg = GetRoleLvGiftCfg();
|
|
|
+ // if (RoleLvGiftCfg != null) giftBagCfgs.Add(RoleLvGiftCfg);
|
|
|
+ // giftBagCfgs = RemoveNotOpenCfg(giftBagCfgs);
|
|
|
+ // SortGiftBagCfgs(giftBagCfgs);
|
|
|
+ // return giftBagCfgs;
|
|
|
+ return null;
|
|
|
}
|
|
|
|
|
|
- private List<GiftBagCfg> SortGiftBagCfgs(List<GiftBagCfg> giftBagCfgs)
|
|
|
+ public List<ShopCfg> SortGiftBagCfgs(List<ShopCfg> shopCfgs)
|
|
|
{
|
|
|
- giftBagCfgs.Sort((GiftBagCfg a, GiftBagCfg b) =>
|
|
|
+ shopCfgs.Sort((ShopCfg a, ShopCfg b) =>
|
|
|
{
|
|
|
|
|
|
//未售罄的＞未解锁>已售罄的
|
|
|
@@ -205,16 +206,23 @@ namespace GFGGame
|
|
|
|
|
|
|
|
|
|
|
|
- int descA = a.desc == "" ? 0 : int.Parse(a.desc);
|
|
|
- int descB = b.desc == "" ? 0 : int.Parse(b.desc);
|
|
|
- if (descA != descB) return descA - descB;
|
|
|
+ int disCountA = GetShopGoodsDiscount(a.id);
|
|
|
+ int disCountB = GetShopGoodsDiscount(b.id);
|
|
|
+ if (disCountA != disCountB) return disCountA - disCountB;
|
|
|
|
|
|
if (a.price != b.price) return a.price - b.price;
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
});
|
|
|
- return giftBagCfgs;
|
|
|
+ return shopCfgs;
|
|
|
+ }
|
|
|
+ //获取商品折扣百分比
|
|
|
+ public int GetShopGoodsDiscount(int goodsId)
|
|
|
+ {
|
|
|
+ ShopCfg shopCfg = ShopCfgArray.Instance.GetCfg(goodsId);
|
|
|
+ if (shopCfg.price == 0) return 0;
|
|
|
+ return (int)(((double)shopCfg.originalPrice / (double)shopCfg.price) * 100);
|
|
|
}
|
|
|
private List<GiftBagCfg> RemoveNotOpenCfg(List<GiftBagCfg> giftBagCfgs)
|
|
|
{
|
|
|
@@ -311,14 +319,14 @@ namespace GFGGame
|
|
|
}
|
|
|
}
|
|
|
/// <summary>
|
|
|
- /// 根据礼包id获取下架时间
|
|
|
+ /// 根据商品id获取下架时间
|
|
|
/// </summary>
|
|
|
- /// <param name="giftId"></param>
|
|
|
+ /// <param name="goodsId"></param>
|
|
|
/// <returns></returns>
|
|
|
- public string GetEndTime(int giftId)
|
|
|
+ public string GetEndTime(int goodsId)
|
|
|
{
|
|
|
long endTime = 0;
|
|
|
- GiftBagCfg cfg = GiftBagCfgArray.Instance.GetCfg(giftId);
|
|
|
+ ShopCfg cfg = ShopCfgArray.Instance.GetCfg(goodsId);
|
|
|
if (cfg.endTime == "") return "";
|
|
|
|
|
|
endTime = TimeUtil.DateTimeToTimestamp(cfg.endTime);
|
zhaoyang