feat: Add fatal error dialog

Assets/Cryville.Common/Cryville.Common.asmdef

@@ -2,7 +2,7 @@
     "name": "Cryville.Common",
     "rootNamespace": "",
     "references": [
-        "GUID:da293eebbcb9a4947a212534c52d1a32"
+        "GUID:6055be8ebefd69e48b49212b09b47b2f"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

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

@@ -23,6 +23,12 @@ namespace Cryville.Common.Unity.UI {
 		[SerializeField]
 		protected bool m_ChildScaleHeight;
 
+		[SerializeField]
+		protected bool m_ChildOverflowWidth;
+
+		[SerializeField]
+		protected bool m_ChildOverflowHeight;
+
 		public override void CalculateLayoutInputHorizontal() {
 			base.CalculateLayoutInputHorizontal();
 			CalcAlongAxis(0);
@@ -60,9 +66,10 @@ namespace Cryville.Common.Unity.UI {
 			float size = rectTransform.rect.size[axis];
 			bool controlSize = (axis == 0) ? m_ChildControlWidth : m_ChildControlHeight;
 			bool useScale = (axis == 0) ? m_ChildScaleWidth : m_ChildScaleHeight;
+			bool overflow = (axis == 0) ? m_ChildOverflowWidth : m_ChildOverflowHeight;
 			bool childForceExpandSize = (axis == 0) ? m_ChildForceExpandWidth : m_ChildForceExpandHeight;
 			float alignmentOnAxis = GetAlignmentOnAxis(axis);
-			float innerSize = size - ((axis == 0) ? padding.horizontal : padding.vertical);
+			float innerSize = overflow ? float.PositiveInfinity : (size - ((axis == 0) ? padding.horizontal : padding.vertical));
 			RectTransform child = rectChildren[0];
 			GetChildSizes(child, axis, controlSize, childForceExpandSize, out var min2, out var preferred2, out var flexible2);
 			float scaleFactor2 = useScale ? child.localScale[axis] : 1f;

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

@@ -6,8 +6,9 @@ using System.Globalization;
 using System.Reflection;
 using TMPro;
 using UnityEngine;
+using UnityEngine.TextCore;
 using UnityEngine.TextCore.LowLevel;
-using UnityEngine.TextCore.Text;
+using AtlasPopulationMode = TMPro.AtlasPopulationMode;
 
 namespace Cryville.Common.Unity.UI {
 	[RequireComponent(typeof(TMP_Text))]
@@ -16,7 +17,7 @@ namespace Cryville.Common.Unity.UI {
 		public static FontMatcher FontMatcher;
 		public static int MaxFallbackCount = 4;
 
-		static readonly Dictionary<CultureInfo, FontAsset> _cachedFonts = new();
+		static readonly Dictionary<CultureInfo, TMP_FontAsset> _cachedFonts = new();
 
 		[SerializeField]
 		Shader m_shader;
@@ -46,7 +47,7 @@ namespace Cryville.Common.Unity.UI {
 							if (MaxFallbackCount <= 0) break;
 						}
 						else {
-							font.fallbackFontAssetTable ??= new List<FontAsset>();
+							font.fallbackFontAssetTable ??= new List<TMP_FontAsset>();
 							font.fallbackFontAssetTable.Add(ifont);
 							if (font.fallbackFontAssetTable.Count >= MaxFallbackCount) break;
 						}
@@ -58,23 +59,93 @@ namespace Cryville.Common.Unity.UI {
 			Text.font = font;
 		}
 
-		static MethodInfo _methodCreateFontAsset;
-		static readonly object[] _paramsCreateFontAsset = new object[] { null, null, 90, 9, GlyphRenderMode.SDFAA, 1024, 1024, Type.Missing, Type.Missing };
-		static FontAsset CreateFontAsset(string path, int index) {
-			if (_methodCreateFontAsset == null) {
-				_methodCreateFontAsset = typeof(FontAsset).GetMethod(
-					"CreateFontAsset", BindingFlags.Static | BindingFlags.NonPublic, null,
-					new Type[] {
-						typeof(string), typeof(int), typeof(int), typeof(int),
-						typeof(GlyphRenderMode), typeof(int), typeof(int),
-						typeof(AtlasPopulationMode), typeof(bool)
-					},
-					null
-				);
+		static TMP_FontAsset CreateFontAsset(string path, int index) => CreateFontAsset(path, index, 90, 9, GlyphRenderMode.SDFAA, 1024, 1024, AtlasPopulationMode.Dynamic);
+
+		static readonly Lazy<FieldInfo> _f_m_Version = new(() => typeof(TMP_FontAsset).GetField("m_Version", BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic));
+		static readonly Lazy<PropertyInfo> _p_atlasWidth = new(() => typeof(TMP_FontAsset).GetProperty("atlasWidth", BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic));
+		static readonly Lazy<PropertyInfo> _p_atlasHeight = new(() => typeof(TMP_FontAsset).GetProperty("atlasHeight", BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic));
+		static readonly Lazy<PropertyInfo> _p_atlasPadding = new(() => typeof(TMP_FontAsset).GetProperty("atlasPadding", BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic));
+		static readonly Lazy<PropertyInfo> _p_atlasRenderMode = new(() => typeof(TMP_FontAsset).GetProperty("atlasRenderMode", BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic));
+		static readonly Lazy<PropertyInfo> _p_freeGlyphRects = new(() => typeof(TMP_FontAsset).GetProperty("freeGlyphRects", BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic));
+		static readonly Lazy<PropertyInfo> _p_usedGlyphRects = new(() => typeof(TMP_FontAsset).GetProperty("usedGlyphRects", BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic));
+
+		static readonly Lazy<PropertyInfo> _p_ShaderRef_MobileBitmap = new(() => typeof(ShaderUtilities).GetProperty("ShaderRef_MobileBitmap", BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic));
+		static readonly Lazy<PropertyInfo> _p_ShaderRef_MobileSDF = new(() => typeof(ShaderUtilities).GetProperty("ShaderRef_MobileSDF", BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic));
+
+		public static TMP_FontAsset CreateFontAsset(string path, int faceIndex, int samplingPointSize, int atlasPadding, GlyphRenderMode renderMode, int atlasWidth, int atlasHeight, AtlasPopulationMode atlasPopulationMode = AtlasPopulationMode.Dynamic, bool enableMultiAtlasSupport = true) {
+			// Initialize FontEngine
+			FontEngine.InitializeFontEngine();
+
+			// Load Font Face
+			if (FontEngine.LoadFontFace(path, samplingPointSize, faceIndex) != FontEngineError.Success) {
+				Debug.LogWarning("Unable to load font face at path " + path);
+				return null;
 			}
-			_paramsCreateFontAsset[0] = path;
-			_paramsCreateFontAsset[1] = index;
-			return (FontAsset)_methodCreateFontAsset.Invoke(null, _paramsCreateFontAsset);
+
+			// Create new font asset
+			TMP_FontAsset fontAsset = ScriptableObject.CreateInstance<TMP_FontAsset>();
+
+			_f_m_Version.Value.SetValue(fontAsset, "1.1.0");
+			fontAsset.faceInfo = FontEngine.GetFaceInfo();
+
+			fontAsset.atlasPopulationMode = atlasPopulationMode;
+
+			_p_atlasWidth.Value.SetValue(fontAsset, atlasWidth);
+			_p_atlasHeight.Value.SetValue(fontAsset, atlasHeight);
+			_p_atlasPadding.Value.SetValue(fontAsset, atlasPadding);
+			_p_atlasRenderMode.Value.SetValue(fontAsset, renderMode);
+
+			// Initialize array for the font atlas textures.
+			fontAsset.atlasTextures = new Texture2D[1];
+
+			// Create and add font atlas texture.
+			var texture = new Texture2D(0, 0, TextureFormat.Alpha8, false);
+			fontAsset.atlasTextures[0] = texture;
+
+			fontAsset.isMultiAtlasTexturesEnabled = enableMultiAtlasSupport;
+
+			// Add free rectangle of the size of the texture.
+			int packingModifier;
+			if (((int)renderMode & 0x10) != 0) {
+				packingModifier = 0;
+
+				// Optimize by adding static ref to shader.
+				var tmp_material = new Material((Shader)_p_ShaderRef_MobileBitmap.Value.GetValue(null));
+
+				//tmp_material.name = texture.name + " Material";
+				tmp_material.SetTexture(ShaderUtilities.ID_MainTex, texture);
+				tmp_material.SetFloat(ShaderUtilities.ID_TextureWidth, atlasWidth);
+				tmp_material.SetFloat(ShaderUtilities.ID_TextureHeight, atlasHeight);
+
+				fontAsset.material = tmp_material;
+			}
+			else {
+				packingModifier = 1;
+
+				// Optimize by adding static ref to shader.
+				var tmp_material = new Material((Shader)_p_ShaderRef_MobileSDF.Value.GetValue(null));
+
+				//tmp_material.name = texture.name + " Material";
+				tmp_material.SetTexture(ShaderUtilities.ID_MainTex, texture);
+				tmp_material.SetFloat(ShaderUtilities.ID_TextureWidth, atlasWidth);
+				tmp_material.SetFloat(ShaderUtilities.ID_TextureHeight, atlasHeight);
+
+				tmp_material.SetFloat(ShaderUtilities.ID_GradientScale, atlasPadding + packingModifier);
+
+				tmp_material.SetFloat(ShaderUtilities.ID_WeightNormal, fontAsset.normalStyle);
+				tmp_material.SetFloat(ShaderUtilities.ID_WeightBold, fontAsset.boldStyle);
+
+				fontAsset.material = tmp_material;
+			}
+
+			_p_freeGlyphRects.Value.SetValue(fontAsset, new List<GlyphRect>(8) { new(0, 0, atlasWidth - packingModifier, atlasHeight - packingModifier) });
+			_p_usedGlyphRects.Value.SetValue(fontAsset, new List<GlyphRect>(8));
+
+			// TODO: Consider adding support for extracting glyph positioning data
+
+			fontAsset.ReadFontAssetDefinition();
+
+			return fontAsset;
 		}
 	}
 }

Assets/Cryville.Common/Unity/UI/TMPLocalizedText.cs.meta

@@ -4,7 +4,7 @@ MonoImporter:
   externalObjects: {}
   serializedVersion: 2
   defaultReferences: []
-  executionOrder: 0
+  executionOrder: -95
   icon: {instanceID: 0}
   userData: 
   assetBundleName: 

Assets/Cryville.EEW.Unity/App.cs

@@ -1,19 +1,60 @@
 using Cryville.Common.Font;
+using Cryville.Common.Logging;
 using Cryville.Common.Unity.UI;
 using Cryville.Culture;
+using System;
+using System.Globalization;
 using System.IO;
 using System.Text;
 using System.Xml;
 using System.Xml.Linq;
 using UnityEngine;
+using Logger = Cryville.Common.Logging.Logger;
 
 namespace Cryville.EEW.Unity {
 	class App {
+		public static string AppDataPath { get; private set; }
+
+		public static Logger MainLogger { get; private set; }
+		static FileStream _logFileStream;
+		static StreamLoggerListener _logWriter;
+
 		static bool _init;
 		public static void Init() {
 			if (_init) return;
 			_init = true;
 
+			AppDataPath = Application.persistentDataPath;
+
+			var logPath = Directory.CreateDirectory(Path.Combine(AppDataPath, "logs"));
+			_logFileStream = new FileStream(
+				Path.Combine(
+					logPath.FullName,
+					string.Format(
+						CultureInfo.InvariantCulture,
+						"{0}.log",
+						DateTimeOffset.UtcNow.ToString("yyyyMMddHHmmssfff", CultureInfo.InvariantCulture)
+					)
+				),
+				FileMode.Create, FileAccess.Write, FileShare.Read
+			);
+			_logWriter = new StreamLoggerListener(_logFileStream) { AutoFlush = true };
+			MainLogger = new Logger();
+			var listener = new InstantLoggerListener();
+			listener.Log += MainLogger.Log;
+			MainLogger.AddListener(_logWriter);
+			Application.logMessageReceivedThreaded += OnInternalLog;
+
+			MainLogger.Log(1, "App", null, "App Version: {0}", Application.version);
+			MainLogger.Log(1, "App", null, "Unity Version: {0}", Application.unityVersion);
+			MainLogger.Log(1, "App", null, "Operating System: {0}, Unity = {1}, Family = {2}", Environment.OSVersion, SystemInfo.operatingSystem, SystemInfo.operatingSystemFamily);
+			MainLogger.Log(1, "App", null, "Platform: Build = {0}, Unity = {1}", PlatformConfig.Name, Application.platform);
+			MainLogger.Log(1, "App", null, "Culture: {0}, UI = {1}, Unity = {2}", SharedCultures.CurrentCulture, SharedCultures.CurrentUICulture, Application.systemLanguage);
+			MainLogger.Log(1, "App", null, "Device: Model = {0}, Type = {1}", SystemInfo.deviceModel, SystemInfo.deviceType);
+			MainLogger.Log(1, "App", null, "Graphics: Name = {0}, Type = {1}, Vendor = {2}, Version = {3}", SystemInfo.graphicsDeviceName, SystemInfo.graphicsDeviceType, SystemInfo.graphicsDeviceVendor, SystemInfo.graphicsDeviceVersion);
+			MainLogger.Log(1, "App", null, "Processor: Count = {0}, Frequency = {1}MHz, Type = {2}", SystemInfo.processorCount, SystemInfo.processorFrequency, SystemInfo.processorType);
+
+			MainLogger.Log(1, "App", null, "Initializing font manager");
 			foreach (var res in Resources.LoadAll<TextAsset>("cldr/common/validity")) {
 				IdValidity.Load(LoadXmlDocument(res));
 			}
@@ -25,7 +66,10 @@ namespace Cryville.EEW.Unity {
 			};
 			TMPLocalizedText.DefaultShader = Resources.Load<Shader>(PlatformConfig.TextShader);
 
+			MainLogger.Log(1, "App", null, "Loading config");
 			SharedSettings.Instance.Init();
+
+			MainLogger.Log(1, "App", null, "Initialized");
 		}
 
 		static readonly Encoding _encoding = new UTF8Encoding(false, true);
@@ -40,5 +84,16 @@ namespace Cryville.EEW.Unity {
 			using var reader = XmlReader.Create(stream, _xmlSettings);
 			return XDocument.Load(reader);
 		}
+
+		static void OnInternalLog(string condition, string stackTrace, LogType type) {
+			var l = type switch {
+				LogType.Log => 1,
+				LogType.Assert => 2,
+				LogType.Warning => 3,
+				LogType.Error or LogType.Exception => 4,
+				_ => 1,
+			};
+			MainLogger.Log(l, "Internal", null, "{0}\n{1}", condition, stackTrace);
+		}
 	}
 }

Assets/Cryville.EEW.Unity/AssemblyInfo.cs

@@ -1,3 +1,3 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("0.0.6")]
+[assembly: AssemblyVersion("0.0.8")]

Assets/Cryville.EEW.Unity/Config.cs

@@ -12,6 +12,7 @@ namespace Cryville.EEW.Unity {
 		float SeverityColorMappingLuminanceMultiplier,
 		bool UseContinuousColor,
 		string ColorScheme,
+		float HillshadeLayerOpacity,
 		string LocationNamer,
 
 		string OverrideTimeZone,
@@ -31,6 +32,7 @@ namespace Cryville.EEW.Unity {
 			1f,
 			false,
 			"Default",
+			1,
 			"FERegionLong",
 
 			null,
@@ -55,23 +57,27 @@ namespace Cryville.EEW.Unity {
 	[JsonDerivedType(typeof(BMKGOpenDataEventSourceConfig), "BMKGOpenData")]
 	[JsonDerivedType(typeof(CWAOpenDataEventSourceConfig), "CWAOpenData")]
 	[JsonDerivedType(typeof(EMSCRealTimeEventSourceConfig), "EMSCRealTime")]
+	[JsonDerivedType(typeof(FANStudioEventSourceConfig), "FANStudio")]
+	[JsonDerivedType(typeof(GeoNetEventSourceConfig), "GeoNet")]
 	[JsonDerivedType(typeof(GlobalQuakeServerEventSourceConfig), "GlobalQuakeServer")]
 	[JsonDerivedType(typeof(GlobalQuakeServer15EventSourceConfig), "GlobalQuakeServer15")]
 	[JsonDerivedType(typeof(JMAAtomEventSourceConfig), "JMAAtom")]
 	[JsonDerivedType(typeof(NOAAEventSourceConfig), "NOAA")]
 	[JsonDerivedType(typeof(UpdateCheckerEventSourceConfig), "UpdateChecker")]
-	[JsonDerivedType(typeof(USGSQuakeMLEventSourceConfig), "USGSQuakeML")]
+	[JsonDerivedType(typeof(USGSEventSourceConfig), "USGSQuakeML")]
 	[JsonDerivedType(typeof(WolfxEventSourceConfig), "Wolfx")]
 	abstract record EventSourceConfig();
 	record BMKGOpenDataEventSourceConfig([property: JsonRequired] string[] Subtypes) : EventSourceConfig;
 	record CWAOpenDataEventSourceConfig([property: JsonRequired] string Subtype, [property: JsonRequired] string Token) : EventSourceConfig;
 	record EMSCRealTimeEventSourceConfig() : EventSourceConfig;
+	record FANStudioEventSourceConfig([property: JsonRequired] string Subtype) : EventSourceConfig;
+	record GeoNetEventSourceConfig(int MinimumMMI = 3, bool DoGetFullHistory = false, bool DoGetStrongMotionInfo = true) : EventSourceConfig;
 	record GlobalQuakeServerEventSourceConfig([property: JsonRequired] string Host, int Port = 38000) : EventSourceConfig;
 	record GlobalQuakeServer15EventSourceConfig(string Host, int Port = 38000) : GlobalQuakeServerEventSourceConfig(Host, Port);
 	record JMAAtomEventSourceConfig(IReadOnlyCollection<string> Filter = null, bool IsFilterWhitelist = false) : EventSourceConfig;
 	record NOAAEventSourceConfig([property: JsonRequired] string Subtype) : EventSourceConfig;
 	record UpdateCheckerEventSourceConfig : EventSourceConfig;
-	record USGSQuakeMLEventSourceConfig([property: JsonRequired] string Subtype) : EventSourceConfig;
+	record USGSEventSourceConfig([property: JsonRequired] string Subtype, bool UseGeoJSONFeeds, string[] Products) : EventSourceConfig;
 	record WolfxEventSourceConfig(IReadOnlyCollection<string> Filter = null, bool IsFilterWhitelist = false, bool UseRawCENCLocationName = false) : EventSourceConfig;
 
 	[JsonSerializable(typeof(Config))]

Assets/Cryville.EEW.Unity/Cryville.EEW.Unity.asmdef

@@ -5,7 +5,7 @@
         "GUID:b92f9c7ac10b1c04e86fc48210f62ab1",
         "GUID:1e0937e40dadba24a97b7342c4559580",
         "GUID:e5b7e7f40a80a814ba706299d68f9213",
-        "GUID:da293eebbcb9a4947a212534c52d1a32"
+        "GUID:6055be8ebefd69e48b49212b09b47b2f"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

Assets/Cryville.EEW.Unity/Map/CameraController.cs

@@ -1,3 +1,4 @@
+using Cryville.EEW.Core.Map;
 using System;
 using System.Drawing;
 using UnityEngine;
@@ -10,12 +11,16 @@ namespace Cryville.EEW.Unity.Map {
 		[SerializeField]
 		Transform m_layerTile;
 		[SerializeField]
+		Transform m_layerTileHillshade;
+		[SerializeField]
 		MapElementManager m_layerElement;
 		[SerializeField]
 		MapElementManager m_layerElementSub;
 		[SerializeField]
 		GameObject m_prefabTile;
 		[SerializeField]
+		GameObject m_prefabTileHillshade;
+		[SerializeField]
 		GameObject m_prefabBitmapHolder;
 		[SerializeField]
 		int m_maxMapTileZoom = 10;
@@ -23,6 +28,7 @@ namespace Cryville.EEW.Unity.Map {
 		bool m_isEditor;
 
 		MapTileCacheManager _tiles;
+		MapTileCacheManager _tilesHillshade;
 		float _elementLayerZ;
 
 		void Start() {
@@ -33,12 +39,23 @@ namespace Cryville.EEW.Unity.Map {
 			_tiles.PrefabTile = m_prefabTile;
 			_tiles.PrefabBitmapHolder = m_prefabBitmapHolder;
 			_tiles.CacheDir = Application.temporaryCachePath;
+			if (m_layerTileHillshade) {
+				m_prefabTileHillshade.GetComponent<SpriteRenderer>().sharedMaterial.color = new UnityEngine.Color(1, 1, 1, SharedSettings.Instance.HillshadeLayerOpacity);
+				_tilesHillshade = new HillshadeMapTileCacheManager {
+					ExtraCachedZoomLevel = 20,
+					Parent = m_layerTileHillshade,
+					PrefabTile = m_prefabTileHillshade,
+					PrefabBitmapHolder = m_prefabBitmapHolder,
+					CacheDir = Application.temporaryCachePath,
+				};
+			}
 			_camera.orthographicSize = 0.5f / MathF.Max(1, (float)_camera.pixelWidth / _camera.pixelHeight);
 			if (m_layerElement != null) _elementLayerZ = m_layerElement.transform.position.z;
 			_mapElementUpdated = true;
 		}
 		void OnDestroy() {
 			_tiles.Dispose();
+			_tilesHillshade?.Dispose();
 		}
 
 		float Scale {
@@ -104,10 +121,10 @@ namespace Cryville.EEW.Unity.Map {
 			var bounds = new Bounds((Vector2)transform.position, new Vector2(w, h));
 			int zoom = Math.Clamp((int)Math.Log(vz / 256, 2) + 1, 0, m_maxMapTileZoom);
 			int zoomScale = 1 << zoom;
-			_tiles.MoveTo(
-				new(Mathf.FloorToInt(bounds.min.x * zoomScale), Mathf.FloorToInt(-bounds.max.y * zoomScale), zoom),
-				new(Mathf.CeilToInt(bounds.max.x * zoomScale), Mathf.CeilToInt(-bounds.min.y * zoomScale), zoom)
-			);
+			var a = new MapTileIndex(Mathf.FloorToInt(bounds.min.x * zoomScale), Mathf.FloorToInt(-bounds.max.y * zoomScale), zoom);
+			var b = new MapTileIndex(Mathf.CeilToInt(bounds.max.x * zoomScale), Mathf.CeilToInt(-bounds.min.y * zoomScale), zoom);
+			_tiles.MoveTo(a, b);
+			_tilesHillshade?.MoveTo(a, b);
 
 			if (m_layerElement != null) {
 				m_layerElement.Scale = h;

Assets/Cryville.EEW.Unity/Map/HillshadeMapTileCacheManager.cs

@@ -0,0 +1,15 @@
+using Cryville.EEW.Core.Map;
+using System.IO;
+using UnityEngine;
+
+namespace Cryville.EEW.Unity.Map {
+	sealed class HillshadeMapTileCacheManager : MapTileCacheManager {
+		protected override MapTileBitmapHolder CreateBitmapHolder(MapTileIndex index) => new(
+			index,
+			GameObject.Instantiate(PrefabBitmapHolder, Parent, false),
+			new($"https://services.arcgisonline.com/arcgis/rest/services/Elevation/World_Hillshade/MapServer/tile/{index.Z}/{index.NY}/{index.NX}.png")
+		);
+
+		protected override string GetCacheFilePath(MapTileIndex index) => Path.Combine(CacheDir, $"map_hillshade/{index.Z}/{index.NX}/{index.NY}");
+	}
+}

Assets/Cryville.EEW.Unity/Map/HillshadeMapTileCacheManager.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 9e8aa96a139a7414cb4d2031a22588db
+guid: d5fed9b884a4ff54f837aa0f2265ad36
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/Cryville.EEW.Unity/Map/MapElementManager.cs

@@ -2,12 +2,15 @@ using Cryville.EEW.BMKGOpenData.Map;
 using Cryville.EEW.Core;
 using Cryville.EEW.CWAOpenData.Map;
 using Cryville.EEW.EMSC.Map;
+using Cryville.EEW.FANStudio.Map;
+using Cryville.EEW.GeoNet.Map;
 using Cryville.EEW.GlobalQuake.Map;
 using Cryville.EEW.JMAAtom.Map;
 using Cryville.EEW.Map;
 using Cryville.EEW.NOAA.Map;
 using Cryville.EEW.QuakeML.Map;
 using Cryville.EEW.Report;
+using Cryville.EEW.USGS.Map;
 using Cryville.EEW.Wolfx.Map;
 using System.Collections.Generic;
 using System.Drawing;
@@ -128,19 +131,27 @@ namespace Cryville.EEW.Unity.Map {
 
 		readonly ContextedGeneratorManager<IMapGeneratorContext, MapElement> _gen = new(new IContextedGenerator<IMapGeneratorContext, MapElement>[] {
 			new BMKGEarthquakeMapGenerator(),
+			new CEAEEWMapGenerator(),
 			new CENCEarthquakeMapGenerator(),
 			new CENCEEWMapGenerator(),
 			new CWAEarthquakeMapGenerator(),
 			new CWAEEWMapGenerator(),
 			new CWATsunamiMapGenerator(),
 			new EMSCRealTimeEventMapGenerator(),
-			new FujianEEWMapGenerator(),
+			new FANStudio.Map.FujianEEWMapGenerator(),
+			new Wolfx.Map.FujianEEWMapGenerator(),
+			new GeoNetQuakeHistoryMapGenerator(),
+			new GeoNetQuakeMapGenerator(),
+			new GeoNetStrongMapGenerator(),
 			new GlobalQuakeMapViewGenerator(),
+			new ICLEEWMapGenerator(),
 			new JMAAtomMapGenerator(),
 			new JMAEEWMapGenerator(),
 			new NOAAMapGenerator(),
+			new FANStudio.Map.SichuanEEWMapGenerator(),
+			new Wolfx.Map.SichuanEEWMapGenerator(),
 			new QuakeMLEventMapGenerator(),
-			new SichuanEEWMapGenerator(),
+			new USGSContoursMapGenerator(),
 		});
 		public UnityMapElement Build(object e, out CultureInfo culture, out int order) {
 			culture = CultureInfo.InvariantCulture;

Assets/Cryville.EEW.Unity/Map/MapTile.cs

@@ -19,10 +19,12 @@ namespace Cryville.EEW.Unity.Map {
 			float z = 1 << index.Z;
 			transform.localPosition = new(index.X / z, -(index.Y + 1) / z, -index.Z / 100f);
 			transform.localScale = new Vector3(1 / z, 1 / z, 1);
-			_idView.gameObject.SetActive(true);
-			byte e = SharedSettings.Instance.IdBytes[((index.X << 2) + index.Y) & 0x1f];
-			int ex = e >> 4, ey = e & 0xf;
-			_idView.localPosition = new(ex / 16f, 1 - ey / 16f, -1 / 200f);
+			if (_idView) {
+				_idView.gameObject.SetActive(true);
+				byte e = SharedSettings.Instance.IdBytes[((index.X << 2) + index.Y) & 0x1f];
+				int ex = e >> 4, ey = e & 0xf;
+				_idView.localPosition = new(ex / 16f, 1 - ey / 16f, -1 / 200f);
+			}
 		}
 
 		public void Set(Sprite sprite) {
@@ -40,5 +42,9 @@ namespace Cryville.EEW.Unity.Map {
 				Destroy(gameObject);
 			}
 		}
+
+		public void SetVisible(bool v) {
+			_renderer.enabled = v;
+		}
 	}
 }

Assets/Cryville.EEW.Unity/Map/MapTileBitmapHolder.cs

@@ -12,6 +12,7 @@ namespace Cryville.EEW.Unity.Map {
 
 		public MapTileBitmapHolder(MapTileIndex index, GameObject gameObject, Uri uri) : base(index) {
 			_behaviour = gameObject.GetComponent<MapTileBitmapHolderBehaviour>();
+			_behaviour.Index = index;
 			_uri = uri;
 		}
 
@@ -32,5 +33,17 @@ namespace Cryville.EEW.Unity.Map {
 		public void Bind(MapTile tile) {
 			_behaviour.Bind(tile);
 		}
+
+		public void Unbind(MapTile tile) {
+			_behaviour.Unbind(tile);
+		}
+
+		public void AddChild(MapTileBitmapHolder bitmapHolder) {
+			_behaviour.AddChild(bitmapHolder._behaviour);
+		}
+
+		public void RemoveChild(MapTileBitmapHolder bitmapHolder) {
+			_behaviour.RemoveChild(bitmapHolder._behaviour);
+		}
 	}
 }

Assets/Cryville.EEW.Unity/Map/MapTileBitmapHolderBehaviour.cs

@@ -1,16 +1,39 @@
+using Cryville.EEW.Core.Map;
 using System;
+using System.Collections.Generic;
 using System.IO;
 using UnityEngine;
 using UnityEngine.Networking;
 
 namespace Cryville.EEW.Unity.Map {
 	sealed class MapTileBitmapHolderBehaviour : MonoBehaviour {
-		Action<Sprite> _callback;
+		public MapTileIndex Index { get; set; }
+
+		readonly List<MapTile> _tiles = new();
 		public void Bind(MapTile tile) {
-			if (_isDone)
+			_tiles.Add(tile);
+			if (_sprite) {
 				tile.Set(_sprite);
-			else
-				_callback += tile.Set;
+			}
+		}
+		public void Unbind(MapTile tile) {
+			_tiles.Remove(tile);
+		}
+
+		readonly List<MapTileBitmapHolderBehaviour> _children = new();
+		public void AddChild(MapTileBitmapHolderBehaviour behaviour) {
+			_children.Add(behaviour);
+			foreach (var tile in _tiles) {
+				tile.SetVisible(false);
+			}
+			SetChildSprite(behaviour);
+		}
+		public void RemoveChild(MapTileBitmapHolderBehaviour behaviour) {
+			_children.Remove(behaviour);
+			bool isActive = _children.Count == 0;
+			foreach (var tile in _tiles) {
+				tile.SetVisible(isActive);
+			}
 		}
 
 		UnityWebRequest _req;
@@ -20,7 +43,6 @@ namespace Cryville.EEW.Unity.Map {
 
 		FileInfo _localFile;
 		bool _isReady;
-		bool _isDone;
 		public void Load(FileInfo file) {
 			_localFile = file;
 			_isReady = true;
@@ -40,7 +62,7 @@ namespace Cryville.EEW.Unity.Map {
 					_req.SendWebRequest();
 				}
 				catch (Exception ex) {
-					Debug.LogException(ex);
+					App.MainLogger.Log(4, "Map", null, "An error occurred when loading map tile {0}: {1}", _localFile, ex);
 				}
 				_isReady = false;
 			}
@@ -48,19 +70,41 @@ namespace Cryville.EEW.Unity.Map {
 			if (_texHandler.isDone && _texHandler.texture != null) {
 				_tex = _texHandler.texture;
 				_tex.wrapMode = TextureWrapMode.Clamp;
-				_sprite = Sprite.Create(_tex, new Rect(0, 0, _tex.width, _tex.height), Vector2.zero, _tex.height, 0, SpriteMeshType.FullRect, Vector4.zero, false);
+				SetSprite(_tex, 0, 0, 0);
 			}
 			else {
-				Debug.LogError(_texHandler.error);
+				App.MainLogger.Log(4, "Map", null, "An error occurred when loading map tile {0}: {1}", _localFile, _texHandler.error);
 				_localFile.Delete();
 			}
 			_req.Dispose();
 			_texHandler.Dispose();
 			_req = null;
-			_callback?.Invoke(_sprite);
-			_isDone = true;
 		}
 
+		int _minDz = int.MaxValue;
+		int _x, _y;
+		void SetSprite(Texture2D tex, int dz, int x, int y) {
+			if (dz >= 8) return;
+			if (dz > _minDz) return;
+			_tex = tex;
+			_x = x; _y = y;
+			_minDz = dz;
+			if (_sprite) Destroy(_sprite);
+			int sx = x << (8 - dz), sy = 256 - ((y + 1) << (8 - dz));
+			_sprite = Sprite.Create(tex, new Rect(sx, sy, 1 << (8 - dz), 1 << (8 - dz)), Vector2.zero, 1 << (8 - dz), 0, SpriteMeshType.FullRect, Vector4.zero, false);
+			foreach (var tile in _tiles)
+				tile.Set(_sprite);
+			foreach (var child in _children) {
+				SetChildSprite(child);
+			}
+		}
+
+		void SetChildSprite(MapTileBitmapHolderBehaviour child) {
+			if (!_tex) return;
+			int cdz = child.Index.Z - Index.Z;
+			int cx = child.Index.X % (1 << cdz) | (_x << cdz), cy = child.Index.Y % (1 << cdz) | (_y << cdz);
+			child.SetSprite(_tex, cdz + _minDz, cx, cy);
+		}
 
 		bool _isDestroyed;
 		public void Destroy() {
@@ -69,11 +113,15 @@ namespace Cryville.EEW.Unity.Map {
 		void OnDestroy() {
 			if (_req != null) {
 				_req.Abort();
+				if (_texHandler != null) {
+					var tex = _texHandler.texture;
+					if (tex) Destroy(tex);
+					_texHandler.Dispose();
+				}
 				_req.Dispose();
-				_texHandler.Dispose();
 			}
 			if (_sprite) Destroy(_sprite);
-			if (_tex) Destroy(_tex);
+			if (_tex && _minDz == 0) Destroy(_tex);
 		}
 	}
 }

Assets/Cryville.EEW.Unity/Map/MapTileCacheManager.cs

@@ -1,4 +1,5 @@
 using Cryville.EEW.Core.Map;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using UnityEngine;
@@ -15,9 +16,9 @@ namespace Cryville.EEW.Unity.Map {
 		protected override MapTileBitmapHolder CreateBitmapHolder(MapTileIndex index) => new(
 			index,
 			GameObject.Instantiate(PrefabBitmapHolder, Parent, false),
-			new($"https://server.arcgisonline.com/ArcGIS/rest/services/Ocean/World_Ocean_Base/MapServer/tile/{index.Z}/{index.NY}/{index.NX}")
+			new($"https://services.arcgisonline.com/arcgis/rest/services/Ocean/World_Ocean_Base/MapServer/tile/{index.Z}/{index.NY}/{index.NX}")
 		);
-		
+
 		protected override string GetCacheFilePath(MapTileIndex index) => Path.Combine(CacheDir, $"map/{index.Z}/{index.NX}/{index.NY}");
 
 		readonly Dictionary<MapTile<MapTileBitmapHolder>, MapTile> _map = new();
@@ -26,16 +27,30 @@ namespace Cryville.EEW.Unity.Map {
 			var gameObject = GameObject.Instantiate(PrefabTile, Parent, false);
 			var uTile = gameObject.GetComponent<MapTile>();
 			_map.Add(tile, uTile);
-			uTile.Init(tile.Index);
-			tile.BitmapHolder.Bind(uTile);
+			var index = tile.Index;
+			uTile.Init(index);
+			var bitmapHolder = tile.BitmapHolder;
+			bitmapHolder.Bind(uTile);
+
+			if (index.Z <= 0) return;
+			var maybeTile = FindTile(index.ZoomToLevel(index.Z - 1, Math.Floor), false);
+			if (maybeTile is not MapTile<MapTileBitmapHolder> parentTile) return;
+			parentTile.BitmapHolder.AddChild(bitmapHolder);
 		}
 
 		protected override void OnTileDestroyed(MapTile<MapTileBitmapHolder> tile) {
 			base.OnTileDestroyed(tile);
+			var bitmapHolder = tile.BitmapHolder;
 			if (_map.TryGetValue(tile, out var uTile)) {
 				uTile.Destroy();
+				bitmapHolder.Unbind(uTile);
 				_map.Remove(tile);
 			}
+			var index = tile.Index;
+			if (index.Z <= 0) return;
+			var maybeTile = FindTile(index.ZoomToLevel(index.Z - 1, Math.Floor), false);
+			if (maybeTile is not MapTile<MapTileBitmapHolder> parentTile) return;
+			parentTile.BitmapHolder.RemoveChild(bitmapHolder);
 		}
 	}
 }

Assets/Cryville.EEW.Unity/SharedSettings.cs

@@ -26,6 +26,7 @@ namespace Cryville.EEW.Unity {
 		public IColorScheme ColorScheme { get; private set; } = new SeverityBasedColorScheme(DefaultSeverityScheme.Instance, DefaultSeverityColorMapping.Instance);
 		public ISubColorScheme BorderColorScheme { get; private set; } = new WrappedColorScheme(new SeverityBasedColorScheme(DefaultSeverityScheme.Instance, DefaultSeverityColorMapping.SecondaryInstance));
 		public ISubColorScheme TextColorScheme { get; private set; } = new DefaultTextColorScheme(Color.White, Color.Black);
+		public float HillshadeLayerOpacity { get; private set; } = 1;
 		public TimeSpan NowcastWarningDelayTolerance { get; private set; } = TimeSpan.FromMinutes(60);
 
 		public CultureInfo RVMCulture { get; private set; } = SharedCultures.CurrentUICulture;
@@ -117,6 +118,7 @@ namespace Cryville.EEW.Unity {
 				"SREV" => new DefaultTextColorScheme(Color.White, Color.FromArgb(28, 28, 28), 0.555f),
 				_ => new DefaultTextColorScheme(Color.White, Color.Black),
 			};
+			HillshadeLayerOpacity = config.HillshadeLayerOpacity;
 			_locationNamer.Namer = config.LocationNamer switch {
 				"FERegionShort" => new FERegionShortNamer(),
 				_ => new FERegionLongNamer(),

Assets/Cryville.EEW.Unity/SoundPlayer.cs

@@ -13,6 +13,7 @@ namespace Cryville.EEW.Unity {
 		};
 
 		protected override Stream Open(string path) {
+			App.MainLogger.Log(0, "Audio", null, "Opening audio file {0}", path);
 			path = Path.Combine(Application.streamingAssetsPath, "Sounds", path + ".ogg");
 			if (!File.Exists(path)) return null;
 			return new FileStream(path, FileMode.Open, FileAccess.Read);

Assets/Cryville.EEW.Unity/TTSWorker.cs

@@ -9,6 +9,7 @@ namespace Cryville.EEW.Unity {
 		readonly ISpVoice _voice;
 
 		public TTSWorker() : base(CreateSoundPlayer()) {
+			App.MainLogger.Log(1, "Audio", null, "Initializing TTS worker");
 			try {
 				_voice = new SpVoiceClass();
 			}
@@ -16,10 +17,12 @@ namespace Cryville.EEW.Unity {
 		}
 
 		static SoundPlayer CreateSoundPlayer() {
+			App.MainLogger.Log(1, "Audio", null, "Creating sound player");
 			try {
 				return new SoundPlayer();
 			}
-			catch (InvalidOperationException) {
+			catch (InvalidOperationException ex) {
+				App.MainLogger.Log(3, "Audio", null, "An error occurred when creating sound player: {0}", ex);
 				return null;
 			}
 		}
@@ -37,11 +40,13 @@ namespace Cryville.EEW.Unity {
 				(uint)(SpeechVoiceSpeakFlags.SVSFlagsAsync | SpeechVoiceSpeakFlags.SVSFPurgeBeforeSpeak),
 				out _
 			);
+			App.MainLogger.Log(0, "Audio", null, "TTS ({0}): {1}", culture, content);
 			return Task.CompletedTask;
 		}
 
 		protected override void StopCurrent() {
 			if (_voice == null) return;
+			App.MainLogger.Log(0, "Audio", null, "TTS stopping current");
 			_voice.Skip("SENTENCE", int.MaxValue, out _);
 		}
 	}

Assets/Cryville.EEW.Unity/UI/Dialog.cs

@@ -0,0 +1,37 @@
+using Cryville.Common.Unity;
+using Cryville.Common.Unity.UI;
+using System.Globalization;
+using UnityEngine;
+
+namespace Cryville.EEW.Unity.UI {
+	public class Dialog : MonoBehaviour {
+		public static Dialog Instance { get; private set; }
+
+		[SerializeField] CanvasGroup m_mask;
+		PropertyTweener<float> _groupAlphaTweener;
+
+		[SerializeField] TMPLocalizedText m_title;
+		[SerializeField] TMPLocalizedText m_message;
+
+		void Awake() {
+			Instance = this;
+
+			m_mask.gameObject.SetActive(false);
+			_groupAlphaTweener = new(() => m_mask.alpha, v => m_mask.alpha = v, Tweeners.Single);
+		}
+
+		public void Show(string title, string message) {
+			Show(SharedCultures.CurrentUICulture, title, message);
+		}
+		public void Show(CultureInfo culture, string title, string message) {
+			m_title.SetText(title, culture);
+			m_message.SetText(message, culture);
+			m_mask.gameObject.SetActive(true);
+			_groupAlphaTweener.Start(1, 0.2f);
+		}
+
+		void Update() {
+			_groupAlphaTweener.Advance(Time.deltaTime);
+		}
+	}
+}

Assets/Cryville.EEW.Unity/UI/Dialog.cs.meta

@@ -1,10 +1,10 @@
 fileFormatVersion: 2
-guid: 4f85302336d038c4da80ea264d185657
+guid: f1b4f209f34bc6e4c8e13aeb4dd5789d
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
   defaultReferences: []
-  executionOrder: 0
+  executionOrder: -5
   icon: {instanceID: 0}
   userData: 
   assetBundleName: 

Assets/Cryville.EEW.Unity/Worker.cs

@@ -5,6 +5,10 @@ using Cryville.EEW.CWAOpenData;
 using Cryville.EEW.CWAOpenData.Model;
 using Cryville.EEW.CWAOpenData.TTS;
 using Cryville.EEW.EMSC;
+using Cryville.EEW.FANStudio;
+using Cryville.EEW.FANStudio.TTS;
+using Cryville.EEW.GeoNet;
+using Cryville.EEW.GeoNet.TTS;
 using Cryville.EEW.GlobalQuake;
 using Cryville.EEW.JMAAtom;
 using Cryville.EEW.JMAAtom.TTS;
@@ -17,7 +21,6 @@ using Cryville.EEW.Unity.UI;
 using Cryville.EEW.UpdateChecker;
 using Cryville.EEW.USGS;
 using Cryville.EEW.Wolfx;
-using Cryville.EEW.Wolfx.Model;
 using Cryville.EEW.Wolfx.TTS;
 using System;
 using System.Collections.Concurrent;
@@ -50,38 +53,52 @@ namespace Cryville.EEW.Unity {
 			}
 			Instance = this;
 
-			App.Init();
+			try {
+				App.Init();
 
-			_worker = new(new TTSWorker());
-			_grouper = new ReportGrouper();
-			_cancellationTokenSource = new();
+				_worker = new(new TTSWorker());
+				_grouper = new ReportGrouper();
+				_cancellationTokenSource = new();
+			}
+			catch (Exception ex) {
+				Dialog.Instance.Show("FATAL ERROR", ex.ToString());
+				throw;
+			}
 		}
 
 		void Start() {
-			LocalizedResources.Init(new LocalizedResourcesManager());
-			RegisterViewModelGenerators(_worker);
-			RegisterTTSMessageGenerators(_worker);
-			BuildWorkers();
-			_worker.RVMGeneratorContext = SharedSettings.Instance;
-			_worker.TTSMessageGeneratorContext = SharedSettings.Instance;
-			_worker.RVMCulture = SharedSettings.Instance.RVMCulture;
-			_worker.SetTTSCultures(SharedSettings.Instance.TTSCultures ?? new TTSCultureConfig[0]);
-			_worker.IgnoreLanguageVariant = SharedSettings.Instance.DoIgnoreLanguageVariant;
-			_ongoingReportManager.Changed += OnOngoingReported;
-			_worker.Reported += OnReported;
-			_grouper.GroupUpdated += OnGroupUpdated;
-			_grouper.GroupRemoved += OnGroupRemoved;
-			Task.Run(() => GatewayVerify(_cancellationTokenSource.Token)).ContinueWith(task => {
-				if (task.IsFaulted) {
-					OnReported(this, new() { Title = task.Exception.Message });
-					return;
-				}
-				_verified = true;
-				_uiActionQueue.Enqueue(() => m_connectingHint.SetActive(false));
-				Task.Run(() => ScheduledGatewayVerify(_cancellationTokenSource, _cancellationTokenSource.Token));
-				Task.Run(() => _worker.RunAsync(_cancellationTokenSource.Token));
-				Task.Run(() => _ongoingReportManager.RunAsync(_cancellationTokenSource.Token));
-			}, TaskScheduler.Current);
+			try {
+				App.MainLogger.Log(1, "App", null, "Initializing localized resources manager");
+				LocalizedResources.Init(new LocalizedResourcesManager());
+				RegisterViewModelGenerators(_worker);
+				RegisterTTSMessageGenerators(_worker);
+				BuildWorkers();
+				_worker.RVMGeneratorContext = SharedSettings.Instance;
+				_worker.TTSMessageGeneratorContext = SharedSettings.Instance;
+				_worker.RVMCulture = SharedSettings.Instance.RVMCulture;
+				_worker.SetTTSCultures(SharedSettings.Instance.TTSCultures ?? new TTSCultureConfig[0]);
+				_worker.IgnoreLanguageVariant = SharedSettings.Instance.DoIgnoreLanguageVariant;
+				_ongoingReportManager.Changed += OnOngoingReported;
+				_worker.Reported += OnReported;
+				_grouper.GroupUpdated += OnGroupUpdated;
+				_grouper.GroupRemoved += OnGroupRemoved;
+				App.MainLogger.Log(1, "App", null, "Worker ready");
+				Task.Run(() => GatewayVerify(_cancellationTokenSource.Token)).ContinueWith(task => {
+					if (task.IsFaulted) {
+						OnReported(this, new() { Title = task.Exception.Message });
+						return;
+					}
+					_verified = true;
+					_uiActionQueue.Enqueue(() => m_connectingHint.SetActive(false));
+					Task.Run(() => ScheduledGatewayVerify(_cancellationTokenSource, _cancellationTokenSource.Token));
+					Task.Run(() => _worker.RunAsync(_cancellationTokenSource.Token));
+					Task.Run(() => _ongoingReportManager.RunAsync(_cancellationTokenSource.Token));
+				}, TaskScheduler.Current);
+			}
+			catch (Exception ex) {
+				Dialog.Instance.Show("FATAL ERROR", ex.ToString());
+				throw;
+			}
 		}
 
 		void OnDestroy() {
@@ -93,41 +110,60 @@ namespace Cryville.EEW.Unity {
 		CENCEarthquakeRVMGenerator _cencEarthquakeRVMGenerator;
 		void RegisterViewModelGenerators(CoreWorker worker) {
 			worker.RegisterViewModelGenerator(new BMKGEarthquakeRVMGenerator());
+			worker.RegisterViewModelGenerator(new CEAEEWRVMGenerator());
 			worker.RegisterViewModelGenerator(_cencEarthquakeRVMGenerator = new CENCEarthquakeRVMGenerator());
 			worker.RegisterViewModelGenerator(new CENCEEWRVMGenerator());
 			worker.RegisterViewModelGenerator(new CWAEarthquakeRVMGenerator());
 			worker.RegisterViewModelGenerator(new CWAEEWRVMGenerator());
 			worker.RegisterViewModelGenerator(new CWATsunamiRVMGenerator());
 			worker.RegisterViewModelGenerator(new EMSCRealTimeEventRVMGenerator());
-			worker.RegisterViewModelGenerator(new FujianEEWRVMGenerator());
+			worker.RegisterViewModelGenerator(new FANStudio.FujianEEWRVMGenerator());
+			worker.RegisterViewModelGenerator(new Wolfx.FujianEEWRVMGenerator());
+			worker.RegisterViewModelGenerator(new GeoNetQuakeHistoryRVMGenerator());
+			worker.RegisterViewModelGenerator(new GeoNetQuakeRVMGenerator());
+			worker.RegisterViewModelGenerator(new GeoNetStrongRVMGenerator());
 			worker.RegisterViewModelGenerator(new GlobalQuakeRVMGenerator());
+			worker.RegisterViewModelGenerator(new ICLEEWRVMGenerator());
 			worker.RegisterViewModelGenerator(new JMAAtomRVMGenerator());
 			worker.RegisterViewModelGenerator(new JMAEEWRVMGenerator());
 			worker.RegisterViewModelGenerator(new NOAAAtomRVMGenerator());
-			worker.RegisterViewModelGenerator(new QuakeMLEventRVMGenerator());
-			worker.RegisterViewModelGenerator(new SichuanEEWRVMGenerator());
+			var quakemlEventRVMGenerator = new QuakeMLEventRVMGenerator();
+			quakemlEventRVMGenerator.AddExtension(new USGSQuakeMLExtension());
+			worker.RegisterViewModelGenerator(quakemlEventRVMGenerator);
+			worker.RegisterViewModelGenerator(new FANStudio.SichuanEEWRVMGenerator());
+			worker.RegisterViewModelGenerator(new Wolfx.SichuanEEWRVMGenerator());
+			worker.RegisterViewModelGenerator(new USGSContoursRVMGenerator());
 			worker.RegisterViewModelGenerator(new VersionRVMGenerator());
 		}
 		CENCEarthquakeTTSMessageGenerator _cencEarthquakeTTSMessageGenerator;
 		void RegisterTTSMessageGenerators(CoreWorker worker) {
 			worker.RegisterTTSMessageGenerator(new BMKGEarthquakeTTSMessageGenerator());
+			worker.RegisterTTSMessageGenerator(new CEAEEWTTSMessageGenerator());
 			worker.RegisterTTSMessageGenerator(_cencEarthquakeTTSMessageGenerator = new CENCEarthquakeTTSMessageGenerator());
 			worker.RegisterTTSMessageGenerator(new CENCEEWTTSMessageGenerator());
 			worker.RegisterTTSMessageGenerator(new CWAEarthquakeTTSMessageGenerator());
 			worker.RegisterTTSMessageGenerator(new CWAEEWTTSMessageGenerator());
 			worker.RegisterTTSMessageGenerator(new CWATsunamiTTSMessageGenerator());
-			worker.RegisterTTSMessageGenerator(new FujianEEWTTSMessageGenerator());
+			worker.RegisterTTSMessageGenerator(new FANStudio.TTS.FujianEEWTTSMessageGenerator());
+			worker.RegisterTTSMessageGenerator(new Wolfx.TTS.FujianEEWTTSMessageGenerator());
+			worker.RegisterTTSMessageGenerator(new GeoNetQuakeHistoryTTSMessageGenerator());
+			worker.RegisterTTSMessageGenerator(new GeoNetQuakeTTSMessageGenerator());
+			worker.RegisterTTSMessageGenerator(new GeoNetStrongTTSMessageGenerator());
+			worker.RegisterTTSMessageGenerator(new ICLEEWTTSMessageGenerator());
 			worker.RegisterTTSMessageGenerator(new JMAAtomTTSMessageGenerator());
 			worker.RegisterTTSMessageGenerator(new JMAEEWTTSMessageGenerator());
 			worker.RegisterTTSMessageGenerator(new NOAATTSMessageGenerator());
-			worker.RegisterTTSMessageGenerator(new SichuanEEWTTSMessageGenerator());
+			worker.RegisterTTSMessageGenerator(new FANStudio.TTS.SichuanEEWTTSMessageGenerator());
+			worker.RegisterTTSMessageGenerator(new Wolfx.TTS.SichuanEEWTTSMessageGenerator());
 		}
 
 		bool _verified;
 		void BuildWorkers() {
-#if UNITY_EDITOR
+			App.MainLogger.Log(1, "App", null, "Building workers");
+#if false//UNITY_EDITOR
 			_worker.AddWorker(new WolfxWorker(new Uri("ws://localhost:9995/wolfx")));
 			_worker.AddWorker(new JMAAtomWorker(new Uri("http://localhost:9095/eqvol.xml")));
+			_worker.AddWorker(new FANStudioWorker<FANStudio.Model.CEAEEW>(new("ws://localhost:9995/fan/cea")));
 			_worker.AddWorker(new CWAReportWorker<Tsunami>(new Uri("http://localhost:9095/E-A0014-001.json"), "1"));
 			_worker.AddWorker(new CWAReportWorker<Earthquake>(new Uri("http://localhost:9095/E-A0015-001.json"), "1"));
 			_worker.AddWorker(new CWAReportWorker<Earthquake>(new Uri("http://localhost:9095/E-A0016-001.json"), "1"));
@@ -139,25 +175,35 @@ namespace Cryville.EEW.Unity {
 #else
 			foreach (var source in SharedSettings.Instance.EventSources) {
 				_worker.AddWorker(source switch {
-					BMKGOpenDataEventSourceConfig bmkgOpenData => BuildBMKGOpenDataWorkerUris(new BMKGOpenDataWorker(new("https://data.bmkg.go.id/DataMKG/TEWS/autogempa.json")), bmkgOpenData),
+					BMKGOpenDataEventSourceConfig bmkgOpenData => BuildBMKGOpenDataWorkerUris(new(new("https://data.bmkg.go.id/DataMKG/TEWS/autogempa.json")), bmkgOpenData),
 					CWAOpenDataEventSourceConfig cwaOpenData => cwaOpenData.Subtype switch {
-						"E-A0014-001" => new CWAReportWorker<Tsunami>(new Uri("https://opendata.cwa.gov.tw/api/v1/rest/datastore/E-A0014-001"), cwaOpenData.Token, 1440, 17280),
-						"E-A0015-001" => new CWAReportWorker<Earthquake>(new Uri("https://opendata.cwa.gov.tw/api/v1/rest/datastore/E-A0015-001"), cwaOpenData.Token),
-						"E-A0016-001" => new CWAReportWorker<Earthquake>(new Uri("https://opendata.cwa.gov.tw/api/v1/rest/datastore/E-A0016-001"), cwaOpenData.Token),
+						"E-A0014-001" => new CWAReportWorker<Tsunami>(new("https://opendata.cwa.gov.tw/api/v1/rest/datastore/E-A0014-001"), cwaOpenData.Token, 1440, 17280),
+						"E-A0015-001" => new CWAReportWorker<Earthquake>(new("https://opendata.cwa.gov.tw/api/v1/rest/datastore/E-A0015-001"), cwaOpenData.Token),
+						"E-A0016-001" => new CWAReportWorker<Earthquake>(new("https://opendata.cwa.gov.tw/api/v1/rest/datastore/E-A0016-001"), cwaOpenData.Token),
 						_ => throw new InvalidOperationException("Unknown CWA open data sub-type."),
 					},
 					EMSCRealTimeEventSourceConfig => new EMSCRealTimeWorker(new("wss://www.seismicportal.eu/standing_order/websocket")),
+					FANStudioEventSourceConfig fanStudio => fanStudio.Subtype switch {
+						"cea" => new FANStudioWorker<FANStudio.Model.CEAEEW>(new("wss://websocket.fanstudio.hk/cea")),
+						"sichuan" => new FANStudioWorker<FANStudio.Model.SichuanEEW>(new("wss://websocket.fanstudio.hk/sichuan")),
+						"fujian" => new FANStudioWorker<FANStudio.Model.FujianEEW>(new("wss://websocket.fanstudio.hk/fujian")),
+						_ => throw new InvalidOperationException("Unknown FAN Studio sub-type."),
+					},
+					GeoNetEventSourceConfig geoNet => BuildGeoNetWorker(new(new("https://api.geonet.org.nz/quake"), new("https://api.geonet.org.nz/quake/history/index"), new("https://api.geonet.org.nz/intensity/strong/processed/index")), geoNet),
 					GlobalQuakeServer15EventSourceConfig gq => new GlobalQuakeWorker15(gq.Host, gq.Port),
 					GlobalQuakeServerEventSourceConfig gq => new GlobalQuakeWorker(gq.Host, gq.Port),
-					JMAAtomEventSourceConfig jmaAtom => BuildJMAAtomWorkerFilter(new JMAAtomWorker(new("https://www.data.jma.go.jp/developer/xml/feed/eqvol.xml")), jmaAtom),
+					JMAAtomEventSourceConfig jmaAtom => BuildJMAAtomWorkerFilter(new(new("https://www.data.jma.go.jp/developer/xml/feed/eqvol.xml")), jmaAtom),
 					NOAAEventSourceConfig noaaAtom => noaaAtom.Subtype switch {
 						"PAAQ" => new NOAAAtomWorker(new("https://www.tsunami.gov/events/xml/PAAQAtom.xml"), new("https://www.tsunami.gov/"), new("/php/esri.php?e=t", UriKind.Relative), "PAAQ"),
 						"PHEB" => new NOAAAtomWorker(new("https://www.tsunami.gov/events/xml/PHEBAtom.xml"), new("https://www.tsunami.gov/"), new("/php/esri.php?e=t", UriKind.Relative), "PHEB"),
 						_ => throw new InvalidOperationException("Unknown NOAA sub-type."),
 					},
 					UpdateCheckerEventSourceConfig => new UpdateCheckerWorker(typeof(Worker).Assembly.GetName().Version?.ToString(3) ?? "", "unity"),
-					USGSQuakeMLEventSourceConfig usgsQuakeML => BuildUSGSQuakeMLWorkerUri(new USGSQuakeMLWorker(new Uri("https://earthquake.usgs.gov/earthquakes/feed/v1.0/quakeml.php")), usgsQuakeML),
-					WolfxEventSourceConfig wolfx => BuildWolfxWorkerFilter(new WolfxWorker(new Uri("wss://ws-api.wolfx.jp/all_eew")), wolfx),
+					USGSEventSourceConfig usgs => BuildUSGSWorker(usgs.UseGeoJSONFeeds
+						? new USGSGeoJSONWorker(new Uri("https://earthquake.usgs.gov/earthquakes/feed/v1.0/geojson.php"))
+						: new USGSQuakeMLWorker(new Uri("https://earthquake.usgs.gov/earthquakes/feed/v1.0/quakeml.php"))
+					, usgs),
+					WolfxEventSourceConfig wolfx => BuildWolfxWorkerFilter(new WolfxWorker(new("wss://ws-api.wolfx.jp/all_eew")), wolfx),
 					_ => throw new InvalidOperationException("Unknown event source type."),
 				});
 			}
@@ -170,12 +216,12 @@ namespace Cryville.EEW.Unity {
 		}
 		WolfxWorker BuildWolfxWorkerFilter(WolfxWorker worker, WolfxEventSourceConfig config) {
 			if (config.Filter != null) worker.SetFilter(config.Filter.Select(i => i switch {
-				"cenc_eew" => typeof(CENCEEW),
-				"cenc_eqlist" => typeof(WolfxEarthquakeList<CENCEarthquake>),
-				"cwa_eew" => typeof(CWAEEW),
-				"fj_eew" => typeof(FujianEEW),
-				"jma_eew" => typeof(JMAEEW),
-				"sc_eew" => typeof(SichuanEEW),
+				"cenc_eew" => typeof(Wolfx.Model.CENCEEW),
+				"cenc_eqlist" => typeof(Wolfx.Model.WolfxEarthquakeList<Wolfx.Model.CENCEarthquake>),
+				"cwa_eew" => typeof(Wolfx.Model.CWAEEW),
+				"fj_eew" => typeof(Wolfx.Model.FujianEEW),
+				"jma_eew" => typeof(Wolfx.Model.JMAEEW),
+				"sc_eew" => typeof(Wolfx.Model.SichuanEEW),
 				_ => throw new InvalidOperationException("Unknown Wolfx event type."),
 			}));
 			worker.IsFilterWhitelist = config.IsFilterWhitelist;
@@ -190,8 +236,22 @@ namespace Cryville.EEW.Unity {
 			worker.SetDataUris(config.Subtypes.Select(i => new Uri(string.Format(CultureInfo.InvariantCulture, "https://data.bmkg.go.id/DataMKG/TEWS/{0}.json", i))));
 			return worker;
 		}
-		static USGSQuakeMLWorker BuildUSGSQuakeMLWorkerUri(USGSQuakeMLWorker worker, USGSQuakeMLEventSourceConfig config) {
-			worker.SetFeedRelativeUri(new(string.Format(CultureInfo.InvariantCulture, "/earthquakes/feed/v1.0/summary/{0}.quakeml", config.Subtype), UriKind.Relative));
+		static GeoNetWorker BuildGeoNetWorker(GeoNetWorker worker, GeoNetEventSourceConfig pref) {
+			worker.MinimumMMI = pref.MinimumMMI;
+			worker.DoGetFullHistory = pref.DoGetFullHistory;
+			worker.DoGetStrongMotionInfo = pref.DoGetStrongMotionInfo;
+			return worker;
+		}
+		static USGSWorker BuildUSGSWorker(USGSWorker worker, USGSEventSourceConfig config) {
+			worker.SetFeedRelativeUri(new(string.Format(CultureInfo.InvariantCulture, "/earthquakes/feed/v1.0/summary/{0}{1}", config.Subtype, config.UseGeoJSONFeeds ? ".geojson" : ".quakeml"), UriKind.Relative));
+			if (worker is USGSGeoJSONWorker geojsonWorker) {
+				geojsonWorker.SetFilter(
+					config.Products
+						.Select(i => i.Split('/', 2))
+						.GroupBy(i => i[0])
+						.ToDictionary(g => g.Key, g => g.Select(i => i[1]))
+				);
+			}
 			return worker;
 		}
 
@@ -200,7 +260,7 @@ namespace Cryville.EEW.Unity {
 		ReportViewModel _latestHistoryReport;
 		void OnReported(object sender, ReportViewModel e) {
 			if (e.Model is Exception && e.Model is not SourceWorkerNetworkException)
-				Debug.LogError(e);
+				App.MainLogger.Log(4, "App", null, "Received an error from {0}: {1}", sender.GetType(), e.Model);
 			_grouper.Report(e);
 			_ongoingReportManager.Report(e);
 			_uiActionQueue.Enqueue(() => {

Assets/Materials/Multiply.mat

@@ -0,0 +1,91 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Multiply
+  m_Shader: {fileID: 4800000, guid: 0637d3d4bac33b34ea1fb084d1aa83c5, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _AlphaTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - PixelSnap: 0
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _EnableExternalAlpha: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _Flip: {r: 1, g: 1, b: 1, a: 1}
+    - _RendererColor: {r: 1, g: 1, b: 1, a: 1}
+  m_BuildTextureStacks: []

Assets/Materials/Multiply.mat.meta

@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: 4972abff193472e4bbef2dd0ec07b55e
+guid: e2b4779e0934e3b45978a57b79d75597
 NativeFormatImporter:
   externalObjects: {}
-  mainObjectFileID: 0
+  mainObjectFileID: 2100000
   userData: 
   assetBundleName: 
   assetBundleVariant: 

Assets/Plugins/Cryville.Common.Logging.dll.meta

@@ -0,0 +1,33 @@
+fileFormatVersion: 2
+guid: 7aa0c56ccfdaf9443b58f26bf40eed01
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      Any: 
+    second:
+      enabled: 1
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
+  - first:
+      Windows Store Apps: WindowsStoreApps
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Plugins/Cryville.Common.Logging.xml

@@ -0,0 +1,185 @@
+<?xml version="1.0"?>
+<doc>
+    <assembly>
+        <name>Cryville.Common.Logging</name>
+    </assembly>
+    <members>
+        <member name="T:Cryville.Common.Logging.Logger">
+            <summary>
+            A logger.
+            </summary>
+        </member>
+        <member name="M:Cryville.Common.Logging.Logger.AddListener(Cryville.Common.Logging.LoggerListener)">
+            <summary>
+            Attaches a listener to the logger.
+            </summary>
+            <param name="listener">The logger listener.</param>
+        </member>
+        <member name="M:Cryville.Common.Logging.Logger.RemoveListener(Cryville.Common.Logging.LoggerListener)">
+            <summary>
+            Detaches a listener from the logger.
+            </summary>
+            <param name="listener">The logger listener.</param>
+        </member>
+        <member name="M:Cryville.Common.Logging.Logger.Log(System.Int32,System.String,System.String,System.Object[])">
+            <summary>
+            Logs to the logger.
+            </summary>
+            <param name="level">The severity level.</param>
+            <param name="category">The category.</param>
+            <param name="format">The format string.</param>
+            <param name="args">The arguments for formatting.</param>
+        </member>
+        <member name="M:Cryville.Common.Logging.Logger.Log(System.Int32,System.String,System.IFormatProvider,System.String,System.Object[])">
+            <summary>
+            Logs to the logger.
+            </summary>
+            <param name="level">The severity level.</param>
+            <param name="category">The category.</param>
+            <param name="provider">The format provider.</param>
+            <param name="format">The format string.</param>
+            <param name="args">The arguments for formatting.</param>
+        </member>
+        <member name="M:Cryville.Common.Logging.Logger.Log(System.Int32,System.String,System.String)">
+            <summary>
+            Logs to the logger.
+            </summary>
+            <param name="level">The severity level.</param>
+            <param name="category">The category.</param>
+            <param name="message">The message.</param>
+        </member>
+        <member name="M:Cryville.Common.Logging.Logger.Log(System.Int32,System.String,System.Char[])">
+            <summary>
+            Logs to the logger.
+            </summary>
+            <param name="level">The severity level.</param>
+            <param name="category">The category.</param>
+            <param name="message">An array of <see cref="T:System.Char" /> containing the message.</param>
+        </member>
+        <member name="M:Cryville.Common.Logging.Logger.Log(System.Int32,System.String,System.Char[],System.Int32,System.Int32)">
+            <summary>
+            Logs to the logger.
+            </summary>
+            <param name="level">The severity level.</param>
+            <param name="category">The category.</param>
+            <param name="message">An array of <see cref="T:System.Char" /> containing the message.</param>
+            <param name="index">A zero-based index of the first character of the message within <paramref name="message" />.</param>
+            <param name="length">The length of the message.</param>
+        </member>
+        <member name="M:Cryville.Common.Logging.Logger.Log(System.Int32,System.String,System.Char*,System.Int32)">
+            <summary>
+            Logs to the logger.
+            </summary>
+            <param name="level">The severity level.</param>
+            <param name="category">The category.</param>
+            <param name="message">A pointer to the first character of the message.</param>
+            <param name="length">The length of the message.</param>
+        </member>
+        <member name="T:Cryville.Common.Logging.LoggerListener">
+            <summary>
+            A logger listener.
+            </summary>
+        </member>
+        <member name="M:Cryville.Common.Logging.LoggerListener.Dispose(System.Boolean)">
+            <summary>
+            Closes the logger listener and cleans up all the resources.
+            </summary>
+            <param name="disposing">Whether to clean up managed resources.</param>
+        </member>
+        <member name="M:Cryville.Common.Logging.LoggerListener.Dispose">
+            <summary>
+            Closes the logger listener.
+            </summary>
+        </member>
+        <member name="M:Cryville.Common.Logging.LoggerListener.OnLog(System.Int32,System.String,System.String)">
+            <summary>
+            Handles an incoming log.
+            </summary>
+            <param name="level">The severity level.</param>
+            <param name="category">The category.</param>
+            <param name="message">The message.</param>
+        </member>
+        <member name="M:Cryville.Common.Logging.LoggerListener.OnLog(System.Int32,System.String,System.Char[],System.Int32,System.Int32)">
+            <summary>
+            Handles an incoming log.
+            </summary>
+            <param name="level">The severity level.</param>
+            <param name="category">The category.</param>
+            <param name="message">An array of <see cref="T:System.Char" /> containing the message.</param>
+            <param name="index">A zero-based index of the first character of the message within <paramref name="message" />.</param>
+            <param name="length">The length of the message.</param>
+        </member>
+        <member name="M:Cryville.Common.Logging.LoggerListener.OnLog(System.Int32,System.String,System.Char*,System.Int32)">
+            <summary>
+            Handles an incoming log.
+            </summary>
+            <param name="level">The severity level.</param>
+            <param name="category">The category.</param>
+            <param name="message">A pointer to the first character of the message.</param>
+            <param name="length">The length of the message.</param>
+        </member>
+        <member name="T:Cryville.Common.Logging.InstantLoggerListener">
+            <summary>
+            A <see cref="T:Cryville.Common.Logging.LoggerListener" /> that calls a callback function on log.
+            </summary>
+        </member>
+        <member name="E:Cryville.Common.Logging.InstantLoggerListener.Log">
+            <summary>
+            Occurs when a log is logged to the logger.
+            </summary>
+        </member>
+        <member name="M:Cryville.Common.Logging.InstantLoggerListener.OnLog(System.Int32,System.String,System.String)">
+            <inheritdoc />
+        </member>
+        <member name="T:Cryville.Common.Logging.BufferedLoggerListener">
+            <summary>
+            A <see cref="T:Cryville.Common.Logging.LoggerListener" /> that buffers the logs for enumeration.
+            </summary>
+        </member>
+        <member name="M:Cryville.Common.Logging.BufferedLoggerListener.OnLog(System.Int32,System.String,System.String)">
+            <inheritdoc />
+        </member>
+        <member name="M:Cryville.Common.Logging.BufferedLoggerListener.Enumerate(Cryville.Common.Logging.LogHandler)">
+            <summary>
+            Enumerates the buffered logs.
+            </summary>
+            <param name="callback">The callback function to receive the logs.</param>
+        </member>
+        <member name="T:Cryville.Common.Logging.StreamLoggerListener">
+            <summary>
+            A <see cref="T:Cryville.Common.Logging.LoggerListener" /> that writes logs into a stream.
+            </summary>
+            <param name="stream">The stream.</param>
+            <param name="encoding">The encoding.</param>
+        </member>
+        <member name="M:Cryville.Common.Logging.StreamLoggerListener.#ctor(System.IO.Stream,System.Text.Encoding)">
+            <summary>
+            A <see cref="T:Cryville.Common.Logging.LoggerListener" /> that writes logs into a stream.
+            </summary>
+            <param name="stream">The stream.</param>
+            <param name="encoding">The encoding.</param>
+        </member>
+        <member name="M:Cryville.Common.Logging.StreamLoggerListener.#ctor(System.IO.Stream)">
+            <summary>
+            Creates an instance of the <see cref="T:Cryville.Common.Logging.StreamLoggerListener" /> class.
+            </summary>
+            <param name="stream">The stream.</param>
+        </member>
+        <member name="P:Cryville.Common.Logging.StreamLoggerListener.AutoFlush">
+            <summary>
+            Whether to flush the stream every time a log is written.
+            </summary>
+        </member>
+        <member name="M:Cryville.Common.Logging.StreamLoggerListener.OnLog(System.Int32,System.String,System.String)">
+            <inheritdoc />
+        </member>
+        <member name="T:Cryville.Common.Logging.LogHandler">
+            <summary>
+            Represents the method that will handle a log.
+            </summary>
+            <param name="level">The severity level.</param>
+            <param name="category">The category.</param>
+            <param name="message">The message.</param>
+        </member>
+    </members>
+</doc>

Assets/Plugins/Cryville.Common.Logging.xml.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 2ade62400bece1a4f9093a91ca22b276
+guid: 72ded0675457e0348809193a9c1092b5
 TextScriptImporter:
   externalObjects: {}
   userData: 

Assets/Plugins/Cryville.EEW.FANStudio.Map.dll.meta

@@ -0,0 +1,33 @@
+fileFormatVersion: 2
+guid: decba95f87869fa4699fd22f50528285
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      Any: 
+    second:
+      enabled: 1
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
+  - first:
+      Windows Store Apps: WindowsStoreApps
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Plugins/Cryville.EEW.FANStudio.TTS.dll.meta

@@ -0,0 +1,33 @@
+fileFormatVersion: 2
+guid: 50ac3fa1c3c1c7244820383f3c6f2617
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      Any: 
+    second:
+      enabled: 1
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
+  - first:
+      Windows Store Apps: WindowsStoreApps
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Plugins/Cryville.EEW.FANStudio.dll.meta

@@ -0,0 +1,33 @@
+fileFormatVersion: 2
+guid: 2c4be81d04cc2a345933d001819f2d96
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      Any: 
+    second:
+      enabled: 1
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
+  - first:
+      Windows Store Apps: WindowsStoreApps
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Plugins/Cryville.EEW.GeoNet.Map.dll.meta

@@ -0,0 +1,33 @@
+fileFormatVersion: 2
+guid: 9add703a85e306e41a5f1f424b9e5980
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      Any: 
+    second:
+      enabled: 1
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
+  - first:
+      Windows Store Apps: WindowsStoreApps
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Plugins/Cryville.EEW.GeoNet.TTS.dll.meta

@@ -0,0 +1,33 @@
+fileFormatVersion: 2
+guid: 1fa7d6d104052f447b49fc53f65d55cd
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      Any: 
+    second:
+      enabled: 1
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
+  - first:
+      Windows Store Apps: WindowsStoreApps
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Plugins/Cryville.EEW.GeoNet.dll.meta

@@ -0,0 +1,33 @@
+fileFormatVersion: 2
+guid: 590f9955e3e1e36458e2f7b807a05188
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      Any: 
+    second:
+      enabled: 1
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
+  - first:
+      Windows Store Apps: WindowsStoreApps
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Plugins/Cryville.EEW.USGS.Map.dll.meta

@@ -0,0 +1,33 @@
+fileFormatVersion: 2
+guid: 123d46d01924a434fbe65219e8baba1e
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      Any: 
+    second:
+      enabled: 1
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
+  - first:
+      Windows Store Apps: WindowsStoreApps
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Plugins/Cryville.EEW.xml

@@ -76,6 +76,20 @@
             The shared instance of the <see cref="T:Cryville.EEW.Heartbeat" /> class.
             </summary>
         </member>
+        <member name="T:Cryville.EEW.HttpExtensions">
+            <summary>
+            Provides a set of <see langword="static" /> methods related to HTTP.
+            </summary>
+        </member>
+        <member name="M:Cryville.EEW.HttpExtensions.EnsureNonErrorStatusCode(System.Net.Http.HttpResponseMessage)">
+            <summary>
+            Throws an exception if the HTTP response has a client error status code (400~499) or a server error status code (500~599).
+            </summary>
+            <param name="response">The response message.</param>
+            <returns>The response message if there is no error.</returns>
+            <exception cref="T:System.InvalidOperationException">The response has a client error status code (400~499).</exception>
+            <exception cref="T:System.Net.Http.HttpRequestException">The response has a server error status code (500~599).</exception>
+        </member>
         <member name="T:Cryville.EEW.HttpPullWorker">
             <summary>
             A source worker that pulls events with HTTP GET requests.
@@ -117,6 +131,34 @@
             <returns>The task.</returns>
             <exception cref="T:System.InvalidOperationException">The server responses with an unhandled status code.</exception>
         </member>
+        <member name="M:Cryville.EEW.HttpPullWorker.HandleRawResponse(System.Net.Http.HttpResponseMessage,System.Threading.CancellationToken)">
+            <summary>
+            Handles a raw response message.
+            </summary>
+            <param name="response">The response message.</param>
+            <param name="cancellationToken">A cancellation token.</param>
+            <returns>A task.</returns>
+        </member>
+        <member name="M:Cryville.EEW.HttpPullWorker.TryGetAsync(System.Uri,System.Threading.CancellationToken,System.Boolean,System.Int32)">
+            <summary>
+            Try to send a GET request to the specified URI.
+            </summary>
+            <param name="uri">The URI.</param>
+            <param name="cancellationToken">The cancellation token.</param>
+            <param name="retryOnErrorStatusCode">Whether to retry if the server responses with an error status code.</param>
+            <param name="retries">Times to retry before the request fails.</param>
+            <returns>The response message, or <see langword="null" /> if the request fails.</returns>
+        </member>
+        <member name="M:Cryville.EEW.HttpPullWorker.TrySendAsync(System.Func{System.Net.Http.HttpRequestMessage},System.Threading.CancellationToken,System.Boolean,System.Int32)">
+            <summary>
+            Try to send a request to the specified URI.
+            </summary>
+            <param name="msgFactory">A function that creates the request message.</param>
+            <param name="cancellationToken">The cancellation token.</param>
+            <param name="retryOnErrorStatusCode">Whether to retry if the server responses with an error status code.</param>
+            <param name="retries">Times to retry before the request fails.</param>
+            <returns>The response message, or <see langword="null" /> if the request fails.</returns>
+        </member>
         <member name="M:Cryville.EEW.HttpPullWorker.GetUri">
             <summary>
             Gets the URI of the next request, usually based on <see cref="P:Cryville.EEW.HttpPullWorker.BaseUri" />.
@@ -128,7 +170,7 @@
         </member>
         <member name="M:Cryville.EEW.HttpPullWorker.AfterHandled(System.Threading.CancellationToken)">
             <summary>
-            Called when a response is handled successfully, or when the server reponses with No Content (204) or Not Modified (304).
+            Called when a response is handled successfully, or when the server responses with a non-error status code (100~399).
             </summary>
         </member>
         <member name="M:Cryville.EEW.HttpPullWorker.Handle(System.IO.Stream,System.Net.Http.Headers.HttpResponseHeaders,System.Threading.CancellationToken)">
@@ -151,6 +193,52 @@
             </summary>
             <param name="ex">The exception.</param>
         </member>
+        <member name="T:Cryville.EEW.IBuilder">
+            <summary>
+            Represents a builder that builds another object. May hold a set of properties used when constructing the target object.
+            </summary>
+        </member>
+        <member name="M:Cryville.EEW.IBuilder.GetName(System.Globalization.CultureInfo@)">
+            <summary>
+            Gets a human-readable name of the builder.
+            </summary>
+            <param name="culture">The preferred culture of the name. When the method returns, set to the actual culture of the name.</param>
+            <remarks>
+            It is recommended to get the name from a <see cref="T:Cryville.EEW.LocalizedResource" />.
+            </remarks>
+        </member>
+        <member name="M:Cryville.EEW.IBuilder.Build(System.Globalization.CultureInfo@)">
+            <summary>
+            Builds the object.
+            </summary>
+            <param name="culture">The preferred culture of the object. When the method returns, set to the actual culture of the object.</param>
+            <returns>The built object.</returns>
+        </member>
+        <member name="T:Cryville.EEW.IBuilder`1">
+            <summary>
+            Represents a builder that builds another object. May hold a set of properties used when constructing the target object.
+            </summary>
+            <typeparam name="T">The type of the target object.</typeparam>
+        </member>
+        <member name="M:Cryville.EEW.IBuilder`1.Build(System.Globalization.CultureInfo@)">
+            <summary>
+            Builds the object.
+            </summary>
+            <param name="culture">The preferred culture of the object. When the method returns, set to the actual culture of the object.</param>
+            <returns>The built object.</returns>
+        </member>
+        <member name="T:Cryville.EEW.SimpleBuilder`1">
+            <summary>
+            Represents a builder that builds another object with a parameterless constructor.
+            </summary>
+            <typeparam name="T">The type of the target object.</typeparam>
+        </member>
+        <member name="M:Cryville.EEW.SimpleBuilder`1.GetName(System.Globalization.CultureInfo@)">
+            <inheritdoc />
+        </member>
+        <member name="M:Cryville.EEW.SimpleBuilder`1.Build(System.Globalization.CultureInfo@)">
+            <inheritdoc />
+        </member>
         <member name="T:Cryville.EEW.IGenerator`1">
             <summary>
             Represents a generator that generates objects of a specific type from input objects.
@@ -228,6 +316,17 @@
             <param name="specificity">The preferred specificity of the name. When the method returns, set to the actual specificity of the name.</param>
             <returns>The name.</returns>
         </member>
+        <member name="T:Cryville.EEW.IPropertiesHolder">
+            <summary>
+            Represents an object that holds a set of properties.
+            </summary>
+        </member>
+        <member name="M:Cryville.EEW.IPropertiesHolder.GetProperties">
+            <summary>
+            Gets the properties of the object.
+            </summary>
+            <returns>The properties of the object.</returns>
+        </member>
         <member name="T:Cryville.EEW.ISourceWorker">
             <summary>
             Represents a worker that gets events from a source.
@@ -549,6 +648,61 @@
         <member name="P:Cryville.EEW.Models.GeoJSON.Feature.Properties">
             <summary>The properties of the feature.</summary>
         </member>
+        <member name="T:Cryville.EEW.Models.GeoJSON.Feature`1">
+            <summary>
+            Represents a spatially bounded thing.
+            </summary>
+            <typeparam name="T">The type of the properties.</typeparam>
+            <param name="Id">A JSON string or number representing the commonly used identifier of the feature.</param>
+            <param name="Geometry">The geometry of the feature.</param>
+            <param name="Properties">The properties of the feature.</param>
+            <param name="BoundingBox">The bounding box.</param>
+        </member>
+        <member name="M:Cryville.EEW.Models.GeoJSON.Feature`1.#ctor(System.Text.Json.JsonElement,Cryville.EEW.Models.GeoJSON.Geometry,`0,System.Double[])">
+            <summary>
+            Represents a spatially bounded thing.
+            </summary>
+            <typeparam name="T">The type of the properties.</typeparam>
+            <param name="Id">A JSON string or number representing the commonly used identifier of the feature.</param>
+            <param name="Geometry">The geometry of the feature.</param>
+            <param name="Properties">The properties of the feature.</param>
+            <param name="BoundingBox">The bounding box.</param>
+        </member>
+        <member name="P:Cryville.EEW.Models.GeoJSON.Feature`1.Id">
+            <summary>A JSON string or number representing the commonly used identifier of the feature.</summary>
+        </member>
+        <member name="P:Cryville.EEW.Models.GeoJSON.Feature`1.Geometry">
+            <summary>The geometry of the feature.</summary>
+        </member>
+        <member name="P:Cryville.EEW.Models.GeoJSON.Feature`1.Properties">
+            <summary>The properties of the feature.</summary>
+        </member>
+        <member name="T:Cryville.EEW.Models.GeoJSON.IFeature`1">
+            <summary>
+            Represents a spatially bounded thing.
+            </summary>
+            <typeparam name="T">The type of the properties.</typeparam>
+        </member>
+        <member name="P:Cryville.EEW.Models.GeoJSON.IFeature`1.Id">
+            <summary>
+            A JSON string or number representing the commonly used identifier of the feature.
+            </summary>
+        </member>
+        <member name="P:Cryville.EEW.Models.GeoJSON.IFeature`1.Geometry">
+            <summary>
+            The geometry of the feature.
+            </summary>
+        </member>
+        <member name="P:Cryville.EEW.Models.GeoJSON.IFeature`1.Properties">
+            <summary>
+            The properties of the feature.
+            </summary>
+        </member>
+        <member name="P:Cryville.EEW.Models.GeoJSON.IFeature`1.BoundingBox">
+            <summary>
+            The bounding box.
+            </summary>
+        </member>
         <member name="T:Cryville.EEW.Models.GeoJSON.FeatureCollection">
             <summary>
             Represents a feature collection.
@@ -566,6 +720,25 @@
         <member name="P:Cryville.EEW.Models.GeoJSON.FeatureCollection.Features">
             <summary>The features.</summary>
         </member>
+        <member name="T:Cryville.EEW.Models.GeoJSON.FeatureCollection`1">
+            <summary>
+            Represents a feature collection.
+            </summary>
+            <typeparam name="T">The type of the properties of the features.</typeparam>
+            <param name="Features">The features.</param>
+            <param name="BoundingBox">The bounding box.</param>
+        </member>
+        <member name="M:Cryville.EEW.Models.GeoJSON.FeatureCollection`1.#ctor(Cryville.EEW.Models.GeoJSON.Feature{`0}[],System.Double[])">
+            <summary>
+            Represents a feature collection.
+            </summary>
+            <typeparam name="T">The type of the properties of the features.</typeparam>
+            <param name="Features">The features.</param>
+            <param name="BoundingBox">The bounding box.</param>
+        </member>
+        <member name="P:Cryville.EEW.Models.GeoJSON.FeatureCollection`1.Features">
+            <summary>The features.</summary>
+        </member>
         <member name="T:Cryville.EEW.Models.GeoJSON.GeoJSONObject">
             <summary>
             A Geometry, Feature, or collection of Features.
@@ -983,6 +1156,37 @@
         <member name="M:Cryville.EEW.NonstandardDateTimeJsonConverter.Write(System.Text.Json.Utf8JsonWriter,System.DateTime,System.Text.Json.JsonSerializerOptions)">
             <inheritdoc />
         </member>
+        <member name="T:Cryville.EEW.ProgressiveDelay">
+            <summary>
+            A helper class that produces progressive delay.
+            </summary>
+        </member>
+        <member name="P:Cryville.EEW.ProgressiveDelay.CurrentDelay">
+            <summary>
+            The delay to next tick.
+            </summary>
+        </member>
+        <member name="M:Cryville.EEW.ProgressiveDelay.#ctor(System.Double,System.Double,System.Double)">
+            <summary>
+            Creates an instance of the <see cref="T:Cryville.EEW.ProgressiveDelay" /> class.
+            </summary>
+            <param name="baseDelay">The minimum delay.</param>
+            <param name="maxDelay">The maximum delay.</param>
+            <param name="delayMultiplier">The multiplier between adjacent delay values.</param>
+            <exception cref="T:System.ArgumentOutOfRangeException"><paramref name="baseDelay" /> is negative or zero. -or- <paramref name="maxDelay" /> is negative or zero. -or- <paramref name="delayMultiplier" /> is less than or equal to 1.</exception>
+        </member>
+        <member name="M:Cryville.EEW.ProgressiveDelay.Step(System.Double)">
+            <summary>
+            Decrements the current delay and ticks if the delay has run over.
+            </summary>
+            <param name="amount">The amount of delay to decrement.</param>
+            <returns>Whether to tick.</returns>
+        </member>
+        <member name="M:Cryville.EEW.ProgressiveDelay.Reset">
+            <summary>
+            Resets to the base delay.
+            </summary>
+        </member>
         <member name="T:Cryville.EEW.Report.EmptyRVMGeneratorContext">
             <summary>
             An empty <see cref="T:Cryville.EEW.Report.IRVMGeneratorContext" />.
@@ -1018,7 +1222,7 @@
             </summary>
             <param name="Latitude">The latitude of the hypocenter.</param>
             <param name="Longitude">The longitude of the hypocenter.</param>
-            <param name="DateTime">The origin date time.</param>
+            <param name="DateTime">The origin date time in UTC.</param>
             <param name="Magnitude">The magnitude.</param>
         </member>
         <member name="M:Cryville.EEW.Report.HypocenterGroupKey.#ctor(System.Double,System.Double,System.DateTime,System.Double)">
@@ -1027,7 +1231,7 @@
             </summary>
             <param name="Latitude">The latitude of the hypocenter.</param>
             <param name="Longitude">The longitude of the hypocenter.</param>
-            <param name="DateTime">The origin date time.</param>
+            <param name="DateTime">The origin date time in UTC.</param>
             <param name="Magnitude">The magnitude.</param>
         </member>
         <member name="P:Cryville.EEW.Report.HypocenterGroupKey.Latitude">
@@ -1037,7 +1241,7 @@
             <summary>The longitude of the hypocenter.</summary>
         </member>
         <member name="P:Cryville.EEW.Report.HypocenterGroupKey.DateTime">
-            <summary>The origin date time.</summary>
+            <summary>The origin date time in UTC.</summary>
         </member>
         <member name="P:Cryville.EEW.Report.HypocenterGroupKey.Magnitude">
             <summary>The magnitude.</summary>
@@ -1317,11 +1521,6 @@
             <see cref="P:Cryville.EEW.Report.ReportViewModel.InvalidatedTime" /> converted to UTC.
             </summary>
         </member>
-        <member name="P:Cryville.EEW.Report.ReportViewModel.IssueTime">
-            <summary>
-            The time when the report is issued, in the time zone indicated by <see cref="P:Cryville.EEW.Report.ReportViewModel.TimeZone" />.
-            </summary>
-        </member>
         <member name="P:Cryville.EEW.Report.ReportViewModel.UtcIssueTime">
             <summary>
             The time when the report is issued, in UTC.
@@ -1445,13 +1644,10 @@
             The parent type.
             </summary>
         </member>
-        <member name="M:Cryville.EEW.Report.ReportViewModelPropertyType.#ctor(System.String,Cryville.EEW.Report.ReportViewModelPropertyType)">
+        <member name="P:Cryville.EEW.Report.ReportViewModelPropertyType.Root">
             <summary>
-            Creates an instance of the <see cref="T:Cryville.EEW.Report.ReportViewModelPropertyType" /> class.
+            The root type.
             </summary>
-            <param name="name">The name of the type.</param>
-            <param name="parent">The parent type.</param>
-            <exception cref="T:System.ArgumentException"><paramref name="name" /> contains the sub-type delimiter <c>:</c>.</exception>
         </member>
         <member name="M:Cryville.EEW.Report.ReportViewModelPropertyType.OfSubtype(System.String)">
             <summary>
@@ -1463,6 +1659,14 @@
         <member name="M:Cryville.EEW.Report.ReportViewModelPropertyType.ToString">
             <inheritdoc/>
         </member>
+        <member name="M:Cryville.EEW.Report.ReportViewModelPropertyType.Of(System.String,Cryville.EEW.Report.ReportViewModelPropertyType)">
+            <summary>
+            Gets an instance of the <see cref="T:Cryville.EEW.Report.ReportViewModelPropertyType" /> class.
+            </summary>
+            <param name="name">The name of the type.</param>
+            <param name="parent">The parent type.</param>
+            <exception cref="T:System.ArgumentException"><paramref name="name" /> contains the sub-type delimiter <c>:</c>.</exception>
+        </member>
         <member name="M:Cryville.EEW.Report.ReportViewModelPropertyType.FromString(System.String)">
             <summary>
             Creates a report view model property type from a string.

Assets/Prefabs/MapElements/LabeledPoint.prefab

@@ -25,6 +25,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 314817003022633517}
+  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
@@ -32,7 +33,6 @@ Transform:
   m_Children:
   - {fileID: 5835740329156370247}
   m_Father: {fileID: 0}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!212 &3466321595658153065
 SpriteRenderer:
@@ -102,7 +102,7 @@ MonoBehaviour:
   m_material: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
   m_sprite: {fileID: 21300000, guid: 6fd7ea081adb0004a989c2e841e4cf34, type: 3}
   m_spriteArea: {fileID: 21300000, guid: ff05af16f0aa0464fb8ce6255a8bcbde, type: 3}
-  m_textMesh: {fileID: 8492560861778078080}
+  m_textMesh: {fileID: 2943969175049193218}
   m_text: 
   m_color: {r: 1, g: 1, b: 1, a: 1}
   m_textColor: {r: 0, g: 0, b: 0, a: 1}
@@ -116,7 +116,7 @@ GameObject:
   m_Component:
   - component: {fileID: 5835740329156370247}
   - component: {fileID: 7081374813375499800}
-  - component: {fileID: 8492560861778078080}
+  - component: {fileID: 2943969175049193218}
   m_Layer: 0
   m_Name: Text
   m_TagString: Untagged
@@ -137,7 +137,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 3836035813174775836}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -164,7 +163,7 @@ MeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+  - {fileID: 2032012751209664223, guid: 43806d535501e38458454007849d98a5, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -186,7 +185,7 @@ MeshRenderer:
   m_SortingLayer: 0
   m_SortingOrder: 0
   m_AdditionalVertexStreams: {fileID: 0}
---- !u!114 &8492560861778078080
+--- !u!114 &2943969175049193218
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -195,7 +194,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 3168339112987716420}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 35fd352f36a42a74e9f2d44b7fc67bdf, type: 3}
+  m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
@@ -208,8 +207,8 @@ MonoBehaviour:
       m_Calls: []
   m_text: 
   m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
-  m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: 43806d535501e38458454007849d98a5, type: 2}
+  m_sharedMaterial: {fileID: 2032012751209664223, guid: 43806d535501e38458454007849d98a5, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []
@@ -249,7 +248,7 @@ MonoBehaviour:
   m_lineSpacingMax: 0
   m_paragraphSpacing: 0
   m_charWidthMaxAdj: 0
-  m_TextWrappingMode: 1
+  m_enableWordWrapping: 1
   m_wordWrappingRatios: 0.4
   m_overflowMode: 0
   m_linkedTextComponent: {fileID: 0}

Assets/Prefabs/MapElements/Point.prefab

@@ -1,177 +1,5 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
---- !u!1 &184933130346846969
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 8761057050648440570}
-  - component: {fileID: 5417593746151227301}
-  - component: {fileID: 6679562870913980477}
-  m_Layer: 0
-  m_Name: Text
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &8761057050648440570
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 184933130346846969}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 2041650355143975329}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0.8, y: 0.6}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!23 &5417593746151227301
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 184933130346846969}
-  m_Enabled: 1
-  m_CastShadows: 0
-  m_ReceiveShadows: 0
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 2
-  m_RayTraceProcedural: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: -3021868053195457599, guid: 2b12354fb2d86744887c3e4bfee63986, type: 2}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  m_AdditionalVertexStreams: {fileID: 0}
---- !u!114 &6679562870913980477
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 184933130346846969}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 35fd352f36a42a74e9f2d44b7fc67bdf, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_text: 
-  m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 2b12354fb2d86744887c3e4bfee63986, type: 2}
-  m_sharedMaterial: {fileID: -3021868053195457599, guid: 2b12354fb2d86744887c3e4bfee63986, type: 2}
-  m_fontSharedMaterials: []
-  m_fontMaterial: {fileID: 0}
-  m_fontMaterials: []
-  m_fontColor32:
-    serializedVersion: 2
-    rgba: 4278190080
-  m_fontColor: {r: 0, g: 0, b: 0, a: 1}
-  m_enableVertexGradient: 0
-  m_colorMode: 3
-  m_fontColorGradient:
-    topLeft: {r: 1, g: 1, b: 1, a: 1}
-    topRight: {r: 1, g: 1, b: 1, a: 1}
-    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
-    bottomRight: {r: 1, g: 1, b: 1, a: 1}
-  m_fontColorGradientPreset: {fileID: 0}
-  m_spriteAsset: {fileID: 0}
-  m_tintAllSprites: 0
-  m_StyleSheet: {fileID: 0}
-  m_TextStyleHashCode: -1183493901
-  m_overrideHtmlColors: 0
-  m_faceColor:
-    serializedVersion: 2
-    rgba: 4294967295
-  m_fontSize: 6
-  m_fontSizeBase: 6
-  m_fontWeight: 400
-  m_enableAutoSizing: 0
-  m_fontSizeMin: 18
-  m_fontSizeMax: 72
-  m_fontStyle: 0
-  m_HorizontalAlignment: 2
-  m_VerticalAlignment: 512
-  m_textAlignment: 65535
-  m_characterSpacing: 0
-  m_wordSpacing: 0
-  m_lineSpacing: 0
-  m_lineSpacingMax: 0
-  m_paragraphSpacing: 0
-  m_charWidthMaxAdj: 0
-  m_TextWrappingMode: 1
-  m_wordWrappingRatios: 0.4
-  m_overflowMode: 0
-  m_linkedTextComponent: {fileID: 0}
-  parentLinkedComponent: {fileID: 0}
-  m_enableKerning: 1
-  m_enableExtraPadding: 0
-  checkPaddingRequired: 0
-  m_isRichText: 1
-  m_parseCtrlCharacters: 1
-  m_isOrthographic: 0
-  m_isCullingEnabled: 0
-  m_horizontalMapping: 0
-  m_verticalMapping: 0
-  m_uvLineOffset: 0
-  m_geometrySortingOrder: 0
-  m_IsTextObjectScaleStatic: 0
-  m_VertexBufferAutoSizeReduction: 0
-  m_useMaxVisibleDescender: 1
-  m_pageToDisplay: 1
-  m_margin: {x: 0, y: 0, z: 0, w: 0}
-  m_isUsingLegacyAnimationComponent: 0
-  m_isVolumetricText: 0
-  _SortingLayer: 0
-  _SortingLayerID: 0
-  _SortingOrder: 0
-  m_hasFontAssetChanged: 0
-  m_renderer: {fileID: 5417593746151227301}
-  m_maskType: 0
 --- !u!1 &3258148121682082704
 GameObject:
   m_ObjectHideFlags: 0
@@ -197,14 +25,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3258148121682082704}
+  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 8761057050648440570}
+  m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!212 &1834065869972807124
 SpriteRenderer:

Assets/Prefabs/TileMultiply.prefab

@@ -0,0 +1,100 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &7683017549812261837
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7683017549812261838}
+  - component: {fileID: 7683017549812261832}
+  - component: {fileID: 3920659423852445223}
+  m_Layer: 0
+  m_Name: TileMultiply
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &7683017549812261838
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7683017549812261837}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &7683017549812261832
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7683017549812261837}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 0
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: e2b4779e0934e3b45978a57b79d75597, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_Sprite: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 1.28, y: 1.28}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 0
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0
+--- !u!114 &3920659423852445223
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7683017549812261837}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 772f71bcdaaa2504d9e9a469c3100593, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _idView: {fileID: 0}

Assets/Prefabs/TileMultiply.prefab.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: 43c7445480589fb4a944cdc658afd52e
-AssemblyDefinitionImporter:
+guid: d112aa7211e072e489ec497e34c5b57b
+PrefabImporter:
   externalObjects: {}
   userData: 
   assetBundleName: 

Assets/Prefabs/UI/Event Group.prefab

@@ -31,7 +31,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 8912050087328653367}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -108,7 +107,6 @@ RectTransform:
   - {fileID: 5834406091014907362}
   - {fileID: 7644034394791790906}
   m_Father: {fileID: 5834406091484752082}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -146,7 +144,7 @@ GameObject:
   m_Component:
   - component: {fileID: 5834406091014907362}
   - component: {fileID: 5834406091014907360}
-  - component: {fileID: 5834406091014907361}
+  - component: {fileID: 8350542771391447870}
   - component: {fileID: 3377665050230390713}
   m_Layer: 5
   m_Name: Location
@@ -168,7 +166,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 219718066529163937}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -183,7 +180,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5834406091014907363}
   m_CullTransparentMesh: 1
---- !u!114 &5834406091014907361
+--- !u!114 &8350542771391447870
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -192,7 +189,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 5834406091014907363}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 83e7715acbfae1d4b84414c13d03ed3f, type: 3}
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
@@ -205,8 +202,8 @@ MonoBehaviour:
       m_Calls: []
   m_text: Location
   m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 2b12354fb2d86744887c3e4bfee63986, type: 2}
-  m_sharedMaterial: {fileID: -3021868053195457599, guid: 2b12354fb2d86744887c3e4bfee63986, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: 43806d535501e38458454007849d98a5, type: 2}
+  m_sharedMaterial: {fileID: 2032012751209664223, guid: 43806d535501e38458454007849d98a5, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []
@@ -246,7 +243,7 @@ MonoBehaviour:
   m_lineSpacingMax: 0
   m_paragraphSpacing: 0
   m_charWidthMaxAdj: 0
-  m_TextWrappingMode: 1
+  m_enableWordWrapping: 1
   m_wordWrappingRatios: 0.4
   m_overflowMode: 0
   m_linkedTextComponent: {fileID: 0}
@@ -316,7 +313,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 5834406091484752082}
-  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -392,7 +388,6 @@ RectTransform:
   - {fileID: 5834406092755917685}
   - {fileID: 5834406091484752082}
   m_Father: {fileID: 5834406091441962553}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -502,7 +497,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 5834406091855906047}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -582,7 +576,6 @@ RectTransform:
   m_Children:
   - {fileID: 5834406091256718655}
   m_Father: {fileID: 5834406092508179349}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -730,7 +723,6 @@ RectTransform:
   - {fileID: 5834406091943899974}
   - {fileID: 5834406091195202553}
   m_Father: {fileID: 5834406091256718655}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -833,7 +825,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 5834406091855906047}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -908,7 +899,7 @@ GameObject:
   m_Component:
   - component: {fileID: 5834406091655591273}
   - component: {fileID: 5834406091655591271}
-  - component: {fileID: 5834406091655591272}
+  - component: {fileID: 2013712272710719855}
   - component: {fileID: 2471572682003598253}
   m_Layer: 5
   m_Name: Title
@@ -930,7 +921,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 5834406092755917685}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -945,7 +935,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5834406091655591274}
   m_CullTransparentMesh: 1
---- !u!114 &5834406091655591272
+--- !u!114 &2013712272710719855
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -954,7 +944,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 5834406091655591274}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 83e7715acbfae1d4b84414c13d03ed3f, type: 3}
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
@@ -967,8 +957,8 @@ MonoBehaviour:
       m_Calls: []
   m_text: Key
   m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 2b12354fb2d86744887c3e4bfee63986, type: 2}
-  m_sharedMaterial: {fileID: -3021868053195457599, guid: 2b12354fb2d86744887c3e4bfee63986, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: 43806d535501e38458454007849d98a5, type: 2}
+  m_sharedMaterial: {fileID: 2032012751209664223, guid: 43806d535501e38458454007849d98a5, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []
@@ -1008,7 +998,7 @@ MonoBehaviour:
   m_lineSpacingMax: 0
   m_paragraphSpacing: 0
   m_charWidthMaxAdj: 0
-  m_TextWrappingMode: 1
+  m_enableWordWrapping: 1
   m_wordWrappingRatios: 0.4
   m_overflowMode: 0
   m_linkedTextComponent: {fileID: 0}
@@ -1079,7 +1069,6 @@ RectTransform:
   - {fileID: 5834406091519064139}
   - {fileID: 5834406091272192538}
   m_Father: {fileID: 5834406092508179349}
-  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -1122,7 +1111,7 @@ GameObject:
   m_Component:
   - component: {fileID: 5834406091943899974}
   - component: {fileID: 5834406091943899972}
-  - component: {fileID: 5834406091943899973}
+  - component: {fileID: 6124413518238812087}
   - component: {fileID: 4362377661074236031}
   m_Layer: 5
   m_Name: Time
@@ -1144,7 +1133,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 5834406091484752082}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -1159,7 +1147,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5834406091943899975}
   m_CullTransparentMesh: 1
---- !u!114 &5834406091943899973
+--- !u!114 &6124413518238812087
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1168,7 +1156,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 5834406091943899975}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 83e7715acbfae1d4b84414c13d03ed3f, type: 3}
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
@@ -1181,8 +1169,8 @@ MonoBehaviour:
       m_Calls: []
   m_text: 2000-01-01 00:00:00 (UTC+00:00)
   m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 2b12354fb2d86744887c3e4bfee63986, type: 2}
-  m_sharedMaterial: {fileID: -3021868053195457599, guid: 2b12354fb2d86744887c3e4bfee63986, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: 43806d535501e38458454007849d98a5, type: 2}
+  m_sharedMaterial: {fileID: 2032012751209664223, guid: 43806d535501e38458454007849d98a5, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []
@@ -1222,7 +1210,7 @@ MonoBehaviour:
   m_lineSpacingMax: 0
   m_paragraphSpacing: 0
   m_charWidthMaxAdj: 0
-  m_TextWrappingMode: 1
+  m_enableWordWrapping: 1
   m_wordWrappingRatios: 0.4
   m_overflowMode: 0
   m_linkedTextComponent: {fileID: 0}
@@ -1296,7 +1284,6 @@ RectTransform:
   - {fileID: 8912050087328653367}
   - {fileID: 5834406091855906047}
   m_Father: {fileID: 0}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -1382,7 +1369,7 @@ GameObject:
   m_Component:
   - component: {fileID: 5834406092510226393}
   - component: {fileID: 5834406092510226391}
-  - component: {fileID: 5834406092510226392}
+  - component: {fileID: 4612551469735255901}
   - component: {fileID: 3616977570084737508}
   m_Layer: 5
   m_Name: Value
@@ -1404,7 +1391,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 5834406092755917685}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -1419,7 +1405,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5834406092510226394}
   m_CullTransparentMesh: 1
---- !u!114 &5834406092510226392
+--- !u!114 &4612551469735255901
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1428,7 +1414,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 5834406092510226394}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 83e7715acbfae1d4b84414c13d03ed3f, type: 3}
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
@@ -1441,8 +1427,8 @@ MonoBehaviour:
       m_Calls: []
   m_text: 1.0
   m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 2b12354fb2d86744887c3e4bfee63986, type: 2}
-  m_sharedMaterial: {fileID: -3021868053195457599, guid: 2b12354fb2d86744887c3e4bfee63986, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: 43806d535501e38458454007849d98a5, type: 2}
+  m_sharedMaterial: {fileID: 2032012751209664223, guid: 43806d535501e38458454007849d98a5, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []
@@ -1482,7 +1468,7 @@ MonoBehaviour:
   m_lineSpacingMax: 0
   m_paragraphSpacing: 0
   m_charWidthMaxAdj: 0
-  m_TextWrappingMode: 1
+  m_enableWordWrapping: 1
   m_wordWrappingRatios: 0.4
   m_overflowMode: 0
   m_linkedTextComponent: {fileID: 0}
@@ -1556,7 +1542,6 @@ RectTransform:
   - {fileID: 5834406092510226393}
   - {fileID: 7570636788080655652}
   m_Father: {fileID: 5834406091256718655}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -1658,7 +1643,6 @@ RectTransform:
   m_Children:
   - {fileID: 8679172922107940774}
   m_Father: {fileID: 5834406092508179349}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -1699,7 +1683,7 @@ GameObject:
   m_Component:
   - component: {fileID: 7570636788080655652}
   - component: {fileID: 8357749348711467279}
-  - component: {fileID: 3510639864939328373}
+  - component: {fileID: 2241488890724639720}
   - component: {fileID: 9020149657235358073}
   m_Layer: 5
   m_Name: Condition
@@ -1721,7 +1705,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 5834406092755917685}
-  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -1736,7 +1719,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7715991554483343456}
   m_CullTransparentMesh: 1
---- !u!114 &3510639864939328373
+--- !u!114 &2241488890724639720
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1745,7 +1728,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 7715991554483343456}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 83e7715acbfae1d4b84414c13d03ed3f, type: 3}
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
@@ -1758,8 +1741,8 @@ MonoBehaviour:
       m_Calls: []
   m_text: Condition
   m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 2b12354fb2d86744887c3e4bfee63986, type: 2}
-  m_sharedMaterial: {fileID: -3021868053195457599, guid: 2b12354fb2d86744887c3e4bfee63986, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: 43806d535501e38458454007849d98a5, type: 2}
+  m_sharedMaterial: {fileID: 2032012751209664223, guid: 43806d535501e38458454007849d98a5, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []
@@ -1799,7 +1782,7 @@ MonoBehaviour:
   m_lineSpacingMax: 0
   m_paragraphSpacing: 0
   m_charWidthMaxAdj: 0
-  m_TextWrappingMode: 1
+  m_enableWordWrapping: 1
   m_wordWrappingRatios: 0.4
   m_overflowMode: 0
   m_linkedTextComponent: {fileID: 0}
@@ -1848,7 +1831,7 @@ GameObject:
   m_Component:
   - component: {fileID: 7644034394791790906}
   - component: {fileID: 2803690609595868592}
-  - component: {fileID: 9177950703787671617}
+  - component: {fileID: 1716669987999271027}
   - component: {fileID: 3056363139123556364}
   m_Layer: 5
   m_Name: Predicate
@@ -1870,7 +1853,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 219718066529163937}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -1885,7 +1867,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8846059653213718660}
   m_CullTransparentMesh: 1
---- !u!114 &9177950703787671617
+--- !u!114 &1716669987999271027
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1894,7 +1876,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 8846059653213718660}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 83e7715acbfae1d4b84414c13d03ed3f, type: 3}
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
@@ -1907,8 +1889,8 @@ MonoBehaviour:
       m_Calls: []
   m_text: Predicate
   m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 2b12354fb2d86744887c3e4bfee63986, type: 2}
-  m_sharedMaterial: {fileID: -3021868053195457599, guid: 2b12354fb2d86744887c3e4bfee63986, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: 43806d535501e38458454007849d98a5, type: 2}
+  m_sharedMaterial: {fileID: 2032012751209664223, guid: 43806d535501e38458454007849d98a5, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []
@@ -1948,7 +1930,7 @@ MonoBehaviour:
   m_lineSpacingMax: 0
   m_paragraphSpacing: 0
   m_charWidthMaxAdj: 0
-  m_TextWrappingMode: 1
+  m_enableWordWrapping: 1
   m_wordWrappingRatios: 0.4
   m_overflowMode: 0
   m_linkedTextComponent: {fileID: 0}

Assets/Prefabs/UI/Event Ongoing.prefab

@@ -29,7 +29,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7245722805295636248}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -71,7 +70,6 @@ RectTransform:
   m_Children:
   - {fileID: 7245722804793660640}
   m_Father: {fileID: 7245722805295636248}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -230,7 +228,6 @@ RectTransform:
   m_Children:
   - {fileID: 7245722803986725359}
   m_Father: {fileID: 7245722804793660640}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -352,7 +349,6 @@ RectTransform:
   m_Children:
   - {fileID: 7245722804771600193}
   m_Father: {fileID: 7245722803680943975}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -433,7 +429,7 @@ GameObject:
   m_Component:
   - component: {fileID: 7245722804771600193}
   - component: {fileID: 7245722804771600199}
-  - component: {fileID: 7245722804771600198}
+  - component: {fileID: 865413950520411596}
   - component: {fileID: 7245722804771600196}
   m_Layer: 5
   m_Name: Text
@@ -455,7 +451,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7245722803986725359}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -470,7 +465,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7245722804771600192}
   m_CullTransparentMesh: 1
---- !u!114 &7245722804771600198
+--- !u!114 &865413950520411596
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -479,7 +474,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 7245722804771600192}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 83e7715acbfae1d4b84414c13d03ed3f, type: 3}
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
@@ -492,8 +487,8 @@ MonoBehaviour:
       m_Calls: []
   m_text: Title  Location
   m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 2b12354fb2d86744887c3e4bfee63986, type: 2}
-  m_sharedMaterial: {fileID: -3021868053195457599, guid: 2b12354fb2d86744887c3e4bfee63986, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: 6368f7bc44d26f346a4682281270a0f0, type: 2}
+  m_sharedMaterial: {fileID: 9205331132965503640, guid: 6368f7bc44d26f346a4682281270a0f0, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []
@@ -521,8 +516,8 @@ MonoBehaviour:
   m_fontSizeBase: 14
   m_fontWeight: 400
   m_enableAutoSizing: 0
-  m_fontSizeMin: 0
-  m_fontSizeMax: 0
+  m_fontSizeMin: 18
+  m_fontSizeMax: 72
   m_fontStyle: 0
   m_HorizontalAlignment: 1
   m_VerticalAlignment: 512
@@ -533,7 +528,7 @@ MonoBehaviour:
   m_lineSpacingMax: 0
   m_paragraphSpacing: 0
   m_charWidthMaxAdj: 0
-  m_TextWrappingMode: 0
+  m_enableWordWrapping: 0
   m_wordWrappingRatios: 0.4
   m_overflowMode: 1
   m_linkedTextComponent: {fileID: 0}
@@ -607,7 +602,6 @@ RectTransform:
   m_Children:
   - {fileID: 7245722803680943975}
   m_Father: {fileID: 3660102970111463108}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -742,7 +736,6 @@ RectTransform:
   - {fileID: 3660102970111463108}
   - {fileID: 6698345396572408384}
   m_Father: {fileID: 0}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}

Assets/Prefabs/UI/Event Unit.prefab

@@ -31,7 +31,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 80450502294307239}
-  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -82,7 +81,7 @@ GameObject:
   m_Component:
   - component: {fileID: 80450501543897588}
   - component: {fileID: 80450501543897590}
-  - component: {fileID: 80450501543897591}
+  - component: {fileID: 4141494289979181466}
   - component: {fileID: 1932066282991597056}
   m_Layer: 5
   m_Name: Location
@@ -104,7 +103,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1276614981859334282}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -119,7 +117,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 80450501543897589}
   m_CullTransparentMesh: 1
---- !u!114 &80450501543897591
+--- !u!114 &4141494289979181466
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -128,7 +126,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 80450501543897589}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 83e7715acbfae1d4b84414c13d03ed3f, type: 3}
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
@@ -141,8 +139,8 @@ MonoBehaviour:
       m_Calls: []
   m_text: Location
   m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 2b12354fb2d86744887c3e4bfee63986, type: 2}
-  m_sharedMaterial: {fileID: -3021868053195457599, guid: 2b12354fb2d86744887c3e4bfee63986, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: 43806d535501e38458454007849d98a5, type: 2}
+  m_sharedMaterial: {fileID: 2032012751209664223, guid: 43806d535501e38458454007849d98a5, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []
@@ -182,7 +180,7 @@ MonoBehaviour:
   m_lineSpacingMax: 0
   m_paragraphSpacing: 0
   m_charWidthMaxAdj: 0
-  m_TextWrappingMode: 1
+  m_enableWordWrapping: 1
   m_wordWrappingRatios: 0.4
   m_overflowMode: 0
   m_linkedTextComponent: {fileID: 0}
@@ -255,7 +253,6 @@ RectTransform:
   - {fileID: 80450501902254568}
   - {fileID: 80450503375932420}
   m_Father: {fileID: 0}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -398,7 +395,6 @@ RectTransform:
   - {fileID: 80450502279952833}
   - {fileID: 80450503204041366}
   m_Father: {fileID: 80450501804675484}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -524,7 +520,6 @@ RectTransform:
   - {fileID: 80450501797848153}
   - {fileID: 80450502120133029}
   m_Father: {fileID: 80450501902254568}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -618,7 +613,7 @@ GameObject:
   m_Component:
   - component: {fileID: 80450501861713796}
   - component: {fileID: 80450501861713798}
-  - component: {fileID: 80450501861713799}
+  - component: {fileID: 1757885075173720550}
   - component: {fileID: 5465326677663977747}
   m_Layer: 5
   m_Name: Time
@@ -640,7 +635,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 80450502294307239}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -655,7 +649,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 80450501861713797}
   m_CullTransparentMesh: 1
---- !u!114 &80450501861713799
+--- !u!114 &1757885075173720550
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -664,7 +658,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 80450501861713797}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 83e7715acbfae1d4b84414c13d03ed3f, type: 3}
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
@@ -677,8 +671,8 @@ MonoBehaviour:
       m_Calls: []
   m_text: 2000-01-01 00:00:00 (UTC+00:00)
   m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 2b12354fb2d86744887c3e4bfee63986, type: 2}
-  m_sharedMaterial: {fileID: -3021868053195457599, guid: 2b12354fb2d86744887c3e4bfee63986, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: 43806d535501e38458454007849d98a5, type: 2}
+  m_sharedMaterial: {fileID: 2032012751209664223, guid: 43806d535501e38458454007849d98a5, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []
@@ -718,7 +712,7 @@ MonoBehaviour:
   m_lineSpacingMax: 0
   m_paragraphSpacing: 0
   m_charWidthMaxAdj: 0
-  m_TextWrappingMode: 1
+  m_enableWordWrapping: 1
   m_wordWrappingRatios: 0.4
   m_overflowMode: 0
   m_linkedTextComponent: {fileID: 0}
@@ -792,7 +786,6 @@ RectTransform:
   - {fileID: 80450503330427149}
   - {fileID: 7854064457888656693}
   m_Father: {fileID: 80450502120133029}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -896,7 +889,6 @@ RectTransform:
   m_Children:
   - {fileID: 80450501804675484}
   m_Father: {fileID: 80450501697287680}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -997,7 +989,6 @@ RectTransform:
   - {fileID: 80450501884541537}
   - {fileID: 80450502294307239}
   m_Father: {fileID: 80450501804675484}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -1035,8 +1026,8 @@ GameObject:
   m_Component:
   - component: {fileID: 80450502245152642}
   - component: {fileID: 80450502245152644}
-  - component: {fileID: 80450502245152645}
   - component: {fileID: 1443925177126299440}
+  - component: {fileID: 2777711089830034469}
   m_Layer: 5
   m_Name: Title
   m_TagString: Untagged
@@ -1057,7 +1048,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 80450501884541537}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -1072,7 +1062,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 80450502245152643}
   m_CullTransparentMesh: 1
---- !u!114 &80450502245152645
+--- !u!114 &1443925177126299440
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1081,7 +1071,20 @@ MonoBehaviour:
   m_GameObject: {fileID: 80450502245152643}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 83e7715acbfae1d4b84414c13d03ed3f, type: 3}
+  m_Script: {fileID: 11500000, guid: c03870a7d4386e846be005a0ac36e987, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_shader: {fileID: 0}
+--- !u!114 &2777711089830034469
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 80450502245152643}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
@@ -1094,8 +1097,8 @@ MonoBehaviour:
       m_Calls: []
   m_text: Key
   m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 2b12354fb2d86744887c3e4bfee63986, type: 2}
-  m_sharedMaterial: {fileID: -3021868053195457599, guid: 2b12354fb2d86744887c3e4bfee63986, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: 43806d535501e38458454007849d98a5, type: 2}
+  m_sharedMaterial: {fileID: 2032012751209664223, guid: 43806d535501e38458454007849d98a5, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []
@@ -1135,7 +1138,7 @@ MonoBehaviour:
   m_lineSpacingMax: 0
   m_paragraphSpacing: 0
   m_charWidthMaxAdj: 0
-  m_TextWrappingMode: 1
+  m_enableWordWrapping: 1
   m_wordWrappingRatios: 0.4
   m_overflowMode: 0
   m_linkedTextComponent: {fileID: 0}
@@ -1161,19 +1164,6 @@ MonoBehaviour:
   m_hasFontAssetChanged: 0
   m_baseMaterial: {fileID: 0}
   m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
---- !u!114 &1443925177126299440
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 80450502245152643}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: c03870a7d4386e846be005a0ac36e987, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_shader: {fileID: 0}
 --- !u!1 &80450502279952830
 GameObject:
   m_ObjectHideFlags: 0
@@ -1207,7 +1197,6 @@ RectTransform:
   m_Children:
   - {fileID: 80450502668165710}
   m_Father: {fileID: 80450501797848153}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -1311,7 +1300,6 @@ RectTransform:
   - {fileID: 80450501861713796}
   - {fileID: 80450501390156039}
   m_Father: {fileID: 80450502120133029}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -1392,8 +1380,8 @@ GameObject:
   m_Component:
   - component: {fileID: 80450502668165710}
   - component: {fileID: 80450502668165712}
-  - component: {fileID: 80450502668165713}
   - component: {fileID: 6435372855871633828}
+  - component: {fileID: 4621455595744417101}
   m_Layer: 5
   m_Name: _text
   m_TagString: Untagged
@@ -1414,7 +1402,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 80450502279952833}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -1429,7 +1416,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 80450502668165711}
   m_CullTransparentMesh: 1
---- !u!114 &80450502668165713
+--- !u!114 &6435372855871633828
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1438,7 +1425,20 @@ MonoBehaviour:
   m_GameObject: {fileID: 80450502668165711}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 83e7715acbfae1d4b84414c13d03ed3f, type: 3}
+  m_Script: {fileID: 11500000, guid: c03870a7d4386e846be005a0ac36e987, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_shader: {fileID: 0}
+--- !u!114 &4621455595744417101
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 80450502668165711}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
@@ -1451,8 +1451,8 @@ MonoBehaviour:
       m_Calls: []
   m_text: Title
   m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 2b12354fb2d86744887c3e4bfee63986, type: 2}
-  m_sharedMaterial: {fileID: -3021868053195457599, guid: 2b12354fb2d86744887c3e4bfee63986, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: 43806d535501e38458454007849d98a5, type: 2}
+  m_sharedMaterial: {fileID: 2032012751209664223, guid: 43806d535501e38458454007849d98a5, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []
@@ -1492,7 +1492,7 @@ MonoBehaviour:
   m_lineSpacingMax: 0
   m_paragraphSpacing: 0
   m_charWidthMaxAdj: 0
-  m_TextWrappingMode: 1
+  m_enableWordWrapping: 1
   m_wordWrappingRatios: 0.4
   m_overflowMode: 0
   m_linkedTextComponent: {fileID: 0}
@@ -1518,19 +1518,6 @@ MonoBehaviour:
   m_hasFontAssetChanged: 0
   m_baseMaterial: {fileID: 0}
   m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
---- !u!114 &6435372855871633828
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 80450502668165711}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: c03870a7d4386e846be005a0ac36e987, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_shader: {fileID: 0}
 --- !u!1 &80450503204041367
 GameObject:
   m_ObjectHideFlags: 0
@@ -1566,7 +1553,6 @@ RectTransform:
   m_Children:
   - {fileID: 80450503436090928}
   m_Father: {fileID: 80450501797848153}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -1709,7 +1695,7 @@ GameObject:
   m_Component:
   - component: {fileID: 80450503330427149}
   - component: {fileID: 80450503330427151}
-  - component: {fileID: 80450503330427148}
+  - component: {fileID: 776716046236088400}
   - component: {fileID: 4418729342044054100}
   m_Layer: 5
   m_Name: Value
@@ -1731,7 +1717,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 80450501884541537}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -1746,7 +1731,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 80450503330427146}
   m_CullTransparentMesh: 1
---- !u!114 &80450503330427148
+--- !u!114 &776716046236088400
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1755,7 +1740,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 80450503330427146}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 83e7715acbfae1d4b84414c13d03ed3f, type: 3}
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
@@ -1768,8 +1753,8 @@ MonoBehaviour:
       m_Calls: []
   m_text: 1.0
   m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 2b12354fb2d86744887c3e4bfee63986, type: 2}
-  m_sharedMaterial: {fileID: -3021868053195457599, guid: 2b12354fb2d86744887c3e4bfee63986, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: 43806d535501e38458454007849d98a5, type: 2}
+  m_sharedMaterial: {fileID: 2032012751209664223, guid: 43806d535501e38458454007849d98a5, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []
@@ -1809,7 +1794,7 @@ MonoBehaviour:
   m_lineSpacingMax: 0
   m_paragraphSpacing: 0
   m_charWidthMaxAdj: 0
-  m_TextWrappingMode: 1
+  m_enableWordWrapping: 1
   m_wordWrappingRatios: 0.4
   m_overflowMode: 0
   m_linkedTextComponent: {fileID: 0}
@@ -1879,7 +1864,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 80450501697287680}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -1935,7 +1919,7 @@ GameObject:
   m_Component:
   - component: {fileID: 80450503436090928}
   - component: {fileID: 80450503436090930}
-  - component: {fileID: 80450503436090931}
+  - component: {fileID: 7300424552273697579}
   - component: {fileID: 2989991316368909908}
   m_Layer: 5
   m_Name: _text
@@ -1957,7 +1941,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 80450503204041366}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -1972,7 +1955,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 80450503436090929}
   m_CullTransparentMesh: 1
---- !u!114 &80450503436090931
+--- !u!114 &7300424552273697579
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1981,7 +1964,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 80450503436090929}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 83e7715acbfae1d4b84414c13d03ed3f, type: 3}
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
@@ -1994,8 +1977,8 @@ MonoBehaviour:
       m_Calls: []
   m_text: '#100 (Fin.)'
   m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 2b12354fb2d86744887c3e4bfee63986, type: 2}
-  m_sharedMaterial: {fileID: -3021868053195457599, guid: 2b12354fb2d86744887c3e4bfee63986, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: 43806d535501e38458454007849d98a5, type: 2}
+  m_sharedMaterial: {fileID: 2032012751209664223, guid: 43806d535501e38458454007849d98a5, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []
@@ -2035,7 +2018,7 @@ MonoBehaviour:
   m_lineSpacingMax: 0
   m_paragraphSpacing: 0
   m_charWidthMaxAdj: 0
-  m_TextWrappingMode: 0
+  m_enableWordWrapping: 0
   m_wordWrappingRatios: 0.4
   m_overflowMode: 0
   m_linkedTextComponent: {fileID: 0}
@@ -2084,7 +2067,7 @@ GameObject:
   m_Component:
   - component: {fileID: 7854064457888656693}
   - component: {fileID: 8108920680829285094}
-  - component: {fileID: 7043582914778565776}
+  - component: {fileID: 4484159136645687116}
   - component: {fileID: 982023614326607205}
   m_Layer: 5
   m_Name: Condition
@@ -2106,7 +2089,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 80450501884541537}
-  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -2121,7 +2103,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4303620419042550251}
   m_CullTransparentMesh: 1
---- !u!114 &7043582914778565776
+--- !u!114 &4484159136645687116
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -2130,7 +2112,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 4303620419042550251}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 83e7715acbfae1d4b84414c13d03ed3f, type: 3}
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
@@ -2143,8 +2125,8 @@ MonoBehaviour:
       m_Calls: []
   m_text: Condition
   m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 2b12354fb2d86744887c3e4bfee63986, type: 2}
-  m_sharedMaterial: {fileID: -3021868053195457599, guid: 2b12354fb2d86744887c3e4bfee63986, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: 43806d535501e38458454007849d98a5, type: 2}
+  m_sharedMaterial: {fileID: 2032012751209664223, guid: 43806d535501e38458454007849d98a5, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []
@@ -2184,7 +2166,7 @@ MonoBehaviour:
   m_lineSpacingMax: 0
   m_paragraphSpacing: 0
   m_charWidthMaxAdj: 0
-  m_TextWrappingMode: 1
+  m_enableWordWrapping: 1
   m_wordWrappingRatios: 0.4
   m_overflowMode: 0
   m_linkedTextComponent: {fileID: 0}
@@ -2233,7 +2215,7 @@ GameObject:
   m_Component:
   - component: {fileID: 8545762996354293361}
   - component: {fileID: 6864217503214847098}
-  - component: {fileID: 5168326023663491122}
+  - component: {fileID: 5773893373017525473}
   - component: {fileID: 8654799436829298006}
   m_Layer: 5
   m_Name: Predicate
@@ -2255,7 +2237,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1276614981859334282}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -2270,7 +2251,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4939851336661202173}
   m_CullTransparentMesh: 1
---- !u!114 &5168326023663491122
+--- !u!114 &5773893373017525473
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -2279,7 +2260,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 4939851336661202173}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 83e7715acbfae1d4b84414c13d03ed3f, type: 3}
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
@@ -2292,8 +2273,8 @@ MonoBehaviour:
       m_Calls: []
   m_text: Predicate
   m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 2b12354fb2d86744887c3e4bfee63986, type: 2}
-  m_sharedMaterial: {fileID: -3021868053195457599, guid: 2b12354fb2d86744887c3e4bfee63986, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: 43806d535501e38458454007849d98a5, type: 2}
+  m_sharedMaterial: {fileID: 2032012751209664223, guid: 43806d535501e38458454007849d98a5, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []
@@ -2333,7 +2314,7 @@ MonoBehaviour:
   m_lineSpacingMax: 0
   m_paragraphSpacing: 0
   m_charWidthMaxAdj: 0
-  m_TextWrappingMode: 1
+  m_enableWordWrapping: 1
   m_wordWrappingRatios: 0.4
   m_overflowMode: 0
   m_linkedTextComponent: {fileID: 0}
@@ -2404,7 +2385,6 @@ RectTransform:
   - {fileID: 80450501543897588}
   - {fileID: 8545762996354293361}
   m_Father: {fileID: 80450502294307239}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}

Assets/Prefabs/UI/Event.prefab

@@ -32,7 +32,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 3913774529903216065}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -133,7 +132,6 @@ RectTransform:
   - {fileID: 3913774529601653667}
   - {fileID: 1555661482230922473}
   m_Father: {fileID: 3913774529903216065}
-  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -255,7 +253,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 3913774529902919372}
-  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -326,7 +323,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 3913774529903216065}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -363,7 +359,7 @@ GameObject:
   m_Component:
   - component: {fileID: 3913774529601653667}
   - component: {fileID: 3913774529601653665}
-  - component: {fileID: 3913774529601653664}
+  - component: {fileID: 5356915862313898911}
   - component: {fileID: 4241997480962929832}
   m_Layer: 5
   m_Name: Value
@@ -385,7 +381,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 3913774529213522512}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -400,7 +395,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3913774529601653666}
   m_CullTransparentMesh: 1
---- !u!114 &3913774529601653664
+--- !u!114 &5356915862313898911
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -409,7 +404,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 3913774529601653666}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 83e7715acbfae1d4b84414c13d03ed3f, type: 3}
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
@@ -422,8 +417,8 @@ MonoBehaviour:
       m_Calls: []
   m_text: 1.0
   m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 2b12354fb2d86744887c3e4bfee63986, type: 2}
-  m_sharedMaterial: {fileID: -3021868053195457599, guid: 2b12354fb2d86744887c3e4bfee63986, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: 43806d535501e38458454007849d98a5, type: 2}
+  m_sharedMaterial: {fileID: 2032012751209664223, guid: 43806d535501e38458454007849d98a5, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []
@@ -451,8 +446,8 @@ MonoBehaviour:
   m_fontSizeBase: 20
   m_fontWeight: 400
   m_enableAutoSizing: 0
-  m_fontSizeMin: 0
-  m_fontSizeMax: 0
+  m_fontSizeMin: 18
+  m_fontSizeMax: 72
   m_fontStyle: 0
   m_HorizontalAlignment: 2
   m_VerticalAlignment: 256
@@ -463,7 +458,7 @@ MonoBehaviour:
   m_lineSpacingMax: 0
   m_paragraphSpacing: 0
   m_charWidthMaxAdj: 0
-  m_TextWrappingMode: 1
+  m_enableWordWrapping: 1
   m_wordWrappingRatios: 0.4
   m_overflowMode: 0
   m_linkedTextComponent: {fileID: 0}
@@ -511,8 +506,8 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 3913774529607049028}
-  - component: {fileID: 3913774529607049034}
-  - component: {fileID: 3913774529607049029}
+  - component: {fileID: 8556862481849683131}
+  - component: {fileID: 1212719740450675548}
   - component: {fileID: 7396477248684304470}
   m_Layer: 5
   m_Name: Location
@@ -534,14 +529,13 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7838244607878739931}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &3913774529607049034
+--- !u!222 &8556862481849683131
 CanvasRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -549,7 +543,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3913774529607049031}
   m_CullTransparentMesh: 1
---- !u!114 &3913774529607049029
+--- !u!114 &1212719740450675548
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -558,7 +552,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 3913774529607049031}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 83e7715acbfae1d4b84414c13d03ed3f, type: 3}
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
@@ -571,8 +565,8 @@ MonoBehaviour:
       m_Calls: []
   m_text: Location
   m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 2b12354fb2d86744887c3e4bfee63986, type: 2}
-  m_sharedMaterial: {fileID: -3021868053195457599, guid: 2b12354fb2d86744887c3e4bfee63986, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: 43806d535501e38458454007849d98a5, type: 2}
+  m_sharedMaterial: {fileID: 2032012751209664223, guid: 43806d535501e38458454007849d98a5, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []
@@ -600,8 +594,8 @@ MonoBehaviour:
   m_fontSizeBase: 22
   m_fontWeight: 400
   m_enableAutoSizing: 0
-  m_fontSizeMin: 0
-  m_fontSizeMax: 0
+  m_fontSizeMin: 18
+  m_fontSizeMax: 72
   m_fontStyle: 0
   m_HorizontalAlignment: 1
   m_VerticalAlignment: 256
@@ -612,7 +606,7 @@ MonoBehaviour:
   m_lineSpacingMax: 0
   m_paragraphSpacing: 0
   m_charWidthMaxAdj: 0
-  m_TextWrappingMode: 1
+  m_enableWordWrapping: 1
   m_wordWrappingRatios: 0.4
   m_overflowMode: 0
   m_linkedTextComponent: {fileID: 0}
@@ -661,7 +655,7 @@ GameObject:
   m_Component:
   - component: {fileID: 3913774529609655469}
   - component: {fileID: 3913774529609655475}
-  - component: {fileID: 3913774529609655474}
+  - component: {fileID: 1655504509664597425}
   - component: {fileID: 8983747288499142204}
   m_Layer: 5
   m_Name: Title
@@ -683,7 +677,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 3913774529213522512}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -698,7 +691,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3913774529609655468}
   m_CullTransparentMesh: 1
---- !u!114 &3913774529609655474
+--- !u!114 &1655504509664597425
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -707,7 +700,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 3913774529609655468}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 83e7715acbfae1d4b84414c13d03ed3f, type: 3}
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
@@ -720,8 +713,8 @@ MonoBehaviour:
       m_Calls: []
   m_text: Key
   m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 2b12354fb2d86744887c3e4bfee63986, type: 2}
-  m_sharedMaterial: {fileID: -3021868053195457599, guid: 2b12354fb2d86744887c3e4bfee63986, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: 43806d535501e38458454007849d98a5, type: 2}
+  m_sharedMaterial: {fileID: 2032012751209664223, guid: 43806d535501e38458454007849d98a5, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []
@@ -749,8 +742,8 @@ MonoBehaviour:
   m_fontSizeBase: 12
   m_fontWeight: 400
   m_enableAutoSizing: 0
-  m_fontSizeMin: 0
-  m_fontSizeMax: 0
+  m_fontSizeMin: 18
+  m_fontSizeMax: 72
   m_fontStyle: 0
   m_HorizontalAlignment: 2
   m_VerticalAlignment: 256
@@ -761,7 +754,7 @@ MonoBehaviour:
   m_lineSpacingMax: 0
   m_paragraphSpacing: 0
   m_charWidthMaxAdj: 0
-  m_TextWrappingMode: 1
+  m_enableWordWrapping: 1
   m_wordWrappingRatios: 0.4
   m_overflowMode: 0
   m_linkedTextComponent: {fileID: 0}
@@ -810,7 +803,7 @@ GameObject:
   m_Component:
   - component: {fileID: 3913774529632130609}
   - component: {fileID: 3913774529632130615}
-  - component: {fileID: 3913774529632130614}
+  - component: {fileID: 1317776619385960372}
   - component: {fileID: 8636177924945764816}
   m_Layer: 5
   m_Name: Time
@@ -832,7 +825,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 3913774529902919372}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -847,7 +839,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3913774529632130608}
   m_CullTransparentMesh: 1
---- !u!114 &3913774529632130614
+--- !u!114 &1317776619385960372
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -856,7 +848,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 3913774529632130608}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 83e7715acbfae1d4b84414c13d03ed3f, type: 3}
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
@@ -869,8 +861,8 @@ MonoBehaviour:
       m_Calls: []
   m_text: 2000-01-01 00:00:00
   m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 2b12354fb2d86744887c3e4bfee63986, type: 2}
-  m_sharedMaterial: {fileID: -3021868053195457599, guid: 2b12354fb2d86744887c3e4bfee63986, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: 43806d535501e38458454007849d98a5, type: 2}
+  m_sharedMaterial: {fileID: 2032012751209664223, guid: 43806d535501e38458454007849d98a5, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []
@@ -898,8 +890,8 @@ MonoBehaviour:
   m_fontSizeBase: 12
   m_fontWeight: 400
   m_enableAutoSizing: 0
-  m_fontSizeMin: 0
-  m_fontSizeMax: 0
+  m_fontSizeMin: 18
+  m_fontSizeMax: 72
   m_fontStyle: 0
   m_HorizontalAlignment: 1
   m_VerticalAlignment: 256
@@ -910,7 +902,7 @@ MonoBehaviour:
   m_lineSpacingMax: 0
   m_paragraphSpacing: 0
   m_charWidthMaxAdj: 0
-  m_TextWrappingMode: 1
+  m_enableWordWrapping: 1
   m_wordWrappingRatios: 0.4
   m_overflowMode: 0
   m_linkedTextComponent: {fileID: 0}
@@ -959,7 +951,7 @@ GameObject:
   m_Component:
   - component: {fileID: 3913774529674276062}
   - component: {fileID: 3913774529674276061}
-  - component: {fileID: 3913774529674276060}
+  - component: {fileID: 966352961830480132}
   - component: {fileID: 3913774529674276063}
   - component: {fileID: 6259669005375505982}
   m_Layer: 5
@@ -982,7 +974,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 3913774529903216065}
-  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -997,7 +988,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3913774529674276057}
   m_CullTransparentMesh: 1
---- !u!114 &3913774529674276060
+--- !u!114 &966352961830480132
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1006,7 +997,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 3913774529674276057}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 83e7715acbfae1d4b84414c13d03ed3f, type: 3}
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
@@ -1019,8 +1010,8 @@ MonoBehaviour:
       m_Calls: []
   m_text: '#1'
   m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 2b12354fb2d86744887c3e4bfee63986, type: 2}
-  m_sharedMaterial: {fileID: -3021868053195457599, guid: 2b12354fb2d86744887c3e4bfee63986, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: 43806d535501e38458454007849d98a5, type: 2}
+  m_sharedMaterial: {fileID: 2032012751209664223, guid: 43806d535501e38458454007849d98a5, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []
@@ -1048,8 +1039,8 @@ MonoBehaviour:
   m_fontSizeBase: 18
   m_fontWeight: 400
   m_enableAutoSizing: 0
-  m_fontSizeMin: 0
-  m_fontSizeMax: 0
+  m_fontSizeMin: 18
+  m_fontSizeMax: 72
   m_fontStyle: 0
   m_HorizontalAlignment: 1
   m_VerticalAlignment: 512
@@ -1060,7 +1051,7 @@ MonoBehaviour:
   m_lineSpacingMax: 0
   m_paragraphSpacing: 0
   m_charWidthMaxAdj: 0
-  m_TextWrappingMode: 1
+  m_enableWordWrapping: 1
   m_wordWrappingRatios: 0.4
   m_overflowMode: 0
   m_linkedTextComponent: {fileID: 0}
@@ -1155,7 +1146,6 @@ RectTransform:
   - {fileID: 3913774529632130609}
   - {fileID: 3913774529370232167}
   m_Father: {fileID: 3913774529903216065}
-  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -1285,7 +1275,6 @@ RectTransform:
   - {fileID: 3913774529213522512}
   - {fileID: 3913774529902919372}
   m_Father: {fileID: 0}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -1436,7 +1425,7 @@ GameObject:
   m_Component:
   - component: {fileID: 3370482957866633433}
   - component: {fileID: 6977910020062333758}
-  - component: {fileID: 5209847457958900152}
+  - component: {fileID: 5455065672188945866}
   - component: {fileID: 3296447696111715972}
   m_Layer: 5
   m_Name: Predicate
@@ -1458,7 +1447,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7838244607878739931}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -1473,7 +1461,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4412266777753179456}
   m_CullTransparentMesh: 1
---- !u!114 &5209847457958900152
+--- !u!114 &5455065672188945866
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1482,7 +1470,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 4412266777753179456}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 83e7715acbfae1d4b84414c13d03ed3f, type: 3}
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
@@ -1495,8 +1483,8 @@ MonoBehaviour:
       m_Calls: []
   m_text: Predicate
   m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 2b12354fb2d86744887c3e4bfee63986, type: 2}
-  m_sharedMaterial: {fileID: -3021868053195457599, guid: 2b12354fb2d86744887c3e4bfee63986, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: 43806d535501e38458454007849d98a5, type: 2}
+  m_sharedMaterial: {fileID: 2032012751209664223, guid: 43806d535501e38458454007849d98a5, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []
@@ -1524,8 +1512,8 @@ MonoBehaviour:
   m_fontSizeBase: 12
   m_fontWeight: 400
   m_enableAutoSizing: 0
-  m_fontSizeMin: 0
-  m_fontSizeMax: 0
+  m_fontSizeMin: 18
+  m_fontSizeMax: 72
   m_fontStyle: 0
   m_HorizontalAlignment: 1
   m_VerticalAlignment: 256
@@ -1536,7 +1524,7 @@ MonoBehaviour:
   m_lineSpacingMax: 0
   m_paragraphSpacing: 0
   m_charWidthMaxAdj: 0
-  m_TextWrappingMode: 1
+  m_enableWordWrapping: 1
   m_wordWrappingRatios: 0.4
   m_overflowMode: 0
   m_linkedTextComponent: {fileID: 0}
@@ -1585,7 +1573,7 @@ GameObject:
   m_Component:
   - component: {fileID: 1555661482230922473}
   - component: {fileID: 1618853099505256819}
-  - component: {fileID: 15697949687015208}
+  - component: {fileID: 7099785447317287107}
   - component: {fileID: 5126399493325244587}
   m_Layer: 5
   m_Name: Condition
@@ -1607,7 +1595,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 3913774529213522512}
-  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -1622,7 +1609,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7874974698646029946}
   m_CullTransparentMesh: 1
---- !u!114 &15697949687015208
+--- !u!114 &7099785447317287107
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1631,7 +1618,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 7874974698646029946}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 83e7715acbfae1d4b84414c13d03ed3f, type: 3}
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
@@ -1644,8 +1631,8 @@ MonoBehaviour:
       m_Calls: []
   m_text: Condition
   m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 2b12354fb2d86744887c3e4bfee63986, type: 2}
-  m_sharedMaterial: {fileID: -3021868053195457599, guid: 2b12354fb2d86744887c3e4bfee63986, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: 43806d535501e38458454007849d98a5, type: 2}
+  m_sharedMaterial: {fileID: 2032012751209664223, guid: 43806d535501e38458454007849d98a5, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []
@@ -1673,8 +1660,8 @@ MonoBehaviour:
   m_fontSizeBase: 12
   m_fontWeight: 400
   m_enableAutoSizing: 0
-  m_fontSizeMin: 0
-  m_fontSizeMax: 0
+  m_fontSizeMin: 18
+  m_fontSizeMax: 72
   m_fontStyle: 0
   m_HorizontalAlignment: 2
   m_VerticalAlignment: 256
@@ -1685,7 +1672,7 @@ MonoBehaviour:
   m_lineSpacingMax: 0
   m_paragraphSpacing: 0
   m_charWidthMaxAdj: 0
-  m_TextWrappingMode: 1
+  m_enableWordWrapping: 1
   m_wordWrappingRatios: 0.4
   m_overflowMode: 0
   m_linkedTextComponent: {fileID: 0}
@@ -1756,7 +1743,6 @@ RectTransform:
   - {fileID: 3913774529607049028}
   - {fileID: 3370482957866633433}
   m_Father: {fileID: 3913774529902919372}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}

Assets/Prefabs/UI/Property.prefab

@@ -10,7 +10,7 @@ GameObject:
   m_Component:
   - component: {fileID: 5569359501729395037}
   - component: {fileID: 5569359501729395039}
-  - component: {fileID: 5569359501729395036}
+  - component: {fileID: 3443541259058308425}
   - component: {fileID: 8105243158765966554}
   - component: {fileID: -3940543153975910597}
   m_Layer: 5
@@ -33,7 +33,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -48,7 +47,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5569359501729395026}
   m_CullTransparentMesh: 1
---- !u!114 &5569359501729395036
+--- !u!114 &3443541259058308425
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -57,7 +56,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 5569359501729395026}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 83e7715acbfae1d4b84414c13d03ed3f, type: 3}
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
@@ -70,8 +69,8 @@ MonoBehaviour:
       m_Calls: []
   m_text: Key 1.0
   m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 2b12354fb2d86744887c3e4bfee63986, type: 2}
-  m_sharedMaterial: {fileID: -3021868053195457599, guid: 2b12354fb2d86744887c3e4bfee63986, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: 43806d535501e38458454007849d98a5, type: 2}
+  m_sharedMaterial: {fileID: 2032012751209664223, guid: 43806d535501e38458454007849d98a5, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []
@@ -99,8 +98,8 @@ MonoBehaviour:
   m_fontSizeBase: 12
   m_fontWeight: 400
   m_enableAutoSizing: 0
-  m_fontSizeMin: 0
-  m_fontSizeMax: 0
+  m_fontSizeMin: 18
+  m_fontSizeMax: 72
   m_fontStyle: 0
   m_HorizontalAlignment: 1
   m_VerticalAlignment: 256
@@ -111,7 +110,7 @@ MonoBehaviour:
   m_lineSpacingMax: 0
   m_paragraphSpacing: 0
   m_charWidthMaxAdj: 0
-  m_TextWrappingMode: 1
+  m_enableWordWrapping: 1
   m_wordWrappingRatios: 0.4
   m_overflowMode: 0
   m_linkedTextComponent: {fileID: 0}

Assets/Resources/TextMesh Pro/Fonts/NotoSans-VariableFont_wdth,wght SDF.asset

@@ -1,258 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!21 &-3021868053195457599
-Material:
-  serializedVersion: 8
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: NotoSans-VariableFont_wdth,wght Atlas Material
-  m_Shader: {fileID: 4800000, guid: 68e6db2ebdc24f95958faec2be5558d6, type: 3}
-  m_ValidKeywords: []
-  m_InvalidKeywords: []
-  m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
-  stringTagMap: {}
-  disabledShaderPasses: []
-  m_SavedProperties:
-    serializedVersion: 3
-    m_TexEnvs:
-    - _BumpMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _Cube:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _FaceTex:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MainTex:
-        m_Texture: {fileID: 4318944087442446991}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _OutlineTex:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    m_Ints: []
-    m_Floats:
-    - _Ambient: 0.5
-    - _Bevel: 0.5
-    - _BevelClamp: 0
-    - _BevelOffset: 0
-    - _BevelRoundness: 0
-    - _BevelWidth: 0
-    - _BumpFace: 0
-    - _BumpOutline: 0
-    - _ColorMask: 15
-    - _CullMode: 0
-    - _Diffuse: 0.5
-    - _FaceDilate: 0
-    - _FaceUVSpeedX: 0
-    - _FaceUVSpeedY: 0
-    - _GlowInner: 0.05
-    - _GlowOffset: 0
-    - _GlowOuter: 0.05
-    - _GlowPower: 0.75
-    - _GradientScale: 10
-    - _LightAngle: 3.1416
-    - _MaskSoftnessX: 0
-    - _MaskSoftnessY: 0
-    - _OutlineSoftness: 0
-    - _OutlineUVSpeedX: 0
-    - _OutlineUVSpeedY: 0
-    - _OutlineWidth: 0
-    - _PerspectiveFilter: 0.875
-    - _Reflectivity: 10
-    - _ScaleRatioA: 0.9
-    - _ScaleRatioB: 0.73125
-    - _ScaleRatioC: 0.73125
-    - _ScaleX: 1
-    - _ScaleY: 1
-    - _ShaderFlags: 0
-    - _Sharpness: 0
-    - _SpecularPower: 2
-    - _Stencil: 0
-    - _StencilComp: 8
-    - _StencilOp: 0
-    - _StencilReadMask: 255
-    - _StencilWriteMask: 255
-    - _TextureHeight: 1024
-    - _TextureWidth: 1024
-    - _UnderlayDilate: 0
-    - _UnderlayOffsetX: 0
-    - _UnderlayOffsetY: 0
-    - _UnderlaySoftness: 0
-    - _VertexOffsetX: 0
-    - _VertexOffsetY: 0
-    - _WeightBold: 0.75
-    - _WeightNormal: 0
-    m_Colors:
-    - _ClipRect: {r: -32767, g: -32767, b: 32767, a: 32767}
-    - _EnvMatrixRotation: {r: 0, g: 0, b: 0, a: 0}
-    - _FaceColor: {r: 1, g: 1, b: 1, a: 1}
-    - _GlowColor: {r: 0, g: 1, b: 0, a: 0.5}
-    - _MaskCoord: {r: 0, g: 0, b: 32767, a: 32767}
-    - _OutlineColor: {r: 0, g: 0, b: 0, a: 1}
-    - _ReflectFaceColor: {r: 0, g: 0, b: 0, a: 1}
-    - _ReflectOutlineColor: {r: 0, g: 0, b: 0, a: 1}
-    - _SpecularColor: {r: 1, g: 1, b: 1, a: 1}
-    - _UnderlayColor: {r: 0, g: 0, b: 0, a: 0.5}
-  m_BuildTextureStacks: []
---- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 19001, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: NotoSans-VariableFont_wdth,wght SDF
-  m_EditorClassIdentifier: 
-  m_Version: 1.1.0
-  m_Material: {fileID: -3021868053195457599}
-  m_SourceFontFileGUID: 35400ee909f32d94f9901006d051135c
-  m_SourceFontFile: {fileID: 12800000, guid: 35400ee909f32d94f9901006d051135c, type: 3}
-  m_AtlasPopulationMode: 1
-  InternalDynamicOS: 0
-  m_FaceInfo:
-    m_FaceIndex: 0
-    m_FamilyName: Noto Sans
-    m_StyleName: Regular
-    m_PointSize: 90
-    m_Scale: 1
-    m_UnitsPerEM: 1000
-    m_LineHeight: 122.58
-    m_AscentLine: 96.21001
-    m_CapLine: 65
-    m_MeanLine: 49
-    m_Baseline: 0
-    m_DescentLine: -26.37
-    m_SuperscriptOffset: 96.21001
-    m_SuperscriptSize: 0.5
-    m_SubscriptOffset: -26.37
-    m_SubscriptSize: 0.5
-    m_UnderlineOffset: -11.25
-    m_UnderlineThickness: 4.5
-    m_StrikethroughOffset: 19.6
-    m_StrikethroughThickness: 4.5
-    m_TabWidth: 23
-  m_FontWeightTable:
-  - regularTypeface: {fileID: 0}
-    italicTypeface: {fileID: 0}
-  - regularTypeface: {fileID: 0}
-    italicTypeface: {fileID: 0}
-  - regularTypeface: {fileID: 0}
-    italicTypeface: {fileID: 0}
-  - regularTypeface: {fileID: 0}
-    italicTypeface: {fileID: 0}
-  - regularTypeface: {fileID: 0}
-    italicTypeface: {fileID: 0}
-  - regularTypeface: {fileID: 0}
-    italicTypeface: {fileID: 0}
-  - regularTypeface: {fileID: 0}
-    italicTypeface: {fileID: 0}
-  - regularTypeface: {fileID: 0}
-    italicTypeface: {fileID: 0}
-  - regularTypeface: {fileID: 0}
-    italicTypeface: {fileID: 0}
-  - regularTypeface: {fileID: 0}
-    italicTypeface: {fileID: 0}
-  m_GlyphTable: []
-  m_CharacterTable: []
-  m_AtlasTextures:
-  - {fileID: 4318944087442446991}
-  m_AtlasTextureIndex: 0
-  m_IsMultiAtlasTexturesEnabled: 0
-  m_ClearDynamicDataOnBuild: 1
-  m_AtlasWidth: 1024
-  m_AtlasHeight: 1024
-  m_AtlasPadding: 9
-  m_AtlasRenderMode: 4165
-  m_UsedGlyphRects: []
-  m_FreeGlyphRects:
-  - m_X: 0
-    m_Y: 0
-    m_Width: 1023
-    m_Height: 1023
-  m_FontFeatureTable:
-    m_GlyphPairAdjustmentRecords: []
-  m_FallbackFontAssetTable: []
-  m_fontAssetCreationEditorSettings:
-    sourceFontFileGUID: 35400ee909f32d94f9901006d051135c
-    faceIndex: 0
-    pointSizeSamplingMode: 0
-    pointSize: 90
-    padding: 9
-    packingMode: 0
-    atlasWidth: 1024
-    atlasHeight: 1024
-    characterSetSelectionMode: 7
-    characterSequence: 
-    referencedFontAssetGUID: 
-    referencedTextAssetGUID: 
-    fontStyle: 0
-    fontStyleModifier: 0
-    renderMode: 4165
-    includeFontFeatures: 0
-  m_RegularStyleWeight: 0
-  m_RegularStyleSpacing: 0
-  m_BoldStyleWeight: 0.75
-  m_BoldStyleSpacing: 7
-  m_ItalicStyleSlant: 35
-  m_TabMultiple: 10
---- !u!28 &4318944087442446991
-Texture2D:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: NotoSans-VariableFont_wdth,wght Atlas
-  m_ImageContentsHash:
-    serializedVersion: 2
-    Hash: 00000000000000000000000000000000
-  m_ForcedFallbackFormat: 4
-  m_DownscaleFallback: 0
-  m_IsAlphaChannelOptional: 0
-  serializedVersion: 2
-  m_Width: 0
-  m_Height: 0
-  m_CompleteImageSize: 0
-  m_MipsStripped: 0
-  m_TextureFormat: 1
-  m_MipCount: 1
-  m_IsReadable: 1
-  m_IsPreProcessed: 0
-  m_IgnoreMasterTextureLimit: 0
-  m_StreamingMipmaps: 0
-  m_StreamingMipmapsPriority: 0
-  m_VTOnly: 0
-  m_AlphaIsTransparency: 0
-  m_ImageCount: 1
-  m_TextureDimension: 2
-  m_TextureSettings:
-    serializedVersion: 2
-    m_FilterMode: 1
-    m_Aniso: 1
-    m_MipBias: 0
-    m_WrapU: 0
-    m_WrapV: 0
-    m_WrapW: 0
-  m_LightmapFormat: 0
-  m_ColorSpace: 0
-  m_PlatformBlob: 
-  image data: 0
-  _typelessdata: 
-  m_StreamData:
-    serializedVersion: 2
-    offset: 0
-    size: 0
-    path: 

Assets/Resources/TextMesh Pro/Shaders/SDFFunctions.hlsl

@@ -1,178 +0,0 @@
-float2 UnpackUV(float uv)
-{
-	float2 output;
-	output.x = floor(uv / 4096.0);
-	output.y = uv - 4096.0 * output.x;
-
-	return output * 0.001953125;
-}
-
-float4 BlendARGB(float4 overlying, float4 underlying)
-{
-	overlying.rgb *= overlying.a;
-	underlying.rgb *= underlying.a;
-	float3 blended = overlying.rgb + ((1 - overlying.a) * underlying.rgb);
-	float alpha = underlying.a + (1 - underlying.a) * overlying.a;
-	return float4(blended / alpha, alpha);
-}
-
-float3 GetSpecular(float3 n, float3 l)
-{
-	float spec = pow(max(0.0, dot(n, l)), _Reflectivity);
-	return _SpecularColor.rgb * spec * _SpecularPower;
-}
-
-void GetSurfaceNormal_float(texture2D atlas, float textureWidth, float textureHeight, float2 uv, bool isFront, out float3 nornmal)
-{
-	float3 delta = float3(1.0 / textureWidth, 1.0 / textureHeight, 0.0);
-
-	// Read "height field"
-	float4 h = float4(
-		SAMPLE_TEXTURE2D(atlas, SamplerState_Linear_Clamp, uv - delta.xz).a,
-		SAMPLE_TEXTURE2D(atlas, SamplerState_Linear_Clamp, uv + delta.xz).a,
-		SAMPLE_TEXTURE2D(atlas, SamplerState_Linear_Clamp, uv - delta.zy).a,
-		SAMPLE_TEXTURE2D(atlas, SamplerState_Linear_Clamp, uv + delta.zy).a);
-
-	bool raisedBevel = _BevelType;
-
-	h += _BevelOffset;
-
-	float bevelWidth = max(.01, _BevelWidth);
-
-	// Track outline
-	h -= .5;
-	h /= bevelWidth;
-	h = saturate(h + .5);
-
-	if (raisedBevel) h = 1 - abs(h * 2.0 - 1.0);
-	h = lerp(h, sin(h * 3.141592 / 2.0), float4(_BevelRoundness, _BevelRoundness, _BevelRoundness, _BevelRoundness));
-	h = min(h, 1.0 - float4(_BevelClamp, _BevelClamp, _BevelClamp, _BevelClamp));
-	h *= _BevelAmount * bevelWidth * _GradientScale * -2.0;
-
-	float3 va = normalize(float3(-1.0, 0.0, h.y - h.x));
-	float3 vb = normalize(float3(0.0, 1.0, h.w - h.z));
-
-	float3 f = float3(1, 1, 1);
-	if (isFront) f = float3(1, 1, -1);
-	nornmal = cross(va, vb) * f;
-}
-
-void EvaluateLight_float(float4 faceColor, float3 n, out float4 color)
-{
-	n.z = abs(n.z);
-	float3 light = normalize(float3(sin(_LightAngle), cos(_LightAngle), 1.0));
-
-	float3 col = max(faceColor.rgb, 0) + GetSpecular(n, light)* faceColor.a;
-	//faceColor.rgb += col * faceColor.a;
-	col *= 1 - (dot(n, light) * _Diffuse);
-	col *= lerp(_Ambient, 1, n.z * n.z);
-
-	//fixed4 reflcol = texCUBE(_Cube, reflect(input.viewDir, -n));
-	//faceColor.rgb += reflcol.rgb * lerp(_ReflectFaceColor.rgb, _ReflectOutlineColor.rgb, saturate(sd + outline * 0.5)) * faceColor.a;
-
-	color = float4(col, faceColor.a);
-}
-
-// Add custom function to handle time in HDRP
-
-
-//
-void GenerateUV_float(float2 inUV, float4 transform, float2 animSpeed, out float2 outUV)
-{
-	outUV = inUV * transform.xy + transform.zw + (animSpeed * _Time.y);
-}
-
-void ComputeUVOffset_float(float texWidth, float texHeight, float2 offset, float SDR, out float2 uvOffset)
-{
-	uvOffset = float2(-offset.x * SDR / texWidth, -offset.y * SDR / texHeight);
-}
-
-void ScreenSpaceRatio2_float(float4x4 projection, float4 position, float2 objectScale, float screenWidth, float screenHeight, float fontScale, out float SSR)
-{
-	float2 pixelSize = position.w;
-	pixelSize /= (objectScale * mul((float2x2)projection, float2(screenWidth, screenHeight)));
-	SSR = rsqrt(dot(pixelSize, pixelSize)*2) * fontScale;
-}
-
-// UV			: Texture coordinate of the source distance field texture
-// TextureSize	: Size of the source distance field texture
-// Filter		: Enable perspective filter (soften)
-void ScreenSpaceRatio_float(float2 UV, float TextureSize, bool Filter, out float SSR)
-{
-	if(Filter)
-	{
-		float2 a = float2(ddx(UV.x), ddy(UV.x));
-		float2 b = float2(ddx(UV.y), ddy(UV.y));
-		float s = lerp(dot(a,a), dot(b,b), 0.5);
-		SSR = rsqrt(s) / TextureSize;
-	}
-	else
-	{
-		float s = rsqrt(abs(ddx(UV.x) * ddy(UV.y) - ddy(UV.x) * ddx(UV.y)));
-		SSR = s / TextureSize;
-	}
-}
-
-// SSR : Screen Space Ratio
-// SD  : Signed Distance (encoded : Distance / SDR + .5)
-// SDR : Signed Distance Ratio
-//
-// IsoPerimeter : Dilate / Contract the shape
-void ComputeSDF_float(float SSR, float SD, float SDR, float isoPerimeter, float softness, out float outAlpha)
-{
-	softness *= SSR * SDR;
-	float d = (SD - 0.5) * SDR;																				// Signed distance to edge, in Texture space
-	outAlpha = saturate((d * 2.0 * SSR + 0.5 + isoPerimeter * SDR * SSR + softness * 0.5) / (1.0 + softness));	// Screen pixel coverage (alpha)
-}
-
-void ComputeSDF2_float(float SSR, float SD, float SDR, float2 isoPerimeter, float2 softness, out float2 outAlpha)
-{
-	softness *= SSR * SDR;
-	float d = (SD - 0.5f) * SDR;
-	outAlpha = saturate((d * 2.0f * SSR + 0.5f + isoPerimeter * SDR * SSR + softness * 0.5) / (1.0 + softness));
-}
-
-void ComputeSDF4_float(float SSR, float SD, float SDR, float4 isoPerimeter, float4 softness, out float4 outAlpha)
-{
-	softness *= SSR * SDR;
-	float d = (SD - 0.5f) * SDR;
-	outAlpha = saturate((d * 2.0f * SSR + 0.5f + isoPerimeter * SDR * SSR + softness * 0.5) / (1.0 + softness));
-}
-
-void ComputeSDF44_float(float SSR, float4 SD, float SDR, float4 isoPerimeter, float4 softness, bool outline, out float4 outAlpha)
-{
-	softness *= SSR * SDR;
-	float4 d = (SD - 0.5f) * SDR;
-	if(outline) d.w = max(max(d.x, d.y), d.z);
-	outAlpha = saturate((d * 2.0f * SSR + 0.5f + isoPerimeter * SDR * SSR + softness * 0.5) / (1.0 + softness));
-}
-
-void Composite_float(float4 overlying, float4 underlying, out float4 outColor)
-{
-	outColor = BlendARGB(overlying, underlying);
-}
-
-// Face only
-void Layer1_float(float alpha, float4 color0, out float4 outColor)
-{
-	color0.a *= alpha;
-	outColor = color0;
-}
-
-// Face + 1 Outline
-void Layer2_float(float2 alpha, float4 color0, float4 color1, out float4 outColor)
-{
-	color1.a *= alpha.y;
-	color0.rgb *= color0.a; color1.rgb *= color1.a;
-	outColor = lerp(color1, color0, alpha.x);
-	outColor.rgb /= outColor.a;
-}
-
-// Face + 3 Outline
-void Layer4_float(float4 alpha, float4 color0, float4 color1, float4 color2, float4 color3, out float4 outColor)
-{
-	color3.a *= alpha.w;
-	color0.rgb *= color0.a; color1.rgb *= color1.a; color2.rgb *= color2.a; color3.rgb *= color3.a;
-	outColor = lerp(lerp(lerp(color3, color2, alpha.z), color1, alpha.y), color0, alpha.x);
-	outColor.rgb /= outColor.a;
-}

Assets/Resources/TextMesh Pro/Shaders/SDFFunctions.hlsl.meta

@@ -1,10 +0,0 @@
-fileFormatVersion: 2
-guid: 96de908384869cd409c75efa351d5edf
-ShaderImporter:
-  externalObjects: {}
-  defaultTextures: []
-  nonModifiableTextures: []
-  preprocessorOverride: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Resources/TextMesh Pro/Shaders/TMP_SDF-HDRP LIT.shadergraph.meta

@@ -1,10 +0,0 @@
-fileFormatVersion: 2
-guid: ca2ed216f98028c4dae6c5224a952b3c
-ScriptedImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 2
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
-  script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3}

Assets/Resources/TextMesh Pro/Shaders/TMP_SDF-HDRP UNLIT.shadergraph.meta

@@ -1,10 +0,0 @@
-fileFormatVersion: 2
-guid: f63d574838ccfb44f84acc05fed0af48
-ScriptedImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 2
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
-  script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3}

Assets/Resources/TextMesh Pro/Shaders/TMP_SDF-URP Lit.shadergraph.meta

@@ -1,10 +0,0 @@
-fileFormatVersion: 2
-guid: a3d800b099a06e0478fb790c5e79057a
-ScriptedImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 2
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
-  script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3}

Assets/Resources/TextMesh Pro/Shaders/TMP_SDF-URP Unlit.shadergraph.meta

@@ -1,10 +0,0 @@
-fileFormatVersion: 2
-guid: 124c112a6e8f1a54e8b0870e881b56d8
-ScriptedImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 2
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
-  script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3}

Assets/Resources/TextMesh Pro/Shaders/TMPro_Properties.cginc

@@ -1,80 +0,0 @@
-// UI Editable properties
-uniform sampler2D	_FaceTex;					// Alpha : Signed Distance
-uniform float		_FaceUVSpeedX;
-uniform float		_FaceUVSpeedY;
-uniform fixed4		_FaceColor;					// RGBA : Color + Opacity
-uniform float		_FaceDilate;				// v[ 0, 1]
-uniform float		_OutlineSoftness;			// v[ 0, 1]
-
-uniform sampler2D	_OutlineTex;				// RGBA : Color + Opacity
-uniform float		_OutlineUVSpeedX;
-uniform float		_OutlineUVSpeedY;
-uniform fixed4		_OutlineColor;				// RGBA : Color + Opacity
-uniform float		_OutlineWidth;				// v[ 0, 1]
-
-uniform float		_Bevel;						// v[ 0, 1]
-uniform float		_BevelOffset;				// v[-1, 1]
-uniform float		_BevelWidth;				// v[-1, 1]
-uniform float		_BevelClamp;				// v[ 0, 1]
-uniform float		_BevelRoundness;			// v[ 0, 1]
-
-uniform sampler2D	_BumpMap;					// Normal map
-uniform float		_BumpOutline;				// v[ 0, 1]
-uniform float		_BumpFace;					// v[ 0, 1]
-
-uniform samplerCUBE	_Cube;						// Cube / sphere map
-uniform fixed4 		_ReflectFaceColor;			// RGB intensity
-uniform fixed4		_ReflectOutlineColor;
-//uniform float		_EnvTiltX;					// v[-1, 1]
-//uniform float		_EnvTiltY;					// v[-1, 1]
-uniform float3      _EnvMatrixRotation;
-uniform float4x4	_EnvMatrix;
-
-uniform fixed4		_SpecularColor;				// RGB intensity
-uniform float		_LightAngle;				// v[ 0,Tau]
-uniform float		_SpecularPower;				// v[ 0, 1]
-uniform float		_Reflectivity;				// v[ 5, 15]
-uniform float		_Diffuse;					// v[ 0, 1]
-uniform float		_Ambient;					// v[ 0, 1]
-
-uniform fixed4		_UnderlayColor;				// RGBA : Color + Opacity
-uniform float		_UnderlayOffsetX;			// v[-1, 1]
-uniform float		_UnderlayOffsetY;			// v[-1, 1]
-uniform float		_UnderlayDilate;			// v[-1, 1]
-uniform float		_UnderlaySoftness;			// v[ 0, 1]
-
-uniform fixed4 		_GlowColor;					// RGBA : Color + Intesity
-uniform float 		_GlowOffset;				// v[-1, 1]
-uniform float 		_GlowOuter;					// v[ 0, 1]
-uniform float 		_GlowInner;					// v[ 0, 1]
-uniform float 		_GlowPower;					// v[ 1, 1/(1+4*4)]
-
-// API Editable properties
-uniform float 		_ShaderFlags;
-uniform float		_WeightNormal;
-uniform float		_WeightBold;
-
-uniform float		_ScaleRatioA;
-uniform float		_ScaleRatioB;
-uniform float		_ScaleRatioC;
-
-uniform float		_VertexOffsetX;
-uniform float		_VertexOffsetY;
-
-//uniform float		_UseClipRect;
-uniform float		_MaskID;
-uniform sampler2D	_MaskTex;
-uniform float4		_MaskCoord;
-uniform float4		_ClipRect;	// bottom left(x,y) : top right(z,w)
-uniform float		_MaskSoftnessX;
-uniform float		_MaskSoftnessY;
-
-// Font Atlas properties
-uniform sampler2D	_MainTex;
-uniform float		_TextureWidth;
-uniform float		_TextureHeight;
-uniform float 		_GradientScale;
-uniform float		_ScaleX;
-uniform float		_ScaleY;
-uniform float		_PerspectiveFilter;
-uniform float		_Sharpness;