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
---
Fight/MapTransferUtility.cs | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Fight/MapTransferUtility.cs b/Fight/MapTransferUtility.cs
index bec6394..1352753 100644
--- a/Fight/MapTransferUtility.cs
+++ b/Fight/MapTransferUtility.cs
@@ -80,7 +80,7 @@
if (mapID != PlayerDatas.Instance.baseData.MapID)
{
- if (_model.IsMapUnLocked(mapID) == false)
+ if (_model.IsMapUnlocked(mapID) == false)
{
SysNotifyMgr.Instance.ShowTip("Map_Delivery");
return;
@@ -408,7 +408,7 @@
}
// 鍒ゆ柇鍦板浘鏄惁瑙ｉ攣
- if (_model.IsMapUnLocked(_npcLocation.mapId) == false)
+ if (_model.IsMapUnlocked(_npcLocation.mapId) == false)
{
SysNotifyMgr.Instance.ShowTip("Map_Delivery");
return;
@@ -642,7 +642,7 @@
return;
}
- if (_model.IsMapUnLocked(npcLocation.mapId) == false)
+ if (_model.IsMapUnlocked(npcLocation.mapId) == false)
{
SysNotifyMgr.Instance.ShowTip("Map_Delivery");
return;
@@ -722,7 +722,7 @@
MapModel _model = ModelCenter.Instance.GetModel<MapModel>();
- if (_model.IsMapUnLocked(mapID) == false)
+ if (_model.IsMapUnlocked(mapID) == false)
{
SysNotifyMgr.Instance.ShowTip("Map_Delivery");
return;
@@ -747,7 +747,7 @@
public static bool Send_WorldTransfer(int mapId, Vector3 position, MapTransferType type, byte lineID = 255, int _npcId = 0)
{
- if (!AssetSource.sceneFromEditor && VersionConfig.Get().assetAccess != InstalledAsset.IngoreDownLoad && !AssetVersionUtility.unPriorAssetDownLoadDone)
+ if (!AssetSource.sceneFromEditor && !AssetVersionUtility.IsUnpriorAssetDownLoadOk())
{
var mapResConfig = DTCA127_tagMCStartChangeMap.GetMapResourcesConfig(mapId, 0);
var assetVersion = AssetVersionUtility.GetAssetVersion(StringUtility.Contact("maps/", mapResConfig.MapResources.ToLower()));
--
Gitblit v1.8.0