Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

Client_PangDeRong

2018-12-24 b549a63ed0fffb7b7ed3e5bab10b167b5502619e

Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

 System/GatheringSoul/GatherSoulItemBehaviour.cs

@@ -223,11 +223,15 @@
                        {

                            data.SetTipsFuncBtn(ItemWinBtnType.compose, OnTipFunc);

                        }

                        if (soulModel.IsSamePropertyCompareHoles(-1, item as GatherSoulItem) == -1)

                        bool existSamePropertyHole = soulModel.IsSamePropertyCompareHoles(-1, item as GatherSoulItem) != -1;

                        if (!existSamePropertyHole)

                        {

                            data.SetTipsFuncBtn(ItemWinBtnType.Wear, OnTipFunc);

                        }

                        else

                        GatherSoulItem holeItem;

                        if (existSamePropertyHole ||

                            (item.itemType == GatheringSoulModel.GATHERSOUL_CORE_TYPE

                            && soulModel.TryGetItem(soulModel.coreHole, out holeItem)))

                        {

                            data.SetTipsFuncBtn(ItemWinBtnType.Replace, OnTipFunc);

                        }


 System/GatheringSoul/GatheringSoulModel.cs

@@ -863,6 +863,23 @@
                    SendEquipPack((int)PackType.rptGatherSoul, item.index, (int)PackType.rptInterimPack, tryEquipHole);

                }

            }

            if (item.itemType == GATHERSOUL_CORE_TYPE)

            {

                GatherSoulItem holeItem;

                if (TryGetItem(coreHole, out holeItem))

                {

                    var sameHole = -1;

                    if (gatherSoulPropertys[item.id].Count > gatherSoulPropertys[holeItem.id].Count)

                    {

                        sameHole = IsSamePropertyCompareHoles(coreHole, item);

                    }

                    if (sameHole != -1)

                    {

                        SendEquipPack((int)PackType.rptInterimPack, sameHole, (int)PackType.rptGatherSoul, 0);

                    }

                    SendEquipPack((int)PackType.rptGatherSoul, item.index, (int)PackType.rptInterimPack, tryEquipHole);

                }

            }

        }



        public void ExecutePutOffSoul(GatherSoulItem item)


 System/Launch/LaunchWin.cs

@@ -30,9 +30,7 @@


        string stepDescription = string.Empty;



        float refProgress = 0f;

        float behaviourProgress = 0f;

        float trueProgress = 0f;



        float timer = 0.1f;

        float interval = 0.1f;

@@ -68,9 +66,7 @@
        {

            backGroundTimer = 0f;

            backGroundIndex = 0;

            refProgress = 0f;

            behaviourProgress = 0f;

            trueProgress = 0f;

            m_ProgressSlider.ResetValue(0f);

            m_AlphaTween.SetStartState();



@@ -121,7 +117,7 @@


        void UpdateLoadingProgress(Launch.LaunchStage _stage, float _progress)

        {

            trueProgress = Mathf.Max(_progress, behaviourProgress);

            behaviourProgress = _progress;

            switch (_stage)

            {

                case Launch.LaunchStage.AssetCopy:

@@ -153,15 +149,6 @@
            }

            else

            {

                if (trueProgress > 0.9599f)

                {

                    behaviourProgress = Mathf.Clamp01(behaviourProgress + Time.deltaTime * 0.2f);

                }

                else

                {

                    behaviourProgress = Mathf.SmoothDamp(behaviourProgress, trueProgress, ref refProgress, 0.2f);

                }



                m_ProgressSlider.value = behaviourProgress;

                m_Progress.text = VersionUtility.Instance.IsShangGu() ? stepDescription :

                    StringUtility.Contact(stepDescription, Mathf.RoundToInt(behaviourProgress * 100), "%");