From 0ccc2ba67acb40eaff3cad4822d077f04223f71e Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期二, 14 八月 2018 19:47:31 +0800
Subject: [PATCH] 1565 组队准备界面取消，队长无法恢复原先的状态
---
System/Team/TeamPrepareWin.cs | 19 ++++++++-----------
System/Team/MyTeamWin.cs | 4 ++++
System/Team/TeamModel.cs | 14 ++++++++++++++
3 files changed, 26 insertions(+), 11 deletions(-)
diff --git a/System/Team/MyTeamWin.cs b/System/Team/MyTeamWin.cs
index 3b61b82..3d9533f 100644
--- a/System/Team/MyTeamWin.cs
+++ b/System/Team/MyTeamWin.cs
@@ -158,6 +158,10 @@
{
if (model.myTeam.iamCaptainer)
{
+ if (model.myTeam.iamCaptainer)
+ {
+ model.RecordHeroAI();
+ }
GroupDungeonChallengeProcessor.Instance.GroupChallengeDungeon(model.myTeam.mission.mapId, model.myTeam.mission.mapEx, false);
}
else
diff --git a/System/Team/TeamModel.cs b/System/Team/TeamModel.cs
index 6a2327a..5dffb24 100644
--- a/System/Team/TeamModel.cs
+++ b/System/Team/TeamModel.cs
@@ -1108,6 +1108,20 @@
}
}
+ public bool autoHandupRecord = false;
+ public int moveToNPCRecord = 0;
+ public void RecordHeroAI()
+ {
+ autoHandupRecord = PlayerDatas.Instance.hero.aiHandler.IsAuto();
+ moveToNPCRecord = MapTransferUtility.Instance.NpcID;
+ }
+
+ public void ClearHeroAIRecord()
+ {
+ autoHandupRecord = false;
+ moveToNPCRecord = 0;
+ }
+
}
}
diff --git a/System/Team/TeamPrepareWin.cs b/System/Team/TeamPrepareWin.cs
index 05b9f53..ed61fde 100644
--- a/System/Team/TeamPrepareWin.cs
+++ b/System/Team/TeamPrepareWin.cs
@@ -31,9 +31,6 @@
float timer = 0f;
bool alreadyAutoPrepare = false;
-
- bool autoHandupRecord = false;
- int moveToNPCRecord = 0;
bool rejectManual = false;
TeamModel model { get { return ModelCenter.Instance.GetModel<TeamModel>(); } }
@@ -52,8 +49,10 @@
protected override void OnPreOpen()
{
rejectManual = false;
- autoHandupRecord = PlayerDatas.Instance.hero.aiHandler.IsAuto();
- moveToNPCRecord = MapTransferUtility.Instance.NpcID;
+ if (!model.myTeam.iamCaptainer)
+ {
+ model.RecordHeroAI();
+ }
PlayerDatas.Instance.hero.Behaviour.StopHandupAI();
MapTransferUtility.Instance.Clear();
@@ -85,23 +84,21 @@
{
if (rejectManual || model.teamPrepare.isError || model.teamPrepare.IsReject())
{
- if (autoHandupRecord)
+ if (model.autoHandupRecord)
{
if (PlayerDatas.Instance.hero != null)
{
PlayerDatas.Instance.hero.Behaviour.StartHandupAI();
}
-
- autoHandupRecord = false;
}
- if (moveToNPCRecord != 0)
+ if (model.moveToNPCRecord != 0)
{
- MapTransferUtility.Instance.MoveToNPC(moveToNPCRecord);
- moveToNPCRecord = 0;
+ MapTransferUtility.Instance.MoveToNPC(model.moveToNPCRecord);
}
}
+ model.ClearHeroAIRecord();
model.memberPrepareStateChangeEvent -= ShowPrepareStates;
}
--
Gitblit v1.8.0