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

Client_PangDeRong

2018-12-28 87a2f0e66af54d5d6020bbc50d30e1477d4fa9ee

 System/CrossServerOneVsOne/SeasonRewardCell.cs

@@ -135,10 +135,26 @@
            for (int i = 0; i < m_Itemlist.childCount; i++)

            {

                GameObject ObjChild = m_Itemlist.GetChild(i).gameObject;

                KingRewardItem kingRewardItem = ObjChild.GetComponent<KingRewardItem>();

                if (i < List.Count)

                {

                    ObjChild.SetActive(true);

                    ItemCell _ItemCell = ObjChild.GetComponent<ItemCell>();

                    var config = Config.Instance.Get<KingTreasureItemConfig>(List[i].item.id);

                    if (config != null)

                    {

                        kingRewardItem.KingText.gameObject.SetActive(true);

                        kingRewardItem.KingText.text = config.qualityName;

                        var Itemconfig = Config.Instance.Get<ItemConfig>(List[i].item.id);

                        if (Itemconfig != null)

                        {

                            kingRewardItem.KingText.color = UIHelper.GetUIColor(Itemconfig.ItemColor,false);                      
                        }

                    }

                    else

                    {

                        kingRewardItem.KingText.gameObject.SetActive(false);

                    }

                    ItemCell _ItemCell = kingRewardItem.ItemCell;

                    ItemCellModel cellModel = new ItemCellModel(List[i].item.id, true, (ulong)List[i].item.count, List[i].isBind);

                    _ItemCell.Init(cellModel);

                    int type = i;

@@ -171,6 +187,7 @@
            if (config != null)

            {

                m_Segmenttext.text = config.Name;

               // m_Segmenttext.color = UIHelper.GetDanLVColor(config.DanLV, false);

            }

            if (CrossServerOneVsOnePKSeason.Instance.SeasonState != 2)

            {

@@ -224,10 +241,26 @@
            for (int i = 0; i < m_Itemlist.childCount; i++)

            {

                GameObject ObjChild = m_Itemlist.GetChild(i).gameObject;

                KingRewardItem kingRewardItem = ObjChild.GetComponent<KingRewardItem>();

                if (i < List.Count)

                {

                    ObjChild.SetActive(true);

                    ItemCell _ItemCell = ObjChild.GetComponent<ItemCell>();

                    var config = Config.Instance.Get<KingTreasureItemConfig>(List[i].ItemId);

                    if (config != null)

                    {

                        kingRewardItem.KingText.gameObject.SetActive(true);

                        kingRewardItem.KingText.text = config.qualityName;

                        var Itemconfig = Config.Instance.Get<ItemConfig>(List[i].ItemId);

                        if (Itemconfig != null)

                        {

                            kingRewardItem.KingText.color = UIHelper.GetUIColor(Itemconfig.ItemColor, false);

                        }

                    }

                    else

                    {

                        kingRewardItem.KingText.gameObject.SetActive(false);

                    }

                    ItemCell _ItemCell = kingRewardItem.ItemCell;

                    ItemCellModel cellModel = new ItemCellModel(List[i].ItemId, true, (ulong)List[i].ItemNumber, List[i].Isbind);

                    _ItemCell.Init(cellModel);

                    int type = i;