From 643e616d219f35adbd2deb92ad63fa121b190171 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期一, 29 十二月 2025 11:58:15 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
---
Main/System/ClientVersion/VersionUtility.cs | 4 ++--
Main/System/Mail/MailCell.cs | 4 +++-
Main/System/Login/ServerListCenter.cs | 9 ++++++---
3 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/Main/System/ClientVersion/VersionUtility.cs b/Main/System/ClientVersion/VersionUtility.cs
index 59798e7..4b1a20b 100644
--- a/Main/System/ClientVersion/VersionUtility.cs
+++ b/Main/System/ClientVersion/VersionUtility.cs
@@ -15,8 +15,8 @@
public class VersionUtility : Singleton<VersionUtility>
{
- public static readonly string[] VERSION_URL = new string[] {
- "http://xssgcenter.secondworld.net.cn:11000/center/appversion_new.php/?"};
+ // public static readonly string[] VERSION_URL = new string[] {
+ // "http://xssgcenter.secondworld.net.cn:11000/center/appversion_new.php/?"};
public string androidRoot { get { return string.Empty;/*StringUtility.Concat(SDKUtils.Instance.DeviceRootPath, "/", VersionConfig.Get().bundleIdentifier);*/ } }
diff --git a/Main/System/Login/ServerListCenter.cs b/Main/System/Login/ServerListCenter.cs
index 1c127c1..e5b7eb0 100644
--- a/Main/System/Login/ServerListCenter.cs
+++ b/Main/System/Login/ServerListCenter.cs
@@ -5,9 +5,12 @@
using System;
public class ServerListCenter : Singleton<ServerListCenter>
-
{
- public static readonly string[] JUMP_URL = new string[] { "http://xssgcenter.secondworld.net.cn:11000/center/server_list.php/?" };
+ public static readonly string[] JUMP_URL = new string[]
+ {
+ "http://xssgcenter.secondworld.net.cn:11000/center/server_list.php/?",
+ "http://106.55.151.92:11000/center/server_list_new.php/?"
+ };
public static string SERVERLIST_URL_COMMON = "";
public static string SERVERLIST_URL_PLAYER = "";
@@ -199,7 +202,7 @@
return;
}
- var url = StringUtility.Concat(JUMP_URL[0], "game=xssg&flag=", VersionConfig.Get().appId, "_", VersionConfig.Get().branch.ToString(), "_", VersionConfig.Get().version);
+ var url = StringUtility.Concat(JUMP_URL[jumpUrlIndex % JUMP_URL.Length], "game=xssg&flag=", VersionConfig.Get().appId, "_", VersionConfig.Get().branch.ToString(), "_", VersionConfig.Get().version);
jumpUrlIndex++;
serverUrl = url;
Debug.Log("http鍦板潃:serverlist " + url);
diff --git a/Main/System/Mail/MailCell.cs b/Main/System/Mail/MailCell.cs
index 25d3973..ec8e9ff 100644
--- a/Main/System/Mail/MailCell.cs
+++ b/Main/System/Mail/MailCell.cs
@@ -7,6 +7,7 @@
[SerializeField] Button btnMail;
[SerializeField] ImageEx imgMask;
[SerializeField] ImageEx imgRed;
+ [SerializeField] ImageEx imgRead;
[SerializeField] ImageEx imgHasAward;
[SerializeField] TextEx txtTitle;
[SerializeField] TextEx txtDate;
@@ -22,9 +23,10 @@
if (!model.TryGetMailData(uuid, out var mailData) || mailData == null)
return;
//mailData.MailState 閭欢鐘舵�侊細 0-鏈煡锛�1-鏈锛�2-宸茶锛�3-宸查锛�
+ imgRead.SetSprite(mailData.MailState == 1 ? "MailUnRead" : "MailRead");
imgRed.SetActive(mailData.MailState == 1);
imgHasAward.SetActive(mailData.MailState != 3 && mailData.HasAward());
- imgMask.SetActive(mailData.MailState == 2 || mailData.MailState == 3);
+ imgMask.SetActive(false);
if (mailData.IsTemplateMail() && MailConfig.HasKey(mailData.GetTemplateKey()))
{
txtTitle.text = MailConfig.Get(mailData.GetTemplateKey()).Title;
--
Gitblit v1.8.0