diff --git a/lua/app/common/bi_report.lua b/lua/app/common/bi_report.lua index 63c5bd29..86831afe 100644 --- a/lua/app/common/bi_report.lua +++ b/lua/app/common/bi_report.lua @@ -15,8 +15,8 @@ BIReport.CLICK_BTN_TYPE = { BIReport.ADS_OPT_TYPE = { CLICK = "Click", - SUC = "Scu", - RETURN = "Return", + SUCCESS = "Success", + REWARD_GET = "RewardGet", } BIReport.PAY_OPT_TYPE = { @@ -574,7 +574,7 @@ end function BIReport:postAdPlaySuccess(adsType) local args = { ad_type = adsType, - event_type = BIReport.ADS_OPT_TYPE.SUC, + event_type = BIReport.ADS_OPT_TYPE.SUCCESS, } self:report(EVENT_NAME_AD_OPT, args) end @@ -583,7 +583,7 @@ end function BIReport:postAdRewardGet(adsType) local args = { ad_type = adsType, - event_type = BIReport.ADS_OPT_TYPE.RETURN, + event_type = BIReport.ADS_OPT_TYPE.REWARD_GET, } self:report(EVENT_NAME_AD_OPT, args) end diff --git a/lua/app/common/sdk_manager.lua b/lua/app/common/sdk_manager.lua index 1ab6d41a..4b56d6b6 100644 --- a/lua/app/common/sdk_manager.lua +++ b/lua/app/common/sdk_manager.lua @@ -278,23 +278,22 @@ function SDKManager:showFullScreenAds(adsClickType, adCallback) end return true end - - -- if NetManager:isNotReachable() then - -- -- 没有网 - -- GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.NO_NETWORK)) - -- return false - -- end - -- if NetManager:getIsBusy() then - -- GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.NETWORK_ERROE_1)) - -- return false - -- end - if DataManager.MallActData:skipAd() then - self:adRewradAd(true) - if adCallback then - adCallback() - end - return true + if NetManager:isNotReachable() then + -- 没有网 + GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.NO_NETWORK)) + return false end + if NetManager:getIsBusy() then + GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.NETWORK_ERROE_1)) + return false + end + -- if DataManager.MallActData:skipAd() then + -- self:adRewradAd(true) + -- if adCallback then + -- adCallback() + -- end + -- return true + -- end if CS.UnityEngine.Application.platform == CS.UnityEngine.RuntimePlatform.Android then if not CS.BF.BFMain.Instance.SDKMgr.BFIronSourceSDKMgr.AdLoaded then GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.NO_ADS)) diff --git a/lua/app/global/global_func.lua b/lua/app/global/global_func.lua index 638c7c4d..38216625 100644 --- a/lua/app/global/global_func.lua +++ b/lua/app/global/global_func.lua @@ -1305,8 +1305,7 @@ function GFunc.setAdsSprite(img, isGrey) if not img then return end - -- local skip = DataManager.MallActData:skipAd() - local skip = false + local skip = false -- DataManager.MallActData:skipAd() local icon = nil if isGrey then icon = skip and "common_ad_6" or "common_ad_5" @@ -1317,7 +1316,7 @@ function GFunc.setAdsSprite(img, isGrey) end function GFunc.getAdSprite() - local skip = DataManager.MallActData:skipAd() + local skip = false --DataManager.MallActData:skipAd() return skip and "common_ad_4" or "common_ad_3" end diff --git a/lua/app/ui/activity/seven_day/seven_day_ui.lua b/lua/app/ui/activity/seven_day/seven_day_ui.lua index 2a4e15f9..203b0dd9 100644 --- a/lua/app/ui/activity/seven_day/seven_day_ui.lua +++ b/lua/app/ui/activity/seven_day/seven_day_ui.lua @@ -78,7 +78,7 @@ function SevenDayUI:initTop() self.stepObjs[i] = { btn = self.uiMap["seven_day_ui.slider_bg.btn_" .. i], - num = self.uiMap["seven_day_ui.slider_bg.btn_" .. i .. ".num"], + num = self.uiMap["seven_day_ui.slider_bg.num_" .. i], spine = self.uiMap["seven_day_ui.slider_bg.btn_" .. i .. ".ui_spine"], } self.stepObjs[i].btn:addClickListener(function()