1719 双属性符印满级时，显示异常

client_linchunjie

2018-08-27 aca71d06e68466fe5ef95c4d98b91707852c4631

1719 双属性符印满级时，显示异常

 System/Rune/RuneModel.cs

@@ -476,12 +476,12 @@
                    }

                    if (!IsSameInHoleRune(_itemCfg.ID, _hole))

                    {

                        return true;

                    }

                    if (runeComposeModel.m_RuneBothPropertys.Contains(rune.id)

                        if (runeComposeModel.m_RuneBothPropertys.Contains(rune.id)

                        && GetDoublePropLimitCount() <= GetCurrentDoublePropCount())

                    {

                        return false;

                        {

                            return false;

                        }

                        return true;

                    }

                }

            }

@@ -827,7 +827,8 @@
                    || (_itemBetterCfg.ItemColor == _itemCfg.ItemColor && _runeCfg.AttrType.Length == 1 && _runeBetterCfg.AttrType.Length == 2))

                {

                    if (runeComposeModel.m_RuneBothPropertys.Contains(_rune.id)

                        && GetDoublePropLimitCount() <= GetCurrentDoublePropCount())

                        && GetDoublePropLimitCount() <= GetCurrentDoublePropCount()

                        && !runeComposeModel.m_RuneBothPropertys.Contains(_runeHole.id))

                    {

                        return false;

                    }

@@ -874,7 +875,8 @@
                || (_itemBetterCfg.ItemColor == _itemCfg.ItemColor && _runeCfg.AttrType.Length == 1 && _runeBetterCfg.AttrType.Length == 2))

            {

                if (runeComposeModel.m_RuneBothPropertys.Contains(_data.id)

                    && GetDoublePropLimitCount() <= GetCurrentDoublePropCount())

                    && GetDoublePropLimitCount() <= GetCurrentDoublePropCount()

                    && !runeComposeModel.m_RuneBothPropertys.Contains(_runeHole.id))

                {

                    return false;

                }

@@ -939,6 +941,7 @@
                    OnRefreshRuneTowerLv();

                }

            }

            UpdateRedpoint();

        }



        public bool IsSameInHoleRune(int id, int hole)


 System/Rune/RuneMosaicWin.cs

@@ -293,6 +293,7 @@
            m_LevelUpBtnTxt.color = m_RuneLevelUpBtn.interactable ? m_LevelUpCacheColor : Color.grey;

            runeLevelUpItemNum.gameObject.SetActive(!_isRuneMaxLv);

            m_ContainerLvUp1.gameObject.SetActive(!_isRuneMaxLv);

            m_ContainerLvUp2.gameObject.SetActive(!_isRuneMaxLv);

            m_ContainerItem.gameObject.SetActive(!_isRuneMaxLv);

            m_RuneLevelUpBtn.gameObject.SetActive(!_isRuneMaxLv);

            //m_ContainerLevelUp.gameObject.SetActive(!_isRuneMaxLv);


 System/Rune/RunePackCell.cs

@@ -84,8 +84,10 @@
                MessageWin.Inst.ShowFixedTip(Language.Get("L1078"));

                return;

            }

            var sltHoleRune = model.GetHoleRune(model.sltRuneHole);

            if (runeComposeModel.m_RuneBothPropertys.Contains(_rune.id)

                && model.GetDoublePropLimitCount() <= model.GetCurrentDoublePropCount())

                && model.GetDoublePropLimitCount() <= model.GetCurrentDoublePropCount()

                && (sltHoleRune == null || !runeComposeModel.m_RuneBothPropertys.Contains(sltHoleRune.id)))

            {

                var _count = model.GetDoublePropLimitCount();

                SysNotifyMgr.Instance.ShowTip("RuneGridUnEnough", _count);