From 78bfe524ea4776c47f6314e56e97f39970b00fce Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期二, 25 九月 2018 15:07:07 +0800
Subject: [PATCH] Merge branch 'master' into 1871天赋功能
---
System/Dungeon/DungeonFightWin.cs | 36 +++++++++++++++++++++++++++++-------
1 files changed, 29 insertions(+), 7 deletions(-)
diff --git a/System/Dungeon/DungeonFightWin.cs b/System/Dungeon/DungeonFightWin.cs
index 3d4fa8b..85643da 100644
--- a/System/Dungeon/DungeonFightWin.cs
+++ b/System/Dungeon/DungeonFightWin.cs
@@ -30,7 +30,8 @@
[SerializeField] DungeonItemCollect m_ItemCollect;
[SerializeField] DungeonGuardSkyBehaviour m_GuardSky;
[SerializeField] DungeonBossBriefInfoContainer m_BossInfosContainer;
-
+ [SerializeField] GameObject m_Container_WHYJ;
+ [SerializeField] DungenWHYJ m_DungenWHYJ;
bool excutedAutoExit = false;
float timer = 0f;
DateTime endTime = DateTime.Now;
@@ -97,6 +98,15 @@
model.dungeonCoolDownEvent += OnLeaveMapTimeEvent;
MainInterfaceWin.Event_Duplicates += OnChangeFuncBtnPosEvent;
+ if (WHYJBool())
+ {
+ m_Container_WHYJ.SetActive(true);
+ m_DungenWHYJ.Init();
+ }
+ else
+ {
+ m_Container_WHYJ.SetActive(false);
+ }
}
protected override void OnAfterOpen()
@@ -120,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();
@@ -131,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()
@@ -265,7 +275,7 @@
var config = Config.Instance.Get<RuneTowerFloorConfig>(runeTowerModel.currentFloor);
var lastFloor = (int)ModelCenter.Instance.GetModel<RuneModel>().RuneTowerOpenLV;
var lastFloorConfig = Config.Instance.Get<RuneTowerFloorConfig>(lastFloor);
- if (model.dungeonResult.isPass == 1 && config.TowerId == lastFloorConfig.TowerId)
+ if (model.dungeonResult.isPass == 1 && config.TowerId == lastFloorConfig.TowerId && lastFloorConfig.AutoExit == 0)
{
var runeTowerStage = StageManager.Instance.CurrentStage as RuneTowerDungeonStage;
runeTowerStage.PerformChallengeNextLevel();
@@ -365,6 +375,18 @@
}
+ private bool WHYJBool()//鍒ゆ柇鏄惁鍦ㄥú鐨囬仐杩瑰壇鏈�
+ {
+ var dataMapId = model.GetDataMapIdByMapId(PlayerDatas.Instance.baseData.MapID);
+ if (dataMapId == GeneralConfig.Instance.ruinsTranscriptMapId)
+ {
+ return true;
+ }
+ else
+ {
+ return false;
+ }
+ }
}
}
--
Gitblit v1.8.0