From 2f723e5320ef618985cc9ea8f71deafd3e4bec36 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期二, 16 四月 2019 11:35:50 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Dungeon/DungeonModel.cs | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/System/Dungeon/DungeonModel.cs b/System/Dungeon/DungeonModel.cs
index 037259b..d61cf99 100644
--- a/System/Dungeon/DungeonModel.cs
+++ b/System/Dungeon/DungeonModel.cs
@@ -27,6 +27,7 @@
public event Action<DungeonCoolDownType> dungeonCoolDownEvent;
public event Action dungeonBeginCoolDownEndEvent;
public event Action updateMissionEvent;
+ public event Action onDungeonResultEvent;
public event Action<int> dungeonStageChangeEvent;
public event Action getDungeonResultEvent;
public event Action dungeonEnterCoolDownUpdate;
@@ -858,6 +859,13 @@
WindowCenter.Instance.Open<GatherSoulDungeonHintWin>();
}
break;
+ case HazyGrassModel.ReikiGrassMapId:
+ case HazyGrassModel.FairyGrassMapId:
+ if (!WindowCenter.Instance.IsOpen<HazyGrassDungeonWin>())
+ {
+ WindowCenter.Instance.Open<HazyGrassDungeonWin>();
+ }
+ break;
default:
if (GetDungeonHintId(mapId, lineId) != 0)
{
@@ -914,7 +922,12 @@
public void ProcessResult(string _msg)
{
m_DungeonResult = LitJson.JsonMapper.ToObject<DungeonResult>(_msg);
- if (m_DungeonResult.isSweep == 1)
+
+ if (AdventureStage.Instance.IsInAdventureStage)
+ {
+ WindowCenter.Instance.Open<DungeonAdventureVictoryWin>();
+ }
+ else if (m_DungeonResult.isSweep == 1)
{
switch (m_DungeonResult.dataMapID)
{
@@ -1041,6 +1054,11 @@
case RidingPetBossModel.RIDINGPETBOSS_MAP:
WindowCenter.Instance.Open<RidingPetBossVictoryWin>();
break;
+ case 22030:
+ case 32030:
+ case HazyDemonKingModel.Client_MapID:
+ WindowCenter.Instance.Open<HazyDemonKingVictoryWin>();
+ break;
default:
WindowCenter.Instance.Open<DungeonVictoryWin>();
break;
@@ -1072,6 +1090,11 @@
}
}
}
+
+ if (onDungeonResultEvent != null)
+ {
+ onDungeonResultEvent();
+ }
}
public int GetDungeonHintId(int _dataMapId, int _lineId)
--
Gitblit v1.8.0