Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts

yyl

2025-12-11 243044702c6a743e57d322e5ca538d9897919026

 Main/System/Launch/LaunchWin.cs

@@ -17,8 +17,8 @@
        // [SerializeField] Image m_BackGround;
        [SerializeField] RectTransform m_AndroidProgressContainer;
        [SerializeField] RectTransform m_NetworkContainer;
        [SerializeField] SmoothSlider m_PartProgressSlider;
        [SerializeField] SmoothSlider m_TotalProgressSlider;
    // [SerializeField] SmoothSlider m_PartProgressSlider;
    [SerializeField] Slider m_TotalProgressSlider;
        [SerializeField] Text m_StageDescription;
        [SerializeField] RectTransform m_IosProgressContainer;
        [SerializeField] Text m_IosProgressTip;
@@ -39,40 +39,18 @@
        int WaitSeconds = 0;
        bool ShowCircleView = false;
        float TempCheck = 0;
        protected override void InitComponent()
        {
            base.InitComponent();
            // m_BackGround.preserveAspect = true;
            // if (Application.isEditor)
            // {
            //     var sprite = BuiltInLoader.LoadSprite("Launch_1");
            //     m_BackGround.overrideSprite = sprite;
            // }
            // else
            // {
            //     for (var i = 0; i < 3; i++)
            //     {
            //         var sprite = BuiltInLoader.LoadSprite(StringUtility.Concat("Launch_", i + 1));
            //         if (sprite != null)
            //         {
            //             backGrounds.Add(sprite);
            //         }
            //     }

            //     m_BackGround.overrideSprite = backGrounds[0];
            // }


        }

        protected override void OnPreOpen()
        {
            base.OnPreOpen();
        UIManager.Instance.OnOpenWindow += OnOpenWindow;
        UIManager.Instance.OnCloseWindow += OnCloseWindow;
            backGroundTimer = 0f;
            backGroundIndex = 0;
            if (m_TotalProgressSlider != null)
            {
                m_TotalProgressSlider.ResetValue(0f);
            m_TotalProgressSlider.value = 0f;
            }

            // m_AlphaTween.SetStartState();
@@ -117,26 +95,37 @@

            UpdateProgress();

            if (m_TotalProgressSlider == null)
            {
                m_TotalProgressSlider = this.GetComponentInChildren<SmoothSlider>(true);
            }
        // if (m_TotalProgressSlider == null)
        // {
        //     m_TotalProgressSlider = this.GetComponentInChildren<SmoothSlider>(true);
        // }
        }

        protected override void OnOpen()
        {
            base.OnOpen();
        }


        protected override void OnPreClose()
        {
            base.OnPreClose();
        UIManager.Instance.OnOpenWindow -= OnOpenWindow;
        UIManager.Instance.OnCloseWindow -= OnCloseWindow;
        }

        protected override void OnClose()
    void OnOpenWindow(UIBase win)
        {
            base.OnClose();
        if (win is DownLoadWin)
        {
            m_AndroidProgressContainer.SetActive(false);
        }
    }

    void OnCloseWindow(UIBase win)
    {
        if (win is DownLoadWin)
        {
            m_AndroidProgressContainer.SetActive(true);
        }
    }


        public void FadeOut()
        {
@@ -220,10 +209,10 @@

                if (progressInfo.stage == LaunchStage.DownLoad)
                {
                    if (m_PartProgressSlider != null && m_PartProgressSlider.gameObject.activeInHierarchy)
                    {
                        m_PartProgressSlider.SetActive(false);
                    }
                // if (m_PartProgressSlider != null && m_PartProgressSlider.gameObject.activeInHierarchy)
                // {
                //     m_PartProgressSlider.SetActive(false);
                // }

                    if (m_TotalProgressSlider != null && m_TotalProgressSlider.gameObject.activeInHierarchy)
                    {
@@ -232,10 +221,10 @@
                }
                else
                {
                    if (m_PartProgressSlider != null && !m_PartProgressSlider.gameObject.activeInHierarchy)
                    {
                        m_PartProgressSlider.SetActive(true);
                    }
                // if (m_PartProgressSlider != null && !m_PartProgressSlider.gameObject.activeInHierarchy)
                // {
                //     m_PartProgressSlider.SetActive(true);
                // }

                    if (m_TotalProgressSlider != null && !m_TotalProgressSlider.gameObject.activeInHierarchy)
                    {
@@ -247,10 +236,10 @@
                        m_TotalProgressSlider.value = progressInfo.totalProgress;
                    }

                    if (m_PartProgressSlider != null)
                    {
                        m_PartProgressSlider.value = progressInfo.partProgress;
                    }
                // if (m_PartProgressSlider != null)
                // {
                //     m_PartProgressSlider.value = progressInfo.partProgress;
                // }
                }

                DisplayStageDescription(progressInfo.stage, progressInfo.step);