From 1b4b01956de5d072e3281176ff5e219bd5e2b511 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期二, 30 九月 2025 15:26:58 +0800
Subject: [PATCH] Merge branch 'master' of http://mobile.secondworld.net.cn:10010/r/Project_SG_scripts

---
 Main/System/Mail/MailCell.cs |   23 +++++++++++++----------
 1 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/Main/System/Mail/MailGlobalCell.cs b/Main/System/Mail/MailCell.cs
similarity index 63%
rename from Main/System/Mail/MailGlobalCell.cs
rename to Main/System/Mail/MailCell.cs
index 3cf95c8..bbfdd6e 100644
--- a/Main/System/Mail/MailGlobalCell.cs
+++ b/Main/System/Mail/MailCell.cs
@@ -1,9 +1,11 @@
-锘縰sing UnityEngine;
+锘縰sing System;
+using UnityEngine;
+using UnityEngine.UI;
 
-public class MailGlobalCell : CellView
+public class MailCell : CellView
 {
-    [SerializeField] ButtonEx btnMail;
-    [SerializeField] ImageEx imgState;
+    [SerializeField] Button btnMail;
+    [SerializeField] ImageEx imgMask;
     [SerializeField] ImageEx imgRed;
     [SerializeField] TextEx txtTitle;
     [SerializeField] TextEx txtDate;
@@ -18,18 +20,19 @@
         uuid = list[index];
         if (!model.TryGetMailData(uuid, out var mailData) || mailData == null)
             return;
+        //mailData.MailState 閭欢鐘舵�侊細 0-鏈煡锛�1-鏈锛�2-宸茶锛�3-宸查锛�
         imgRed.SetActive(mailData.MailState == 1);
-        txtTitle.text = mailData.Title;
-        imgState.SetSprite(mailData.MailState == 2 || mailData.MailState == 3 ? "MailRead" : "MailNoRead");
-        if (mailData.Items != null)
+        imgMask.SetActive(mailData.MailState == 2 || mailData.MailState == 3);
+        if (mailData.IsTemplateMail() && MailConfig.HasKey(mailData.GetTemplateKey()))
         {
-            txtDate.text = model.FormatCreateMailTime(mailData.CreateDateTime);
+            txtTitle.text = MailConfig.Get(mailData.GetTemplateKey()).Title;
         }
         else
         {
-            int expiryDay = model.GetMailExpiryDays(mailData.CreateDateTime, mailData.LimitDays);
-            txtDate.text = expiryDay > 0 ? Language.Get("Mail07", expiryDay) : model.FormatCreateMailTime(mailData.CreateDateTime);
+            txtTitle.text = mailData.Title;
         }
+
+        txtDate.text = model.FormatMailExpiryDays(mailData.CreateDateTime, mailData.LimitDays);
         btnMail.SetListener(OnClickButtonMail);
     }
 

--
Gitblit v1.8.0