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

client_Hale

2018-12-24 b90e484d2b71c713b53d2ba2fe55b2019d954ca9

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

 System/GatheringSoul/GatherSoulItemBehaviour.cs

@@ -211,7 +211,7 @@
                        if (composeModel.TryGetCompose(item.id, out compose)

                            && compose.requireItems.Count > 0)

                        {

                            data.SetTipsFuncBtn(ItemWinBtnType.split, OnTipFunc);

                            data.SetTipsFuncBtn(ItemWinBtnType.dismantle, OnTipFunc);

                        }

                        else

                        {


 System/GatheringSoul/GatherSoulTotalPropertyWin.cs

@@ -85,10 +85,10 @@
                    m_Propertys[index].gameObject.SetActive(true);

                    m_Propertys[index].DisplayUpper(propertySorts[i], displayPropertyDict[propertySorts[i]]);

                }

                else if (index < m_ClonePropertys.Count)

                else if (index - m_Propertys.Length < m_ClonePropertys.Count)

                {

                    m_ClonePropertys[index].gameObject.SetActive(true);

                    m_ClonePropertys[index].DisplayUpper(propertySorts[i], displayPropertyDict[propertySorts[i]]);

                    m_ClonePropertys[index - m_Propertys.Length].gameObject.SetActive(true);

                    m_ClonePropertys[index - m_Propertys.Length].DisplayUpper(propertySorts[i], displayPropertyDict[propertySorts[i]]);

                }

                index++;

            }


 System/GatheringSoul/GatheringSoulModel.cs

@@ -250,7 +250,7 @@
                emptyHoles = emptyHoles.Distinct(holeItemTypeDistinct).ToList();

                SelectBestEquipSoul(emptyHoles);

            }

            else

            if (packIndexs.Count == 0)

            {

                SelectBestReplaceSoul();

            }

@@ -661,6 +661,10 @@
                        {

                            continue;

                        }

                        if (compare.itemType == GATHERSOUL_ESSENCE_TYPE)

                        {

                            continue;

                        }

                        if (item.ExistSameProperty(compare.id)

                            && item.itemColor < compare.itemColor)

                        {

@@ -692,7 +696,7 @@
                    };

                    WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.GatherSoul271);

                    break;

                case ItemWinBtnType.split:

                case ItemWinBtnType.dismantle:

                case ItemWinBtnType.Resolve:

                    if (type == ItemWinBtnType.Resolve

                        && IsBestSoul(item, item.placeType, item.index))

@@ -747,13 +751,13 @@
            if (composeModel.TryGetCompose(item.id, out compose))

            {

                var config = Config.Instance.Get<ItemConfig>(item.id);

                var baseName = config.ItemName;

                var baseName = UIHelper.AppendStringColor(config.ItemColor, config.ItemName, true);

                var sb = new StringBuilder();

                for (int i = 0; i < compose.requireItems.Count; i++)

                {

                    var itemId = compose.requireItems[i];

                    config = Config.Instance.Get<ItemConfig>(itemId);

                    sb.Append(config.ItemName);

                    sb.Append(UIHelper.AppendStringColor(config.ItemColor, config.ItemName, true));

                    if (i < compose.requireItems.Count - 2)

                    {

                        sb.Append("、");

@@ -1532,6 +1536,11 @@


        public bool ExistSameProperty(int compareId)

        {

            if (!model.gatherSoulPropertys.ContainsKey(compareId)

                || !model.gatherSoulPropertys.ContainsKey(id))

            {

                return false;

            }

            var list = model.gatherSoulPropertys[id];

            for (int i = 0; i < list.Count; i++)

            {