From e59cd0b6b7f2a9e9a08d3ea88e89b8d023a86eb1 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期五, 04 一月 2019 15:12:03 +0800
Subject: [PATCH] 2821 【BUG】【1.4.100】跨服pk，没有屏蔽仙盟红包
---
System/MainInterfacePanel/MainInterfaceWin.cs | 25 ++++++++++++-------------
1 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/System/MainInterfacePanel/MainInterfaceWin.cs b/System/MainInterfacePanel/MainInterfaceWin.cs
index 82c5b2f..1cb3c73 100644
--- a/System/MainInterfacePanel/MainInterfaceWin.cs
+++ b/System/MainInterfacePanel/MainInterfaceWin.cs
@@ -456,7 +456,9 @@
{
m_RedpackGetSfx.StopImediatly();
}
- if (OSEnvelopeModel.CanGetEnvelope())
+ var requireRedpack = (OSEnvelopeModel.CanGetEnvelope()
+ || redPacket.IsRedBagGetBool) && PlayerDatas.Instance.baseData.ExAttr5 != 1;
+ if (requireRedpack)
{
m_RedBag.gameObject.SetActive(true);
if (!m_RedpackGetSfx.IsPlaying)
@@ -466,18 +468,7 @@
}
else
{
- if (redPacket.IsRedBagGetBool)
- {
- m_RedBag.gameObject.SetActive(true);
- if (!m_RedpackGetSfx.IsPlaying)
- {
- m_RedpackGetSfx.Play();
- }
- }
- else
- {
- m_RedBag.gameObject.SetActive(false);
- }
+ m_RedBag.gameObject.SetActive(false);
}
CheckSendRedpackBtn();
}
@@ -1014,6 +1005,10 @@
{
StartCoroutine(featureNoticeModel.WhetherToPlayTheBox());//鍔熻兘棰勫憡
}
+ if (_tCDBPlayerRefresh == PlayerDataRefresh.ExAttr5)//鍒ゆ柇鏄惁鍐嶈法鏈�
+ {
+ IsCrossServerOneVsOne();
+ }
}
void OnArriveCollectNPC(uint sid, int npcID)
@@ -1315,6 +1310,10 @@
m_FunctionForecastTip.gameObject.SetActive(true);
m_TaskSwithButton.gameObject.SetActive(true);
m_InGamePusher.gameObject.SetActive(true);
+ if (WindowCenter.Instance.IsOpen<FightingPKWin>())
+ {
+ WindowCenter.Instance.CloseImmediately<FightingPKWin>();
+ }
OnRedBagGet();
}
--
Gitblit v1.8.0