snxxz_scripts.git

			@@ -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;
			@@ -278,14 +278,16 @@
			{
			//Debug.LogFormat(" \|-- 这是一只活动boss");
			// 取得分线
			if (GeneralConfig.Instance.fairyGrabBossMapLines != null
			&& GeneralConfig.Instance.fairyGrabBossMapLines.TryGetValue(_npcLocation.mapId, out _lineID))
			if (GeneralConfig.Instance.fairyGrabBossMapLines != null)
			{
			_lineID = GeneralConfig.Instance.fairyGrabBossMapLines.ContainsKey(_npcLocation.mapId) ?
			GeneralConfig.Instance.fairyGrabBossMapLines[_npcLocation.mapId] : 0;
			// 如果当前处于不同的分线, 则下面的处理中,地图ID相同也切线
			if (_lineID != PlayerDatas.Instance.baseData.FBID)
			{
			//Debug.LogFormat(" \|-- 不在同一分线: {0} != {1}", _lineID, PlayerDatas.Instance.baseData.FBID);
			_forceTransfer = true;
			npcID = 0;
			}
			}
			else
			@@ -293,8 +295,6 @@
			Debug.LogErrorFormat("对应的地图ID: {0} 在配置中没有对应的分线id", _npcLocation.mapId);
			}
			}

			npcID = 0;
			}

			// 如果不是处于相同地图, 则切图
			@@ -342,7 +342,8 @@
			&& Time.realtimeSinceStartup - lastMoveToWorldBossTime < 60)
			&& PlayerDatas.Instance.baseData.FBID == 0)
			\|\| BossFakeLineUtility.Instance.showFakeLine
			\|\| _fairyBossModel != null)
			\|\| (_fairyBossModel.bosses != null
			&& _fairyBossModel.bosses.Contains(npcID)))
			{
			//Debug.LogFormat(" \|-- 非想去的boss为60秒内行为产生且为同一只boss, {0}, {1}", BossFakeLineUtility.Instance.showFakeLine,
			//PlayerDatas.Instance.baseData.FBID);
			@@ -407,7 +408,7 @@
			}

			// 判断地图是否解锁
			if (_model.IsMapUnLocked(_npcLocation.mapId) == false)
			if (_model.IsMapUnlocked(_npcLocation.mapId) == false)
			{
			SysNotifyMgr.Instance.ShowTip("Map_Delivery");
			return;
			@@ -641,7 +642,7 @@
			return;
			}

			if (_model.IsMapUnLocked(npcLocation.mapId) == false)
			if (_model.IsMapUnlocked(npcLocation.mapId) == false)
			{
			SysNotifyMgr.Instance.ShowTip("Map_Delivery");
			return;
			@@ -721,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;
			@@ -746,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()));
			@@ -785,7 +786,7 @@
			// return;
			//}

			//NPCConfig _npcConfig = ConfigManager.Instance.GetTemplate<NPCConfig>(NpcID);
			//NPCConfig _npcConfig = Config.Instance.Get<NPCConfig>(NpcID);
			//if (_npcConfig == null)
			//{
			// return;