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/WorldMapAreaBehaviour.cs | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/System/WorldMap/WorldMapAreaBehaviour.cs b/System/WorldMap/WorldMapAreaBehaviour.cs
index d1a1f82..fa1ed83 100644
--- a/System/WorldMap/WorldMapAreaBehaviour.cs
+++ b/System/WorldMap/WorldMapAreaBehaviour.cs
@@ -61,11 +61,11 @@
m_MapArea = _area;
m_ScaleTween.SetStartState();
DrawArea();
- m_PressTip.enabled = !model.IsMapUnLocked(m_MapArea.id);
+ m_PressTip.enabled = !model.IsMapUnlocked(m_MapArea.id);
if (m_NewUnLockTip != null)
{
- m_NewUnLockTip.gameObject.SetActive(m_MapArea.id != model.newUnLockedMap && model.newUnLockMapsTip == m_MapArea.id);
+ m_NewUnLockTip.gameObject.SetActive(m_MapArea.id != model.newUnlockedMap && model.newUnlockMapTip == m_MapArea.id);
}
CheckAchievementGuide();
@@ -85,7 +85,7 @@
{
try
{
- var unLocked = model.IsMapUnLocked(m_MapArea.id);
+ var unLocked = model.IsMapUnlocked(m_MapArea.id);
var mapConfig = Config.Instance.Get<MapConfig>(m_MapArea.id);
m_AreaName.text = mapConfig.Name;
m_AreaLevel.text = mapConfig.LV.ToString();
@@ -108,7 +108,7 @@
m_ScaleTween.Play(false);
downTime = Time.time;
var mapId = m_MapArea.id;
- if (!model.IsMapUnLocked(mapId))
+ if (!model.IsMapUnlocked(mapId))
{
m_UnLockTip.Display(mapId);
}
@@ -121,7 +121,7 @@
private void OnPointerClick()
{
- var isUnLocked = model.IsMapUnLocked(m_MapArea.id);
+ var isUnLocked = model.IsMapUnlocked(m_MapArea.id);
if (isUnLocked || Time.time - downTime < 0.3f)
{
if (isUnLocked)
@@ -139,7 +139,6 @@
MapTransferUtility.Instance.Clear();
model.RequestMapTransport(m_MapArea.id);
- model.ConfirmNewMap(m_MapArea.id);
}
}
}
--
Gitblit v1.8.0