Merge branch 'master' into ItemReconstruction

client_Wu Xijin

2019-02-21 c13c4f0f42106636eeb736511a44b931a3984de2

Merge branch 'master' into ItemReconstruction

 System/ClientVersion/VersionConfig.cs

@@ -247,7 +247,7 @@
                var input = lhsStrings[i];

                var intTemp = 0;

                int.TryParse(input, out intTemp);

                version1 += intTemp * MathUtility.Power(100, lhsStrings.Length - i);

                version1 += intTemp * MathUtility.Power(1000, lhsStrings.Length - i);

            }



            var version2 = 0;

@@ -256,11 +256,10 @@
                var input = rhsStrings[i];

                var intTemp = 0;

                int.TryParse(input, out intTemp);

                version2 += intTemp * MathUtility.Power(100, rhsStrings.Length - i);

                version2 += intTemp * MathUtility.Power(1000, rhsStrings.Length - i);

            }



            return version1 > version2 ? _lhs : _rhs;



        }

    }




 System/Launch/LaunchWin.cs

@@ -92,6 +92,11 @@
                m_IosProgressContainer.gameObject.SetActive(false);

            }



            if (m_StageDescription != null)

            {

                m_StageDescription.text = GetLaunchStageDescription(showStage, showStep);

            }



            UpdateProgress();

        }



@@ -111,6 +116,7 @@
        protected override void OnActived()

        {

            base.OnActived();



            if (m_TotalProgressSlider == null)

            {

                m_TotalProgressSlider = this.GetComponentInChildren<SmoothSlider>(true);


 Utility/ConfigInitiator.cs

@@ -384,7 +384,7 @@
                }
                else if (DeviceUtility.cpu > 1 && DeviceUtility.memory > 1.5f * 1024)
                {
                    return 4;
                    return 2;
                }
                else
                {