From c080c44a275c54783f6e0d3ee6cb86e1e16f562e Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期五, 02 十一月 2018 10:17:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into DownLoad
---
System/Team/GroupDungeonChallengeProcessor.cs | 44 +++++++++++++++++++++++++++++++++++---------
1 files changed, 35 insertions(+), 9 deletions(-)
diff --git a/System/Team/GroupDungeonChallengeProcessor.cs b/System/Team/GroupDungeonChallengeProcessor.cs
index ae64017..023d5f2 100644
--- a/System/Team/GroupDungeonChallengeProcessor.cs
+++ b/System/Team/GroupDungeonChallengeProcessor.cs
@@ -38,16 +38,36 @@
var realmModel = ModelCenter.Instance.GetModel<RealmModel>();
realmModel.GotoDungeon();
break;
- default:
- int error = 0;
- var dungeon = new Dungeon(_mapId, _lineId);
- if (dungeonModel.TestChallange(dungeon, out error))
+ case 31080:
{
- dungeonModel.GroupChallenge(dungeon);
+ int error = 0;
+ var dungeon = new Dungeon(_mapId, _lineId);
+ if (dungeonModel.TestChallange(dungeon, out error))
+ {
+ dungeonModel.GroupChallenge(dungeon);
+ }
+ else
+ {
+ ProcessEnterDungeonError(error);
+ if (error == 5)
+ {
+ TeamFailEnterDungeonHandle.Instance.HandleFairyLand(1, 6);
+ }
+ }
}
- else
+ break;
+ default:
{
- ProcessEnterDungeonError(error);
+ int error = 0;
+ var dungeon = new Dungeon(_mapId, _lineId);
+ if (dungeonModel.TestChallange(dungeon, out error))
+ {
+ dungeonModel.GroupChallenge(dungeon);
+ }
+ else
+ {
+ ProcessEnterDungeonError(error);
+ }
}
break;
}
@@ -102,8 +122,14 @@
{
if (_isAutoMatch)
{
- var dungeon = new Dungeon(GeneralDefine.ruinsTranscriptMapId, main.LayerNumberNow);
- dungeonModel.GroupChallenge(dungeon);
+ bool iamCaptainer = ModelCenter.Instance.GetModel<TeamModel>().myTeam.iamCaptainer;
+ if (iamCaptainer)
+ {
+ dungeonModel.RequestChallangeDungeon(GeneralDefine.ruinsTranscriptMapId, main.LayerNumberNow);
+ }
+
+ //var dungeon = new Dungeon(GeneralDefine.ruinsTranscriptMapId, main.LayerNumberNow);
+ //dungeonModel.GroupChallenge(dungeon);
}
else
{
--
Gitblit v1.8.0