From b5651b96bb1bfd53341af7fbe4cb46db54dee58c Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期四, 27 十二月 2018 14:40:47 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/MainInterfaceWin.cs | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/System/MainInterfacePanel/MainInterfaceWin.cs b/System/MainInterfacePanel/MainInterfaceWin.cs
index 2a94950..f8eb073 100644
--- a/System/MainInterfacePanel/MainInterfaceWin.cs
+++ b/System/MainInterfacePanel/MainInterfaceWin.cs
@@ -1142,7 +1142,8 @@
private void IsShowTaskPanel()//鏄惁鏄剧ず浠诲姟闈㈡澘
{
var inDungeon = IsDungeon();
- if (inDungeon || fairyGrabBossModel.grabBossHintOpen)
+ var IsCrossServerOneVsOne = GameNetSystem.Instance.crossServerConnected_Loigc;
+ if (inDungeon || fairyGrabBossModel.grabBossHintOpen || IsCrossServerOneVsOne)
{
m_TaskAndTeamTip.SetActive(false);
m_TaskSwithButton.gameObject.SetActive(false);
@@ -1269,7 +1270,7 @@
private void IsCrossServerOneVsOne()
{
- if (CrossServerRewardModel.IsCrossServerOneVsOne())//鏄惁鍐嶈法鏈嶅壇鏈腑
+ if (GameNetSystem.Instance.crossServerConnected_Loigc)//鏄惁鍐嶈法鏈嶅壇鏈腑
{
if (!WindowCenter.Instance.IsOpen("FightingPKWin"))
{
@@ -1283,8 +1284,6 @@
m_TaskSwithButton.gameObject.SetActive(false);
m_InGamePusher.gameObject.SetActive(false);
m_RedBag.gameObject.SetActive(false);
- m_MailObj.SetActive(false);
- m_TaskAndTeamTip.SetActive(false);
if (Vector3.Distance(m_CastSkillTip.localPosition, m_position2_S.localPosition) <= 1)//鎶�鑳介潰鏉挎敹璧风姸鎬�
{
ShowCastSkill();//鏄剧ず鎶�鑳界粍,闅愯棌鎸夐挳缁�(寮哄埗鍒囨崲)
@@ -1300,8 +1299,6 @@
m_TaskSwithButton.gameObject.SetActive(true);
m_InGamePusher.gameObject.SetActive(true);
OnRedBagGet();
- m_MailObj.SetActive(true);
- m_TaskAndTeamTip.SetActive(true);
}
}
--
Gitblit v1.8.0