puxuan/c1_lua
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

七天乐界面调整

Browse Source
This commit is contained in:
chenxi 2023-05-31 10:11:45 +08:00
parent 02832f21f3
commit ce822360d2
4 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lua/app/common/bi_report.lua
View File

@ -15,8 +15,8 @@ BIReport.CLICK_BTN_TYPE = {
BIReport.ADS_OPT_TYPE = { BIReport.ADS_OPT_TYPE = {
CLICK = "Click", CLICK = "Click",
SUC = "Scu", SUCCESS = "Success",
RETURN = "Return", REWARD_GET = "RewardGet",
} }
BIReport.PAY_OPT_TYPE = { BIReport.PAY_OPT_TYPE = {
@ -574,7 +574,7 @@ end
function BIReport:postAdPlaySuccess(adsType) function BIReport:postAdPlaySuccess(adsType)
local args = { local args = {
ad_type = adsType, ad_type = adsType,
event_type = BIReport.ADS_OPT_TYPE.SUC, event_type = BIReport.ADS_OPT_TYPE.SUCCESS,
} }
self:report(EVENT_NAME_AD_OPT, args) self:report(EVENT_NAME_AD_OPT, args)
end end
@ -583,7 +583,7 @@ end
function BIReport:postAdRewardGet(adsType) function BIReport:postAdRewardGet(adsType)
local args = { local args = {
ad_type = adsType, 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) self:report(EVENT_NAME_AD_OPT, args)
end end

29
lua/app/common/sdk_manager.lua
View File

@ -278,23 +278,22 @@ function SDKManager:showFullScreenAds(adsClickType, adCallback)
end end
return true return true
end end
if NetManager:isNotReachable() then
-- if NetManager:isNotReachable() then -- 没有网
-- -- 没有网 GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.NO_NETWORK))
-- GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.NO_NETWORK)) return false
-- 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 end
return true if NetManager:getIsBusy() then
GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.NETWORK_ERROE_1))
return false
end 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 CS.UnityEngine.Application.platform == CS.UnityEngine.RuntimePlatform.Android then
if not CS.BF.BFMain.Instance.SDKMgr.BFIronSourceSDKMgr.AdLoaded then if not CS.BF.BFMain.Instance.SDKMgr.BFIronSourceSDKMgr.AdLoaded then
GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.NO_ADS)) GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.NO_ADS))

5
lua/app/global/global_func.lua
View File

@ -1305,8 +1305,7 @@ function GFunc.setAdsSprite(img, isGrey)
if not img then if not img then
return return
end end
-- local skip = DataManager.MallActData:skipAd() local skip = false -- DataManager.MallActData:skipAd()
local skip = false
local icon = nil local icon = nil
if isGrey then if isGrey then
icon = skip and "common_ad_6" or "common_ad_5" icon = skip and "common_ad_6" or "common_ad_5"
@ -1317,7 +1316,7 @@ function GFunc.setAdsSprite(img, isGrey)
end end
function GFunc.getAdSprite() function GFunc.getAdSprite()
local skip = DataManager.MallActData:skipAd() local skip = false --DataManager.MallActData:skipAd()
return skip and "common_ad_4" or "common_ad_3" return skip and "common_ad_4" or "common_ad_3"
end end

2
lua/app/ui/activity/seven_day/seven_day_ui.lua
View File

@ -78,7 +78,7 @@ function SevenDayUI:initTop()
self.stepObjs[i] = { self.stepObjs[i] = {
btn = self.uiMap["seven_day_ui.slider_bg.btn_" .. 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"], spine = self.uiMap["seven_day_ui.slider_bg.btn_" .. i .. ".ui_spine"],
} }
self.stepObjs[i].btn:addClickListener(function() self.stepObjs[i].btn:addClickListener(function()