From 155ce0bb222a5097ba4cd900fe4ba587bbeff0a4 Mon Sep 17 00:00:00 2001 From: PopSlime Date: Thu, 23 Nov 2023 13:46:00 +0800 Subject: [PATCH] Remove legacy call helper. --- Assets/Cryville/Common/Unity/CallHelper.cs | 26 ------------------- .../Cryville/Common/Unity/CallHelper.cs.meta | 12 --------- .../Crtr/Config/UI/InputConfigPanel.cs | 7 +++-- 3 files changed, 3 insertions(+), 42 deletions(-) delete mode 100644 Assets/Cryville/Common/Unity/CallHelper.cs delete mode 100644 Assets/Cryville/Common/Unity/CallHelper.cs.meta diff --git a/Assets/Cryville/Common/Unity/CallHelper.cs b/Assets/Cryville/Common/Unity/CallHelper.cs deleted file mode 100644 index 33bf271..0000000 --- a/Assets/Cryville/Common/Unity/CallHelper.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System; -using UnityEngine; - -namespace Cryville.Common.Unity { - static class CallHelper { - public static bool HasFlag(this Enum obj, Enum flag) { - ulong num = Convert.ToUInt64(flag); - ulong num2 = Convert.ToUInt64(obj); - return (num2 & num) == num; - } - - public static void Purge(Transform obj) { - foreach (Transform i in obj) - GameObject.Destroy(i.gameObject); - } - - /*public static void DownloadAndUnzip(string url, FileInfo file) { - using (DownloadDialog d = new DownloadDialog()) { - d.Download(url, file); - } - using (ZipFile z = new ZipFile(file.FullName)) { - z.ExtractAll(file.DirectoryName, ExtractExistingFileAction.OverwriteSilently); - } - }*/ - } -} diff --git a/Assets/Cryville/Common/Unity/CallHelper.cs.meta b/Assets/Cryville/Common/Unity/CallHelper.cs.meta deleted file mode 100644 index 9c2b67f..0000000 --- a/Assets/Cryville/Common/Unity/CallHelper.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 98b3d4b7cc1ce054598780159356da35 -timeCreated: 1608801352 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Cryville/Crtr/Config/UI/InputConfigPanel.cs b/Assets/Cryville/Crtr/Config/UI/InputConfigPanel.cs index d308112..ed311a0 100644 --- a/Assets/Cryville/Crtr/Config/UI/InputConfigPanel.cs +++ b/Assets/Cryville/Crtr/Config/UI/InputConfigPanel.cs @@ -1,5 +1,4 @@ using Cryville.Common; -using Cryville.Common.Unity; using Cryville.Crtr.Ruleset; using Cryville.Input; using System; @@ -44,7 +43,7 @@ namespace Cryville.Crtr.Config.UI { else _targetPDim = null; _targetNotNull = def.notnull; m_inputDialog.SetActive(true); - CallHelper.Purge(m_deviceList); + foreach (Transform i in m_deviceList) Destroy(i.gameObject); _consumer.EnumerateEvents(ev => { }); _recvsrcs.Clear(); _applicableEntries = 1; @@ -85,12 +84,12 @@ namespace Cryville.Crtr.Config.UI { } public void OnConfigEnable() { - CallHelper.Purge(m_entryList); + foreach (Transform i in m_entryList) Destroy(i.gameObject); _entries.Clear(); _consumer = new SimpleInputConsumer(Game.InputManager); _consumer.Activate(); foreach (var i in m_configScene.ruleset.Root.inputs) { - var e = GameObject.Instantiate(m_prefabInputConfigEntry, m_entryList.transform).GetComponent(); + var e = Instantiate(m_prefabInputConfigEntry, m_entryList.transform).GetComponent(); _entries.Add(i.Key, e); e.SetKey(this, i.Key); OnProxyChanged(this, proxy[i.Key]);