From f077c9cba2d4eae2b7ac7c7102711f4477534eb8 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期二, 25 九月 2018 11:41:39 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Dungeon/DungeonModel.cs | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/System/Dungeon/DungeonModel.cs b/System/Dungeon/DungeonModel.cs
index 7d4a868..d4c2aa7 100644
--- a/System/Dungeon/DungeonModel.cs
+++ b/System/Dungeon/DungeonModel.cs
@@ -453,7 +453,7 @@
}
else
{
- CancelGroupEnter(_dungeon.mapId);
+ CancelGroupEnter(_dungeon);
}
});
}
@@ -479,9 +479,9 @@
}
}
- private void CancelGroupEnter(int _mapId)
+ private void CancelGroupEnter(Dungeon _dungeon)
{
- switch (_mapId)
+ switch (_dungeon.mapId)
{
case RealmModel.REALM_DUNGEON_ID:
if (!WindowCenter.Instance.CheckOpen<TeamFrameWin>())
@@ -491,6 +491,14 @@
WindowCenter.Instance.Open<TeamFrameWin>(false, teamModel.myTeam.inTeam ? 1 : 0);
}
break;
+ default:
+ if (!WindowCenter.Instance.CheckOpen<TeamFrameWin>())
+ {
+ var teamModel = ModelCenter.Instance.GetModel<TeamModel>();
+ teamModel.missionBuf = teamModel.currentMission = new TeamMission(_dungeon.mapId, _dungeon.lineId);
+ WindowCenter.Instance.Open<TeamFrameWin>(false, teamModel.myTeam.inTeam ? 1 : 0);
+ }
+ break;
}
}
--
Gitblit v1.8.0