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

client_Wu Xijin

2019-05-23 0f702a65846d6292740e4e9ec4344062081f6da4

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

 System/Equip/EquipSuitEffect.cs

@@ -14,7 +14,7 @@
            Display(itemId);

        }



        public void Display(int itemId)

        public void Display(int itemId, bool dirty = false)

        {

            this.itemId = itemId;

            var isSuitEquip = ItemLogicUtility.Instance.IsSuitEquip(itemId);

@@ -26,6 +26,11 @@
            {

                m_SuitEffect.StopImediatly();

            }



            if (dirty)

            {

                SnxxzGame.Instance.StartCoroutine(Co_SetOrder(this, transform as RectTransform));

            }

        }



        public static EquipSuitEffect Create(RectTransform transform)


 System/EquipStar/EquipStarUpgradeCandidateSlot.cs

@@ -20,6 +20,8 @@
        [SerializeField] Button m_Select;
        [SerializeField] RedpointBehaviour m_Redpoint;

        public bool suitEffectDirty { get; set; }

        EquipStarModel model { get { return ModelCenter.Instance.GetModel<EquipStarModel>(); } }
        EquipModel equipModel { get { return ModelCenter.Instance.GetModel<EquipModel>(); } }
        PackModel packModel { get { return ModelCenter.Instance.GetModel<PackModel>(); } }
@@ -60,6 +62,7 @@
            }
            else
            {
                m_ItemCell.suitEffectDirty = suitEffectDirty;
                m_ItemCell.gameObject.SetActive(true);
                m_EmptyItem.gameObject.SetActive(false);
                m_ItemCell.Init(item);
@@ -67,6 +70,8 @@
                m_Description1.text = item.config.ItemName;
                m_Description1.color = UIHelper.GetUIColor(item.config.ItemColor, true);
                m_Description2.text = string.Empty;

                suitEffectDirty = false;
            }
        }

@@ -115,6 +120,7 @@
                return;
            }

            behaviour.suitEffectDirty = true;
            behaviour.gameObject.SetActive(false);
            behaviour.transform.SetParent(null);
            pool.Release(behaviour.gameObject);

 System/EquipTrain/EquipTrainCandidateBehaviour.cs

@@ -20,6 +20,8 @@
        [SerializeField] Button m_Select;
        [SerializeField] RedpointBehaviour m_Redpoint;

        public bool suitEffectDirty { get; set; }

        EquipTrainModel model { get { return ModelCenter.Instance.GetModel<EquipTrainModel>(); } }
        EquipModel equipModel { get { return ModelCenter.Instance.GetModel<EquipModel>(); } }
        PackModel packModel { get { return ModelCenter.Instance.GetModel<PackModel>(); } }
@@ -62,6 +64,7 @@
            }
            else
            {
                m_ItemCell.suitEffectDirty = suitEffectDirty;
                m_ItemCell.gameObject.SetActive(true);
                m_EmptyItem.gameObject.SetActive(false);
                m_ItemCell.Init(item);
@@ -74,6 +77,8 @@
                var starLevel = this.candidate.starLevel.Fetch();
                m_Star.gameObject.SetActive(true);
                m_Star.text = starLevel >= 1 ? string.Format("{0}星", starLevel) : "";

                suitEffectDirty = false;
            }
        }

@@ -126,6 +131,7 @@
                return;
            }

            behaviour.suitEffectDirty = true;
            behaviour.gameObject.SetActive(false);
            behaviour.transform.SetParent(null);
            pool.Release(behaviour.gameObject);

 System/KnapSack/New/CommonItemBaisc.cs

@@ -93,6 +93,8 @@
            }

        }



        public bool suitEffectDirty { get; set; }



        GameObject cellContainer;

        protected void LoadPrefab()

        {

@@ -163,7 +165,8 @@
                countText.text = UIHelper.ReplaceLargeNum((double)count);

            }



            suitEffect.Display(itemId);

            suitEffect.Display(itemId, suitEffectDirty);

            suitEffectDirty = false;



            var compareReslut = isCompare ? Compare(type, itemId, score, guid) : 0;

            switch (compareReslut)