冲突处理

yyl

7 天以前 f5e22c5cfac4b3037414afb58557b80a309a99e4

冲突处理

 Assets/Launch/Manager/LocalResManager.cs

@@ -148,44 +148,44 @@
            case "ryzj":
                VERSION_URL = new string[]
                {
                    "http://xssgcenter.secondworld.net.cn:11000/center/appversion_new.php?",
                    "http://106.55.151.92:11000/center/appversion_new.php?",
                    "https://xssgcenter.secondworld.net.cn:11000/center/appversion_new.php?",
                    "https://106.55.151.92:11000/center/appversion_new.php?",
                };
                break;
            case "sghy":
                VERSION_URL = new string[]
                {
                    "http://sghycenter.funimpactgames.com:11000/center/appversion_new.php?",
                    "http://47.250.213.171:11000/center/appversion_new.php?",
                    "https://sghycenter.funimpactgames.com:11000/center/appversion_new.php?",
                    "https://47.250.213.171:11000/center/appversion_new.php?",
                };
                break;
            case "xssgyh":
                VERSION_URL = new string[]
                {
                    "http://xssgyhcenter.secondworld.net.cn:11000/center/appversion_new.php/?",
                    "https://xssgyhcenter.secondworld.net.cn:11000/center/appversion_new.php/?",
                };
                break;
            case "xssgdy":
                VERSION_URL = new string[]
                {
                    "http://xssgdycenter.secondworld.net.cn:11000/center/appversion_new.php/?",
                    "https://xssgdycenter.secondworld.net.cn:11000/center/appversion_new.php/?",
                };
                break;
            default:
                VERSION_URL = new string[]
                {
                    "http://xssgcenter.secondworld.net.cn:11000/center/appversion_new.php?",
                    "http://106.55.151.92:11000/center/appversion_new.php?",
                    "https://xssgcenter.secondworld.net.cn:11000/center/appversion_new.php?",
                    "https://106.55.151.92:11000/center/appversion_new.php?",
                };
                break;
        }

#if TEST_URL
#if TEST_URL 
        // if (VersionConfigEx.config.versionAuthority == VersionConfigEx.VersionAuthority.InterTest)
        {
            VERSION_URL = new string[]
            {
                "http://gamecenter.secondworld.net.cn:11000/center/appversion_new.php?",
            { 
                "https://gamecenter.secondworld.net.cn/center/appversion_new.php?",
            };
        }
#endif
@@ -911,23 +911,23 @@
            case "test":
            case "xssg":
            case "ryzj":
                url = "http://xssgcenter.secondworld.net.cn:11000/center/eventreport.php?";
                url = "https://xssgcenter.secondworld.net.cn:11000/center/eventreport.php?";
                break;
            case "sghy":
                url = "http://sghycenter.funimpactgames.com:11000/center/eventreport.php?";
                url = "https://sghycenter.funimpactgames.com:11000/center/eventreport.php?";
                break;
            case "xssgyh":
                url = "http://xssgyhcenter.secondworld.net.cn:11000/center/eventreport.php?";
                url = "https://xssgyhcenter.secondworld.net.cn:11000/center/eventreport.php?";
                break;
            case "xssgdy":
                url = "http://xssgdycenter.secondworld.net.cn:11000/center/eventreport.php?";
                url = "https://xssgdycenter.secondworld.net.cn:11000/center/eventreport.php?";
                break;
            default:
                url = "http://xssgcenter.secondworld.net.cn:11000/center/eventreport.php?";
                url = "https://xssgcenter.secondworld.net.cn:11000/center/eventreport.php?";
                break;
        }
#if TEST_URL
        url = "http://gamecenter.secondworld.net.cn:11000/center/eventreport.php?";
        url = "https://gamecenter.secondworld.net.cn:11000/center/eventreport.php?";
#endif
    }

@@ -1011,6 +1011,15 @@
#endif
    }

    public static string GetWebGLDeviceId()
    {
#if UNITY_WEBGL && !UNITY_EDITOR
        return GetOrCreateWebGLDeviceId();
#else
        return UnityEngine.SystemInfo.deviceUniqueIdentifier;
#endif
    }

    public static string GetDeviceOSLevel()
    {
#if UNITY_IOS