From b5d06e488541ffd992b2ce1d7b24bbb8b7250d9b Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期五, 28 十二月 2018 14:23:40 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/CrossServerOneVsOne/CrossServerSettlementWin.cs | 1 +
System/CrossServerOneVsOne/FightingPKWin.cs | 4 ++--
Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0418_tagObjInfoRefresh.cs | 4 ++--
Core/NetworkPackage/DTCFile/ServerPack/H06_PlayerVsNPC/DTC0614_tagUseSkillPos.cs | 7 +++++++
Fight/GameActor/GA_Hero.cs | 2 +-
System/CrossServerOneVsOne/CrossServerRewardModel.cs | 13 ++++++++++---
6 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0418_tagObjInfoRefresh.cs b/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0418_tagObjInfoRefresh.cs
index 55afa45..2099b53 100644
--- a/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0418_tagObjInfoRefresh.cs
+++ b/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0418_tagObjInfoRefresh.cs
@@ -61,9 +61,9 @@
_actor.ActorInfo.ResetHp(-1, -1, (int)vNetData.Value);
}
- if(_actor is GActorNpcFight)
+ if (_actor is GActorNpcFight)
{
- if((PlayerDataRefresh)vNetData.RefreshType == PlayerDataRefresh.Speed)
+ if ((PlayerDataRefresh)vNetData.RefreshType == PlayerDataRefresh.Speed)
{
_actor.ActorInfo.moveSpeed = 500f / vNetData.Value;
}
diff --git a/Core/NetworkPackage/DTCFile/ServerPack/H06_PlayerVsNPC/DTC0614_tagUseSkillPos.cs b/Core/NetworkPackage/DTCFile/ServerPack/H06_PlayerVsNPC/DTC0614_tagUseSkillPos.cs
index ff875d9..ead3fe2 100644
--- a/Core/NetworkPackage/DTCFile/ServerPack/H06_PlayerVsNPC/DTC0614_tagUseSkillPos.cs
+++ b/Core/NetworkPackage/DTCFile/ServerPack/H06_PlayerVsNPC/DTC0614_tagUseSkillPos.cs
@@ -465,6 +465,13 @@
return;
}
#endif
+
+ // 璺ㄦ湇绔炴妧鍦轰笉妫�娴嬪弽鍑婚�昏緫
+ if(PlayerDatas.Instance.baseData.MapID == 31340)
+ {
+ return;
+ }
+
// 鏄惁鍙嶅嚮
if (_sTarget.ObjID == PlayerDatas.Instance.PlayerId)
{
diff --git a/Fight/GameActor/GA_Hero.cs b/Fight/GameActor/GA_Hero.cs
index 1577eef..06292ab 100644
--- a/Fight/GameActor/GA_Hero.cs
+++ b/Fight/GameActor/GA_Hero.cs
@@ -328,7 +328,7 @@
#if UNITY_EDITOR
&& RuntimeLogUtility.s_forceAutoFight
#endif
- )
+ && PlayerDatas.Instance.baseData.MapID != 31340)
{
if (!aiHandler.IsAuto() && !BossShowModel.Instance.BossShowing)
{
diff --git a/System/CrossServerOneVsOne/CrossServerRewardModel.cs b/System/CrossServerOneVsOne/CrossServerRewardModel.cs
index 674eaf0..c31bdef 100644
--- a/System/CrossServerOneVsOne/CrossServerRewardModel.cs
+++ b/System/CrossServerOneVsOne/CrossServerRewardModel.cs
@@ -349,7 +349,6 @@
{
var match = new CC104_tagCMExitCrossRealm();
GameNetSystem.Instance.SendToCrossServer(match);
- SetPkType();
}
private static int pkDanLvNow = 0;
@@ -409,9 +408,17 @@
set { m_PkType = value; }
}
- private static void SetPkType()
+ public static void SetPkType()
{
- DTCA202_tagMCAttackMode.Send_SwitchAttackMode((E_AttackMode)m_PkType);
+ if (m_PkType != 1)
+ {
+ DTCA202_tagMCAttackMode.Send_SwitchAttackMode((E_AttackMode)m_PkType);
+ }
+ else
+ {
+ DTCA202_tagMCAttackMode.Send_SwitchAttackMode((E_AttackMode)0);
+ }
+
}
}
diff --git a/System/CrossServerOneVsOne/CrossServerSettlementWin.cs b/System/CrossServerOneVsOne/CrossServerSettlementWin.cs
index 5eae60b..2bf9011 100644
--- a/System/CrossServerOneVsOne/CrossServerSettlementWin.cs
+++ b/System/CrossServerOneVsOne/CrossServerSettlementWin.cs
@@ -93,6 +93,7 @@
protected override void OnPreClose()
{
+ CrossServerRewardModel.SetPkType();
}
protected override void OnAfterClose()
diff --git a/System/CrossServerOneVsOne/FightingPKWin.cs b/System/CrossServerOneVsOne/FightingPKWin.cs
index 31c97f4..932f30d 100644
--- a/System/CrossServerOneVsOne/FightingPKWin.cs
+++ b/System/CrossServerOneVsOne/FightingPKWin.cs
@@ -142,8 +142,8 @@
}
else
{
- var surplus = dungeonEndTime - DateTime.Now;
- m_CountdownText.text = ((int)surplus.TotalSeconds).ToString();
+ var surplus = dungeonEndTime - DateTime.Now;
+ m_CountdownText.text = (Mathf.CeilToInt((float)surplus.TotalSeconds)).ToString();
}
}
--
Gitblit v1.8.0