Fix startup progress bar not working if first item has no cover.

.gitignore

@@ -61,6 +61,7 @@ crashlytics-build.properties
 #
 /Docs
 /Issues
+/Local
 /Obsolete
 /Snapshots
 /UI

Assets/Cryville/Common/Logger.cs

@@ -17,7 +17,7 @@ namespace Cryville.Common {
 		public static void SetLogPath(string path) {
 			logPath = path;
 			var dir = new DirectoryInfo(path);
-			if (!dir.Exists) Directory.CreateDirectory(dir.FullName);
+			if (!dir.Exists) dir.Create();
 		}
 		/// <summary>
 		/// Logs to the specified logger.

Assets/Cryville/Common/Math/FractionUtils.cs

@@ -0,0 +1,52 @@
+using System;
+
+namespace Cryville.Common.Math {
+	/// <summary>
+	/// Provides a set of <see langword="static" /> methods related to fractions.
+	/// </summary>
+	public static class FractionUtils {
+		/// <summary>
+		/// Converts a <see cref="double" /> decimal to a fraction.
+		/// </summary>
+		/// <param name="value">The decimal.</param>
+		/// <param name="error">The error.</param>
+		/// <param name="n">The numerator.</param>
+		/// <param name="d">The denominator.</param>
+		/// <exception cref="ArgumentOutOfRangeException"><paramref name="value" /> is less than 0 or <paramref name="error" /> is not greater than 0 or not less than 1.</exception>
+		public static void ToFraction(double value, double error, out int n, out int d) {
+			if (value < 0.0)
+				throw new ArgumentOutOfRangeException("value", "Must be >= 0.");
+			if (error <= 0.0 || error >= 1.0)
+				throw new ArgumentOutOfRangeException("accuracy", "Must be > 0 and < 1.");
+
+			int num = (int)System.Math.Floor(value);
+			value -= num;
+
+			if (value < error) { n = num; d = 1; return; }
+			if (1 - error < value) { n = num + 1; d = 1; return; }
+
+			int lower_n = 0;
+			int lower_d = 1;
+			int upper_n = 1;
+			int upper_d = 1;
+			while (true) {
+				int middle_n = lower_n + upper_n;
+				int middle_d = lower_d + upper_d;
+
+				if (middle_d * (value + error) < middle_n) {
+					upper_n = middle_n;
+					upper_d = middle_d;
+				}
+				else if (middle_n < (value - error) * middle_d) {
+					lower_n = middle_n;
+					lower_d = middle_d;
+				}
+				else {
+					n = num * middle_d + middle_n;
+					d = middle_d;
+					return;
+				}
+			}
+		}
+	}
+}

Assets/Cryville/Common/Math/FractionUtils.cs.meta

@@ -1,8 +1,7 @@
 fileFormatVersion: 2
-guid: da665e46f8c2b5b46ad8e3bf5cd34007
-timeCreated: 1605077404
-licenseType: Free
+guid: 6829ada596979a545a935785eeea2972
 MonoImporter:
+  externalObjects: {}
   serializedVersion: 2
   defaultReferences: []
   executionOrder: 0

Assets/Cryville/Common/Plist/PlistConvert.cs

@@ -1,49 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Reflection;
-
-namespace Cryville.Common.Plist {
-	public class PlistConvert {
-		public static T Deserialize<T>(string file) {
-			return (T)Deserialize(typeof(T), PlistCS.Plist.readPlist(file));
-		}
-
-		public static object Deserialize(Type type, object obj, Binder binder = null) {
-			if (binder == null)
-				binder = BinderAttribute.CreateBinderOfType(type);
-			if (obj is IList) {
-				var lobj = (List<object>)obj;
-				foreach (var i in lobj) {
-					throw new NotImplementedException(); // TODO
-				}
-			}
-			else if (obj is IDictionary) {
-				var dobj = (Dictionary<string, object>)obj;
-				if (typeof(IDictionary).IsAssignableFrom(type)) {
-					var result = (IDictionary)ReflectionHelper.InvokeEmptyConstructor(type);
-					var it = type.GetGenericArguments()[1];
-					foreach (var i in dobj) {
-						var value = Deserialize(it, i.Value, binder);
-						result.Add(i.Key, value);
-					}
-					return result;
-				}
-				else {
-					var result = ReflectionHelper.InvokeEmptyConstructor(type);
-					foreach (var i in dobj) {
-						var imis = type.GetMember(i.Key);
-						if (imis.Length == 0) continue;
-						var imi = imis[0];
-						var it = ReflectionHelper.GetMemberType(imi);
-						var value = Deserialize(it, i.Value, binder);
-						ReflectionHelper.SetValue(imi, result, value, binder);
-					}
-					return result;
-				}
-			}
-			else return obj;
-			throw new Exception(); // TODO
-		}
-	}
-}

Assets/Cryville/Common/ReflectionHelper.cs

@@ -168,5 +168,19 @@ namespace Cryville.Common {
 			}
 			return result;
 		}
+
+		/// <summary>
+		/// Gets the namespace qualified name of a type.
+		/// </summary>
+		/// <param name="type">The type.</param>
+		/// <returns>The namespace qualified name of the class.</returns>
+		public static string GetNamespaceQualifiedName(Type type) {
+			string result = type.Namespace + "." + type.Name;
+			var typeargs = type.GetGenericArguments();
+			if (typeargs.Length > 0) {
+				result = string.Format("{0}[{1}]", result, string.Join(",", from a in typeargs select GetNamespaceQualifiedName(a)));
+			}
+			return result;
+		}
 	}
 }

Assets/Cryville/Common/StringUtils.cs

@@ -40,7 +40,9 @@ namespace Cryville.Common {
 		/// <param name="name">The file name excluding the extension.</param>
 		/// <returns>The escaped file name.</returns>
 		public static string EscapeFileName(string name) {
-			return Regex.Replace(name, @"[\/\\\<\>\:\x22\|\?\*\p{Cc}\.\s]", "_");
+			var result = Regex.Replace(name, @"[\/\\\<\>\:\x22\|\?\*\p{Cc}]", "_").TrimEnd(' ', '.');
+			if (result.Length == 0) return "_";
+			return result;
 		}
 	}
 }

Assets/Cryville/Common/Unity/CallHelper.cs

@@ -9,14 +9,6 @@ namespace Cryville.Common.Unity {
 			return (num2 & num) == num;
 		}
 
-		public static void ShowException(Exception ex) {
-			ShowMessageBox(ex.ToString());
-		}
-
-		public static void ShowMessageBox(string message) {
-			GameObject.Instantiate<GameObject>(Resources.Load<GameObject>("Common/Popup")).GetComponent<Popup>().Message = message;
-		}
-
 		public static void Purge(Transform obj) {
 			foreach (Transform i in obj)
 				GameObject.Destroy(i.gameObject);

Assets/Cryville/Common/Unity/Input/InputManager.cs

@@ -13,6 +13,7 @@ namespace Cryville.Common.Unity.Input {
 		};
 		// TODO set private
 		public readonly List<InputHandler> _handlers = new List<InputHandler>();
+		readonly Dictionary<Type, InputHandler> _typemap = new Dictionary<Type, InputHandler>();
 		readonly Dictionary<InputHandler, double> _timeOrigins = new Dictionary<InputHandler, double>();
 		readonly object _lock = new object();
 		readonly Dictionary<InputIdentifier, InputVector> _vectors = new Dictionary<InputIdentifier, InputVector>();
@@ -22,6 +23,7 @@ namespace Cryville.Common.Unity.Input {
 				try {
 					if (!typeof(InputHandler).IsAssignableFrom(t)) continue;
 					var h = (InputHandler)ReflectionHelper.InvokeEmptyConstructor(t);
+					_typemap.Add(t, h);
 					h.OnInput += OnInput;
 					_handlers.Add(h);
 					_timeOrigins.Add(h, 0);
@@ -32,6 +34,9 @@ namespace Cryville.Common.Unity.Input {
 				}
 			}
 		}
+		public InputHandler GetHandler(string name) {
+			return _typemap[Type.GetType(name)];
+		}
 		public void Activate() {
 			lock (_lock) {
 				_events.Clear();

Assets/Cryville/Common/Unity/Popup.cs

@@ -1,29 +0,0 @@
-using UnityEngine;
-using UnityEngine.UI;
-
-namespace Cryville.Common.Unity {
-	public class Popup : MonoBehaviour {
-
-		public string Message = "";
-
-		LayoutElement layout;
-
-		float timer = 0;
-
-#pragma warning disable IDE0051
-		void Start() {
-			layout = GetComponent<LayoutElement>();
-			GetComponentInChildren<Text>().text = Message;
-			transform.SetParent(GameObject.Find("PopupList").transform);
-			layout.minHeight = 0;
-		}
-
-		void Update() {
-			if (timer <= 0.8f) layout.minHeight = timer * 50;
-			else if (timer >= 5f) GameObject.Destroy(gameObject);
-			else if (timer >= 4.2f) layout.minHeight = (300 - timer) * 50;
-			timer += Time.deltaTime;
-		}
-#pragma warning restore IDE0051
-	}
-}

Assets/Cryville/Common/Unity/PropItem.cs

@@ -133,10 +133,10 @@ namespace Cryville.Common.Unity {
 					prop.SetValue(Target, v, new object[]{ });
 				}
 				catch (TargetInvocationException ex) {
-					CallHelper.ShowMessageBox(ex.InnerException.Message);
+					// CallHelper.ShowMessageBox(ex.InnerException.Message);
 				}
 				catch (Exception ex) {
-					CallHelper.ShowMessageBox(ex.Message);
+					// CallHelper.ShowMessageBox(ex.Message);
 				}
 			}
 			UpdateValue();

Assets/Cryville/Common/Unity/UI/ScrollableItemGrid.cs

@@ -200,8 +200,7 @@ namespace Cryville.Common.Unity.UI {
 
 		void GenerateLine(int index, int line) {
 			for (int j = 0; j < LineItemCount; j++) {
-				var child = GameObject.Instantiate(m_itemTemplate);
-				child.transform.SetParent(transform, false);
+				var child = GameObject.Instantiate(m_itemTemplate, transform, false);
 				lines[index][j] = child;
 			}
 			LoadLine(index, line);

Assets/Cryville/Crtr/Browsing/ChartResourceImporter.cs

@@ -0,0 +1,22 @@
+using Newtonsoft.Json;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+
+namespace Cryville.Crtr.Browsing {
+	public class ChartResourceImporter : ResourceConverter {
+		static readonly string[] SUPPORTED_FORMATS = { ".umgc" };
+		public override string[] GetSupportedFormats() {
+			return SUPPORTED_FORMATS;
+		}
+
+		public override IEnumerable<Resource> ConvertFrom(FileInfo file) {
+			var meta = Path.Combine(file.Directory.FullName, "meta.json");
+			if (!File.Exists(meta)) throw new FileNotFoundException("Meta file for the chart not found");
+			using (StreamReader reader = new StreamReader(meta, Encoding.UTF8)) {
+				var data = JsonConvert.DeserializeObject<ChartMeta>(reader.ReadToEnd());
+				return new Resource[] { new ChartResource(data.name, file) };
+			}
+		}
+	}
+}

Assets/Cryville/Crtr/Browsing/ChartResourceImporter.cs.meta

@@ -1,8 +1,7 @@
 fileFormatVersion: 2
-guid: 3bc71e8b62d4022409aa5518bbf3a7d8
-timeCreated: 1608801352
-licenseType: Free
+guid: 168366bb891392b42a1d0a6bfa068ff3
 MonoImporter:
+  externalObjects: {}
   serializedVersion: 2
   defaultReferences: []
   executionOrder: 0

Assets/Cryville/Crtr/Browsing/DetailPanel.cs

@@ -47,11 +47,11 @@ namespace Cryville.Crtr.Browsing {
 			_cover.sprite = m_coverPlaceholder;
 			if (data.Cover != null) data.Cover.Destination = DisplayCover;
 			var meta = data.Meta;
-			_title.text = string.Format("{0}\n{1}", meta.song.name, meta.chart.name);
+			_title.text = string.Format("{0}\n{1}", meta.song.name, meta.name);
 			_desc.text = string.Format(
 				"Music artist: {0}\nCharter: {1}\nLength: {2}\nNote Count: {3}",
-				meta.song.author, meta.chart.author,
-				TimeSpan.FromSeconds(meta.chart.length).ToString(3), meta.note_count
+				meta.song.author, meta.author,
+				TimeSpan.FromSeconds(meta.length).ToString(3), meta.note_count
 			);
 		}
 		private void DisplayCover(bool succeeded, Texture2D tex) {
@@ -60,10 +60,10 @@ namespace Cryville.Crtr.Browsing {
 			}
 		}
 		public void OnPlay() {
-			Master.Open(_id);
+			Master.Open(_id, _data);
 		}
 		public void OnConfig() {
-			Master.OpenConfig(_id);
+			Master.OpenConfig(_id, _data);
 		}
 	}
 }

Assets/Cryville/Crtr/Browsing/LegacyResourceManager.cs

@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using UnityEngine;
+using Logger = Cryville.Common.Logger;
 
 namespace Cryville.Crtr.Browsing {
 	internal class LegacyResourceManager : IResourceManager<ChartDetail> {
@@ -58,22 +59,25 @@ namespace Cryville.Crtr.Browsing {
 
 		public ResourceItemMeta GetItemMeta(int id) {
 			var item = items[id];
-			AsyncDelivery<Texture2D> cover = null;
-			var coverFile = item.GetFiles("cover.*");
-			if (coverFile.Length > 0) {
-				cover = new AsyncDelivery<Texture2D>();
-				var task = new LoadTextureTask(Game.FileProtocolPrefix + coverFile[0].FullName, cover.Deliver);
-				cover.CancelSource = task.Cancel;
-				Game.NetworkTaskWorker.SubmitNetworkTask(task);
-			}
+			var meta = new ChartMeta();
 			string name = item.Name;
 			string desc = "(Unknown)";
-			var metaFile = new FileInfo(item.FullName + "/meta.json");
+			var metaFile = new FileInfo(item.FullName + "/.umgc");
 			if (metaFile.Exists) {
 				using (var reader = new StreamReader(metaFile.FullName)) {
-					var meta = JsonConvert.DeserializeObject<ChartMeta>(reader.ReadToEnd());
+					meta = JsonConvert.DeserializeObject<ChartMeta>(reader.ReadToEnd());
 					name = meta.song.name;
-					desc = meta.chart.name;
+					desc = meta.name;
+				}
+			}
+			AsyncDelivery<Texture2D> cover = null;
+			if (meta.cover != null && meta.cover != "") {
+				var coverFile = item.GetFiles(meta.cover);
+				if (coverFile.Length > 0) {
+					cover = new AsyncDelivery<Texture2D>();
+					var task = new LoadTextureTask(Game.FileProtocolPrefix + coverFile[0].FullName, cover.Deliver);
+					cover.CancelSource = task.Cancel;
+					Game.NetworkTaskWorker.SubmitNetworkTask(task);
 				}
 			}
 			return new ResourceItemMeta {
@@ -86,21 +90,23 @@ namespace Cryville.Crtr.Browsing {
 
 		public ChartDetail GetItemDetail(int id) {
 			var item = items[id];
-			AsyncDelivery<Texture2D> cover = null;
-			var coverFile = item.GetFiles("cover.*");
-			if (coverFile.Length > 0) {
-				cover = new AsyncDelivery<Texture2D>();
-				var task = new LoadTextureTask(Game.FileProtocolPrefix + coverFile[0].FullName, cover.Deliver);
-				cover.CancelSource = task.Cancel;
-				Game.NetworkTaskWorker.SubmitNetworkTask(task);
-			}
-			ChartMeta meta = new ChartMeta();
-			var metaFile = new FileInfo(item.FullName + "/meta.json");
+			var meta = new ChartMeta();
+			var metaFile = new FileInfo(item.FullName + "/.umgc");
 			if (metaFile.Exists) {
 				using (var reader = new StreamReader(metaFile.FullName)) {
 					meta = JsonConvert.DeserializeObject<ChartMeta>(reader.ReadToEnd());
 				}
 			}
+			AsyncDelivery<Texture2D> cover = null;
+			if (meta.cover != null && meta.cover != "") {
+				var coverFile = item.GetFiles(meta.cover);
+				if (coverFile.Length > 0) {
+					cover = new AsyncDelivery<Texture2D>();
+					var task = new LoadTextureTask(Game.FileProtocolPrefix + coverFile[0].FullName, cover.Deliver);
+					cover.CancelSource = task.Cancel;
+					Game.NetworkTaskWorker.SubmitNetworkTask(task);
+				}
+			}
 			return new ChartDetail {
 				Cover = cover,
 				Meta = meta,
@@ -108,39 +114,72 @@ namespace Cryville.Crtr.Browsing {
 		}
 
 		public string GetItemPath(int id) {
-			return items[id].Name + "/.umgc";
+			var item = items[id];
+			var meta = new ChartMeta();
+			var metaFile = new FileInfo(item.FullName + "/.umgc");
+			using (var reader = new StreamReader(metaFile.FullName)) {
+				meta = JsonConvert.DeserializeObject<ChartMeta>(reader.ReadToEnd());
+			}
+			return string.Format("{0}/{1}.json", items[id].Name, meta.data);
 		}
 
 		public bool ImportItemFrom(string path) {
 			var file = new FileInfo(path);
 			if (!converters.ContainsKey(file.Extension)) return false;
 			foreach (var converter in converters[file.Extension]) {
-				var resources = converter.ConvertFrom(file);
+				IEnumerable<Resource> resources = null;
+				try {
+					resources = converter.ConvertFrom(file);
+				}
+				catch (Exception ex) {
+					LogAndPopup(4, ex.Message);
+					return false;
+				}
 				foreach (var res in resources) {
-					if (res is ChartResource) {
-						var tres = (ChartResource)res;
+					if (!res.Valid) {
+						LogAndPopup(3, "Attempt to import invalid resource: {0}", res);
+					}
+					else if (res is RawChartResource) {
+						var tres = (RawChartResource)res;
 						var dir = new DirectoryInfo(_rootPath + "/charts/" + res.Name);
 						if (!dir.Exists) dir.Create();
-						using (var writer = new StreamWriter(dir.FullName + "/.umgc")) {
+						using (var writer = new StreamWriter(dir.FullName + "/.json")) {
 							writer.Write(JsonConvert.SerializeObject(tres.Main, Game.GlobalJsonSerializerSettings));
 						}
-						using (var writer = new StreamWriter(dir.FullName + "/meta.json")) {
+						using (var writer = new StreamWriter(dir.FullName + "/.umgc")) {
+							tres.Meta.data = "";
 							writer.Write(JsonConvert.SerializeObject(tres.Meta, Game.GlobalJsonSerializerSettings));
 						}
+						if (tres.Meta.cover != null)
+							new FileInfo(Path.Combine(file.Directory.FullName, tres.Meta.cover))
+								.CopyTo(Path.Combine(dir.FullName, tres.Meta.cover), true);
 					}
-					else if (res is CoverResource) {
-						var tres = (CoverResource)res;
-						var dir = new DirectoryInfo(_rootPath + "/charts/" + res.Name);
-						if (!dir.Exists) dir.Create();
-						var dest = new FileInfo(_rootPath + "/charts/" + res.Name + "/cover" + tres.Source.Extension);
-						if (!dest.Exists) tres.Source.CopyTo(dest.FullName);
+					else if (res is FileResource) {
+						var tres = (FileResource)res;
+						DirectoryInfo dest;
+						if (res is ChartResource)
+							dest = new DirectoryInfo(_rootPath + "/charts/" + res.Name);
+						else if (res is RulesetResource)
+							dest = new DirectoryInfo(_rootPath + "/rulesets/" + res.Name);
+						else if (res is SkinResource)
+							dest = new DirectoryInfo(_rootPath + "/skins/" + (res as SkinResource).RulesetName + "/" + res.Name);
+						else if (res is SongResource)
+							dest = new DirectoryInfo(_rootPath + "/songs/" + res.Name);
+						else {
+							LogAndPopup(3, "Attempt to import unsupported file resource: {0}", res);
+							continue;
+						}
+						if (!dest.Exists) {
+							dest.Create();
+							tres.Master.CopyTo(Path.Combine(dest.FullName, tres.Master.Extension));
+							foreach (var attachment in tres.Attachments) {
+								attachment.CopyTo(Path.Combine(dest.FullName, attachment.Name));
+							}
+						}
+						else LogAndPopup(1, "Resource already exists: {0}", res);
 					}
-					else if (res is SongResource) {
-						var tres = (SongResource)res;
-						var dir = new DirectoryInfo(_rootPath + "/songs/" + res.Name);
-						if (!dir.Exists) dir.Create();
-						var dest = new FileInfo(_rootPath + "/songs/" + res.Name + "/.ogg");
-						if (!dest.Exists) tres.Source.CopyTo(dest.FullName);
+					else {
+						LogAndPopup(3, "Attempt to import unsupported resource: {0}", res);
 					}
 				}
 				return true;
@@ -148,6 +187,12 @@ namespace Cryville.Crtr.Browsing {
 			return false;
 		}
 
+		void LogAndPopup(int level, string format, params object[] args) {
+			var msg = string.Format(format, args);
+			Logger.Log("main", level, "Resource", msg);
+			Popup.Create(msg);
+		}
+
 		public string[] GetSupportedFormats() {
 			return converters.Keys.ToArray();
 		}

Assets/Cryville/Crtr/Browsing/PVPBool.cs

@@ -24,10 +24,6 @@ namespace Cryville.Crtr.Browsing {
 		const float SPEED = 8;
 		float _ratio;
 #pragma warning disable IDE0051
-		void Start() {
-			m_handleArea.sizeDelta = new Vector2(m_handle.rect.height - m_handle.rect.width, 0);
-		}
-
 		void Update() {
 			if (_value && _ratio != 1) {
 				_ratio += SPEED * Time.deltaTime;
@@ -40,6 +36,10 @@ namespace Cryville.Crtr.Browsing {
 				UpdateGraphics();
 			}
 		}
+
+		void OnRectTransformDimensionsChange() {
+			m_handleArea.sizeDelta = new Vector2(m_handle.rect.height - m_handle.rect.width, 0);
+		}
 #pragma warning restore IDE0051
 
 		void UpdateGraphics() {

Assets/Cryville/Crtr/Browsing/PVPNumber.cs

@@ -60,7 +60,6 @@ namespace Cryville.Crtr.Browsing {
 			ev.callback.AddListener(e => OnPointerClick((PointerEventData)e));
 			m_ctn.triggers.Add(ev);
 
-			m_handleArea.sizeDelta = new Vector2(m_handle.rect.height - m_handle.rect.width, 0);
 			if (MaxStep != 0) SetRatio(0.5f);
 		}
 
@@ -70,6 +69,10 @@ namespace Cryville.Crtr.Browsing {
 				SetValueFromPos(pp);
 			}
 		}
+
+		void OnRectTransformDimensionsChange() {
+			m_handleArea.sizeDelta = new Vector2(m_handle.rect.height - m_handle.rect.width, 0);
+		}
 #pragma warning restore IDE0051
 
 		Vector2 pp;

Assets/Cryville/Crtr/Browsing/PVPString.cs

@@ -0,0 +1,28 @@
+using UnityEngine.UI;
+
+namespace Cryville.Crtr.Browsing {
+	public class PVPString : PropertyValuePanel {
+		string m_value;
+		public override object Value {
+			get {
+				return m_value;
+			}
+			set {
+				m_value = (string)value;
+				_inputField.text = m_value;
+			}
+		}
+
+		InputField _inputField;
+
+		void Awake() {
+			_inputField = GetComponent<InputField>();
+			_inputField.onValueChanged.AddListener(OnValueChanged);
+		}
+
+		void OnValueChanged(string value) {
+			m_value = value;
+			Callback(Value);
+		}
+	}
+}

Assets/Cryville/Crtr/Browsing/PVPString.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: aadf11739189bc94e9cb4f702eb7ccd3
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Cryville/Crtr/Browsing/PropertyCategoryPanel.cs

@@ -32,8 +32,7 @@ namespace Cryville.Crtr.Browsing {
 		public void Load(string name, IEnumerable<PropertyInfo> props, object target) {
 			Name = name.ToUpper();
 			foreach (var prop in props) {
-				var obj = GameObject.Instantiate<GameObject>(m_propertyPrefab);
-				obj.transform.SetParent(transform, false);
+				var obj = GameObject.Instantiate<GameObject>(m_propertyPrefab, transform, false);
 				obj.GetComponent<PropertyPanel>().Load(prop, target);
 			}
 		}

Assets/Cryville/Crtr/Browsing/PropertyPanel.cs

@@ -10,6 +10,8 @@ namespace Cryville.Crtr.Browsing {
 		GameObject m_bool;
 		[SerializeField]
 		GameObject m_number;
+		[SerializeField]
+		GameObject m_string;
 
 		PropertyInfo _property;
 		object _target;
@@ -32,8 +34,9 @@ namespace Cryville.Crtr.Browsing {
 			GameObject vp;
 			if (prop.PropertyType == typeof(bool)) vp = m_bool;
 			else if (prop.PropertyType == typeof(float) || prop.PropertyType == typeof(int)) vp = m_number;
+			else if (prop.PropertyType == typeof(string)) vp = m_string;
 			else return;
-			_value = GameObject.Instantiate(vp, _valueContainer).GetComponent<PropertyValuePanel>();
+			_value = GameObject.Instantiate(vp, _valueContainer, false).GetComponent<PropertyValuePanel>();
 			if (_value is PVPNumber) {
 				var t = (PVPNumber)_value;
 				t.IntegerMode = prop.PropertyType == typeof(int);

Assets/Cryville/Crtr/Browsing/ResourceBrowser.cs

@@ -59,11 +59,11 @@ namespace Cryville.Crtr.Browsing {
 		private void OnAddDialogClosed() {
 			if (_dialog.FileName == null) return;
 			if (ResourceManager.ImportItemFrom(_dialog.FileName)) {
-				Debug.Log("Import succeeded"); // TODO
+				Popup.Create("Import succeeded");
 				OnPathClicked(ResourceManager.CurrentDirectory.Length - 1);
 			}
 			else {
-				Debug.Log("Import failed"); // TODO
+				Popup.Create("Import failed");
 			}
 		}
 	}

Assets/Cryville/Crtr/Browsing/ResourceBrowserMaster.cs

@@ -1,5 +1,6 @@
 using Cryville.Common;
 using Cryville.Common.Unity.UI;
+using Newtonsoft.Json;
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.SceneManagement;
@@ -64,8 +65,8 @@ namespace Cryville.Crtr.Browsing {
 			_units[_slideDest + 1].SlideToRight();
 		}
 
-		public void Open(int id) {
-			SetDataSettings(id);
+		public void Open(int id, ChartDetail detail) {
+			SetDataSettings(id, detail);
 #if UNITY_5_3_OR_NEWER
 			SceneManager.LoadScene("Play", LoadSceneMode.Additive);
 #else
@@ -74,8 +75,8 @@ namespace Cryville.Crtr.Browsing {
 			GameObject.Find("/Master").GetComponent<Master>().HideMenu();
 		}
 
-		public void OpenConfig(int id) {
-			SetDataSettings(id);
+		public void OpenConfig(int id, ChartDetail detail) {
+			SetDataSettings(id, detail);
 #if UNITY_5_3_OR_NEWER
 			SceneManager.LoadScene("Config", LoadSceneMode.Additive);
 #else
@@ -84,9 +85,9 @@ namespace Cryville.Crtr.Browsing {
 			GameObject.Find("/Master").GetComponent<Master>().HideMenu();
 		}
 
-		void SetDataSettings(int id) {
-			Settings.Default.LoadRuleset = "key/.umgr";
-			Settings.Default.LoadSkin = "key/0/.umgs";
+		void SetDataSettings(int id, ChartDetail detail) {
+			Settings.Default.LoadRuleset = detail.Meta.ruleset + "/.umgr";
+			Settings.Default.LoadRulesetConfig = detail.Meta.ruleset + ".json";
 			Settings.Default.LoadChart = MainBrowser.ResourceManager.GetItemPath(id);
 		}
 	}
@@ -97,16 +98,22 @@ namespace Cryville.Crtr.Browsing {
 	}
 
 #pragma warning disable IDE1006
-	public struct ChartMeta {
-		public MetaInfo song { get; set; }
-		public MetaInfo chart { get; set; }
-		public struct MetaInfo {
-			public string name { get; set; }
-			public string author { get; set; }
-			public float length { get; set; }
-		}
+	public class MetaInfo {
+		public string name { get; set; }
+		public string author { get; set; }
+		[JsonRequired]
+		public string data { get; set; }
+	}
+	public class SongMetaInfo {
+		public string name { get; set; }
+		public string author { get; set; }
+	}
+	public class ChartMeta : MetaInfo {
+		public SongMetaInfo song { get; set; }
+		public float length { get; set; }
 		public string ruleset { get; set; }
 		public int note_count { get; set; }
+		public string cover { get; set; }
 	}
 #pragma warning restore IDE1006
 }

Assets/Cryville/Crtr/Browsing/ResourceConverter.cs

@@ -1,5 +1,7 @@
 using Cryville.Common;
+using Newtonsoft.Json;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.IO;
 
 namespace Cryville.Crtr.Browsing {
@@ -12,24 +14,67 @@ namespace Cryville.Crtr.Browsing {
 			Name = StringUtils.EscapeFileName(name);
 		}
 		public string Name { get; private set; }
+		public abstract bool Valid { get; }
+		public override string ToString() {
+			return string.Format("{0} ({1})", Name, ReflectionHelper.GetSimpleName(GetType()));
+		}
 	}
-	public class ChartResource : Resource {
-		public ChartResource(string name, Chart main, ChartMeta meta) : base(name) {
+	public class RawChartResource : Resource {
+		public RawChartResource(string name, Chart main, ChartMeta meta) : base(name) {
 			Main = main; Meta = meta;
 		}
 		public Chart Main { get; private set; }
 		public ChartMeta Meta { get; private set; }
+		public override bool Valid { get { return true; } }
 	}
-	public class CoverResource : Resource {
-		public CoverResource(string name, FileInfo src) : base(name) {
-			Source = src;
+	public abstract class FileResource : Resource {
+		public FileResource(string name, FileInfo master) : base(name) {
+			Master = master;
+			Attachments = new List<FileInfo>();
+		}
+		public FileInfo Master { get; private set; }
+		public List<FileInfo> Attachments { get; private set; }
+		public override bool Valid {
+			get {
+				if (!Master.Exists) return false;
+				foreach (var file in Attachments) {
+					if (!file.Exists) return false;
+				}
+				return true;
+			}
 		}
-		public FileInfo Source { get; private set; }
 	}
-	public class SongResource : Resource {
-		public SongResource(string name, FileInfo src) : base(name) {
-			Source = src;
+	public class ChartResource : FileResource {
+		public ChartResource(string name, FileInfo master) : base(name, master) {
+			using (var reader = new StreamReader(master.FullName)) {
+				var meta = JsonConvert.DeserializeObject<ChartMeta>(reader.ReadToEnd());
+				Attachments.Add(new FileInfo(Path.Combine(master.Directory.FullName, meta.data + ".json")));
+				if (meta.cover != null) Attachments.Add(new FileInfo(Path.Combine(master.Directory.FullName, meta.cover)));
+			}
+		}
+	}
+	public class SongResource : FileResource {
+		public SongResource(string name, FileInfo master) : base(name, master) { }
+	}
+	public class RulesetResource : FileResource {
+		public RulesetResource(string name, FileInfo master) : base(name, master) {
+			using (var reader = new StreamReader(master.FullName)) {
+				var meta = JsonConvert.DeserializeObject<Ruleset>(reader.ReadToEnd());
+				Attachments.Add(new FileInfo(Path.Combine(master.Directory.FullName, meta.data + ".pdt")));
+			}
+		}
+	}
+	public class SkinResource : FileResource {
+		public string RulesetName { get; private set; }
+		public SkinResource(string name, FileInfo master) : base(name, master) {
+			using (var reader = new StreamReader(master.FullName)) {
+				var meta = JsonConvert.DeserializeObject<Skin>(reader.ReadToEnd());
+				RulesetName = meta.ruleset;
+				Attachments.Add(new FileInfo(Path.Combine(master.Directory.FullName, meta.data + ".pdt")));
+				foreach (var frame in meta.frames) {
+					Attachments.Add(new FileInfo(Path.Combine(master.Directory.FullName, frame)));
+				}
+			}
 		}
-		public FileInfo Source { get; private set; }
 	}
 }

Assets/Cryville/Crtr/Browsing/RulesetResourceImporter.cs

@@ -0,0 +1,20 @@
+using Newtonsoft.Json;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+
+namespace Cryville.Crtr.Browsing {
+	public class RulesetResourceImporter : ResourceConverter {
+		static readonly string[] SUPPORTED_FORMATS = { ".umgr" };
+		public override string[] GetSupportedFormats() {
+			return SUPPORTED_FORMATS;
+		}
+
+		public override IEnumerable<Resource> ConvertFrom(FileInfo file) {
+			using (StreamReader reader = new StreamReader(file.FullName, Encoding.UTF8)) {
+				var data = JsonConvert.DeserializeObject<Ruleset>(reader.ReadToEnd());
+				return new Resource[] { new RulesetResource(data.name, file) };
+			}
+		}
+	}
+}

Assets/Cryville/Crtr/Browsing/RulesetResourceImporter.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: f2c1531e76f19a647865f7ec335561cd
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Cryville/Crtr/Browsing/SkinResourceImporter.cs

@@ -0,0 +1,20 @@
+using Newtonsoft.Json;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+
+namespace Cryville.Crtr.Browsing {
+	public class SkinResourceImporter : ResourceConverter {
+		static readonly string[] SUPPORTED_FORMATS = { ".umgs" };
+		public override string[] GetSupportedFormats() {
+			return SUPPORTED_FORMATS;
+		}
+
+		public override IEnumerable<Resource> ConvertFrom(FileInfo file) {
+			using (StreamReader reader = new StreamReader(file.FullName, Encoding.UTF8)) {
+				var data = JsonConvert.DeserializeObject<Skin>(reader.ReadToEnd());
+				return new Resource[] { new SkinResource(data.name, file) };
+			}
+		}
+	}
+}

Assets/Cryville/Crtr/Browsing/SkinResourceImporter.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 9904b4c21758c5046afc341fe2fa8845
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Cryville/Crtr/Chart.cs

@@ -377,14 +377,6 @@ namespace Cryville.Crtr {
 				}
 			}
 
-			public Note() {
-				SubmitPropSrc("track", new PropSrc.Float(() => {
-					var i = motions.FirstOrDefault(m => m.RelativeNode == null && m.Name == "track");
-					if (i == null) return ((Vec1)ChartPlayer.motionRegistry["track"].InitValue).Value;
-					else return ((Vec1)i.AbsoluteValue).Value;
-				}));
-			}
-
 			public override EventList GetEventsOfType(string type) {
 				switch (type) {
 					case "judges": return new EventList<Judge>(judges);

Assets/Cryville/Crtr/ChartHandler.cs

@@ -37,9 +37,9 @@ namespace Cryville.Crtr {
 				else if (ev.Unstamped == null) { }
 				else if (ev.Unstamped is Chart.Sound) {
 					Chart.Sound tev = (Chart.Sound)ev.Unstamped;
-					var source = new LibavFileAudioSource(
-						Game.GameDataPath + "/songs/" + tev.id + "/.ogg"
-					);
+					var dir = new DirectoryInfo(Game.GameDataPath + "/songs/" + tev.id);
+					var files = dir.GetFiles();
+					var source = new LibavFileAudioSource(files[0].FullName);
 					source.SelectStream();
 					sounds.Add(source);
 					Game.AudioSession.Sequence(

Assets/Cryville/Crtr/ChartPlayer.cs

@@ -1,9 +1,7 @@
-//#define NO_THREAD
 #define BUILD
 
 using Cryville.Common;
-using Cryville.Common.Plist;
-using Cryville.Common.Unity.Input;
+using Cryville.Crtr.Config;
 using Cryville.Crtr.Event;
 using Newtonsoft.Json;
 using System;
@@ -27,8 +25,7 @@ namespace Cryville.Crtr {
 		Ruleset ruleset;
 		PdtRuleset pruleset;
 		Dictionary<string, Texture2D> texs;
-		public static Dictionary<string, Cocos2dFrames.Frame> frames;
-		List<Cocos2dFrames> plists;
+		public static Dictionary<string, SpriteFrame> frames;
 
 		readonly Queue<string> texLoadQueue = new Queue<string>();
 #if UNITY_5_4_OR_NEWER
@@ -53,6 +50,7 @@ namespace Cryville.Crtr {
 		public static Rect hitRect;
 		public static Plane[] frustumPlanes;
 
+		RulesetConfig _rscfg;
 		static bool disableGC = true;
 		static float clippingDist = 1f;
 		static float renderDist = 6f;
@@ -69,17 +67,6 @@ namespace Cryville.Crtr {
 		
 		InputProxy inputProxy;
 
-		~ChartPlayer() {
-			Dispose();
-		}
-
-		public void Dispose() {
-#if !NO_THREAD
-			if (loadThread != null) loadThread.Abort();
-#endif
-			if (texLoader != null) texLoader.Dispose();
-		}
-
 		#region MonoBehaviour
 		void Start() {
 			var logobj = GameObject.Find("Logs");
@@ -96,134 +83,153 @@ namespace Cryville.Crtr {
 
 			texHandler = new DownloadHandlerTexture();
 #if BUILD
-			Play();
+			try {
+				Play();
+			}
+			catch (Exception ex) {
+				Game.LogException("Load/WorkerThread", "An error occured while loading the data", ex);
+				Popup.CreateException(ex);
+				ReturnToMenu();
+			}
 #endif
 
 			// Camera.main.RenderToCubemap();
 		}
 
+		void OnDestroy() {
+			if (cbus != null) cbus.Dispose();
+			if (bbus != null) bbus.Dispose();
+			if (tbus != null) tbus.Dispose();
+			if (nbus != null) nbus.Dispose();
+			if (loadThread != null) loadThread.Abort();
+			if (texLoader != null) texLoader.Dispose();
+			if (inputProxy != null) inputProxy.Dispose();
+			if (texs != null) foreach (var t in texs) Texture.Destroy(t.Value);
+			Camera.onPostRender -= OnCameraPostRender;
+			GC.Collect();
+		}
+
 		bool texloaddone;
 		diag::Stopwatch texloadtimer = new diag::Stopwatch();
 		bool firstFrame;
 		double atime0;
 		void Update() {
-			// if (Input.GetKeyDown(KeyCode.Return)) TogglePlay();
-			if (started) {
-				try {
-					if (Screen.width != screenSize.x || Screen.height != screenSize.y)
-						throw new InvalidOperationException("Window resized while playing");
-					float dt = firstFrame
+			if (started) GameUpdate();
+			else if (loadThread != null) LoadUpdate();
+			if (logEnabled) LogUpdate();
+			else Game.MainLogger.Enumerate((level, module, msg) => { });
+		}
+		void GameUpdate() {
+			try {
+				if (Screen.width != screenSize.x || Screen.height != screenSize.y)
+					throw new InvalidOperationException("Window resized while playing");
+				float dt = firstFrame
 						? 1f / Application.targetFrameRate
 						: Time.deltaTime;
-					firstFrame = false;
-					inputProxy.ForceTick();
-					cbus.ForwardByTime(dt);
-					bbus.ForwardByTime(dt);
-					UnityEngine.Profiling.Profiler.BeginSample("ChartPlayer.Forward");
-					UnityEngine.Profiling.Profiler.BeginSample("EventBus.Copy");
-					bbus.CopyTo(2, tbus);
-					bbus.CopyTo(3, nbus);
-					UnityEngine.Profiling.Profiler.EndSample();
-					float step = autoRenderStep ? ( firstFrame
+				firstFrame = false;
+				inputProxy.ForceTick();
+				cbus.ForwardByTime(dt);
+				bbus.ForwardByTime(dt);
+				UnityEngine.Profiling.Profiler.BeginSample("ChartPlayer.Forward");
+				UnityEngine.Profiling.Profiler.BeginSample("EventBus.Copy");
+				bbus.CopyTo(2, tbus);
+				bbus.CopyTo(3, nbus);
+				UnityEngine.Profiling.Profiler.EndSample();
+				float step = autoRenderStep ? ( firstFrame
 						? 1f / Application.targetFrameRate
 						: Time.smoothDeltaTime
 					) : renderStep;
-					actualRenderStep = step;
+				actualRenderStep = step;
 
-					nbus.ForwardStepByTime(clippingDist, step);
-					nbus.BroadcastEndUpdate();
-					nbus.Anchor();
+				nbus.ForwardStepByTime(clippingDist, step);
+				nbus.BroadcastEndUpdate();
+				nbus.Anchor();
 
-					tbus.ForwardStepByTime(clippingDist, step);
-					tbus.ForwardStepByTime(renderDist, step);
-					tbus.BroadcastEndUpdate();
-					UnityEngine.Profiling.Profiler.EndSample();
-				}
-				catch (Exception ex) {
-					Game.LogException("Game", "An error occured while playing", ex);
-					Stop();
-				}
+				tbus.ForwardStepByTime(clippingDist, step);
+				tbus.ForwardStepByTime(renderDist, step);
+				tbus.BroadcastEndUpdate();
+				UnityEngine.Profiling.Profiler.EndSample();
 			}
-#if !NO_THREAD
-			else if (loadThread != null) {
-				if (texLoader != null) {
-					string url = texLoader.url;
-					string name = StringUtils.TrimExt(url.Substring(url.LastIndexOfAny(new char[] {'/', '\\'}) + 1));
+			catch (Exception ex) {
+				Game.LogException("Game", "An error occured while playing", ex);
+				Popup.CreateException(ex);
+				Stop();
+			}
+		}
+		void LoadUpdate() {
+			if (texLoader != null) {
+				string url = texLoader.url;
+				string name = StringUtils.TrimExt(url.Substring(url.LastIndexOfAny(new char[] {'/', '\\'}) + 1));
 #if UNITY_5_4_OR_NEWER
-					if (texHandler.isDone) {
-						var tex = texHandler.texture;
-						texs.Add(name, tex);
-						Logger.Log("main", 0, "Load/MainThread", "Loaded texture {0} ({1} bytes)", name, texLoader.downloadedBytes);
-						texLoader.Dispose();
-						texHandler.Dispose();
-						texLoader = null;
-					}
-					else if (texLoader.downloadProgress != 0) {
-						Logger.Log("main", 0, "Load/MainThread", "Loading texture {0} {1:P0}", name, texLoader.downloadProgress);
-					}
-#else
-					if (texLoader.isDone) {
-						var tex = texLoader.texture;
-						texs.Add(name, tex);
-						Logger.Log("main", 0, "Load/MainThread", "Loaded texture {0} ({1} bytes)", name, texLoader.bytesDownloaded);
-						texLoader.Dispose();
-						texLoader = null;
-					}
-					else if (texLoader.progress != 0) {
-						Logger.Log("main", 0, "Load/MainThread", "Loading texture {0} {1:P0}", name, texLoader.progress);
-					}
-#endif
+				if (texHandler.isDone) {
+					var tex = texHandler.texture;
+					tex.wrapMode = TextureWrapMode.Clamp;
+					texs.Add(name, tex);
+					texLoader.Dispose();
+					texHandler.Dispose();
+					texLoader = null;
 				}
-				if (texLoader == null)
-					if (texLoadQueue.Count > 0) {
+#else
+				if (texLoader.isDone) {
+					var tex = texLoader.texture;
+					tex.wrapMode = TextureWrapMode.Clamp;
+					texs.Add(name, tex);
+					texLoader.Dispose();
+					texLoader = null;
+				}
+#endif
+			}
+			if (texLoader == null)
+				if (texLoadQueue.Count > 0) {
 #if UNITY_5_4_OR_NEWER
-						texHandler = new DownloadHandlerTexture();
-						texLoader = new UnityWebRequest(Game.FileProtocolPrefix + texLoadQueue.Dequeue(), "GET", texHandler, null);
-						texLoader.SendWebRequest();
+					texHandler = new DownloadHandlerTexture();
+					texLoader = new UnityWebRequest(Game.FileProtocolPrefix + texLoadQueue.Dequeue(), "GET", texHandler, null);
+					texLoader.SendWebRequest();
 #else
 						texLoader = new WWW(Game.FileProtocolPrefix + texLoadQueue.Dequeue());
 #endif
-					}
-					else if (!texloaddone) {
-						texloaddone = true;
-						texloadtimer.Stop();
-						Logger.Log("main", 1, "Load/MainThread", "Main thread done ({0}ms)", texloadtimer.Elapsed.TotalMilliseconds);
-					}
-				if (!loadThread.IsAlive) {
-					if (cbus == null) {
-						Logger.Log("main", 4, "Load/MainThread", "Load failed");
-						loadThread = null;
+				}
+				else if (!texloaddone) {
+					texloaddone = true;
+					texloadtimer.Stop();
+					Logger.Log("main", 1, "Load/MainThread", "Main thread done ({0}ms)", texloadtimer.Elapsed.TotalMilliseconds);
+				}
+			if (!loadThread.IsAlive) {
+				if (threadException != null) {
+					Logger.Log("main", 4, "Load/MainThread", "Load failed");
+					loadThread = null;
+					Popup.CreateException(threadException);
 #if BUILD
-						ReturnToMenu();
+					ReturnToMenu();
 #endif
-					}
-					else if (texLoader == null) {
-						Prehandle();
-						loadThread = null;
-					}
+				}
+				else if (texLoader == null) {
+					Prehandle();
+					loadThread = null;
 				}
 			}
-#endif
-			if (logEnabled) {
-				string _logs = logs.text;
-				Game.MainLogger.Enumerate((level, module, msg) => {
-					string color;
-					switch (level) {
-						case 0: color = "#888888"; break;
-						case 1: color = "#bbbbbb"; break;
-						case 2: color = "#0088ff"; break;
-						case 3: color = "#ffff00"; break;
-						case 4: color = "#ff0000"; break;
-						case 5: color = "#bb0000"; break;
-						default: color = "#ff00ff"; break;
-					}
-					_logs += string.Format(
-						"\r\n<color={1}bb><{2}> {3}</color>",
-						DateTime.UtcNow.ToString("s"), color, module, msg
-					);
-				});
-				logs.text = _logs.Substring(Mathf.Max(0, _logs.IndexOf('\n', Mathf.Max(0, _logs.Length - 4096))));
-				var sttext = string.Format(
+		}
+		string timetext = string.Empty;
+		void LogUpdate() {
+			string _logs = logs.text;
+			Game.MainLogger.Enumerate((level, module, msg) => {
+				string color;
+				switch (level) {
+					case 0: color = "#888888"; break;
+					case 1: color = "#bbbbbb"; break;
+					case 2: color = "#0088ff"; break;
+					case 3: color = "#ffff00"; break;
+					case 4: color = "#ff0000"; break;
+					case 5: color = "#bb0000"; break;
+					default: color = "#ff00ff"; break;
+				}
+				_logs += string.Format(
+					"\r\n<color={1}bb><{2}> {3}</color>",
+					DateTime.UtcNow.ToString("s"), color, module, msg
+				);
+			});
+			logs.text = _logs.Substring(Mathf.Max(0, _logs.IndexOf('\n', Mathf.Max(0, _logs.Length - 4096))));
+			var sttext = string.Format(
 					"FPS: i{0:0} / s{1:0}\nSMem: {2:N0} / {3:N0}\nIMem: {4:N0} / {5:N0}",
 					1 / Time.deltaTime,
 					1 / Time.smoothDeltaTime,
@@ -239,18 +245,19 @@ namespace Cryville.Crtr {
 					UnityEngine.Profiling.Profiler.GetTotalReservedMemory()
 #endif
 				);
-				if (started) sttext += string.Format(
-					"\nSTime: {0:R}\nATime: {1:R}\nITime: {2:R}",
-					cbus.Time,
-					Game.AudioClient.Position - atime0,
-					inputProxy.GetTimestampAverage()
-				);
-				if (judge != null) sttext += "\n== Scores ==\n" + judge.GetFullFormattedScoreString();
-				status.text = sttext;
-			}
-			else {
-				Game.MainLogger.Enumerate((level, module, msg) => { });
-			}
+			sttext += timetext;
+			if (judge != null) sttext += "\n== Scores ==\n" + judge.GetFullFormattedScoreString();
+			status.text = sttext;
+		}
+		void OnCameraPostRender(Camera cam) {
+			if (!logEnabled) return;
+			if (started) timetext = string.Format(
+				"\nSTime: {0:R}\nATime: {1:R}\nITime: {2:R}",
+				cbus.Time,
+				Game.AudioClient.Position - atime0,
+				inputProxy.GetTimestampAverage()
+			);
+			else timetext = string.Empty;
 		}
 		#endregion
 
@@ -301,14 +308,13 @@ namespace Cryville.Crtr {
 			autoRenderStep = renderStep == 0;
 			soundOffset = Settings.Default.SoundOffset;
 			startOffset = Settings.Default.StartOffset;
-			sv = Settings.Default.ScrollVelocity;
 			firstFrame = true;
-#if !NO_THREAD
 			texloaddone = false;
-#endif
 			Game.NetworkTaskWorker.SuspendBackgroundTasks();
 			Game.AudioSession = Game.AudioSequencer.NewSession();
 
+			Camera.onPostRender += OnCameraPostRender;
+
 			var hitPlane = new Plane(Vector3.forward, Vector3.zero);
 			var r0 = Camera.main.ViewportPointToRay(new Vector3(0, 0, 1));
 			float dist;
@@ -325,45 +331,48 @@ namespace Cryville.Crtr {
 			FileInfo chartFile = new FileInfo(
 				Game.GameDataPath + "/charts/" + Settings.Default.LoadChart
 			);
+
 			FileInfo rulesetFile = new FileInfo(
 				Game.GameDataPath + "/rulesets/" + Settings.Default.LoadRuleset
 			);
-			FileInfo skinFile = new FileInfo(
-				Game.GameDataPath + "/skins/" + Settings.Default.LoadSkin
+			if (!rulesetFile.Exists) throw new FileNotFoundException("Ruleset for the chart not found\nMake sure you have imported the ruleset");
+
+			FileInfo rulesetConfigFile = new FileInfo(
+				Game.GameDataPath + "/config/rulesets/" + Settings.Default.LoadRulesetConfig
 			);
-#if NO_THREAD
-			texloadtimer.Stop();
-			Logger.LogFormat("main", 0, "Load/MainThread", "Textures loaded successfully ({0}ms)", texloadtimer.Elapsed.TotalMilliseconds);
-			Load(new LoadInfo(){
-				chartFile = chartFile,
-				rulesetFile = rulesetFile,
-				skinFile = skinFile,
-			});
-			Prehandle();
-#else
+			if (!rulesetConfigFile.Exists) throw new FileNotFoundException("Ruleset config not found\nPlease open the config to generate");
+			using (StreamReader cfgreader = new StreamReader(rulesetConfigFile.FullName, Encoding.UTF8)) {
+				_rscfg = JsonConvert.DeserializeObject<RulesetConfig>(cfgreader.ReadToEnd(), new JsonSerializerSettings() {
+					MissingMemberHandling = MissingMemberHandling.Error
+				});
+			}
+			sv = _rscfg.generic.ScrollVelocity;
+
+			FileInfo skinFile = new FileInfo(
+				string.Format("{0}/skins/{1}/{2}/.umgs", Game.GameDataPath, rulesetFile.Directory.Name, _rscfg.generic.Skin)
+			);
+			if (!skinFile.Exists) throw new FileNotFoundException("Skin not found\nPlease specify an available skin in the config");
+			using (StreamReader reader = new StreamReader(skinFile.FullName, Encoding.UTF8)) {
+				skin = JsonConvert.DeserializeObject<Skin>(reader.ReadToEnd(), new JsonSerializerSettings() {
+					MissingMemberHandling = MissingMemberHandling.Error
+				});
+				if (skin.format != Skin.CURRENT_FORMAT) throw new FormatException("Invalid skin file version");
+			}
+
 			loadThread = new Thread(new ParameterizedThreadStart(Load));
 			loadThread.Start(new LoadInfo() {
 				chartFile = chartFile,
 				rulesetFile = rulesetFile,
 				skinFile = skinFile,
 			});
-#endif
 
 			Logger.Log("main", 0, "Load/MainThread", "Loading textures...");
 			texloadtimer = new diag::Stopwatch();
 			texloadtimer.Start();
+			frames = new Dictionary<string, SpriteFrame>();
 			texs = new Dictionary<string, Texture2D>();
-			var flist = skinFile.Directory.GetFiles("*.png");
-			foreach (FileInfo f in flist) {
-#if NO_THREAD
-				using (WWW w = new WWW("file:///" + f.FullName)) {
-					string name = StringUtils.TrimExt(f.Name);
-					while (!w.isDone);
-					texs.Add(name, w.texture);
-				}
-#else
-				texLoadQueue.Enqueue(f.FullName);
-#endif
+			foreach (var f in skin.frames) {
+				texLoadQueue.Enqueue(Path.Combine(skinFile.Directory.FullName, f));
 			}
 		}
 
@@ -372,35 +381,18 @@ namespace Cryville.Crtr {
 				diag::Stopwatch timer = new diag::Stopwatch();
 				timer.Reset(); timer.Start();
 				Logger.Log("main", 0, "Load/Prehandle", "Prehandling (iteration 3)");
-				foreach (var i in plists) i.Init(texs);
 				foreach (var t in texs) {
 					if (frames.ContainsKey(t.Key)) {
 						Logger.Log("main", 3, "Load/Prehandle", "Duplicated texture name: {0}", t.Key);
 						continue;
 					}
-					var f = new Cocos2dFrames.Frame(t.Value);
+					var f = new SpriteFrame(t.Value);
 					f.Init();
 					frames.Add(t.Key, f);
 				}
 				Logger.Log("main", 0, "Load/Prehandle", "Initializing states");
 				cbus.BroadcastInit();
-
-				inputProxy = new InputProxy(pruleset, judge);
-				foreach (var i in Game.InputManager._handlers) {
-					/*if (i is UnityKeyHandler<UnityKeyboardReceiver>) {
-						inputProxy.Set(new InputProxyEntry { Source = new InputSource { Handler = i, Type = (int)KeyCode.Z }, Target = "track0" });
-						inputProxy.Set(new InputProxyEntry { Source = new InputSource { Handler = i, Type = (int)KeyCode.X }, Target = "track1" });
-						inputProxy.Set(new InputProxyEntry { Source = new InputSource { Handler = i, Type = (int)KeyCode.Comma }, Target = "track2" });
-						inputProxy.Set(new InputProxyEntry { Source = new InputSource { Handler = i, Type = (int)KeyCode.Period }, Target = "track3" });
-						break;
-					}*/
-					if (i is UnityMouseHandler) {
-						inputProxy.Set(new InputProxyEntry { Source = new InputSource { Handler = i, Type = 0 }, Target = "screen_x" });
-						break;
-					}
-				}
 				inputProxy.Activate();
-
 				if (logEnabled) ToggleLogs();
 				Logger.Log("main", 0, "Load/Prehandle", "Cleaning up");
 				GC.Collect();
@@ -415,6 +407,7 @@ namespace Cryville.Crtr {
 			}
 			catch (Exception ex) {
 				Game.LogException("Load/Prehandle", "An error occured while prehandling the data", ex);
+				Popup.CreateException(ex);
 				Stop();
 			}
 		}
@@ -422,19 +415,18 @@ namespace Cryville.Crtr {
 		public void Stop() {
 			try {
 				Logger.Log("main", 1, "Game", "Stopping");
-				chart = null;
 				Game.AudioSession = Game.AudioSequencer.NewSession();
-				if (cbus != null) cbus.Dispose();
-				if (bbus != null) bbus.Dispose();
-				if (tbus != null) tbus.Dispose();
-				if (nbus != null) nbus.Dispose();
 				inputProxy.Deactivate();
-				foreach (var t in texs) Texture.Destroy(t.Value);
+				if (cbus != null) { cbus.Dispose(); cbus = null; }
+				if (bbus != null) { bbus.Dispose(); bbus = null; }
+				if (tbus != null) { tbus.Dispose(); tbus = null; }
+				if (nbus != null) { nbus.Dispose(); nbus = null; }
 				Logger.Log("main", 1, "Game", "Stopped");
 			}
 			catch (Exception ex) {
 				if (!logEnabled) ToggleLogs();
 				Game.LogException("Game", "An error occured while stopping", ex);
+				Popup.CreateException(ex);
 			}
 			finally {
 				if (started) {
@@ -462,6 +454,7 @@ namespace Cryville.Crtr {
 			public FileInfo skinFile;
 		}
 
+		Exception threadException;
 #if !NO_THREAD
 		Thread loadThread = null;
 		diag::Stopwatch workerTimer;
@@ -478,6 +471,7 @@ namespace Cryville.Crtr {
 			}
 			catch (Exception ex) {
 				Game.LogException("Load/WorkerThread", "An error occured while loading the data", ex);
+				threadException = ex;
 			}
 		}
 
@@ -509,7 +503,12 @@ namespace Cryville.Crtr {
 				judge = new Judge(pruleset);
 				etor.ContextJudge = judge;
 
-				cbus.AttachSystems(pskin, judge);
+				inputProxy = new InputProxy(pruleset, judge);
+				inputProxy.LoadFrom(_rscfg.inputs);
+				if (!inputProxy.IsCompleted) {
+					throw new ArgumentException("Input config not completed\nPlease complete the input settings");
+				}
+
 				Logger.Log("main", 0, "Load/WorkerThread", "Attaching handlers");
 				var ch = new ChartHandler(chart, dir);
 				cbus.RootState.AttachHandler(ch);
@@ -527,12 +526,17 @@ namespace Cryville.Crtr {
 						ts.Value.AttachHandler(th);
 					}
 				}
+				cbus.AttachSystems(pskin, judge);
 				Logger.Log("main", 0, "Load/WorkerThread", "Prehandling (iteration 1)");
-				cbus.Clone(16).Forward();
+				using (var pbus = cbus.Clone(16)) {
+					pbus.Forward();
+				}
 				Logger.Log("main", 0, "Load/WorkerThread", "Patching events");
 				cbus.DoPatch();
 				Logger.Log("main", 0, "Load/WorkerThread", "Prehandling (iteration 2)");
-				cbus.Clone(17).Forward();
+				using (var pbus = cbus.Clone(17)) {
+					pbus.Forward();
+				}
 
 				Logger.Log("main", 0, "Load/WorkerThread", "Cloning states (type 1)");
 				bbus = cbus.Clone(1, -clippingDist);
@@ -550,7 +554,7 @@ namespace Cryville.Crtr {
 				ruleset = JsonConvert.DeserializeObject<Ruleset>(reader.ReadToEnd(), new JsonSerializerSettings() {
 					MissingMemberHandling = MissingMemberHandling.Error
 				});
-				if (ruleset.format != 1) throw new FormatException("Invalid ruleset file version");
+				if (ruleset.format != Ruleset.CURRENT_FORMAT) throw new FormatException("Invalid ruleset file version");
 				ruleset.LoadPdt(dir);
 				pruleset = ruleset.Root;
 				pruleset.Optimize(etor);
@@ -560,23 +564,9 @@ namespace Cryville.Crtr {
 		void LoadSkin(FileInfo file) {
 			DirectoryInfo dir = file.Directory;
 			Logger.Log("main", 0, "Load/WorkerThread", "Loading skin: {0}", file);
-			using (StreamReader reader = new StreamReader(file.FullName, Encoding.UTF8)) {
-				skin = JsonConvert.DeserializeObject<Skin>(reader.ReadToEnd(), new JsonSerializerSettings() {
-					MissingMemberHandling = MissingMemberHandling.Error
-				});
-				if (skin.format != 1) throw new FormatException("Invalid skin file version");
-				skin.LoadPdt(dir);
-				pskin = skin.Root;
-				pskin.Optimize(etor);
-			}
-			plists = new List<Cocos2dFrames>();
-			frames = new Dictionary<string, Cocos2dFrames.Frame>();
-			foreach (FileInfo f in file.Directory.GetFiles("*.plist")) {
-				var pobj = PlistConvert.Deserialize<Cocos2dFrames>(f.FullName);
-				plists.Add(pobj);
-				foreach (var i in pobj.frames)
-					frames.Add(StringUtils.TrimExt(i.Key), i.Value);
-			}
+			skin.LoadPdt(dir);
+			pskin = skin.Root;
+			pskin.Optimize(etor);
 		}
 		#endregion
 	}

Assets/Cryville/Crtr/Cocos2dFrames.cs

@@ -1,176 +0,0 @@
-using Cryville.Common;
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text.RegularExpressions;
-using UnityEngine;
-
-namespace Cryville.Crtr {
-	[BinderAttribute(typeof(Cocos2dFramesBinder))]
-	public class Cocos2dFrames {
-		public Metadata metadata;
-		public class Metadata {
-			public int format;
-			public Vector2 size;
-			public string textureFileName;
-		}
-
-		public Dictionary<string, Frame> frames;
-		public class Frame {
-#pragma warning disable IDE1006
-			Rect _frame;
-			public Rect frame {
-				get { return _frame; }
-				set { _frame = value; }
-			}
-			public Rect textureRect {
-				get { return _frame; }
-				set { _frame = value; }
-			}
-
-			bool _rotated = false;
-			public bool rotated {
-				get { return _rotated; }
-				set { _rotated = value; }
-			}
-			public bool textureRotated {
-				get { return _rotated; }
-				set { _rotated = value; }
-			}
-#pragma warning restore IDE1006
-
-			public Vector2 offset;
-
-			public Rect sourceColorRect;
-			public Vector2 sourceSize;
-			private Rect _uv;
-			private Vector2[] cuv;
-			public Rect UV {
-				get {
-					return _uv;
-				}
-				private set {
-					_uv = value;
-					float x0 = Mathf.Min(_uv.xMin, _uv.xMax);
-					float x1 = Mathf.Max(_uv.xMin, _uv.xMax);
-					float y0 = Mathf.Min(_uv.yMin, _uv.yMax);
-					float y1 = Mathf.Max(_uv.yMin, _uv.yMax);
-					if (_rotated) cuv = new Vector2[]{
-						new Vector2(x0, y1),
-						new Vector2(x1, y0),
-						new Vector2(x0, y0),
-						new Vector2(x1, y1),
-					};
-					else cuv = new Vector2[]{
-						new Vector2(x0, y0),
-						new Vector2(x1, y1),
-						new Vector2(x1, y0),
-						new Vector2(x0, y1),
-					};
-				}
-			}
-			public Vector2 GetUV(Vector2 uv) {
-				return GetUV(uv.x, uv.y);
-			}
-			public Vector2 GetUV(float u, float v) {
-				Vector2 uv00 = cuv[0], uv11 = cuv[1],
-				uv10 = cuv[2], uv01 = cuv[3];
-				return (1 - u - v) * uv00
-					+ u * uv10
-					+ v * uv01
-					+ u * v * (uv00 + uv11 - uv10 - uv01);
-			}
-			public Texture2D Texture {
-				get;
-				private set;
-			}
-			public Vector2 Size {
-				get {
-					return new Vector2(Texture.width, Texture.height);
-				}
-			}
-			
-			public void Init() {
-				if (Texture == null)
-					throw new InvalidOperationException(); // TODO
-				_frame = new Rect(Vector2.zero, Size);
-				var w = _frame.width;
-				var h = _frame.height;
-				float x = _frame.x / w;
-				float y = 1 - _frame.y / h;
-				float tw = (_rotated ? _frame.height : _frame.width) / w;
-				float th = (_rotated ? _frame.width : _frame.height) / h;
-				if (_rotated) UV = new Rect(x, y, tw, -th);
-				else UV = new Rect(x, y, tw, -th);
-			}
-
-			public void Init(int w, int h, Texture2D _base) {
-				if (Texture != null)
-					throw new InvalidOperationException(); // TODO
-				Texture = _base;
-				float x = _frame.x / w;
-				float y = 1 - _frame.y / h;
-				float tw = (_rotated ? _frame.height : _frame.width) / w;
-				float th = (_rotated ? _frame.width : _frame.height) / h;
-				if (_rotated) UV = new Rect(x, y, tw, -th);
-				else UV = new Rect(x, y, tw, -th);
-			}
-			public Frame() { }
-			public Frame(Texture2D tex) {
-				Texture = tex;
-			}
-		}
-
-		Texture2D _base;
-
-		public void Init(Dictionary<string, Texture2D> texs) {
-			_base = texs[StringUtils.TrimExt(metadata.textureFileName)];
-			var w = (int)metadata.size.x;
-			var h = (int)metadata.size.y;
-			if (w == 0 || h == 0) {
-				w = _base.width;
-				h = _base.height;
-			}
-			foreach (var f in frames) {
-				f.Value.Init(w, h, _base);
-			}
-		}
-	}
-
-	public class Cocos2dFramesBinder : EmptyBinder {
-		public override object ChangeType(object value, Type type, CultureInfo culture) {
-			if (value is string) {
-				var str = (string)value;
-				if (type == typeof(Rect)) {
-					var m = Regex.Match(str, @"^{({.*?}),({.*?})}$");
-					var p = (Vector2)ChangeType(m.Groups[1].Value, typeof(Vector2), culture);
-					var s = (Vector2)ChangeType(m.Groups[2].Value, typeof(Vector2), culture);
-					return new Rect(p, s);
-				}
-				else if (type == typeof(Vector2)) {
-					var m = Regex.Match(str, @"^{(.*?),(.*?)}$");
-					var w = float.Parse(m.Groups[1].Value);
-					var h = float.Parse(m.Groups[2].Value);
-					return new Vector2(w, h);
-				}
-			}
-			else if (typeof(IDictionary).IsAssignableFrom(value.GetType())) {
-				var dict = (IDictionary)value;
-				if (type == typeof(Rect)) {
-					var x = float.Parse((string)dict["x"]);
-					var y = float.Parse((string)dict["y"]);
-					var w = float.Parse((string)dict["w"]);
-					var h = float.Parse((string)dict["h"]);
-					return new Rect(x, y, w, h);
-				}
-				else if (type == typeof(Vector2)) {
-					var w = float.Parse((string)dict["w"]);
-					var h = float.Parse((string)dict["h"]);
-					return new Vector2(w, h);
-				}
-			}
-			return base.ChangeType(value, type, culture);
-		}
-	}
-}

Assets/Cryville/Crtr/Components/MeshBase.cs

@@ -0,0 +1,28 @@
+using System;
+
+namespace Cryville.Crtr.Components {
+	public abstract class MeshBase : SkinComponent {
+		public MeshBase() {
+			SubmitProperty("zindex", new PropOp.Integer(v => ZIndex = (short)v));
+		}
+
+		protected MeshWrapper mesh = new MeshWrapper();
+
+		short _zindex;
+		public short ZIndex {
+			get {
+				return _zindex;
+			}
+			set {
+				if (value < 0 || value > 5000)
+					throw new ArgumentOutOfRangeException("value", "Z-index must be in [0..5000]");
+				_zindex = value;
+				UpdateZIndex();
+			}
+		}
+		protected void UpdateZIndex() {
+			if (!mesh.Initialized) return;
+			mesh.Renderer.material.renderQueue = _zindex;
+		}
+	}
+}

Assets/Cryville/Crtr/Components/MeshBase.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 75daba44e5811b943a08e6f137cc2b0c
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Cryville/Crtr/Components/SectionalGameObject.cs

@@ -5,11 +5,10 @@ using System.Collections.Generic;
 using UnityEngine;
 
 namespace Cryville.Crtr.Components {
-	public abstract class SectionalGameObject : SkinComponent {
+	public abstract class SectionalGameObject : MeshBase {
 		protected Vector3? prevpt;
 		protected Quaternion? prevrot;
 		protected int vertCount = 0;
-		protected MeshWrapper mesh = new MeshWrapper();
 
 		protected override void OnDestroy() {
 			mesh.Destroy();
@@ -56,7 +55,6 @@ namespace Cryville.Crtr.Components {
 			SubmitProperty("head", new PropOp.String(v => head.FrameName = v));
 			SubmitProperty("body", new PropOp.String(v => body.FrameName = v));
 			SubmitProperty("tail", new PropOp.String(v => tail.FrameName = v));
-			SubmitProperty("transparent", new PropOp.Boolean(v => transparent = v));
 			SubmitProperty("shape", new op_set_shape(this));
 		}
 
@@ -94,7 +92,6 @@ namespace Cryville.Crtr.Components {
 		public SpriteInfo body = new SpriteInfo();
 		public SpriteInfo tail = new SpriteInfo();
 
-		public bool transparent;
 		List<Vector3> vertices;
 		List<float> lengths;
 		float sumLength = 0;
@@ -106,7 +103,7 @@ namespace Cryville.Crtr.Components {
 			body.Load();
 			tail.Load();
 
-			mesh.Init(transform, transparent);
+			mesh.Init(transform);
 
 			List<Material> materials = new List<Material>();
 			if (head.FrameName != null) AddMat(materials, head.FrameName);

Assets/Cryville/Crtr/Components/SpriteBase.cs

@@ -2,14 +2,12 @@
 using UnityEngine;
 
 namespace Cryville.Crtr.Components {
-	public abstract class SpriteBase : SkinComponent {
+	public abstract class SpriteBase : MeshBase {
 		public SpriteBase() {
 			SubmitProperty("bound", new op_set_bound(this));
-			SubmitProperty("transparent", new PropOp.Boolean(v => transparent = v));
 			SubmitProperty("pivot", new PropOp.Vector2(v => Pivot = v));
 			SubmitProperty("scale", new PropOp.Vector2(v => Scale = v));
 			SubmitProperty("ui", new PropOp.Boolean(v => UI = v));
-			SubmitProperty("zindex", new PropOp.Integer(v => ZIndex = (short)v));
 		}
 
 #pragma warning disable IDE1006
@@ -27,8 +25,6 @@ namespace Cryville.Crtr.Components {
 		}
 #pragma warning restore IDE1006
 
-		protected MeshWrapper mesh = new MeshWrapper();
-
 		protected override void OnDestroy() {
 			mesh.Destroy();
 		}
@@ -82,21 +78,6 @@ namespace Cryville.Crtr.Components {
 			if (da.x != 0) _scale.x = dp.x / da.x;
 			if (da.y != 0) _scale.y = dp.z / da.y;
 		}
-		
-		short _zindex;
-		public short ZIndex {
-			get {
-				return _zindex;
-			}
-			set {
-				_zindex = value;
-				UpdateZIndex();
-			}
-		}
-		protected void UpdateZIndex() {
-			if (!mesh.Initialized) return;
-			mesh.Renderer.sortingOrder = _zindex;
-		}
 
 		static readonly Quaternion uirot
 			= Quaternion.Euler(new Vector3(-90, 0, 0));
@@ -109,10 +90,8 @@ namespace Cryville.Crtr.Components {
 			}
 		}
 
-		public bool transparent = false;
-
 		protected void InternalInit(string meshName = "quad") {
-			mesh.Init(transform, transparent);
+			mesh.Init(transform);
 			mesh.Mesh = GenericResources.Meshes[meshName];
 			UpdateScale();
 			UpdateZIndex();

Assets/Cryville/Crtr/Components/SpritePlane.cs

@@ -5,7 +5,7 @@ using Logger = Cryville.Common.Logger;
 namespace Cryville.Crtr.Components {
 	public class SpriteInfo {
 		public string FrameName;
-		public Cocos2dFrames.Frame Frame {
+		public SpriteFrame Frame {
 			get;
 			private set;
 		}

Assets/Cryville/Crtr/Components/SpriteRect.cs

@@ -4,8 +4,6 @@ namespace Cryville.Crtr.Components {
 	public class SpriteRect : SpriteBase {
 		public SpriteRect() {
 			SubmitProperty("color", new PropOp.Color(v => Color = v));
-
-			transparent = true;
 		}
 
 		Color _color;

Assets/Cryville/Crtr/Components/SpriteText.cs

@@ -86,7 +86,7 @@ namespace Cryville.Crtr.Components {
 				else if (frameHeight != f.Value.Rect.height) throw new Exception("Inconsistent frame height");
 				if (!meshes.ContainsKey(f.Value.Frame.Texture)) {
 					var m = new MeshWrapper();
-					m.Init(mesh.MeshTransform, transparent);
+					m.Init(mesh.MeshTransform);
 					m.Mesh = new Mesh();
 					m.Renderer.material.mainTexture = f.Value.Frame.Texture;
 					meshes.Add(f.Value.Frame.Texture, m);

Assets/Cryville/Crtr/Config/ConfigScene.cs

@@ -1,8 +1,85 @@
-using UnityEngine;
+using JetBrains.Annotations;
+using Newtonsoft.Json;
+using System;
+using System.IO;
+using System.Text;
+using UnityEngine;
 using UnityEngine.SceneManagement;
 
 namespace Cryville.Crtr.Config {
 	public class ConfigScene : MonoBehaviour {
+		[SerializeField]
+		Transform m_content;
+
+		[SerializeField]
+		SettingsPanel m_genericConfigPanel;
+
+		[SerializeField]
+		InputConfigPanel m_inputConfigPanel;
+
+		public Ruleset ruleset;
+		RulesetConfig _rscfg;
+
+		void Awake() {
+			ChartPlayer.etor = new PdtEvaluator();
+			FileInfo file = new FileInfo(
+				Game.GameDataPath + "/rulesets/" + Settings.Default.LoadRuleset
+			);
+			if (!file.Exists) {
+				Popup.Create("Ruleset for the chart not found\nMake sure you have imported the ruleset");
+				ReturnToMenu();
+				return;
+			}
+			DirectoryInfo dir = file.Directory;
+			using (StreamReader reader = new StreamReader(file.FullName, Encoding.UTF8)) {
+				ruleset = JsonConvert.DeserializeObject<Ruleset>(reader.ReadToEnd(), new JsonSerializerSettings() {
+					MissingMemberHandling = MissingMemberHandling.Error
+				});
+				if (ruleset.format != Ruleset.CURRENT_FORMAT) throw new FormatException("Invalid ruleset file version");
+				ruleset.LoadPdt(dir);
+			}
+			FileInfo cfgfile = new FileInfo(
+				Game.GameDataPath + "/config/rulesets/" + Settings.Default.LoadRulesetConfig
+			);
+			if (!cfgfile.Exists) {
+				if (!cfgfile.Directory.Exists) cfgfile.Directory.Create();
+				_rscfg = new RulesetConfig();
+			}
+			else {
+				using (StreamReader cfgreader = new StreamReader(cfgfile.FullName, Encoding.UTF8)) {
+					_rscfg = JsonConvert.DeserializeObject<RulesetConfig>(cfgreader.ReadToEnd(), new JsonSerializerSettings() {
+						MissingMemberHandling = MissingMemberHandling.Error
+					});
+				}
+			}
+
+			m_genericConfigPanel.Target = _rscfg.generic;
+
+			var proxy = new InputProxy(ruleset.Root, null);
+			proxy.LoadFrom(_rscfg.inputs);
+			m_inputConfigPanel.proxy = proxy;
+			Game.InputManager.Activate();
+		}
+
+		public void SwitchCategory(GameObject cat) {
+			foreach (Transform c in m_content) {
+				c.gameObject.SetActive(false);
+			}
+			cat.SetActive(true);
+		}
+
+		public void SaveAndReturnToMenu() {
+			Game.InputManager.Deactivate();
+			m_inputConfigPanel.proxy.SaveTo(_rscfg.inputs);
+			m_inputConfigPanel.proxy.Dispose();
+			FileInfo cfgfile = new FileInfo(
+				Game.GameDataPath + "/config/rulesets/" + Settings.Default.LoadRulesetConfig
+			);
+			using (StreamWriter cfgwriter = new StreamWriter(cfgfile.FullName, false, Encoding.UTF8)) {
+				cfgwriter.Write(JsonConvert.SerializeObject(_rscfg, Game.GlobalJsonSerializerSettings));
+			}
+			ReturnToMenu();
+		}
 		public void ReturnToMenu() {
 			GameObject.Find("Master").GetComponent<Master>().ShowMenu();
 #if UNITY_5_5_OR_NEWER

Assets/Cryville/Crtr/Config/InputConfigPanel.cs

@@ -1,15 +1,14 @@
 using Cryville.Common.Unity;
 using Cryville.Common.Unity.Input;
-using Newtonsoft.Json;
-using System;
 using System.Collections.Generic;
-using System.IO;
-using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
 
 namespace Cryville.Crtr.Config {
-	public class InputConfig : MonoBehaviour {
+	public class InputConfigPanel : MonoBehaviour {
+		[SerializeField]
+		ConfigScene m_configScene;
+
 		[SerializeField]
 		GameObject m_inputDialog;
 
@@ -25,14 +24,13 @@ namespace Cryville.Crtr.Config {
 		[SerializeField]
 		GameObject m_prefabInputConfigEntry;
 
-		InputProxy _proxy;
-		Dictionary<string, InputConfigEntry> _entries = new Dictionary<string, InputConfigEntry>();
+		public InputProxy proxy;
+		Dictionary<string, InputConfigPanelEntry> _entries = new Dictionary<string, InputConfigPanelEntry>();
 
 		string _sel;
 		public void OpenDialog(string entry) {
 			_sel = entry;
 			m_inputDialog.SetActive(true);
-			Game.InputManager.Activate();
 			CallHelper.Purge(m_deviceList);
 			_recvsrcs.Clear();
 			AddSourceItem(null);
@@ -40,39 +38,24 @@ namespace Cryville.Crtr.Config {
 
 		public void CloseDialog() {
 			m_inputDialog.SetActive(false);
-			Game.InputManager.Deactivate();
 		}
 
 		public void CloseDialog(InputSource? src) {
-			_proxy.Set(new InputProxyEntry {
+			proxy.Set(new InputProxyEntry {
 				Target = _sel,
 				Source = src,
 			});
 			m_inputDialog.SetActive(false);
-			Game.InputManager.Deactivate();
 		}
 
 		void Start() {
-			ChartPlayer.etor = new PdtEvaluator();
-			FileInfo file = new FileInfo(
-				Game.GameDataPath + "/rulesets/" + Settings.Default.LoadRuleset
-			);
-			DirectoryInfo dir = file.Directory;
-			using (StreamReader reader = new StreamReader(file.FullName, Encoding.UTF8)) {
-				var ruleset = JsonConvert.DeserializeObject<Ruleset>(reader.ReadToEnd(), new JsonSerializerSettings() {
-					MissingMemberHandling = MissingMemberHandling.Error
-				});
-				if (ruleset.format != 1) throw new FormatException("Invalid ruleset file version");
-				ruleset.LoadPdt(dir);
-				_proxy = new InputProxy(ruleset.Root, null);
-				foreach (var i in ruleset.Root.inputs) {
-					var e = GameObject.Instantiate(m_prefabInputConfigEntry).GetComponent<InputConfigEntry>();
-					e.transform.SetParent(m_entryList.transform);
-					_entries.Add(i.Key, e);
-					e.SetKey(this, i.Key);
-				}
-				_proxy.ProxyChanged += OnProxyChanged;
+			foreach (var i in m_configScene.ruleset.Root.inputs) {
+				var e = GameObject.Instantiate(m_prefabInputConfigEntry, m_entryList.transform).GetComponent<InputConfigPanelEntry>();
+				_entries.Add(i.Key, e);
+				e.SetKey(this, i.Key);
+				OnProxyChanged(this, proxy[i.Key]);
 			}
+			proxy.ProxyChanged += OnProxyChanged;
 		}
 
 		void OnProxyChanged(object sender, ProxyChangedEventArgs e) {
@@ -92,11 +75,10 @@ namespace Cryville.Crtr.Config {
 		void AddSourceItem(InputSource? src) {
 			if (_recvsrcs.Contains(src)) return;
 			_recvsrcs.Add(src);
-			var obj = Instantiate(m_prefabListItem);
-			obj.transform.SetParent(m_deviceList);
+			var obj = Instantiate(m_prefabListItem, m_deviceList);
 			obj.transform.Find("Text").GetComponent<Text>().text = src == null ? "None" : src.Value.Handler.GetTypeName(src.Value.Type);
 			var btn = obj.GetComponent<Button>();
-			if (src != null) btn.interactable = !_proxy.IsUsed(src.Value);
+			if (src != null) btn.interactable = !proxy.IsUsed(src.Value);
 			btn.onClick.AddListener(() => {
 				CloseDialog(src);
 			});

Assets/Cryville/Crtr/Config/InputConfigPanelEntry.cs

@@ -2,7 +2,7 @@
 using UnityEngine.UI;
 
 namespace Cryville.Crtr.Config {
-	public class InputConfigEntry : MonoBehaviour {
+	public class InputConfigPanelEntry : MonoBehaviour {
 		[SerializeField]
 		Text m_key;
 
@@ -12,7 +12,7 @@ namespace Cryville.Crtr.Config {
 		[SerializeField]
 		Button m_button;
 
-		public void SetKey(InputConfig master, string name) {
+		public void SetKey(InputConfigPanel master, string name) {
 			m_key.text = name;
 			m_value.text = "None";
 			m_button.onClick.AddListener(() => {

Assets/Cryville/Crtr/Config/RulesetConfig.cs

@@ -0,0 +1,32 @@
+using Cryville.Common.ComponentModel;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+
+namespace Cryville.Crtr.Config {
+	public class RulesetConfig {
+		public Generic generic = new Generic();
+		public class Generic {
+			[Category("basic")]
+			[JsonProperty("skin")]
+			public string Skin { get; set; }
+
+			[Category("deprecated")][Obsolete]
+			[JsonProperty("scroll_velocity")][DefaultValue(1)]
+			[LogarithmicScale][Step(0.5f)][Precision(1e-1)]
+			public float ScrollVelocity { get; set; }
+
+			public Generic() {
+				Skin = "";
+				ScrollVelocity = 1;
+			}
+		}
+		public Dictionary<string, InputEntry> inputs
+			= new Dictionary<string, InputEntry>();
+		public class InputEntry {
+			public string handler;
+			public int type;
+		}
+	}
+}

Assets/Cryville/Crtr/Config/RulesetConfig.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: aa140184f4b7acb4b994a0826e1f107d
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Cryville/Crtr/Event/ContainerHandler.cs

@@ -63,6 +63,13 @@ namespace Cryville.Crtr.Event {
 			get { return cs.Container; }
 		}
 		
+		public SkinContainer skinContainer;
+		public Judge judge;
+		public void AttachSystems(PdtSkin skin, Judge judge) {
+			skinContainer = new SkinContainer(skin);
+			this.judge = judge;
+		}
+
 		public ContainerHandler() { }
 		public abstract string TypeName {
 			get;
@@ -82,7 +89,7 @@ namespace Cryville.Crtr.Event {
 		/// Called upon initialization of <see cref="cs" />.
 		/// </summary>
 		public virtual void Init() {
-			cs.skinContainer.MatchStatic(cs);
+			skinContainer.MatchStatic(cs);
 			foreach (var i in gogroup.GetComponentsInChildren<SkinComponent>())
 				i.Init();
 		}
@@ -115,7 +122,7 @@ namespace Cryville.Crtr.Event {
 		public virtual void Update(ContainerState s, StampedEvent ev) {
 			bool flag = !Awoken && s.CloneType >= 2 && s.CloneType < 16;
 			if (flag) PreAwake(s);
-			if (Awoken && s.CloneType <= 2) if (gogroup) cs.skinContainer.MatchDynamic(s);
+			if (Awoken && s.CloneType <= 2) if (gogroup) skinContainer.MatchDynamic(s);
 			if (flag) Awake(s);
 		}
 		public virtual void ExUpdate(ContainerState s, StampedEvent ev) { }
@@ -123,7 +130,7 @@ namespace Cryville.Crtr.Event {
 		public virtual void EndUpdate(ContainerState s) {
 			if (s.CloneType < 16) {
 				Awoken = false;
-				if (gogroup && s.CloneType <= 2) cs.skinContainer.MatchDynamic(s);
+				if (gogroup && s.CloneType <= 2) skinContainer.MatchDynamic(s);
 			}
 		}
 		public virtual void Anchor() { }

Assets/Cryville/Crtr/Event/ContainerState.cs

@@ -50,8 +50,6 @@ namespace Cryville.Crtr.Event {
 		public byte CloneType;
 		private ContainerState rootPrototype = null;
 		private ContainerState prototype = null;
-		public SkinContainer skinContainer;
-		public Judge judge;
 
 		public ContainerHandler Handler {
 			get;
@@ -196,7 +194,7 @@ namespace Cryville.Crtr.Event {
 		public void Dispose() {
 			if (Disposed) return;
 			Disposed = true;
-			if (Handler != null) Handler.Dispose();
+			if (CloneType < 16 && Handler != null) Handler.Dispose();
 			foreach (var s in Children)
 				s.Value.Dispose();
 			RMVPool.ReturnAll();
@@ -210,8 +208,7 @@ namespace Cryville.Crtr.Event {
 		}
 
 		public void AttachSystems(PdtSkin skin, Judge judge) {
-			skinContainer = new SkinContainer(skin);
-			this.judge = judge;
+			Handler.AttachSystems(skin, judge);
 		}
 
 		public Vector GetRawValue(Identifier key) {

Assets/Cryville/Crtr/Event/EventBus.cs

@@ -35,6 +35,7 @@ namespace Cryville.Crtr.Event {
 			r.invalidatedStates = new HashSet<ContainerState>();
 			r.Time += offsetTime;
 			r.RootState = RootState.Clone(ct);
+			r.RootState.StartUpdate();
 			r.Expand();
 			r.AttachBus();
 			foreach (var s in r.states) r.invalidatedStates.Add(s.Value);

Assets/Cryville/Crtr/Event/RMVPool.cs

@@ -20,7 +20,7 @@ namespace Cryville.Crtr.Event {
 				_buckets.Add(reg.Key, new Bucket(reg.Key, 4096));
 		}
 
-		readonly Dictionary<RealtimeMotionValue, string> _rented = new Dictionary<RealtimeMotionValue, string>();
+		readonly Dictionary<RealtimeMotionValue, Identifier> _rented = new Dictionary<RealtimeMotionValue, Identifier>();
 		public RealtimeMotionValue Rent(Identifier name) {
 			var n = name;
 			var obj = _buckets[n].Rent();

Assets/Cryville/Crtr/Extensions/Bestdori.meta

@@ -1,9 +1,8 @@
 fileFormatVersion: 2
-guid: 925f95cb7c6644a4695b2701d42e1ea2
+guid: b9bd9e24d7c553341a2a12391843542f
 folderAsset: yes
-timeCreated: 1606989037
-licenseType: Free
 DefaultImporter:
+  externalObjects: {}
   userData: 
   assetBundleName: 
   assetBundleVariant: 

Assets/Cryville/Crtr/Extensions/Bestdori/BestdoriChartConverter.cs

@@ -0,0 +1,183 @@
+using Cryville.Common;
+using Cryville.Common.Math;
+using Cryville.Crtr.Browsing;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.IO;
+
+namespace Cryville.Crtr.Extensions.Bestdori {
+	public class BestdoriChartConverter : ResourceConverter {
+		static readonly string[] SUPPORTED_FORMATS = { ".json" };
+		public override string[] GetSupportedFormats() {
+			return SUPPORTED_FORMATS;
+		}
+
+		public override IEnumerable<Resource> ConvertFrom(FileInfo file) {
+			List<Resource> result = new List<Resource>();
+			List<BestdoriChartEvent> src;
+			using (var reader = new StreamReader(file.FullName)) {
+				src = JsonConvert.DeserializeObject<List<BestdoriChartEvent>>(reader.ReadToEnd());
+			}
+			var group = new Chart.Group() {
+				tracks = new List<Chart.Track>(),
+				notes = new List<Chart.Note>(),
+				motions = new List<Chart.Motion>(),
+			};
+			Chart chart = new Chart {
+				format = 2,
+				time = new BeatTime(0, 0, 1),
+				ruleset = "bang_dream_girls_band_party",
+				sigs = new List<Chart.Signature>(),
+				sounds = new List<Chart.Sound>(),
+				motions = new List<Chart.Motion>(),
+				groups = new List<Chart.Group> { group },
+			};
+			string bgm = null;
+			double? cbpm = null;
+			double pbeat = 0, ctime = 0;
+			double endbeat = 0;
+			foreach (var ev in src) {
+				double cbeat = ev.StartBeat;
+				ctime += cbpm == null ? 0 : (cbeat - pbeat) / cbpm.Value * 60;
+				pbeat = cbeat;
+				if (cbeat > endbeat) endbeat = cbeat;
+				if (ev is BestdoriChartEvent.System) {
+					if (bgm != null) continue;
+					var tev = (BestdoriChartEvent.System)ev;
+					bgm = StringUtils.TrimExt(tev.data);
+					var name = "bang_dream_girls_band_party__" + bgm;
+					result.Add(new SongResource(name, new FileInfo(Path.Combine(file.Directory.FullName, tev.data))));
+					chart.sounds.Add(new Chart.Sound { time = ToBeatTime(tev.beat), id = name });
+				}
+				else if (ev is BestdoriChartEvent.BPM) {
+					var tev = (BestdoriChartEvent.BPM)ev;
+					cbpm = tev.bpm;
+					chart.sigs.Add(new Chart.Signature { time = ToBeatTime(tev.beat), tempo = (float)tev.bpm });
+				}
+				else if (ev is BestdoriChartEvent.Single) {
+					var tev = (BestdoriChartEvent.Single)ev;
+					group.notes.Add(new Chart.Note {
+						time = ToBeatTime(tev.beat),
+						judges = new List<Chart.Judge> { new Chart.Judge { name = tev.flick ? "single_flick" : "single" } },
+						motions = new List<Chart.Motion> { new Chart.Motion { motion = "track:" + tev.lane.ToString() } },
+					});
+				}
+				else if (ev is BestdoriChartEvent.Long) {
+					var tev = (BestdoriChartEvent.Long)ev;
+					var c1 = tev.connections[tev.connections.Count - 1];
+					var note = new Chart.Note {
+						time = ToBeatTime(tev.connections[0].beat),
+						endtime = ToBeatTime(c1.beat),
+						judges = new List<Chart.Judge>(),
+					};
+					for (int i = 0; i < tev.connections.Count; i++) {
+						BestdoriChartEvent.Connection c = tev.connections[i];
+						note.motions.Add(new Chart.Motion { motion = "track:" + c.lane.ToString() });
+						if (i == 0)
+							note.judges.Add(new Chart.Judge { name = "single" });
+						else if (i == tev.connections.Count - 1)
+							note.judges.Add(new Chart.Judge { time = ToBeatTime(c.beat), name = c.flick ? "longend_flick" : "longend" });
+						else if (!c.hidden)
+							note.judges.Add(new Chart.Judge { time = ToBeatTime(c.beat), name = "longnode" });
+					}
+					if (c1.beat > endbeat) endbeat = c1.beat;
+					group.notes.Add(note);
+				}
+				else throw new NotImplementedException("Unsupported event: " + ev.type);
+			}
+			if (bgm == null) throw new FormatException("Chart contains no song");
+			chart.endtime = ToBeatTime(endbeat);
+			result.Add(new RawChartResource(string.Format("bang_dream_girls_band_party__{0}__{1}", bgm, StringUtils.TrimExt(file.Name)), chart, new ChartMeta {
+				name = string.Format("Bandori {0} {1}", bgm, StringUtils.TrimExt(file.Name)),
+				author = "©BanG Dream! Project ©Craft Egg Inc. ©bushiroad",
+				ruleset = "bang_dream_girls_band_party",
+				note_count = group.notes.Count,
+				length = (float)ctime,
+				song = new SongMetaInfo {
+					name = bgm,
+					author = "©BanG Dream! Project ©Craft Egg Inc. ©bushiroad",
+				}
+			}));
+			return result;
+		}
+
+		BeatTime ToBeatTime(double beat, double error = 1e-4) {
+			int i, n, d;
+			FractionUtils.ToFraction(beat, error, out n, out d);
+			i = n / d; n %= d;
+			return new BeatTime(i, n, d);
+		}
+	}
+
+#pragma warning disable IDE1006
+	[JsonConverter(typeof(BestdoriChartEventCreator))]
+	abstract class BestdoriChartEvent {
+		public abstract string type { get; }
+		public abstract double StartBeat { get; }
+		public abstract class InstantEvent : BestdoriChartEvent {
+			public double beat;
+			public override double StartBeat { get { return beat; } }
+		}
+		public class BPM : InstantEvent {
+			public override string type { get { return "BPM"; } }
+			public double bpm;
+		}
+		public class System : InstantEvent {
+			public override string type { get { return "System"; } }
+			public string data;
+		}
+		public abstract class SingleBase : InstantEvent {
+			public double lane;
+			public bool skill;
+			public bool flick;
+		}
+		public class Single : SingleBase {
+			public override string type { get { return "Single"; } }
+		}
+		public class Directional : SingleBase {
+			public override string type { get { return "Directional"; } }
+			public string direction;
+			public int width;
+		}
+		public class Connection : SingleBase {
+			public override string type { get { return null; } }
+			public bool hidden;
+		}
+		public class Long : BestdoriChartEvent {
+			public override string type { get { return "Long"; } }
+			public List<Connection> connections;
+			public override double StartBeat { get { return connections[0].beat; } }
+		}
+		public class Slide : Long {
+			public override string type { get { return "Slide"; } }
+		}
+	}
+#pragma warning restore IDE1006
+	class BestdoriChartEventCreator : CustomCreationConverter<BestdoriChartEvent> {
+		string _currentType;
+
+		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer) {
+			var obj = JObject.ReadFrom(reader);
+			var type = obj["type"];
+			if (type == null) _currentType = null;
+			else _currentType = obj["type"].ToObject<string>();
+			return base.ReadJson(obj.CreateReader(), objectType, existingValue, serializer);
+		}
+
+		public override BestdoriChartEvent Create(Type objectType) {
+			switch (_currentType) {
+				case "BPM": return new BestdoriChartEvent.BPM();
+				case "System": return new BestdoriChartEvent.System();
+				case "Single": return new BestdoriChartEvent.Single();
+				case "Directional": return new BestdoriChartEvent.Directional();
+				case null: return new BestdoriChartEvent.Connection();
+				case "Long": return new BestdoriChartEvent.Long();
+				case "Slide": return new BestdoriChartEvent.Slide();
+				default: throw new ArgumentException("Unknown event type: " + _currentType);
+			}
+		}
+	}
+}

Assets/Cryville/Crtr/Extensions/Bestdori/BestdoriChartConverter.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: e3c5a8bf05d5e284ba498e91cb0dd35e
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Cryville/Crtr/Extensions/Malody/MalodyChartConverter.cs

@@ -2,6 +2,7 @@ using Cryville.Crtr.Browsing;
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.IO;
 using System.Linq;
 
@@ -17,23 +18,32 @@ namespace Cryville.Crtr.Extensions.Malody {
 		public override IEnumerable<Resource> ConvertFrom(FileInfo file) {
 			List<Resource> result = new List<Resource>();
 			MalodyChart src;
+			if (file.Extension != ".mc") throw new NotImplementedException("mcz file is not supported");
 			using (var reader = new StreamReader(file.FullName)) {
 				src = JsonConvert.DeserializeObject<MalodyChart>(reader.ReadToEnd());
 			}
 			if (src.meta.mode != 0) throw new NotImplementedException("The chart mode is not supported");
+			if (src.meta.mode_ext.column != 4) throw new NotImplementedException("The key count is not supported");
+
+			var ruleset = "malody!" + MODES[src.meta.mode];
+			if (src.meta.mode == 0) {
+				ruleset += "." + src.meta.mode_ext.column.ToString(CultureInfo.InvariantCulture) + "k";
+			}
 
 			ChartMeta meta = new ChartMeta() {
-				song = new ChartMeta.MetaInfo() {
+				name = src.meta.version,
+				author = src.meta.creator,
+				song = new SongMetaInfo() {
 					name = src.meta.song.titleorg != null ? src.meta.song.titleorg : src.meta.song.title,
 					author = src.meta.song.artistorg != null ? src.meta.song.artistorg : src.meta.song.artist,
 				},
-				ruleset = "malody!" + MODES[src.meta.mode],
+				ruleset = ruleset,
 			};
 
 			Chart chart = new Chart {
 				format = 2,
 				time = new BeatTime(-4, 0, 1),
-				ruleset = "malody!" + MODES[src.meta.mode],
+				ruleset = ruleset,
 				sigs = new List<Chart.Signature>(),
 				sounds = new List<Chart.Sound>(),
 				motions = new List<Chart.Motion>(),
@@ -64,16 +74,17 @@ namespace Cryville.Crtr.Extensions.Malody {
 			Dictionary<MalodyChart.IEvent, StartEventState> longEvents
 				= new Dictionary<MalodyChart.IEvent, StartEventState>();
 
-			float? baseBpm = null;
+			float? baseBpm = null, cbpm = null;
 			float pbeat = 0f, ctime = 0f;
 			int[] endbeat = new int[] { 0, 0, 1 };
 			foreach (var ev in events) {
-				float cbeat = bp(ev.beat);
-				ctime += baseBpm == null ? 0 : (cbeat - pbeat) / baseBpm.Value * 60f;
+				float cbeat = ConvertBeat(ev.beat);
+				ctime += cbpm == null ? 0 : (cbeat - pbeat) / cbpm.Value * 60f;
 				pbeat = cbeat;
 				if (ev is MalodyChart.Time) {
 					var tev = (MalodyChart.Time)ev;
 					if (baseBpm == null) baseBpm = tev.bpm;
+					cbpm = tev.bpm;
 					chart.sigs.Add(new Chart.Signature {
 						time = new BeatTime(ev.beat[0], ev.beat[1], ev.beat[2]),
 						tempo = tev.bpm,
@@ -105,7 +116,7 @@ namespace Cryville.Crtr.Extensions.Malody {
 						else throw new NotImplementedException();
 					}
 					else {
-						if (bp(tev.beat) > bp(endbeat)) endbeat = tev.beat;
+						if (ConvertBeat(tev.beat) > ConvertBeat(endbeat)) endbeat = tev.beat;
 						var rn = new Chart.Note() {
 							time = new BeatTime(tev.beat[0], tev.beat[1], tev.beat[2]),
 							motions = new List<Chart.Motion> {
@@ -113,7 +124,7 @@ namespace Cryville.Crtr.Extensions.Malody {
 							},
 						};
 						if (tev.endbeat != null) {
-							if (bp(tev.endbeat) > bp(endbeat)) endbeat = tev.endbeat;
+							if (ConvertBeat(tev.endbeat) > ConvertBeat(endbeat)) endbeat = tev.endbeat;
 							rn.endtime = new BeatTime(tev.endbeat[0], tev.endbeat[1], tev.endbeat[2]);
 							longEvents.Add(ev, new StartEventState {
 								Destination = rn,
@@ -134,16 +145,13 @@ namespace Cryville.Crtr.Extensions.Malody {
 				else throw new NotSupportedException();
 			}
 			chart.endtime = new BeatTime(endbeat[0] + 4, endbeat[1], endbeat[2]);
-			meta.chart = new ChartMeta.MetaInfo() {
-				name = src.meta.version,
-				author = src.meta.creator,
-				length = ctime,
-			};
+			meta.length = ctime;
 			meta.note_count = group.notes.Count;
-			string chartName = string.Format("{0} - {1}", meta.song.name, meta.chart.name);
-			result.Add(new ChartResource(chartName, chart, meta));
-			if (src.meta.background != null)
-				result.Add(new CoverResource(chartName, new FileInfo(file.DirectoryName + "/" + src.meta.background)));
+			string chartName = string.Format("{0} - {1}", meta.song.name, meta.name);
+			if (src.meta.background != null) {
+				meta.cover = src.meta.background;
+			}
+			result.Add(new RawChartResource(chartName, chart, meta));
 			return result;
 		}
 
@@ -152,13 +160,13 @@ namespace Cryville.Crtr.Extensions.Malody {
 			public ChartEvent Destination { get; set; }
 		}
 
-		float bp(int[] beat) {
+		float ConvertBeat(int[] beat) {
 			return beat[0] + (float)beat[1] / beat[2];
 		}
 	}
 
 #pragma warning disable IDE1006
-	public struct MalodyChart {
+	struct MalodyChart {
 		public interface IEvent {
 			int[] beat { get; set; }
 			int[] endbeat { get; set; }

Assets/Cryville/Crtr/GenericResources.cs

@@ -19,6 +19,7 @@ namespace Cryville.Crtr {
 		public static void LoadDefault() {
 			if (loaded) return;
 			Components.Add("image", typeof(SpritePlane));
+			Components.Add("mesh", typeof(MeshBase));
 			Components.Add("polysec", typeof(PolygonSGO));
 			Components.Add("rect", typeof(SpriteRect));
 			Components.Add("scale3", typeof(SpriteScale3));
@@ -29,8 +30,7 @@ namespace Cryville.Crtr {
 			Meshes.Add("quad_scale3h", Resources.Load<Mesh>("quad_scale3h"));
 			Meshes.Add("quad_scale9", Resources.Load<Mesh>("quad_scale9"));
 
-			Materials.Add("-CutoutMat", Resources.Load<Material>("CutoutMat"));
-			Materials.Add("-TransparentMat", Resources.Load<Material>("TransparentMat"));
+			Materials.Add("-SpriteMat", Resources.Load<Material>("SpriteMat"));
 
 			loaded = true;
 		}

Assets/Cryville/Crtr/InputProxy.cs

@@ -1,13 +1,13 @@
 using Cryville.Common;
 using Cryville.Common.Pdt;
 using Cryville.Common.Unity.Input;
+using Cryville.Crtr.Config;
 using System;
 using System.Collections.Generic;
 using UnityEngine;
-using Logger = Cryville.Common.Logger;
 
 namespace Cryville.Crtr {
-	public class InputProxy {
+	public class InputProxy : IDisposable {
 		readonly PdtEvaluator _etor;
 		readonly PdtRuleset _ruleset;
 		readonly Judge _judge;
@@ -37,31 +37,61 @@ namespace Cryville.Crtr {
 		readonly Dictionary<string, int> _use = new Dictionary<string, int>();
 		readonly Dictionary<string, List<string>> _rev = new Dictionary<string, List<string>>();
 		public event EventHandler<ProxyChangedEventArgs> ProxyChanged;
+		public void LoadFrom(Dictionary<string, RulesetConfig.InputEntry> config) {
+			foreach (var cfg in config) {
+				Set(new InputProxyEntry {
+					Target = cfg.Key,
+					Source = new InputSource {
+						Handler = Game.InputManager.GetHandler(cfg.Value.handler),
+						Type = cfg.Value.type
+					}
+				});
+			}
+		}
+		public void SaveTo(Dictionary<string, RulesetConfig.InputEntry> config) {
+			config.Clear();
+			foreach (var p in _tproxies) {
+				config.Add(p.Key, new RulesetConfig.InputEntry {
+					handler = ReflectionHelper.GetNamespaceQualifiedName(p.Value.Source.Value.Handler.GetType()),
+					type = p.Value.Source.Value.Type
+				});
+			}
+		}
 		public void Set(InputProxyEntry proxy) {
-			var name = proxy.Target;
-			if (_tproxies.ContainsKey(name)) Remove(proxy);
-			if (_use[proxy.Target] > 0)
+			var target = proxy.Target;
+			if (!_ruleset.inputs.ContainsKey(target)) throw new ArgumentException("Invalid input name");
+			if (_tproxies.ContainsKey(target)) Remove(proxy);
+			if (_use[target] > 0)
 				throw new InvalidOperationException("Input already assigned");
 			if (proxy.Source != null) {
-				proxy.Source.Value.Handler.OnInput -= OnInput; // Prevent duplicated hooks, no exception will be thrown
-				proxy.Source.Value.Handler.OnInput += OnInput;
-				_tproxies.Add(proxy.Target, proxy);
+				if (_judge != null) {
+					proxy.Source.Value.Handler.OnInput -= OnInput; // Prevent duplicated hooks, no exception will be thrown
+					proxy.Source.Value.Handler.OnInput += OnInput;
+				}
+				_tproxies.Add(target, proxy);
 				_sproxies.Add(proxy.Source.Value, proxy);
-				IncrementUseRecursive(name);
-				IncrementReversedUseRecursive(name);
+				IncrementUseRecursive(target);
+				IncrementReversedUseRecursive(target);
 			}
 		}
 		void Remove(InputProxyEntry proxy) {
-			var name = proxy.Target;
-			proxy.Source.Value.Handler.OnInput -= OnInput;
-			_sproxies.Remove(_tproxies[name].Source.Value);
-			_tproxies.Remove(name);
-			DecrementUseRecursive(name);
-			DecrementReversedUseRecursive(name);
+			var target = proxy.Target;
+			if (_judge != null) _tproxies[target].Source.Value.Handler.OnInput -= OnInput;
+			_sproxies.Remove(_tproxies[target].Source.Value);
+			_tproxies.Remove(target);
+			DecrementUseRecursive(target);
+			DecrementReversedUseRecursive(target);
 		}
 		public bool IsUsed(InputSource src) {
 			return _sproxies.ContainsKey(src);
 		}
+		public bool IsCompleted {
+			get {
+				foreach (var i in _use)
+					if (i.Value == 0 && !_tproxies.ContainsKey(i.Key)) return false;
+				return true;
+			}
+		}
 		void IncrementUseRecursive(string name) {
 			BroadcastProxyChanged(name);
 			var passes = _ruleset.inputs[name].pass;
@@ -98,7 +128,12 @@ namespace Cryville.Crtr {
 		}
 		void BroadcastProxyChanged(string name) {
 			var del = ProxyChanged;
-			if (del != null) del(this, new ProxyChangedEventArgs(name, _tproxies.ContainsKey(name) ? _tproxies[name].Source : null, _use[name] > 0));
+			if (del != null) del(this, this[name]);
+		}
+		public ProxyChangedEventArgs this[string name] {
+			get {
+				return new ProxyChangedEventArgs(name, _tproxies.ContainsKey(name) ? _tproxies[name].Source : null, _use[name] > 0);
+			}
 		}
 		#endregion
 
@@ -113,6 +148,22 @@ namespace Cryville.Crtr {
 		}
 		public void Deactivate() { foreach (var src in _sproxies.Keys) src.Handler.Deactivate(); }
 
+		~InputProxy() {
+			Dispose(false);
+			GC.SuppressFinalize(this);
+		}
+		public void Dispose() {
+			Dispose(true);
+		}
+		protected void Dispose(bool disposing) {
+			if (disposing) {
+				Deactivate();
+				foreach (var proxy in _tproxies.Values) {
+					proxy.Source.Value.Handler.OnInput -= OnInput;
+				}
+			}
+		}
+
 		readonly object _lock = new object();
 		static readonly int _var_value = IdentifierManager.SharedInstance.Request("value");
 		static readonly PropOp.Arbitrary _arbop = new PropOp.Arbitrary();
@@ -131,14 +182,15 @@ namespace Cryville.Crtr {
 					if (!_vect.TryGetValue(id, out ft)) ft = tt;
 					if (vec.IsNull) {
 						_etor.ContextCascadeUpdate(_var_value, new PropSrc.Arbitrary(PdtInternalType.Null, _nullvalue));
+						OnInput(id, proxy.Target, ft, tt, true);
 					}
 					else {
 						fixed (byte* ptr = _vecbuf) {
 							*(Vector3*)ptr = vec.Vector;
 						}
 						_etor.ContextCascadeUpdate(_var_value, new PropSrc.Arbitrary(PdtInternalType.Vector, _vecbuf));
+						OnInput(id, proxy.Target, ft, tt, false);
 					}
-					OnInput(id, proxy.Target, ft, tt);
 					_vect[id] = tt;
 					_etor.ContextCascadeDiscard();
 				}
@@ -146,14 +198,14 @@ namespace Cryville.Crtr {
 		}
 		static readonly int _var_fv = IdentifierManager.SharedInstance.Request("fv");
 		static readonly int _var_tv = IdentifierManager.SharedInstance.Request("tv");
-		unsafe void OnInput(InputIdentifier id, Identifier target, float ft, float tt) {
+		unsafe void OnInput(InputIdentifier id, Identifier target, float ft, float tt, bool nullflag) {
 			var def = _ruleset.inputs[target];
 			if (def.pass != null) {
 				foreach (var p in def.pass) {
 					_etor.ContextCascadeInsert();
 					_arbop.Name = _var_value;
-					_etor.Evaluate(_arbop, p.Value);
-					OnInput(id, p.Key, ft, tt);
+					if (!nullflag) _etor.Evaluate(_arbop, p.Value);
+					OnInput(id, p.Key, ft, tt, nullflag);
 					_etor.ContextCascadeDiscard();
 				}
 			}

Assets/Cryville/Crtr/Judge.cs

@@ -1,7 +1,10 @@
 using Cryville.Common;
+using Cryville.Common.Buffers;
 using Cryville.Common.Pdt;
 using Cryville.Crtr.Event;
+using System;
 using System.Collections.Generic;
+using System.Globalization;
 
 namespace Cryville.Crtr {
 	public class Judge {
@@ -30,14 +33,7 @@ namespace Cryville.Crtr {
 		public Judge(PdtRuleset rs) {
 			_etor = ChartPlayer.etor;
 			_rs = rs;
-			foreach (var s in rs.scores) {
-				var key = s.Key;
-				scoreSrcs.Add(key.Key, new PropSrc.Float(() => scores[key.Key]));
-				scoreOps.Add(key.Key, new PropOp.Float(v => scores[key.Key] = v));
-				scoreFmtKeys.Add(key.Key, IdentifierManager.SharedInstance.Request("_score_" + (string)key.Name));
-				scoreDefs.Add(key.Key, s.Value);
-				scores.Add(key.Key, s.Value.init);
-			}
+			InitScores();
 		}
 		public void Prepare(float st, float et, Identifier input, JudgeDefinition def, ContainerState container) {
 			List<JudgeEvent> list;
@@ -85,6 +81,19 @@ namespace Cryville.Crtr {
 			}
 			return ~num;
 		}
+		int BinarySearchFirst(List<JudgeEvent> list, float time, int stack) {
+			if (list[0].Definition.stack == stack && list[0].StartClip == time) return 0;
+			int num = 0;
+			int num2 = list.Count - 1;
+			while (num <= num2) {
+				int num3 = num + (num2 - num >> 1);
+				int num4 = -list[num3].Definition.stack.CompareTo(stack);
+				if (num4 == 0) num4 = list[num3].StartClip.CompareTo(time);
+				if (num4 >= 0) num2 = num3 - 1;
+				else num = num3 + 1;
+			}
+			return num + 1;
+		}
 		public void Feed(Identifier target, float ft, float tt) {
 			Forward(target, tt);
 			var actlist = activeEvs[target];
@@ -103,8 +112,11 @@ namespace Cryville.Crtr {
 						if (def.scores != null) UpdateScore(def.scores);
 						if (def.pass != null) Pass(def.pass);
 						actlist.RemoveAt(index);
-						index = BinarySearch(actlist, ev.StartClip, def.prop);
-						if (index < 0) index = ~index;
+						if (def.prop != 0 && actlist.Count > 0) {
+							index = BinarySearchFirst(actlist, ev.StartClip, def.stack - def.prop);
+							if (index < 0) index = ~index;
+						}
+						else index++;
 					}
 					else index++;
 				}
@@ -150,40 +162,95 @@ namespace Cryville.Crtr {
 				var key = scoreop.Key;
 				_etor.ContextSelfValue = scoreSrcs[key.name.Key];
 				_etor.Evaluate(scoreOps[key.name.Key], scoreop.Value);
+				InvalidateScore(key.name.Key);
 				foreach (var s in _rs.scores) {
 					if (s.Value.value != null) {
 						_etor.ContextSelfValue = scoreSrcs[s.Key.Key];
 						_etor.Evaluate(scoreOps[s.Key.Key], s.Value.value);
+						InvalidateScore(s.Key.Key);
 					}
 				}
 			}
-			ScoreCache.Clear();
 		}
-		readonly Dictionary<int, int> scoreFmtKeys = new Dictionary<int, int>();
+		readonly Dictionary<int, int> scoreStringKeys = new Dictionary<int, int>();
+		readonly Dictionary<int, int> scoreStringKeysRev = new Dictionary<int, int>();
 		readonly Dictionary<int, PropSrc> scoreSrcs = new Dictionary<int, PropSrc>();
 		readonly Dictionary<int, PropOp> scoreOps = new Dictionary<int, PropOp>();
 		readonly Dictionary<int, ScoreDefinition> scoreDefs = new Dictionary<int, ScoreDefinition>();
-		public readonly Dictionary<int, float> scores = new Dictionary<int, float>();
-		readonly Dictionary<int, string> ScoreCache = new Dictionary<int, string>();
-		readonly object _lock = new object();
-		public Dictionary<int, string> GetFormattedScoreStrings() {
-			lock (_lock) {
-				if (ScoreCache.Count == 0) {
-					foreach (var s in scores)
-						ScoreCache.Add(scoreFmtKeys[s.Key], s.Value.ToString(scoreDefs[s.Key].format));
-				}
-				return ScoreCache;
+		readonly Dictionary<int, float> scores = new Dictionary<int, float>();
+		readonly Dictionary<int, string> scoreStringCache = new Dictionary<int, string>();
+		readonly Dictionary<int, PropSrc> scoreStringSrcs = new Dictionary<int, PropSrc>();
+		readonly ArrayPool<byte> scoreStringPool = new ArrayPool<byte>();
+		void InitScores() {
+			foreach (var s in _rs.scores) {
+				var key = s.Key.Key;
+				var strkey = IdentifierManager.SharedInstance.Request("_score_" + (string)s.Key.Name);
+				scoreStringKeys.Add(key, strkey);
+				scoreStringKeysRev.Add(strkey, key);
+				scoreSrcs.Add(key, new PropSrc.Float(() => scores[key]));
+				scoreOps.Add(key, new PropOp.Float(v => scores[key] = v));
+				scoreDefs.Add(key, s.Value);
+				scores.Add(key, s.Value.init);
+				scoreStringCache.Add(scoreStringKeys[key], null);
+				scoreStringSrcs.Add(scoreStringKeys[key], new ScoreStringSrc(scoreStringPool, () => GetScoreString(strkey)));
 			}
 		}
+		void InvalidateScore(int key) {
+			scoreSrcs[key].Invalidate();
+			scoreStringCache[scoreStringKeys[key]] = null;
+			scoreStringSrcs[scoreStringKeys[key]].Invalidate();
+		}
+		string GetScoreString(int key) {
+			var result = scoreStringCache[key];
+			if (result == null) {
+				var rkey = scoreStringKeysRev[key];
+				return scoreStringCache[key] = scores[rkey].ToString(scoreDefs[rkey].format, CultureInfo.InvariantCulture);
+			}
+			else return result;
+		}
+		public bool TryGetScoreSrc(int key, out PropSrc value) {
+			return scoreSrcs.TryGetValue(key, out value);
+		}
+		public bool TryGetScoreStringSrc(int key, out PropSrc value) {
+			return scoreStringSrcs.TryGetValue(key, out value);
+		}
 		public string GetFullFormattedScoreString() {
 			bool flag = false;
 			string result = "";
-			foreach (var s in GetFormattedScoreStrings()) {
-				result += string.Format(flag ? "\n{0}: {1}" : "{0}: {1}", IdentifierManager.SharedInstance.Retrieve(s.Key), s.Value);
+			foreach (var s in scores.Keys) {
+				result += string.Format(flag ? "\n{0}: {1}" : "{0}: {1}", IdentifierManager.SharedInstance.Retrieve(s), GetScoreString(scoreStringKeys[s]));
 				flag = true;
 			}
 			return result;
 		}
+		class ScoreStringSrc : PropSrc {
+			readonly Func<string> _cb;
+			readonly ArrayPool<byte> _pool;
+			byte[] _buf;
+			public ScoreStringSrc(ArrayPool<byte> pool, Func<string> cb) {
+				_pool = pool;
+				_cb = cb;
+			}
+			public override void Invalidate() {
+				base.Invalidate();
+				if (_buf != null) {
+					_pool.Return(_buf);
+					_buf = null;
+				}
+			}
+			protected override unsafe void InternalGet(out int type, out byte[] value) {
+				var src = _cb();
+				int strlen = src.Length;
+				type = PdtInternalType.String;
+				value = _pool.Rent(sizeof(int) + strlen * sizeof(char));
+				fixed (byte* _ptr = value) {
+					char* ptr = (char*)(_ptr + sizeof(int));
+					*(int*)_ptr = strlen;
+					int i = 0;
+					foreach (var c in src) ptr[i++] = c;
+				}
+			}
+		}
 	}
 	public class InputDefinition {
 		public int dim;
@@ -198,7 +265,7 @@ namespace Cryville.Crtr {
 		public Identifier[] miss;
 		public Dictionary<ScoreOperation, PdtExpression> scores;
 		public int stack;
-		public int prop = -1;
+		public int prop = 1;
 	}
 	public class ScoreOperation {
 		public Identifier name;

Assets/Cryville/Crtr/Menu.cs

@@ -6,25 +6,33 @@ namespace Cryville.Crtr {
 	public class Menu : MonoBehaviour {
 #pragma warning disable IDE0044
 		[SerializeField]
-		private ResourceBrowserMaster m_browserMaster;
+		ResourceBrowserMaster m_browserMaster;
 		[SerializeField]
-		private Animator m_targetAnimator;
+		Animator m_targetAnimator;
 		[SerializeField]
-		private ProgressBar m_progressBar;
+		ProgressBar m_progressBar;
+		[SerializeField]
+		SettingsPanel m_settingsPanel;
 #pragma warning restore IDE0044
 
+		int frameIndex = 2;
 		bool initialized = false;
 		int totalTasks = 0;
 #pragma warning disable IDE0051
 		void Awake() {
 			Game.Init();
 			transform.parent.Find("Canvas/Contents").gameObject.SetActive(true);
+			m_settingsPanel.Target = Settings.Default;
 		}
 		void Update() {
 			if (!initialized) {
 				int taskCount = Game.NetworkTaskWorker.TaskCount;
 				if (totalTasks < taskCount) totalTasks = taskCount;
-				m_progressBar.value = 1 - (float)taskCount / totalTasks;
+				if (frameIndex > 0) {
+					frameIndex--;
+					return;
+				}
+				m_progressBar.value = totalTasks == 0 ? 1 : (1 - (float)taskCount / totalTasks);
 				if (taskCount == 0) {
 					initialized = true;
 					m_targetAnimator.SetTrigger("T_Main");

Assets/Cryville/Crtr/MeshWrapper.cs

@@ -22,23 +22,16 @@ namespace Cryville.Crtr {
 			get;
 			private set;
 		}
-		public bool Transparent {
-			get;
-			private set;
-		}
 		public bool Initialized {
 			get;
 			private set;
 		}
 		public Material NewMaterial {
 			get {
-				return Material.Instantiate(GenericResources.Materials[
-					Transparent ? "-TransparentMat" : "-CutoutMat"
-				]);
+				return Material.Instantiate(GenericResources.Materials["-SpriteMat"]);
 			}
 		}
-		public void Init(Transform parent, bool transparent = false) {
-			Transparent = transparent;
+		public void Init(Transform parent) {
 			MeshObject = new GameObject("__mesh__");
 			MeshTransform = MeshObject.transform;
 			MeshTransform.SetParent(parent, false);
@@ -48,9 +41,7 @@ namespace Cryville.Crtr {
 				MeshObject.AddComponent<MeshRenderer>();
 			MeshFilter = MeshObject.GetComponent<MeshFilter>();
 			Renderer = MeshObject.GetComponent<Renderer>();
-			Renderer.material = GenericResources.Materials[
-				transparent ? "-TransparentMat" : "-CutoutMat"
-			]; // TODO
+			Renderer.material = GenericResources.Materials["-SpriteMat"];
 			Initialized = true;
 		}
 		public void Destroy() {

Assets/Cryville/Crtr/NoteHandler.cs

@@ -11,7 +11,6 @@ namespace Cryville.Crtr {
 		readonly GroupHandler gh;
 		public readonly Chart.Note Event;
 		readonly PdtRuleset ruleset;
-		readonly Judge judge;
 		public NoteHandler(GroupHandler gh, Chart.Note ev, PdtRuleset rs, Judge j) : base() {
 			this.gh = gh;
 			Event = ev;
@@ -62,18 +61,6 @@ namespace Cryville.Crtr {
 			}
 		}
 
-		readonly Dictionary<Chart.Motion, Vec1> phMotions = new Dictionary<Chart.Motion, Vec1>();
-		bool invalidated = false;
-		readonly List<StampedEvent.Judge> patchedJudgeEvents = new List<StampedEvent.Judge>();
-
-		public override void StartUpdate(ContainerState s) {
-			base.StartUpdate(s);
-			/*if (s.CloneType == 16 && Event.judge != null) {
-				// var etor = new Evaluator();
-				//CompiledRuleset.PatchJudge(Event, ChartPlayer.cruleset.primary_judges[Event.judge], s.Time, etor, patchedJudgeEvents, !Event.@long);
-			}*/
-		}
-
 		public override void Update(ContainerState s, StampedEvent ev) {
 			base.Update(s, ev);
 			if (s.CloneType == 1) {
@@ -103,73 +90,6 @@ namespace Cryville.Crtr {
 					ChartPlayer.etor.ContextState = null;
 					ChartPlayer.etor.ContextEvent = null;
 				}
-				else if (ev.Unstamped is Chart.Motion) {
-					/*var tev = (Chart.Motion)ev.Unstamped;
-					if (tev.Name != "judge") return;
-					phMotions.Add(tev, (Vec1)s.GetRawValue<Vec1>(tev.Name).Clone());*/
-				}
-				else if (ev.Unstamped is InstantEvent) {
-					/*var oev = ((InstantEvent)ev.Unstamped).Original;
-					if (oev is Chart.Motion) {
-						var tev = (Chart.Motion)oev;
-						if (tev.Name != "judge") return;
-						var v0 = phMotions[tev];
-						var v1 = s.GetRawValue<Vec1>(tev.Name);
-						// var etor = new Evaluator();
-						for (var vi = Mathf.Ceil(v0.Value); vi < v1.Value; vi++) {
-							var v = new Vec1(vi);
-							var t = MotionLerper.Delerp(v, ev.Time, v1, ev.Origin.Time, v0, tev.transition, tev.rate);
-							CompiledRuleset.PatchJudge(
-								Event, ChartPlayer.cruleset.primary_judges[tev.Name.SubName],
-								t, etor, patchedJudgeEvents
-							);
-						}
-						phMotions.Remove(tev);
-					}*/
-				}
-			}
-		}
-		
-		public override void ExUpdate(ContainerState s, StampedEvent ev) {
-			base.ExUpdate(s, ev);
-			if (ev is StampedEvent.Judge) {
-				var tev = (StampedEvent.Judge)ev;
-				if (tev.TargetJudge != null && s.CloneType == 0 && !invalidated) {
-					//judge.Issue(tev, this);
-				}
-				else if (tev.TargetJudge == null && s.CloneType == 17) {
-					//judge.RecordPos(tev.StartEvent, GetFramePoint(s.Parent, s.Track));
-				}
-				else
-					return;
-				patchedJudgeEvents.Remove(tev);
-				// Logger.Log("main", 0, "Judge", "ir {0}", patchedJudgeEvents.Count);
-			}
-		}
-
-		public override void MotionUpdate(byte ct, Chart.Motion ev) {
-			base.MotionUpdate(ct, ev);
-			if (ct == 0) {
-				/*if (ev.Name == "judge") {
-					if (invalidated) return;
-					if (ev.Name == null)
-						throw new InvalidOperationException();
-					judge.IssueImmediate(this, ev.Name.SubName, GetFramePoint(cs.Parent, cs.Track));
-				}*/
-			}
-			else if (ct == 16) {
-				/*var etor = new EvalImpl();
-				if (ev.MotionName == "judge") {
-					if (ev.MotionSubName == null)
-						throw new InvalidOperationException();
-					var l = new List<StampedEvent>();
-					float t = ps.Time;
-					CompiledRuleset.PatchJudge(
-						Event, ChartPlayer.cruleset.primary_judges[ev.MotionSubName],
-						t, etor, ref l
-					);
-					cs.Bus.IssueEventPatch(l);
-				}*/
 			}
 		}
 
@@ -183,13 +103,6 @@ namespace Cryville.Crtr {
 				a_tail.rotation = Quaternion.Euler(ts.Direction);
 #endif
 			}
-			else if (s.CloneType == 16) {
-				/*if (Event.endjudge != null) {
-					//var etor = new Evaluator();
-					//CompiledRuleset.PatchJudge(Event, ChartPlayer.cruleset.primary_judges[Event.endjudge], ps.Time, etor, patchedJudgeEvents, true);
-				}
-				cs.Bus.IssuePatch(patchedJudgeEvents.Cast<StampedEvent>());*/
-			}
 			OpenAnchor("tail");
 			base.EndUpdate(s);
 			CloseAnchor("tail");
@@ -248,10 +161,5 @@ namespace Cryville.Crtr {
 				}
 			}
 		}
-
-		public List<StampedEvent.Judge> Invalidate() {
-			invalidated = true;
-			return patchedJudgeEvents;
-		}
 	}
 }

Assets/Cryville/Crtr/PdtEvaluator.cs

@@ -23,8 +23,6 @@ namespace Cryville.Crtr {
 			else {
 				var id = new Identifier(name);
 				PropSrc prop;
-				string str;
-				float num;
 				if (ContextEvent != null && ContextEvent.PropSrcs.TryGetValue(name, out prop)) {
 					prop.Get(out type, out value);
 				}
@@ -32,15 +30,12 @@ namespace Cryville.Crtr {
 					var vec = ContextState.GetRawValue(id);
 					new VectorSrc(() => vec).Get(out type, out value);
 				}
-				else if (ContextJudge != null && ContextJudge.scores.TryGetValue(name, out num)) {
-					type = PdtInternalType.Number;
-					LoadNum(num);
-					value = _numbuf;
+				else if (ContextJudge != null && ContextJudge.TryGetScoreSrc(name, out prop)) {
+					prop.Get(out type, out value);
 					RevokePotentialConstant();
 				}
-				else if (ContextJudge != null && ContextJudge.GetFormattedScoreStrings().TryGetValue(name, out str)) {
-					type = PdtInternalType.String;
-					value = GetBytes(str);
+				else if (ContextJudge != null && ContextJudge.TryGetScoreStringSrc(name, out prop)) {
+					prop.Get(out type, out value);
 					RevokePotentialConstant();
 				}
 				else {
@@ -146,6 +141,8 @@ namespace Cryville.Crtr {
 			_ctxops.Add(IdentifierManager.SharedInstance.Request("attack_timing"), new func_attack_timing(cccb));
 			_ctxops.Add(IdentifierManager.SharedInstance.Request("enter_timing"), new func_enter_timing(cccb));
 			_ctxops.Add(IdentifierManager.SharedInstance.Request("release_timing"), new func_release_timing(cccb));
+			_ctxops.Add(IdentifierManager.SharedInstance.Request("leave_timing"), new func_leave_timing(cccb));
+			_ctxops.Add(IdentifierManager.SharedInstance.Request("contact_timing"), new func_contact_timing(cccb));
 		}
 		static PdtEvaluator() {
 			_shortops.Add(new PdtOperatorSignature("@", 2), new op_at_2());
@@ -507,6 +504,22 @@ namespace Cryville.Crtr {
 				return ft > t0 && ft <= t1;
 			}
 		}
+		class func_leave_timing : JudgeFunction {
+			public func_leave_timing(Func<int, PropSrc> ctxcb) : base(1, ctxcb) { }
+			protected override bool ExecuteImpl(float fn, float tn, float ft, float tt, Vector3? fv, Vector3? tv) {
+				if (fv == null || tv == null) return false;
+				var t1 = GetOperand(0).AsNumber() + tn;
+				return ft < t1 && tt >= t1;
+			}
+		}
+		class func_contact_timing : JudgeFunction {
+			public func_contact_timing(Func<int, PropSrc> ctxcb) : base(2, ctxcb) { }
+			protected override bool ExecuteImpl(float fn, float tn, float ft, float tt, Vector3? fv, Vector3? tv) {
+				var t0 = GetOperand(0).AsNumber() + fn;
+				var t1 = GetOperand(1).AsNumber() + tn;
+				return (fv == null || ft < t1) && (tv == null || tt >= t0);
+			}
+		}
 		#endregion
 		unsafe static class oputil {
 			public static float AsNumber(PropSrc src) {

Assets/Cryville/Crtr/Popup.cs

@@ -0,0 +1,37 @@
+using System;
+using UnityEngine;
+using UnityEngine.UI;
+
+namespace Cryville.Crtr {
+	public class Popup : MonoBehaviour {
+		public string Message = "";
+		CanvasGroup group;
+		float timer = 0;
+
+		const float DURATION = 5.0f;
+		const float DURIN = 0.4f;
+		const float DUROUT = 0.4f;
+
+		void Start() {
+			group = GetComponent<CanvasGroup>();
+			group.alpha = 0;
+			GetComponentInChildren<Text>().text = Message;
+			transform.SetParent(GameObject.Find("PopupList").transform);
+		}
+
+		void Update() {
+			if (timer <= DURIN) group.alpha = timer / DURIN;
+			else if (timer >= DURATION) GameObject.Destroy(gameObject);
+			else if (timer >= DURATION - DUROUT) group.alpha = (DURATION - timer) / DUROUT;
+			timer += Time.deltaTime;
+		}
+
+		public static void CreateException(Exception ex) {
+			Create(ex.Message);
+		}
+
+		public static void Create(string msg) {
+			Instantiate(Resources.Load<GameObject>("Common/Popup")).GetComponent<Popup>().Message = msg;
+		}
+	}
+}

Assets/Cryville/Crtr/PropSrc.cs

@@ -6,6 +6,7 @@ namespace Cryville.Crtr {
 	public abstract class PropSrc {
 		int _type;
 		byte[] _buf = null;
+		public virtual void Invalidate() { _buf = null; }
 		public void Get(out int type, out byte[] value) {
 			if (_buf == null) InternalGet(out _type, out _buf);
 			type = _type;

Assets/Cryville/Crtr/Ruleset.cs

@@ -1,5 +1,6 @@
 using Cryville.Common;
 using Cryville.Common.Pdt;
+using Cryville.Crtr.Browsing;
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
@@ -10,21 +11,19 @@ using System.Text.RegularExpressions;
 using SIdentifier = Cryville.Common.Identifier;
 
 namespace Cryville.Crtr {
-	public class Ruleset {
+	public class Ruleset : MetaInfo {
+		public const long CURRENT_FORMAT = 2;
+
 		[JsonRequired]
 		public long format;
 		
-		[JsonRequired]
 		public string @base;
-		
-		[JsonRequired]
-		public string pdt;
 
 		[JsonIgnore]
 		public PdtRuleset Root { get; private set; }
 
 		public void LoadPdt(DirectoryInfo dir) {
-			using (StreamReader pdtreader = new StreamReader(dir.FullName + "/" + pdt + ".pdt", Encoding.UTF8)) {
+			using (StreamReader pdtreader = new StreamReader(dir.FullName + "/" + data + ".pdt", Encoding.UTF8)) {
 				var src = pdtreader.ReadToEnd();
 				Root = new RulesetInterpreter(src, null).Interpret();
 			}

Assets/Cryville/Crtr/Settings.cs

@@ -84,6 +84,18 @@ namespace Cryville.Crtr {
 			}
 		}
 
+		[Browsable(false)]
+		[Category("data")]
+		[Description("The ruleset config file to load.")]
+		public string LoadRulesetConfig {
+			get {
+				return PlayerPrefs.GetString("LoadRulesetConfig", "");
+			}
+			set {
+				PlayerPrefs.SetString("LoadRulesetConfig", value);
+			}
+		}
+
 		[Browsable(false)]
 		[Category("data")]
 		[Description("The skin file to load.")]
@@ -100,7 +112,7 @@ namespace Cryville.Crtr {
 		[LogarithmicScale][Step(0.5f)][Precision(1e-1)]
 		public float RenderDistance {
 			get {
-				return PlayerPrefs.GetFloat("RenderDistance", 6);
+				return PlayerPrefs.GetFloat("RenderDistance", 4);
 			}
 			set {
 				PlayerPrefs.SetFloat("RenderDistance", value);
@@ -119,17 +131,6 @@ namespace Cryville.Crtr {
 			}
 		}
 
-		[Category("gameplay")]
-		[LogarithmicScale][Step(0.5f)][Precision(1e-1)]
-		public float ScrollVelocity {
-			get {
-				return PlayerPrefs.GetFloat("ScrollVelocity", 1);
-			}
-			set {
-				PlayerPrefs.SetFloat("ScrollVelocity", value);
-			}
-		}
-
 		[Category("gameplay")]
 		[Step(0.04f)][Precision(1e-3)]
 		public float SoundOffset {

Assets/Cryville/Crtr/SettingsPanel.cs

@@ -7,30 +7,41 @@ using UnityEngine;
 namespace Cryville.Crtr {
 	public class SettingsPanel : MonoBehaviour {
 		[SerializeField]
-		private GameObject m_categoryPrefab;
+		GameObject m_categoryPrefab;
 
-		private Transform _container;
+		[SerializeField]
+		Transform m_container;
 
-#pragma warning disable IDE0051
-		void Awake() {
-			_container = transform.Find("Content/__content__");
-		}
-		public void Start() {
-			LoadProperties();
-			foreach (Transform c in _container) GameObject.Destroy(c.gameObject);
-			foreach (var c in _categories) {
-				var obj = GameObject.Instantiate<GameObject>(m_categoryPrefab);
-				obj.transform.SetParent(_container, false);
-				obj.GetComponent<PropertyCategoryPanel>().Load(c.Key, c.Value, Settings.Default);
+		bool _invalidated = true;
+		object m_target;
+		public object Target {
+			get {
+				return m_target;
+			}
+			set {
+				if (m_target != value) {
+					m_target = value;
+					_invalidated = true;
+				}
 			}
 		}
-#pragma warning restore IDE0051
 
-		Dictionary<string, List<PropertyInfo>> _categories = null;
+		public void Update() {
+			if (!_invalidated) return;
+			LoadProperties();
+			foreach (Transform c in m_container) GameObject.Destroy(c.gameObject);
+			foreach (var c in _categories) {
+				var obj = GameObject.Instantiate<GameObject>(m_categoryPrefab, m_container, false);
+				obj.GetComponent<PropertyCategoryPanel>().Load(c.Key, c.Value, Target);
+			}
+		}
+
+		Dictionary<string, List<PropertyInfo>> _categories = new Dictionary<string, List<PropertyInfo>>();
 		public void LoadProperties() {
-			if (_categories != null) return;
-			_categories = new Dictionary<string, List<PropertyInfo>>();
-			foreach (var p in typeof(Settings).GetProperties()) {
+			_categories.Clear();
+			_invalidated = false;
+			if (Target == null) return;
+			foreach (var p in Target.GetType().GetProperties()) {
 				bool browsable = true;
 				string category = "miscellaneous";
 				foreach (var attr in p.GetCustomAttributes(true)) {

Assets/Cryville/Crtr/Skin.cs

@@ -1,5 +1,6 @@
 using Cryville.Common;
 using Cryville.Common.Pdt;
+using Cryville.Crtr.Browsing;
 using Cryville.Crtr.Components;
 using Newtonsoft.Json;
 using System;
@@ -10,7 +11,9 @@ using System.Reflection;
 using System.Text;
 
 namespace Cryville.Crtr {
-	public class Skin {
+	public class Skin : MetaInfo {
+		public const long CURRENT_FORMAT = 2;
+
 		[JsonRequired]
 		public long format;
 
@@ -18,15 +21,14 @@ namespace Cryville.Crtr {
 
 		[JsonRequired]
 		public string ruleset;
-		
-		[JsonRequired]
-		public string pdt;
+
+		public List<string> frames = new List<string>();
 
 		[JsonIgnore]
 		public PdtSkin Root { get; private set; }
 
 		public void LoadPdt(DirectoryInfo dir) {
-			using (StreamReader pdtreader = new StreamReader(dir.FullName + "/" + pdt + ".pdt", Encoding.UTF8)) {
+			using (StreamReader pdtreader = new StreamReader(dir.FullName + "/" + data + ".pdt", Encoding.UTF8)) {
 				var src = pdtreader.ReadToEnd();
 				Root = new SkinInterpreter(src, null).Interpret();
 			}

Assets/Cryville/Crtr/SkinContainer.cs

@@ -17,24 +17,26 @@ namespace Cryville.Crtr {
 			skin = _skin;
 		}
 		public void MatchStatic(ContainerState context) {
+			ChartPlayer.etor.ContextState = context;
+			ChartPlayer.etor.ContextEvent = context.Container;
 			matchedStatic.Clear();
 			MatchStatic(skin, context, context.Handler.gogroup);
 
 			foreach (var m in matchedStatic) {
 				var el = m.Key;
 				var obj = m.Value;
+				ChartPlayer.etor.ContextTransform = obj;
 				foreach (var p in el.properties) {
 					if (p.Key.Name == null)
 						obj.gameObject.AddComponent(p.Key.Component);
 					else {
-						ChartPlayer.etor.ContextTransform = obj;
-						ChartPlayer.etor.ContextEvent = context.Container;
 						ChartPlayer.etor.Evaluate(GetPropOp(obj, p.Key), p.Value);
-						ChartPlayer.etor.ContextEvent = null;
-						ChartPlayer.etor.ContextTransform = null;
 					}
 				}
+				ChartPlayer.etor.ContextTransform = null;
 			}
+			ChartPlayer.etor.ContextEvent = null;
+			ChartPlayer.etor.ContextState = null;
 		}
 		void MatchStatic(SkinElement rel, ContainerState context, Transform anchor = null) {
 			matchedStatic.Add(rel, anchor);
@@ -47,22 +49,24 @@ namespace Cryville.Crtr {
 		}
 		public void MatchDynamic(ContainerState context) {
 			Profiler.BeginSample("SkinContainer.MatchDynamic");
+			ChartPlayer.etor.ContextState = context;
+			ChartPlayer.etor.ContextEvent = context.Container;
 			matchedDynamic.Clear();
 			MatchDynamic(skin, context, context.Handler.gogroup);
 
 			foreach (var m in matchedDynamic) {
 				var el = m.Key;
 				var obj = m.Value;
+				ChartPlayer.etor.ContextTransform = obj;
 				foreach (var p in el.properties) {
 					if (p.Key.Name == null) continue;
 					if (p.Value.IsConstant) continue;
-					ChartPlayer.etor.ContextTransform = obj;
-					ChartPlayer.etor.ContextEvent = context.Container;
 					ChartPlayer.etor.Evaluate(GetPropOp(obj, p.Key), p.Value);
-					ChartPlayer.etor.ContextEvent = null;
-					ChartPlayer.etor.ContextTransform = null;
 				}
+				ChartPlayer.etor.ContextTransform = null;
 			}
+			ChartPlayer.etor.ContextEvent = null;
+			ChartPlayer.etor.ContextState = null;
 			Profiler.EndSample();
 		}
 		void MatchDynamic(SkinElement rel, ContainerState context, Transform anchor = null) {

Assets/Cryville/Crtr/SkinSelectors.cs

@@ -114,9 +114,7 @@ namespace Cryville.Crtr {
 			}
 			public override Transform Match(ContainerState h, Transform a, Transform ot = null) {
 				ChartPlayer.etor.ContextTransform = a;
-				ChartPlayer.etor.ContextEvent = h.Container;
 				ChartPlayer.etor.Evaluate(_op, _exp);
-				ChartPlayer.etor.ContextEvent = null;
 				ChartPlayer.etor.ContextTransform = null;
 				return _flag ? a : null;
 			}

Assets/Cryville/Crtr/SpriteFrame.cs

@@ -0,0 +1,109 @@
+using System;
+using UnityEngine;
+
+namespace Cryville.Crtr {
+	public class SpriteFrame {
+#pragma warning disable IDE1006
+		Rect _frame;
+		public Rect frame {
+			get { return _frame; }
+			set { _frame = value; }
+		}
+		public Rect textureRect {
+			get { return _frame; }
+			set { _frame = value; }
+		}
+
+		bool _rotated = false;
+		public bool rotated {
+			get { return _rotated; }
+			set { _rotated = value; }
+		}
+		public bool textureRotated {
+			get { return _rotated; }
+			set { _rotated = value; }
+		}
+#pragma warning restore IDE1006
+
+		public Vector2 offset;
+
+		public Rect sourceColorRect;
+		public Vector2 sourceSize;
+		private Rect _uv;
+		private Vector2[] cuv;
+		public Rect UV {
+			get {
+				return _uv;
+			}
+			private set {
+				_uv = value;
+				float x0 = Mathf.Min(_uv.xMin, _uv.xMax);
+				float x1 = Mathf.Max(_uv.xMin, _uv.xMax);
+				float y0 = Mathf.Min(_uv.yMin, _uv.yMax);
+				float y1 = Mathf.Max(_uv.yMin, _uv.yMax);
+				if (_rotated) cuv = new Vector2[]{
+						new Vector2(x0, y1),
+						new Vector2(x1, y0),
+						new Vector2(x0, y0),
+						new Vector2(x1, y1),
+					};
+				else cuv = new Vector2[]{
+						new Vector2(x0, y0),
+						new Vector2(x1, y1),
+						new Vector2(x1, y0),
+						new Vector2(x0, y1),
+					};
+			}
+		}
+		public Vector2 GetUV(Vector2 uv) {
+			return GetUV(uv.x, uv.y);
+		}
+		public Vector2 GetUV(float u, float v) {
+			Vector2 uv00 = cuv[0], uv11 = cuv[1],
+				uv10 = cuv[2], uv01 = cuv[3];
+			return (1 - u - v) * uv00
+				+ u * uv10
+				+ v * uv01
+				+ u * v * (uv00 + uv11 - uv10 - uv01);
+		}
+		public Texture2D Texture {
+			get;
+			private set;
+		}
+		public Vector2 Size {
+			get {
+				return new Vector2(Texture.width, Texture.height);
+			}
+		}
+
+		public void Init() {
+			if (Texture == null)
+				throw new InvalidOperationException(); // TODO
+			_frame = new Rect(Vector2.zero, Size);
+			var w = _frame.width;
+			var h = _frame.height;
+			float x = _frame.x / w;
+			float y = 1 - _frame.y / h;
+			float tw = (_rotated ? _frame.height : _frame.width) / w;
+			float th = (_rotated ? _frame.width : _frame.height) / h;
+			if (_rotated) UV = new Rect(x, y, tw, -th);
+			else UV = new Rect(x, y, tw, -th);
+		}
+
+		public void Init(int w, int h, Texture2D _base) {
+			if (Texture != null)
+				throw new InvalidOperationException(); // TODO
+			Texture = _base;
+			float x = _frame.x / w;
+			float y = 1 - _frame.y / h;
+			float tw = (_rotated ? _frame.height : _frame.width) / w;
+			float th = (_rotated ? _frame.width : _frame.height) / h;
+			if (_rotated) UV = new Rect(x, y, tw, -th);
+			else UV = new Rect(x, y, tw, -th);
+		}
+		public SpriteFrame() { }
+		public SpriteFrame(Texture2D tex) {
+			Texture = tex;
+		}
+	}
+}

Assets/MsvcStdextWorkaround.cs

@@ -0,0 +1,24 @@
+#if UNITY_EDITOR
+using System;
+using UnityEditor.Build;
+using UnityEditor.Build.Reporting;
+
+public class MsvcStdextWorkaround : IPreprocessBuildWithReport {
+	const string kWorkaroundFlag = "/D_SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS";
+
+	public int callbackOrder => 0;
+
+	public void OnPreprocessBuild(BuildReport report) {
+		var clEnv = Environment.GetEnvironmentVariable("_CL_");
+
+		if (string.IsNullOrEmpty(clEnv)) {
+			Environment.SetEnvironmentVariable("_CL_", kWorkaroundFlag);
+		}
+		else if (!clEnv.Contains(kWorkaroundFlag)) {
+			clEnv += " " + kWorkaroundFlag;
+			Environment.SetEnvironmentVariable("_CL_", clEnv);
+		}
+	}
+}
+
+#endif // UNITY_EDITOR

Assets/MsvcStdextWorkaround.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 9ed0687e714ce1042921c0057f42039f
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/PlistCS.meta

@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 71d5ddaf108e0014c98c206ed5135ded
-folderAsset: yes
-timeCreated: 1605077401
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/PlistCS/Src.meta

@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 8f21b229422310b40a4d539f7319bd1f
-folderAsset: yes
-timeCreated: 1605077401
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/PlistCS/Src/Plist.cs

@@ -1,838 +0,0 @@
-//
-//   PlistCS Property List (plist) serialization and parsing library.
-//
-//   https://github.com/animetrics/PlistCS
-//   
-//   Copyright (c) 2011 Animetrics Inc. (marc@animetrics.com)
-//   
-//   Permission is hereby granted, free of charge, to any person obtaining a copy
-//   of this software and associated documentation files (the "Software"), to deal
-//   in the Software without restriction, including without limitation the rights
-//   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//   copies of the Software, and to permit persons to whom the Software is
-//   furnished to do so, subject to the following conditions:
-//   
-//   The above copyright notice and this permission notice shall be included in
-//   all copies or substantial portions of the Software.
-//   
-//   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-//   THE SOFTWARE.
-
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.IO;
-using System.Text;
-using System.Xml;
-
-namespace PlistCS {
-	public static class Plist {
-		private static List<int> offsetTable = new List<int>();
-		private static List<byte> objectTable = new List<byte>();
-		private static int refCount;
-		private static int objRefSize;
-		private static int offsetByteSize;
-		private static long offsetTableOffset;
-
-		#region Public Functions
-
-		public static object readPlist(string path) {
-			using (FileStream f = new FileStream(path, FileMode.Open, FileAccess.Read)) {
-				return readPlist(f, plistType.Auto);
-			}
-		}
-
-		public static object readPlistSource(string source) {
-			return readPlist(System.Text.Encoding.UTF8.GetBytes(source));
-		}
-
-		public static object readPlist(byte[] data) {
-			using (var memory = new MemoryStream(data)) {
-				return readPlist(memory, plistType.Auto);
-			}
-		}
-
-		public static plistType getPlistType(Stream stream) {
-			byte[] magicHeader = new byte[8];
-			stream.Read(magicHeader, 0, 8);
-
-			if (BitConverter.ToInt64(magicHeader, 0) == 3472403351741427810) {
-				return plistType.Binary;
-			}
-			else {
-				return plistType.Xml;
-			}
-		}
-
-		public static object readPlist(Stream stream, plistType type) {
-			if (type == plistType.Auto) {
-				type = getPlistType(stream);
-				stream.Seek(0, SeekOrigin.Begin);
-			}
-
-			if (type == plistType.Binary) {
-				using (BinaryReader reader = new BinaryReader(stream)) {
-					byte[] data = reader.ReadBytes((int)reader.BaseStream.Length);
-					return readBinary(data);
-				}
-			}
-			else {
-				XmlDocument xml = new XmlDocument();
-				xml.XmlResolver = null;
-				xml.Load(stream);
-				return readXml(xml);
-			}
-		}
-
-		public static void writeXml(object value, string path) {
-			using (StreamWriter writer = new StreamWriter(path)) {
-				writer.Write(writeXml(value));
-			}
-		}
-
-		public static void writeXml(object value, Stream stream) {
-			using (StreamWriter writer = new StreamWriter(stream)) {
-				writer.Write(writeXml(value));
-			}
-		}
-
-		public static string writeXml(object value) {
-			using (MemoryStream ms = new MemoryStream()) {
-				XmlWriterSettings xmlWriterSettings = new XmlWriterSettings();
-				xmlWriterSettings.Encoding = new System.Text.UTF8Encoding(false);
-				xmlWriterSettings.ConformanceLevel = ConformanceLevel.Document;
-				xmlWriterSettings.Indent = true;
-
-				using (XmlWriter xmlWriter = XmlWriter.Create(ms, xmlWriterSettings)) {
-					xmlWriter.WriteStartDocument();
-					//xmlWriter.WriteComment("DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" " + "\"http://www.apple.com/DTDs/PropertyList-1.0.dtd\"");
-					xmlWriter.WriteDocType("plist", "-//Apple Computer//DTD PLIST 1.0//EN", "http://www.apple.com/DTDs/PropertyList-1.0.dtd", null);
-					xmlWriter.WriteStartElement("plist");
-					xmlWriter.WriteAttributeString("version", "1.0");
-					compose(value, xmlWriter);
-					xmlWriter.WriteEndElement();
-					xmlWriter.WriteEndDocument();
-					xmlWriter.Flush();
-					return Encoding.UTF8.GetString(ms.ToArray());
-				}
-			}
-		}
-
-		public static void writeBinary(object value, string path) {
-			using (BinaryWriter writer = new BinaryWriter(new FileStream(path, FileMode.Create))) {
-				writer.Write(writeBinary(value));
-			}
-		}
-
-		public static void writeBinary(object value, Stream stream) {
-			using (BinaryWriter writer = new BinaryWriter(stream)) {
-				writer.Write(writeBinary(value));
-			}
-		}
-
-		public static byte[] writeBinary(object value) {
-			offsetTable.Clear();
-			objectTable.Clear();
-			refCount = 0;
-			objRefSize = 0;
-			offsetByteSize = 0;
-			offsetTableOffset = 0;
-
-			//Do not count the root node, subtract by 1
-			int totalRefs = countObject(value) - 1;
-
-			refCount = totalRefs;
-
-			objRefSize = RegulateNullBytes(BitConverter.GetBytes(refCount)).Length;
-
-			composeBinary(value);
-
-			writeBinaryString("bplist00", false);
-
-			offsetTableOffset = (long)objectTable.Count;
-
-			offsetTable.Add(objectTable.Count - 8);
-
-			offsetByteSize = RegulateNullBytes(BitConverter.GetBytes(offsetTable[offsetTable.Count - 1])).Length;
-
-			List<byte> offsetBytes = new List<byte>();
-
-			offsetTable.Reverse();
-
-			for (int i = 0; i < offsetTable.Count; i++) {
-				offsetTable[i] = objectTable.Count - offsetTable[i];
-				byte[] buffer = RegulateNullBytes(BitConverter.GetBytes(offsetTable[i]), offsetByteSize);
-				Array.Reverse(buffer);
-				offsetBytes.AddRange(buffer);
-			}
-
-			objectTable.AddRange(offsetBytes);
-
-			objectTable.AddRange(new byte[6]);
-			objectTable.Add(Convert.ToByte(offsetByteSize));
-			objectTable.Add(Convert.ToByte(objRefSize));
-
-			var a = BitConverter.GetBytes((long)totalRefs + 1);
-			Array.Reverse(a);
-			objectTable.AddRange(a);
-
-			objectTable.AddRange(BitConverter.GetBytes((long)0));
-			a = BitConverter.GetBytes(offsetTableOffset);
-			Array.Reverse(a);
-			objectTable.AddRange(a);
-
-			return objectTable.ToArray();
-		}
-
-		#endregion
-
-		#region Private Functions
-
-		private static object readXml(XmlDocument xml) {
-			XmlNode rootNode = xml.DocumentElement.ChildNodes[0];
-			return parse(rootNode);
-		}
-
-		private static object readBinary(byte[] data) {
-			offsetTable.Clear();
-			List<byte> offsetTableBytes = new List<byte>();
-			objectTable.Clear();
-			refCount = 0;
-			objRefSize = 0;
-			offsetByteSize = 0;
-			offsetTableOffset = 0;
-
-			List<byte> bList = new List<byte>(data);
-
-			List<byte> trailer = bList.GetRange(bList.Count - 32, 32);
-
-			parseTrailer(trailer);
-
-			objectTable = bList.GetRange(0, (int)offsetTableOffset);
-
-			offsetTableBytes = bList.GetRange((int)offsetTableOffset, bList.Count - (int)offsetTableOffset - 32);
-
-			parseOffsetTable(offsetTableBytes);
-
-			return parseBinary(0);
-		}
-
-		private static Dictionary<string, object> parseDictionary(XmlNode node) {
-			XmlNodeList children = node.ChildNodes;
-			if (children.Count % 2 != 0) {
-				throw new DataMisalignedException("Dictionary elements must have an even number of child nodes");
-			}
-
-			Dictionary<string, object> dict = new Dictionary<string, object>();
-
-			for (int i = 0; i < children.Count; i += 2) {
-				XmlNode keynode = children[i];
-				XmlNode valnode = children[i + 1];
-
-				if (keynode.Name != "key") {
-					throw new ApplicationException("expected a key node");
-				}
-
-				object result = parse(valnode);
-
-				if (result != null) {
-					dict.Add(keynode.InnerText, result);
-				}
-			}
-
-			return dict;
-		}
-
-		private static List<object> parseArray(XmlNode node) {
-			List<object> array = new List<object>();
-
-			foreach (XmlNode child in node.ChildNodes) {
-				object result = parse(child);
-				if (result != null) {
-					array.Add(result);
-				}
-			}
-
-			return array;
-		}
-
-		private static void composeArray(List<object> value, XmlWriter writer) {
-			writer.WriteStartElement("array");
-			foreach (object obj in value) {
-				compose(obj, writer);
-			}
-			writer.WriteEndElement();
-		}
-
-		private static object parse(XmlNode node) {
-			switch (node.Name) {
-				case "dict":
-					return parseDictionary(node);
-				case "array":
-					return parseArray(node);
-				case "string":
-					return node.InnerText;
-				case "integer":
-					//  int result;
-					//int.TryParse(node.InnerText, System.Globalization.NumberFormatInfo.InvariantInfo, out result);
-					return Convert.ToInt32(node.InnerText, System.Globalization.NumberFormatInfo.InvariantInfo);
-				case "real":
-					return Convert.ToDouble(node.InnerText, System.Globalization.NumberFormatInfo.InvariantInfo);
-				case "false":
-					return false;
-				case "true":
-					return true;
-				case "null":
-					return null;
-				case "date":
-					return XmlConvert.ToDateTime(node.InnerText, XmlDateTimeSerializationMode.Utc);
-				case "data":
-					return Convert.FromBase64String(node.InnerText);
-			}
-
-			throw new ApplicationException(String.Format("Plist Node `{0}' is not supported", node.Name));
-		}
-
-		private static void compose(object value, XmlWriter writer) {
-
-			if (value == null || value is string) {
-				writer.WriteElementString("string", value as string);
-			}
-			else if (value is int || value is long) {
-				writer.WriteElementString("integer", ((int)value).ToString(System.Globalization.NumberFormatInfo.InvariantInfo));
-			}
-			else if (value is System.Collections.Generic.Dictionary<string, object> ||
-			  value.GetType().ToString().StartsWith("System.Collections.Generic.Dictionary`2[System.String")) {
-				//Convert to Dictionary<string, object>
-				Dictionary<string, object> dic = value as Dictionary<string, object>;
-				if (dic == null) {
-					dic = new Dictionary<string, object>();
-					IDictionary idic = (IDictionary)value;
-					foreach (var key in idic.Keys) {
-						dic.Add(key.ToString(), idic[key]);
-					}
-				}
-				writeDictionaryValues(dic, writer);
-			}
-			else if (value is List<object>) {
-				composeArray((List<object>)value, writer);
-			}
-			else if (value is byte[]) {
-				writer.WriteElementString("data", Convert.ToBase64String((Byte[])value));
-			}
-			else if (value is float || value is double) {
-				writer.WriteElementString("real", ((double)value).ToString(System.Globalization.NumberFormatInfo.InvariantInfo));
-			}
-			else if (value is DateTime) {
-				DateTime time = (DateTime)value;
-				string theString = XmlConvert.ToString(time, XmlDateTimeSerializationMode.Utc);
-				writer.WriteElementString("date", theString);//, "yyyy-MM-ddTHH:mm:ssZ"));
-			}
-			else if (value is bool) {
-				writer.WriteElementString(value.ToString().ToLower(), "");
-			}
-			else {
-				throw new Exception(String.Format("Value type '{0}' is unhandled", value.GetType().ToString()));
-			}
-		}
-
-		private static void writeDictionaryValues(Dictionary<string, object> dictionary, XmlWriter writer) {
-			writer.WriteStartElement("dict");
-			foreach (string key in dictionary.Keys) {
-				object value = dictionary[key];
-				writer.WriteElementString("key", key);
-				compose(value, writer);
-			}
-			writer.WriteEndElement();
-		}
-
-		private static int countObject(object value) {
-			int count = 0;
-			switch (value.GetType().ToString()) {
-				case "System.Collections.Generic.Dictionary`2[System.String,System.Object]":
-					Dictionary<string, object> dict = (Dictionary<string, object>)value;
-					foreach (string key in dict.Keys) {
-						count += countObject(dict[key]);
-					}
-					count += dict.Keys.Count;
-					count++;
-					break;
-				case "System.Collections.Generic.List`1[System.Object]":
-					List<object> list = (List<object>)value;
-					foreach (object obj in list) {
-						count += countObject(obj);
-					}
-					count++;
-					break;
-				default:
-					count++;
-					break;
-			}
-			return count;
-		}
-
-		private static byte[] writeBinaryDictionary(Dictionary<string, object> dictionary) {
-			List<byte> buffer = new List<byte>();
-			List<byte> header = new List<byte>();
-			List<int> refs = new List<int>();
-			for (int i = dictionary.Count - 1; i >= 0; i--) {
-				var o = new object[dictionary.Count];
-				dictionary.Values.CopyTo(o, 0);
-				composeBinary(o[i]);
-				offsetTable.Add(objectTable.Count);
-				refs.Add(refCount);
-				refCount--;
-			}
-			for (int i = dictionary.Count - 1; i >= 0; i--) {
-				var o = new string[dictionary.Count];
-				dictionary.Keys.CopyTo(o, 0);
-				composeBinary(o[i]);//);
-				offsetTable.Add(objectTable.Count);
-				refs.Add(refCount);
-				refCount--;
-			}
-
-			if (dictionary.Count < 15) {
-				header.Add(Convert.ToByte(0xD0 | Convert.ToByte(dictionary.Count)));
-			}
-			else {
-				header.Add(0xD0 | 0xf);
-				header.AddRange(writeBinaryInteger(dictionary.Count, false));
-			}
-
-
-			foreach (int val in refs) {
-				byte[] refBuffer = RegulateNullBytes(BitConverter.GetBytes(val), objRefSize);
-				Array.Reverse(refBuffer);
-				buffer.InsertRange(0, refBuffer);
-			}
-
-			buffer.InsertRange(0, header);
-
-
-			objectTable.InsertRange(0, buffer);
-
-			return buffer.ToArray();
-		}
-
-		private static byte[] composeBinaryArray(List<object> objects) {
-			List<byte> buffer = new List<byte>();
-			List<byte> header = new List<byte>();
-			List<int> refs = new List<int>();
-
-			for (int i = objects.Count - 1; i >= 0; i--) {
-				composeBinary(objects[i]);
-				offsetTable.Add(objectTable.Count);
-				refs.Add(refCount);
-				refCount--;
-			}
-
-			if (objects.Count < 15) {
-				header.Add(Convert.ToByte(0xA0 | Convert.ToByte(objects.Count)));
-			}
-			else {
-				header.Add(0xA0 | 0xf);
-				header.AddRange(writeBinaryInteger(objects.Count, false));
-			}
-
-			foreach (int val in refs) {
-				byte[] refBuffer = RegulateNullBytes(BitConverter.GetBytes(val), objRefSize);
-				Array.Reverse(refBuffer);
-				buffer.InsertRange(0, refBuffer);
-			}
-
-			buffer.InsertRange(0, header);
-
-			objectTable.InsertRange(0, buffer);
-
-			return buffer.ToArray();
-		}
-
-		private static byte[] composeBinary(object obj) {
-			byte[] value;
-			switch (obj.GetType().ToString()) {
-				case "System.Collections.Generic.Dictionary`2[System.String,System.Object]":
-					value = writeBinaryDictionary((Dictionary<string, object>)obj);
-					return value;
-
-				case "System.Collections.Generic.List`1[System.Object]":
-					value = composeBinaryArray((List<object>)obj);
-					return value;
-
-				case "System.Byte[]":
-					value = writeBinaryByteArray((byte[])obj);
-					return value;
-
-				case "System.Double":
-					value = writeBinaryDouble((double)obj);
-					return value;
-
-				case "System.Int32":
-					value = writeBinaryInteger((int)obj, true);
-					return value;
-
-				case "System.String":
-					value = writeBinaryString((string)obj, true);
-					return value;
-
-				case "System.DateTime":
-					value = writeBinaryDate((DateTime)obj);
-					return value;
-
-				case "System.Boolean":
-					value = writeBinaryBool((bool)obj);
-					return value;
-
-				default:
-					return new byte[0];
-			}
-		}
-
-		public static byte[] writeBinaryDate(DateTime obj) {
-			List<byte> buffer = new List<byte>(RegulateNullBytes(BitConverter.GetBytes(PlistDateConverter.ConvertToAppleTimeStamp(obj)), 8));
-			buffer.Reverse();
-			buffer.Insert(0, 0x33);
-			objectTable.InsertRange(0, buffer);
-			return buffer.ToArray();
-		}
-
-		public static byte[] writeBinaryBool(bool obj) {
-			List<byte> buffer = new List<byte>(new byte[1] { (bool)obj ? (byte)9 : (byte)8 });
-			objectTable.InsertRange(0, buffer);
-			return buffer.ToArray();
-		}
-
-		private static byte[] writeBinaryInteger(int value, bool write) {
-			List<byte> buffer = new List<byte>(BitConverter.GetBytes((long)value));
-			buffer = new List<byte>(RegulateNullBytes(buffer.ToArray()));
-			while (buffer.Count != Math.Pow(2, Math.Log(buffer.Count) / Math.Log(2)))
-				buffer.Add(0);
-			int header = 0x10 | (int)(Math.Log(buffer.Count) / Math.Log(2));
-
-			buffer.Reverse();
-
-			buffer.Insert(0, Convert.ToByte(header));
-
-			if (write)
-				objectTable.InsertRange(0, buffer);
-
-			return buffer.ToArray();
-		}
-
-		private static byte[] writeBinaryDouble(double value) {
-			List<byte> buffer = new List<byte>(RegulateNullBytes(BitConverter.GetBytes(value), 4));
-			while (buffer.Count != Math.Pow(2, Math.Log(buffer.Count) / Math.Log(2)))
-				buffer.Add(0);
-			int header = 0x20 | (int)(Math.Log(buffer.Count) / Math.Log(2));
-
-			buffer.Reverse();
-
-			buffer.Insert(0, Convert.ToByte(header));
-
-			objectTable.InsertRange(0, buffer);
-
-			return buffer.ToArray();
-		}
-
-		private static byte[] writeBinaryByteArray(byte[] value) {
-			List<byte> buffer = new List<byte>(value);
-			List<byte> header = new List<byte>();
-			if (value.Length < 15) {
-				header.Add(Convert.ToByte(0x40 | Convert.ToByte(value.Length)));
-			}
-			else {
-				header.Add(0x40 | 0xf);
-				header.AddRange(writeBinaryInteger(buffer.Count, false));
-			}
-
-			buffer.InsertRange(0, header);
-
-			objectTable.InsertRange(0, buffer);
-
-			return buffer.ToArray();
-		}
-
-		private static byte[] writeBinaryString(string value, bool head) {
-			List<byte> buffer = new List<byte>();
-			List<byte> header = new List<byte>();
-			foreach (char chr in value.ToCharArray())
-				buffer.Add(Convert.ToByte(chr));
-
-			if (head) {
-				if (value.Length < 15) {
-					header.Add(Convert.ToByte(0x50 | Convert.ToByte(value.Length)));
-				}
-				else {
-					header.Add(0x50 | 0xf);
-					header.AddRange(writeBinaryInteger(buffer.Count, false));
-				}
-			}
-
-			buffer.InsertRange(0, header);
-
-			objectTable.InsertRange(0, buffer);
-
-			return buffer.ToArray();
-		}
-
-		private static byte[] RegulateNullBytes(byte[] value) {
-			return RegulateNullBytes(value, 1);
-		}
-
-		private static byte[] RegulateNullBytes(byte[] value, int minBytes) {
-			Array.Reverse(value);
-			List<byte> bytes = new List<byte>(value);
-			for (int i = 0; i < bytes.Count; i++) {
-				if (bytes[i] == 0 && bytes.Count > minBytes) {
-					bytes.Remove(bytes[i]);
-					i--;
-				}
-				else
-					break;
-			}
-
-			if (bytes.Count < minBytes) {
-				int dist = minBytes - bytes.Count;
-				for (int i = 0; i < dist; i++)
-					bytes.Insert(0, 0);
-			}
-
-			value = bytes.ToArray();
-			Array.Reverse(value);
-			return value;
-		}
-
-		private static void parseTrailer(List<byte> trailer) {
-			offsetByteSize = BitConverter.ToInt32(RegulateNullBytes(trailer.GetRange(6, 1).ToArray(), 4), 0);
-			objRefSize = BitConverter.ToInt32(RegulateNullBytes(trailer.GetRange(7, 1).ToArray(), 4), 0);
-			byte[] refCountBytes = trailer.GetRange(12, 4).ToArray();
-			Array.Reverse(refCountBytes);
-			refCount = BitConverter.ToInt32(refCountBytes, 0);
-			byte[] offsetTableOffsetBytes = trailer.GetRange(24, 8).ToArray();
-			Array.Reverse(offsetTableOffsetBytes);
-			offsetTableOffset = BitConverter.ToInt64(offsetTableOffsetBytes, 0);
-		}
-
-		private static void parseOffsetTable(List<byte> offsetTableBytes) {
-			for (int i = 0; i < offsetTableBytes.Count; i += offsetByteSize) {
-				byte[] buffer = offsetTableBytes.GetRange(i, offsetByteSize).ToArray();
-				Array.Reverse(buffer);
-				offsetTable.Add(BitConverter.ToInt32(RegulateNullBytes(buffer, 4), 0));
-			}
-		}
-
-		private static object parseBinaryDictionary(int objRef) {
-			Dictionary<string, object> buffer = new Dictionary<string, object>();
-			List<int> refs = new List<int>();
-			int refCount = 0;
-
-			int refStartPosition;
-			refCount = getCount(offsetTable[objRef], out refStartPosition);
-
-
-			if (refCount < 15)
-				refStartPosition = offsetTable[objRef] + 1;
-			else
-				refStartPosition = offsetTable[objRef] + 2 + RegulateNullBytes(BitConverter.GetBytes(refCount), 1).Length;
-
-			for (int i = refStartPosition; i < refStartPosition + refCount * 2 * objRefSize; i += objRefSize) {
-				byte[] refBuffer = objectTable.GetRange(i, objRefSize).ToArray();
-				Array.Reverse(refBuffer);
-				refs.Add(BitConverter.ToInt32(RegulateNullBytes(refBuffer, 4), 0));
-			}
-
-			for (int i = 0; i < refCount; i++) {
-				buffer.Add((string)parseBinary(refs[i]), parseBinary(refs[i + refCount]));
-			}
-
-			return buffer;
-		}
-
-		private static object parseBinaryArray(int objRef) {
-			List<object> buffer = new List<object>();
-			List<int> refs = new List<int>();
-			int refCount = 0;
-
-			int refStartPosition;
-			refCount = getCount(offsetTable[objRef], out refStartPosition);
-
-
-			if (refCount < 15)
-				refStartPosition = offsetTable[objRef] + 1;
-			else
-				//The following integer has a header aswell so we increase the refStartPosition by two to account for that.
-				refStartPosition = offsetTable[objRef] + 2 + RegulateNullBytes(BitConverter.GetBytes(refCount), 1).Length;
-
-			for (int i = refStartPosition; i < refStartPosition + refCount * objRefSize; i += objRefSize) {
-				byte[] refBuffer = objectTable.GetRange(i, objRefSize).ToArray();
-				Array.Reverse(refBuffer);
-				refs.Add(BitConverter.ToInt32(RegulateNullBytes(refBuffer, 4), 0));
-			}
-
-			for (int i = 0; i < refCount; i++) {
-				buffer.Add(parseBinary(refs[i]));
-			}
-
-			return buffer;
-		}
-
-		private static int getCount(int bytePosition, out int newBytePosition) {
-			byte headerByte = objectTable[bytePosition];
-			byte headerByteTrail = Convert.ToByte(headerByte & 0xf);
-			int count;
-			if (headerByteTrail < 15) {
-				count = headerByteTrail;
-				newBytePosition = bytePosition + 1;
-			}
-			else
-				count = (int)parseBinaryInt(bytePosition + 1, out newBytePosition);
-			return count;
-		}
-
-		private static object parseBinary(int objRef) {
-			byte header = objectTable[offsetTable[objRef]];
-			switch (header & 0xF0) {
-				case 0: {
-						//If the byte is
-						//0 return null
-						//9 return true
-						//8 return false
-						return (objectTable[offsetTable[objRef]] == 0) ? (object)null : ((objectTable[offsetTable[objRef]] == 9) ? true : false);
-					}
-				case 0x10: {
-						return parseBinaryInt(offsetTable[objRef]);
-					}
-				case 0x20: {
-						return parseBinaryReal(offsetTable[objRef]);
-					}
-				case 0x30: {
-						return parseBinaryDate(offsetTable[objRef]);
-					}
-				case 0x40: {
-						return parseBinaryByteArray(offsetTable[objRef]);
-					}
-				case 0x50://String ASCII
-                    {
-						return parseBinaryAsciiString(offsetTable[objRef]);
-					}
-				case 0x60://String Unicode
-                    {
-						return parseBinaryUnicodeString(offsetTable[objRef]);
-					}
-				case 0xD0: {
-						return parseBinaryDictionary(objRef);
-					}
-				case 0xA0: {
-						return parseBinaryArray(objRef);
-					}
-			}
-			throw new Exception("This type is not supported");
-		}
-
-		public static object parseBinaryDate(int headerPosition) {
-			byte[] buffer = objectTable.GetRange(headerPosition + 1, 8).ToArray();
-			Array.Reverse(buffer);
-			double appleTime = BitConverter.ToDouble(buffer, 0);
-			DateTime result = PlistDateConverter.ConvertFromAppleTimeStamp(appleTime);
-			return result;
-		}
-
-		private static object parseBinaryInt(int headerPosition) {
-			int output;
-			return parseBinaryInt(headerPosition, out output);
-		}
-
-		private static object parseBinaryInt(int headerPosition, out int newHeaderPosition) {
-			byte header = objectTable[headerPosition];
-			int byteCount = (int)Math.Pow(2, header & 0xf);
-			byte[] buffer = objectTable.GetRange(headerPosition + 1, byteCount).ToArray();
-			Array.Reverse(buffer);
-			//Add one to account for the header byte
-			newHeaderPosition = headerPosition + byteCount + 1;
-			return BitConverter.ToInt32(RegulateNullBytes(buffer, 4), 0);
-		}
-
-		private static object parseBinaryReal(int headerPosition) {
-			byte header = objectTable[headerPosition];
-			int byteCount = (int)Math.Pow(2, header & 0xf);
-			byte[] buffer = objectTable.GetRange(headerPosition + 1, byteCount).ToArray();
-			Array.Reverse(buffer);
-
-			return BitConverter.ToDouble(RegulateNullBytes(buffer, 8), 0);
-		}
-
-		private static object parseBinaryAsciiString(int headerPosition) {
-			int charStartPosition;
-			int charCount = getCount(headerPosition, out charStartPosition);
-
-			var buffer = objectTable.GetRange(charStartPosition, charCount);
-			return buffer.Count > 0 ? Encoding.ASCII.GetString(buffer.ToArray()) : string.Empty;
-		}
-
-		private static object parseBinaryUnicodeString(int headerPosition) {
-			int charStartPosition;
-			int charCount = getCount(headerPosition, out charStartPosition);
-			charCount = charCount * 2;
-
-			byte[] buffer = new byte[charCount];
-			byte one, two;
-
-			for (int i = 0; i < charCount; i += 2) {
-				one = objectTable.GetRange(charStartPosition + i, 1)[0];
-				two = objectTable.GetRange(charStartPosition + i + 1, 1)[0];
-
-				if (BitConverter.IsLittleEndian) {
-					buffer[i] = two;
-					buffer[i + 1] = one;
-				}
-				else {
-					buffer[i] = one;
-					buffer[i + 1] = two;
-				}
-			}
-
-			return Encoding.Unicode.GetString(buffer);
-		}
-
-		private static object parseBinaryByteArray(int headerPosition) {
-			int byteStartPosition;
-			int byteCount = getCount(headerPosition, out byteStartPosition);
-			return objectTable.GetRange(byteStartPosition, byteCount).ToArray();
-		}
-
-		#endregion
-	}
-
-	public enum plistType {
-		Auto, Binary, Xml
-	}
-
-	public static class PlistDateConverter {
-		public static long timeDifference = 978307200;
-
-		public static long GetAppleTime(long unixTime) {
-			return unixTime - timeDifference;
-		}
-
-		public static long GetUnixTime(long appleTime) {
-			return appleTime + timeDifference;
-		}
-
-		public static DateTime ConvertFromAppleTimeStamp(double timestamp) {
-			DateTime origin = new DateTime(2001, 1, 1, 0, 0, 0, 0);
-			return origin.AddSeconds(timestamp);
-		}
-
-		public static double ConvertToAppleTimeStamp(DateTime date) {
-			DateTime begin = new DateTime(2001, 1, 1, 0, 0, 0, 0);
-			TimeSpan diff = date - begin;
-			return Math.Floor(diff.TotalSeconds);
-		}
-	}
-}

Assets/Prefabs/PVString.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: d3142009b74dda042a75e9b808dde66d
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/TransparentMat.mat.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 6805a4a1bc3dde4418e39fe1e4ab68b0
-timeCreated: 1614591336
-licenseType: Free
-NativeFormatImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Resources/default.txt

@@ -0,0 +1 @@
+../../Local/default_resources.zip

Packages/packages-lock.json

@@ -11,7 +11,7 @@
       "depth": 2,
       "source": "registry",
       "dependencies": {},
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
     },
     "com.unity.ide.visualstudio": {
       "version": "2.0.16",
@@ -20,14 +20,14 @@
       "dependencies": {
         "com.unity.test-framework": "1.1.9"
       },
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
     },
     "com.unity.nuget.newtonsoft-json": {
       "version": "3.0.2",
       "depth": 0,
       "source": "registry",
       "dependencies": {},
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
     },
     "com.unity.test-framework": {
       "version": "1.1.31",
@@ -38,7 +38,7 @@
         "com.unity.modules.imgui": "1.0.0",
         "com.unity.modules.jsonserialize": "1.0.0"
       },
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
     },
     "com.unity.ugui": {
       "version": "1.0.0",

ProjectSettings/PackageManagerSettings.asset

@@ -21,15 +21,16 @@ MonoBehaviour:
   m_Registries:
   - m_Id: main
     m_Name: 
-    m_Url: https://packages.unity.cn
+    m_Url: https://packages.unity.com
     m_Scopes: []
     m_IsDefault: 1
     m_Capabilities: 7
+    m_ConfigSource: 0
   m_UserSelectedRegistryName: 
   m_UserAddingNewScopedRegistry: 0
   m_RegistryInfoDraft:
     m_Modified: 0
     m_ErrorMessage: 
-    m_UserModificationsInstanceId: -844
-    m_OriginalInstanceId: -846
+    m_UserModificationsInstanceId: -830
+    m_OriginalInstanceId: -832
   m_LoadAssets: 0

ProjectSettings/ProjectVersion.txt

@@ -1,2 +1,2 @@
-m_EditorVersion: 2021.3.10f1c1
-m_EditorVersionWithRevision: 2021.3.10f1c1 (fad0948fb939)
+m_EditorVersion: 2021.3.14f1
+m_EditorVersionWithRevision: 2021.3.14f1 (eee1884e7226)