From 92a49294f766883008658f69e04464ee301c7c57 Mon Sep 17 00:00:00 2001 From: PopSlime Date: Sun, 30 Oct 2022 18:18:21 +0800 Subject: [PATCH] Code cleanup. --- Assets/Cryville/Common/Network/HttpClient.cs | 2 +- Assets/Cryville/Common/Pdt/PdtEvaluatorBase.cs | 1 - Assets/Cryville/Common/Plist/PlistConvert.cs | 1 - Assets/Cryville/Common/ReflectionHelper.cs | 2 +- Assets/Cryville/Common/Unity/CallHelper.cs | 4 ++-- Assets/Cryville/Common/Unity/Input/NativeMethods.cs | 3 +-- Assets/Cryville/Crtr/Browsing/LegacyResourceManager.cs | 6 +++--- Assets/Cryville/Crtr/Browsing/PropertyCategoryPanel.cs | 3 +-- Assets/Cryville/Crtr/Browsing/ResourceBrowserMaster.cs | 1 - Assets/Cryville/Crtr/Chart.cs | 6 +++--- Assets/Cryville/Crtr/Event/EventBatch.cs | 1 - Assets/Cryville/Crtr/InputProxy.cs | 1 - Assets/Cryville/Crtr/PdtEvaluator.cs | 1 - Assets/Cryville/Crtr/Ruleset.cs | 1 - Assets/Cryville/Crtr/SkinInterpreter.cs | 1 - Assets/Cryville/Crtr/TrackHandler.cs | 1 - 16 files changed, 12 insertions(+), 23 deletions(-) diff --git a/Assets/Cryville/Common/Network/HttpClient.cs b/Assets/Cryville/Common/Network/HttpClient.cs index 92cdbfb..dc18611 100644 --- a/Assets/Cryville/Common/Network/HttpClient.cs +++ b/Assets/Cryville/Common/Network/HttpClient.cs @@ -1,3 +1,4 @@ +using Microsoft.Win32; using System; using System.Collections.Generic; using System.Globalization; @@ -5,7 +6,6 @@ using System.IO; using System.Linq; using System.Net.Sockets; using System.Text; -using Microsoft.Win32; namespace Cryville.Common.Network { public class HttpClient { diff --git a/Assets/Cryville/Common/Pdt/PdtEvaluatorBase.cs b/Assets/Cryville/Common/Pdt/PdtEvaluatorBase.cs index 124ef1d..0aac98c 100644 --- a/Assets/Cryville/Common/Pdt/PdtEvaluatorBase.cs +++ b/Assets/Cryville/Common/Pdt/PdtEvaluatorBase.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using static Cryville.Crtr.Cocos2dFrames; namespace Cryville.Common.Pdt { /// diff --git a/Assets/Cryville/Common/Plist/PlistConvert.cs b/Assets/Cryville/Common/Plist/PlistConvert.cs index 2a082c4..c0566c2 100644 --- a/Assets/Cryville/Common/Plist/PlistConvert.cs +++ b/Assets/Cryville/Common/Plist/PlistConvert.cs @@ -1,7 +1,6 @@ using System; using System.Collections; using System.Collections.Generic; -using System.ComponentModel; using System.Reflection; namespace Cryville.Common.Plist { diff --git a/Assets/Cryville/Common/ReflectionHelper.cs b/Assets/Cryville/Common/ReflectionHelper.cs index 4c698c9..cfc2741 100644 --- a/Assets/Cryville/Common/ReflectionHelper.cs +++ b/Assets/Cryville/Common/ReflectionHelper.cs @@ -1,7 +1,7 @@ using System; -using System.Reflection; using System.Collections.Generic; using System.Linq; +using System.Reflection; namespace Cryville.Common { /// diff --git a/Assets/Cryville/Common/Unity/CallHelper.cs b/Assets/Cryville/Common/Unity/CallHelper.cs index 38b0eff..4d85c87 100644 --- a/Assets/Cryville/Common/Unity/CallHelper.cs +++ b/Assets/Cryville/Common/Unity/CallHelper.cs @@ -1,5 +1,5 @@ -using UnityEngine; -using System; +using System; +using UnityEngine; namespace Cryville.Common.Unity { static class CallHelper { diff --git a/Assets/Cryville/Common/Unity/Input/NativeMethods.cs b/Assets/Cryville/Common/Unity/Input/NativeMethods.cs index 38ee4a3..67ba374 100644 --- a/Assets/Cryville/Common/Unity/Input/NativeMethods.cs +++ b/Assets/Cryville/Common/Unity/Input/NativeMethods.cs @@ -1,5 +1,4 @@ -using UnityEngine; -using System; +using System; using System.Runtime.InteropServices; using System.Text; diff --git a/Assets/Cryville/Crtr/Browsing/LegacyResourceManager.cs b/Assets/Cryville/Crtr/Browsing/LegacyResourceManager.cs index 42eccd2..64fbf34 100644 --- a/Assets/Cryville/Crtr/Browsing/LegacyResourceManager.cs +++ b/Assets/Cryville/Crtr/Browsing/LegacyResourceManager.cs @@ -1,11 +1,11 @@ using Cryville.Common; using Cryville.Common.Unity; -using System; -using System.IO; -using UnityEngine; using Newtonsoft.Json; +using System; using System.Collections.Generic; +using System.IO; using System.Linq; +using UnityEngine; namespace Cryville.Crtr.Browsing { internal class LegacyResourceManager : IResourceManager { diff --git a/Assets/Cryville/Crtr/Browsing/PropertyCategoryPanel.cs b/Assets/Cryville/Crtr/Browsing/PropertyCategoryPanel.cs index a152851..9daea16 100644 --- a/Assets/Cryville/Crtr/Browsing/PropertyCategoryPanel.cs +++ b/Assets/Cryville/Crtr/Browsing/PropertyCategoryPanel.cs @@ -1,5 +1,4 @@ -using Cryville.Common.Unity.UI; -using System.Collections.Generic; +using System.Collections.Generic; using System.Reflection; using UnityEngine; using UnityEngine.UI; diff --git a/Assets/Cryville/Crtr/Browsing/ResourceBrowserMaster.cs b/Assets/Cryville/Crtr/Browsing/ResourceBrowserMaster.cs index 07cc973..e720150 100644 --- a/Assets/Cryville/Crtr/Browsing/ResourceBrowserMaster.cs +++ b/Assets/Cryville/Crtr/Browsing/ResourceBrowserMaster.cs @@ -1,6 +1,5 @@ using Cryville.Common; using Cryville.Common.Unity.UI; -using System; using System.Collections.Generic; using UnityEngine; using UnityEngine.SceneManagement; diff --git a/Assets/Cryville/Crtr/Chart.cs b/Assets/Cryville/Crtr/Chart.cs index e8fea3c..8031bcc 100644 --- a/Assets/Cryville/Crtr/Chart.cs +++ b/Assets/Cryville/Crtr/Chart.cs @@ -280,7 +280,7 @@ namespace Cryville.Crtr { if (m.Groups[3].Success) { ushort id = ushort.Parse(m.Groups[3].Value); Vec1 time = m.Groups[5].Success ? new Vec1(m.Groups[5].Value) : null; - byte? trs = m.Groups[7].Success ? byte.Parse(m.Groups[7].Value) : (byte?)null; + byte? trs = m.Groups[7].Success ? byte.Parse(m.Groups[7].Value) : null; Vec1 rate = m.Groups[9].Success ? new Vec1(m.Groups[9].Value) : null; Vector value = m.Groups[11].Success ? Vector.Construct(registry.Type, m.Groups[11].Value) : null; RelativeNode = new MotionNode() { @@ -333,9 +333,9 @@ namespace Cryville.Crtr { [JsonIgnore] public MotionNode RelativeNode; - [DefaultValue(TransitionType.Ease)] + [DefaultValue(TransitionType.Ease)] // TODO [Obsolete] public TransitionType transition = TransitionType.Ease; - [DefaultValue(1.0f)] + [DefaultValue(1.0f)] // TODO [Obsolete] public float rate = 1.0f; [DefaultValue(0.0f)] public float sumfix = 0.0f; diff --git a/Assets/Cryville/Crtr/Event/EventBatch.cs b/Assets/Cryville/Crtr/Event/EventBatch.cs index b4b9a5b..6540ebe 100644 --- a/Assets/Cryville/Crtr/Event/EventBatch.cs +++ b/Assets/Cryville/Crtr/Event/EventBatch.cs @@ -1,7 +1,6 @@ using System; using System.Collections; using System.Collections.Generic; -using System.Linq; namespace Cryville.Crtr.Event { public class EventBatch : IComparable, IEnumerable { diff --git a/Assets/Cryville/Crtr/InputProxy.cs b/Assets/Cryville/Crtr/InputProxy.cs index 7334562..0e9fbc4 100644 --- a/Assets/Cryville/Crtr/InputProxy.cs +++ b/Assets/Cryville/Crtr/InputProxy.cs @@ -1,7 +1,6 @@ using Cryville.Common.Unity.Input; using System; using System.Collections.Generic; -using System.Xml.Linq; namespace Cryville.Crtr { public class InputProxy { diff --git a/Assets/Cryville/Crtr/PdtEvaluator.cs b/Assets/Cryville/Crtr/PdtEvaluator.cs index cacc0ad..5f43173 100644 --- a/Assets/Cryville/Crtr/PdtEvaluator.cs +++ b/Assets/Cryville/Crtr/PdtEvaluator.cs @@ -1,7 +1,6 @@ using Cryville.Common.Pdt; using System; using System.Collections.Generic; -using System.Data.SqlTypes; using UnityEngine; namespace Cryville.Crtr { diff --git a/Assets/Cryville/Crtr/Ruleset.cs b/Assets/Cryville/Crtr/Ruleset.cs index 85b2379..5cb7677 100644 --- a/Assets/Cryville/Crtr/Ruleset.cs +++ b/Assets/Cryville/Crtr/Ruleset.cs @@ -6,7 +6,6 @@ using System.Collections.Generic; using System.Globalization; using System.IO; using System.Text; -using System.Xml.Linq; namespace Cryville.Crtr { public class Ruleset { diff --git a/Assets/Cryville/Crtr/SkinInterpreter.cs b/Assets/Cryville/Crtr/SkinInterpreter.cs index deb4b34..4d9b5a9 100644 --- a/Assets/Cryville/Crtr/SkinInterpreter.cs +++ b/Assets/Cryville/Crtr/SkinInterpreter.cs @@ -18,7 +18,6 @@ namespace Cryville.Crtr { case '@': GetChar(); a.Add(GetIdentifier()); - key = null; break; case '$': GetChar(); diff --git a/Assets/Cryville/Crtr/TrackHandler.cs b/Assets/Cryville/Crtr/TrackHandler.cs index 6abeb34..c437eb8 100644 --- a/Assets/Cryville/Crtr/TrackHandler.cs +++ b/Assets/Cryville/Crtr/TrackHandler.cs @@ -1,7 +1,6 @@ using Cryville.Crtr.Components; using Cryville.Crtr.Event; using UnityEngine; -using Logger = Cryville.Common.Logger; namespace Cryville.Crtr { class TrackHandler : ContainerHandler {