Revert "【1.4】聚魂功能"

client_linchunjie

2018-12-20 c84504d14a5823db18572dfb38f1e9d68c224617

Revert "【1.4】聚魂功能"

This reverts commit 0dd88ff18c1267948c90c362306dc8a536c32bf9.

 System/GatheringSoul/GatherSoulItemBehaviour.cs

@@ -166,8 +166,8 @@
                            data.SetTipsFuncBtn(ItemWinBtnType.Replace, OnTipFunc);

                        }

                        GatherSoulComposeModel.Compose compose;

                        if ((composeModel.TryGetCompose(item.id, out compose)

                            && compose.requireItems.Count > 0) || item.sourceType == 1)

                        if(composeModel.TryGetCompose(item.id,out compose)

                            && compose.requireItems.Count > 0)

                        {

                            data.SetTipsFuncBtn(ItemWinBtnType.split, OnTipFunc);

                        }


 System/GatheringSoul/GatheringSoulModel.cs

@@ -1210,10 +1210,6 @@
                GatherSoulItem item;

                if (virtualPack.TryGetItem(PackType.rptGatherSoul, packlist[i], out item))

                {

                    if (item.sourceType == 1)

                    {

                        continue;

                    }

                    if (item.itemType == GATHERSOUL_ESSENCE_TYPE)

                    {

                        list.Add(item);

@@ -1411,8 +1407,6 @@
        public int itemType { get; private set; }



        public int placeType { get; private set; }//0-背包 1-装备



        public int sourceType { get; private set; }//来源



        GatheringSoulModel model

        {