From bdd3a28a5495537e1d150d08b8065d2a959d4548 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期五, 28 十二月 2018 14:08:06 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/CrossServerOneVsOne/CrossServerRewardModel.cs | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/System/CrossServerOneVsOne/CrossServerRewardModel.cs b/System/CrossServerOneVsOne/CrossServerRewardModel.cs
index 13fc4a7..c31bdef 100644
--- a/System/CrossServerOneVsOne/CrossServerRewardModel.cs
+++ b/System/CrossServerOneVsOne/CrossServerRewardModel.cs
@@ -128,6 +128,10 @@
{
if (GameNetSystem.Instance.crossServerConnected_Loigc)//鍓湰缁撶畻鐣岄潰
{
+ if (WindowCenter.Instance.IsOpen<CrossServerOneVsOneRoundWin>())
+ {
+ WindowCenter.Instance.CloseImmediately<CrossServerOneVsOneRoundWin>();
+ }
WindowCenter.Instance.Open<CrossServerSettlementWin>();
}
}
@@ -345,7 +349,6 @@
{
var match = new CC104_tagCMExitCrossRealm();
GameNetSystem.Instance.SendToCrossServer(match);
- SetPkType();
}
private static int pkDanLvNow = 0;
@@ -405,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);
+ }
+
}
}
--
Gitblit v1.8.0