From a1cfb3d3c3ae9f0f3c2f6f8e56b0aba5967d0301 Mon Sep 17 00:00:00 2001
From: chenxi <xi_chen@juzugame.com>
Date: Fri, 19 May 2023 21:55:40 +0800
Subject: [PATCH] =?UTF-8?q?=E9=82=AE=E7=AE=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lua/app/global/global_func.lua        | 22 ++++++----------------
 lua/app/ui/mail/mail_ui.lua           |  2 +-
 lua/app/userdata/mail/mail_entity.lua |  4 ++++
 3 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/lua/app/global/global_func.lua b/lua/app/global/global_func.lua
index e14914f0..141d5707 100644
--- a/lua/app/global/global_func.lua
+++ b/lua/app/global/global_func.lua
@@ -1301,29 +1301,19 @@ function GFunc.doScaleQuickZoom(img,callback)
 end
 
 -- colorType 1 白色， 2 黑色
-function GFunc.setAdsSprite(img, isGrey, colorType)
+function GFunc.setAdsSprite(img, isGrey)
 	if not img then
 		return
 	end
-
-	colorType = colorType or 1
-	local skip = DataManager.MallActData:skipAd()
-	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
-
+	-- local skip = DataManager.MallActData:skipAd()
+	local skip = false
+	local icon = nil
 	if isGrey then
 		icon = skip and "common_ad_6" or "common_ad_5"
+	else
+		icon = skip and "common_ad_4" or "common_ad_3"
 	end
 	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
 
 function GFunc.getAdSprite()
diff --git a/lua/app/ui/mail/mail_ui.lua b/lua/app/ui/mail/mail_ui.lua
index 55b45258..c60916bc 100644
--- a/lua/app/ui/mail/mail_ui.lua
+++ b/lua/app/ui/mail/mail_ui.lua
@@ -66,7 +66,7 @@ function MailUI:_display()
 		self:closeUI()
 	end)
     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))
 end
 
diff --git a/lua/app/userdata/mail/mail_entity.lua b/lua/app/userdata/mail/mail_entity.lua
index 7801ba46..86057e32 100644
--- a/lua/app/userdata/mail/mail_entity.lua
+++ b/lua/app/userdata/mail/mail_entity.lua
@@ -11,6 +11,10 @@ function MailEntity:ctor(info)
     self.title = json.decode(info.title or "{}")
     self.body = json.decode(info.body or "{}")
     self.rewards = info.rewards or {}
+    -- 处理一下格式
+    for i, v in ipairs(self.rewards) do
+        v.num = v.count
+    end
     self.data.isDirty = false
 
     if self.title.key then