少年修仙传客户端代码仓库
client_Wu Xijin
2019-05-08 8222f73f92600a3f2398959604c8e66e9fb38814
6690 【2.0】【前端】境界装备锻造选中优化
2个文件已修改
146 ■■■■■ 已修改文件
System/EquipStar/EquipStarWin.cs 73 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/EquipTrain/EquipTrainWin.cs 73 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/EquipStar/EquipStarWin.cs
@@ -14,7 +14,9 @@
    public class EquipStarWin : Window
    {
        [SerializeField] RectTransform m_LevelContainer;
        [SerializeField] ScrollRect m_LevelScrollRect;
        [SerializeField] RectTransform m_OperateContainer;
        [SerializeField] RectTransform m_EmptyContainer;
        [SerializeField] Star[] m_Stars;
@@ -98,24 +100,7 @@
        {
            if (force || model.selectedLevel.dirty)
            {
                var level = model.selectedLevel.Fetch();
                for (var i = 0; i < levelBehaviours.Count; i++)
                {
                    var behaviour = levelBehaviours[i];
                    if (behaviour.level != level)
                    {
                        behaviour.Dispose();
                    }
                }
                for (var i = 0; i < levelBehaviours.Count; i++)
                {
                    var behaviour = levelBehaviours[i];
                    if (behaviour.level == level)
                    {
                        behaviour.Display();
                    }
                }
                DisplayCandidateSlots(model.selectedLevel.Fetch(), force);
            }
            if (force || model.selectedPlace.dirty)
@@ -190,6 +175,58 @@
            }
        }
        private void DisplayCandidateSlots(int selectedLevel, bool resetPosition)
        {
            for (var i = 0; i < levelBehaviours.Count; i++)
            {
                var behaviour = levelBehaviours[i];
                if (behaviour.level != selectedLevel)
                {
                    behaviour.Dispose();
                }
            }
            RectTransform selectedBehaviour = null;
            for (var i = 0; i < levelBehaviours.Count; i++)
            {
                var behaviour = levelBehaviours[i];
                if (behaviour.level == selectedLevel)
                {
                    behaviour.Display();
                    selectedBehaviour = behaviour.transform as RectTransform;
                }
            }
            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;
                    }
                    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;
                }
            }
        }
        private void DisplayStars(List<EquipStarModel.Star> stars)
        {
            StopCoroutine("Co_DisplayStars");
System/EquipTrain/EquipTrainWin.cs
@@ -16,7 +16,7 @@
    {
        [SerializeField] RectTransform m_LevelContainer;
        [SerializeField] ScrollRect m_LevelScrollRect;
        [SerializeField] RectTransform m_OperateContainer;
        [SerializeField] RectTransform m_EmptyContainer;
        [SerializeField] Text m_MaxTrainLevel;
@@ -110,24 +110,7 @@
        {
            if (force || model.selectedLevel.dirty)
            {
                var level = model.selectedLevel.Fetch();
                for (var i = 0; i < levelBehaviours.Count; i++)
                {
                    var behaviour = levelBehaviours[i];
                    if (behaviour.level != level)
                    {
                        behaviour.Dispose();
                    }
                }
                for (var i = 0; i < levelBehaviours.Count; i++)
                {
                    var behaviour = levelBehaviours[i];
                    if (behaviour.level == level)
                    {
                        behaviour.Display();
                    }
                }
                DisplayCandidateSlots(model.selectedLevel.Fetch(), force);
            }
            if (force || model.selectedPlace.dirty)
@@ -226,6 +209,58 @@
        }
        private void DisplayCandidateSlots(int selectedLevel, bool resetPosition)
        {
            for (var i = 0; i < levelBehaviours.Count; i++)
            {
                var behaviour = levelBehaviours[i];
                if (behaviour.level != selectedLevel)
                {
                    behaviour.Dispose();
                }
            }
            RectTransform selectedBehaviour = null;
            for (var i = 0; i < levelBehaviours.Count; i++)
            {
                var behaviour = levelBehaviours[i];
                if (behaviour.level == selectedLevel)
                {
                    behaviour.Display();
                    selectedBehaviour = behaviour.transform as RectTransform;
                }
            }
            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;
                    }
                    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;
                }
            }
        }
        private void DisplayMaterial(Int3 material)
        {
            m_MaterialCell.Display(material.x, material.y, material.z);