【战斗】提交备战时选中状态的修改
parent
9df0e00945
commit
97bacdc2a7
|
|
@ -204,6 +204,11 @@ namespace Gameplay.Level
|
|||
{
|
||||
_SetSelf(selectUnit, worldPosition, yaw);
|
||||
}
|
||||
|
||||
if (TeamManager.IsHideAllUI)
|
||||
{
|
||||
TeamManager.IsHideAllUI = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
|
|
@ -259,6 +264,10 @@ namespace Gameplay.Level
|
|||
if (ValueValidator.IsIdValid(characterIDHere))
|
||||
{
|
||||
_level.SelectUnit(characterIDHere);
|
||||
if (!TeamManager.IsHideAllUI)
|
||||
{
|
||||
TeamManager.IsHideAllUI = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -513,6 +513,13 @@ public class TeamManager
|
|||
|
||||
}
|
||||
LevelManager.Instance.CurrentLevel.Map.ShowInfo(Map.InfoMask.ShowCells, isNeedShow);
|
||||
if (uid == Constants.INVALID_UINT_ID)
|
||||
{
|
||||
if (IsHideAllUI)
|
||||
{
|
||||
IsHideAllUI = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//获取某一个角色的信息
|
||||
|
|
|
|||
|
|
@ -788,7 +788,8 @@ public class UITeamFightController : UIWindow
|
|||
unit.Node.GameObject.SetActive(false);
|
||||
}
|
||||
TeamManager.Instance.SetSelectID();
|
||||
|
||||
ClearWaitSelect();
|
||||
|
||||
}
|
||||
|
||||
if (LevelManager.Instance.CurrentLevel.IsInBattle())
|
||||
|
|
@ -840,6 +841,7 @@ public class UITeamFightController : UIWindow
|
|||
AreaManager.instance.readyAreaManager.HideReadyArea();
|
||||
LevelManager.Instance.CurrentLevel.Map.ShowInfo(Map.InfoMask.ShowCells, false);
|
||||
TeamManager.Instance.SetSelectID();
|
||||
ClearWaitSelect();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -321,13 +321,18 @@ public class UI_StartBtn_CMSBtnController : UIWindow{
|
|||
{
|
||||
isCancel = false;
|
||||
}
|
||||
|
||||
var data = new EDReleasePlayerSkill();
|
||||
data.isCancel = isCancel;
|
||||
|
||||
if (TeamManager.IsHideAllUI)
|
||||
if (LevelManager.Instance.CurrentLevel.IsInBattle())
|
||||
{
|
||||
TeamManager.IsHideAllUI = false;
|
||||
if (TeamManager.IsHideAllUI)
|
||||
{
|
||||
TeamManager.IsHideAllUI = false;
|
||||
}
|
||||
}
|
||||
|
||||
EventManager.Instance.Send(EventManager.EventName.INFIGHT_PLAYER_SKILL_RELEASE, data);
|
||||
GoCancelSkill.SetActive(false);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue