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-19 21:55:40 +08:00
parent 06da81fc58
commit a1cfb3d3c3
3 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1301,29 +1301,19 @@ function GFunc.doScaleQuickZoom(img,callback)
end end
-- colorType 1 白色， 2 黑色 -- colorType 1 白色， 2 黑色
function GFunc.setAdsSprite(img, isGrey, colorType) function GFunc.setAdsSprite(img, isGrey)
if not img then if not img then
return return
end end
-- local skip = DataManager.MallActData:skipAd()
colorType = colorType or 1 local skip = false
local skip = DataManager.MallActData:skipAd() local icon = nil
local icon = ""
if colorType == 1 then
icon = skip and "common_ad_4" or "common_ad_3"
end
if colorType == 2 then
icon = skip and "common_ad_2" or "common_ad_1"
end
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"
else
icon = skip and "common_ad_4" or "common_ad_3"
end end
img:setSprite(GConst.ATLAS_PATH.COMMON, icon) img:setSprite(GConst.ATLAS_PATH.COMMON, icon)
--img:setSprite(GConst.ATLAS_PATH.COMMON, icon, function ()
-- img:getComponent(GConst.TYPEOF_UNITY_CLASS.UI_IMAGE):SetNativeSize()
--end)
end end
function GFunc.getAdSprite() function GFunc.getAdSprite()

2
lua/app/ui/mail/mail_ui.lua
View File

@ -66,7 +66,7 @@ function MailUI:_display()
self:closeUI() self:closeUI()
end) end)
uiMap["mail_ui.bg.title_bg.title_tx"]:setText(I18N:getGlobalText(I18N.GlobalConst.MAIL_TITLE)) uiMap["mail_ui.bg.title_bg.title_tx"]:setText(I18N:getGlobalText(I18N.GlobalConst.MAIL_TITLE))
uiMap["mail_ui.bg.btn_delect.btn_tx"]:setText(I18N:getGlobalText(I18N.GlobalConst.BTN_DELETE_ALL)) uiMap["mail_ui.bg.btn_delect.btn_tx"]:setText(I18N:getGlobalText(I18N.GlobalConst.BTN_DELETE_ALL_READ_MAIL))
uiMap["mail_ui.bg.btn_claimed.btn_tx"]:setText(I18N:getGlobalText(I18N.GlobalConst.BTN_CLAIM_ALL)) uiMap["mail_ui.bg.btn_claimed.btn_tx"]:setText(I18N:getGlobalText(I18N.GlobalConst.BTN_CLAIM_ALL))
end end

4
lua/app/userdata/mail/mail_entity.lua
View File

@ -11,6 +11,10 @@ function MailEntity:ctor(info)
self.title = json.decode(info.title or "{}") self.title = json.decode(info.title or "{}")
self.body = json.decode(info.body or "{}") self.body = json.decode(info.body or "{}")
self.rewards = info.rewards or {} self.rewards = info.rewards or {}
-- 处理一下格式
for i, v in ipairs(self.rewards) do
v.num = v.count
end
self.data.isDirty = false self.data.isDirty = false
if self.title.key then if self.title.key then