yyl
1 天以前 643e616d219f35adbd2deb92ad63fa121b190171
Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
3个文件已修改
17 ■■■■■ 已修改文件
Main/System/ClientVersion/VersionUtility.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Main/System/Login/ServerListCenter.cs 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Main/System/Mail/MailCell.cs 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
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);*/ } }
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);
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;