3335 洗练界面添加装备星级显示.

client_Wu Xijin

2019-03-27 42435a8788fc20a272c2b63d6aecf236f1e60a00

3335 洗练界面添加装备星级显示.

 System/BetterItemGet/BetterEquipGetModel.cs.orig

File was deleted

 System/BetterItemGet/BetterEquipGetModel.cs.orig.meta

File was deleted

 System/BetterItemGet/PreciousItemGetModel.cs.orig

File was deleted

 System/BetterItemGet/PreciousItemGetModel.cs.orig.meta

File was deleted

 System/EquipTrain/EquipTrainCandidate.cs

@@ -15,6 +15,7 @@
        public readonly LogicString equipGuid = new LogicString();
        public readonly LogicInt trainLevel = new LogicInt();
        public readonly LogicBool selected = new LogicBool();
        public readonly LogicInt starLevel = new LogicInt();

        public EquipTrainCandidate(Int2 equipPosition)
        {

 System/EquipTrain/EquipTrainCandidateBehaviour.cs

@@ -14,6 +14,7 @@
        [SerializeField] Image m_BackGround;
        [SerializeField] Image m_EmptyItem;
        [SerializeField] ItemCell m_ItemCell;
        [SerializeField] Text m_Star;
        [SerializeField] Text m_Description1;
        [SerializeField] Text m_Description2;
        [SerializeField] Button m_Select;
@@ -51,6 +52,7 @@
            {
                m_ItemCell.gameObject.SetActive(false);
                m_EmptyItem.gameObject.SetActive(true);
                m_Star.gameObject.SetActive(false);
                var place = this.candidate.equipPosition.y;
                m_Description1.text = string.Format("部位：{0}", UIHelper.GetEquipPlaceName(place));
                m_Description1.color = UIHelper.GetUIColor(TextColType.Black, true);
@@ -66,6 +68,10 @@
                m_Description1.color = UIHelper.GetUIColor(item.config.ItemColor, true);
                m_Description2.text = string.Format("洗练等级：{0}级", this.candidate.trainLevel.Fetch());
                m_Description2.color = UIHelper.GetUIColor(TextColType.Black, true);

                var starLevel = this.candidate.starLevel.Fetch();
                m_Star.gameObject.SetActive(true);
                m_Star.text = starLevel >= 1 ? string.Format("{0}星", starLevel) : "";
            }
        }

@@ -80,6 +86,7 @@
            if (force || this.candidate.trainLevel.dirty)
            {
                m_Description2.text = string.Format("洗练等级：{0}级", this.candidate.trainLevel.Fetch());
                m_Description2.color = UIHelper.GetUIColor(TextColType.Black, true);
            }
        }


 System/EquipTrain/EquipTrainWin.cs

@@ -18,6 +18,7 @@

        [SerializeField] Text m_MaxTrainLevel;
        [SerializeField] ItemCell m_TargetEquip;
        [SerializeField] Text m_EquipStar;
        [SerializeField] RectTransform m_EquipEmpty;

        [SerializeField] MaterialCell m_MaterialCell;
@@ -132,11 +133,16 @@
                    m_EquipEmpty.gameObject.SetActive(false);
                    m_TargetEquip.gameObject.SetActive(true);
                    m_TargetEquip.Init(equip);

                    var starLevel = starModel.GetEquipStarLevel(equipPosition);
                    m_EquipStar.gameObject.SetActive(true);
                    m_EquipStar.text = starLevel >= 1 ? string.Format("{0}星", starLevel) : "";
                }
                else
                {
                    m_EquipEmpty.gameObject.SetActive(true);
                    m_TargetEquip.gameObject.SetActive(false);
                    m_EquipStar.gameObject.SetActive(false);
                }
            }


 System/ItemTip/TipBaseInfoWidget.cs

@@ -27,7 +27,7 @@
            {
                m_Label.gameObject.SetActive(true);
                m_Label.SetSprite("Equiped_a");
                m_Star.text = string.Format("{0}星", baseInfo.star);
                m_Star.text = baseInfo.star >= 1 ? string.Format("{0}星", baseInfo.star) : "";
            }
            else if (baseInfo.isAuction)
            {