From c90cdd78c2bf8bcfa25cec7432a5876f6085ecfb Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期五, 01 二月 2019 11:18:37 +0800
Subject: [PATCH] 3335 切换地图逻辑重构。
---
Core/GameEngine/Model/Player/PlayerDatas.cs | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/Core/GameEngine/Model/Player/PlayerDatas.cs b/Core/GameEngine/Model/Player/PlayerDatas.cs
index 537d891..2089d99 100644
--- a/Core/GameEngine/Model/Player/PlayerDatas.cs
+++ b/Core/GameEngine/Model/Player/PlayerDatas.cs
@@ -111,7 +111,7 @@
{
if (CrossServerUtility.IsCrossServer())
{
- if (vNetData.socketType == GameNetSystem.SocketType.Main)
+ if (vNetData.socketType == ServerType.Main)
{
if (vNetData.RefreshType[i].RefreshType == (int)PlayerDataRefresh.HP
|| vNetData.RefreshType[i].RefreshType == (int)PlayerDataRefresh.MaxHP
@@ -186,7 +186,7 @@
recordSp = baseData.treasurePotentialSp;
}
- RefreshProperty(vNetData.socketType == GameNetSystem.SocketType.Main, (PlayerDataRefresh)vNetData.RefreshType, vNetData.Value);
+ RefreshProperty(vNetData.socketType == ServerType.Main, (PlayerDataRefresh)vNetData.RefreshType, vNetData.Value);
if (recordSp > 0 && spNewGetEvent != null)
{
@@ -593,8 +593,6 @@
if (GameNetSystem.Instance.crossServerConnected_Loigc)
{
GameNetSystem.Instance.crossServerConnected_Loigc = false;
- LoadingWin.targetMapResId = 1;
- WindowCenter.Instance.Open<LoadingWin>();
GameNetSystem.Instance.DisconnectCrossServer();
if (hero != null)
@@ -607,9 +605,17 @@
GameNetSystem.Instance.SendInfo(sendInfo);
baseData.MapID = baseData.mainServerMapIdRecord;
baseData.dungeonLineId = 0;
- DTCA127_tagMCStartChangeMap.LineID = 0;
ModelCenter.Instance.GetModel<DungeonModel>().ResetBufData();
- StageManager.Instance.Load<DungeonStage>(baseData.MapID, GameNetSystem.SocketType.CrossSever, true);
+
+ StageLoad.Instance.PushSceneLoadCommand(new StageLoad.StageLoadCommand()
+ {
+ toMapId = baseData.MapID,
+ toLineId = 0,
+ needEmpty = true,
+ needLoadResource = true,
+ serverType = ServerType.CrossSever,
+ isClientLoadMap = true
+ });
}
}
break;
--
Gitblit v1.8.0