少年修仙传客户端代码仓库
client_Hale
2018-09-25 ec901bfd42ee3f46f5b5269e2a838da1ef111455
Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
3个文件已修改
16 ■■■■■ 已修改文件
System/Dungeon/DungeonFightWin.cs 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Dungeon/TrialDungeonModel.cs 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/WindowJump/WindowJumpMgr.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Dungeon/DungeonFightWin.cs
@@ -130,10 +130,10 @@
            MainInterfaceWin.Event_Duplicates -= OnChangeFuncBtnPosEvent;
            model.dungeonCoolDownEvent -= OnLeaveMapTimeEvent;
            try
            {
                var mapId = PlayerDatas.Instance.baseData.MapID;
                var mapConfig = Config.Instance.Get<MapConfig>(mapId);
            try
            {
                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()
System/Dungeon/TrialDungeonModel.cs
@@ -281,7 +281,8 @@
                    {
                        if (itemModel.chinItemModel.EquipPlace == config.EquipPlace
                            && (itemModel.chinItemModel.JobLimit / 100 == PlayerDatas.Instance.baseData.Job
                            || itemModel.chinItemModel.JobLimit == 0))
                            || itemModel.chinItemModel.JobLimit == 0)
                            && !ModelCenter.Instance.GetModel<PackModelInterface>().IsOverdue(itemModel.itemInfo.ItemGUID, itemModel.itemId, itemModel.useDataDict))
                        {
                            var compare = EquipCompare(itemModel, config);
                            if (compare == -1 || compare == 0)
@@ -293,7 +294,7 @@
                }
            }
            singlepack = packModel.GetSinglePackModel(PackType.rptEquip);
            if (singlepack != null)
            if (singlepack == null)
            {
                return 1;
            }
System/WindowJump/WindowJumpMgr.cs
@@ -705,6 +705,7 @@
                SetJumpLogic<TreasureLevelUpWin>(0);
                break;
            case JumpUIType.Kylin:
                dungeonModel.currentDungeon = new Dungeon(31190, 0);
                SetJumpLogic<MultipleDifficultyDungeonWin>(0);
                break;
            case JumpUIType.Kylin1: