From ee945ee8d3199e91df76e7b320d2c37f5efc599a Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期三, 12 九月 2018 17:10:57 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/WorldMap/LocalMapEventPointToggle.cs | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/System/WorldMap/LocalMapEventPointToggle.cs b/System/WorldMap/LocalMapEventPointToggle.cs
index 0ce74c1..9ff088e 100644
--- a/System/WorldMap/LocalMapEventPointToggle.cs
+++ b/System/WorldMap/LocalMapEventPointToggle.cs
@@ -38,14 +38,14 @@
m_LayoutLeft.gameObject.SetActive(mapConfig.MapFBType == (int)MapType.OpenCountry);
DrawEventInfo();
- OnSelected(model.selectedLocalMapEventPoint);
- model.selectLocalMapEventPointEvent += OnSelected;
+ OnSelected(model.selectedMapEventPoint);
+ model.selectMapEventPointEvent += OnSelected;
}
public override void Dispose()
{
base.Dispose();
- model.selectLocalMapEventPointEvent -= OnSelected;
+ model.selectMapEventPointEvent -= OnSelected;
}
private void Awake()
@@ -89,8 +89,8 @@
private void MoveToNpc()
{
- var mapNPCConfig = Config.Instance.Get<MapEventPointConfig>(m_EventId);
- MapTransferUtility.Instance.MissionFlyTo(PlayerDatas.Instance.baseData.MapID, mapNPCConfig.NPCID);
+ var config = Config.Instance.Get<MapEventPointConfig>(m_EventId);
+ MapTransferUtility.Instance.MissionFlyTo(PlayerDatas.Instance.baseData.MapID, config.NPCID);
WindowCenter.Instance.Close<WorldMapWin>();
WindowCenter.Instance.Close<LocalMapWin>();
@@ -99,7 +99,7 @@
private void SelectEventPoint()
{
- model.selectedLocalMapEventPoint = m_EventId;
+ model.selectedMapEventPoint = m_EventId;
}
private void OnSelected(int _event)
--
Gitblit v1.8.0