少年修仙传客户端代码仓库
client_Hale
2018-12-21 8f0f12faf980582a07de599da490c30b1bcc426c
Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
1个文件已修改
14 ■■■■■ 已修改文件
System/GatheringSoul/GatheringSoulModel.cs 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/GatheringSoul/GatheringSoulModel.cs
@@ -613,8 +613,8 @@
                    {
                        continue;
                    }
                    if (!item.ExistSameProperty(compare.id)
                        || item.Compare(compare) != 1)
                    if (item.ExistSameProperty(compare.id)
                        && item.itemColor < compare.itemColor)
                    {
                        return false;
                    }
@@ -633,8 +633,8 @@
                        {
                            continue;
                        }
                        if (!item.ExistSameProperty(compare.id)
                            || item.Compare(compare) != 1)
                        if (item.ExistSameProperty(compare.id)
                            && item.itemColor < compare.itemColor)
                        {
                            return false;
                        }
@@ -666,7 +666,8 @@
                    break;
                case ItemWinBtnType.split:
                case ItemWinBtnType.Resolve:
                    if (IsBestSoul(item, item.placeType, item.index))
                    if (type == ItemWinBtnType.Resolve
                        && IsBestSoul(item, item.placeType, item.index))
                    {
                        ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"), Language.Get("BestGatherSoulResolveConfirm"), (bool isOk) =>
                          {
@@ -1455,6 +1456,8 @@
        public int placeType { get; private set; }//0-背包 1-装备
        public int itemColor { get; private set; }
        GatheringSoulModel model
        {
            get { return ModelCenter.Instance.GetModel<GatheringSoulModel>(); }
@@ -1471,6 +1474,7 @@
            base.ParsePackItem(index, data);
            var itemConfig = Config.Instance.Get<ItemConfig>(id);
            itemType = itemConfig.Type;
            itemColor = itemConfig.ItemColor;
            if (itemType == GatheringSoulModel.GATHERSOUL_SOUL_TYPE)
            {
                gatherSoulType = GatherSoulType.Soul;