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

client_linchunjie

2019-04-17 a756f262cb06c1c185fc0f648ccaf19e233eca14

 System/KnapSack/Logic/ItemTipsModel.cs

@@ -222,24 +222,6 @@
            }

        }



        public bool TryGetAtkSpeedColor(int atkSpeed, out string color)

        {

            color = string.Empty;

            foreach (var key in atkSpeedColorDict.Keys)

            {

                var rangelist = atkSpeedColorDict[key];

                if (rangelist.Count > 1)

                {

                    if (atkSpeed >= rangelist[0] && atkSpeed <= rangelist[1])

                    {

                        color = key;

                        return true;

                    }

                }

            }

            return false;

        }



        #endregion



        /// <summary>

@@ -323,14 +305,6 @@
            }

        }



        public void SetCurrentAttrData(ItemModel itemModel, bool isCompare)

        {

            curAttrData = new ItemAttrData(itemModel.itemId, false, (ulong)itemModel.count

                  , itemModel.gridIndex, isCompare

                  , itemModel.packType, itemModel.guid, ConfigParse.Analysis(itemModel.itemInfo.userData), ItemTipChildType.Normal);

        }





        public void SetCompareAttrData(ItemModel itemModel)

        {

            compareAttrData = new ItemAttrData(itemModel.itemId, false, (ulong)itemModel.count

@@ -395,10 +369,6 @@
                        {

                            EquipTipUtility.Show(curAttrData.guid);

                        }

                    }

                    else

                    {

                        WindowCenter.Instance.Open<EquipWin>();

                    }

                    break;

                case ItemWinType.wingsWin:

@@ -876,28 +846,6 @@
            return s;

        }



        private string SetAttrColor(string attrStr, int atkSpeed, int equipPlace)

        {

            string color = string.Empty;

            bool isColor = TryGetAtkSpeedColor(atkSpeed, out color);

            if (isColor)

            {

                return StringUtility.Contact("<color=#", color, ">", attrStr, "</color>");

            }

            return attrStr;

        }



        public int GetProValueType(int precentType, int value)

        {

            switch (precentType)

            {

                case 1:

                case 2:

                    return Mathf.RoundToInt(value / 100);

                default:

                    return value;

            }

        }

        #endregion



        #region 设置传奇属性

@@ -1757,7 +1705,6 @@
        public ItemTipChildType ChildType { get; private set; }  //决定当前面板打开哪个

        public Dictionary<int, List<int>> useDataDict { get; private set; }

        public Dictionary<int, int> strengthDataDict { get; private set; }

        public Dictionary<int, int> washDataDict { get; private set; }

        public Dictionary<int, int> legendDataDict { get; private set; }

        public Dictionary<int, int> exhaustedMaxDataDict { get; private set; }

        public Dictionary<int, int> wingsRefineMatDict { get; private set; }