From 5cba98371d5a14cb82390a9052b9efec013d277d Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期二, 26 三月 2019 11:52:36 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/TaskModel.cs | 33 ++++++++++++++++-----------------
1 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/System/MainInterfacePanel/TaskModel.cs b/System/MainInterfacePanel/TaskModel.cs
index 72ba6d1..55505f2 100644
--- a/System/MainInterfacePanel/TaskModel.cs
+++ b/System/MainInterfacePanel/TaskModel.cs
@@ -353,25 +353,24 @@
{
return;
}
- var config = StoryMissionsConfig.Get(taskID);
+
+ var state = GetQuestState(taskID);
+ var config = StoryMissionsConfig.GetConfig(taskID, state);
bool IsOpenMain = WindowCenter.Instance.IsOpen<MainInterfaceWin>();
- var treasureStageUpShow = ModelCenter.Instance.GetModel<TreasureModel>().treasureStageUpShow;
if (config != null)
- {
- for (int i = 0; i < config.NpcID.Length; i++)
- {
- if (NPCid == config.NpcID[i])
- {
- if (!WindowCenter.Instance.IsOpen<DialogueDuidanceWin>() && IsOpenMain
- && !treasureStageUpShow && !WindowCenter.Instance.ExistAnyFullScreenOrMaskWin())
- {
- WindowCenter.Instance.Close<MainInterfaceWin>();
- WindowCenter.Instance.Open<DialogueDuidanceWin>();
- }
- return;
- }
+ {
+ if (NPCid == config.NpcID)
+ {
+ if (!WindowCenter.Instance.IsOpen<DialogueDuidanceWin>() && IsOpenMain
+ && !WindowCenter.Instance.ExistAnyFullScreenOrMaskWin())
+ {
+ WindowCenter.Instance.Close<MainInterfaceWin>();
+ DialogueDuidanceWin.storyMissionId = config.id;
+ WindowCenter.Instance.Open<DialogueDuidanceWin>();
+ }
+ return;
}
- if (!WindowCenter.Instance.IsOpen<TaskBoxBGMWin>() && IsOpenMain && !treasureStageUpShow)
+ if (!WindowCenter.Instance.IsOpen<TaskBoxBGMWin>() && IsOpenMain)
{
WindowCenter.Instance.Close<MainInterfaceWin>();
WindowCenter.Instance.Open<TaskBoxBGMWin>();
@@ -390,7 +389,7 @@
}
else
{
- if (!WindowCenter.Instance.IsOpen<TaskBoxBGMWin>() && IsOpenMain && !treasureStageUpShow)
+ if (!WindowCenter.Instance.IsOpen<TaskBoxBGMWin>() && IsOpenMain)
{
WindowCenter.Instance.Close<MainInterfaceWin>();
WindowCenter.Instance.Open<TaskBoxBGMWin>();
--
Gitblit v1.8.0