Merge branch 'release_1' into pr/454

2023-11-04 19:25:34 -04:00 · 2023-11-04 19:25:34 -04:00 · 4fd29e123f
parent cd10c4a543 3002e48350
commit 4fd29e123f
466 changed files with 130662 additions and 18055 deletions
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@ -1,6 +1,7 @@
 {
-	"recommendations": [
-		"ms-dotnettools.csharp",
-		"editorconfig.editorconfig"
-	]
+    "recommendations": [
+        "ms-dotnettools.csharp",
+        "editorconfig.editorconfig",
+        "visualstudiotoolsforunity.vstuc"
+    ]
 }
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@ -0,0 +1,10 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Attach to Unity",
+            "type": "vstuc",
+            "request": "attach"
+        }
+     ]
+}
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@ -1,54 +1,55 @@
 {
-  "files.exclude": {
-    "**/.DS_Store": true,
-    "**/.git": true,
-    "**/.gitmodules": true,
-    "**/*.booproj": true,
-    "**/*.pidb": true,
-    "**/*.suo": true,
-    "**/*.user": true,
-    "**/*.userprefs": true,
-    "**/*.unityproj": true,
-    "**/*.dll": true,
-    "**/*.exe": true,
-    "**/*.pdf": true,
-    "**/*.mid": true,
-    "**/*.midi": true,
-    "**/*.wav": true,
-    "**/*.gif": true,
-    "**/*.ico": true,
-    "**/*.jpg": true,
-    "**/*.jpeg": true,
-    "**/*.png": true,
-    "**/*.psd": true,
-    "**/*.tga": true,
-    "**/*.tif": true,
-    "**/*.tiff": true,
-    "**/*.3ds": true,
-    "**/*.3DS": true,
-    "**/*.fbx": true,
-    "**/*.FBX": true,
-    "**/*.lxo": true,
-    "**/*.LXO": true,
-    "**/*.ma": true,
-    "**/*.MA": true,
-    "**/*.obj": true,
-    "**/*.OBJ": true,
-    "**/*.asset": true,
-    "**/*.cubemap": true,
-    "**/*.flare": true,
-    "**/*.mat": true,
-    "**/*.meta": true,
-    "**/*.prefab": true,
-    "**/*.unity": true,
-    "build/": true,
-    "Build/": true,
-    "Library/": true,
-    "library/": true,
-    "obj/": true,
-    "Obj/": true,
-    "ProjectSettings/": true,
-    "temp/": true,
-    "Temp/": true
-  }
-}
+    "files.exclude": {
+        "**/.DS_Store": true,
+        "**/.git": true,
+        "**/.gitmodules": true,
+        "**/*.booproj": true,
+        "**/*.pidb": true,
+        "**/*.suo": true,
+        "**/*.user": true,
+        "**/*.userprefs": true,
+        "**/*.unityproj": true,
+        "**/*.dll": true,
+        "**/*.exe": true,
+        "**/*.pdf": true,
+        "**/*.mid": true,
+        "**/*.midi": true,
+        "**/*.wav": true,
+        "**/*.gif": true,
+        "**/*.ico": true,
+        "**/*.jpg": true,
+        "**/*.jpeg": true,
+        "**/*.png": true,
+        "**/*.psd": true,
+        "**/*.tga": true,
+        "**/*.tif": true,
+        "**/*.tiff": true,
+        "**/*.3ds": true,
+        "**/*.3DS": true,
+        "**/*.fbx": true,
+        "**/*.FBX": true,
+        "**/*.lxo": true,
+        "**/*.LXO": true,
+        "**/*.ma": true,
+        "**/*.MA": true,
+        "**/*.obj": true,
+        "**/*.OBJ": true,
+        "**/*.asset": true,
+        "**/*.cubemap": true,
+        "**/*.flare": true,
+        "**/*.mat": true,
+        "**/*.meta": true,
+        "**/*.prefab": true,
+        "**/*.unity": true,
+        "build/": true,
+        "Build/": true,
+        "Library/": true,
+        "library/": true,
+        "obj/": true,
+        "Obj/": true,
+        "ProjectSettings/": true,
+        "temp/": true,
+        "Temp/": true
+    },
+    "dotnet.defaultSolution": "HeavenStudio.sln"
+}
--- a/Assets/Editor/BuildScript.cs
+++ b/Assets/Editor/BuildScript.cs
@ -22,7 +22,7 @@ namespace UnityBuilderAction
            string appName = PlayerSettings.productName;
            // Get filename.
            string path = EditorUtility.SaveFilePanel("Build out WINDOWS to...", "", appName, "exe");
-            Build( BuildTarget.StandaloneWindows, 0, path);
+            Build( BuildTarget.StandaloneWindows64, 0, path);
        }

        [MenuItem("File/Build Linux")]
@ -200,7 +200,7 @@ namespace UnityBuilderAction
                    dataPath = $"_Data/";
                    break;
                case BuildTarget.StandaloneOSX:
-                    dataPath = $".app/Contents/";
+                    dataPath = $".app/Contents/Resources/Data/";
                    break;
                case BuildTarget.StandaloneLinux64:
                    dataPath = $"_Data/";
@ -225,7 +225,7 @@ namespace UnityBuilderAction
            {
                Directory.CreateDirectory(assetBundleDirectory);
            }
-            BuildPipeline.BuildAssetBundles(assetBundleDirectory, BuildAssetBundleOptions.ForceRebuildAssetBundle, buildTarget);
+            BuildPipeline.BuildAssetBundles(assetBundleDirectory, BuildAssetBundleOptions.ForceRebuildAssetBundle | BuildAssetBundleOptions.ChunkBasedCompression, buildTarget);

            BuildSummary buildSummary = BuildPipeline.BuildPlayer(buildPlayerOptions).summary;
            ReportSummary(buildSummary);
--- a/Assets/Editor/CreateAssetBundles.cs
+++ b/Assets/Editor/CreateAssetBundles.cs
@ -9,14 +9,47 @@ using UnityEngine;

 public class CreateAssetBundles
 {
-    [MenuItem("Assets/Build AssetBundles")]
-    static void BuildAllAssetBundles()
+    [MenuItem("Assets/Build AssetBundles/Current Platform")]
+    static void BuildAllAssetBundlesCurrPlatform()
    {
-    string assetBundleDirectory = "Assets/StreamingAssets";
-    if (!Directory.Exists(Application.streamingAssetsPath))
-    {
-        Directory.CreateDirectory(assetBundleDirectory);
+        string assetBundleDirectory = "Assets/StreamingAssets";
+        if (!Directory.Exists(Application.streamingAssetsPath))
+        {
+            Directory.CreateDirectory(assetBundleDirectory);
+        }
+        BuildPipeline.BuildAssetBundles(assetBundleDirectory, BuildAssetBundleOptions.ChunkBasedCompression, EditorUserBuildSettings.activeBuildTarget);
    }
-    BuildPipeline.BuildAssetBundles(assetBundleDirectory, BuildAssetBundleOptions.None, EditorUserBuildSettings.activeBuildTarget);
+
+    [MenuItem("Assets/Build AssetBundles/Windows")]
+    static void BuildAllAssetBundlesWindows()
+    {
+        string assetBundleDirectory = "Assets/StreamingAssets/Windows";
+        if (!Directory.Exists(Application.streamingAssetsPath))
+        {
+            Directory.CreateDirectory(assetBundleDirectory);
+        }
+        BuildPipeline.BuildAssetBundles(assetBundleDirectory, BuildAssetBundleOptions.ChunkBasedCompression, BuildTarget.StandaloneWindows);
+    }
+
+    [MenuItem("Assets/Build AssetBundles/Linux")]
+    static void BuildAllAssetBundlesLinux()
+    {
+        string assetBundleDirectory = "Assets/StreamingAssets/Linux";
+        if (!Directory.Exists(Application.streamingAssetsPath))
+        {
+            Directory.CreateDirectory(assetBundleDirectory);
+        }
+        BuildPipeline.BuildAssetBundles(assetBundleDirectory, BuildAssetBundleOptions.ChunkBasedCompression, BuildTarget.StandaloneLinux64);
+    }
+
+    [MenuItem("Assets/Build AssetBundles/Mac")]
+    static void BuildAllAssetBundlesMacOS()
+    {
+        string assetBundleDirectory = "Assets/StreamingAssets/Mac";
+        if (!Directory.Exists(Application.streamingAssetsPath))
+        {
+            Directory.CreateDirectory(assetBundleDirectory);
+        }
+        BuildPipeline.BuildAssetBundles(assetBundleDirectory, BuildAssetBundleOptions.ChunkBasedCompression, BuildTarget.StandaloneOSX);
    }
 }
--- a/Assets/Plugins/BezierSolution/Demo/OctopusArm.mat
+++ b/Assets/Plugins/BezierSolution/Demo/OctopusArm.mat
@ -19,7 +19,7 @@ Material:
    serializedVersion: 3
    m_TexEnvs:
    - _BumpMap:
-        m_Texture: {fileID: 2800000, guid: 89e1b1c005d29cf4598ea861deb35a80, type: 3}
+        m_Texture: {fileID: 2800000, guid: 8b8c8a10edf94ddc8cc4cc4fcd5696a9, type: 3}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _DetailAlbedoMap:
--- a/Assets/Plugins/Discord/Plugins/aarch64.meta
+++ b/Assets/Plugins/Discord/Plugins/aarch64.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 46ec8bf5775b6af429f16d7140f02d54
+guid: 744658200b40eb54595b8aaf092485cc
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}
--- a/Assets/Plugins/Discord/Plugins/aarch64/discord_game_sdk.bundle
+++ b/Assets/Plugins/Discord/Plugins/aarch64/discord_game_sdk.bundle
--- a/Assets/Plugins/Discord/Plugins/aarch64/discord_game_sdk.bundle.meta
+++ b/Assets/Plugins/Discord/Plugins/aarch64/discord_game_sdk.bundle.meta
@ -0,0 +1,63 @@
+fileFormatVersion: 2
+guid: 96fc096f6b288424faf79ea974b7041e
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      : Any
+    second:
+      enabled: 0
+      settings:
+        Exclude Editor: 0
+        Exclude Linux64: 1
+        Exclude OSXUniversal: 0
+        Exclude Win: 1
+        Exclude Win64: 1
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 1
+      settings:
+        CPU: ARM64
+        DefaultValueInitialized: true
+        OS: OSX
+  - first:
+      Standalone: Linux64
+    second:
+      enabled: 0
+      settings:
+        CPU: x86_64
+  - first:
+      Standalone: OSXUniversal
+    second:
+      enabled: 1
+      settings:
+        CPU: ARM64
+  - first:
+      Standalone: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: x86
+  - first:
+      Standalone: Win64
+    second:
+      enabled: 0
+      settings:
+        CPU: x86_64
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Plugins/Discord/Plugins/aarch64/discord_game_sdk.dylib
+++ b/Assets/Plugins/Discord/Plugins/aarch64/discord_game_sdk.dylib
--- a/Assets/Plugins/Discord/Plugins/aarch64/discord_game_sdk.dylib.meta
+++ b/Assets/Plugins/Discord/Plugins/aarch64/discord_game_sdk.dylib.meta
@ -0,0 +1,63 @@
+fileFormatVersion: 2
+guid: 84f8495f7ca76e94c9e4bfe9675f534c
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      : Any
+    second:
+      enabled: 0
+      settings:
+        Exclude Editor: 0
+        Exclude Linux64: 1
+        Exclude OSXUniversal: 0
+        Exclude Win: 1
+        Exclude Win64: 1
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 1
+      settings:
+        CPU: ARM64
+        DefaultValueInitialized: true
+        OS: OSX
+  - first:
+      Standalone: Linux64
+    second:
+      enabled: 0
+      settings:
+        CPU: x86_64
+  - first:
+      Standalone: OSXUniversal
+    second:
+      enabled: 1
+      settings:
+        CPU: ARM64
+  - first:
+      Standalone: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: x86
+  - first:
+      Standalone: Win64
+    second:
+      enabled: 0
+      settings:
+        CPU: x86_64
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Plugins/Discord/Plugins/x86_64.meta
+++ b/Assets/Plugins/Discord/Plugins/x86_64.meta
--- a/Assets/Plugins/Discord/Plugins/x86_64/discord_game_sdk.bundle
+++ b/Assets/Plugins/Discord/Plugins/x86_64/discord_game_sdk.bundle
--- a/Assets/Plugins/Discord/Plugins/x86_64/discord_game_sdk.bundle.meta
+++ b/Assets/Plugins/Discord/Plugins/x86_64/discord_game_sdk.bundle.meta
@ -45,7 +45,7 @@ PluginImporter:
    second:
      enabled: 1
      settings:
-        CPU: AnyCPU
+        CPU: x86_64
  - first:
      Standalone: Win
    second:
--- a/Assets/Plugins/Discord/Plugins/x86_64/discord_game_sdk.dll
+++ b/Assets/Plugins/Discord/Plugins/x86_64/discord_game_sdk.dll
--- a/Assets/Plugins/Discord/Plugins/x86_64/discord_game_sdk.dll.lib
+++ b/Assets/Plugins/Discord/Plugins/x86_64/discord_game_sdk.dll.lib
--- a/Assets/Plugins/Discord/Plugins/x86_64/discord_game_sdk.dll.lib.meta
+++ b/Assets/Plugins/Discord/Plugins/x86_64/discord_game_sdk.dll.lib.meta
--- a/Assets/Plugins/Discord/Plugins/x86_64/discord_game_sdk.dll.meta
+++ b/Assets/Plugins/Discord/Plugins/x86_64/discord_game_sdk.dll.meta
--- a/Assets/Plugins/Discord/Plugins/x86_64/discord_game_sdk.dylib
+++ b/Assets/Plugins/Discord/Plugins/x86_64/discord_game_sdk.dylib
--- a/Assets/Plugins/Discord/Plugins/x86_64/discord_game_sdk.dylib.meta
+++ b/Assets/Plugins/Discord/Plugins/x86_64/discord_game_sdk.dylib.meta
--- a/Assets/Plugins/Discord/Plugins/x86_64/discord_game_sdk.so
+++ b/Assets/Plugins/Discord/Plugins/x86_64/discord_game_sdk.so
--- a/Assets/Plugins/Discord/Plugins/x86_64/discord_game_sdk.so.meta
+++ b/Assets/Plugins/Discord/Plugins/x86_64/discord_game_sdk.so.meta
--- a/Assets/Plugins/Discord/Plugins/x86/discord_game_sdk.dll.meta
+++ b/Assets/Plugins/Discord/Plugins/x86/discord_game_sdk.dll.meta
@ -11,6 +11,16 @@ PluginImporter:
  isExplicitlyReferenced: 0
  validateReferences: 1
  platformData:
+  - first:
+      : Any
+    second:
+      enabled: 0
+      settings:
+        Exclude Editor: 1
+        Exclude Linux64: 0
+        Exclude OSXUniversal: 0
+        Exclude Win: 0
+        Exclude Win64: 0
  - first:
      Any: 
    second:
@ -21,18 +31,19 @@ PluginImporter:
    second:
      enabled: 0
      settings:
-        CPU: x86
+        CPU: AnyCPU
        DefaultValueInitialized: true
+        OS: Windows
  - first:
      Standalone: Linux64
    second:
-      enabled: 0
+      enabled: 1
      settings:
        CPU: None
  - first:
      Standalone: OSXUniversal
    second:
-      enabled: 0
+      enabled: 1
      settings:
        CPU: x86
  - first:
@ -44,7 +55,7 @@ PluginImporter:
  - first:
      Standalone: Win64
    second:
-      enabled: 0
+      enabled: 1
      settings:
        CPU: None
  userData: 
--- a/Assets/Plugins/JSL/.DS_Store
+++ b/Assets/Plugins/JSL/.DS_Store
--- a/Assets/Plugins/JSL/JoyShockLibrary.h.meta
+++ b/Assets/Plugins/JSL/JoyShockLibrary.h.meta
@ -1,27 +0,0 @@
-fileFormatVersion: 2
-guid: 129c872137ca57441bd8e920a0caceef
-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
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Plugins/JSL/x64/JoyShockLibrary.exp
+++ b/Assets/Plugins/JSL/x64/JoyShockLibrary.exp
--- a/Assets/Plugins/JSL/x64/JoyShockLibrary.exp.meta
+++ b/Assets/Plugins/JSL/x64/JoyShockLibrary.exp.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 8290861ef07e2d74497c02c16ea45608
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Plugins/JSL/x64/JoyShockLibrary.lib
+++ b/Assets/Plugins/JSL/x64/JoyShockLibrary.lib
--- a/Assets/Plugins/JSL/x64/libJoyShockLibrary.so
+++ b/Assets/Plugins/JSL/x64/libJoyShockLibrary.so
--- a/Assets/Plugins/JSL/x64/libJoyShockLibrary.so.meta
+++ b/Assets/Plugins/JSL/x64/libJoyShockLibrary.so.meta
@ -1,27 +0,0 @@
-fileFormatVersion: 2
-guid: c785dbfac2c67974fa1cce056df6404d
-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
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Plugins/JSL/x86/JoyShockLibrary.dll
+++ b/Assets/Plugins/JSL/x86/JoyShockLibrary.dll
--- a/Assets/Plugins/JSL/x86/JoyShockLibrary.exp
+++ b/Assets/Plugins/JSL/x86/JoyShockLibrary.exp
--- a/Assets/Plugins/JSL/x86/JoyShockLibrary.lib
+++ b/Assets/Plugins/JSL/x86/JoyShockLibrary.lib
--- a/Assets/Plugins/JSL/x86/JoyShockLibrary.lib.meta
+++ b/Assets/Plugins/JSL/x86/JoyShockLibrary.lib.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 12b152ed16fe1eb4698be175f621ffe4
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Plugins/JoyShockLibrary.meta
+++ b/Assets/Plugins/JoyShockLibrary.meta
--- a/Assets/Plugins/JoyShockLibrary/JoyShockLibrary.cs
+++ b/Assets/Plugins/JoyShockLibrary/JoyShockLibrary.cs
@ -130,13 +130,13 @@ public static class JSL
    public delegate void ConnectionCallback(int handle);
    public delegate void DeconnectionCallback(int handle, bool isConnected);

-    [DllImport("JoyShockLibrary")]
+    [DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
    public static extern int JslConnectDevices();
-    [DllImport("JoyShockLibrary")]
+    [DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
    public static extern int JslGetConnectedDeviceHandles(int[] deviceHandleArray, int size);
-    [DllImport("JoyShockLibrary")]
+    [DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
    public static extern void JslDisconnectAndDisposeAll();
-    [DllImport("JoyShockLibrary")]
+    [DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
    public static extern bool JslStillConnected(int deviceId);

    [DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
@ -148,72 +148,72 @@ public static class JSL
    [DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
    public static extern TOUCH_STATE JslGetTouchState(int deviceId);

-    [DllImport("JoyShockLibrary")]
+    [DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
    public static extern void JslSetGyroSpace(int deviceId, int gyroSpace);

-    [DllImport("JoyShockLibrary")]
+    [DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
    public static extern float JslGetStickStep(int deviceId);
-    [DllImport("JoyShockLibrary")]
+    [DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
    public static extern float JslGetTriggerStep(int deviceId);
-    [DllImport("JoyShockLibrary")]
+    [DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
    public static extern float JslGetPollRate(int deviceId);
-    [DllImport("JoyShockLibrary")]
+    [DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
    public static extern float JslGetTimeSinceLastUpdate(int deviceId);

-    [DllImport("JoyShockLibrary")]
+    [DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
    public static extern float JslGetTouchId(int deviceId, bool secondTouch = false);
-    [DllImport("JoyShockLibrary")]
+    [DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
    public static extern float JslGetTouchDown(int deviceId, bool secondTouch = false);
-    [DllImport("JoyShockLibrary")]
+    [DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
    public static extern float JslGetTouchX(int deviceId, bool secondTouch = false);
-    [DllImport("JoyShockLibrary")]
+    [DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
    public static extern float JslGetTouchY(int deviceId, bool secondTouch = false);

-    [DllImport("JoyShockLibrary")]
+    [DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
    public static extern void JslResetContinuousCalibration(int deviceId);
-    [DllImport("JoyShockLibrary")]
+    [DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
    public static extern void JslStartContinuousCalibration(int deviceId);
-    [DllImport("JoyShockLibrary")]
+    [DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
    public static extern void JslPauseContinuousCalibration(int deviceId);
-    [DllImport("JoyShockLibrary")]
+    [DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
    public static extern void JslGetCalibrationOffset(int deviceId, ref float xOffset, ref float yOffset, ref float zOffset);
-    [DllImport("JoyShockLibrary")]
+    [DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
    public static extern void JslGetCalibrationOffset(int deviceId, float xOffset, float yOffset, float zOffset);
-    [DllImport("JoyShockLibrary")]
+    [DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
    public static extern JSL_AUTO_CALIBRATION JslGetAutoCalibrationStatus(int deviceId);

-    [DllImport("JoyShockLibrary")]
+    [DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
    public static extern void JslSetCallback(EventCallback callback);
-    [DllImport("JoyShockLibrary")]
+    [DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
    public static extern void JslSetTouchCallback(TouchCallback callback);
    // this function will get called for each device when it is newly connected
-    [DllImport("JoyShockLibrary")]
+    [DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
    public static extern void JslSetConnectCallback(ConnectionCallback callback);
    // this function will get called for each device when it is disconnected
-    [DllImport("JoyShockLibrary")]
+    [DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
    public static extern void JslSetDisconnectCallback(DeconnectionCallback callback);
    
    // super-getter for reading a whole lot of state at once
-    [DllImport("JoyShockLibrary")]
+    [DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
    public static extern JSL_SETTINGS JslGetControllerInfoAndSettings(int deviceId);
-    [DllImport("JoyShockLibrary")]
+    [DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
    public static extern int JslGetControllerType(int deviceId);
-    [DllImport("JoyShockLibrary")]
+    [DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
    public static extern int JslGetControllerSplitType(int deviceId);
-    [DllImport("JoyShockLibrary")]
+    [DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
    public static extern int JslGetControllerColour(int deviceId);
-    [DllImport("JoyShockLibrary")]
+    [DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
    public static extern int JslGetControllerButtonColour(int deviceId);
-    [DllImport("JoyShockLibrary")]
+    [DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
    public static extern int JslGetControllerLeftGripColour(int deviceId);
-    [DllImport("JoyShockLibrary")]
+    [DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
    public static extern int JslGetControllerRightGripColour(int deviceId);
-    [DllImport("JoyShockLibrary")]
+    [DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
    public static extern void JslSetLightColour(int deviceId, int colour);
-    [DllImport("JoyShockLibrary")]
+    [DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
    public static extern void JslSetRumble(int deviceId, int smallRumble, int bigRumble);
-    [DllImport("JoyShockLibrary")]
+    [DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
    public static extern void JslSetRumbleFrequency(int deviceId, float smallRumble, float bigRumble, float smallFrequency, float bigFrequency);
-    [DllImport("JoyShockLibrary")]
+    [DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
    public static extern void JslSetPlayerNumber(int deviceId, int number);
 }
--- a/Assets/Plugins/JoyShockLibrary/JoyShockLibrary.cs.meta
+++ b/Assets/Plugins/JoyShockLibrary/JoyShockLibrary.cs.meta
--- a/Assets/Plugins/JoyShockLibrary/LICENSE.md
+++ b/Assets/Plugins/JoyShockLibrary/LICENSE.md
--- a/Assets/Plugins/JoyShockLibrary/LICENSE.md.meta
+++ b/Assets/Plugins/JoyShockLibrary/LICENSE.md.meta
--- a/Assets/Plugins/JoyShockLibrary/Plugins.meta
+++ b/Assets/Plugins/JoyShockLibrary/Plugins.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 8e7e8f5a82a3a134e91c54efd2274ea9
+guid: ff63a2670a6ba934aaf5addc3520f87e
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}
--- a/Assets/Plugins/JoyShockLibrary/Plugins/JoyShockLibrary.dll
+++ b/Assets/Plugins/JoyShockLibrary/Plugins/JoyShockLibrary.dll
--- a/Assets/Plugins/JoyShockLibrary/Plugins/JoyShockLibrary.dll.meta
+++ b/Assets/Plugins/JoyShockLibrary/Plugins/JoyShockLibrary.dll.meta
@ -6,7 +6,7 @@ PluginImporter:
  iconMap: {}
  executionOrder: {}
  defineConstraints: []
-  isPreloaded: 0
+  isPreloaded: 1
  isOverridable: 0
  isExplicitlyReferenced: 0
  validateReferences: 1
@ -33,7 +33,7 @@ PluginImporter:
      settings:
        CPU: x86_64
        DefaultValueInitialized: true
-        OS: AnyOS
+        OS: Windows
  - first:
      Standalone: Linux64
    second:
--- a/Assets/Plugins/JoyShockLibrary/Plugins/JoyShockLibrary.h
+++ b/Assets/Plugins/JoyShockLibrary/Plugins/JoyShockLibrary.h
--- a/Assets/Plugins/JoyShockLibrary/Plugins/JoyShockLibrary.h.meta
+++ b/Assets/Plugins/JoyShockLibrary/Plugins/JoyShockLibrary.h.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: c603b06f7fc73b9448935991b913d915
+guid: 129c872137ca57441bd8e920a0caceef
 PluginImporter:
  externalObjects: {}
  serializedVersion: 2
@ -17,14 +17,14 @@ PluginImporter:
      enabled: 0
      settings:
        Exclude Editor: 1
-        Exclude Linux64: 0
-        Exclude OSXUniversal: 0
-        Exclude Win: 0
+        Exclude Linux64: 1
+        Exclude OSXUniversal: 1
+        Exclude Win: 1
        Exclude Win64: 1
  - first:
      Any: 
    second:
-      enabled: 1
+      enabled: 0
      settings: {}
  - first:
      Editor: Editor
@ -37,21 +37,21 @@ PluginImporter:
  - first:
      Standalone: Linux64
    second:
-      enabled: 1
+      enabled: 0
      settings:
        CPU: None
  - first:
      Standalone: OSXUniversal
    second:
-      enabled: 1
+      enabled: 0
      settings:
        CPU: None
  - first:
      Standalone: Win
    second:
-      enabled: 1
+      enabled: 0
      settings:
-        CPU: x86
+        CPU: None
  - first:
      Standalone: Win64
    second:
--- a/Assets/Plugins/JoyShockLibrary/Plugins/libJoyShockLibrary.dylib
+++ b/Assets/Plugins/JoyShockLibrary/Plugins/libJoyShockLibrary.dylib
--- a/Assets/Plugins/JoyShockLibrary/Plugins/libJoyShockLibrary.dylib.meta
+++ b/Assets/Plugins/JoyShockLibrary/Plugins/libJoyShockLibrary.dylib.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 53ce567e644ef4880b1db00e550aa797
+guid: 4808849b7792adb4b852af4fbb552d0e
 PluginImporter:
  externalObjects: {}
  serializedVersion: 2
@ -16,23 +16,15 @@ PluginImporter:
    second:
      enabled: 0
      settings:
-        Exclude Android: 0
        Exclude Editor: 0
        Exclude Linux64: 1
        Exclude OSXUniversal: 0
        Exclude Win: 1
        Exclude Win64: 1
-        Exclude iOS: 0
-  - first:
-      Android: Android
-    second:
-      enabled: 1
-      settings:
-        CPU: ARMv7
  - first:
      Any: 
    second:
-      enabled: 1
+      enabled: 0
      settings: {}
  - first:
      Editor: Editor
@ -41,13 +33,13 @@ PluginImporter:
      settings:
        CPU: AnyCPU
        DefaultValueInitialized: true
-        OS: AnyOS
+        OS: OSX
  - first:
      Standalone: Linux64
    second:
      enabled: 0
      settings:
-        CPU: None
+        CPU: AnyCPU
  - first:
      Standalone: OSXUniversal
    second:
@ -66,15 +58,6 @@ PluginImporter:
      enabled: 0
      settings:
        CPU: x86_64
-  - first:
-      iPhone: iOS
-    second:
-      enabled: 1
-      settings:
-        AddToEmbeddedBinaries: false
-        CPU: AnyCPU
-        CompileFlags: 
-        FrameworkDependencies: 
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Assets/Plugins/JoyShockLibrary/Plugins/libJoyShockLibrary.so
+++ b/Assets/Plugins/JoyShockLibrary/Plugins/libJoyShockLibrary.so
--- a/Assets/Plugins/JoyShockLibrary/Plugins/libJoyShockLibrary.so.meta
+++ b/Assets/Plugins/JoyShockLibrary/Plugins/libJoyShockLibrary.so.meta
@ -0,0 +1,63 @@
+fileFormatVersion: 2
+guid: 2fca353d6ce7fb94099ff7c8b75293a3
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 1
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      : Any
+    second:
+      enabled: 0
+      settings:
+        Exclude Editor: 0
+        Exclude Linux64: 0
+        Exclude OSXUniversal: 1
+        Exclude Win: 0
+        Exclude Win64: 0
+  - first:
+      Any: 
+    second:
+      enabled: 1
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 1
+      settings:
+        CPU: AnyCPU
+        DefaultValueInitialized: true
+        OS: Linux
+  - first:
+      Standalone: Linux64
+    second:
+      enabled: 1
+      settings:
+        CPU: AnyCPU
+  - first:
+      Standalone: OSXUniversal
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: Win
+    second:
+      enabled: 1
+      settings:
+        CPU: x86
+  - first:
+      Standalone: Win64
+    second:
+      enabled: 1
+      settings:
+        CPU: x86_64
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Plugins/JoyShockLibrary/README.md
+++ b/Assets/Plugins/JoyShockLibrary/README.md
--- a/Assets/Plugins/JoyShockLibrary/README.md.meta
+++ b/Assets/Plugins/JoyShockLibrary/README.md.meta
--- a/Assets/Plugins/Starpelly/Colors.cs
+++ b/Assets/Plugins/Starpelly/Colors.cs
@ -16,6 +16,7 @@ namespace Starpelly
        /// </summary>
        public static Color Hex2RGB(this string hex)
        {
+            if (hex is null or "") return Color.black;
            try
            {
                hex = hex.Replace("0x", "");//in case the string is formatted 0xFFFFFF
@ -25,7 +26,7 @@ namespace Starpelly
                byte g = byte.Parse(hex.Substring(2, 2), System.Globalization.NumberStyles.HexNumber);
                byte b = byte.Parse(hex.Substring(4, 2), System.Globalization.NumberStyles.HexNumber);
                //Only use alpha if the string has enough characters
-                if (hex.Length == 8)
+                if (hex.Length >= 8)
                {
                    a = byte.Parse(hex.Substring(6, 2), System.Globalization.NumberStyles.HexNumber);
                }
--- a/Assets/Plugins/Starpelly/Math.cs
+++ b/Assets/Plugins/Starpelly/Math.cs
@ -73,6 +73,14 @@ namespace Starpelly
            return val >= min && val <= max;
        }

+        /// <summary>
+        /// Returns true if a value is within a certain range.
+        /// </summary>
+        public static bool IsWithin(this Vector2 val, Vector2 min, Vector2 max)
+        {
+            return val.x.IsWithin(min.x, max.x) && val.y.IsWithin(min.y, max.y);
+        }
+
        /// <summary>
        /// Returns true if value is between two numbers.
        /// </summary>
--- a/Assets/Resources/Credits.txt
+++ b/Assets/Resources/Credits.txt
@ -1,6 +1,6 @@
 <align="center"><b>Programming</b></align>
 -<indent=5%>Megaminerzero</indent>
-<indent=5%>Starpelly <alpha=#88>(Rhythm Heaven Mania)<alpha=#FF></indent>
+-<indent=5%>Starpelly</indent>
 -<indent=5%>minenice</indent>
 -<indent=5%>huantian</indent>
 -<indent=5%>Slaith12</indent>
@ -20,7 +20,7 @@
 <align="center"><b>Artwork</b></align>
 -<indent=5%>Ko Takeuchi <alpha=#88>(Original <i>Rhythm Heaven</i> Assets)<alpha=#FF></indent>
 -<indent=5%>Nintendo <alpha=#88>(Original <i>Rhythm Heaven</i> Assets)<alpha=#FF></indent>
-<indent=5%>Starpelly <alpha=#88>(Rhythm Heaven Mania)<alpha=#FF></indent>
+-<indent=5%>Starpelly</indent>
 -<indent=5%>OctaHeart <alpha=#88>(Logo)<alpha=#FF></indent>
 -<indent=5%>ev <alpha=#88>(Editor UI)<alpha=#FF></indent>
 -<indent=5%>Seanski2 <alpha=#88>(Minigame Icons)<alpha=#FF></indent>
--- a/Assets/Resources/Fonts/aboutfriend/AboutFriendExtended
+++ b/Assets/Resources/Fonts/aboutfriend/AboutFriendExtended
--- a/Assets/Resources/Fonts/kurokane.meta
+++ b/Assets/Resources/Fonts/kurokane.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 099214b717710f8468369d6cfe2f7135
+guid: 5b6706d996c476a499aa408e80896ef8
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}
--- a/Assets/Resources/Fonts/kurokane/FOT-KurokaneStd_Megamix_Modified-EB
+++ b/Assets/Resources/Fonts/kurokane/FOT-KurokaneStd_Megamix_Modified-EB
@ -0,0 +1,295 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !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: 11500000, guid: 71c1514a6bd24e1e882cebbe1904ce04, type: 3}
+  m_Name: FOT-KurokaneStd_Megamix_Modified-EB SDF
+  m_EditorClassIdentifier: 
+  m_Version: 1.1.0
+  m_FaceInfo:
+    m_FaceIndex: 0
+    m_FamilyName: FOT-Kurokane Std
+    m_StyleName: (Megamix Modified) EB
+    m_PointSize: 90
+    m_Scale: 1
+    m_UnitsPerEM: 1000
+    m_LineHeight: 180
+    m_AscentLine: 79.200005
+    m_CapLine: 70
+    m_MeanLine: 45
+    m_Baseline: 0
+    m_DescentLine: -10.8
+    m_SuperscriptOffset: 79.200005
+    m_SuperscriptSize: 0.5
+    m_SubscriptOffset: -10.8
+    m_SubscriptSize: 0.5
+    m_UnderlineOffset: -11.25
+    m_UnderlineThickness: 4.5
+    m_StrikethroughOffset: 18
+    m_StrikethroughThickness: 4.5
+    m_TabWidth: 25
+  m_Material: {fileID: 1618155055176292627}
+  m_SourceFontFileGUID: e22d5ff7d28211244a36b00ccc4ec738
+  m_CreationSettings:
+    sourceFontFileName: 
+    sourceFontFileGUID: e22d5ff7d28211244a36b00ccc4ec738
+    faceIndex: 0
+    pointSizeSamplingMode: 0
+    pointSize: 90
+    padding: 9
+    paddingMode: 2
+    packingMode: 0
+    atlasWidth: 1024
+    atlasHeight: 1024
+    characterSetSelectionMode: 7
+    characterSequence: 
+    referencedFontAssetGUID: 
+    referencedTextAssetGUID: 
+    fontStyle: 0
+    fontStyleModifier: 0
+    renderMode: 4165
+    includeFontFeatures: 0
+  m_SourceFontFile: {fileID: 12800000, guid: e22d5ff7d28211244a36b00ccc4ec738, type: 3}
+  m_SourceFontFilePath: 
+  m_AtlasPopulationMode: 1
+  InternalDynamicOS: 0
+  m_GlyphTable: []
+  m_CharacterTable: []
+  m_AtlasTextures:
+  - {fileID: 7565207379736317986}
+  m_AtlasTextureIndex: 0
+  m_IsMultiAtlasTexturesEnabled: 1
+  m_GetFontFeatures: 1
+  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_MultipleSubstitutionRecords: []
+    m_LigatureSubstitutionRecords: []
+    m_GlyphPairAdjustmentRecords: []
+    m_MarkToBaseAdjustmentRecords: []
+    m_MarkToMarkAdjustmentRecords: []
+  m_ShouldReimportFontFeatures: 0
+  m_FallbackFontAssetTable: []
+  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}
+  fontWeights: []
+  normalStyle: 0
+  normalSpacingOffset: 0
+  boldStyle: 0.75
+  boldSpacing: 7
+  italicStyle: 35
+  tabSize: 10
+  m_fontInfo:
+    Name: 
+    PointSize: 0
+    Scale: 0
+    CharacterCount: 0
+    LineHeight: 0
+    Baseline: 0
+    Ascender: 0
+    CapHeight: 0
+    Descender: 0
+    CenterLine: 0
+    SuperscriptOffset: 0
+    SubscriptOffset: 0
+    SubSize: 0
+    Underline: 0
+    UnderlineThickness: 0
+    strikethrough: 0
+    strikethroughThickness: 0
+    TabWidth: 0
+    Padding: 0
+    AtlasWidth: 0
+    AtlasHeight: 0
+  m_glyphInfoList: []
+  m_KerningTable:
+    kerningPairs: []
+  fallbackFontAssets: []
+  atlas: {fileID: 0}
+--- !u!21 &1618155055176292627
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: FOT-KurokaneStd_Megamix_Modified-EB 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: 7565207379736317986}
+        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: 1
+    - _ScaleRatioB: 1
+    - _ScaleRatioC: 1
+    - _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!28 &7565207379736317986
+Texture2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: FOT-KurokaneStd_Megamix_Modified-EB Atlas
+  m_ImageContentsHash:
+    serializedVersion: 2
+    Hash: 00000000000000000000000000000000
+  m_ForcedFallbackFormat: 4
+  m_DownscaleFallback: 0
+  m_IsAlphaChannelOptional: 0
+  serializedVersion: 2
+  m_Width: 1
+  m_Height: 1
+  m_CompleteImageSize: 1
+  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: 1
+  _typelessdata: 00
+  m_StreamData:
+    serializedVersion: 2
+    offset: 0
+    size: 0
+    path: 
--- a/Assets/Resources/Fonts/kurokane/FOT-KurokaneStd_Megamix_Modified-EB
+++ b/Assets/Resources/Fonts/kurokane/FOT-KurokaneStd_Megamix_Modified-EB
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: f902de7d2e0240c4289d3fe9c6aa7dc2
+guid: e5f3069ff426f2546b8168857ad6e0d4
 NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 11400000
--- a/Assets/Resources/Fonts/kurokane/FOT-KurokaneStd_Megamix_Modified-EB.otf
+++ b/Assets/Resources/Fonts/kurokane/FOT-KurokaneStd_Megamix_Modified-EB.otf
--- a/Assets/Resources/Fonts/kurokane/FOT-KurokaneStd_Megamix_Modified-EB.otf.meta
+++ b/Assets/Resources/Fonts/kurokane/FOT-KurokaneStd_Megamix_Modified-EB.otf.meta
@ -0,0 +1,21 @@
+fileFormatVersion: 2
+guid: e22d5ff7d28211244a36b00ccc4ec738
+TrueTypeFontImporter:
+  externalObjects: {}
+  serializedVersion: 4
+  fontSize: 16
+  forceTextureCase: -2
+  characterSpacing: 0
+  characterPadding: 1
+  includeFontData: 1
+  fontNames:
+  - FOT-Kurokane Std
+  fallbackFontReferences: []
+  customCharacters: 
+  fontRenderingMode: 0
+  ascentCalculationMode: 1
+  useLegacyBoundsCalculation: 0
+  shouldRoundAdvanceValue: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Resources/Fonts/rodin/FOT-Rodin
+++ b/Assets/Resources/Fonts/rodin/FOT-Rodin
--- a/Assets/Resources/Fonts/rodin/FOT-Rodin
+++ b/Assets/Resources/Fonts/rodin/FOT-Rodin
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 68c22dc494e75af43ac0c8797f696a96
+guid: 9ff0c04cbd659ef43bccfe273684eadf
 NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 11400000
--- a/Assets/Resources/Fonts/rodin/FOT-Rodin
+++ b/Assets/Resources/Fonts/rodin/FOT-Rodin
@ -164,21 +164,14 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 71c1514a6bd24e1e882cebbe1904ce04, type: 3}
  m_Name: FOT-Rodin Pro B SDF Dynamic
  m_EditorClassIdentifier: 
-  hashCode: 315820101
-  material: {fileID: -1034967165085496816}
-  materialHashCode: -1530786235
  m_Version: 1.1.0
-  m_SourceFontFileGUID: 2f2282f979bbb774f812572d39e9218e
-  m_SourceFontFile_EditorRef: {fileID: 12800000, guid: 2f2282f979bbb774f812572d39e9218e, type: 3}
-  m_SourceFontFile: {fileID: 12800000, guid: 2f2282f979bbb774f812572d39e9218e, type: 3}
-  m_AtlasPopulationMode: 1
  m_FaceInfo:
    m_FaceIndex: 0
    m_FamilyName: FOT-Rodin Pro
    m_StyleName: B
    m_PointSize: 90
    m_Scale: 1
-    m_UnitsPerEM: 0
+    m_UnitsPerEM: 1000
    m_LineHeight: 180
    m_AscentLine: 79.200005
    m_CapLine: 71
@ -194,6 +187,31 @@ MonoBehaviour:
    m_StrikethroughOffset: 20
    m_StrikethroughThickness: 4.5
    m_TabWidth: 31
+  m_Material: {fileID: -1034967165085496816}
+  m_SourceFontFileGUID: 2f2282f979bbb774f812572d39e9218e
+  m_CreationSettings:
+    sourceFontFileName: 
+    sourceFontFileGUID: 2f2282f979bbb774f812572d39e9218e
+    faceIndex: 0
+    pointSizeSamplingMode: 0
+    pointSize: 90
+    padding: 9
+    paddingMode: 0
+    packingMode: 0
+    atlasWidth: 2048
+    atlasHeight: 2048
+    characterSetSelectionMode: 7
+    characterSequence: 
+    referencedFontAssetGUID: 
+    referencedTextAssetGUID: 
+    fontStyle: 0
+    fontStyleModifier: 0
+    renderMode: 4165
+    includeFontFeatures: 0
+  m_SourceFontFile: {fileID: 12800000, guid: 2f2282f979bbb774f812572d39e9218e, type: 3}
+  m_SourceFontFilePath: 
+  m_AtlasPopulationMode: 1
+  InternalDynamicOS: 0
  m_GlyphTable:
  - m_Index: 775
    m_Metrics:
@ -219,7 +237,12 @@ MonoBehaviour:
  - {fileID: -8417186236035040702}
  m_AtlasTextureIndex: 0
  m_IsMultiAtlasTexturesEnabled: 1
+  m_GetFontFeatures: 1
  m_ClearDynamicDataOnBuild: 1
+  m_AtlasWidth: 2048
+  m_AtlasHeight: 2048
+  m_AtlasPadding: 9
+  m_AtlasRenderMode: 4165
  m_UsedGlyphRects:
  - m_X: 0
    m_Y: 0
@ -234,57 +257,93 @@ MonoBehaviour:
    m_Y: 0
    m_Width: 1976
    m_Height: 2047
-  m_fontInfo:
-    Name: 
-    PointSize: 0
-    Scale: 0
-    CharacterCount: 0
-    LineHeight: 0
-    Baseline: 0
-    Ascender: 0
-    CapHeight: 0
-    Descender: 0
-    CenterLine: 0
-    SuperscriptOffset: 0
-    SubscriptOffset: 0
-    SubSize: 0
-    Underline: 0
-    UnderlineThickness: 0
-    strikethrough: 0
-    strikethroughThickness: 0
-    TabWidth: 0
-    Padding: 0
-    AtlasWidth: 0
-    AtlasHeight: 0
-  atlas: {fileID: 0}
-  m_AtlasWidth: 2048
-  m_AtlasHeight: 2048
-  m_AtlasPadding: 9
-  m_AtlasRenderMode: 4165
-  m_glyphInfoList: []
-  m_KerningTable:
-    kerningPairs: []
  m_FontFeatureTable:
-    m_GlyphPairAdjustmentRecords: []
-  fallbackFontAssets: []
+    m_MultipleSubstitutionRecords: []
+    m_LigatureSubstitutionRecords:
+    - m_ComponentGlyphIDs: 4f000000100000004e000000
+      m_LigatureGlyphID: 11868
+    - m_ComponentGlyphIDs: 4f00000054000000
+      m_LigatureGlyphID: 8029
+    m_GlyphPairAdjustmentRecords:
+    - m_FirstAdjustmentRecord:
+        m_GlyphIndex: 79
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: 0.90000004
+          m_YAdvance: 0
+      m_SecondAdjustmentRecord:
+        m_GlyphIndex: 87
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: 0
+          m_YAdvance: 0
+      m_FeatureLookupFlags: -1702022880
+    - m_FirstAdjustmentRecord:
+        m_GlyphIndex: 79
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: -0.45000002
+          m_YAdvance: 0
+      m_SecondAdjustmentRecord:
+        m_GlyphIndex: 90
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: 0
+          m_YAdvance: 0
+      m_FeatureLookupFlags: -1702022880
+    - m_FirstAdjustmentRecord:
+        m_GlyphIndex: 87
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: -4.5
+          m_YAdvance: 0
+      m_SecondAdjustmentRecord:
+        m_GlyphIndex: 13
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: 0
+          m_YAdvance: 0
+      m_FeatureLookupFlags: -1702022880
+    - m_FirstAdjustmentRecord:
+        m_GlyphIndex: 87
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: -4.5
+          m_YAdvance: 0
+      m_SecondAdjustmentRecord:
+        m_GlyphIndex: 15
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: 0
+          m_YAdvance: 0
+      m_FeatureLookupFlags: -1702022880
+    - m_FirstAdjustmentRecord:
+        m_GlyphIndex: 87
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: 3.96
+          m_YAdvance: 0
+      m_SecondAdjustmentRecord:
+        m_GlyphIndex: 122
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: 0
+          m_YAdvance: 0
+      m_FeatureLookupFlags: -1702022880
+    m_MarkToBaseAdjustmentRecords: []
+    m_MarkToMarkAdjustmentRecords: []
+  m_ShouldReimportFontFeatures: 0
  m_FallbackFontAssetTable: []
-  m_CreationSettings:
-    sourceFontFileName: 
-    sourceFontFileGUID: 2f2282f979bbb774f812572d39e9218e
-    pointSizeSamplingMode: 0
-    pointSize: 90
-    padding: 9
-    packingMode: 0
-    atlasWidth: 2048
-    atlasHeight: 2048
-    characterSetSelectionMode: 7
-    characterSequence: 
-    referencedFontAssetGUID: 
-    referencedTextAssetGUID: 
-    fontStyle: 0
-    fontStyleModifier: 0
-    renderMode: 4165
-    includeFontFeatures: 0
  m_FontWeightTable:
  - regularTypeface: {fileID: 0}
    italicTypeface: {fileID: 0}
@ -313,3 +372,30 @@ MonoBehaviour:
  boldSpacing: 7
  italicStyle: 35
  tabSize: 10
+  m_fontInfo:
+    Name: 
+    PointSize: 0
+    Scale: 0
+    CharacterCount: 0
+    LineHeight: 0
+    Baseline: 0
+    Ascender: 0
+    CapHeight: 0
+    Descender: 0
+    CenterLine: 0
+    SuperscriptOffset: 0
+    SubscriptOffset: 0
+    SubSize: 0
+    Underline: 0
+    UnderlineThickness: 0
+    strikethrough: 0
+    strikethroughThickness: 0
+    TabWidth: 0
+    Padding: 0
+    AtlasWidth: 0
+    AtlasHeight: 0
+  m_glyphInfoList: []
+  m_KerningTable:
+    kerningPairs: []
+  fallbackFontAssets: []
+  atlas: {fileID: 0}
--- a/Assets/Resources/Fonts/rodin/FOT-Rodin
+++ b/Assets/Resources/Fonts/rodin/FOT-Rodin
--- a/Assets/Resources/Fonts/rodin/FOT-Rodin
+++ b/Assets/Resources/Fonts/rodin/FOT-Rodin
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 00ba8359d55aea94799b54c203adf38f
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Resources/Fonts/rodin/FOT-Rodin
+++ b/Assets/Resources/Fonts/rodin/FOT-Rodin
@ -2,14 +2,15 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_Name: FOT-Rodin Pro DB Entity
  m_Shader: {fileID: 4800000, guid: 68e6db2ebdc24f95958faec2be5558d6, type: 3}
-  m_ShaderKeywords: 
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
  m_LightmapFlags: 4
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0
@ -39,6 +40,7 @@ Material:
        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
+    m_Ints: []
    m_Floats:
    - _Ambient: 1
    - _Bevel: 0.5
--- a/Assets/Resources/Fonts/rodin/FOT-Rodin
+++ b/Assets/Resources/Fonts/rodin/FOT-Rodin
@ -14,9 +14,9 @@ Texture2D:
  m_DownscaleFallback: 0
  m_IsAlphaChannelOptional: 0
  serializedVersion: 2
-  m_Width: 0
-  m_Height: 0
-  m_CompleteImageSize: 0
+  m_Width: 1
+  m_Height: 1
+  m_CompleteImageSize: 1
  m_MipsStripped: 0
  m_TextureFormat: 1
  m_MipCount: 1
@ -40,8 +40,8 @@ Texture2D:
  m_LightmapFormat: 0
  m_ColorSpace: 0
  m_PlatformBlob: 
-  image data: 0
-  _typelessdata: 
+  image data: 1
+  _typelessdata: 00
  m_StreamData:
    serializedVersion: 2
    offset: 0
@ -59,21 +59,14 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 71c1514a6bd24e1e882cebbe1904ce04, type: 3}
  m_Name: FOT-Rodin Pro DB SDF Dynamic
  m_EditorClassIdentifier: 
-  hashCode: -716773919
-  material: {fileID: 5296781804180034499}
-  materialHashCode: -1646043487
  m_Version: 1.1.0
-  m_SourceFontFileGUID: d9b391ecd583bd54fa458814fbcad7be
-  m_SourceFontFile_EditorRef: {fileID: 12800000, guid: d9b391ecd583bd54fa458814fbcad7be, type: 3}
-  m_SourceFontFile: {fileID: 12800000, guid: d9b391ecd583bd54fa458814fbcad7be, type: 3}
-  m_AtlasPopulationMode: 1
  m_FaceInfo:
    m_FaceIndex: 0
    m_FamilyName: FOT-Rodin Pro
    m_StyleName: DB
    m_PointSize: 90
    m_Scale: 1
-    m_UnitsPerEM: 0
+    m_UnitsPerEM: 1000
    m_LineHeight: 180
    m_AscentLine: 79.200005
    m_CapLine: 71
@ -89,59 +82,16 @@ MonoBehaviour:
    m_StrikethroughOffset: 20
    m_StrikethroughThickness: 4.5
    m_TabWidth: 31
-  m_GlyphTable: []
-  m_CharacterTable: []
-  m_AtlasTextures:
-  - {fileID: -7616882842637102995}
-  m_AtlasTextureIndex: 0
-  m_IsMultiAtlasTexturesEnabled: 1
-  m_ClearDynamicDataOnBuild: 1
-  m_UsedGlyphRects: []
-  m_FreeGlyphRects:
-  - m_X: 0
-    m_Y: 0
-    m_Width: 2047
-    m_Height: 2047
-  m_fontInfo:
-    Name: 
-    PointSize: 0
-    Scale: 0
-    CharacterCount: 0
-    LineHeight: 0
-    Baseline: 0
-    Ascender: 0
-    CapHeight: 0
-    Descender: 0
-    CenterLine: 0
-    SuperscriptOffset: 0
-    SubscriptOffset: 0
-    SubSize: 0
-    Underline: 0
-    UnderlineThickness: 0
-    strikethrough: 0
-    strikethroughThickness: 0
-    TabWidth: 0
-    Padding: 0
-    AtlasWidth: 0
-    AtlasHeight: 0
-  atlas: {fileID: 0}
-  m_AtlasWidth: 2048
-  m_AtlasHeight: 2048
-  m_AtlasPadding: 9
-  m_AtlasRenderMode: 4165
-  m_glyphInfoList: []
-  m_KerningTable:
-    kerningPairs: []
-  m_FontFeatureTable:
-    m_GlyphPairAdjustmentRecords: []
-  fallbackFontAssets: []
-  m_FallbackFontAssetTable: []
+  m_Material: {fileID: 5296781804180034499}
+  m_SourceFontFileGUID: d9b391ecd583bd54fa458814fbcad7be
  m_CreationSettings:
    sourceFontFileName: 
    sourceFontFileGUID: d9b391ecd583bd54fa458814fbcad7be
+    faceIndex: 0
    pointSizeSamplingMode: 0
    pointSize: 90
    padding: 9
+    paddingMode: 0
    packingMode: 0
    atlasWidth: 2048
    atlasHeight: 2048
@ -153,6 +103,115 @@ MonoBehaviour:
    fontStyleModifier: 0
    renderMode: 4165
    includeFontFeatures: 0
+  m_SourceFontFile: {fileID: 12800000, guid: d9b391ecd583bd54fa458814fbcad7be, type: 3}
+  m_SourceFontFilePath: 
+  m_AtlasPopulationMode: 1
+  InternalDynamicOS: 0
+  m_GlyphTable: []
+  m_CharacterTable: []
+  m_AtlasTextures:
+  - {fileID: -7616882842637102995}
+  m_AtlasTextureIndex: 0
+  m_IsMultiAtlasTexturesEnabled: 1
+  m_GetFontFeatures: 1
+  m_ClearDynamicDataOnBuild: 1
+  m_AtlasWidth: 2048
+  m_AtlasHeight: 2048
+  m_AtlasPadding: 9
+  m_AtlasRenderMode: 4165
+  m_UsedGlyphRects: []
+  m_FreeGlyphRects:
+  - m_X: 0
+    m_Y: 0
+    m_Width: 2047
+    m_Height: 2047
+  m_FontFeatureTable:
+    m_MultipleSubstitutionRecords: []
+    m_LigatureSubstitutionRecords:
+    - m_ComponentGlyphIDs: 4f000000100000004e000000
+      m_LigatureGlyphID: 11868
+    - m_ComponentGlyphIDs: 4f00000054000000
+      m_LigatureGlyphID: 8029
+    m_GlyphPairAdjustmentRecords:
+    - m_FirstAdjustmentRecord:
+        m_GlyphIndex: 79
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: 1.8000001
+          m_YAdvance: 0
+      m_SecondAdjustmentRecord:
+        m_GlyphIndex: 87
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: 0
+          m_YAdvance: 0
+      m_FeatureLookupFlags: -1702022880
+    - m_FirstAdjustmentRecord:
+        m_GlyphIndex: 79
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: 0.45000002
+          m_YAdvance: 0
+      m_SecondAdjustmentRecord:
+        m_GlyphIndex: 90
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: 0
+          m_YAdvance: 0
+      m_FeatureLookupFlags: -1702022880
+    - m_FirstAdjustmentRecord:
+        m_GlyphIndex: 87
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: -4.5
+          m_YAdvance: 0
+      m_SecondAdjustmentRecord:
+        m_GlyphIndex: 13
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: 0
+          m_YAdvance: 0
+      m_FeatureLookupFlags: -1702022880
+    - m_FirstAdjustmentRecord:
+        m_GlyphIndex: 87
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: -4.5
+          m_YAdvance: 0
+      m_SecondAdjustmentRecord:
+        m_GlyphIndex: 15
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: 0
+          m_YAdvance: 0
+      m_FeatureLookupFlags: -1702022880
+    - m_FirstAdjustmentRecord:
+        m_GlyphIndex: 87
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: 4.1400003
+          m_YAdvance: 0
+      m_SecondAdjustmentRecord:
+        m_GlyphIndex: 122
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: 0
+          m_YAdvance: 0
+      m_FeatureLookupFlags: -1702022880
+    m_MarkToBaseAdjustmentRecords: []
+    m_MarkToMarkAdjustmentRecords: []
+  m_ShouldReimportFontFeatures: 0
+  m_FallbackFontAssetTable: []
  m_FontWeightTable:
  - regularTypeface: {fileID: 0}
    italicTypeface: {fileID: 0}
@ -181,6 +240,33 @@ MonoBehaviour:
  boldSpacing: 7
  italicStyle: 35
  tabSize: 10
+  m_fontInfo:
+    Name: 
+    PointSize: 0
+    Scale: 0
+    CharacterCount: 0
+    LineHeight: 0
+    Baseline: 0
+    Ascender: 0
+    CapHeight: 0
+    Descender: 0
+    CenterLine: 0
+    SuperscriptOffset: 0
+    SubscriptOffset: 0
+    SubSize: 0
+    Underline: 0
+    UnderlineThickness: 0
+    strikethrough: 0
+    strikethroughThickness: 0
+    TabWidth: 0
+    Padding: 0
+    AtlasWidth: 0
+    AtlasHeight: 0
+  m_glyphInfoList: []
+  m_KerningTable:
+    kerningPairs: []
+  fallbackFontAssets: []
+  atlas: {fileID: 0}
 --- !u!21 &5296781804180034499
 Material:
  serializedVersion: 8
--- a/Assets/Resources/Fonts/rodin/FOT-Rodin
+++ b/Assets/Resources/Fonts/rodin/FOT-Rodin
--- a/Assets/Resources/Games/doubleDate.prefab
+++ b/Assets/Resources/Games/doubleDate.prefab
@ -1310,7 +1310,7 @@ SpriteRenderer:
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
  m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: -1
  m_Sprite: {fileID: 471275613544938806, guid: 1f442840d85d9e944819c7e21ab38483, type: 3}
  m_Color: {r: 1, g: 1, b: 1, a: 0.41960785}
  m_FlipX: 0
@ -12337,7 +12337,7 @@ ParticleSystemRenderer:
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
  m_SortingLayer: 0
-  m_SortingOrder: 4
+  m_SortingOrder: 0
  m_RenderMode: 0
  m_MeshDistribution: 0
  m_SortMode: 0
@ -14435,7 +14435,6 @@ MonoBehaviour:
  SoundSequences: []
  EligibleHits: []
  scheduledInputs: []
-  firstEnable: 0
  soccer: {fileID: 6033749656558512970, guid: 3f09924efb4db354aa2899ebbebfbcf5, type: 3}
  basket: {fileID: 5811262171106880114, guid: 5f00b13cb8a13dc49b2fc7d78e9c8a5d, type: 3}
  football: {fileID: 8037004963704552774, guid: 8945cdc8b29cf4640b7f7d1c678be884, type: 3}
@ -14457,7 +14456,7 @@ MonoBehaviour:
    anchor: {fileID: 0}
    positions:
    - tag: 
-      pos: {x: -12.2, y: -2.75, z: 0}
+      pos: {x: -12.5, y: -2.75, z: 0}
      target: {fileID: 0}
      height: 4.4
      duration: 1
@ -14466,7 +14465,7 @@ MonoBehaviour:
      - key: rot
        value: 135
    - tag: 
-      pos: {x: -6.7, y: -2.75, z: 0}
+      pos: {x: -7.75, y: -2.75, z: 0}
      target: {fileID: 0}
      height: 2.75
      duration: 1.2
@ -14475,19 +14474,19 @@ MonoBehaviour:
      - key: rot
        value: 202.5
    - tag: 
-      pos: {x: -1.2, y: -2.75, z: 0}
+      pos: {x: -2.15, y: -2.75, z: 0}
      target: {fileID: 0}
      height: 2.5
-      duration: 1.2
+      duration: 1.25
      useLastRealPos: 0
      values:
      - key: rot
        value: 151.875
    - tag: 
-      pos: {x: 4.3, y: -2.75, z: 0}
+      pos: {x: 3.5, y: -2.75, z: 0}
      target: {fileID: 0}
      height: 1.8
-      duration: 1.5
+      duration: 1.6
      useLastRealPos: 0
      values:
      - key: rot
@ -14582,7 +14581,7 @@ MonoBehaviour:
    anchor: {fileID: 0}
    positions:
    - tag: 
-      pos: {x: -12, y: -2.75, z: 0}
+      pos: {x: -12.25, y: -2.75, z: 0}
      target: {fileID: 0}
      height: 4.4
      duration: 1
--- a/Assets/Resources/Games/fanClub.prefab
+++ b/Assets/Resources/Games/fanClub.prefab
@ -27064,7 +27064,7 @@ MonoBehaviour:
        pitch: 1
        volume: 1
        looping: 0
-        offset: 0.055
+        offset: 0.02
        parameters: []
  - name: arisa_iina_fast
    sequence:
@ -27083,7 +27083,7 @@ MonoBehaviour:
        pitch: 1
        volume: 1
        looping: 0
-        offset: 0.055
+        offset: 0.025
        parameters: []
  - name: crowd_big_ready
    sequence:
@ -27165,7 +27165,6 @@ MonoBehaviour:
        parameters: []
  EligibleHits: []
  scheduledInputs: []
-  firstEnable: 0
  StageAnimator: {fileID: 22498285944424125}
  Arisa: {fileID: 3728697055337045071}
  ArisaRootMotion: {fileID: 2223479141072930853}
--- a/Assets/Resources/Games/firstContact.prefab
+++ b/Assets/Resources/Games/firstContact.prefab
@ -1055,15 +1055,17 @@ MonoBehaviour:
  m_lineSpacingMax: 0
  m_paragraphSpacing: 0
  m_charWidthMaxAdj: 50
-  m_enableWordWrapping: 0
+  m_TextWrappingMode: 0
  m_wordWrappingRatios: 0.4
  m_overflowMode: 0
  m_linkedTextComponent: {fileID: 0}
  parentLinkedComponent: {fileID: 0}
  m_enableKerning: 1
+  m_ActiveFontFeatures: 6e72656b
  m_enableExtraPadding: 0
  checkPaddingRequired: 0
  m_isRichText: 1
+  m_EmojiFallbackSupport: 1
  m_parseCtrlCharacters: 1
  m_isOrthographic: 1
  m_isCullingEnabled: 0
@ -1713,15 +1715,17 @@ MonoBehaviour:
  m_lineSpacingMax: 0
  m_paragraphSpacing: 0
  m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
+  m_TextWrappingMode: 1
  m_wordWrappingRatios: 0.4
  m_overflowMode: 3
  m_linkedTextComponent: {fileID: 0}
  parentLinkedComponent: {fileID: 0}
  m_enableKerning: 1
+  m_ActiveFontFeatures: 00000000
  m_enableExtraPadding: 0
  checkPaddingRequired: 0
  m_isRichText: 1
+  m_EmojiFallbackSupport: 1
  m_parseCtrlCharacters: 1
  m_isOrthographic: 1
  m_isCullingEnabled: 0
@ -2602,15 +2606,17 @@ MonoBehaviour:
  m_lineSpacingMax: 0
  m_paragraphSpacing: 0
  m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
+  m_TextWrappingMode: 1
  m_wordWrappingRatios: 0.4
  m_overflowMode: 3
  m_linkedTextComponent: {fileID: 0}
  parentLinkedComponent: {fileID: 0}
  m_enableKerning: 1
+  m_ActiveFontFeatures: 6e72656b
  m_enableExtraPadding: 0
  checkPaddingRequired: 0
  m_isRichText: 1
+  m_EmojiFallbackSupport: 1
  m_parseCtrlCharacters: 1
  m_isOrthographic: 1
  m_isCullingEnabled: 0
@ -4187,10 +4193,6 @@ MonoBehaviour:
  SoundSequences: []
  EligibleHits: []
  scheduledInputs: []
-  firstEnable: 0
-  alienSpeakCount: 0
-  translatorSpeakCount: 0
-  hasMissed: 0
  alien: {fileID: 1725356918350344904}
  translator: {fileID: 2669316826032871973}
  missionControl: {fileID: 1703073459706337243}
--- a/Assets/Resources/Games/forkLifter.prefab
+++ b/Assets/Resources/Games/forkLifter.prefab
@ -1119,7 +1119,6 @@ MonoBehaviour:
  SoundSequences: []
  EligibleHits: []
  scheduledInputs: []
-  firstEnable: 0
  ForkLifterHand: {fileID: 5813499711174113249}
  handAnim: {fileID: 5813499711174113250}
  flickedObject: {fileID: 5813499710694194086}
--- a/Assets/Resources/Games/karateman.prefab
+++ b/Assets/Resources/Games/karateman.prefab
--- a/Assets/Resources/Models/Games/RhythmRally/Paddler.controller
+++ b/Assets/Resources/Models/Games/RhythmRally/Paddler.controller
@ -22,6 +22,33 @@ AnimatorStateTransition:
  m_InterruptionSource: 0
  m_OrderedInterruption: 1
  m_CanTransitionToSelf: 1
+--- !u!1102 &-7660928310954623538
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: UnReady1
+  m_Speed: -4
+  m_CycleOffset: 1
+  m_Transitions:
+  - {fileID: 5805743421897320861}
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: -4791534359250169297, guid: cebeb8610d89fb34688750080a285ddb, type: 3}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
 --- !u!1102 &-3986917046676279002
 AnimatorState:
  serializedVersion: 6
@ -59,16 +86,16 @@ AnimatorStateMachine:
  m_ChildStates:
  - serializedVersion: 1
    m_State: {fileID: 6416047872712211942}
-    m_Position: {x: 240, y: 260, z: 0}
+    m_Position: {x: 200, y: 240, z: 0}
  - serializedVersion: 1
    m_State: {fileID: 4424825005415695879}
    m_Position: {x: 320, y: 50, z: 0}
  - serializedVersion: 1
    m_State: {fileID: -3986917046676279002}
-    m_Position: {x: 460, y: 190, z: 0}
+    m_Position: {x: 200, y: 290, z: 0}
  - serializedVersion: 1
    m_State: {fileID: 124654373728809099}
-    m_Position: {x: 510, y: 260, z: 0}
+    m_Position: {x: 420, y: 190, z: 0}
  - serializedVersion: 1
    m_State: {fileID: 7339080780637248285}
    m_Position: {x: 550, y: 330, z: 0}
@ -78,6 +105,9 @@ AnimatorStateMachine:
  - serializedVersion: 1
    m_State: {fileID: 7618035723044257044}
    m_Position: {x: 270, y: 120, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: -7660928310954623538}
+    m_Position: {x: 630, y: 190, z: 0}
  m_ChildStateMachines: []
  m_AnyStateTransitions: []
  m_EntryTransitions: []
@ -162,6 +192,28 @@ AnimatorState:
  m_MirrorParameter: 
  m_CycleOffsetParameter: 
  m_TimeParameter: 
+--- !u!1101 &5805743421897320861
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions: []
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 7618035723044257044}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0
+  m_TransitionOffset: 0
+  m_ExitTime: 0
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1102 &6416047872712211942
 AnimatorState:
  serializedVersion: 6
--- a/Assets/Resources/Prefabs/Common/RightClickDropdown.prefab
+++ b/Assets/Resources/Prefabs/Common/RightClickDropdown.prefab
@ -0,0 +1,440 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1069446853043438909
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8384641343036272350}
+  - component: {fileID: 5892063193686803625}
+  m_Layer: 5
+  m_Name: RightClickDropdown
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8384641343036272350
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1069446853043438909}
+  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: 957154786397146521}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 160, y: 12}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5892063193686803625
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1069446853043438909}
+  m_CullTransparentMesh: 1
+--- !u!1 &2304285986814012682
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1187626560509100645}
+  - component: {fileID: 5548373997629452713}
+  - component: {fileID: 6009602095063593120}
+  m_Layer: 5
+  m_Name: Text (TMP)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1187626560509100645
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2304285986814012682}
+  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: 6907741928570761706}
+  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, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5548373997629452713
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2304285986814012682}
+  m_CullTransparentMesh: 1
+--- !u!114 &6009602095063593120
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2304285986814012682}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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: Option
+  m_isRightToLeft: 0
+  m_fontAsset: {fileID: 11400000, guid: 00ba8359d55aea94799b54c203adf38f, type: 2}
+  m_sharedMaterial: {fileID: -1034967165085496816, guid: 00ba8359d55aea94799b54c203adf38f, type: 2}
+  m_fontSharedMaterials: []
+  m_fontMaterial: {fileID: 0}
+  m_fontMaterials: []
+  m_fontColor32:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontColor: {r: 1, g: 1, b: 1, 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: 24
+  m_fontSizeBase: 24
+  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: 0
+  m_ActiveFontFeatures: 6e72656b
+  m_enableExtraPadding: 0
+  checkPaddingRequired: 0
+  m_isRichText: 1
+  m_EmojiFallbackSupport: 1
+  m_parseCtrlCharacters: 1
+  m_isOrthographic: 1
+  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
+  m_hasFontAssetChanged: 0
+  m_baseMaterial: {fileID: 0}
+  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!1 &6068898642408905715
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 957154786397146521}
+  - component: {fileID: 7068493347926292236}
+  - component: {fileID: 1343412359289404708}
+  - component: {fileID: 7980774898327048575}
+  - component: {fileID: 6566328886501881416}
+  m_Layer: 5
+  m_Name: RightClickDropdown
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &957154786397146521
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6068898642408905715}
+  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: 6907741928570761706}
+  m_Father: {fileID: 8384641343036272350}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 160, y: -60}
+  m_SizeDelta: {x: 160, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7068493347926292236
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6068898642408905715}
+  m_CullTransparentMesh: 1
+--- !u!114 &1343412359289404708
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6068898642408905715}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0, b: 0, 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_Sprite: {fileID: 1401309272, guid: bd48ded17f064414eb670529c2375358, type: 3}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &7980774898327048575
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6068898642408905715}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 70
+  m_ChildAlignment: 0
+  m_Spacing: 0
+  m_ChildForceExpandWidth: 0
+  m_ChildForceExpandHeight: 0
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
+--- !u!114 &6566328886501881416
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6068898642408905715}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 0
+  m_VerticalFit: 2
+--- !u!1 &8337216749316256214
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6907741928570761706}
+  - component: {fileID: 154936598456533904}
+  - component: {fileID: 5155450919514646833}
+  - component: {fileID: 6604080304440396267}
+  - component: {fileID: 8296619418044947051}
+  m_Layer: 5
+  m_Name: Option
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &6907741928570761706
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8337216749316256214}
+  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: 1187626560509100645}
+  m_Father: {fileID: 957154786397146521}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 80, y: -17.5}
+  m_SizeDelta: {x: 160, y: 35}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &154936598456533904
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8337216749316256214}
+  m_CullTransparentMesh: 1
+--- !u!114 &5155450919514646833
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8337216749316256214}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &6604080304440396267
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8337216749316256214}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.4811321, g: 0.4811321, b: 0.4811321, a: 1}
+    m_PressedColor: {r: 0.2264151, g: 0.2264151, b: 0.2264151, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 5155450919514646833}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!114 &8296619418044947051
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8337216749316256214}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Delegates: []
--- a/Assets/Resources/Prefabs/Common/RightClickDropdown.prefab.meta
+++ b/Assets/Resources/Prefabs/Common/RightClickDropdown.prefab.meta
@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: 47521c369c3ab7849aeb7e479bad21ea
-DefaultImporter:
+guid: 56a45ac5cd0da2a4ab398d1a63e18d9f
+PrefabImporter:
  externalObjects: {}
  userData: 
  assetBundleName: 
--- a/Assets/Resources/Prefabs/Common/SettingsMenu.prefab
+++ b/Assets/Resources/Prefabs/Common/SettingsMenu.prefab
@ -59,7 +59,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  m_Material: {fileID: 0}
-  m_Color: {r: 0.20392157, g: 0.20392157, b: 0.20392157, a: 1}
+  m_Color: {r: 0.6509804, g: 0.6509804, b: 0.6509804, a: 1}
  m_RaycastTarget: 1
  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
  m_Maskable: 1
@ -185,15 +185,17 @@ MonoBehaviour:
  m_lineSpacingMax: 0
  m_paragraphSpacing: 0
  m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
+  m_TextWrappingMode: 1
  m_wordWrappingRatios: 0.4
  m_overflowMode: 0
  m_linkedTextComponent: {fileID: 0}
  parentLinkedComponent: {fileID: 0}
  m_enableKerning: 1
+  m_ActiveFontFeatures: 6e72656b
  m_enableExtraPadding: 0
  checkPaddingRequired: 0
  m_isRichText: 1
+  m_EmojiFallbackSupport: 1
  m_parseCtrlCharacters: 1
  m_isOrthographic: 1
  m_isCullingEnabled: 0
@ -323,7 +325,7 @@ RectTransform:
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 50, y: 50}
+  m_SizeDelta: {x: 32, y: 32}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8995444694228702769
 CanvasRenderer:
@ -474,10 +476,10 @@ RectTransform:
  m_Father: {fileID: 8995444695563632161}
  m_RootOrder: 3
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 1}
-  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
  m_AnchoredPosition: {x: 0, y: -124.099976}
-  m_SizeDelta: {x: 1202, y: 27.28003}
+  m_SizeDelta: {x: -64, y: 27.28003}
  m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &8995444694302297417
 CanvasRenderer:
@ -494,7 +496,7 @@ MonoBehaviour:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 8995444694302297421}
-  m_Enabled: 1
+  m_Enabled: 0
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
  m_Name: 
@ -535,7 +537,7 @@ MonoBehaviour:
    m_Top: 0
    m_Bottom: 0
  m_ChildAlignment: 0
-  m_Spacing: 0
+  m_Spacing: 4
  m_ChildForceExpandWidth: 1
  m_ChildForceExpandHeight: 0
  m_ChildControlWidth: 1
@ -668,15 +670,17 @@ MonoBehaviour:
  m_lineSpacingMax: 0
  m_paragraphSpacing: 0
  m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
+  m_TextWrappingMode: 1
  m_wordWrappingRatios: 0.4
  m_overflowMode: 0
  m_linkedTextComponent: {fileID: 0}
  parentLinkedComponent: {fileID: 0}
  m_enableKerning: 1
+  m_ActiveFontFeatures: 6e72656b
  m_enableExtraPadding: 0
  checkPaddingRequired: 0
  m_isRichText: 1
+  m_EmojiFallbackSupport: 1
  m_parseCtrlCharacters: 1
  m_isOrthographic: 1
  m_isCullingEnabled: 0
@ -824,7 +828,7 @@ RectTransform:
  m_AnchorMin: {x: 1, y: 1}
  m_AnchorMax: {x: 1, y: 1}
  m_AnchoredPosition: {x: -38, y: -38}
-  m_SizeDelta: {x: 52, y: 52}
+  m_SizeDelta: {x: 42, y: 42}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8995444695466722202
 CanvasRenderer:
@ -854,7 +858,7 @@ MonoBehaviour:
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_Sprite: {fileID: 0}
+  m_Sprite: {fileID: 21300000, guid: 77703dfffd29ca6439338d6adfc62c9b, type: 3}
  m_Type: 1
  m_PreserveAspect: 0
  m_FillCenter: 1
--- a/Assets/Resources/Prefabs/Editor/RemixProperties/RemixInfo.prefab
+++ b/Assets/Resources/Prefabs/Editor/RemixProperties/RemixInfo.prefab
@ -550,15 +550,17 @@ MonoBehaviour:
  m_lineSpacingMax: 0
  m_paragraphSpacing: 0
  m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
+  m_TextWrappingMode: 1
  m_wordWrappingRatios: 0.4
  m_overflowMode: 0
  m_linkedTextComponent: {fileID: 0}
  parentLinkedComponent: {fileID: 0}
  m_enableKerning: 1
+  m_ActiveFontFeatures: 00000000
  m_enableExtraPadding: 0
  checkPaddingRequired: 0
  m_isRichText: 1
+  m_EmojiFallbackSupport: 1
  m_parseCtrlCharacters: 1
  m_isOrthographic: 1
  m_isCullingEnabled: 0
@ -771,6 +773,9 @@ MonoBehaviour:
  - tag: remixdesc
    label: Description
    isReadOnly: 0
+  - tag: playstyle
+    label: Recommended Control Style
+    isReadOnly: 0
  - tag: remixtags
    label: Tags
    isReadOnly: 0
--- a/Assets/Resources/Prefabs/Editor/SettingsMenu/ControllerSetup.prefab
+++ b/Assets/Resources/Prefabs/Editor/SettingsMenu/ControllerSetup.prefab
--- a/Assets/Resources/Prefabs/Editor/SettingsMenu/CreditsLegal.prefab
+++ b/Assets/Resources/Prefabs/Editor/SettingsMenu/CreditsLegal.prefab
@ -27,6 +27,7 @@ RectTransform:
  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: 3276216358884288554}
  m_Father: {fileID: 3276216360127051165}
@ -73,6 +74,7 @@ RectTransform:
  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: 3276216360411725377}
  m_Father: {fileID: 3276216359486296926}
@ -150,6 +152,7 @@ RectTransform:
  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: 3276216359673638260}
  m_Father: {fileID: 3276216358621914657}
@ -283,6 +286,7 @@ RectTransform:
  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: 3276216359294279433}
  m_Father: {fileID: 3276216359814484404}
@ -416,6 +420,7 @@ RectTransform:
  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: 3276216360127051165}
  m_Father: {fileID: 3276216359861115896}
@ -507,14 +512,15 @@ RectTransform:
  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: 3276216360127051165}
  m_RootOrder: 1
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 705.5, y: 0}
-  m_SizeDelta: {x: 1371, y: 0}
+  m_AnchoredPosition: {x: 627.5, y: 0}
+  m_SizeDelta: {x: 1215, y: 0}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3276216359264292463
 CanvasRenderer:
@ -587,15 +593,17 @@ MonoBehaviour:
  m_lineSpacingMax: 0
  m_paragraphSpacing: 0
  m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
+  m_TextWrappingMode: 1
  m_wordWrappingRatios: 0.4
  m_overflowMode: 0
  m_linkedTextComponent: {fileID: 0}
  parentLinkedComponent: {fileID: 0}
  m_enableKerning: 1
+  m_ActiveFontFeatures: 6e72656b
  m_enableExtraPadding: 0
  checkPaddingRequired: 0
  m_isRichText: 1
+  m_EmojiFallbackSupport: 1
  m_parseCtrlCharacters: 1
  m_isOrthographic: 1
  m_isCullingEnabled: 0
@ -675,6 +683,7 @@ RectTransform:
  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: 3276216358902658882}
  m_RootOrder: 0
@ -750,6 +759,7 @@ RectTransform:
  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: 3276216359692268649}
  m_RootOrder: 0
@ -826,6 +836,7 @@ RectTransform:
  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: 3276216359861115896}
  - {fileID: 3276216358758736494}
@ -918,6 +929,7 @@ RectTransform:
  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: 3276216358884288554}
  m_RootOrder: 0
@ -991,6 +1003,7 @@ RectTransform:
  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: 3276216359458918366}
  m_Father: {fileID: 3276216360247263705}
@ -1028,6 +1041,7 @@ RectTransform:
  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: 3276216358902658882}
  m_Father: {fileID: 3276216360127051165}
@ -1075,6 +1089,7 @@ RectTransform:
  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: 3276216359023061022}
  - {fileID: 3276216360247263705}
@ -1141,8 +1156,8 @@ MonoBehaviour:
  m_Vertical: 1
  m_MovementType: 1
  m_Elasticity: 0.1
-  m_Inertia: 0
-  m_DecelerationRate: 0.135
+  m_Inertia: 1
+  m_DecelerationRate: 0.01
  m_ScrollSensitivity: 35
  m_Viewport: {fileID: 3276216359023061022}
  m_HorizontalScrollbar: {fileID: 0}
@ -1182,6 +1197,7 @@ RectTransform:
  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: 3276216358621914657}
  - {fileID: 3276216359264292461}
@ -1263,6 +1279,7 @@ RectTransform:
  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: 3276216359692268649}
  m_Father: {fileID: 3276216359861115896}
@ -1388,6 +1405,7 @@ RectTransform:
  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: 3276216358758736494}
  m_RootOrder: 0
@ -1468,15 +1486,17 @@ MonoBehaviour:
  m_lineSpacingMax: 0
  m_paragraphSpacing: 0
  m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
+  m_TextWrappingMode: 1
  m_wordWrappingRatios: 0.4
  m_overflowMode: 0
  m_linkedTextComponent: {fileID: 0}
  parentLinkedComponent: {fileID: 0}
  m_enableKerning: 1
+  m_ActiveFontFeatures: 6e72656b
  m_enableExtraPadding: 0
  checkPaddingRequired: 0
  m_isRichText: 1
+  m_EmojiFallbackSupport: 1
  m_parseCtrlCharacters: 1
  m_isOrthographic: 1
  m_isCullingEnabled: 0
--- a/Assets/Resources/Prefabs/Editor/SettingsMenu/EditorSettings.prefab
+++ b/Assets/Resources/Prefabs/Editor/SettingsMenu/EditorSettings.prefab
--- a/Assets/Resources/Prefabs/Editor/SettingsMenu/GameSettings.prefab
+++ b/Assets/Resources/Prefabs/Editor/SettingsMenu/GameSettings.prefab
@ -349,15 +349,17 @@ MonoBehaviour:
  m_lineSpacingMax: 0
  m_paragraphSpacing: 0
  m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
+  m_TextWrappingMode: 1
  m_wordWrappingRatios: 0.4
  m_overflowMode: 0
  m_linkedTextComponent: {fileID: 0}
  parentLinkedComponent: {fileID: 0}
  m_enableKerning: 1
+  m_ActiveFontFeatures: 6e72656b
  m_enableExtraPadding: 0
  checkPaddingRequired: 0
  m_isRichText: 1
+  m_EmojiFallbackSupport: 1
  m_parseCtrlCharacters: 1
  m_isOrthographic: 1
  m_isCullingEnabled: 0
@ -550,15 +552,17 @@ MonoBehaviour:
  m_lineSpacingMax: 0
  m_paragraphSpacing: 0
  m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 0
+  m_TextWrappingMode: 3
  m_wordWrappingRatios: 0.4
  m_overflowMode: 0
  m_linkedTextComponent: {fileID: 0}
  parentLinkedComponent: {fileID: 0}
  m_enableKerning: 1
+  m_ActiveFontFeatures: 6e72656b
  m_enableExtraPadding: 1
  checkPaddingRequired: 0
  m_isRichText: 1
+  m_EmojiFallbackSupport: 1
  m_parseCtrlCharacters: 1
  m_isOrthographic: 1
  m_isCullingEnabled: 0
@ -685,15 +689,17 @@ MonoBehaviour:
  m_lineSpacingMax: 0
  m_paragraphSpacing: 0
  m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
+  m_TextWrappingMode: 1
  m_wordWrappingRatios: 0.4
  m_overflowMode: 0
  m_linkedTextComponent: {fileID: 0}
  parentLinkedComponent: {fileID: 0}
  m_enableKerning: 1
+  m_ActiveFontFeatures: 6e72656b
  m_enableExtraPadding: 0
  checkPaddingRequired: 0
  m_isRichText: 1
+  m_EmojiFallbackSupport: 1
  m_parseCtrlCharacters: 1
  m_isOrthographic: 1
  m_isCullingEnabled: 0
@ -822,15 +828,17 @@ MonoBehaviour:
  m_lineSpacingMax: 0
  m_paragraphSpacing: 0
  m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
+  m_TextWrappingMode: 1
  m_wordWrappingRatios: 0.4
  m_overflowMode: 0
  m_linkedTextComponent: {fileID: 0}
  parentLinkedComponent: {fileID: 0}
  m_enableKerning: 1
+  m_ActiveFontFeatures: 00000000
  m_enableExtraPadding: 0
  checkPaddingRequired: 0
  m_isRichText: 1
+  m_EmojiFallbackSupport: 1
  m_parseCtrlCharacters: 1
  m_isOrthographic: 1
  m_isCullingEnabled: 0
@ -1986,15 +1994,17 @@ MonoBehaviour:
  m_lineSpacingMax: 0
  m_paragraphSpacing: 0
  m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
+  m_TextWrappingMode: 1
  m_wordWrappingRatios: 0.4
  m_overflowMode: 0
  m_linkedTextComponent: {fileID: 0}
  parentLinkedComponent: {fileID: 0}
  m_enableKerning: 1
+  m_ActiveFontFeatures: 6e72656b
  m_enableExtraPadding: 0
  checkPaddingRequired: 0
  m_isRichText: 1
+  m_EmojiFallbackSupport: 1
  m_parseCtrlCharacters: 1
  m_isOrthographic: 1
  m_isCullingEnabled: 0
@ -3061,15 +3071,17 @@ MonoBehaviour:
  m_lineSpacingMax: 0
  m_paragraphSpacing: 0
  m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 0
+  m_TextWrappingMode: 3
  m_wordWrappingRatios: 0.4
  m_overflowMode: 0
  m_linkedTextComponent: {fileID: 0}
  parentLinkedComponent: {fileID: 0}
  m_enableKerning: 1
+  m_ActiveFontFeatures: 6e72656b
  m_enableExtraPadding: 1
  checkPaddingRequired: 0
  m_isRichText: 1
+  m_EmojiFallbackSupport: 1
  m_parseCtrlCharacters: 1
  m_isOrthographic: 1
  m_isCullingEnabled: 0
@ -3560,15 +3572,17 @@ MonoBehaviour:
  m_lineSpacingMax: 0
  m_paragraphSpacing: 0
  m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
+  m_TextWrappingMode: 1
  m_wordWrappingRatios: 0.4
  m_overflowMode: 0
  m_linkedTextComponent: {fileID: 0}
  parentLinkedComponent: {fileID: 0}
  m_enableKerning: 1
+  m_ActiveFontFeatures: 6e72656b
  m_enableExtraPadding: 0
  checkPaddingRequired: 0
  m_isRichText: 1
+  m_EmojiFallbackSupport: 1
  m_parseCtrlCharacters: 1
  m_isOrthographic: 1
  m_isCullingEnabled: 0
@ -3922,10 +3936,13 @@ MonoBehaviour:
  m_GlobalFontAsset: {fileID: 11400000, guid: c2df694f599b22b42817910ff570a9df, type: 2}
  m_OnFocusSelectAll: 1
  m_ResetOnDeActivation: 1
+  m_KeepTextSelectionVisible: 0
  m_RestoreOriginalTextOnEscape: 1
  m_isRichTextEditingAllowed: 0
  m_LineLimit: 0
+  isAlert: 0
  m_InputValidator: {fileID: 0}
+  m_ShouldActivateOnSelect: 1
 --- !u!1 &2413243360073305582
 GameObject:
  m_ObjectHideFlags: 0
@ -4345,10 +4362,13 @@ MonoBehaviour:
  m_GlobalFontAsset: {fileID: 11400000, guid: c2df694f599b22b42817910ff570a9df, type: 2}
  m_OnFocusSelectAll: 1
  m_ResetOnDeActivation: 1
+  m_KeepTextSelectionVisible: 0
  m_RestoreOriginalTextOnEscape: 1
  m_isRichTextEditingAllowed: 0
  m_LineLimit: 0
+  isAlert: 0
  m_InputValidator: {fileID: 0}
+  m_ShouldActivateOnSelect: 1
 --- !u!1 &2663069741382970651
 GameObject:
  m_ObjectHideFlags: 0
@ -4533,10 +4553,13 @@ MonoBehaviour:
  m_GlobalFontAsset: {fileID: 11400000, guid: c2df694f599b22b42817910ff570a9df, type: 2}
  m_OnFocusSelectAll: 1
  m_ResetOnDeActivation: 1
+  m_KeepTextSelectionVisible: 0
  m_RestoreOriginalTextOnEscape: 1
  m_isRichTextEditingAllowed: 0
  m_LineLimit: 0
+  isAlert: 0
  m_InputValidator: {fileID: 0}
+  m_ShouldActivateOnSelect: 1
 --- !u!1 &2663113318115009593
 GameObject:
  m_ObjectHideFlags: 0
@ -5274,15 +5297,17 @@ MonoBehaviour:
  m_lineSpacingMax: 0
  m_paragraphSpacing: 0
  m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
+  m_TextWrappingMode: 1
  m_wordWrappingRatios: 0.4
  m_overflowMode: 0
  m_linkedTextComponent: {fileID: 0}
  parentLinkedComponent: {fileID: 0}
  m_enableKerning: 1
+  m_ActiveFontFeatures: 6e72656b
  m_enableExtraPadding: 0
  checkPaddingRequired: 0
  m_isRichText: 1
+  m_EmojiFallbackSupport: 1
  m_parseCtrlCharacters: 1
  m_isOrthographic: 1
  m_isCullingEnabled: 0
@ -5690,15 +5715,17 @@ MonoBehaviour:
  m_lineSpacingMax: 0
  m_paragraphSpacing: 0
  m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
+  m_TextWrappingMode: 1
  m_wordWrappingRatios: 0.4
  m_overflowMode: 0
  m_linkedTextComponent: {fileID: 0}
  parentLinkedComponent: {fileID: 0}
  m_enableKerning: 1
+  m_ActiveFontFeatures: 6e72656b
  m_enableExtraPadding: 0
  checkPaddingRequired: 0
  m_isRichText: 1
+  m_EmojiFallbackSupport: 1
  m_parseCtrlCharacters: 1
  m_isOrthographic: 1
  m_isCullingEnabled: 0
@ -5900,10 +5927,13 @@ MonoBehaviour:
  m_GlobalFontAsset: {fileID: 11400000, guid: c2df694f599b22b42817910ff570a9df, type: 2}
  m_OnFocusSelectAll: 1
  m_ResetOnDeActivation: 1
+  m_KeepTextSelectionVisible: 0
  m_RestoreOriginalTextOnEscape: 1
  m_isRichTextEditingAllowed: 0
  m_LineLimit: 0
+  isAlert: 0
  m_InputValidator: {fileID: 0}
+  m_ShouldActivateOnSelect: 1
 --- !u!1 &3551385317041670879
 GameObject:
  m_ObjectHideFlags: 0
@ -6093,15 +6123,17 @@ MonoBehaviour:
  m_lineSpacingMax: 0
  m_paragraphSpacing: 0
  m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
+  m_TextWrappingMode: 1
  m_wordWrappingRatios: 0.4
  m_overflowMode: 0
  m_linkedTextComponent: {fileID: 0}
  parentLinkedComponent: {fileID: 0}
  m_enableKerning: 1
+  m_ActiveFontFeatures: 6e72656b
  m_enableExtraPadding: 0
  checkPaddingRequired: 0
  m_isRichText: 1
+  m_EmojiFallbackSupport: 1
  m_parseCtrlCharacters: 1
  m_isOrthographic: 1
  m_isCullingEnabled: 0
@ -6228,15 +6260,17 @@ MonoBehaviour:
  m_lineSpacingMax: 0
  m_paragraphSpacing: 0
  m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 0
+  m_TextWrappingMode: 3
  m_wordWrappingRatios: 0.4
  m_overflowMode: 0
  m_linkedTextComponent: {fileID: 0}
  parentLinkedComponent: {fileID: 0}
  m_enableKerning: 1
+  m_ActiveFontFeatures: 00000000
  m_enableExtraPadding: 1
  checkPaddingRequired: 0
  m_isRichText: 1
+  m_EmojiFallbackSupport: 1
  m_parseCtrlCharacters: 1
  m_isOrthographic: 1
  m_isCullingEnabled: 0
@ -6517,15 +6551,17 @@ MonoBehaviour:
  m_lineSpacingMax: 0
  m_paragraphSpacing: 0
  m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
+  m_TextWrappingMode: 1
  m_wordWrappingRatios: 0.4
  m_overflowMode: 0
  m_linkedTextComponent: {fileID: 0}
  parentLinkedComponent: {fileID: 0}
  m_enableKerning: 1
+  m_ActiveFontFeatures: 00000000
  m_enableExtraPadding: 0
  checkPaddingRequired: 0
  m_isRichText: 1
+  m_EmojiFallbackSupport: 1
  m_parseCtrlCharacters: 1
  m_isOrthographic: 1
  m_isCullingEnabled: 0
@ -6692,15 +6728,17 @@ MonoBehaviour:
  m_lineSpacingMax: 0
  m_paragraphSpacing: 0
  m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
+  m_TextWrappingMode: 1
  m_wordWrappingRatios: 0.4
  m_overflowMode: 0
  m_linkedTextComponent: {fileID: 0}
  parentLinkedComponent: {fileID: 0}
  m_enableKerning: 1
+  m_ActiveFontFeatures: 00000000
  m_enableExtraPadding: 0
  checkPaddingRequired: 0
  m_isRichText: 1
+  m_EmojiFallbackSupport: 1
  m_parseCtrlCharacters: 1
  m_isOrthographic: 1
  m_isCullingEnabled: 0
@ -7895,15 +7933,17 @@ MonoBehaviour:
  m_lineSpacingMax: 0
  m_paragraphSpacing: 0
  m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
+  m_TextWrappingMode: 1
  m_wordWrappingRatios: 0.4
  m_overflowMode: 0
  m_linkedTextComponent: {fileID: 0}
  parentLinkedComponent: {fileID: 0}
  m_enableKerning: 1
+  m_ActiveFontFeatures: 00000000
  m_enableExtraPadding: 0
  checkPaddingRequired: 0
  m_isRichText: 1
+  m_EmojiFallbackSupport: 1
  m_parseCtrlCharacters: 1
  m_isOrthographic: 1
  m_isCullingEnabled: 0
@ -8509,15 +8549,17 @@ MonoBehaviour:
  m_lineSpacingMax: 0
  m_paragraphSpacing: 0
  m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
+  m_TextWrappingMode: 1
  m_wordWrappingRatios: 0.4
  m_overflowMode: 0
  m_linkedTextComponent: {fileID: 0}
  parentLinkedComponent: {fileID: 0}
  m_enableKerning: 1
+  m_ActiveFontFeatures: 6e72656b
  m_enableExtraPadding: 0
  checkPaddingRequired: 0
  m_isRichText: 1
+  m_EmojiFallbackSupport: 1
  m_parseCtrlCharacters: 1
  m_isOrthographic: 1
  m_isCullingEnabled: 0
@ -8645,15 +8687,17 @@ MonoBehaviour:
  m_lineSpacingMax: 0
  m_paragraphSpacing: 0
  m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
+  m_TextWrappingMode: 1
  m_wordWrappingRatios: 0.4
  m_overflowMode: 0
  m_linkedTextComponent: {fileID: 0}
  parentLinkedComponent: {fileID: 0}
  m_enableKerning: 1
+  m_ActiveFontFeatures: 6e72656b
  m_enableExtraPadding: 0
  checkPaddingRequired: 0
  m_isRichText: 1
+  m_EmojiFallbackSupport: 1
  m_parseCtrlCharacters: 1
  m_isOrthographic: 1
  m_isCullingEnabled: 0
@ -9068,15 +9112,17 @@ MonoBehaviour:
  m_lineSpacingMax: 0
  m_paragraphSpacing: 0
  m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
+  m_TextWrappingMode: 1
  m_wordWrappingRatios: 0.4
  m_overflowMode: 0
  m_linkedTextComponent: {fileID: 0}
  parentLinkedComponent: {fileID: 0}
  m_enableKerning: 1
+  m_ActiveFontFeatures: 6e72656b
  m_enableExtraPadding: 0
  checkPaddingRequired: 0
  m_isRichText: 1
+  m_EmojiFallbackSupport: 1
  m_parseCtrlCharacters: 1
  m_isOrthographic: 1
  m_isCullingEnabled: 0
@ -9203,15 +9249,17 @@ MonoBehaviour:
  m_lineSpacingMax: 0
  m_paragraphSpacing: 0
  m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
+  m_TextWrappingMode: 1
  m_wordWrappingRatios: 0.4
  m_overflowMode: 0
  m_linkedTextComponent: {fileID: 0}
  parentLinkedComponent: {fileID: 0}
  m_enableKerning: 1
+  m_ActiveFontFeatures: 00000000
  m_enableExtraPadding: 0
  checkPaddingRequired: 0
  m_isRichText: 1
+  m_EmojiFallbackSupport: 1
  m_parseCtrlCharacters: 1
  m_isOrthographic: 1
  m_isCullingEnabled: 0
@ -9672,12 +9720,15 @@ MonoBehaviour:
  m_ItemText: {fileID: 8402981209467784936}
  m_ItemImage: {fileID: 0}
  m_Value: 0
+  m_MultiSelect: 0
  m_Options:
    m_Options:
    - m_Text: Dual
      m_Image: {fileID: 0}
+      m_Color: {r: 1, g: 1, b: 1, a: 1}
    - m_Text: Single
      m_Image: {fileID: 0}
+      m_Color: {r: 1, g: 1, b: 1, a: 1}
  m_OnValueChanged:
    m_PersistentCalls:
      m_Calls:
@ -9803,15 +9854,17 @@ MonoBehaviour:
  m_lineSpacingMax: 0
  m_paragraphSpacing: 0
  m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
+  m_TextWrappingMode: 1
  m_wordWrappingRatios: 0.4
  m_overflowMode: 0
  m_linkedTextComponent: {fileID: 0}
  parentLinkedComponent: {fileID: 0}
  m_enableKerning: 1
+  m_ActiveFontFeatures: 6e72656b
  m_enableExtraPadding: 0
  checkPaddingRequired: 0
  m_isRichText: 1
+  m_EmojiFallbackSupport: 1
  m_parseCtrlCharacters: 1
  m_isOrthographic: 1
  m_isCullingEnabled: 0
@ -10100,15 +10153,17 @@ MonoBehaviour:
  m_lineSpacingMax: 0
  m_paragraphSpacing: 0
  m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
+  m_TextWrappingMode: 1
  m_wordWrappingRatios: 0.4
  m_overflowMode: 0
  m_linkedTextComponent: {fileID: 0}
  parentLinkedComponent: {fileID: 0}
  m_enableKerning: 1
+  m_ActiveFontFeatures: 6e72656b
  m_enableExtraPadding: 0
  checkPaddingRequired: 0
  m_isRichText: 1
+  m_EmojiFallbackSupport: 1
  m_parseCtrlCharacters: 1
  m_isOrthographic: 1
  m_isCullingEnabled: 0
@ -10457,15 +10512,17 @@ MonoBehaviour:
  m_lineSpacingMax: 0
  m_paragraphSpacing: 0
  m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
+  m_TextWrappingMode: 1
  m_wordWrappingRatios: 0.4
  m_overflowMode: 0
  m_linkedTextComponent: {fileID: 0}
  parentLinkedComponent: {fileID: 0}
  m_enableKerning: 1
+  m_ActiveFontFeatures: 6e72656b
  m_enableExtraPadding: 0
  checkPaddingRequired: 0
  m_isRichText: 1
+  m_EmojiFallbackSupport: 1
  m_parseCtrlCharacters: 1
  m_isOrthographic: 1
  m_isCullingEnabled: 0
@ -10592,15 +10649,17 @@ MonoBehaviour:
  m_lineSpacingMax: 0
  m_paragraphSpacing: 0
  m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
+  m_TextWrappingMode: 1
  m_wordWrappingRatios: 0.4
  m_overflowMode: 0
  m_linkedTextComponent: {fileID: 0}
  parentLinkedComponent: {fileID: 0}
  m_enableKerning: 1
+  m_ActiveFontFeatures: 6e72656b
  m_enableExtraPadding: 0
  checkPaddingRequired: 0
  m_isRichText: 1
+  m_EmojiFallbackSupport: 1
  m_parseCtrlCharacters: 1
  m_isOrthographic: 1
  m_isCullingEnabled: 0
@ -10803,15 +10862,17 @@ MonoBehaviour:
  m_lineSpacingMax: 0
  m_paragraphSpacing: 0
  m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
+  m_TextWrappingMode: 1
  m_wordWrappingRatios: 0.4
  m_overflowMode: 0
  m_linkedTextComponent: {fileID: 0}
  parentLinkedComponent: {fileID: 0}
  m_enableKerning: 1
+  m_ActiveFontFeatures: 6e72656b
  m_enableExtraPadding: 0
  checkPaddingRequired: 0
  m_isRichText: 1
+  m_EmojiFallbackSupport: 1
  m_parseCtrlCharacters: 1
  m_isOrthographic: 1
  m_isCullingEnabled: 0
@ -10938,15 +10999,17 @@ MonoBehaviour:
  m_lineSpacingMax: 0
  m_paragraphSpacing: 0
  m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
+  m_TextWrappingMode: 1
  m_wordWrappingRatios: 0.4
  m_overflowMode: 0
  m_linkedTextComponent: {fileID: 0}
  parentLinkedComponent: {fileID: 0}
  m_enableKerning: 1
+  m_ActiveFontFeatures: 6e72656b
  m_enableExtraPadding: 0
  checkPaddingRequired: 0
  m_isRichText: 1
+  m_EmojiFallbackSupport: 1
  m_parseCtrlCharacters: 1
  m_isOrthographic: 1
  m_isCullingEnabled: 0
@ -11260,15 +11323,17 @@ MonoBehaviour:
  m_lineSpacingMax: 0
  m_paragraphSpacing: 0
  m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 0
+  m_TextWrappingMode: 3
  m_wordWrappingRatios: 0.4
  m_overflowMode: 0
  m_linkedTextComponent: {fileID: 0}
  parentLinkedComponent: {fileID: 0}
  m_enableKerning: 1
+  m_ActiveFontFeatures: 6e72656b
  m_enableExtraPadding: 1
  checkPaddingRequired: 0
  m_isRichText: 1
+  m_EmojiFallbackSupport: 1
  m_parseCtrlCharacters: 1
  m_isOrthographic: 1
  m_isCullingEnabled: 0
@ -12106,15 +12171,17 @@ MonoBehaviour:
  m_lineSpacingMax: 0
  m_paragraphSpacing: 0
  m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 0
+  m_TextWrappingMode: 3
  m_wordWrappingRatios: 0.4
  m_overflowMode: 0
  m_linkedTextComponent: {fileID: 0}
  parentLinkedComponent: {fileID: 0}
  m_enableKerning: 1
+  m_ActiveFontFeatures: 6e72656b
  m_enableExtraPadding: 1
  checkPaddingRequired: 0
  m_isRichText: 1
+  m_EmojiFallbackSupport: 1
  m_parseCtrlCharacters: 1
  m_isOrthographic: 1
  m_isCullingEnabled: 0
@ -12588,10 +12655,13 @@ MonoBehaviour:
  m_GlobalFontAsset: {fileID: 11400000, guid: c2df694f599b22b42817910ff570a9df, type: 2}
  m_OnFocusSelectAll: 1
  m_ResetOnDeActivation: 1
+  m_KeepTextSelectionVisible: 0
  m_RestoreOriginalTextOnEscape: 1
  m_isRichTextEditingAllowed: 0
  m_LineLimit: 0
+  isAlert: 0
  m_InputValidator: {fileID: 0}
+  m_ShouldActivateOnSelect: 1
 --- !u!1 &7818140731132867041
 GameObject:
  m_ObjectHideFlags: 0
@ -13063,6 +13133,7 @@ MonoBehaviour:
  m_ItemText: {fileID: 607737781079879371}
  m_ItemImage: {fileID: 0}
  m_Value: 0
+  m_MultiSelect: 0
  m_Options:
    m_Options: []
  m_OnValueChanged:
@ -13181,15 +13252,17 @@ MonoBehaviour:
  m_lineSpacingMax: 0
  m_paragraphSpacing: 0
  m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
+  m_TextWrappingMode: 1
  m_wordWrappingRatios: 0.4
  m_overflowMode: 0
  m_linkedTextComponent: {fileID: 0}
  parentLinkedComponent: {fileID: 0}
  m_enableKerning: 1
+  m_ActiveFontFeatures: 6e72656b
  m_enableExtraPadding: 0
  checkPaddingRequired: 0
  m_isRichText: 1
+  m_EmojiFallbackSupport: 1
  m_parseCtrlCharacters: 1
  m_isOrthographic: 1
  m_isCullingEnabled: 0
@ -13728,15 +13801,17 @@ MonoBehaviour:
  m_lineSpacingMax: 0
  m_paragraphSpacing: 0
  m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
+  m_TextWrappingMode: 1
  m_wordWrappingRatios: 0.4
  m_overflowMode: 0
  m_linkedTextComponent: {fileID: 0}
  parentLinkedComponent: {fileID: 0}
  m_enableKerning: 1
+  m_ActiveFontFeatures: 6e72656b
  m_enableExtraPadding: 0
  checkPaddingRequired: 0
  m_isRichText: 1
+  m_EmojiFallbackSupport: 1
  m_parseCtrlCharacters: 1
  m_isOrthographic: 1
  m_isCullingEnabled: 0
@ -13863,15 +13938,17 @@ MonoBehaviour:
  m_lineSpacingMax: 0
  m_paragraphSpacing: 0
  m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
+  m_TextWrappingMode: 1
  m_wordWrappingRatios: 0.4
  m_overflowMode: 0
  m_linkedTextComponent: {fileID: 0}
  parentLinkedComponent: {fileID: 0}
  m_enableKerning: 1
+  m_ActiveFontFeatures: 00000000
  m_enableExtraPadding: 0
  checkPaddingRequired: 0
  m_isRichText: 1
+  m_EmojiFallbackSupport: 1
  m_parseCtrlCharacters: 1
  m_isOrthographic: 1
  m_isCullingEnabled: 0
--- a/Assets/Resources/Prefabs/GameView/CamerasEditor.prefab
+++ b/Assets/Resources/Prefabs/GameView/CamerasEditor.prefab
@ -170,6 +170,120 @@ MonoBehaviour:
  m_FillOrigin: 0
  m_UseSpriteMesh: 0
  m_PixelsPerUnitMultiplier: 3
+--- !u!1 &435555855710102188
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7576197626345016079}
+  - component: {fileID: 1664206953461466981}
+  - component: {fileID: 7845231527756581285}
+  m_Layer: 31
+  m_Name: FlasherL
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7576197626345016079
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 435555855710102188}
+  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: 8552962828543516429}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 2, y: 12}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1664206953461466981
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 435555855710102188}
+  m_CullTransparentMesh: 1
+--- !u!114 &7845231527756581285
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 435555855710102188}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 0, b: 0, a: 0.1254902}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 0
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 8be59c4bde4258c429ac39251f5f681b, type: 3}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 5
+--- !u!1 &699803779871748277
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8552962828543516429}
+  m_Layer: 31
+  m_Name: Flashers
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &8552962828543516429
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 699803779871748277}
+  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: 7576197626345016079}
+  - {fileID: 8281773103246844715}
+  m_Father: {fileID: 2077856143944097172}
+  m_RootOrder: 3
+  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, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &2464883521749415129
 GameObject:
  m_ObjectHideFlags: 0
@ -693,6 +807,82 @@ Transform:
  m_Father: {fileID: 0}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &6809880121875460609
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8281773103246844715}
+  - component: {fileID: 7734333607666534753}
+  - component: {fileID: 2240635501115395630}
+  m_Layer: 31
+  m_Name: FlasherR
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8281773103246844715
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6809880121875460609}
+  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: 8552962828543516429}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0.0000009536743, y: 0}
+  m_SizeDelta: {x: 2, y: 12}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7734333607666534753
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6809880121875460609}
+  m_CullTransparentMesh: 1
+--- !u!114 &2240635501115395630
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6809880121875460609}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0, b: 1, a: 0.1254902}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 0
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 8be59c4bde4258c429ac39251f5f681b, type: 3}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 5
 --- !u!1 &7051539713125569525
 GameObject:
  m_ObjectHideFlags: 0
@ -894,6 +1084,7 @@ RectTransform:
  - {fileID: 2769789585838315502}
  - {fileID: 8925473620302868482}
  - {fileID: 8512930684284350359}
+  - {fileID: 8552962828543516429}
  m_Father: {fileID: 6052331674888157612}
  m_RootOrder: 4
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- a/Assets/Resources/Prefabs/GameView/Cursor.prefab
+++ b/Assets/Resources/Prefabs/GameView/Cursor.prefab
@ -28,6 +28,7 @@ Transform:
  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: 285182280367868644}
  m_RootOrder: 1
@ -46,8 +47,12 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  follow: 1
  mouseMoveSpeed: 249.1
-  Eyes: {fileID: 0}
-  OuterCircle: {fileID: 0}
+  sideChangeTrailTime: 0
+  DSGuy: {fileID: 0}
+  DSGuyAnimator: {fileID: 0}
+  flickCoeff: 0.35
+  flickInitMul: 1.5
+  splitTouchSnapEffect: {fileID: 0}
  InnerCircle: {fileID: 0}
  Circle: {fileID: 0}
 --- !u!50 &285182279131759466
@ -81,6 +86,7 @@ GameObject:
  m_Component:
  - component: {fileID: 285182279137842937}
  - component: {fileID: 285182279137842938}
+  - component: {fileID: 7664691932365309657}
  m_Layer: 3
  m_Name: Actual
  m_TagString: Untagged
@ -98,6 +104,7 @@ Transform:
  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: 285182279538923132}
  m_Father: {fileID: 285182280367868644}
@ -117,10 +124,122 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  follow: 0
  mouseMoveSpeed: 0
-  Eyes: {fileID: 285182279528619885}
-  OuterCircle: {fileID: 285182279354310575}
+  sideChangeTrailTime: 0.05
+  DSGuy: {fileID: 285182280031512481}
+  DSGuyAnimator: {fileID: 4592128791974829295}
+  flickCoeff: 12
+  flickInitMul: 64
+  splitTouchSnapEffect: {fileID: 7664691932365309657}
  InnerCircle: {fileID: 285182279842109877}
  Circle: {fileID: 285182279897966106}
+--- !u!96 &7664691932365309657
+TrailRenderer:
+  serializedVersion: 2
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 285182279137842936}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 0
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 0
+  m_LightProbeUsage: 0
+  m_ReflectionProbeUsage: 0
+  m_RayTracingMode: 0
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 10306, guid: 0000000000000000f000000000000000, type: 0}
+  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: 20000
+  m_Time: 0.083333336
+  m_Parameters:
+    serializedVersion: 3
+    widthMultiplier: 0.15
+    widthCurve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: 0
+        outSlope: -0.9
+        tangentMode: 69
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.22058824
+      - serializedVersion: 3
+        time: 1
+        value: 0.1
+        inSlope: -0.9
+        outSlope: -2.2915363
+        tangentMode: 69
+        weightedMode: 0
+        inWeight: 0.16176468
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    colorGradient:
+      serializedVersion: 2
+      key0: {r: 1, g: 1, b: 1, a: 0.3137255}
+      key1: {r: 1, g: 1, b: 1, a: 0}
+      key2: {r: 0, g: 0, b: 0, a: 0}
+      key3: {r: 0, g: 0, b: 0, a: 0}
+      key4: {r: 0, g: 0, b: 0, a: 0}
+      key5: {r: 0, g: 0, b: 0, a: 0}
+      key6: {r: 0, g: 0, b: 0, a: 0}
+      key7: {r: 0, g: 0, b: 0, a: 0}
+      ctime0: 0
+      ctime1: 65535
+      ctime2: 0
+      ctime3: 0
+      ctime4: 0
+      ctime5: 0
+      ctime6: 0
+      ctime7: 0
+      atime0: 0
+      atime1: 65535
+      atime2: 0
+      atime3: 0
+      atime4: 0
+      atime5: 0
+      atime6: 0
+      atime7: 0
+      m_Mode: 0
+      m_NumColorKeys: 2
+      m_NumAlphaKeys: 2
+    numCornerVertices: 0
+    numCapVertices: 4
+    alignment: 0
+    textureMode: 0
+    shadowBias: 0.5
+    generateLightingData: 0
+  m_MinVertexDistance: 0.25
+  m_Autodestruct: 0
+  m_Emitting: 1
 --- !u!1 &285182279354310575
 GameObject:
  m_ObjectHideFlags: 0
@ -148,6 +267,7 @@ Transform:
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 0, y: 0, z: 1}
+  m_ConstrainProportionsScale: 1
  m_Children: []
  m_Father: {fileID: 285182280031512482}
  m_RootOrder: 0
@ -163,6 +283,7 @@ SpriteRenderer:
  m_CastShadows: 0
  m_ReceiveShadows: 0
  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
@ -230,6 +351,7 @@ Transform:
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 0.65, y: 0.65, z: 1}
+  m_ConstrainProportionsScale: 0
  m_Children:
  - {fileID: 285182280031512482}
  - {fileID: 285182279897966107}
@ -275,6 +397,7 @@ Transform:
  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: 285182279842109878}
  m_RootOrder: 0
@ -290,6 +413,7 @@ SpriteRenderer:
  m_CastShadows: 0
  m_ReceiveShadows: 0
  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
@ -359,6 +483,7 @@ Transform:
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
  m_LocalPosition: {x: 0, y: -0.66, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 1
  m_Children: []
  m_Father: {fileID: 285182280031512482}
  m_RootOrder: 2
@ -374,6 +499,7 @@ SpriteRenderer:
  m_CastShadows: 0
  m_ReceiveShadows: 0
  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
@ -467,6 +593,7 @@ Transform:
  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: 285182279419378161}
  m_Father: {fileID: 285182279137842937}
@ -479,7 +606,7 @@ MonoBehaviour:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 285182279538923131}
-  m_Enabled: 1
+  m_Enabled: 0
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: 5421f511c7f44364cb7a8b3c23a9cf19, type: 3}
  m_Name: 
@ -496,7 +623,7 @@ MonoBehaviour:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 285182279538923131}
-  m_Enabled: 1
+  m_Enabled: 0
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: 141a2c65793e39943a8304c67905de70, type: 3}
  m_Name: 
@ -530,6 +657,7 @@ Transform:
  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: 1
  m_Children:
  - {fileID: 285182279492467814}
  m_Father: {fileID: 285182280031512482}
@ -546,6 +674,7 @@ SpriteRenderer:
  m_CastShadows: 0
  m_ReceiveShadows: 0
  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
@ -614,6 +743,7 @@ Transform:
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 0.2, y: 0.2, z: 1}
+  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 285182279419378161}
  m_RootOrder: 1
@ -629,6 +759,7 @@ SpriteRenderer:
  m_CastShadows: 0
  m_ReceiveShadows: 0
  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
@ -691,6 +822,7 @@ GameObject:
  serializedVersion: 6
  m_Component:
  - component: {fileID: 285182280031512482}
+  - component: {fileID: 4592128791974829295}
  m_Layer: 3
  m_Name: DSGUY
  m_TagString: Untagged
@ -708,6 +840,7 @@ Transform:
  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: 285182279354310576}
  - {fileID: 285182279842109878}
@ -715,6 +848,27 @@ Transform:
  m_Father: {fileID: 285182279419378161}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!95 &4592128791974829295
+Animator:
+  serializedVersion: 5
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 285182280031512481}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 9100000, guid: a050595e43364bb4e9840d98fc70be72, type: 2}
+  m_CullingMode: 0
+  m_UpdateMode: 0
+  m_ApplyRootMotion: 0
+  m_LinearVelocityBlending: 0
+  m_StabilizeFeet: 0
+  m_WarningMessage: 
+  m_HasTransformHierarchy: 1
+  m_AllowConstantClipSamplingOptimization: 1
+  m_KeepAnimatorStateOnDisable: 0
+  m_WriteDefaultValuesOnDisable: 0
 --- !u!1 &285182280367868641
 GameObject:
  m_ObjectHideFlags: 0
@ -741,6 +895,7 @@ Transform:
  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: 285182279137842937}
  - {fileID: 285182279131759465}
--- a/Assets/Resources/Prefabs/GameView/GameTex.renderTexture
+++ b/Assets/Resources/Prefabs/GameView/GameTex.renderTexture
@ -14,8 +14,8 @@ RenderTexture:
  m_DownscaleFallback: 0
  m_IsAlphaChannelOptional: 0
  serializedVersion: 5
-  m_Width: 1518
-  m_Height: 854
+  m_Width: 1600
+  m_Height: 900
  m_AntiAliasing: 2
  m_MipCount: -1
  m_DepthStencilFormat: 92
--- a/Assets/Resources/Prefabs/GameView/OverlayTex.renderTexture
+++ b/Assets/Resources/Prefabs/GameView/OverlayTex.renderTexture
@ -14,8 +14,8 @@ RenderTexture:
  m_DownscaleFallback: 0
  m_IsAlphaChannelOptional: 0
  serializedVersion: 5
-  m_Width: 2277
-  m_Height: 1281
+  m_Width: 2400
+  m_Height: 1350
  m_AntiAliasing: 1
  m_MipCount: -1
  m_DepthStencilFormat: 92
--- a/Assets/Resources/Sfx/games/fanClub/arisa_ii_fast_jp.wav
+++ b/Assets/Resources/Sfx/games/fanClub/arisa_ii_fast_jp.wav
--- a/Assets/Resources/Sfx/games/fanClub/arisa_ii_jp.wav
+++ b/Assets/Resources/Sfx/games/fanClub/arisa_ii_jp.wav
--- a/Assets/Resources/Sfx/games/fanClub/arisa_in_jp.wav
+++ b/Assets/Resources/Sfx/games/fanClub/arisa_in_jp.wav
--- a/Assets/Resources/Sfx/games/fanClub/arisa_na_fast_jp.wav
+++ b/Assets/Resources/Sfx/games/fanClub/arisa_na_fast_jp.wav
--- a/Assets/Resources/Sfx/games/fanClub/arisa_na_jp.wav
+++ b/Assets/Resources/Sfx/games/fanClub/arisa_na_jp.wav
--- a/Assets/Resources/Sfx/games/karateMan/lightbulbNtrHit.ogg
+++ b/Assets/Resources/Sfx/games/karateMan/lightbulbNtrHit.ogg
--- a/Assets/Resources/Sfx/games/karateMan/lightbulbNtrHit.ogg.meta
+++ b/Assets/Resources/Sfx/games/karateMan/lightbulbNtrHit.ogg.meta
@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 6ad9f1d601adf9a4889010293bb854d4
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Resources/Sfx/games/karateMan/lightbulbNtrOut.ogg
+++ b/Assets/Resources/Sfx/games/karateMan/lightbulbNtrOut.ogg
--- a/Assets/Resources/Sfx/games/karateMan/lightbulbNtrOut.ogg.meta
+++ b/Assets/Resources/Sfx/games/karateMan/lightbulbNtrOut.ogg.meta
@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 86fe61ed86cc5bd4cb8da587c4e4cc48
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Resources/Sfx/games/karateMan/offbeatLightbulbNtrOut.ogg
+++ b/Assets/Resources/Sfx/games/karateMan/offbeatLightbulbNtrOut.ogg
--- a/Assets/Resources/Sfx/games/karateMan/offbeatLightbulbNtrOut.ogg.meta
+++ b/Assets/Resources/Sfx/games/karateMan/offbeatLightbulbNtrOut.ogg.meta
@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 5e6b77f98971e73459639530f1524456
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Resources/Sprites/Editor/EventObjOutline.png
+++ b/Assets/Resources/Sprites/Editor/EventObjOutline.png
--- a/Assets/Resources/Sprites/Editor/EventObjOutline.png.meta
+++ b/Assets/Resources/Sprites/Editor/EventObjOutline.png.meta
@ -3,7 +3,7 @@ guid: f9232c079e126cd48a7344b23eaf42a5
 TextureImporter:
  internalIDToNameTable: []
  externalObjects: {}
-  serializedVersion: 11
+  serializedVersion: 12
  mipmaps:
    mipMapMode: 0
    enableMipMap: 0
@ -24,6 +24,7 @@ TextureImporter:
  streamingMipmaps: 0
  streamingMipmapsPriority: 0
  vTOnly: 0
+  ignoreMasterTextureLimit: 0
  grayScaleToAlpha: 0
  generateCubemap: 6
  cubemapConvolution: 0
@ -62,13 +63,14 @@ TextureImporter:
  textureFormatSet: 0
  ignorePngGamma: 0
  applyGammaDecoding: 0
+  cookieLightType: 1
  platformSettings:
  - serializedVersion: 3
    buildTarget: DefaultTexturePlatform
    maxTextureSize: 2048
    resizeAlgorithm: 0
    textureFormat: -1
-    textureCompression: 0
+    textureCompression: 2
    compressionQuality: 50
    crunchedCompression: 0
    allowsAlphaSplitting: 0
@ -99,6 +101,30 @@ TextureImporter:
    overridden: 0
    androidETC2FallbackOverride: 0
    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
  spriteSheet:
    serializedVersion: 2
    sprites: []
@ -106,12 +132,13 @@ TextureImporter:
    physicsShape: []
    bones: []
    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
+    internalID: 1537655665
    vertices: []
    indices: 
    edges: []
    weights: []
    secondaryTextures: []
+    nameFileIdTable: {}
  spritePackingTag: 
  pSDRemoveMatte: 0
  pSDShowRemoveMatteOption: 0
--- a/Assets/Resources/Sprites/Editor/GameIcons/wizardsWaltz.png
+++ b/Assets/Resources/Sprites/Editor/GameIcons/wizardsWaltz.png
--- a/Assets/Resources/Sprites/Editor/GameIcons/wizardsWaltz_mask.png
+++ b/Assets/Resources/Sprites/Editor/GameIcons/wizardsWaltz_mask.png
--- a/Show more
+++ b/Show more