From 7959c89a3469bc513c5f2669e1e4cae07039d2d2 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期四, 25 四月 2019 12:25:16 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/WorldMap/LocalMapTag.cs | 46 +++++++++++++++++++++-------------------------
1 files changed, 21 insertions(+), 25 deletions(-)
diff --git a/System/WorldMap/LocalMapTag.cs b/System/WorldMap/LocalMapTag.cs
index fbff780..c9872a6 100644
--- a/System/WorldMap/LocalMapTag.cs
+++ b/System/WorldMap/LocalMapTag.cs
@@ -27,14 +27,24 @@
int npcId = 0;
int index = 0;
+ Vector3 jumpPoint = Vector3.zero;
MapModel mapModel { get { return ModelCenter.Instance.GetModel<MapModel>(); } }
TaskModel taskModel { get { return ModelCenter.Instance.GetModel<TaskModel>(); } }
FairyLeagueModel fairyLeagueModel { get { return ModelCenter.Instance.GetModel<FairyLeagueModel>(); } }
+ private void Start()
+ {
+ if (m_Moveto != null)
+ {
+ m_Moveto.SetListener(MoveTo);
+ }
+ }
+
public void Display(int npcId, TextColType colorType)
{
this.npcId = npcId;
+ var config = NPCConfig.Get(this.npcId);
switch (m_TagType)
{
case TagType.Function:
@@ -59,17 +69,19 @@
case TagType.WayPoint:
break;
case TagType.Boss:
+ m_NpcName.text = config.charName;
+ m_Level.text = Language.Get("HeadUpName_Monster", config.NPCLV);
+ m_NpcName.colorType = colorType;
+ var dangerous = PlayerDatas.Instance.baseData.LV <= config.NPCLV;
+ m_Level.color = UIHelper.GetUIColor(dangerous ? TextColType.Red : TextColType.Green, false);
break;
case TagType.Elite:
case TagType.Monster:
- var config = NPCConfig.Get(this.npcId);
m_NpcName.text = config.charName;
m_NpcName.colorType = colorType;
break;
case TagType.Crystal:
this.OnCrystalStateChange(this.npcId);
- m_Moveto.RemoveAllListeners();
- m_Moveto.AddListener(MoveTo);
PlayerDatas.Instance.playerDataRefreshEvent -= PlayerDataRefreshEvent;
PlayerDatas.Instance.playerDataRefreshEvent += PlayerDataRefreshEvent;
fairyLeagueModel.UpdateWarCrystalEvent -= OnCrystalStateChange;
@@ -78,34 +90,14 @@
}
}
- public void Display(int npcId, TextColType colorType, Vector3 _position)
+ public void Display(Vector3 position)
{
- this.npcId = npcId;
- switch (m_TagType)
- {
- case TagType.Boss:
- var config = NPCConfig.Get(this.npcId);
- m_NpcName.text = config.charName;
- m_Level.text = Language.Get("HeadUpName_Monster", config.NPCLV);
- m_NpcName.colorType = colorType;
- var dangerous = PlayerDatas.Instance.baseData.LV <= config.NPCLV;
- m_Level.color = UIHelper.GetUIColor(dangerous ? TextColType.Red : TextColType.Green, false);
- m_Moveto.SetListener(MoveTo);
- break;
- default:
- break;
- }
+ jumpPoint = position;
}
public void Display(int index)
{
this.index = index;
- switch (m_TagType)
- {
- case TagType.FairyLeagueBuff:
- m_Moveto.SetListener(MoveTo);
- break;
- }
}
public void Dispose()
@@ -159,6 +151,9 @@
hero.MoveToPosition(new Vector3(buffPos.x, hero.Pos.y, buffPos.y));
}
}
+ break;
+ case TagType.JumpPoint:
+ MapTransferUtility.Instance.MoveToLocalMapPosition(new Vector3(jumpPoint.x, jumpPoint.z, 0) * 2);
break;
default:
{
@@ -233,6 +228,7 @@
WayPoint = 5,
Crystal = 6,
FairyLeagueBuff = 7,
+ JumpPoint = 8
}
}
--
Gitblit v1.8.0