From ec901bfd42ee3f46f5b5269e2a838da1ef111455 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期二, 25 九月 2018 10:52:40 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/WindowJump/WindowJumpMgr.cs | 1 +
System/Dungeon/TrialDungeonModel.cs | 5 +++--
System/Dungeon/DungeonFightWin.cs | 10 +++++-----
3 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/System/Dungeon/DungeonFightWin.cs b/System/Dungeon/DungeonFightWin.cs
index 8382c33..85643da 100644
--- a/System/Dungeon/DungeonFightWin.cs
+++ b/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()
diff --git a/System/Dungeon/TrialDungeonModel.cs b/System/Dungeon/TrialDungeonModel.cs
index 2975386..46b97dc 100644
--- a/System/Dungeon/TrialDungeonModel.cs
+++ b/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;
}
diff --git a/System/WindowJump/WindowJumpMgr.cs b/System/WindowJump/WindowJumpMgr.cs
index 8d135d4..08b9a4d 100644
--- a/System/WindowJump/WindowJumpMgr.cs
+++ b/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:
--
Gitblit v1.8.0