Merge remote-tracking branch 'origin/dev_memory' into dev_cyp

This commit is contained in:
Caiyanpeng committed 2021-11-16 18:41:22 +08:00
commit e3e2f5200b
7 files changed
+31 -9

No files matched your search

@@ -142,7 +142,7 @@ public class DeviceView : MonoBehaviour
}));
UIManager.AddEvent(connectionButton.gameObject, EventTriggerType.PointerClick, new UnityEngine.Events.UnityAction<BaseEventData>(e => {
if (!mPairButton.activeSelf)
if (!connectionPanel.activeSelf)
{
return;
}