2216 猫耳强更apk流程问题

client_Wu Xijin

2018-10-25 f673ee46ff95028e00aa4fcc7f161d4524376d2c

2216 猫耳强更apk流程问题

# Conflicts:
#	Core/GameEngine/Model/ConfigManager.cs

 System/ClientVersion/VersionUtility.cs

@@ -144,7 +144,12 @@


    public string GetApkRemoteUrl()

    {

        if (IsMaoErGame())

        if (versionInfo == null)

        {

            return string.Empty;

        }



        if (IsMaoErGame() && versionInfo.downAsset == 0)

        {

            if (maoerVersion.Keys.Contains("url"))

            {


 System/Login/LoginWin.cs

@@ -50,7 +50,10 @@
            m_ServerSelect.SetListener(OpenServerListWin);

            m_SwitchAccount.SetListener(SwitchAccount);

            m_Notice.SetListener(VeiwNotice);

            m_UserHelp.SetListener(OpenUserHelp);

            if (m_UserHelp)

            {

                m_UserHelp.SetListener(OpenUserHelp);

            }

        }



        protected override void OnPreOpen()

@@ -66,7 +69,10 @@
            m_AlphaTween.SetStartState();

            m_SwitchAccount.gameObject.SetActive(VersionConfig.Get().versionAuthority == VersionAuthority.Release && !VersionConfig.Get().isBanShu);



            m_UserHelp.gameObject.SetActive(Config.Instance.ContainKey<ContactConfig>(VersionConfig.Get().appId));

            if (m_UserHelp)

            {

                m_UserHelp.gameObject.SetActive(Config.Instance.ContainKey<ContactConfig>(VersionConfig.Get().appId));

            }



            m_WaitServerList.gameObject.SetActive(!ServerListCenter.Instance.serverListGot);

            m_ContainerEnterGame.gameObject.SetActive(ServerListCenter.Instance.serverListGot);