少年修仙传客户端代码仓库
client_linchunjie
2019-04-27 b68bf6efef97df1575e5c7e24ee89c172e285afb
3335 奇遇添加退出按钮
5个文件已修改
38 ■■■■ 已修改文件
Fight/Stage/Dungeon/AdventureStage.cs 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Dungeon/DungeonFightWin.cs 20 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/MainInterfacePanel/MainInterfaceWin.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/MainInterfacePanel/MainPositionTween.cs 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/MainInterfacePanel/MapSwitchingBehaviour.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Fight/Stage/Dungeon/AdventureStage.cs
@@ -11,6 +11,8 @@
    private Vector3 m_CacheHeroPos;
    private GA_NpcClientFunc m_Npc;
    private bool dungeonFightWinOpenRecord = false;
    public event Action onLoadAdventureStage;
    public event Action onExitAdventureStage;
@@ -50,6 +52,11 @@
        yield return null;
        WindowCenter.Instance.Close<LoadingWin>();
        WindowCenter.Instance.Open<MainInterfaceWin>();
        dungeonFightWinOpenRecord = WindowCenter.Instance.IsOpen<DungeonFightWin>();
        if (!dungeonFightWinOpenRecord)
        {
            WindowCenter.Instance.Open<DungeonFightWin>();
        }
        BossShowModel.Instance.bossShowCompletedEvent -= BossShowCompletedEvent;
        BossShowModel.Instance.bossShowCompletedEvent += BossShowCompletedEvent;
@@ -92,6 +99,10 @@
        yield return null;
        WindowCenter.Instance.Open<MainInterfaceWin>();
        WindowCenter.Instance.Close<LoadingWin>();
        if (!dungeonFightWinOpenRecord)
        {
            WindowCenter.Instance.Close<DungeonFightWin>();
        }
        if (onExitAdventureStage != null)
        {
System/Dungeon/DungeonFightWin.cs
@@ -217,6 +217,18 @@
        private void ExitDungeon()
        {
            if (AdventureStage.Instance.IsInAdventureStage)
            {
                ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"), Language.Get("HazyExitAdventureConfirm"), (bool isOk) =>
                  {
                      if (isOk)
                      {
                          AdventureStage.Instance.Exit();
                      }
                  });
                return;
            }
            var dataMapId = model.GetDataMapIdByMapId(PlayerDatas.Instance.baseData.MapID);
            var config = DungeonOpenTimeConfig.Get(dataMapId);
            string language = string.Empty;
@@ -362,6 +374,10 @@
        {
            if (immedidately)
            {
                m_ContainerFuncBtn.localPosition = MainPositionTween.isDefaultState ? m_ContainerFuncBottom.localPosition : m_ContainerFuncUp.localPosition;
            }
            else
            {
                if (MainPositionTween.isDefaultState)
                {
                    m_Tweener = m_ContainerFuncBtn.DOLocalMoveY(m_ContainerFuncBottom.localPosition.y, 1);
@@ -370,10 +386,6 @@
                {
                    m_Tweener = m_ContainerFuncBtn.DOLocalMoveY(m_ContainerFuncUp.localPosition.y, 1);
                }
            }
            else
            {
                m_ContainerFuncBtn.localPosition = MainPositionTween.isDefaultState ? m_ContainerFuncBottom.localPosition : m_ContainerFuncUp.localPosition;
            }
        }
System/MainInterfacePanel/MainInterfaceWin.cs
@@ -145,7 +145,7 @@
            }
            var isNeutralMap = GeneralDefine.neutralBossMaps.Contains(PlayerDatas.Instance.baseData.MapID);
            if (isNeutralMap)
            if (isNeutralMap && !AdventureStage.Instance.IsInAdventureStage)
            {
                m_BossBriefInfos.gameObject.SetActive(true);
                if (PlayerDatas.Instance.baseData.MapID == DogzDungeonModel.DATA_MAPID)
System/MainInterfacePanel/MainPositionTween.cs
@@ -109,7 +109,8 @@
            m_ContainerBossList.gameObject.SetActive(isNeutralMap);
            rightTopState = RightTopState.Function;
            if ((isDungeon || isNeutralMap || isBossArea) && !isGuiding && switchParams.showDefault)
            if ((isDungeon || isNeutralMap || isBossArea || AdventureStage.Instance.IsInAdventureStage)
                && !isGuiding && switchParams.showDefault)
            {
                rightTopState = RightTopState.Boss;
            }
System/MainInterfacePanel/MapSwitchingBehaviour.cs
@@ -29,7 +29,7 @@
        public void Init()
        {
            int MapID = PlayerDatas.Instance.baseData.MapID;
            if (MapIdList.Contains(MapID))
            if (MapIdList.Contains(MapID) && !AdventureStage.Instance.IsInAdventureStage)
            {
                m_Btn_MapSwitch.gameObject.SetActive(true);
            }