少年修仙传客户端代码仓库
client_linchunjie
2019-05-08 bbb4e3ee533f49f3aa1c4c8674227de443c82846
6686 【2.0】【前端】五行灵根界面功能优化
4个文件已修改
2个文件已添加
128 ■■■■■ 已修改文件
System/MainInterfacePanel/MainButtonMisc.cs 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Role/ReikiRootModel.cs 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Role/ReikiRootRemindWin.cs 60 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Role/ReikiRootRemindWin.cs.meta 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Role/ReikiRootResetWin.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Skill/TreasureSkillModel.cs 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/MainInterfacePanel/MainButtonMisc.cs
@@ -5,6 +5,7 @@
using UnityEngine;
using System.Collections;
using UnityEngine.UI;
using System;
namespace Snxxz.UI
{
@@ -23,6 +24,7 @@
        [SerializeField] Button m_FlyToFairyGrabBoss;
        [SerializeField] Button m_FriendQuestBtn;
        [SerializeField] Button m_FairyRequestBtn;
        [SerializeField] Button m_ReikiResetRemind;
        FestivalRedpackModel festivalRedpackModel { get { return ModelCenter.Instance.GetModel<FestivalRedpackModel>(); } }
        OSRedEnvelopeModel OSEnvelopeModel { get { return ModelCenter.Instance.GetModel<OSRedEnvelopeModel>(); } }
@@ -33,6 +35,7 @@
        FairyGrabBossModel fairyGrabBossModel { get { return ModelCenter.Instance.GetModel<FairyGrabBossModel>(); } }
        FriendsModel friendsModel { get { return ModelCenter.Instance.GetModel<FriendsModel>(); } }
        FairyModel fairyModel { get { return ModelCenter.Instance.GetModel<FairyModel>(); } }
        ReikiRootModel reikiRootModel { get { return ModelCenter.Instance.GetModel<ReikiRootModel>(); } }
        private void Start()
        {
@@ -44,6 +47,7 @@
            m_GotoFairyGrabBoss.SetListener(GotoFairyGrabBoss);
            m_FlyToFairyGrabBoss.SetListener(FlyToFairyGrabBoss);
            m_FairyRequestBtn.SetListener(OnFairyRequestClick);
            m_ReikiResetRemind.SetListener(OnReikiRemind);
        }
        public void Init()
@@ -53,6 +57,7 @@
            CheckSendRedpackBtn();
            ShowFairyGrabBoss();
            IsCrossServerOneVsOne();
            DisplayReikiRemind();
            RedPacketModel.OnRedBagGetEvent += OnRedBagGet;
            OSEnvelopeModel.OSRedEnvelopeUpdateEvent += OnRedBagGet;
@@ -115,6 +120,7 @@
                m_DungeonAssistImg.gameObject.SetActive(false);
                m_FriendQuestBtn.gameObject.SetActive(false);
                m_FairyRequestBtn.gameObject.SetActive(false);
                m_ReikiResetRemind.gameObject.SetActive(false);
            }
            else
            {
@@ -124,6 +130,7 @@
                UpdateDungeonAssistImag();
                FriendQuestBtn();
                UpdateFairyRequest();
                DisplayReikiRemind();
            }
        }//再跨服状态的开关显隐控制
@@ -381,6 +388,12 @@
                m_FriendQuestBtn.gameObject.SetActive(false);
            }
        }
        void DisplayReikiRemind()
        {
            m_ReikiResetRemind.gameObject.SetActive(reikiRootModel.resetReikiRemind);
        }
        private void OnClickFriendQuest()
        {
            WindowCenter.Instance.Open<FriendQuestWin>();
@@ -389,6 +402,12 @@
        {
            WindowCenter.Instance.Open<FairyInviteWin>();
        }
        private void OnReikiRemind()
        {
            WindowCenter.Instance.Open<ReikiRootRemindWin>();
        }
        private void UpdateFairyRequest()
        {
            m_FairyRequestBtn.gameObject.SetActive(fairyModel.FairyRequestRedPoint.count > 0);
System/Role/ReikiRootModel.cs
@@ -62,6 +62,9 @@
            }
        }
        public bool resetReikiRootRecord { get; set; }
        public bool resetReikiRemind { get; set; }
        public readonly Redpoint redpoint = new Redpoint(101, 10103);
        public event Action onCacheFreePointRefresh;
@@ -73,6 +76,7 @@
            PlayerDatas.Instance.playerDataRefreshEvent += PlayerDataRefreshEvent;
            FuncOpen.Instance.OnFuncStateChangeEvent += OnFuncStateChangeEvent;
            StageLoad.Instance.onStageLoadFinish += OnStageLoadFinish;
        }
        public void OnBeforePlayerDataInitialize()
@@ -80,6 +84,7 @@
            m_ReikiRootPoints.Clear();
            m_ReikiRootFreePoints.Clear();
            isServerPrepare = false;
            resetReikiRootRecord = false;
        }
        public void OnPlayerLoginOk()
@@ -92,6 +97,7 @@
        {
            PlayerDatas.Instance.playerDataRefreshEvent -= PlayerDataRefreshEvent;
            FuncOpen.Instance.OnFuncStateChangeEvent -= OnFuncStateChangeEvent;
            StageLoad.Instance.onStageLoadFinish -= OnStageLoadFinish;
        }
        void ParseConfig()
@@ -134,6 +140,14 @@
            }
        }
        private void OnStageLoadFinish()
        {
            if (!(StageLoad.Instance.currentStage is DungeonStage))
            {
                resetReikiRemind = false;
            }
        }
        private void OnFuncStateChangeEvent(int id)
        {
            if (id == (int)FuncOpenEnum.ReikiRoot)
System/Role/ReikiRootRemindWin.cs
New file
@@ -0,0 +1,60 @@
//--------------------------------------------------------
//    [Author]:           第二世界
//    [  Date ]:           Wednesday, May 08, 2019
//--------------------------------------------------------
using System;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
namespace Snxxz.UI
{
    public class ReikiRootRemindWin : Window
    {
        [SerializeField] Button m_Goto;
        [SerializeField] Button m_Close;
        #region Built-in
        protected override void BindController()
        {
        }
        protected override void AddListeners()
        {
            m_Goto.AddListener(Goto);
            m_Close.AddListener(CloseClick);
        }
        protected override void OnPreOpen()
        {
            ModelCenter.Instance.GetModel<ReikiRootModel>().resetReikiRemind = false;
        }
        protected override void OnAfterOpen()
        {
        }
        protected override void OnPreClose()
        {
        }
        protected override void OnAfterClose()
        {
        }
        #endregion
        private void Goto()
        {
            CloseImmediately();
            WindowCenter.Instance.Open<SkillWin>(false, 1);
        }
    }
}
System/Role/ReikiRootRemindWin.cs.meta
New file
@@ -0,0 +1,12 @@
fileFormatVersion: 2
guid: a9d58215535de474da9f3c66b5cdf0bc
timeCreated: 1557303137
licenseType: Pro
MonoImporter:
  serializedVersion: 2
  defaultReferences: []
  executionOrder: 0
  icon: {instanceID: 0}
  userData:
  assetBundleName:
  assetBundleVariant:
System/Role/ReikiRootResetWin.cs
@@ -91,6 +91,7 @@
            {
                var pak = new CB207_tagCMResetAttrPoint();
                GameNetSystem.Instance.SendInfo(pak);
                model.resetReikiRootRecord = true;
                CloseImmediately();
            }
            else
@@ -103,6 +104,7 @@
                }
                var pak = new CB207_tagCMResetAttrPoint();
                GameNetSystem.Instance.SendInfo(pak);
                model.resetReikiRootRecord = true;
                CloseImmediately();
            }
        }
System/Skill/TreasureSkillModel.cs
@@ -41,6 +41,7 @@
        public static int redpointIndex = 100;
        PackModel packModel { get { return ModelCenter.Instance.GetModel<PackModel>(); } }
        ReikiRootModel reikiRootModel { get { return ModelCenter.Instance.GetModel<ReikiRootModel>(); } }
        public event Action selectRefresh;
        public event Action<int> treasureSkillRefresh;
@@ -271,6 +272,8 @@
        public void OnReceivePackage(HA309_tagMCSkillElementInfo package)
        {
            var resetReikiRemind = false;
            for (int i = 0; i < package.Cnt; i++)
            {
                var data = package.InfoList[i];
@@ -278,12 +281,22 @@
                for (int j = 0; j < data.SkillCnt; j++)
                {
                    var lastLevel = m_ExpertActiveLevels.ContainsKey((int)data.ActiveSkill[j].SkillID) ?
                        m_ExpertActiveLevels[(int)data.ActiveSkill[j].SkillID] : 0;
                    m_ExpertActiveLevels[(int)data.ActiveSkill[j].SkillID] = data.ActiveSkill[j].ActiveLV;
                    if (serverInited)
                    {
                        if (expertActiveRefresh != null)
                        {
                            expertActiveRefresh((int)data.ActiveSkill[j].SkillID);
                        }
                        if (!resetReikiRemind)
                        {
                            if (data.ActiveSkill[j].ActiveLV < lastLevel && reikiRootModel.resetReikiRootRecord)
                            {
                                resetReikiRemind = true;
                            }
                        }
                    }
                }
@@ -292,6 +305,14 @@
            {
                expertSkillRefresh();
            }
            if (resetReikiRemind)
            {
                reikiRootModel.resetReikiRemind = true;
            }
            reikiRootModel.resetReikiRootRecord = false;
            UpdateRedpoint();
        }