Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
| | |
| | | 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();
|
| | |
| | | }
|
| | | 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()
|
| | |
| | | {
|
| | | 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)
|
| | |
| | | }
|
| | | }
|
| | | singlepack = packModel.GetSinglePackModel(PackType.rptEquip);
|
| | | if (singlepack != null)
|
| | | if (singlepack == null)
|
| | | {
|
| | | return 1;
|
| | | }
|
| | |
| | | SetJumpLogic<TreasureLevelUpWin>(0);
|
| | | break;
|
| | | case JumpUIType.Kylin:
|
| | | dungeonModel.currentDungeon = new Dungeon(31190, 0);
|
| | | SetJumpLogic<MultipleDifficultyDungeonWin>(0);
|
| | | break;
|
| | | case JumpUIType.Kylin1:
|