From c46c24e933bef1f29b140aceff6f6f178c23000e Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期四, 23 五月 2019 16:11:19 +0800
Subject: [PATCH] 6780 boss之家多地图合并。
---
System/WorldMap/LocalMapFindPath.cs | 54 ++++++++++++++++++++++++++++--------------------------
1 files changed, 28 insertions(+), 26 deletions(-)
diff --git a/System/WorldMap/LocalMapFindPath.cs b/System/WorldMap/LocalMapFindPath.cs
index 4c09603..8f6bc5e 100644
--- a/System/WorldMap/LocalMapFindPath.cs
+++ b/System/WorldMap/LocalMapFindPath.cs
@@ -29,28 +29,30 @@
MapModel model { get { return ModelCenter.Instance.GetModel<MapModel>(); } }
- int mapId = 0;
- public void Init(int _mapId)
+ int dataMapId = 0;
+ int lineId = 0;
+ public void Init(int dataMapId, int lineId)
{
- mapId = _mapId;
- if (mapId != mapMatrix.mapId)
+ this.dataMapId = dataMapId;
+ this.lineId = lineId;
+
+ if (this.dataMapId != this.mapMatrix.mapId)
{
- PathPointClear();
+ this.PathPointClear();
}
- if (mapId == PlayerDatas.Instance.baseData.MapID)
+ if (this.dataMapId == MapUtility.GetDataMapId())
{
- m_HeroHead.gameObject.SetActive(true);
+ this.m_HeroHead.gameObject.SetActive(true);
var job = PlayerDatas.Instance.baseData.Job;
- m_HeroHead.SetSprite(GeneralDefine.GetJobHeadPortrait(job, 0));
+ this.m_HeroHead.SetSprite(GeneralDefine.GetJobHeadPortrait(job, 0));
}
else
{
- m_HeroHead.gameObject.SetActive(false);
+ this.m_HeroHead.gameObject.SetActive(false);
}
- var dataMapId = MapUtility.GetDataMapId(mapId);
- var mapResConfig = MapResourcesConfig.GetConfig(dataMapId, 0);
+ var mapResConfig = MapResourcesConfig.GetConfig(this.dataMapId, this.lineId);
var mapWidth = mapResConfig.MapScale.x;
var mapHeight = mapResConfig.MapScale.y;
@@ -66,7 +68,7 @@
m_BoundDrag.moveArea = new BoundedDrag.MoveArea(-offsetX, offsetX, offsetY, -offsetY);
- mapMatrix = new LocalMap(mapId, mapWidth, mapHeight, uiMapWidth, uiMapHeight);
+ this.mapMatrix = new LocalMap(this.dataMapId, mapWidth, mapHeight, uiMapWidth, uiMapHeight);
DrawWayPoints();
DrawFunctionNpcs();
@@ -79,21 +81,21 @@
m_BoundDrag.onBeginDrag.AddListener(OnBeginDrag);
model.selectMapEventPointEvent += FoucsEventPoint;
- if (PlayerDatas.Instance.baseData.MapID == mapId)
+ if (MapUtility.GetDataMapId() == this.dataMapId)
{
var hero = PlayerDatas.Instance.hero;
if (hero != null)
{
if (hero.PathFindStatus == GActor.E_PathFindStatus.Moving)
{
- OnHeroStartMove();
+ this.OnHeroStartMove();
}
else
{
- OnHeroStopMove();
+ this.OnHeroStopMove();
}
- hero.OnPathFinding += OnHeroStartMove;
- hero.OnPathFindStop += OnHeroStopMove;
+ hero.OnPathFinding += this.OnHeroStartMove;
+ hero.OnPathFindStop += this.OnHeroStopMove;
}
}
}
@@ -120,7 +122,7 @@
void HeroMoveTo(Vector3 _position)
{
- if (mapId != PlayerDatas.Instance.baseData.MapID)
+ if (dataMapId != PlayerDatas.Instance.baseData.MapID)
{
return;
}
@@ -161,7 +163,7 @@
private void LateUpdate()
{
- if (mapId == PlayerDatas.Instance.baseData.MapID)
+ if (dataMapId == MapUtility.GetDataMapId())
{
UpdateHeroPosition();
}
@@ -208,7 +210,7 @@
private void DrawEventPoints()
{
- var eventPoints = model.GetMapEventPoints(mapId);
+ var eventPoints = model.GetMapEventPoints(dataMapId, lineId);
for (int i = 0; i < eventPoints.Count; i++)
{
var eventPoint = eventPoints[i];
@@ -268,7 +270,7 @@
var waypoints = maptransportConfig.GetValues();
foreach (var waypoint in waypoints)
{
- if (waypoint.OriginalMapID == this.mapId)
+ if (waypoint.OriginalMapID == MapUtility.GetMapId(this.dataMapId, this.lineId))
{
DrawWayPoint(waypoint.TransportID);
}
@@ -290,7 +292,7 @@
private void DrawFunctionNpcs()
{
- var npcRefreshIds = model.GetMapNPCRefreshIds(mapId);
+ var npcRefreshIds = model.GetMapNPCRefreshIds(dataMapId);
if (npcRefreshIds != null)
{
foreach (var item in npcRefreshIds)
@@ -323,7 +325,7 @@
private void DrawJumpPoints()
{
- var mapData = H2Engine.MapData.LoadFormFile(mapId);
+ var mapData = H2Engine.MapData.LoadFormFile(MapUtility.GetMapId(dataMapId, lineId));
if (mapData == null)
{
return;
@@ -358,7 +360,7 @@
private void UpdateHeroPosition()
{
- if (mapId == PlayerDatas.Instance.baseData.MapID)
+ if (dataMapId == PlayerDatas.Instance.baseData.MapID)
{
var heroPos = mapMatrix.WorldToLocalPosition(PlayerDatas.Instance.hero.Pos);
if (Vector3.Distance(heroPrePosition, heroPos) > 0.01f)
@@ -519,9 +521,9 @@
public float localMapWidth;
public float localMapHeight;
- public LocalMap(int mId, float mWidth, float mHeigth, float mSpriteWidth, float mSpriteHeight)
+ public LocalMap(int mapId, float mWidth, float mHeigth, float mSpriteWidth, float mSpriteHeight)
{
- mapId = mId;
+ this.mapId = mapId;
worldMapWidth = mWidth;
worldMapHeight = mHeigth;
localMapWidth = mSpriteWidth;
--
Gitblit v1.8.0