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

yyl

2 天以前 973edc44a04dceb8b48a32ca912e6167f86189d4

 Main/System/Launch/LoadingWin.cs

@@ -10,7 +10,7 @@
    protected int targetProgress = 0;

    // [SerializeField] UIAlphaTween m_AlphaTween;
    [SerializeField] Image m_BackGround;
    [SerializeField] RawImage m_BackGround;
    [SerializeField] SmoothSlider m_PartProgressSlider;
    [SerializeField] SmoothSlider m_TotalProgressSlider;
    [SerializeField] Text m_StageDescription;
@@ -26,30 +26,30 @@
    {
        base.InitComponent();

        if (Application.isEditor)
        {
            if (m_BackGround.overrideSprite == null)
            {
                var sprite = BuiltInLoader.LoadSprite("Launch_1");
                m_BackGround.overrideSprite = sprite;
            }
        }
        else
        {
            if (backGrounds.Count <= 0)
            {
                for (var i = 0; i < 3; i++)
                {
                    var sprite = BuiltInLoader.LoadSprite(StringUtility.Contact("Launch_", i + 1));
                    if (sprite != null)
                    {
                        backGrounds.Add(sprite);
                    }
                }
        // if (Application.isEditor)
        // {
        //     if (m_BackGround.overrideSprite == null)
        //     {
        //         var sprite = BuiltInLoader.LoadSprite("Launch_1");
        //         m_BackGround.overrideSprite = sprite;
        //     }
        // }
        // else
        // {
        //     if (backGrounds.Count <= 0)
        //     {
        //         for (var i = 0; i < 3; i++)
        //         {
        //             var sprite = BuiltInLoader.LoadSprite(StringUtility.Contact("Launch_", i + 1));
        //             if (sprite != null)
        //             {
        //                 backGrounds.Add(sprite);
        //             }
        //         }

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

    protected override void OnPreOpen()
@@ -116,30 +116,30 @@
    protected void LateUpdate()
    {
        UpdateProgress();
        CopiedLogic_LateUpdate();
        // CopiedLogic_LateUpdate();
    }

    private void CopiedLogic_LateUpdate()
    {
        backGroundTimer += Time.deltaTime;
        if (backGroundTimer >= 3f)
        {
            backGroundTimer -= 3f;
            if (backGrounds.Count > 1)
            {
                m_BackGround.overrideSprite = backGrounds[(++backGroundIndex) % backGrounds.Count];
            }
        // backGroundTimer += Time.deltaTime;
        // if (backGroundTimer >= 3f)
        // {
        //     backGroundTimer -= 3f;
        //     if (backGrounds.Count > 1)
        //     {
        //         m_BackGround.overrideSprite = backGrounds[(++backGroundIndex) % backGrounds.Count];
        //     }

            //  考虑在这里做这个描述的切换 或者根据图片来做提示词
            // m_StageDescription.text = "";
        }
        //     //  考虑在这里做这个描述的切换 或者根据图片来做提示词
        //     // m_StageDescription.text = "";
        // }
    }

    public void SetData(LaunchWinData _launchWinData)
    {
        backGroundTimer = _launchWinData.backGroundTimer;
        backGroundIndex = _launchWinData.backGroundIndex;
        m_BackGround.overrideSprite = _launchWinData.sprite;
        // m_BackGround.overrideSprite = _launchWinData.sprite;
        backGrounds = _launchWinData.sprites;
        m_StageDescription.text = Language.GetFromLocal(44);//最后Completed一定是这个 考虑要不要塞入LaunchWinData..
    }