Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
| | |
| | | EventBroadcast.Instance.RemoveListener<BattleDmgInfo>(EventName.BATTLE_DAMAGE_TAKEN, OnDamageTaken); |
| | | EventBroadcast.Instance.RemoveListener<string, SkillConfig, TeamHero>(EventName.BATTLE_CAST_SKILL, OnCastSkill); |
| | | UIManager.Instance.CloseWindow<BattleHUDWin>(); |
| | | |
| | | BattleManager.Instance.storyBattleField.IsPause = false; |
| | | bool isOpenBattleChangeTab = IsOpenBattleChangeTab(); |
| | | if (isOpenBattleChangeTab) |
| | | { |
| | |
| | | BattleManager.Instance.onBattleFieldCreate += OnCreateBattleField; |
| | | EventBroadcast.Instance.AddListener<BattleDmgInfo>(EventName.BATTLE_DAMAGE_TAKEN, OnDamageTaken); |
| | | EventBroadcast.Instance.AddListener<string, SkillConfig, TeamHero>(EventName.BATTLE_CAST_SKILL, OnCastSkill); |
| | | |
| | | BattleManager.Instance.storyBattleField.IsPause = true; |
| | | UIManager.Instance.CloseWindow<MainWin>(); |
| | | } |
| | | |
| | |
| | | EventBroadcast.Instance.RemoveListener<string, SkillConfig, TeamHero>(EventName.BATTLE_CAST_SKILL, OnCastSkill); |
| | | |
| | | UIManager.Instance.CloseWindow<BattleHUDWin>(); |
| | | |
| | | BattleManager.Instance.storyBattleField.IsPause = false; |
| | | if (!UIManager.Instance.IsOpened<MainWin>()) |
| | | UIManager.Instance.OpenWindow<MainWin>(); |
| | | |