0312 洗练装备提取装备阶标签

hch

2019-12-10 c4ae7727b06af9f533ff86cb5a09dcaa7ec7f9ed

0312 洗练装备提取装备阶标签

 System/EquipTrain/EquipTrainLevelBehaviour.cs

@@ -14,8 +14,7 @@
    {

        [SerializeField] Button m_Select;
        [SerializeField] Image m_BackGround;
        [SerializeField] Image m_Arrow;
        [SerializeField] Image m_SelectImg;
        [SerializeField] Text m_Title;
        [SerializeField] RedpointBehaviour m_Redpoint;

@@ -29,7 +28,7 @@
        {
            var equipSet = equipModel.GetEquipSet(level);
            var realmConfig = RealmConfig.Get(equipSet.realm);
            this.m_Title.text = Language.Get("RealmEquipName", realmConfig.Name);
            this.m_Title.text = realmConfig.Name;

            this.level = level;
            this.m_Redpoint.redpointId = 91 * 10000 + level * 100;
@@ -46,19 +45,17 @@

        public void Display()
        {
            var siblingIndex = this.transform.GetSiblingIndex();
            var candidates = this.model.candidatePlaces.Fetch();
            for (var i = candidates.Count - 1; i >= 0; i--)
            {
                var behaviour = EquipTrainCandidateBehaviourPool.Get();
                behaviour.Display(candidates[i]);
                behaviour.transform.SetParentEx(this.transform.parent, Vector3.zero, Quaternion.identity, Vector3.one);
                behaviour.transform.SetSiblingIndex(siblingIndex + 1);
                behaviour.transform.SetParentEx(this.transform.parent.parent.Find("Container_Candidate/ContentEquip"), Vector3.zero, Quaternion.identity, Vector3.one);
                behaviour.transform.SetSiblingIndex(0);
                slotBehaviours.Add(behaviour);
            }

            m_BackGround.SetSprite("RealmEquip_16");
            m_Arrow.transform.localEulerAngles = new Vector3(0, 0, 180);
            m_SelectImg.SetActive(true);
            this.m_Title.color = new Color32(255, 255, 255, 255);//"#ffffff";
        }

        public void Dispose()
@@ -69,15 +66,15 @@
            }

            slotBehaviours.Clear();
            m_BackGround.SetSprite("RealmEquip_5");
            m_Arrow.transform.localEulerAngles = Vector3.zero;
            m_SelectImg.SetActive(false);
            this.m_Title.color = new Color32(198, 181, 149, 255); //c6b595
        }

        private void Select()
        {
            if (model.selectedLevel.value == this.level)
            {
                model.SelectLevel(0);
                return;
            }
            else
            {

 System/EquipTrain/EquipTrainWin.cs

@@ -245,34 +245,34 @@
                }
            }

            if (resetPosition && selectedBehaviour != null)
            {
                var height = 0f;
                var totalHeight = 0f;
                var index = selectedBehaviour.GetSiblingIndex();
                var childCount = m_LevelContainer.childCount;
            //if (resetPosition && selectedBehaviour != null)
            //{
            //    var height = 0f;
            //    var totalHeight = 0f;
            //    var index = selectedBehaviour.GetSiblingIndex();
            //    var childCount = m_LevelContainer.childCount;

                for (var i = 0; i < childCount; i++)
                {
                    var child = m_LevelContainer.GetChild(i);
                    if (i < index)
                    {
                        height += (child as RectTransform).rect.height;
                    }
            //    for (var i = 0; i < childCount; i++)
            //    {
            //        var child = m_LevelContainer.GetChild(i);
            //        if (i < index)
            //        {
            //            height += (child as RectTransform).rect.height;
            //        }

                    totalHeight += (child as RectTransform).rect.height;
                }
            //        totalHeight += (child as RectTransform).rect.height;
            //    }

                var viewRect = (m_LevelScrollRect.transform as RectTransform).rect;
                if (totalHeight > viewRect.height)
                {
                    m_LevelScrollRect.verticalNormalizedPosition = 1 - height / (totalHeight - viewRect.height);
                }
                else
                {
                    m_LevelScrollRect.verticalNormalizedPosition = 1;
                }
            }
            //    var viewRect = (m_LevelScrollRect.transform as RectTransform).rect;
            //    if (totalHeight > viewRect.height)
            //    {
            //        m_LevelScrollRect.verticalNormalizedPosition = 1 - height / (totalHeight - viewRect.height);
            //    }
            //    else
            //    {
            //        m_LevelScrollRect.verticalNormalizedPosition = 1;
            //    }
            //}
        }

        private void DisplayMaterial(Int3 material)