少年修仙传客户端代码仓库
client_Wu Xijin
2019-07-12 bb87ce659d9885459aafbe4cf6781b6f09f17865
4471 【主干】【BUG】日常界面新功能显示异常
4个文件已修改
84 ■■■■■ 已修改文件
System/DailyQuest/DailyQuestBehaviour.cs 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/DailyQuest/DailyQuestModel.cs 69 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/DailyQuest/DailyQuestWin.cs 1 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UI/Common/FuncOpen.cs 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/DailyQuest/DailyQuestBehaviour.cs
@@ -58,7 +58,7 @@
            this.gameObject.name = StringUtility.Contact("DailyQuestBehaviour_", data.id);
            DisplayProgressAndActiveValue();
            if(model.IsNewDailyQuest(data.id))
            if (model.IsNewDailyQuest(data.id))
            {
                m_UIEffect.maskArea = this.transform.parent.parent.parent.GetComponent<RectTransform>();
                m_UIEffect.Play();
@@ -150,6 +150,8 @@
                    model.GotoDailyQuest(data.id);
                }
            }
            model.AddHasShowNewDailyQuest(data.id);
        }
        private void GotoFunc()
System/DailyQuest/DailyQuestModel.cs
@@ -11,7 +11,7 @@
namespace Snxxz.UI
{
    [XLua.LuaCallCSharp]
    public class DailyQuestModel : Model, IPlayerLoginOk, IBeforePlayerDataInitialize, IMapInitOk ,ISwitchAccount
    public class DailyQuestModel : Model, IPlayerLoginOk, IBeforePlayerDataInitialize, IMapInitOk, IAfterPlayerDataInitialize
    {
        const int DAILYQUEST_REDPOINTID = 78000;
        const int EVERYDAY_REDPOINTID = 78001;
@@ -100,7 +100,6 @@
            }
        }
        private List<int> m_newDailyQuestOpenList = new List<int>();
        private List<int> m_HasShowDailyQuestList = new List<int>();
        Dictionary<int, DailyQuestData> dailyQuests = new Dictionary<int, DailyQuestData>();
@@ -152,7 +151,6 @@
            allianceBossModel.allianceBossStateRefresh += AllianceBossStateRefresh;
            RedpointCenter.Instance.redpointValueChangeEvent += RedpointValueChangeEvent;
            TaskModel.Event_FairyAuTask += OnFairyTaskRefresh;
            FuncOpen.Instance.NewFuncOpenEvent += OnNewFuncOpen;
        }
        public override void UnInit()
@@ -167,19 +165,6 @@
            allianceBossModel.allianceBossStateRefresh -= AllianceBossStateRefresh;
            RedpointCenter.Instance.redpointValueChangeEvent -= RedpointValueChangeEvent;
            TaskModel.Event_FairyAuTask -= OnFairyTaskRefresh;
            FuncOpen.Instance.NewFuncOpenEvent -= OnNewFuncOpen;
            m_newDailyQuestOpenList.Clear();
            m_HasShowDailyQuestList.Clear();
        }
        public void OnPlayerLoginOk()
        {
            DailyQuestActionTimer.Instance.Begin();
        }
        public void OnSwitchAccount()
        {
            m_newDailyQuestOpenList.Clear();
            m_HasShowDailyQuestList.Clear();
        }
@@ -189,39 +174,33 @@
            usableActivePoint = 0;
        }
        public void OnAfterPlayerDataInitialize()
        {
            m_HasShowDailyQuestList.Clear();
            var playerId = PlayerDatas.Instance.baseData.PlayerID;
            var localSavedArray = LocalSave.GetIntArray(StringUtility.Contact("DailyQuestNewFunctionShowList_", playerId));
            if (!localSavedArray.IsNullOrEmpty())
            {
                m_HasShowDailyQuestList.AddRange(localSavedArray);
            }
        }
        public void OnPlayerLoginOk()
        {
            DailyQuestActionTimer.Instance.Begin();
        }
        public void OnMapInitOk()
        {
            UpdateRedpoints();
        }
        public void OnNewFuncOpen(int id)
        {
            var quests = DailyQuestConfig.GetValues();
            bool bHasAdd = false;
            foreach (var quest in quests)
            {
                if (quest.UnLockFuncID == id && !m_newDailyQuestOpenList.Contains(quest.ID))
                {
                    m_newDailyQuestOpenList.Add(quest.ID);
                    bHasAdd = true;
                }
            }
            if (newDailyQuestOpenEvent != null && bHasAdd)
            {
                newDailyQuestOpenEvent();
            }
        }
        public bool IsNewDailyQuest(int id)
        {
            if (category == DailyQuestCategory.EveryDay)
            {
                if (m_newDailyQuestOpenList.Contains(id) && IsDailyQuestUnLock(id))
                if (IsDailyQuestUnLock(id) && !m_HasShowDailyQuestList.Contains(id))
                {
                    if (!m_HasShowDailyQuestList.Contains(id))
                    {
                        m_HasShowDailyQuestList.Add(id);
                    }
                    return true;
                }
            }
@@ -229,14 +208,14 @@
            return false;
        }
        public void RemoveHasShowDailyQuest()
        public void AddHasShowNewDailyQuest(int id)
        {
            for (int i = 0; i < m_HasShowDailyQuestList.Count; i++)
            if (IsDailyQuestUnLock(id) && !m_HasShowDailyQuestList.Contains(id))
            {
                var id = m_HasShowDailyQuestList[i];
                m_newDailyQuestOpenList.Remove(id);
                m_HasShowDailyQuestList.Add(id);
                var playerId = PlayerDatas.Instance.baseData.PlayerID;
                LocalSave.SetIntArray(StringUtility.Contact("DailyQuestNewFunctionShowList_", playerId), m_HasShowDailyQuestList.ToArray());
            }
            m_HasShowDailyQuestList.Clear();
        }
        private void RedpointValueChangeEvent(int id)
@@ -803,7 +782,7 @@
                    case DailyQuestType.FairyTask:
                        if (PlayerDatas.Instance.baseData.LV <= GeneralDefine.dailyQuestRedpointLevelLimit)
                        {
                            if (FuncOpen.Instance.IsFuncOpen(16)
                            if (FuncOpen.Instance.IsFuncOpen(16)
                                && TaskAllocation.Instance.FairyAuAllNumber() < taskModel.FairyAuTaskCount_Day)
                            {
                                dailyQuest.redpoint.state = RedPointState.Simple;
System/DailyQuest/DailyQuestWin.cs
@@ -42,7 +42,6 @@
        protected override void OnAfterClose()
        {
            base.OnAfterClose();
            model.RemoveHasShowDailyQuest();
        }
        protected override void OnActived()
UI/Common/FuncOpen.cs
@@ -18,8 +18,6 @@
                return _inst;
            }
        }
        private bool m_bIsFirstRecive = true;
        public event Action<int> NewFuncOpenEvent;
        protected FuncOpen()
        {
@@ -95,14 +93,6 @@
                {
                    OnFuncStateChangeEvent(funcState.FuncID);
                }
                if(!m_bIsFirstRecive && !bPerFuncIsOpen && bAfterFuncIsOpen)
                {
                    NewFuncOpenEvent(funcState.FuncID);
                }
            }
            if(m_bIsFirstRecive)
            {
                m_bIsFirstRecive = false;
            }
        }