少年修仙传客户端代码仓库
client_linchunjie
2019-05-16 dfc3c3ee42b194377f9bbeee55bfcff8490c1fe2
6807 【2.0【开发】灵根界面和专精激活再优化
4个文件已修改
67 ■■■■■ 已修改文件
System/Role/ReikiRootModel.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Role/ReikiRootWin.cs 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Skill/ExpertSkillActiveRemindWin.cs 51 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Skill/ExpertSkillSelectWin.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Role/ReikiRootModel.cs
@@ -77,6 +77,8 @@
        public int selectReikiRoot { get; set; }
        public bool openFromTreasureSkill { get; set; }
        public readonly Redpoint redpoint = new Redpoint(101, 10103);
        public event Action onCacheFreePointRefresh;
System/Role/ReikiRootWin.cs
@@ -22,6 +22,7 @@
        [SerializeField] Text m_FreePoint;
        [SerializeField] Button m_Reset;
        [SerializeField] Text m_ResetLabel;
        [SerializeField] Button m_GetPath;
        [SerializeField] Button m_Confirm;
        [SerializeField] Button m_Rule;
@@ -65,6 +66,7 @@
            m_Reset.AddListener(OnReset);
            m_Confirm.AddListener(Confirm);
            m_Rule.AddListener(OnRule);
            m_GetPath.AddListener(GetPath);
            m_NumKeyboard.onValueChange.AddListener(OnPointValChange);
            m_NumKeyboard.onConfirm.AddListener((bool isOk) =>
@@ -130,6 +132,7 @@
            }
            treasureSkillModel.newSatisfyActiveExpertDirty = false;
            model.openFromTreasureSkill = false;
            StopAllCoroutines();
        }
@@ -150,7 +153,7 @@
                }
            }
            if (treasureSkillModel.newSatisfyActiveExpertDirty)
            if (treasureSkillModel.newSatisfyActiveExpertDirty && !model.openFromTreasureSkill)
            {
                if (!WindowCenter.Instance.IsOpen<ReikiRootQualityPromoteWin>())
                {
@@ -334,6 +337,13 @@
            WindowCenter.Instance.Open<ReikiRootRuleWin>();
        }
        private void GetPath()
        {
            RealmRecommandEquipGetWayWin.equipGetWays.Clear();
            RealmRecommandEquipGetWayWin.equipGetWays.AddRange(model.reikiRootGetWays);
            WindowCenter.Instance.Open<RealmRecommandEquipGetWayWin>();
        }
        private void OnFlyComplete()
        {
            StartCoroutine(Co_DisplayReikis());
System/Skill/ExpertSkillActiveRemindWin.cs
@@ -14,9 +14,11 @@
    public class ExpertSkillActiveRemindWin : Window
    {
        [SerializeField] Text m_Reiki;
        [SerializeField] Text m_Remind;
        [SerializeField] Button m_GotoReiki;
        [SerializeField] Button m_GetPath;
        [SerializeField] Button m_Confirm;
        [SerializeField] Button m_Cancel;
        [SerializeField] Button m_Close;
        public static int skillId = 0;
@@ -32,7 +34,8 @@
        protected override void AddListeners()
        {
            m_GotoReiki.AddListener(GotoReiki);
            m_GetPath.AddListener(GetPath);
            m_Confirm.AddListener(Confirm);
            m_Cancel.AddListener(CloseClick);
            m_Close.AddListener(CloseClick);
        }
@@ -65,27 +68,50 @@
                var requireProperty = skillConfig.RequireProperty();
                var requireValue = skillConfig.RequirePropertyValue();
                var propertyConfig = PlayerPropertyConfig.Get(requireProperty);
                m_Remind.text = Language.Get("ExpertSkillActiveRemind", propertyConfig.Name, requireValue);
                if (reikiRootModel.freePoint + reikiRootModel.GetReikiRootPoint(requireProperty) >= requireValue)
                var point = requireValue - reikiRootModel.GetReikiRootPoint(requireProperty);
                if (reikiRootModel.freePoint >= point)
                {
                    m_GotoReiki.gameObject.SetActive(true);
                    m_GetPath.gameObject.SetActive(false);
                    m_Reiki.text = StringUtility.Contact(propertyConfig.Name, ":", requireValue);
                    m_Reiki.color = UIHelper.GetUIColor(TextColType.Green, true);
                    m_GotoReiki.gameObject.SetActive(false);
                    m_Confirm.gameObject.SetActive(true);
                    m_Cancel.gameObject.SetActive(true);
                    m_Remind.gameObject.SetActive(true);
                }
                else
                {
                    m_GotoReiki.gameObject.SetActive(false);
                    m_GetPath.gameObject.SetActive(true);
                    m_Reiki.text = StringUtility.Contact(propertyConfig.Name, ":", requireValue
                        , Language.Get("ExpertSkillActiveRemind", point));
                    m_Reiki.color = UIHelper.GetUIColor(TextColType.Red, true);
                    m_GotoReiki.gameObject.SetActive(true);
                    m_Confirm.gameObject.SetActive(false);
                    m_Cancel.gameObject.SetActive(false);
                    m_Remind.gameObject.SetActive(false);
                }
            }
        }
        private void GetPath()
        private void Confirm()
        {
            TreasurePotential expert;
            if (model.TryGetPotential(skillId, out expert))
            {
                var level = 0;
                model.TryGetExpertActiveLevel(skillId, out level);
                var skillConfig = SkillConfig.Get(skillId + level);
                var requireProperty = skillConfig.RequireProperty();
                var requireValue = skillConfig.RequirePropertyValue();
                var propertyConfig = PlayerPropertyConfig.Get(requireProperty);
                var point = requireValue - reikiRootModel.GetReikiRootPoint(requireProperty);
                if (reikiRootModel.freePoint >= point)
                {
                    reikiRootModel.SendAddPoint(new byte[1] { (byte)requireProperty }, new ushort[1] { (ushort)point });
                }
            }
            CloseImmediately();
            RealmRecommandEquipGetWayWin.equipGetWays.Clear();
            RealmRecommandEquipGetWayWin.equipGetWays.AddRange(reikiRootModel.reikiRootGetWays);
            WindowCenter.Instance.Open<RealmRecommandEquipGetWayWin>();
        }
        private void GotoReiki()
@@ -94,6 +120,7 @@
            WindowCenter.Instance.CloseImmediately("ExpertSkillSelectWin");
            var skillConfig = SkillConfig.Get(skillId);
            reikiRootModel.selectReikiRoot = skillConfig.RequireProperty();
            reikiRootModel.openFromTreasureSkill = true;
            WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.RolePoint);
        }
    }
System/Skill/ExpertSkillSelectWin.cs
@@ -238,7 +238,7 @@
                m_Select.gameObject.SetActive(activeLevel > 0 && !satisfyActive && !used);
                m_Active.gameObject.SetActive(satisfyActive || error == 3);
                m_Active.SetColorful(m_ActiveLabel, satisfyActive);
                //m_Active.SetColorful(m_ActiveLabel, satisfyActive);
                if (satisfyActive || error == 3)
                {