From a9b4bb435fc0eda83fa5338f40ff854bd9844361 Mon Sep 17 00:00:00 2001
From: lwb <q3213421wrwqr>
Date: 星期一, 22 二月 2021 17:53:33 +0800
Subject: [PATCH] Merge branch 'master' into ILRuntime
---
System/MainWin/MainWinTopGrid.cs | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/System/MainWin/MainWinTopGrid.cs b/System/MainWin/MainWinTopGrid.cs
index 9f51c8e..2452dca 100644
--- a/System/MainWin/MainWinTopGrid.cs
+++ b/System/MainWin/MainWinTopGrid.cs
@@ -13,7 +13,9 @@
public class MainWinTopGrid : MonoBehaviour
{
[SerializeField] bool m_AlwayShow;
+ // 閰嶇疆閫昏緫鍙傝�� IsOpen 鍑芥暟
[SerializeField] int m_FunctionId;
+ [SerializeField] int m_ActivityType = 0; //娲诲姩妯℃澘
[SerializeField] int m_OpenServerActivityType = 100;
[SerializeField] bool m_IsAnyOpenServerActivity = false;
[SerializeField] Operation m_OperationActivityType = Operation.max;
@@ -81,15 +83,16 @@
return FuncOpen.Instance.IsFuncOpen(m_FunctionId);
}
+ //榛樿100涓轰笉鍒ゅ畾
if (m_OpenServerActivityType != 100)
{
- return OpenServerActivityCenter.Instance.IsActivityOpen(m_OpenServerActivityType);
+ return OpenServerActivityCenter.Instance.IsActivityOpen(m_OpenServerActivityType, m_ActivityType);
}
if (m_IsAnyOpenServerActivity)
{
var functionOrder = 0;
- return OpenServerActivityCenter.Instance.IsAnyActivityOpen(out functionOrder);
+ return OpenServerActivityCenter.Instance.IsAnyActivityOpen(out functionOrder, m_ActivityType);
}
if (m_OperationActivityType != Operation.max)
--
Gitblit v1.8.0