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

client_linchunjie

2019-03-14 d0d289d502fe85e9bb597ced1b41c73b8bc75889

 System/MainInterfacePanel/FeaturesType3.cs

@@ -151,7 +151,7 @@
                }

                else

                {

                    ItemAttrData attrData = new ItemAttrData(List[0].id, false, (ulong)List[0].count, -1, List[0].bind ? 1 : 0);

                    ItemAttrData attrData = new ItemAttrData(List[0].id, false, (ulong)List[0].count);

                    itemTipsModel.SetItemTipsModel(attrData);

                   // DebugEx.LogError("弹框");

                }

@@ -165,14 +165,6 @@
            else

            {

                m_Number1.gameObject.SetActive(false);

            }

            if (List[0].bind)

            {

                m_Lock1.gameObject.SetActive(true);

            }

            else

            {

                m_Lock1.gameObject.SetActive(false);

            }

            if (FuncOpen.Instance.IsFuncOpen(funcID))

            {

@@ -219,7 +211,7 @@
                }

                else

                {

                    ItemAttrData attrData = new ItemAttrData(List[1].id, false, (ulong)List[1].count, -1, List[1].bind ? 1 : 0);

                    ItemAttrData attrData = new ItemAttrData(List[1].id, false, (ulong)List[1].count);

                    itemTipsModel.SetItemTipsModel(attrData);

                    //DebugEx.LogError("弹框");

                }

@@ -233,14 +225,7 @@
            {

                m_Number2.gameObject.SetActive(false);

            }

            if (List[1].bind)

            {

                m_Lock2.gameObject.SetActive(true);

            }

            else

            {

                m_Lock2.gameObject.SetActive(false);

            }



            if (FuncOpen.Instance.IsFuncOpen(funcID))

            {

                m_ItemBG2.gray = false;