Prg_ZhangXuheng
/
NLDClient-yudde
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

【UI】界面打开/关闭动画提交

main
chenyuqi 2024-08-14 19:05:52 +08:00
parent f587fda50d
commit a0968f9f0e
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ProjectNLD/Assets/Code/Scripts/Framework/UI/UIManager.Window.cs
View File

@ -97,8 +97,8 @@ public partial class UIManager
_WindowMeta(UINameConst.UIGiftCode, UIWindowLayer.Normal);
//关卡
_WindowMeta(UINameConst.UI_LevelSelect, UIWindowLayer.Normal, UIOpenType.FullScreen, true);
_WindowMeta(UINameConst.UI_BeforeFight, UIWindowLayer.Normal, UIOpenType.FullScreen);
_WindowMeta(UINameConst.UI_LevelSelect, UIWindowLayer.Normal, UIOpenType.FullScreen, true, true);
_WindowMeta(UINameConst.UI_BeforeFight, UIWindowLayer.Normal, UIOpenType.FullScreen, false, true);
_WindowMeta(UINameConst.UI_LevelDetail, UIWindowLayer.Normal, UIOpenType.Pop, false, true);
//PVP
@ -111,7 +111,7 @@ public partial class UIManager
//商店
_WindowMeta(UINameConst.UIGiftCodeAwards, UIWindowLayer.Normal, UIOpenType.FullScreen);
_WindowMeta(UINameConst.UI_Shop, UIWindowLayer.Normal, UIOpenType.FullScreen, true);
_WindowMeta(UINameConst.UI_Purchase, UIWindowLayer.Normal, UIOpenType.FullScreen);
_WindowMeta(UINameConst.UI_Purchase, UIWindowLayer.Normal, UIOpenType.FullScreen, false, true);
//营地
_WindowMeta(UINameConst.UI_Camp, UIWindowLayer.Normal, UIOpenType.Pop, true);
@ -120,16 +120,16 @@ public partial class UIManager
_WindowMeta(UINameConst.UI_Guide, UIWindowLayer.Guide);
_WindowMeta(UINameConst.UI_GuideTip, UIWindowLayer.Guide);
_WindowMeta(UINameConst.UI_ChoosePerson, UIWindowLayer.Normal, UIOpenType.FullScreen);
_WindowMeta(UINameConst.UI_WriteName, UIWindowLayer.Normal, UIOpenType.FullScreen);
_WindowMeta(UINameConst.UI_NameConfirmWindow, UIWindowLayer.Normal, UIOpenType.FullScreen);
_WindowMeta(UINameConst.UI_WriteName, UIWindowLayer.Normal, UIOpenType.FullScreen, false, true);
_WindowMeta(UINameConst.UI_NameConfirmWindow, UIWindowLayer.Normal, UIOpenType.FullScreen, false, true);
//其他
_WindowMeta(UINameConst.UI_PlayerLevelUp, UIWindowLayer.Normal);
_WindowMeta(UINameConst.UI_MusicPanel, UIWindowLayer.Normal, UIOpenType.FullScreen);
_WindowMeta(UINameConst.UI_PlayerLevelUp, UIWindowLayer.Normal, UIOpenType.Pop, false, true);
_WindowMeta(UINameConst.UI_MusicPanel, UIWindowLayer.Normal, UIOpenType.FullScreen, false, true);
_WindowMeta(UINameConst.UI_LevelTransition, UIWindowLayer.Waiting);
_WindowMeta(UINameConst.UI_TransitionNormal, UIWindowLayer.Waiting, UIOpenType.Pop, true);
_WindowMeta(UINameConst.UI_LongTip, UIWindowLayer.Normal);
_WindowMeta(UINameConst.UI_NoticeWindow, UIWindowLayer.Normal);
_WindowMeta(UINameConst.UI_NoticeWindow, UIWindowLayer.Normal, UIOpenType.Pop, false, true);
_WindowMeta(UINameConst.UI_RealNameIdentify, UIWindowLayer.Normal);
}

9
ProjectNLD/Assets/Code/Scripts/Gameplay/UI/LevelFight/FightReady/UITeamFightController.cs
View File

@ -884,7 +884,7 @@ public class UITeamFightController : UIWindow
_dragingUid = 0;
return;
}
if (ValueValidator.IsIdValid(TeamManager.Instance.SelectID))
{
if (LevelManager.Instance.CurrentLevel.IsInBattle())
@ -909,6 +909,13 @@ public class UITeamFightController : UIWindow
ClearWaitSelect();
}
}
if(LevelManager.Instance.CurrentLevel.IsPreparing())
{
TeamManager.Instance.SetSelectID();
ClearWaitSelect();
LevelManager.Instance.CurrentLevel.UnSelectUnit();
}
}
private void _OnSkillPauseEnd()