snxxz_scripts.git

parent: 1875ff6e | 补丁 | 提交 | ignore whitespace

Linyi

2018-08-09 c0d07211e428d670784f891537a8d3a1090be51b

2235 【前端】宗门试练材料兑换引导

6个文件已修改

	System/Dungeon/TrialDungeonModel.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Dungeon/TrialExchangeWin.cs	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/MainInterfacePanel/MainInterfaceWin.cs	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/MainInterfacePanel/TopRightTip.cs	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/NewBieGuidance/NewBieCenter.cs	16 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Utility/EnumHelper.cs	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 System/Dungeon/TrialDungeonModel.cs

@@ -17,6 +17,8 @@
        public event Action SelectEquipClassEvent;



        bool serverInited = false;



        public const int TRIALEXCHANGE_GUIDE = 91;

        public override void Init()

        {

            ParseConfig();


 System/Dungeon/TrialExchangeWin.cs

@@ -89,6 +89,11 @@
        {

            model.SelectEquipClassEvent -= SelectEquipClassEvent;

            packModel.RefreshItemCountAct -= RefreshItemCountAct;



            if (!NewBieCenter.Instance.completeGuidesBuf.Contains(TrialDungeonModel.TRIALEXCHANGE_GUIDE))

            {

                NewBieCenter.Instance.RemoveNewBieGuide(TrialDungeonModel.TRIALEXCHANGE_GUIDE);

            }

        }



        protected override void OnAfterClose()


 System/MainInterfacePanel/MainInterfaceWin.cs

@@ -384,7 +384,9 @@


        private void GuideBeginEvent()

        {

            if (NewBieCenter.Instance.inGuiding && NewBieCenter.Instance.currentGuide == 89)

            if (NewBieCenter.Instance.inGuiding

                && (NewBieCenter.Instance.currentGuide == 89

                || NewBieCenter.Instance.currentGuide == TrialDungeonModel.TRIALEXCHANGE_GUIDE))

            {

                UnFlodFunctionArea(true, 0);

            }


 System/MainInterfacePanel/TopRightTip.cs

@@ -47,6 +47,10 @@
            {

                ModelCenter.Instance.GetModel<DailyQuestModel>().currentDailyQuest = (int)DailyQuestType.FairyLand;

            }

            if (NewBieCenter.Instance.inGuiding && NewBieCenter.Instance.currentGuide == TrialDungeonModel.TRIALEXCHANGE_GUIDE)

            {

                ModelCenter.Instance.GetModel<DailyQuestModel>().currentDailyQuest = (int)DailyQuestType.Trial;

            }

            WindowCenter.Instance.Close<MainInterfaceWin>();

            WindowCenter.Instance.Open<DailyQuestWin>();

        }


 System/NewBieGuidance/NewBieCenter.cs

@@ -205,6 +205,19 @@
            }

        }



        public void RemoveNewBieGuide(int _id)

        {

            if (!completeGuidesBuf.Contains(_id))

            {

                completeGuidesBuf.Add(_id);

            }



            var send = new CA222_tagCMSetGuideOK();

            send.GuideIndex = (byte)_id;

            send.IsOK = 1;

            GameNetSystem.Instance.SendInfo(send);

        }



        public void FinishCurrentGuideWithoutCloseWin()

        {

            var guideRecord = currentGuide;

@@ -339,6 +352,9 @@
                    return state == DailyQuestModel.DailyQuestState.CanBuyTimes;

                case GuideTriggerType.TeamAutoAccept:

                    return !teamModel.myTeam.inTeam;

                case GuideTriggerType.TrialExchange:

                    var trialDailyState = dailyModel.GetQuestState((int)DailyQuestType.Trial);

                    return trialDailyState == DailyQuestModel.DailyQuestState.Completed;

                default:

                    return false;

            }


 Utility/EnumHelper.cs

@@ -1176,7 +1176,8 @@
    Pray = 18,//祈愿

    VIPExperience = 19,//vip体验

    FairyLandBuyTimes = 20,//仙界秘境购买次数

    TeamAutoAccept=21,//自动接受组队邀请

    TeamAutoAccept = 21,//自动接受组队邀请

    TrialExchange = 22,//宗门试炼兑换材料



    QuestCanAccept = 100,//任务可接

    QuestCanDo = 101,//任务可进行

			@@ -17,6 +17,8 @@
			public event Action SelectEquipClassEvent;

			bool serverInited = false;

			public const int TRIALEXCHANGE_GUIDE = 91;
			public override void Init()
			{
			ParseConfig();

			@@ -89,6 +89,11 @@
			{
			model.SelectEquipClassEvent -= SelectEquipClassEvent;
			packModel.RefreshItemCountAct -= RefreshItemCountAct;

			if (!NewBieCenter.Instance.completeGuidesBuf.Contains(TrialDungeonModel.TRIALEXCHANGE_GUIDE))
			{
			NewBieCenter.Instance.RemoveNewBieGuide(TrialDungeonModel.TRIALEXCHANGE_GUIDE);
			}
			}

			protected override void OnAfterClose()

			@@ -384,7 +384,9 @@

			private void GuideBeginEvent()
			{
			if (NewBieCenter.Instance.inGuiding && NewBieCenter.Instance.currentGuide == 89)
			if (NewBieCenter.Instance.inGuiding
			&& (NewBieCenter.Instance.currentGuide == 89
			\|\| NewBieCenter.Instance.currentGuide == TrialDungeonModel.TRIALEXCHANGE_GUIDE))
			{
			UnFlodFunctionArea(true, 0);
			}

			@@ -47,6 +47,10 @@
			{
			ModelCenter.Instance.GetModel<DailyQuestModel>().currentDailyQuest = (int)DailyQuestType.FairyLand;
			}
			if (NewBieCenter.Instance.inGuiding && NewBieCenter.Instance.currentGuide == TrialDungeonModel.TRIALEXCHANGE_GUIDE)
			{
			ModelCenter.Instance.GetModel<DailyQuestModel>().currentDailyQuest = (int)DailyQuestType.Trial;
			}
			WindowCenter.Instance.Close<MainInterfaceWin>();
			WindowCenter.Instance.Open<DailyQuestWin>();
			}

			@@ -205,6 +205,19 @@
			}
			}

			public void RemoveNewBieGuide(int _id)
			{
			if (!completeGuidesBuf.Contains(_id))
			{
			completeGuidesBuf.Add(_id);
			}

			var send = new CA222_tagCMSetGuideOK();
			send.GuideIndex = (byte)_id;
			send.IsOK = 1;
			GameNetSystem.Instance.SendInfo(send);
			}

			public void FinishCurrentGuideWithoutCloseWin()
			{
			var guideRecord = currentGuide;
			@@ -339,6 +352,9 @@
			return state == DailyQuestModel.DailyQuestState.CanBuyTimes;
			case GuideTriggerType.TeamAutoAccept:
			return !teamModel.myTeam.inTeam;
			case GuideTriggerType.TrialExchange:
			var trialDailyState = dailyModel.GetQuestState((int)DailyQuestType.Trial);
			return trialDailyState == DailyQuestModel.DailyQuestState.Completed;
			default:
			return false;
			}

			@@ -1176,7 +1176,8 @@
			Pray = 18,//祈愿
			VIPExperience = 19,//vip体验
			FairyLandBuyTimes = 20,//仙界秘境购买次数
			TeamAutoAccept=21,//自动接受组队邀请
			TeamAutoAccept = 21,//自动接受组队邀请
			TrialExchange = 22,//宗门试炼兑换材料

			QuestCanAccept = 100,//任务可接
			QuestCanDo = 101,//任务可进行