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

Client_PangDeRong

2018-08-21 c58af4ef027205d64323182a8173e6c6020f7517

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

 System/Treasure/TreasureSoulPattern.cs

@@ -6,9 +6,14 @@
{

    public class TreasureSoulPattern : MonoBehaviour

    {

        [SerializeField] RectTransform m_ContainerBottom;

        protected TreasureSoulModel model { get { return ModelCenter.Instance.GetModel<TreasureSoulModel>(); } }

        protected TreasureSpecialData special;



        
        public RectTransform bottom

        {

            get { return m_ContainerBottom; }

        }



        public virtual void Display(int _id)

        {


 System/Treasure/TreasureSoulWin.cs

@@ -303,6 +303,10 @@
            {

                m_TreasureSouls[i].Dispose();

                m_TreasureSouls[i].gameObject.SetActive(_pattern == i && model.IsGetTreasureSoul(model.selectSoul));

                if (m_TreasureSouls[i].bottom != null)

                {

                    m_TreasureSouls[i].bottom.gameObject.SetActive(_pattern == i && model.IsGetTreasureSoul(model.selectSoul));

                }

                if (_pattern == i)

                {

                    m_TreasureSouls[i].Display((int)special.type);