Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_linchunjie

2018-09-25 b1c9fcd24860091c0d3737b72ba218013aa7e1d5

Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

 System/Dungeon/DungeonFightWin.cs

@@ -130,10 +130,10 @@
            MainInterfaceWin.Event_Duplicates -= OnChangeFuncBtnPosEvent;

            model.dungeonCoolDownEvent -= OnLeaveMapTimeEvent;



            var mapId = PlayerDatas.Instance.baseData.MapID;

            var mapConfig = Config.Instance.Get<MapConfig>(mapId);

            try

            {

                var mapId = PlayerDatas.Instance.baseData.MapID;

                var mapConfig = Config.Instance.Get<MapConfig>(mapId);

                if (mapConfig != null && mapConfig.MapFBType != (int)MapType.OpenCountry)

                {

                    throw new NullReferenceException();

@@ -141,10 +141,10 @@
            }

            catch (Exception ex)

            {

                Debug.Log(ex.Message);

                ExceptionCatcher.ReportException("副本战斗界面异常关闭", ex.Message);

                Debug.Log(ex);

                var content = StringUtility.Contact("当前地图：", PlayerDatas.Instance.baseData.MapID, ";堆栈信息：", ex.StackTrace);

                ExceptionCatcher.ReportException("副本战斗界面异常关闭", content);

            }



        }



        protected override void OnAfterClose()