From efa5f8d07fc3321f6ac5f5d97fb422db28d0886f Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期二, 05 三月 2019 10:55:31 +0800
Subject: [PATCH] Merge branch 'master' into Equip
---
Fight/Stage/Dungeon/DungeonStage.cs | 75 +------------------------------------
1 files changed, 3 insertions(+), 72 deletions(-)
diff --git a/Fight/Stage/Dungeon/DungeonStage.cs b/Fight/Stage/Dungeon/DungeonStage.cs
index 01b3bd1..2d72200 100644
--- a/Fight/Stage/Dungeon/DungeonStage.cs
+++ b/Fight/Stage/Dungeon/DungeonStage.cs
@@ -8,9 +8,7 @@
public class DungeonStage : Stage
{
public static Dictionary<MapArea.E_Type, List<MapArea>> s_MapAreaDict;
- private static List<TransferGroup> m_TransferGroupList = new List<TransferGroup>();
public static MapType CurrentMapType;
- private H2Engine.MapData mapData;
public override void Initialize()
{
@@ -31,11 +29,6 @@
SoundPlayer.Instance.PlayBackGroundMusic(mapResConfig.Music);
SceneResourcesReplace();
- foreach (var _t in m_TransferGroupList)
- {
- _t.UnInit();
- }
- m_TransferGroupList.Clear();
// 鍋氫竴浜涘墠鏈熸垬鏂楃殑棰勫姞杞�
// if (!PreFightMission.Instance.IsFinished())
// {
@@ -114,7 +107,7 @@
_hero.SkillMgr.ResetAllCD();
}
- HandleMapData();
+ ClientSceneManager.Instance.Init();
GA_Hero.s_MapSwitching = false;
}
@@ -124,7 +117,6 @@
base.UnInitialize();
StopAllCoroutines();
- mapData = null;
if (s_MapAreaDict != null)
{
@@ -150,7 +142,7 @@
CameraController.Instance.StopZoom();
CameraController.Instance.StopShake();
}
-
+ ClientSceneManager.Instance.UnInit();
GAMgr.Instance.UnInit();
DropItemManager.ReleaseAll();
SFXPlayUtility.Instance.Unitialize();
@@ -168,10 +160,7 @@
DropItemManager.Update();
- foreach (var _trasfer in m_TransferGroupList)
- {
- _trasfer.Update();
- }
+ ClientSceneManager.Instance.Update();
// if (PreFightMission.Instance.IsFinished() == false)
// {
@@ -274,48 +263,7 @@
}
}
- private void HandleMapData()
- {
- mapData = H2Engine.MapData.LoadFormFile(PlayerDatas.Instance.baseData.MapID);
- if (mapData == null)
- {
- return;
- }
- // 鐩墠鐗堟湰鍙鐞嗗埛鍦烘櫙鐗╀欢
- // foreach (var _trigger in mapData.triggers)
- // {
- // if (_trigger.triggerType != H2Engine.MapTrigger.E_TriggerType.EnterStage)
- // {
- // continue;
- // }
- // foreach (var _id in _trigger.evevntIDs)
- // {
- // var _event = mapData.eventDict[_id];
- // if (_event.type == H2Engine.Evt.E_EventType.SceneObject)
- // {
- // var _refreshSceneObject = _event as H2Engine.Evt_RefreshSceneObject;
- // if (_refreshSceneObject != null)
- // {
- // foreach (var _sceneObjData in _refreshSceneObject.sceneObjects)
- // {
- // var _prefab = InstanceResourcesLoader.LoadModelPrefab(InstanceResourcesLoader.raceSuffix, _sceneObjData.resName, false);
- // if (_prefab)
- // {
- // var _go = GameObject.Instantiate(_prefab);
- // _go.transform.position = _sceneObjData.position;
- // _go.transform.eulerAngles = _sceneObjData.eulerAngles;
- // }
- // }
- // }
- // }
- // }
- // }
- foreach (var _trasfer in mapData.transfers)
- {
- m_TransferGroupList.Add(new TransferGroup(_trasfer));
- }
- }
private void HandleAutoFight()
{
@@ -475,23 +423,6 @@
default:
break;
}
- }
-
- public Vector3 GetCloseTransPoint(Vector3 pos)
- {
- // 閬嶅巻鎵惧埌绂荤粰瀹氱偣鏈�杩戝苟涓斿彲瀵昏矾鑷崇殑浼犻�佺偣 P
- // 鎵惧埌 P鐐圭殑 鍙︿竴绔� P1
- // 鍒ゆ柇褰撳墠浼犲叆鐨勭偣鏄惁鍙互瀵昏矾鑷� P1
- // 涓嶈鐨勮瘽閲嶆柊瀵绘壘 鍙互鐨勮瘽杩斿洖 P1 鐨勫潗鏍�
- float _compareDis;
- float _dis;
-
- foreach (var _p in m_TransferGroupList)
- {
-
- }
-
- return Vector3.zero;
}
private void SceneResourceReplace10010()
--
Gitblit v1.8.0