snxxz_scripts.git

parent: dc0b7919 | 补丁 | 提交 | ignore whitespace

client_linchunjie

2018-09-01 2fdbf7d3f0ee03663fced90fb5d3f08f9d85e07e

3067 【前端】守卫人皇、仙盟心法添加仙盟等级限制

7个文件已修改

	System/Activity/ActivityNotifyBehaviour.cs	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/DailyQuest/DailyQuestModel.cs	13 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/DailyQuest/DailyQuestWin.cs	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/FairyAu/BasicFunction.cs	11 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/FairyAu/FairyModel.cs	47 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/FairyAu/PlayerMethodData.cs	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/WindowJump/WindowJumpMgr.cs	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 System/Activity/ActivityNotifyBehaviour.cs

@@ -84,7 +84,19 @@
                        WindowCenter.Instance.Open<NormalDungeonEntranceWin>();

                        break;

                    case DailyQuestType.GuardSky:

                        if (ModelCenter.Instance.GetModel<FairyModel>().completeGuardSky)

                        var fairyData = PlayerDatas.Instance.fairyData;

                        if (!fairyData.HasFairy)

                        {

                            break;

                        }

                        var fairyModel = ModelCenter.Instance.GetModel<FairyModel>();

                        if (fairyData.fairy == null

                            || fairyData.fairy.FamilyLV < fairyModel.guardSkyOpenFairyLv)

                        {

                            SysNotifyMgr.Instance.ShowTip("GuardSkyOpenLvError", fairyModel.guardSkyOpenFairyLv);

                            break;

                        }

                        if (fairyModel.completeGuardSky)

                        {

                            SysNotifyMgr.Instance.ShowTip("TheEmperor1");

                            break;


 System/DailyQuest/DailyQuestModel.cs

@@ -122,6 +122,8 @@
            FuncOpen.Instance.OnFuncStateChangeEvent += OnFunctionStateChange;

            PlayerDatas.Instance.PlayerDataRefreshEvent += OnPlayerDataRefresh;

            fairyModel.guardSkyCompleteEvent += GuardSkyCompleteEvent;

            PlayerDatas.Instance.fairyData.OnRefreshFairyInfo += OnRefreshFairyInfo;

            PlayerDatas.Instance.fairyData.OnRefreshFairyMine += OnRefreshFairyInfo;

        }



        public override void UnInit()

@@ -131,6 +133,8 @@
            FuncOpen.Instance.OnFuncStateChangeEvent -= OnFunctionStateChange;

            PlayerDatas.Instance.PlayerDataRefreshEvent -= OnPlayerDataRefresh;

            fairyModel.guardSkyCompleteEvent -= GuardSkyCompleteEvent;

            PlayerDatas.Instance.fairyData.OnRefreshFairyInfo -= OnRefreshFairyInfo;

            PlayerDatas.Instance.fairyData.OnRefreshFairyMine -= OnRefreshFairyInfo;

        }



        public void OnPlayerLoginOk()

@@ -219,6 +223,10 @@
                        (_dailyConfig.UnLockFuncID == 0 || FuncOpen.Instance.IsFuncOpen(_dailyConfig.UnLockFuncID));

                case DailyQuestType.RuneTowerSweep:

                    return ModelCenter.Instance.GetModel<RuneTowerModel>().yesterdayPassFloor > 0;

                case DailyQuestType.GuardSky:

                    var _dailyGuardSkyConfig = Config.Instance.Get<DailyQuestConfig>(_dailyQuestId);

                    bool _isOpen = _dailyGuardSkyConfig.UnLockFuncID == 0 || FuncOpen.Instance.IsFuncOpen(_dailyGuardSkyConfig.UnLockFuncID);

                    return fairyModel.SatisfyGuardSkyFairyLv() && _isOpen;

                default:

                    var dailyConfig = Config.Instance.Get<DailyQuestConfig>(_dailyQuestId);

                    return dailyConfig.UnLockFuncID == 0 || FuncOpen.Instance.IsFuncOpen(dailyConfig.UnLockFuncID);

@@ -490,6 +498,11 @@
            UpdateDailyActionRedpoint((int)DailyQuestType.GuardSky);

        }



        private void OnRefreshFairyInfo()

        {

            UpdateDailyActionRedpoint((int)DailyQuestType.GuardSky);

        }



        private void OnPlayerDataRefresh(PlayerDataRefresh _refreshType, int _value)

        {

            switch (_refreshType)


 System/DailyQuest/DailyQuestWin.cs

@@ -195,7 +195,13 @@
                    GotoNormalDungeon(_id);

                    break;

                case DailyQuestType.GuardSky:

                    if (ModelCenter.Instance.GetModel<FairyModel>().completeGuardSky)

                    var _fairyModel = ModelCenter.Instance.GetModel<FairyModel>();

                    if (!_fairyModel.SatisfyGuardSkyFairyLv())

                    {

                        SysNotifyMgr.Instance.ShowTip("GuardSkyOpenLvError", _fairyModel.guardSkyOpenFairyLv);

                        break;

                    }

                    if (_fairyModel.completeGuardSky)

                    {

                        SysNotifyMgr.Instance.ShowTip("TheEmperor1");

                        break;


 System/FairyAu/BasicFunction.cs

@@ -67,6 +67,7 @@
            m_FairyRankTxt.text = fairy.WarRank == 0 ? Language.Get("UnDetermind") : GetGrade((int)fairy.WarRank);

        }

        CheckFairyStoreOpen();

        CheckFairyMethodToOpen();

    }



    void CheckFairyStoreOpen()

@@ -74,8 +75,18 @@
        _fairyStoreBtn.image.color = _fairyStoreBtn.image.color.SetA(model.fairyStoreOpen ? 1 : 0.5f);

    }



    void CheckFairyMethodToOpen()

    {

        SkillBtn.image.color = SkillBtn.image.color.SetA(model.fairyMethodToOpen ? 1 : 0.5f);

    }



    void SkillBtna()

    {

        if (!model.fairyMethodToOpen)

        {

            model.ProcessMethodToErrorTip();

            return;

        }

        WindowCenter.Instance.Open<MethodToWin>();

    }




 System/FairyAu/FairyModel.cs

@@ -184,6 +184,10 @@
            fairyStoreLimit = int.Parse(config.Numerical2);

            config = Config.Instance.Get<FuncConfigConfig>("FamilyPartyDeskNpcID");

            fairyFeastDeskNpc = int.Parse(config.Numerical1);

            config = Config.Instance.Get<FuncConfigConfig>("SWRHFamilyLV");

            guardSkyOpenFairyLv = int.Parse(config.Numerical1);

            config = Config.Instance.Get<FuncConfigConfig>("TechFamilyLV");

            fairyMethodToLimit = int.Parse(config.Numerical1);

        }

        #endregion



@@ -498,6 +502,18 @@
            get;private set;

        }



        public int guardSkyOpenFairyLv { get; private set; }



        public bool SatisfyGuardSkyFairyLv()

        {

            var fairyData = PlayerDatas.Instance.fairyData;

            if (!fairyData.HasFairy || fairyData.fairy == null)

            {

                return false;

            }

            return fairyData.fairy.FamilyLV >= guardSkyOpenFairyLv;

        }



        public event Action guardSkyCompleteEvent;

        public void UpdateGuardSky(bool _hasJoin)

        {

@@ -652,6 +668,37 @@
        }

        #endregion



        #region 仙盟心法开启

        public int fairyMethodToLimit { get; private set; }

        public bool fairyMethodToOpen

        {

            get

            {

                if (PlayerDatas.Instance.fairyData.HasFairy)

                {

                    var fairy = PlayerDatas.Instance.fairyData.fairy;

                    if (fairy != null && fairy.FamilyLV >= fairyMethodToLimit)

                    {

                        return true;

                    }

                }

                return false;

            }

        }



        public void ProcessMethodToErrorTip()

        {

            if (!PlayerDatas.Instance.fairyData.HasFairy)

            {

                SysNotifyMgr.Instance.ShowTip("DailyQuestwinUnionLimit");

            }

            else if (PlayerDatas.Instance.fairyData.fairy.FamilyLV < fairyMethodToLimit)

            {

                SysNotifyMgr.Instance.ShowTip("FairyMethodToLimit", fairyMethodToLimit);

            }

        }

        #endregion



        public bool InFairyLeagueDungeon

        {

            get


 System/FairyAu/PlayerMethodData.cs

@@ -26,6 +26,8 @@


    public int _ContributionNumber = 0;//仙盟贡献度

    public Dictionary<int, int> MethodDataNeedLVDic = new Dictionary<int, int>();//心法下表对应的所需学习等级



    FairyModel fairyModel { get { return ModelCenter.Instance.GetModel<FairyModel>(); } }

    public override void Init()

    {

        string str = Config.Instance.Get<FuncConfigConfig>("FamilyTechNeedLV").Numerical1;

@@ -59,6 +61,7 @@
    {

        FairyAuHallRedPoint();

        FairyAuMethodDic();

        FairyAuMethodRedPoint();

    }



    private void OnRefreshFairyMine()//退出仙盟

@@ -97,7 +100,7 @@
    }

    private void  FairyAuMethodRedPoint()//仙盟心法红点

    {

        if (!PlayerDatas.Instance.fairyData.HasFairy || MethodRedPointBtnDic.Count==0)

        if (!fairyModel.fairyMethodToOpen || MethodRedPointBtnDic.Count == 0)

        {

            return;

        }


 System/WindowJump/WindowJumpMgr.cs

@@ -102,7 +102,6 @@
            case JumpUIType.UnionFunc2:

            case JumpUIType.UnionWarehouse:

            case JumpUIType.UnionHall:

            case JumpUIType.UnionMethod:

            case JumpUIType.UnionTask:

            case JumpUIType.UnionTask2:

            case JumpUIType.UnionActive1:

@@ -113,6 +112,13 @@
                    return;

                }

                break;

            case JumpUIType.UnionMethod:

                if (!fairyModel.fairyMethodToOpen)

                {

                    fairyModel.ProcessMethodToErrorTip();

                    return;

                }

                break;

            case JumpUIType.UnionStore:

                if(!fairyModel.fairyStoreOpen)

                {

			@@ -84,7 +84,19 @@
			WindowCenter.Instance.Open<NormalDungeonEntranceWin>();
			break;
			case DailyQuestType.GuardSky:
			if (ModelCenter.Instance.GetModel<FairyModel>().completeGuardSky)
			var fairyData = PlayerDatas.Instance.fairyData;
			if (!fairyData.HasFairy)
			{
			break;
			}
			var fairyModel = ModelCenter.Instance.GetModel<FairyModel>();
			if (fairyData.fairy == null
			\|\| fairyData.fairy.FamilyLV < fairyModel.guardSkyOpenFairyLv)
			{
			SysNotifyMgr.Instance.ShowTip("GuardSkyOpenLvError", fairyModel.guardSkyOpenFairyLv);
			break;
			}
			if (fairyModel.completeGuardSky)
			{
			SysNotifyMgr.Instance.ShowTip("TheEmperor1");
			break;

			@@ -122,6 +122,8 @@
			FuncOpen.Instance.OnFuncStateChangeEvent += OnFunctionStateChange;
			PlayerDatas.Instance.PlayerDataRefreshEvent += OnPlayerDataRefresh;
			fairyModel.guardSkyCompleteEvent += GuardSkyCompleteEvent;
			PlayerDatas.Instance.fairyData.OnRefreshFairyInfo += OnRefreshFairyInfo;
			PlayerDatas.Instance.fairyData.OnRefreshFairyMine += OnRefreshFairyInfo;
			}

			public override void UnInit()
			@@ -131,6 +133,8 @@
			FuncOpen.Instance.OnFuncStateChangeEvent -= OnFunctionStateChange;
			PlayerDatas.Instance.PlayerDataRefreshEvent -= OnPlayerDataRefresh;
			fairyModel.guardSkyCompleteEvent -= GuardSkyCompleteEvent;
			PlayerDatas.Instance.fairyData.OnRefreshFairyInfo -= OnRefreshFairyInfo;
			PlayerDatas.Instance.fairyData.OnRefreshFairyMine -= OnRefreshFairyInfo;
			}

			public void OnPlayerLoginOk()
			@@ -219,6 +223,10 @@
			(_dailyConfig.UnLockFuncID == 0 \|\| FuncOpen.Instance.IsFuncOpen(_dailyConfig.UnLockFuncID));
			case DailyQuestType.RuneTowerSweep:
			return ModelCenter.Instance.GetModel<RuneTowerModel>().yesterdayPassFloor > 0;
			case DailyQuestType.GuardSky:
			var _dailyGuardSkyConfig = Config.Instance.Get<DailyQuestConfig>(_dailyQuestId);
			bool _isOpen = _dailyGuardSkyConfig.UnLockFuncID == 0 \|\| FuncOpen.Instance.IsFuncOpen(_dailyGuardSkyConfig.UnLockFuncID);
			return fairyModel.SatisfyGuardSkyFairyLv() && _isOpen;
			default:
			var dailyConfig = Config.Instance.Get<DailyQuestConfig>(_dailyQuestId);
			return dailyConfig.UnLockFuncID == 0 \|\| FuncOpen.Instance.IsFuncOpen(dailyConfig.UnLockFuncID);
			@@ -490,6 +498,11 @@
			UpdateDailyActionRedpoint((int)DailyQuestType.GuardSky);
			}

			private void OnRefreshFairyInfo()
			{
			UpdateDailyActionRedpoint((int)DailyQuestType.GuardSky);
			}

			private void OnPlayerDataRefresh(PlayerDataRefresh _refreshType, int _value)
			{
			switch (_refreshType)

			@@ -195,7 +195,13 @@
			GotoNormalDungeon(_id);
			break;
			case DailyQuestType.GuardSky:
			if (ModelCenter.Instance.GetModel<FairyModel>().completeGuardSky)
			var _fairyModel = ModelCenter.Instance.GetModel<FairyModel>();
			if (!_fairyModel.SatisfyGuardSkyFairyLv())
			{
			SysNotifyMgr.Instance.ShowTip("GuardSkyOpenLvError", _fairyModel.guardSkyOpenFairyLv);
			break;
			}
			if (_fairyModel.completeGuardSky)
			{
			SysNotifyMgr.Instance.ShowTip("TheEmperor1");
			break;

			@@ -67,6 +67,7 @@
			m_FairyRankTxt.text = fairy.WarRank == 0 ? Language.Get("UnDetermind") : GetGrade((int)fairy.WarRank);
			}
			CheckFairyStoreOpen();
			CheckFairyMethodToOpen();
			}

			void CheckFairyStoreOpen()
			@@ -74,8 +75,18 @@
			_fairyStoreBtn.image.color = _fairyStoreBtn.image.color.SetA(model.fairyStoreOpen ? 1 : 0.5f);
			}

			void CheckFairyMethodToOpen()
			{
			SkillBtn.image.color = SkillBtn.image.color.SetA(model.fairyMethodToOpen ? 1 : 0.5f);
			}

			void SkillBtna()
			{
			if (!model.fairyMethodToOpen)
			{
			model.ProcessMethodToErrorTip();
			return;
			}
			WindowCenter.Instance.Open<MethodToWin>();
			}

			@@ -184,6 +184,10 @@
			fairyStoreLimit = int.Parse(config.Numerical2);
			config = Config.Instance.Get<FuncConfigConfig>("FamilyPartyDeskNpcID");
			fairyFeastDeskNpc = int.Parse(config.Numerical1);
			config = Config.Instance.Get<FuncConfigConfig>("SWRHFamilyLV");
			guardSkyOpenFairyLv = int.Parse(config.Numerical1);
			config = Config.Instance.Get<FuncConfigConfig>("TechFamilyLV");
			fairyMethodToLimit = int.Parse(config.Numerical1);
			}
			#endregion

			@@ -498,6 +502,18 @@
			get;private set;
			}

			public int guardSkyOpenFairyLv { get; private set; }

			public bool SatisfyGuardSkyFairyLv()
			{
			var fairyData = PlayerDatas.Instance.fairyData;
			if (!fairyData.HasFairy \|\| fairyData.fairy == null)
			{
			return false;
			}
			return fairyData.fairy.FamilyLV >= guardSkyOpenFairyLv;
			}

			public event Action guardSkyCompleteEvent;
			public void UpdateGuardSky(bool _hasJoin)
			{
			@@ -652,6 +668,37 @@
			}
			#endregion

			#region 仙盟心法开启
			public int fairyMethodToLimit { get; private set; }
			public bool fairyMethodToOpen
			{
			get
			{
			if (PlayerDatas.Instance.fairyData.HasFairy)
			{
			var fairy = PlayerDatas.Instance.fairyData.fairy;
			if (fairy != null && fairy.FamilyLV >= fairyMethodToLimit)
			{
			return true;
			}
			}
			return false;
			}
			}

			public void ProcessMethodToErrorTip()
			{
			if (!PlayerDatas.Instance.fairyData.HasFairy)
			{
			SysNotifyMgr.Instance.ShowTip("DailyQuestwinUnionLimit");
			}
			else if (PlayerDatas.Instance.fairyData.fairy.FamilyLV < fairyMethodToLimit)
			{
			SysNotifyMgr.Instance.ShowTip("FairyMethodToLimit", fairyMethodToLimit);
			}
			}
			#endregion

			public bool InFairyLeagueDungeon
			{
			get

			@@ -26,6 +26,8 @@

			public int _ContributionNumber = 0;//仙盟贡献度
			public Dictionary<int, int> MethodDataNeedLVDic = new Dictionary<int, int>();//心法下表对应的所需学习等级

			FairyModel fairyModel { get { return ModelCenter.Instance.GetModel<FairyModel>(); } }
			public override void Init()
			{
			string str = Config.Instance.Get<FuncConfigConfig>("FamilyTechNeedLV").Numerical1;
			@@ -59,6 +61,7 @@
			{
			FairyAuHallRedPoint();
			FairyAuMethodDic();
			FairyAuMethodRedPoint();
			}

			private void OnRefreshFairyMine()//退出仙盟
			@@ -97,7 +100,7 @@
			}
			private void FairyAuMethodRedPoint()//仙盟心法红点
			{
			if (!PlayerDatas.Instance.fairyData.HasFairy \|\| MethodRedPointBtnDic.Count==0)
			if (!fairyModel.fairyMethodToOpen \|\| MethodRedPointBtnDic.Count == 0)
			{
			return;
			}

			@@ -102,7 +102,6 @@
			case JumpUIType.UnionFunc2:
			case JumpUIType.UnionWarehouse:
			case JumpUIType.UnionHall:
			case JumpUIType.UnionMethod:
			case JumpUIType.UnionTask:
			case JumpUIType.UnionTask2:
			case JumpUIType.UnionActive1:
			@@ -113,6 +112,13 @@
			return;
			}
			break;
			case JumpUIType.UnionMethod:
			if (!fairyModel.fairyMethodToOpen)
			{
			fairyModel.ProcessMethodToErrorTip();
			return;
			}
			break;
			case JumpUIType.UnionStore:
			if(!fairyModel.fairyStoreOpen)
			{