diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua index 8d41833a72..9b31abc853 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua @@ -553,38 +553,42 @@ end function this.UpdateMonthCardData(msg) --LogError("月卡信息推送 "..#msg.monthinfos) --当我数据没有 后端推过来的有数据 此时需要弹窗 + local isMonthCard = false + local isHightMonthCard = false local showStr = "" for i = 1, #msg.monthinfos do if monthCardData[i].endingTime <= 0 then showStr = Language[11485] + if i == 1 and msg.monthinfos[i].endingTime > 0 then + isMonthCard = true + end + if i == 2 and msg.monthinfos[i].endingTime > 0 then + isHightMonthCard = true + end end end monthCardData = {} - local curActiveMONTHCARD = false - local curActiveLUXURYMONTHCARD = false for i = 1, #msg.monthinfos do - --LogError("月卡信息推送 "..msg.monthinfos[i].id.." "..msg.monthinfos[i].endingTime.." "..msg.monthinfos[i].state) + LogGreen("月卡信息推送 "..msg.monthinfos[i].id.." "..msg.monthinfos[i].endingTime.." "..msg.monthinfos[i].state) local singleMonthCard = {} singleMonthCard.id = msg.monthinfos[i].id singleMonthCard.endingTime = msg.monthinfos[i].endingTime singleMonthCard.state = msg.monthinfos[i].state--0 未领取 1 已领取 if i == MONTH_CARD_TYPE.MONTHCARD then monthSaveAmt = msg.monthinfos[i].totleAmt - curActiveMONTHCARD = true elseif i == MONTH_CARD_TYPE.LUXURYMONTHCARD then smonthSaveAmt = msg.monthinfos[i].totleAmt - curActiveLUXURYMONTHCARD = true end table.insert(monthCardData,singleMonthCard) end CheckRedPointStatus(RedPointType.MonthCard) if showStr ~= "" then if ActTimeCtrlManager.SingleFuncState(JumpType.Welfare) then - if curActiveMONTHCARD then + if isMonthCard then --发送埋点数据 CustomEventManager.SendCustomEvents(FBSDKCustomEventType.FirstBuyMonthCard,0) end - if curActiveLUXURYMONTHCARD then + if isHightMonthCard then --发送埋点数据 CustomEventManager.SendCustomEvents(FBSDKCustomEventType.FirstBuyHeightMonthCard,0) end diff --git a/Assets/ManagedResources/~Lua/View/ShopView.lua b/Assets/ManagedResources/~Lua/View/ShopView.lua index b1727ce52f..747f7bae06 100644 --- a/Assets/ManagedResources/~Lua/View/ShopView.lua +++ b/Assets/ManagedResources/~Lua/View/ShopView.lua @@ -523,7 +523,7 @@ function this:RechargeShopItemAdapter(shopItem, itemData) local itemInfo = ShopManager.GetRechargeItemInfo(itemData.goodsId) icon.sprite = Util.LoadSprite(GetResourcePath(itemInfo.Resources)) num.text = itemInfo.Name - price.text = "¥" .. itemInfo.Price + price.text = "$" .. itemInfo.Price -- 判断首充赠送 local curBuyCount = itemData.buyTimes first:SetActive(curBuyCount < 1)