5398 【前端】【1.4】跨服竞技场开发

client_Wu Xijin

2018-12-27 20f2ded4c1791de35a8266f4b88da38d699582d1

5398 【前端】【1.4】跨服竞技场开发

 System/Loading/LoadingWin.cs

@@ -32,6 +32,7 @@
        [SerializeField] Image m_MapDescription;



        [SerializeField] RectTransform m_CrossServerOneVsOne;

        [SerializeField] Image m_CrossServerOneVsOneBg;

        [SerializeField] Image m_MyPortrayal;

        [SerializeField] Image m_OpponentPortrayal;

        [SerializeField] Text m_MyName;

@@ -53,6 +54,16 @@


        protected override void OnPreOpen()

        {

            var useDefautBackGround = false;

            if (!AssetSource.uiFromEditor)

            {

                var assetVersion = AssetVersionUtility.GetAssetVersion("ui/sprite/loadingbg");

                if (assetVersion == null || !assetVersion.localValid)

                {

                    useDefautBackGround = true;

                }

            }



            if (CrossServerLogin.Instance.oneVsOnePlayerData.waitForLoginCrossServer)

            {

                loadingType = LoadingType.CrossServerOneOne;

@@ -64,6 +75,16 @@


            if (loadingType == LoadingType.CrossServerOneOne)

            {

                if (useDefautBackGround)

                {

                    var sprite = BuiltInLoader.LoadSprite("Launch_1");

                    m_CrossServerOneVsOneBg.overrideSprite = sprite;

                }

                else

                {

                    m_CrossServerOneVsOneBg.SetSprite("CrossServerOneVsOne_LoadingBG");

                }



                m_ContainerNormal.gameObject.SetActive(false);

                m_CrossServerOneVsOne.gameObject.SetActive(true);



@@ -74,15 +95,6 @@
            {

                m_ContainerNormal.gameObject.SetActive(true);

                m_CrossServerOneVsOne.gameObject.SetActive(false);

                var useDefautBackGround = false;

                if (!AssetSource.uiFromEditor)

                {

                    var assetVersion = AssetVersionUtility.GetAssetVersion("ui/sprite/loadingbg");

                    if (assetVersion == null || !assetVersion.localValid)

                    {

                        useDefautBackGround = true;

                    }

                }



                if (useDefautBackGround)

                {

@@ -187,8 +199,6 @@
                    StageManager.Instance.loadingProgressEvent += UpdateLoadingProgress;

                }

            }







        }