From 7fb89beabfa4b456f06beeed65b974c2a42872f4 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期五, 19 四月 2019 17:35:58 +0800
Subject: [PATCH] 3335 缥缈仙域
---
System/HazyRegion/HazyRegionModel.cs | 2 ++
Fight/Stage/Dungeon/AdventureStage.cs | 14 ++++++++------
System/BossShow/BossShowModel.cs | 11 ++++++++++-
3 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/Fight/Stage/Dungeon/AdventureStage.cs b/Fight/Stage/Dungeon/AdventureStage.cs
index fd2e56f..dc63c6b 100644
--- a/Fight/Stage/Dungeon/AdventureStage.cs
+++ b/Fight/Stage/Dungeon/AdventureStage.cs
@@ -31,23 +31,25 @@
private IEnumerator _Enter()
{
- WindowCenter.Instance.Open<LoadingWin>();
+ WindowCenter.Instance.Open<LoadingWin>();
+ WindowCenter.Instance.Close<MainInterfaceWin>();
if (!AssetSource.sceneFromEditor)
{
- AssetBundleUtility.Instance.Sync_LoadAll("maps/map000_xsdt");
+ AssetBundleUtility.Instance.Sync_LoadAll("maps/map140_qy");
}
- var _async = SceneManager.LoadSceneAsync("Map000_Xsdt", LoadSceneMode.Additive);
+ var _async = SceneManager.LoadSceneAsync("Map140_Qy", LoadSceneMode.Additive);
yield return _async;
var _hero = PlayerDatas.Instance.hero;
if (_hero != null)
{
- _hero.Pos = new Vector3(188.49f, 62.512f, 23.85f);
+ _hero.Pos = new Vector3(9.517f, 18.742f, 7.485f);
}
CameraController.Instance.Apply();
yield return null;
- WindowCenter.Instance.Close<LoadingWin>();
+ WindowCenter.Instance.Close<LoadingWin>();
+ WindowCenter.Instance.Open<MainInterfaceWin>();
m_Npc = GAMgr.Instance.ReqClntNoFightNpc<GA_NpcClientFunc>((uint)hazyRegionModel.GetAdventureNpcId(), E_ActorGroup.FuncNpc);
- m_Npc.Pos = new Vector3(189.101f, 62.47324f, 26.147f);
+ m_Npc.Pos = new Vector3(9.549f, 18.76f, 9.268f);
NPCInteractProcessor.s_NpcInteractEvent -= OnNpcTalkEvent;
NPCInteractProcessor.s_NpcInteractEvent += OnNpcTalkEvent;
diff --git a/System/BossShow/BossShowModel.cs b/System/BossShow/BossShowModel.cs
index 552a3d4..f51995c 100644
--- a/System/BossShow/BossShowModel.cs
+++ b/System/BossShow/BossShowModel.cs
@@ -43,10 +43,19 @@
public void StartBossShow(int npcId)
{
+ if (!ActorShowConfig.GetActorShowModel(PlayerDatas.Instance.baseData.MapID, npcId, out actorShowModel))
+ {
+ return;
+ }
+ Start(PlayerDatas.Instance.baseData.MapID, npcId);
+ }
+
+ public void Start(int mapId, int npcId)
+ {
try
{
reqDungeonLineId = -1;
- if (!ActorShowConfig.GetActorShowModel(PlayerDatas.Instance.baseData.MapID, npcId, out actorShowModel))
+ if (!ActorShowConfig.GetActorShowModel(mapId, npcId, out actorShowModel))
{
return;
}
diff --git a/System/HazyRegion/HazyRegionModel.cs b/System/HazyRegion/HazyRegionModel.cs
index 93de794..0a7a4f9 100644
--- a/System/HazyRegion/HazyRegionModel.cs
+++ b/System/HazyRegion/HazyRegionModel.cs
@@ -92,6 +92,8 @@
private void OnLoadAdventureStage()
{
WindowCenter.Instance.Open<HazyAdventureHintWin>();
+ var dialogueConfig = AdventureDialogueConfig.Get(adventureDialogueId);
+ BossShowModel.Instance.Start(0, dialogueConfig.npcId);
}
private void OnExitAdventureStage()
--
Gitblit v1.8.0