From eab3adeae727d8144d33e9d160ddc3661112f401 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期二, 19 二月 2019 10:44:58 +0800
Subject: [PATCH] 3014 【BUG】【1.6】跨服pk，打完机器人没回到原地图
---
Fight/Stage/StageLoad.cs | 2 +-
System/Dungeon/DungeonFightWin.cs | 7 ++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/Fight/Stage/StageLoad.cs b/Fight/Stage/StageLoad.cs
index 6be7dca..d2b0972 100644
--- a/Fight/Stage/StageLoad.cs
+++ b/Fight/Stage/StageLoad.cs
@@ -166,7 +166,7 @@
{
if (ok)
{
- if (currentCommand != null && !currentCommand.serverFlag0109)
+ if (currentCommand != null && !currentCommand.isClientLoadMap && !currentCommand.serverFlag0109)
{
currentCommand.serverFlag0109 = true;
}
diff --git a/System/Dungeon/DungeonFightWin.cs b/System/Dungeon/DungeonFightWin.cs
index 66cd949..5f115d0 100644
--- a/System/Dungeon/DungeonFightWin.cs
+++ b/System/Dungeon/DungeonFightWin.cs
@@ -325,7 +325,12 @@
private void ProcessDungeonEndCoolDown()
{
- var dataMapId = model.GetDataMapIdByMapId(PlayerDatas.Instance.baseData.MapID);
+ if (ClientDungeonStageUtility.isClientDungeon)
+ {
+ return;
+ }
+
+ var dataMapId = MapUtility.GetDataMapId(PlayerDatas.Instance.baseData.MapID);
switch (dataMapId)
{
case RuneTowerModel.RUNETOWER_MAPID:
--
Gitblit v1.8.0