From 315013580696d521db39fb15d5b7b9d46f0cc194 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期二, 07 一月 2025 16:25:03 +0800
Subject: [PATCH] Merge branch 'tqxbqy' of http://mobile.secondworld.net.cn:10010/r/snxxz_scripts into tqxbqy
---
LogicProject/System/MergeServerActivity/MergeServerTurntableWin.cs | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/LogicProject/System/MergeServerActivity/MergeServerTurntableWin.cs b/LogicProject/System/MergeServerActivity/MergeServerTurntableWin.cs
index 6024927..ca8bf94 100644
--- a/LogicProject/System/MergeServerActivity/MergeServerTurntableWin.cs
+++ b/LogicProject/System/MergeServerActivity/MergeServerTurntableWin.cs
@@ -87,6 +87,7 @@
protected override void OnPreOpen()
{
+ ItemLogicUtility.Instance.hidePickItem = true;
model.OnOperationTimeUpdateEvent += operationTimeUpdateEvent;
model.PlayerTurntableEvent += OnPlayerTurntableEvent;
WindowCenter.Instance.windowAfterCloseEvent += WindowAfterCloseEvent;
@@ -102,6 +103,7 @@
protected override void OnPreClose()
{
+ ItemLogicUtility.Instance.hidePickItem = false;
model.OnOperationTimeUpdateEvent -= operationTimeUpdateEvent;
model.PlayerTurntableEvent -= OnPlayerTurntableEvent;
WindowCenter.Instance.windowAfterCloseEvent -= WindowAfterCloseEvent;
--
Gitblit v1.8.0