|
|
@@ -76,7 +76,6 @@ namespace GFGGame
|
|
|
base.AddEventListener();
|
|
|
EventAgent.AddEventListener(ConstMessage.CONTINUOUS_REBATE_GIFT_SHOP_BUY, UpDayRebateAndView);
|
|
|
EventAgent.AddEventListener(ConstMessage.CONTINUOUS_REBATE_GIFT, UpdateView);
|
|
|
- //EventAgent.AddEventListener(ConstMessage.SHOP_BUY, UpdateView);
|
|
|
}
|
|
|
|
|
|
protected override void RemoveEventListener()
|
|
|
@@ -137,18 +136,9 @@ namespace GFGGame
|
|
|
ItemCfg costCfg = ItemCfgArray.Instance.GetCfg(costId);
|
|
|
_ui.m_txtNeed.text = string.Format("是否花费{0}{1} 购买{2}{3}", coustNum, costCfg.name, buyNum, itemCfg.name);
|
|
|
|
|
|
- _ui.m_txtNum.text = "";
|
|
|
_maxTimes = ItemExchangeCfgArray.Instance.GetCfg(_itemId).maxLimit;
|
|
|
- if (_maxTimes != 0)
|
|
|
- {
|
|
|
- _ui.m_txtNum.text = string.Format("今日剩余购买次数{0}/{1}", _maxTimes - _buyTimes, _maxTimes);
|
|
|
- }
|
|
|
-
|
|
|
- if (_message != "")
|
|
|
- {
|
|
|
- _ui.m_txtNum.text = _message;
|
|
|
- }
|
|
|
|
|
|
+ string showTxt = string.Empty;
|
|
|
_shopCfgList.Clear();
|
|
|
//常驻礼包
|
|
|
if (_itemId == ConstItemID.POWER)
|
|
|
@@ -157,6 +147,11 @@ namespace GFGGame
|
|
|
_shopCfgList = ShopCfgArray.Instance
|
|
|
.GetCfgsBymenu1Andmenu2(ConstStoreTabId.ENDURING_GIFT_BOX, ConstStoreSubId.ENDURING_GIFT_BOX_POWER)
|
|
|
.OrderBy(a => a.refreshType).ToList();
|
|
|
+ _ui.m_txtNeed.align = AlignType.Center;
|
|
|
+
|
|
|
+ int maxLimit = ItemExchangeCfgArray.Instance.GetCfg(ConstItemID.POWER).maxLimit;
|
|
|
+ int lastBuyCount = maxLimit - ItemDataManager.GetItemExchangeTimes(ConstItemID.POWER);
|
|
|
+ showTxt = string.Format("每5分钟回复1点体力\n今日剩余购买次数{0}/{1}次", lastBuyCount, maxLimit);
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
@@ -164,8 +159,15 @@ namespace GFGGame
|
|
|
_shopCfgList = ShopCfgArray.Instance
|
|
|
.GetCfgsBymenu1Andmenu2(ConstStoreTabId.ENDURING_GIFT_BOX, ConstStoreSubId.ENDURING_GIFT_BOX_GOLD)
|
|
|
.OrderBy(a => a.refreshType).ToList();
|
|
|
+ _ui.m_txtNeed.align = AlignType.Right;
|
|
|
+
|
|
|
+ if (_maxTimes != 0)
|
|
|
+ {
|
|
|
+ showTxt = string.Format("今日剩余购买次数{0}/{1}", _maxTimes - _buyTimes, _maxTimes);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
+ _ui.m_txtNum.text = showTxt;
|
|
|
_ui.m_txtPromptExt.text = string.Format("除了上述购买{0}的途径，我们还提供了更多的优惠礼包选择", itemCfg.name);
|
|
|
_ui.m_list.itemRenderer = ListItemRender;
|
|
|
_ui.m_list.numItems = _shopCfgList.Count;
|
|
|
@@ -194,16 +196,49 @@ namespace GFGGame
|
|
|
var childItemCfg = ItemCfgArray.Instance.GetCfg(shopCfg.itemId);
|
|
|
var remainBuyNum = shopCfg.maxBuyNum - ShopDataManager.Instance.GetGoodsBuyNumById(shopCfg.id);
|
|
|
item.m_comLeftGiftBox.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg);
|
|
|
+
|
|
|
item.m_btnBuy.m_txtOldPrice.text = $"{shopCfg.originalPrice}";
|
|
|
- item.m_btnBuy.m_txtNewPrice.text = $"{shopCfg.price}元";
|
|
|
+ item.m_btnBuy.m_loaIcon.visible = false;
|
|
|
+ string mTxtOldPrice = string.Empty;
|
|
|
+ if (shopCfg.costType == CostType.ITEM)
|
|
|
+ {
|
|
|
+ //货币
|
|
|
+ ItemCfg costCfg = ItemCfgArray.Instance.GetCfg(shopCfg.costId);
|
|
|
+ item.m_btnBuy.m_loaIcon.visible = true;
|
|
|
+ item.m_btnBuy.m_loaIcon.url = ResPathUtil.GetIconPath(costCfg);
|
|
|
+ }
|
|
|
+ else if (shopCfg.costType == CostType.RMB)
|
|
|
+ {
|
|
|
+ //人民币
|
|
|
+ mTxtOldPrice = "元";
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ //免费
|
|
|
+ mTxtOldPrice = $"免费";
|
|
|
+ item.m_btnBuy.m_txtOldPrice.text = "";
|
|
|
+ item.m_btnBuy.m_txtNewPrice.align = AlignType.Left;
|
|
|
+ item.m_btnBuy.m_txtNewPrice.x = 90;
|
|
|
+ }
|
|
|
+
|
|
|
+ item.m_btnBuy.m_txtNewPrice.text = $"{shopCfg.price + mTxtOldPrice}";
|
|
|
item.m_comLeftGiftBox.target.data = itemCfg;
|
|
|
item.m_comLeftGiftBox.m_loaIcon.onClick.Add(OnListSelectorItemClick);
|
|
|
|
|
|
+ if (shopCfg.originalPrice != shopCfg.price)
|
|
|
+ {
|
|
|
+ var roundedNumStr = NumberUtil.CalculateDiscount(shopCfg.originalPrice, shopCfg.price);
|
|
|
+ item.m_comLeftGiftBox.m_comDiscount.target.visible = true;
|
|
|
+ item.m_comLeftGiftBox.m_comDiscount.m_txtDiscountNum.text = $"{roundedNumStr}折"; //之后再计算赋值
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ item.m_comLeftGiftBox.m_comDiscount.target.visible = false;
|
|
|
+ }
|
|
|
+
|
|
|
if (shopCfg.refreshType == RefreshType.DAY) //也可以换成人民币来做条件
|
|
|
{
|
|
|
//日刷
|
|
|
- item.m_comLeftGiftBox.m_comDiscount.target.visible = true;
|
|
|
- item.m_comLeftGiftBox.m_comDiscount.m_txtDiscountNum.text = "1.5折"; //之后再计算赋值
|
|
|
item.m_comLeftGiftBox.m_comGouMaiGetText.target.visible = false;
|
|
|
item.m_txtUrc.text = string.Format("今日剩余{0}/{1}", remainBuyNum, shopCfg.maxBuyNum);
|
|
|
item.m_txtLrc.text = string.Format("可获得{0}会员积分", shopCfg.price * 10);
|
|
|
@@ -232,17 +267,18 @@ namespace GFGGame
|
|
|
{
|
|
|
//周刷
|
|
|
var weekGiftBoxState = EnduringGiftBoxDataManager.Instance.DayIsRebateGiftBox(shopCfg.itemId);
|
|
|
- item.m_comLeftGiftBox.m_comDiscount.target.visible = false;
|
|
|
item.m_comLeftGiftBox.m_comGouMaiGetText.target.visible = true;
|
|
|
var itemArr = itemCfg.itemsArr[0];
|
|
|
ItemCfg getItemCfg = ItemCfgArray.Instance.GetCfg(itemArr[0]); //及时获得的物品,读取第一个显示ICON
|
|
|
item.m_comLeftGiftBox.m_comGouMaiGetText.m_loaIcon.url = ResPathUtil.GetIconPath(getItemCfg);
|
|
|
item.m_comLeftGiftBox.m_comGouMaiGetText.m_txtGetGold.text = itemArr[1].ToString();
|
|
|
item.m_txtUrc.text = string.Format("每周限购{0}/{1}", remainBuyNum, shopCfg.maxBuyNum);
|
|
|
- item.m_txtLrc.text = string.Format("剩余{0}天", "");
|
|
|
+ item.m_txtLrc.text = string.Format("剩余{0}天",
|
|
|
+ EnduringGiftBoxDataManager.Instance.GetItemRebateDay(itemCfg.id));
|
|
|
item.m_txtWeekPrompt.visible = true;
|
|
|
item.m_txtWeekPrompt.text =
|
|
|
- string.Format("连续{0}天每日获得", NumberUtil.GetChiniseNumberText(itemCfg.param2Arr[0]));
|
|
|
+ string.Format("连续{0}天每日获得",
|
|
|
+ itemCfg.param2Arr[0] + 1); //NumberUtil.GetChiniseNumberText(itemCfg.param2Arr[0])
|
|
|
item.m_icoWeekPromptTag.visible = true;
|
|
|
|
|
|
numItems = childItemCfg.param1Arr.Length;
|
|
|
@@ -448,21 +484,26 @@ namespace GFGGame
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- this.Hide();
|
|
|
+ UpdateView();
|
|
|
+ //this.Hide();
|
|
|
}
|
|
|
|
|
|
+ //购买连续礼包之后，更新数据+更新界面
|
|
|
private void UpDayRebateAndView(EventContext context)
|
|
|
{
|
|
|
ShopCfg shopCfg = context.data as ShopCfg;
|
|
|
var itemCfg = ItemCfgArray.Instance.GetCfg(shopCfg.itemId);
|
|
|
-
|
|
|
+
|
|
|
if (itemCfg.itemType == ConstItemType.GIFT_BAG &&
|
|
|
itemCfg.subType == ConstItemSubType.CONTINUOUS_REWARD_GIFT)
|
|
|
{
|
|
|
- EnduringGiftBoxDataManager.Instance.AddDayAllRebateItemIds(itemCfg.id);
|
|
|
+ int dayNum = EnduringGiftBoxDataManager.Instance.GetItemRebateDay(itemCfg.id);
|
|
|
+ int totalDayNum = dayNum + itemCfg.param2Arr[0];
|
|
|
+
|
|
|
+ EnduringGiftBoxDataManager.Instance.UpDayAllRebateItemDic(itemCfg.id, totalDayNum);
|
|
|
EnduringGiftBoxDataManager.Instance.AddDayRebateItemIds(itemCfg.id);
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
UpdateView();
|
|
|
}
|
|
|
|
zhaoyang
