From 7417f7dcc6312692a74ae0ff4efaee6152db9df3 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期三, 22 五月 2019 14:29:41 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
Core/NetworkPackage/DTCFile/ServerPack/H06_PlayerVsNPC/DTC0608_tagNPCDie.cs | 1 +
Fight/Actor/HeroBehaviour.cs | 13 ++++---------
Fight/Stage/MapEditor/Game/ClientSceneManager.cs | 2 +-
3 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/Core/NetworkPackage/DTCFile/ServerPack/H06_PlayerVsNPC/DTC0608_tagNPCDie.cs b/Core/NetworkPackage/DTCFile/ServerPack/H06_PlayerVsNPC/DTC0608_tagNPCDie.cs
index e42f64d..3a522c6 100644
--- a/Core/NetworkPackage/DTCFile/ServerPack/H06_PlayerVsNPC/DTC0608_tagNPCDie.cs
+++ b/Core/NetworkPackage/DTCFile/ServerPack/H06_PlayerVsNPC/DTC0608_tagNPCDie.cs
@@ -21,6 +21,7 @@
if (PersonalEnemy.m_SBindCDict.ContainsKey(vNetData.ObjID))
{
_actor = GAMgr.Instance.GetBySID(PersonalEnemy.m_SBindCDict[vNetData.ObjID]);
+ ClientSceneManager.Instance.lastDeadPos = _actor.Pos;
GAMgr.Instance.ServerDie(_actor.ServerInstID);
_actor.Die();
GAMgr.Instance.DoDelayDie(_actor as GActorFight);
diff --git a/Fight/Actor/HeroBehaviour.cs b/Fight/Actor/HeroBehaviour.cs
index ad0dc9f..7301552 100644
--- a/Fight/Actor/HeroBehaviour.cs
+++ b/Fight/Actor/HeroBehaviour.cs
@@ -339,16 +339,9 @@
return;
}
- if (!PreFightMission.Instance.IsFinished() && skill.id == 190)
+ if (skill == null || GA_Hero.s_MapSwitching)
{
-
- }
- else
- {
- if (skill == null || GA_Hero.s_MapSwitching)
- {
- return;
- }
+ return;
}
if (m_Hero.ActorInfo.serverDie)
@@ -949,6 +942,8 @@
{
ClientSceneManager.Instance.NpcDead(_clientNpc.belongEventID, _clientNpc, _clientNpc.NpcConfig.NPCID);
}
+
+ ClientSceneManager.Instance.lastDeadPos = _clientNpc.Pos;
}
// 鍓嶆湡鎴樻枟鍙彂閫佺煶澶翠汉鐨�
//if (1000 == _target.NpcConfig.NPCID)
diff --git a/Fight/Stage/MapEditor/Game/ClientSceneManager.cs b/Fight/Stage/MapEditor/Game/ClientSceneManager.cs
index c0d5f8f..7570c01 100644
--- a/Fight/Stage/MapEditor/Game/ClientSceneManager.cs
+++ b/Fight/Stage/MapEditor/Game/ClientSceneManager.cs
@@ -90,7 +90,7 @@
}
}
- public Vector3 lastDeadPos { get; private set; }
+ public Vector3 lastDeadPos { get; set; }
public void NpcDead(int eventID, GActor npc, int npcID)
{
--
Gitblit v1.8.0