diff --git a/.gitignore b/.gitignore index e3f3ede8a..92ebfba2b 100644 --- a/.gitignore +++ b/.gitignore @@ -17,6 +17,7 @@ sysinfo.txt /[Aa]ssets/AssetBundles/* /[Aa]ssets/StreamingAssets/* /[Aa]ssets/Resources/mp3 +/[Ss]ave/* #Unity Meta Files *.meta diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj index 888ee8ae1..566bb9a29 100644 --- a/Assembly-CSharp.csproj +++ b/Assembly-CSharp.csproj @@ -22,7 +22,7 @@ full false Temp\Bin\Debug\ - UNITY_2021_3_10;UNITY_2021_3;UNITY_2021;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_4_OR_NEWER;UNITY_2018_1_OR_NEWER;UNITY_2018_2_OR_NEWER;UNITY_2018_3_OR_NEWER;UNITY_2018_4_OR_NEWER;UNITY_2019_1_OR_NEWER;UNITY_2019_2_OR_NEWER;UNITY_2019_3_OR_NEWER;UNITY_2019_4_OR_NEWER;UNITY_2020_1_OR_NEWER;UNITY_2020_2_OR_NEWER;UNITY_2020_3_OR_NEWER;UNITY_2021_1_OR_NEWER;UNITY_2021_2_OR_NEWER;UNITY_2021_3_OR_NEWER;PLATFORM_ARCH_64;UNITY_64;UNITY_INCLUDE_TESTS;USE_SEARCH_ENGINE_API;USE_SEARCH_TABLE;USE_SEARCH_MODULE;USE_PROPERTY_DATABASE;USE_SEARCH_EXTENSION_API;SCENE_TEMPLATE_MODULE;ENABLE_AR;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_TEXTURE_STREAMING;ENABLE_VIRTUALTEXTURING;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_UNITYWEBREQUEST;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_NATIVE_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_MANAGED_JOBS;ENABLE_MANAGED_TRANSFORM_JOBS;ENABLE_MANAGED_ANIMATION_JOBS;ENABLE_MANAGED_AUDIO_JOBS;ENABLE_MANAGED_UNITYTLS;INCLUDE_DYNAMIC_GI;ENABLE_SCRIPTING_GC_WBARRIERS;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;ENABLE_VIDEO;ENABLE_ACCELERATOR_CLIENT_DEBUGGING;PLATFORM_STANDALONE;TEXTCORE_1_0_OR_NEWER;PLATFORM_STANDALONE_OSX;UNITY_STANDALONE_OSX;UNITY_STANDALONE;ENABLE_GAMECENTER;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_CLUSTER_SYNC;ENABLE_CLUSTERINPUT;ENABLE_SPATIALTRACKING;PLATFORM_UPDATES_TIME_OUTSIDE_OF_PLAYER_LOOP;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_STANDARD_2_0;NET_STANDARD;NET_STANDARD_2_1;NETSTANDARD;NETSTANDARD2_1;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_UNITY_COLLECTIONS_CHECKS;ENABLE_BURST_AOT;UNITY_TEAM_LICENSE;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_DIRECTOR;ENABLE_LOCALIZATION;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_TILEMAP;ENABLE_TIMELINE;ENABLE_LEGACY_INPUT_MANAGER;CSHARP_7_OR_LATER;CSHARP_7_3_OR_NEWER + UNITY_2022_2_1;UNITY_2022_2;UNITY_2022;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_4_OR_NEWER;UNITY_2018_1_OR_NEWER;UNITY_2018_2_OR_NEWER;UNITY_2018_3_OR_NEWER;UNITY_2018_4_OR_NEWER;UNITY_2019_1_OR_NEWER;UNITY_2019_2_OR_NEWER;UNITY_2019_3_OR_NEWER;UNITY_2019_4_OR_NEWER;UNITY_2020_1_OR_NEWER;UNITY_2020_2_OR_NEWER;UNITY_2020_3_OR_NEWER;UNITY_2021_1_OR_NEWER;UNITY_2021_2_OR_NEWER;UNITY_2021_3_OR_NEWER;UNITY_2022_1_OR_NEWER;UNITY_2022_2_OR_NEWER;PLATFORM_ARCH_64;UNITY_64;UNITY_INCLUDE_TESTS;USE_SEARCH_ENGINE_API;USE_SEARCH_TABLE;USE_SEARCH_MODULE;USE_PROPERTY_DATABASE;USE_QUERY_BUILDER;USE_SEARCH_EXTENSION_API;ENABLE_AR;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_TEXTURE_STREAMING;ENABLE_VIRTUALTEXTURING;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_UNITYWEBREQUEST;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_NATIVE_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_EDITOR_GAME_SERVICES;ENABLE_UNITY_GAME_SERVICES_ANALYTICS_SUPPORT;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_GENERATE_NATIVE_PLUGINS_FOR_ASSEMBLIES_API;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_MANAGED_JOBS;ENABLE_MANAGED_TRANSFORM_JOBS;ENABLE_MANAGED_ANIMATION_JOBS;ENABLE_MANAGED_AUDIO_JOBS;ENABLE_MANAGED_UNITYTLS;INCLUDE_DYNAMIC_GI;ENABLE_SCRIPTING_GC_WBARRIERS;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;ENABLE_VIDEO;ENABLE_ACCELERATOR_CLIENT_DEBUGGING;ENABLE_NAVIGATION_PACKAGE_DEBUG_VISUALIZATION;ENABLE_NAVIGATION_HEIGHTMESH_RUNTIME_SUPPORT;ENABLE_NAVIGATION_UI_REQUIRES_PACKAGE;PLATFORM_STANDALONE;TEXTCORE_1_0_OR_NEWER;PLATFORM_STANDALONE_OSX;UNITY_STANDALONE_OSX;UNITY_STANDALONE;ENABLE_GAMECENTER;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_CLUSTER_SYNC;ENABLE_CLUSTERINPUT;ENABLE_SPATIALTRACKING;PLATFORM_UPDATES_TIME_OUTSIDE_OF_PLAYER_LOOP;ENABLE_MONO;NET_STANDARD_2_0;NET_STANDARD;NET_STANDARD_2_1;NETSTANDARD;NETSTANDARD2_1;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_UNITY_COLLECTIONS_CHECKS;ENABLE_BURST_AOT;UNITY_TEAM_LICENSE;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_DIRECTOR;ENABLE_LOCALIZATION;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_TILEMAP;ENABLE_TIMELINE;ENABLE_LEGACY_INPUT_MANAGER;TEXTCORE_FONT_ENGINE_1_5_OR_NEWER;CSHARP_7_OR_LATER;CSHARP_7_3_OR_NEWER prompt 4 0169 @@ -50,1074 +50,1097 @@ 2.0.16 Game:1 StandaloneOSX:2 - 2021.3.10f1 + 2022.2.1f1 + + - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + - - + + + + - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + - + + + + - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + - - - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + - + + + + - - - - - - - - - - - - - - - - + + + + - - - + + + + + + + + + - - - - - + + + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\Managed\UnityEngine\UnityEngine.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.AIModule.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\Managed\UnityEngine\UnityEngine.AIModule.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.ARModule.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\Managed\UnityEngine\UnityEngine.ARModule.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.AccessibilityModule.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\Managed\UnityEngine\UnityEngine.AccessibilityModule.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.AndroidJNIModule.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\Managed\UnityEngine\UnityEngine.AndroidJNIModule.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.AnimationModule.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\Managed\UnityEngine\UnityEngine.AnimationModule.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.AssetBundleModule.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\Managed\UnityEngine\UnityEngine.AssetBundleModule.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.AudioModule.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\Managed\UnityEngine\UnityEngine.AudioModule.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.ClothModule.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\Managed\UnityEngine\UnityEngine.ClothModule.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.ClusterInputModule.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\Managed\UnityEngine\UnityEngine.ClusterInputModule.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.ClusterRendererModule.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\Managed\UnityEngine\UnityEngine.ClusterRendererModule.dll + + + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\Managed\UnityEngine\UnityEngine.ContentLoadModule.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.CoreModule.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\Managed\UnityEngine\UnityEngine.CoreModule.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.CrashReportingModule.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\Managed\UnityEngine\UnityEngine.CrashReportingModule.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.DSPGraphModule.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\Managed\UnityEngine\UnityEngine.DSPGraphModule.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.DirectorModule.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\Managed\UnityEngine\UnityEngine.DirectorModule.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.GIModule.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\Managed\UnityEngine\UnityEngine.GIModule.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.GameCenterModule.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\Managed\UnityEngine\UnityEngine.GameCenterModule.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.GridModule.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\Managed\UnityEngine\UnityEngine.GridModule.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.HotReloadModule.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\Managed\UnityEngine\UnityEngine.HotReloadModule.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.IMGUIModule.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\Managed\UnityEngine\UnityEngine.IMGUIModule.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.ImageConversionModule.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\Managed\UnityEngine\UnityEngine.ImageConversionModule.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.InputModule.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\Managed\UnityEngine\UnityEngine.InputModule.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.InputLegacyModule.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\Managed\UnityEngine\UnityEngine.InputLegacyModule.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.JSONSerializeModule.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\Managed\UnityEngine\UnityEngine.JSONSerializeModule.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.LocalizationModule.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\Managed\UnityEngine\UnityEngine.LocalizationModule.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.ParticleSystemModule.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\Managed\UnityEngine\UnityEngine.ParticleSystemModule.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.PerformanceReportingModule.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\Managed\UnityEngine\UnityEngine.PerformanceReportingModule.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.PhysicsModule.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\Managed\UnityEngine\UnityEngine.PhysicsModule.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.Physics2DModule.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\Managed\UnityEngine\UnityEngine.Physics2DModule.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.ProfilerModule.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\Managed\UnityEngine\UnityEngine.ProfilerModule.dll + + + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\Managed\UnityEngine\UnityEngine.PropertiesModule.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.RuntimeInitializeOnLoadManagerInitializerModule.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\Managed\UnityEngine\UnityEngine.RuntimeInitializeOnLoadManagerInitializerModule.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.ScreenCaptureModule.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\Managed\UnityEngine\UnityEngine.ScreenCaptureModule.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.SharedInternalsModule.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\Managed\UnityEngine\UnityEngine.SharedInternalsModule.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.SpriteMaskModule.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\Managed\UnityEngine\UnityEngine.SpriteMaskModule.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.SpriteShapeModule.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\Managed\UnityEngine\UnityEngine.SpriteShapeModule.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.StreamingModule.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\Managed\UnityEngine\UnityEngine.StreamingModule.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.SubstanceModule.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\Managed\UnityEngine\UnityEngine.SubstanceModule.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.SubsystemsModule.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\Managed\UnityEngine\UnityEngine.SubsystemsModule.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.TLSModule.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\Managed\UnityEngine\UnityEngine.TLSModule.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.TerrainModule.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\Managed\UnityEngine\UnityEngine.TerrainModule.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.TerrainPhysicsModule.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\Managed\UnityEngine\UnityEngine.TerrainPhysicsModule.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.TextCoreFontEngineModule.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\Managed\UnityEngine\UnityEngine.TextCoreFontEngineModule.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.TextCoreTextEngineModule.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\Managed\UnityEngine\UnityEngine.TextCoreTextEngineModule.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.TextRenderingModule.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\Managed\UnityEngine\UnityEngine.TextRenderingModule.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.TilemapModule.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\Managed\UnityEngine\UnityEngine.TilemapModule.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.UIModule.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\Managed\UnityEngine\UnityEngine.UIModule.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.UIElementsModule.dll - - - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.UIElementsNativeModule.dll - - - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.UNETModule.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\Managed\UnityEngine\UnityEngine.UIElementsModule.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.UmbraModule.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\Managed\UnityEngine\UnityEngine.UmbraModule.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.UnityAnalyticsModule.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\Managed\UnityEngine\UnityEngine.UnityAnalyticsModule.dll + + + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\Managed\UnityEngine\UnityEngine.UnityAnalyticsCommonModule.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.UnityConnectModule.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\Managed\UnityEngine\UnityEngine.UnityConnectModule.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.UnityCurlModule.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\Managed\UnityEngine\UnityEngine.UnityCurlModule.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.UnityTestProtocolModule.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\Managed\UnityEngine\UnityEngine.UnityTestProtocolModule.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.UnityWebRequestModule.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\Managed\UnityEngine\UnityEngine.UnityWebRequestModule.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.UnityWebRequestAssetBundleModule.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\Managed\UnityEngine\UnityEngine.UnityWebRequestAssetBundleModule.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.UnityWebRequestAudioModule.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\Managed\UnityEngine\UnityEngine.UnityWebRequestAudioModule.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.UnityWebRequestTextureModule.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\Managed\UnityEngine\UnityEngine.UnityWebRequestTextureModule.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.UnityWebRequestWWWModule.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\Managed\UnityEngine\UnityEngine.UnityWebRequestWWWModule.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.VFXModule.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\Managed\UnityEngine\UnityEngine.VFXModule.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.VRModule.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\Managed\UnityEngine\UnityEngine.VRModule.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.VehiclesModule.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\Managed\UnityEngine\UnityEngine.VehiclesModule.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.VideoModule.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\Managed\UnityEngine\UnityEngine.VideoModule.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.VirtualTexturingModule.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\Managed\UnityEngine\UnityEngine.VirtualTexturingModule.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.WindModule.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\Managed\UnityEngine\UnityEngine.WindModule.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.XRModule.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\Managed\UnityEngine\UnityEngine.XRModule.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\Managed\UnityEngine\UnityEditor.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\Managed\UnityEngine\UnityEditor.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\Managed\UnityEngine\UnityEditor.CoreModule.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\Managed\UnityEngine\UnityEditor.CoreModule.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\Managed\UnityEngine\UnityEditor.DeviceSimulatorModule.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\Managed\UnityEngine\UnityEditor.DeviceSimulatorModule.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\Managed\UnityEngine\UnityEditor.DiagnosticsModule.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\Managed\UnityEngine\UnityEditor.DiagnosticsModule.dll + + + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\Managed\UnityEngine\UnityEditor.EditorToolbarModule.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\Managed\UnityEngine\UnityEditor.GraphViewModule.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\Managed\UnityEngine\UnityEditor.GraphViewModule.dll - - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\Managed\UnityEngine\UnityEditor.PackageManagerUIModule.dll + + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\Managed\UnityEngine\UnityEditor.PresetsUIModule.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\Managed\UnityEngine\UnityEditor.QuickSearchModule.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\Managed\UnityEngine\UnityEditor.QuickSearchModule.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\Managed\UnityEngine\UnityEditor.SceneTemplateModule.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\Managed\UnityEngine\UnityEditor.SceneTemplateModule.dll + + + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\Managed\UnityEngine\UnityEditor.SceneViewModule.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\Managed\UnityEngine\UnityEditor.TextCoreFontEngineModule.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\Managed\UnityEngine\UnityEditor.TextCoreFontEngineModule.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\Managed\UnityEngine\UnityEditor.TextCoreTextEngineModule.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\Managed\UnityEngine\UnityEditor.TextCoreTextEngineModule.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\Managed\UnityEngine\UnityEditor.UIBuilderModule.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\Managed\UnityEngine\UnityEditor.UIBuilderModule.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\Managed\UnityEngine\UnityEditor.UIElementsModule.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\Managed\UnityEngine\UnityEditor.UIElementsModule.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\Managed\UnityEngine\UnityEditor.UIElementsSamplesModule.dll - - - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\Managed\UnityEngine\UnityEditor.UIServiceModule.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\Managed\UnityEngine\UnityEditor.UIElementsSamplesModule.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\Managed\UnityEngine\UnityEditor.UnityConnectModule.dll - - - Library\PackageCache\com.unity.nuget.newtonsoft-json@3.0.2\Runtime\Newtonsoft.Json.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\Managed\UnityEngine\UnityEditor.UnityConnectModule.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\PlaybackEngines\AndroidPlayer\Unity.Android.Types.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\PlaybackEngines\AndroidPlayer\Unity.Android.Types.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\PlaybackEngines\AndroidPlayer\Unity.Android.Gradle.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\PlaybackEngines\AndroidPlayer\Unity.Android.Gradle.dll + + + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\PlaybackEngines\AndroidPlayer\Unity.Android.GradleProject.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\ref\2.1.0\netstandard.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\ref\2.1.0\netstandard.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\Microsoft.Win32.Primitives.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\Microsoft.Win32.Primitives.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.AppContext.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.AppContext.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Buffers.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Buffers.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Collections.Concurrent.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Collections.Concurrent.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Collections.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Collections.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Collections.NonGeneric.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Collections.NonGeneric.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Collections.Specialized.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Collections.Specialized.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.ComponentModel.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.ComponentModel.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.ComponentModel.EventBasedAsync.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.ComponentModel.EventBasedAsync.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.ComponentModel.Primitives.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.ComponentModel.Primitives.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.ComponentModel.TypeConverter.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.ComponentModel.TypeConverter.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Console.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Console.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Data.Common.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Data.Common.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Diagnostics.Contracts.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Diagnostics.Contracts.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Diagnostics.Debug.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Diagnostics.Debug.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Diagnostics.FileVersionInfo.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Diagnostics.FileVersionInfo.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Diagnostics.Process.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Diagnostics.Process.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Diagnostics.StackTrace.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Diagnostics.StackTrace.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Diagnostics.TextWriterTraceListener.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Diagnostics.TextWriterTraceListener.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Diagnostics.Tools.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Diagnostics.Tools.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Diagnostics.TraceSource.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Diagnostics.TraceSource.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Diagnostics.Tracing.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Diagnostics.Tracing.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Drawing.Primitives.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Drawing.Primitives.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Dynamic.Runtime.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Dynamic.Runtime.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Globalization.Calendars.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Globalization.Calendars.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Globalization.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Globalization.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Globalization.Extensions.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Globalization.Extensions.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.IO.Compression.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.IO.Compression.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.IO.Compression.ZipFile.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.IO.Compression.ZipFile.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.IO.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.IO.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.IO.FileSystem.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.IO.FileSystem.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.IO.FileSystem.DriveInfo.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.IO.FileSystem.DriveInfo.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.IO.FileSystem.Primitives.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.IO.FileSystem.Primitives.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.IO.FileSystem.Watcher.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.IO.FileSystem.Watcher.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.IO.IsolatedStorage.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.IO.IsolatedStorage.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.IO.MemoryMappedFiles.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.IO.MemoryMappedFiles.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.IO.Pipes.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.IO.Pipes.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.IO.UnmanagedMemoryStream.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.IO.UnmanagedMemoryStream.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Linq.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Linq.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Linq.Expressions.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Linq.Expressions.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Linq.Parallel.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Linq.Parallel.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Linq.Queryable.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Linq.Queryable.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Memory.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Memory.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Net.Http.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Net.Http.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Net.NameResolution.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Net.NameResolution.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Net.NetworkInformation.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Net.NetworkInformation.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Net.Ping.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Net.Ping.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Net.Primitives.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Net.Primitives.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Net.Requests.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Net.Requests.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Net.Security.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Net.Security.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Net.Sockets.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Net.Sockets.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Net.WebHeaderCollection.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Net.WebHeaderCollection.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Net.WebSockets.Client.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Net.WebSockets.Client.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Net.WebSockets.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Net.WebSockets.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Numerics.Vectors.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Numerics.Vectors.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.ObjectModel.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.ObjectModel.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Reflection.DispatchProxy.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Reflection.DispatchProxy.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Reflection.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Reflection.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Reflection.Emit.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Reflection.Emit.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Reflection.Emit.ILGeneration.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Reflection.Emit.ILGeneration.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Reflection.Emit.Lightweight.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Reflection.Emit.Lightweight.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Reflection.Extensions.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Reflection.Extensions.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Reflection.Primitives.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Reflection.Primitives.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Resources.Reader.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Resources.Reader.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Resources.ResourceManager.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Resources.ResourceManager.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Resources.Writer.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Resources.Writer.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Runtime.CompilerServices.VisualC.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Runtime.CompilerServices.VisualC.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Runtime.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Runtime.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Runtime.Extensions.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Runtime.Extensions.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Runtime.Handles.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Runtime.Handles.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Runtime.InteropServices.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Runtime.InteropServices.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Runtime.InteropServices.RuntimeInformation.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Runtime.InteropServices.RuntimeInformation.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Runtime.Numerics.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Runtime.Numerics.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Runtime.Serialization.Formatters.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Runtime.Serialization.Formatters.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Runtime.Serialization.Json.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Runtime.Serialization.Json.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Runtime.Serialization.Primitives.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Runtime.Serialization.Primitives.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Runtime.Serialization.Xml.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Runtime.Serialization.Xml.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Security.Claims.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Security.Claims.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Security.Cryptography.Algorithms.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Security.Cryptography.Algorithms.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Security.Cryptography.Csp.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Security.Cryptography.Csp.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Security.Cryptography.Encoding.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Security.Cryptography.Encoding.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Security.Cryptography.Primitives.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Security.Cryptography.Primitives.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Security.Cryptography.X509Certificates.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Security.Cryptography.X509Certificates.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Security.Principal.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Security.Principal.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Security.SecureString.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Security.SecureString.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Text.Encoding.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Text.Encoding.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Text.Encoding.Extensions.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Text.Encoding.Extensions.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Text.RegularExpressions.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Text.RegularExpressions.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Threading.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Threading.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Threading.Overlapped.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Threading.Overlapped.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Threading.Tasks.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Threading.Tasks.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Threading.Tasks.Extensions.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Threading.Tasks.Extensions.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Threading.Tasks.Parallel.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Threading.Tasks.Parallel.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Threading.Thread.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Threading.Thread.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Threading.ThreadPool.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Threading.ThreadPool.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Threading.Timer.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Threading.Timer.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.ValueTuple.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.ValueTuple.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Xml.ReaderWriter.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Xml.ReaderWriter.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Xml.XDocument.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Xml.XDocument.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Xml.XmlDocument.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Xml.XmlDocument.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Xml.XmlSerializer.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Xml.XmlSerializer.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Xml.XPath.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Xml.XPath.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Xml.XPath.XDocument.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Xml.XPath.XDocument.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\Extensions\2.0.0\System.Runtime.InteropServices.WindowsRuntime.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\Extensions\2.0.0\System.Runtime.InteropServices.WindowsRuntime.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\mscorlib.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\mscorlib.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.ComponentModel.Composition.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.ComponentModel.Composition.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.Core.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.Core.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.Data.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.Data.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.Drawing.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.Drawing.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.IO.Compression.FileSystem.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.IO.Compression.FileSystem.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.Net.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.Net.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.Numerics.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.Numerics.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.Runtime.Serialization.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.Runtime.Serialization.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.ServiceModel.Web.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.ServiceModel.Web.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.Transactions.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.Transactions.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.Web.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.Web.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.Windows.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.Windows.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.Xml.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.Xml.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.Xml.Linq.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.Xml.Linq.dll - C:\Program Files\Unity\Hub\Editor\2021.3.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.Xml.Serialization.dll - - - Library\ScriptAssemblies\Unity.VSCode.Editor.dll - - - Library\ScriptAssemblies\Unity.Services.Core.Analytics.dll - - - Library\ScriptAssemblies\Unity.TextMeshPro.Editor.dll + C:\Program Files\Unity\Hub\Editor\2022.2.1f1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.Xml.Serialization.dll - - Library\ScriptAssemblies\Unity.Services.Core.Environments.dll + + Library\ScriptAssemblies\Unity.Timeline.dll Library\ScriptAssemblies\Unity.Sysroot.Linux_x86_64.dll - - Library\ScriptAssemblies\Unity.VisualStudio.Editor.dll + + Library\ScriptAssemblies\Unity.AI.Navigation.dll - - Library\ScriptAssemblies\Unity.Toolchain.Win-x86_64-Linux-x86_64.dll + + Library\ScriptAssemblies\Unity.SysrootPackage.Editor.dll + + + Library\ScriptAssemblies\Unity.AI.Navigation.Updater.dll Library\ScriptAssemblies\Unity.Timeline.Editor.dll - - Library\ScriptAssemblies\Unity.Timeline.dll + + Library\ScriptAssemblies\Unity.VisualStudio.Editor.dll Library\ScriptAssemblies\Unity.TextMeshPro.dll @@ -1125,20 +1148,26 @@ Library\ScriptAssemblies\UnityEditor.UI.dll - - Library\ScriptAssemblies\Unity.PlasticSCM.Editor.dll + + Library\ScriptAssemblies\Unity.TextMeshPro.Editor.dll + + + Library\ScriptAssemblies\UnityEngine.UI.dll + + + Library\ScriptAssemblies\Unity.AI.Navigation.Editor.dll Library\ScriptAssemblies\Unity.Rider.Editor.dll - - Library\ScriptAssemblies\UnityEngine.UI.dll + + Library\ScriptAssemblies\Unity.AI.Navigation.Editor.ConversionSystem.dll - - Library\ScriptAssemblies\Unity.SysrootPackage.Editor.dll + + Library\ScriptAssemblies\Unity.VSCode.Editor.dll - - Library\ScriptAssemblies\Unity.Services.Core.dll + + Library\ScriptAssemblies\Unity.Toolchain.Win-x86_64-Linux-x86_64.dll diff --git a/Assets/Resources/font/h2m_font_0.png b/Assets/Resources/font/h2m_font_0.png index baa6fb1b4..cd35aa10c 100644 Binary files a/Assets/Resources/font/h2m_font_0.png and b/Assets/Resources/font/h2m_font_0.png differ diff --git a/Assets/Scene/Scenes/DebugScene.unity b/Assets/Scene/Scenes/DebugScene.unity index 83277c859..0db706fb3 100644 --- a/Assets/Scene/Scenes/DebugScene.unity +++ b/Assets/Scene/Scenes/DebugScene.unity @@ -104,7 +104,7 @@ NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: - serializedVersion: 2 + serializedVersion: 3 agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 @@ -117,7 +117,7 @@ NavMeshSettings: cellSize: 0.16666666 manualTileSize: 0 tileSize: 256 - accuratePlacement: 0 + buildHeightMesh: 0 maxJobWorkers: 0 preserveTilesOutsideBounds: 0 debug: @@ -130,7 +130,7 @@ LightingSettings: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Settings.lighting - serializedVersion: 4 + serializedVersion: 6 m_GIWorkflowMode: 1 m_EnableBakedLightmaps: 1 m_EnableRealtimeLightmaps: 0 @@ -139,7 +139,7 @@ LightingSettings: m_AlbedoBoost: 1 m_IndirectOutputScale: 1 m_UsingShadowmask: 0 - m_BakeBackend: 0 + m_BakeBackend: 1 m_LightmapMaxSize: 1024 m_BakeResolution: 50 m_Padding: 2 @@ -170,7 +170,7 @@ LightingSettings: m_LightProbeSampleCountMultiplier: 4 m_PVRBounces: 2 m_PVRMinBounces: 2 - m_PVREnvironmentMIS: 0 + m_PVREnvironmentImportanceSampling: 0 m_PVRFilteringMode: 0 m_PVRDenoiserTypeDirect: 0 m_PVRDenoiserTypeIndirect: 0 @@ -185,6 +185,8 @@ LightingSettings: m_PVRFilteringAtrousPositionSigmaIndirect: 2 m_PVRFilteringAtrousPositionSigmaAO: 1 m_PVRTiledBaking: 0 + m_NumRaysToShootPerTexel: -1 + m_RespectSceneVisibilityWhenBakingGI: 0 --- !u!1 &501161484 GameObject: m_ObjectHideFlags: 0 @@ -218,6 +220,7 @@ MonoBehaviour: InitScene: SceneLogoMovie InitDebugScene: SceneLogoMovie isJapanese: 0 + preferredFontSize: 28 --- !u!4 &501161486 Transform: m_ObjectHideFlags: 0 diff --git a/Assets/Scene/Scenes/SceneTitle.unity b/Assets/Scene/Scenes/SceneTitle.unity index 711d2ae83..86a6787a0 100644 --- a/Assets/Scene/Scenes/SceneTitle.unity +++ b/Assets/Scene/Scenes/SceneTitle.unity @@ -105,7 +105,7 @@ NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: - serializedVersion: 2 + serializedVersion: 3 agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 @@ -118,7 +118,7 @@ NavMeshSettings: cellSize: 0.16666666 manualTileSize: 0 tileSize: 256 - accuratePlacement: 0 + buildHeightMesh: 0 maxJobWorkers: 0 preserveTilesOutsideBounds: 0 debug: diff --git a/Assets/Scripts/Assembly-CSharp/CBackLogWnd.cs b/Assets/Scripts/Assembly-CSharp/CBackLogWnd.cs index a960e1ed4..480a99a5c 100644 --- a/Assets/Scripts/Assembly-CSharp/CBackLogWnd.cs +++ b/Assets/Scripts/Assembly-CSharp/CBackLogWnd.cs @@ -1,10 +1,8 @@ -using System; -using System.Collections.Generic; -using Qoo; -using Qoo.Application; +using Qoo.Application; using Qoo.Input; using Qoo.Message; using Qoo.SoundSystem; +using System.Collections.Generic; using UnityEngine; // Token: 0x020000A9 RID: 169 @@ -56,7 +54,16 @@ public class CBackLogWnd : UserBaseClass unityTextSprite.z = 1301; unityTextSprite.SetColor(new Color32(byte.MaxValue, byte.MaxValue, byte.MaxValue, byte.MaxValue)); unityTextSprite.SetTextColor(new Color32(byte.MaxValue, byte.MaxValue, byte.MaxValue, byte.MaxValue)); - unityTextSprite.AddText("♪", 28); + if (!UnityApp.PlatformApp.isJapanese) + { + UnityEngine.Debug.LogWarning(UnityApp.PlatformApp.preferredFontSize); + unityTextSprite.AddText("♪", UnityApp.PlatformApp.preferredFontSize); + } + else + { + unityTextSprite.AddText("♪", 28); + } + unityTextSprite.Show = false; } this.InitLog(); @@ -382,8 +389,18 @@ public class CBackLogWnd : UserBaseClass unityTextSprite.SetTextColor(new Color32(byte.MaxValue, byte.MaxValue, byte.MaxValue, byte.MaxValue)); unityTextSprite2.SetTextColor(new Color32(byte.MaxValue, byte.MaxValue, byte.MaxValue, byte.MaxValue)); } - unityTextSprite.AddText(linedata.pszTxt, 28); - unityTextSprite2.AddText("♪", 28); + if (!UnityApp.PlatformApp.isJapanese) + { + UnityEngine.Debug.LogWarning(UnityApp.PlatformApp.preferredFontSize); + unityTextSprite.AddText(linedata.pszTxt, UnityApp.PlatformApp.preferredFontSize); + unityTextSprite2.AddText("♪", UnityApp.PlatformApp.preferredFontSize); + + } + else + { + unityTextSprite.AddText(linedata.pszTxt, 28); + unityTextSprite2.AddText("♪", 28); + } if (linedata.nType == CBackLogWnd.LINETYPE.LINETYPE_MES) { unityTextSprite.x = 204; diff --git a/Assets/Scripts/Assembly-CSharp/CMessageText.cs b/Assets/Scripts/Assembly-CSharp/CMessageText.cs index 33dd2a9b1..768137af3 100644 --- a/Assets/Scripts/Assembly-CSharp/CMessageText.cs +++ b/Assets/Scripts/Assembly-CSharp/CMessageText.cs @@ -1,9 +1,8 @@ -using System; +using Qoo.Def; +using Qoo.Game; using System.Collections.Generic; +using System.Text; using System.Text.RegularExpressions; -using Qoo; -using Qoo.Def; -using Qoo.Game; using UnityEngine; // Token: 0x020000B2 RID: 178 @@ -25,7 +24,7 @@ public class CMessageText this.m_Clip.SetSize(0, 0); this.m_nChNum = 0; this.m_nClipWEx = 0; - this.m_isAutoRet = false; + this.m_isAutoRet = true; this.m_anDefCol = new Color32(byte.MaxValue, byte.MaxValue, byte.MaxValue, byte.MaxValue); this.m_anKeyCol = new Color32(byte.MaxValue, 192, 0, byte.MaxValue); this.m_KeyCursor.BgColor = new Color32(0, 0, 0, 0); @@ -33,7 +32,8 @@ public class CMessageText this.SpCode.AddRange(MsgDef.SP_CODES); this.LineCode.AddRange(MsgDef.LINETOP_CODES); this.m_isKerning = IsKerning; - } + + } // Token: 0x170000BD RID: 189 // (get) Token: 0x0600052C RID: 1324 RVA: 0x00013D1C File Offset: 0x00011F1C @@ -175,6 +175,49 @@ public class CMessageText // Token: 0x06000533 RID: 1331 RVA: 0x00014174 File Offset: 0x00012374 public void AddMessage(string szMsg, Color32 color, MSGFONTSIZE nFontType = MSGFONTSIZE.NORMAL, int nKeywordNo = -1) { + + int testWidth = 0; + if (!UnityApp.PlatformApp.isJapanese) + { + for (int i = 0; i < szMsg.Length; i++) + { + //Force diacritics to closest letter with no accent mark + if (Regex.IsMatch(szMsg[i].ToString(), "[À-ž]")) + { + szMsg = szMsg.Remove(i, 1).Insert(i, szMsg[i].ToString().Normalize(NormalizationForm.FormC).Normalize(NormalizationForm.FormD)); + } + //Auto line breaker based on character widths + BMGlyph glyph = this.font.Font.GetGlyph((int)szMsg[i], true); + if (glyph != null) + { + testWidth += glyph.width; + } + else + { + break; + } + if (szMsg[i] == '\n') + { + testWidth = 0; + } + if (testWidth > 960) + { + for (int j = i; j >= 0; j--) + { + if (szMsg[j] == ' ') + { + szMsg = szMsg.Remove(j, 1).Insert(j, "\n"); + i = j; + testWidth = 0; + + + break; + } + } + } + } + } + foreach (char c in szMsg) { char c2 = '\0'; @@ -484,7 +527,7 @@ public class CMessageText { this.AddChar('-', color, nFontType, true, nKeywordNo); } - return false; + return false; } if (this.m_CurPos.nX >= this.m_ChNum.nCx) { @@ -526,7 +569,7 @@ public class CMessageText if (CMessageText.IsHyphenation) { CharObject lastChrInfo = this.GetLastChrInfo(this.m_CurPos.nY); - return Regex.IsMatch(lastChrInfo.code.ToString(), "^[a-zA-Z0-9]+$") && Regex.IsMatch(chCode.ToString(), "^[a-zA-Z0-9]+$"); + return Regex.IsMatch(lastChrInfo.code.ToString(), "^[a-zA-Z0-9]+$") && Regex.IsMatch(chCode.ToString(), "^[a-zA-Z0-9]+$"); } return false; } @@ -659,7 +702,7 @@ public class CMessageText // Token: 0x06000550 RID: 1360 RVA: 0x00014FF8 File Offset: 0x000131F8 private CharObject GetLastChrInfo(int y) { - for (int i = this.m_ChNum.nCx - 1; i >= 0; i--) + for (int i = this.m_ChNum.nCx - 1; i >= 0; i--) { CharObject chrInfo = this.GetChrInfo(i, y); if (chrInfo != null && chrInfo.code != '\0') diff --git a/Assets/Scripts/Assembly-CSharp/CSVCGList.cs b/Assets/Scripts/Assembly-CSharp/CSVCGList.cs index 30ec98b1a..6aaca946b 100644 --- a/Assets/Scripts/Assembly-CSharp/CSVCGList.cs +++ b/Assets/Scripts/Assembly-CSharp/CSVCGList.cs @@ -66,7 +66,7 @@ public class CSVCGList // Token: 0x06000A2D RID: 2605 RVA: 0x0002D5DC File Offset: 0x0002B7DC public void Update() { - this.read = SysData.IsReadCG(this.fpath); + this.read = SysData.IsReadCG(this.fpath); } // Token: 0x04000851 RID: 2129 diff --git a/Assets/Scripts/Assembly-CSharp/CSVSceneMemory.cs b/Assets/Scripts/Assembly-CSharp/CSVSceneMemory.cs index 2d9950fd0..9c1b7c0fe 100644 --- a/Assets/Scripts/Assembly-CSharp/CSVSceneMemory.cs +++ b/Assets/Scripts/Assembly-CSharp/CSVSceneMemory.cs @@ -24,8 +24,9 @@ public class CSVSceneMemory // Token: 0x06000A61 RID: 2657 RVA: 0x0002E01C File Offset: 0x0002C21C public void Update() { + //Set to True for 100% Scene Unlock bool flag = SysData.IsRead(this.triggerKs, (this.triggerLabel.Length != 0) ? this.triggerLabel.Substring(1) : string.Empty, 0); - this.collectCount = ((!flag) ? 0 : 1); + this.collectCount = ((!flag) ? 0 : 1); } // Token: 0x04000864 RID: 2148 diff --git a/Assets/Scripts/Assembly-CSharp/GalleryInputNameDialogWindow.cs b/Assets/Scripts/Assembly-CSharp/GalleryInputNameDialogWindow.cs index 73faf8786..05ad97d03 100644 --- a/Assets/Scripts/Assembly-CSharp/GalleryInputNameDialogWindow.cs +++ b/Assets/Scripts/Assembly-CSharp/GalleryInputNameDialogWindow.cs @@ -145,8 +145,9 @@ public class GalleryInputNameDialogWindow : BaseWindow if (line == 0) { string galleryInputNameDialog_Name = UIValue.GalleryInputNameDialog_Name; - string paramString = GameData.GetParamString("familyname", string.Empty); - return string.Format("Is {0} {1} correct?", galleryInputNameDialog_Name, paramString); + string galleryInputNameDialog_LastName = UIValue.GalleryInputNameDialog_LastName; + //string paramString = GameData.GetParamString("familyname", string.Empty); + return string.Format("Is {0} {1} correct?", galleryInputNameDialog_Name, galleryInputNameDialog_LastName); } if (line != 1) { diff --git a/Assets/Scripts/Assembly-CSharp/GalleryInputNameKeyboardWindow.cs b/Assets/Scripts/Assembly-CSharp/GalleryInputNameKeyboardWindow.cs index ef48e3454..71a99117c 100644 --- a/Assets/Scripts/Assembly-CSharp/GalleryInputNameKeyboardWindow.cs +++ b/Assets/Scripts/Assembly-CSharp/GalleryInputNameKeyboardWindow.cs @@ -1,4 +1,5 @@ -using System; +using Qoo.Game; +using System; using System.Collections; using UnityEngine; @@ -15,7 +16,8 @@ public class GalleryInputNameKeyboardWindow : BaseWindow public IEnumerator Run() { string initvalue = UIValue.GalleryInputNameDialog_Name; - yield return NameInputKeyboard.Open(initvalue, false); + string initvalue2 = UIValue.GalleryInputNameDialog_LastName; + yield return NameInputKeyboard.Open(initvalue, initvalue2, false); /*switch (Application.platform) { case RuntimePlatform.IPhonePlayer: @@ -26,7 +28,8 @@ public class GalleryInputNameKeyboardWindow : BaseWindow //NameInputKeyboard.DebugInputText = initvalue; IL_82: UIValue.GalleryInputNameDialog_Name = NameInputKeyboard.InputText; - UIValue.GalleryInputNameDialog_Exit = GalleryInputNameDialogExitType.INPUT; + UIValue.GalleryInputNameDialog_LastName = NameInputKeyboard.InputTextLastName; + UIValue.GalleryInputNameDialog_Exit = GalleryInputNameDialogExitType.INPUT; base.DeleteLastAddScene(); NameInputKeyboard.Close(); yield break; diff --git a/Assets/Scripts/Assembly-CSharp/GalleryInputNameWindow.cs b/Assets/Scripts/Assembly-CSharp/GalleryInputNameWindow.cs index 9f313b419..2bcd20e9d 100644 --- a/Assets/Scripts/Assembly-CSharp/GalleryInputNameWindow.cs +++ b/Assets/Scripts/Assembly-CSharp/GalleryInputNameWindow.cs @@ -12,7 +12,8 @@ public class GalleryInputNameWindow : BaseWindow { UIValue.GalleryInputNameDialog_Exit = GalleryInputNameDialogExitType.INVALID; UIValue.GalleryInputNameDialog_Name = GameData.GetParamString("firstname", string.Empty); - this.edit = true; + UIValue.GalleryInputNameDialog_LastName = GameData.GetParamString("familyname", string.Empty); + this.edit = true; this.wait = 0f; } @@ -79,16 +80,17 @@ public class GalleryInputNameWindow : BaseWindow case GalleryInputNameDialogExitType.INPUT: { UIValue.GalleryInputNameDialog_Exit = GalleryInputNameDialogExitType.INVALID; - string galleryInputNameDialog_Name = UIValue.GalleryInputNameDialog_Name; - if (galleryInputNameDialog_Name.Length == 0 || this.checkSpaceOnly(galleryInputNameDialog_Name)) + string galleryInputNameDialog_Name = UIValue.GalleryInputNameDialog_Name; + string galleryInputNameDialog_LastName = UIValue.GalleryInputNameDialog_LastName; + if (galleryInputNameDialog_Name.Length == 0 || this.checkSpaceOnly(galleryInputNameDialog_Name) || galleryInputNameDialog_LastName.Length == 0 || this.checkSpaceOnly(galleryInputNameDialog_LastName)) { UIValue.GalleryInputNameDialog_Type = GalleryInputNameDialogType.EMPTY; } - else if (galleryInputNameDialog_Name.Length > 7) + else if (galleryInputNameDialog_Name.Length > 7 || galleryInputNameDialog_LastName.Length > 7) { UIValue.GalleryInputNameDialog_Type = GalleryInputNameDialogType.OVER; } - else if (!this.checkValidString(galleryInputNameDialog_Name)) + else if (!this.checkValidString(galleryInputNameDialog_Name) || !this.checkValidString(galleryInputNameDialog_LastName)) { UIValue.GalleryInputNameDialog_Type = GalleryInputNameDialogType.INVALIDCHAR; } @@ -102,6 +104,7 @@ public class GalleryInputNameWindow : BaseWindow case GalleryInputNameDialogExitType.YES: UIValue.GalleryInputNameDialog_Exit = GalleryInputNameDialogExitType.INVALID; GameData.SetParamString("firstname", string.Empty, UIValue.GalleryInputNameDialog_Name); + GameData.SetParamString("familyname", string.Empty, UIValue.GalleryInputNameDialog_LastName); SceneManager.BackScene(); break; case GalleryInputNameDialogExitType.NO: diff --git a/Assets/Scripts/Assembly-CSharp/GalleryMovieWindow.cs b/Assets/Scripts/Assembly-CSharp/GalleryMovieWindow.cs index 26b4b9603..f81a8d19a 100644 --- a/Assets/Scripts/Assembly-CSharp/GalleryMovieWindow.cs +++ b/Assets/Scripts/Assembly-CSharp/GalleryMovieWindow.cs @@ -40,7 +40,7 @@ public class GalleryMovieWindow : BaseWindow { //TODO fix movie playing. either make platform specific versions OR make platform agnostic //yield return base.StartCoroutine(MovieManager.PlayMovie("mp4/high/op_movie.mp4", FullScreenMovieControlMode.CancelOnInput)); - yield return base.StartCoroutine(MovieManager.PlayMovie("mp4/high/op_movie.mp4", this.gameObject)); + yield return base.StartCoroutine(MovieManager.PlayMovie("mp4/high/op_movie.webm", this.gameObject)); this.state = GalleryMovieWindow.STATE.END; yield break; } diff --git a/Assets/Scripts/Assembly-CSharp/Game/GameInitilize.cs b/Assets/Scripts/Assembly-CSharp/Game/GameInitilize.cs index 1cf42637a..9783ba9a1 100644 --- a/Assets/Scripts/Assembly-CSharp/Game/GameInitilize.cs +++ b/Assets/Scripts/Assembly-CSharp/Game/GameInitilize.cs @@ -32,12 +32,20 @@ namespace Game msgwnd_STYLE_DATA.posFrm = new Point3(0, 181, 800); msgwnd_STYLE_DATA.posName[0] = new Point3(86, 170, 803); msgwnd_STYLE_DATA.posName[1] = new Point3(126, 170, 802); - msgwnd_STYLE_DATA.posTxt = new Point3(109, 198, 801); - msgwnd_STYLE_DATA.posFace = new Point3(0, 173, 803); + if (!UnityApp.PlatformApp.isJapanese) + { + msgwnd_STYLE_DATA.posTxt = new Point3(104, 198, 801); + msgwnd_STYLE_DATA.sizeTxt = new Size(704, 136); + } + else + { + msgwnd_STYLE_DATA.posTxt = new Point3(109, 198, 801); + msgwnd_STYLE_DATA.sizeTxt = new Size(654, 136); + } + msgwnd_STYLE_DATA.posFace = new Point3(0, 173, 803); msgwnd_STYLE_DATA.posBrk = new Point3(459, 252, 802); msgwnd_STYLE_DATA.sizeBrkSplit = new Size(32, 1); msgwnd_STYLE_DATA.nBrkWait = 4; - msgwnd_STYLE_DATA.sizeTxt = new Size(654, 136); msgwnd_STYLE_DATA.nTxtWEx = 58; msgwnd_STYLE_DATA.bTxtAutoRet = true; msgwnd_STYLE_DATA.colTxt = new Color32(byte.MaxValue, byte.MaxValue, byte.MaxValue, byte.MaxValue); diff --git a/Assets/Scripts/Assembly-CSharp/LogoMovieWindow.cs b/Assets/Scripts/Assembly-CSharp/LogoMovieWindow.cs index ef75d4020..477cb6070 100644 --- a/Assets/Scripts/Assembly-CSharp/LogoMovieWindow.cs +++ b/Assets/Scripts/Assembly-CSharp/LogoMovieWindow.cs @@ -34,7 +34,7 @@ public class LogoMovieWindow : BaseWindow { //TODO fix movie playing. either make platform specific versions OR make platform agnostic //yield return base.StartCoroutine(MovieManager.PlayMovie("mp4/normal/quinrose_logo_8.mp4", FullScreenMovieControlMode.CancelOnInput)); - yield return base.StartCoroutine(MovieManager.PlayMovie("mp4/normal/quinrose_logo_8.mp4", this.gameObject)); + yield return base.StartCoroutine(MovieManager.PlayMovie("mp4/normal/quinrose_logo_8.webm", this.gameObject)); this.state = LogoMovieWindow.STATE.END; yield break; } diff --git a/Assets/Scripts/Assembly-CSharp/MovieDef.cs b/Assets/Scripts/Assembly-CSharp/MovieDef.cs index bc26db533..4e0409da2 100644 --- a/Assets/Scripts/Assembly-CSharp/MovieDef.cs +++ b/Assets/Scripts/Assembly-CSharp/MovieDef.cs @@ -4,7 +4,7 @@ public class MovieDef { // Token: 0x04000550 RID: 1360 - public const string MOVIE_EXT = ".mp4"; + public const string MOVIE_EXT = ".webm"; // Token: 0x04000551 RID: 1361 public const string EFFECT_MOVIE_EXT = ".ogv"; diff --git a/Assets/Scripts/Assembly-CSharp/MovieManager.cs b/Assets/Scripts/Assembly-CSharp/MovieManager.cs index cd11454c7..8e3028f1f 100644 --- a/Assets/Scripts/Assembly-CSharp/MovieManager.cs +++ b/Assets/Scripts/Assembly-CSharp/MovieManager.cs @@ -42,7 +42,7 @@ public static class MovieManager VideoPlayer m_tex = movieFrame.obj.transform.gameObject.AddComponent(); m_tex.playOnAwake = true; Material newMat = new Material(Shader.Find("QO/Sprite") as Shader); - m_tex.url = Application.streamingAssetsPath + "/" + path + ".mp4"; + m_tex.url = Application.streamingAssetsPath + "/" + path + ".webm"; m_tex.isLooping = false; movieFrame.SetMaterial(newMat, 960, 544); m_tex.renderMode = UnityEngine.Video.VideoRenderMode.MaterialOverride; diff --git a/Assets/Scripts/Assembly-CSharp/MovieTex.cs b/Assets/Scripts/Assembly-CSharp/MovieTex.cs index 1e31b3891..c54e1da2e 100644 --- a/Assets/Scripts/Assembly-CSharp/MovieTex.cs +++ b/Assets/Scripts/Assembly-CSharp/MovieTex.cs @@ -46,7 +46,7 @@ public class MovieTex : MonoBehaviour /*this.m_tex.url = "file:///" + Application.streamingAssetsPath + "/" + path; this.m_tex.isLooping = isLoop;*/ //this.m_tex.m_path = path + ".mp4"; - this.m_tex.url = "file:///" + Application.streamingAssetsPath + "/" + path + ".mp4"; + this.m_tex.url = "file:///" + Application.streamingAssetsPath + "/" + path + ".webm"; this.m_tex.isLooping = isLoop; this.m_tex.renderMode = UnityEngine.Video.VideoRenderMode.MaterialOverride; //this.m_tex.targetMaterialRenderer = newMat; diff --git a/Assets/Scripts/Assembly-CSharp/NameInputKeyboard.cs b/Assets/Scripts/Assembly-CSharp/NameInputKeyboard.cs index 53b347b82..749745ced 100644 --- a/Assets/Scripts/Assembly-CSharp/NameInputKeyboard.cs +++ b/Assets/Scripts/Assembly-CSharp/NameInputKeyboard.cs @@ -20,7 +20,8 @@ public class NameInputKeyboard : MonoBehaviour } NameInputKeyboard.m_instance = gameObject.AddComponent(); NameInputKeyboard.m_instance.m_inputText = string.Empty; - } + NameInputKeyboard.m_instance.m_inputTextLastName = string.Empty; + } return NameInputKeyboard.m_instance; } } @@ -45,33 +46,57 @@ public class NameInputKeyboard : MonoBehaviour } } - // Token: 0x0600060E RID: 1550 RVA: 0x00019310 File Offset: 0x00017510 - public static IEnumerator Open(string defaultString = "", bool isUnitySubTask = false) + // Token: 0x170000D4 RID: 212 + // (get) Token: 0x0600060C RID: 1548 RVA: 0x000192F4 File Offset: 0x000174F4 + public static string InputTextLastName + { + get + { + return NameInputKeyboard.Instance.m_inputTextLastName; + } + } + + // Token: 0x170000D5 RID: 213 + // (set) Token: 0x0600060D RID: 1549 RVA: 0x00019300 File Offset: 0x00017500 + public static string DebugInputTextLastName + { + set + { + NameInputKeyboard.Instance.m_inputTextLastName = value; + } + } + + // Token: 0x0600060E RID: 1550 RVA: 0x00019310 File Offset: 0x00017510 + public static IEnumerator Open(string defaultString = "", string defaultString2 = "", bool isUnitySubTask = false) { if (isUnitySubTask) { - yield return NameInputKeyboard.Instance.StartCoroutine(ScreenKeyboardManager.Open(defaultString)); + //Debug.LogWarning("Name" + defaultString + " = " + defaultString2); + yield return NameInputKeyboard.Instance.StartCoroutine(ScreenKeyboardManager.Open(defaultString, defaultString2)); } else { - yield return ScreenKeyboardManager.Open(defaultString); + yield return ScreenKeyboardManager.Open(defaultString, defaultString2); } if (ScreenKeyboardManager.IsCancel) { if (UnityApp.Instance.isJapanese) { NameInputKeyboard.Instance.m_inputText = "アリス"; - } + NameInputKeyboard.Instance.m_inputTextLastName = "リデル"; + } else { NameInputKeyboard.Instance.m_inputText = "Alice"; - } + NameInputKeyboard.Instance.m_inputTextLastName = "Liddell"; + } } else { NameInputKeyboard.Instance.m_inputText = ScreenKeyboardManager.InputText; - } + NameInputKeyboard.Instance.m_inputTextLastName = ScreenKeyboardManager.InputTextLastName; + } yield break; } @@ -90,4 +115,6 @@ public class NameInputKeyboard : MonoBehaviour // Token: 0x040005A8 RID: 1448 private string m_inputText; + + private string m_inputTextLastName; } diff --git a/Assets/Scripts/Assembly-CSharp/Pathing.cs b/Assets/Scripts/Assembly-CSharp/Pathing.cs index 6f7790001..df7342738 100644 --- a/Assets/Scripts/Assembly-CSharp/Pathing.cs +++ b/Assets/Scripts/Assembly-CSharp/Pathing.cs @@ -22,7 +22,17 @@ public static class Pathing get { string path = Application.streamingAssetsPath.TrimStart('/'); - return "file://localhost/" + path; + if(Application.platform == RuntimePlatform.Android) + { + string url = path; + //UnityEngine.Debug.LogWarning(url); + return url; + } + else + { + return "file://localhost/" + path; + } + } } diff --git a/Assets/Scripts/Assembly-CSharp/Qoo/Def/FontDef.cs b/Assets/Scripts/Assembly-CSharp/Qoo/Def/FontDef.cs index 242cca2e2..496300bb6 100644 --- a/Assets/Scripts/Assembly-CSharp/Qoo/Def/FontDef.cs +++ b/Assets/Scripts/Assembly-CSharp/Qoo/Def/FontDef.cs @@ -11,8 +11,13 @@ namespace Qoo.Def return FontDef.FontInfo[(int)eSize]; } - // Token: 0x040004D7 RID: 1239 - public const bool KERNING_MODE = true; + public static void SetFontInfo(FONTINFO[] newFontInfo) + { + FontDef.FontInfo = newFontInfo; + } + + // Token: 0x040004D7 RID: 1239 + public const bool KERNING_MODE = true; // Token: 0x040004D8 RID: 1240 public const int FONT_SMALL_FONT = 22; diff --git a/Assets/Scripts/Assembly-CSharp/Qoo/Game/GameData.cs b/Assets/Scripts/Assembly-CSharp/Qoo/Game/GameData.cs index b804e39f2..331c36590 100644 --- a/Assets/Scripts/Assembly-CSharp/Qoo/Game/GameData.cs +++ b/Assets/Scripts/Assembly-CSharp/Qoo/Game/GameData.cs @@ -324,7 +324,7 @@ namespace Qoo.Game // Token: 0x0600009B RID: 155 RVA: 0x00004340 File Offset: 0x00002540 public static void StartVoiceCheck() { - GameData.SetParamInt("voicecheck", string.Empty, 1); + GameData.SetParamInt("voicecheck", string.Empty, 0); } // Token: 0x0600009C RID: 156 RVA: 0x00004354 File Offset: 0x00002554 @@ -342,7 +342,7 @@ namespace Qoo.Game // Token: 0x0600009E RID: 158 RVA: 0x00004388 File Offset: 0x00002588 public static bool IsFullVoiceCheck() { - return GameData.GetParamInt("voicecheck", string.Empty) > 1; + return GameData.GetParamInt("voicecheck", string.Empty) > 0; } // Token: 0x0600009F RID: 159 RVA: 0x000043A8 File Offset: 0x000025A8 @@ -428,13 +428,24 @@ namespace Qoo.Game } // Token: 0x060000A9 RID: 169 RVA: 0x000044D8 File Offset: 0x000026D8 - public static void SetFirstName(string name) + public static void SetLastName(string name) { - GameData.SetParamString("firstname", string.Empty, name); + GameData.SetParamString("familyname", string.Empty, name); } - // Token: 0x060000AA RID: 170 RVA: 0x000044EC File Offset: 0x000026EC - public static byte[] Save() + public static string GetLastName() + { + return GameData.GetParamString("familyname", string.Empty); + } + + // Token: 0x060000A9 RID: 169 RVA: 0x000044D8 File Offset: 0x000026D8 + public static void SetFirstName(string name) + { + GameData.SetParamString("firstname", string.Empty, name); + } + + // Token: 0x060000AA RID: 170 RVA: 0x000044EC File Offset: 0x000026EC + public static byte[] Save() { if (!GameData.m_isLoadData) { @@ -473,7 +484,8 @@ namespace Qoo.Game GameParam gameParam = new GameParam(); gameParam.Copy(GameData.LockParam); gameParam.Set("firstname", GameData.GetFirstName()); - return gameParam; + gameParam.Set("familyname", GameData.GetLastName()); + return gameParam; } // Token: 0x060000AF RID: 175 RVA: 0x000045AC File Offset: 0x000027AC diff --git a/Assets/Scripts/Assembly-CSharp/Qoo/Game/KsExec.cs b/Assets/Scripts/Assembly-CSharp/Qoo/Game/KsExec.cs index 010b31103..2c4aa6bc5 100644 --- a/Assets/Scripts/Assembly-CSharp/Qoo/Game/KsExec.cs +++ b/Assets/Scripts/Assembly-CSharp/Qoo/Game/KsExec.cs @@ -85,20 +85,24 @@ namespace Qoo.Game if (UnityApp.Instance.isJapanese) { KsExec.editName = "アリス"; - } + KsExec.editLastName = "リデル"; + } else { KsExec.editName = "Alice"; - } + KsExec.editLastName = "Liddell"; + } NameInputKeyboard.DebugInputText = KsExec.editName; - KsExec.KeyboardMain(); + NameInputKeyboard.DebugInputTextLastName = KsExec.editLastName; + KsExec.KeyboardMain(); } else if (KsExec.confirm) { if (KsExec.confirmResult) { GameData.SetParamString("firstname", string.Empty, KsExec.editName); - NameInputKeyboard.Close(); + GameData.SetParamString("familyname", string.Empty, KsExec.editLastName); + NameInputKeyboard.Close(); return true; } KsExec.KeyboardMain(); @@ -108,7 +112,8 @@ namespace Qoo.Game else { KsExec.editName = NameInputKeyboard.InputText; - if (KsExec.editName.Length == 0 || KsExec.checkSpaceOnly(KsExec.editName)) + KsExec.editLastName = NameInputKeyboard.InputTextLastName; + if (KsExec.editName.Length == 0 || KsExec.checkSpaceOnly(KsExec.editName)) { UnityTask.SetSubNoUnityTask(MessageDlg.ExecDlg("No name entered", null)); KsExec.KeyboardMain(); @@ -126,9 +131,10 @@ namespace Qoo.Game else { string arg = KsExec.editName; - string paramString = GameData.GetParamString("familyname", string.Empty); + string arg2 = KsExec.editLastName; + string paramString = GameData.GetParamString("familyname", string.Empty); string[] msgs; - if (UnityApp.Instance.isJapanese) + /*if (UnityApp.Instance.isJapanese) { msgs = new string[] { @@ -143,8 +149,25 @@ namespace Qoo.Game string.Format("Is {0} {1} correct?", arg, paramString) }; - } - UnityTask.SetSubNoUnityTask(MessageDlg.ExecDlg(msgs, new Action(KsExec.SetResult))); + }*/ + + if (UnityApp.Instance.isJapanese) + { + msgs = new string[] + { + string.Format("「{0}＝{1}」です。", arg, arg2), + "よろしいですか？" + }; + } + else + { + msgs = new string[] + { + string.Format("Is {0} {1} correct?", arg, arg2) + }; + + } + UnityTask.SetSubNoUnityTask(MessageDlg.ExecDlg(msgs, new Action(KsExec.SetResult))); KsExec.confirm = true; KsExec.confirmResult = false; } @@ -168,7 +191,7 @@ namespace Qoo.Game // Token: 0x06000614 RID: 1556 RVA: 0x00019604 File Offset: 0x00017804 private static void KeyboardMain() { - UnityTask.SetSubTask(NameInputKeyboard.Open(KsExec.editName, true)); + UnityTask.SetSubTask(NameInputKeyboard.Open(KsExec.editName, KsExec.editLastName, true)); /*switch (UnityEngine.Application.platform) { case RuntimePlatform.IPhonePlayer: @@ -259,5 +282,7 @@ namespace Qoo.Game // Token: 0x040005AB RID: 1451 private static string editName = string.Empty; - } + + private static string editLastName = string.Empty; + } } diff --git a/Assets/Scripts/Assembly-CSharp/Qoo/Game/SysData.cs b/Assets/Scripts/Assembly-CSharp/Qoo/Game/SysData.cs index 0801ef886..4d667973c 100644 --- a/Assets/Scripts/Assembly-CSharp/Qoo/Game/SysData.cs +++ b/Assets/Scripts/Assembly-CSharp/Qoo/Game/SysData.cs @@ -66,7 +66,7 @@ namespace Qoo.Game { SysData.InitCg(); SysData.InitBgm(); - return SysData.m_Param.Init(); + return SysData.m_Param.Init(); } // Token: 0x06000119 RID: 281 RVA: 0x00005EBC File Offset: 0x000040BC @@ -281,7 +281,7 @@ namespace Qoo.Game // Token: 0x0600013B RID: 315 RVA: 0x00006170 File Offset: 0x00004370 public static bool IsReadCG(string name) { - return SysData.m_LookCg.IsLook(FileId.Normalize(name)); + return SysData.m_LookCg.IsLook(FileId.Normalize(name)); } // Token: 0x0600013C RID: 316 RVA: 0x00006184 File Offset: 0x00004384 @@ -297,6 +297,7 @@ namespace Qoo.Game } // Token: 0x0600013E RID: 318 RVA: 0x000061A4 File Offset: 0x000043A4 + //Will 100% all CGs if called public static void SetReadCGAll() { SysData.m_LookCg.SetAll(true); diff --git a/Assets/Scripts/Assembly-CSharp/ScreenKeyboardManager.cs b/Assets/Scripts/Assembly-CSharp/ScreenKeyboardManager.cs index f707ebc0c..8c71262c3 100644 --- a/Assets/Scripts/Assembly-CSharp/ScreenKeyboardManager.cs +++ b/Assets/Scripts/Assembly-CSharp/ScreenKeyboardManager.cs @@ -1,7 +1,9 @@  using System; using System.Collections; +using UnityEditor; using UnityEngine; +using UnityEngine.EventSystems; using UnityEngine.UI; // Token: 0x02000174 RID: 372 @@ -21,8 +23,12 @@ public class ScreenKeyboardManager : MonoBehaviour gameObject = new GameObject("_ScreenKeyboardManager"); } ScreenKeyboardManager.m_instance = gameObject.AddComponent(); + gameObject.AddComponent(); + gameObject.AddComponent(); ScreenKeyboardManager.m_instance.m_inputText = string.Empty; - } + ScreenKeyboardManager.m_instance.m_inputTextLastName = string.Empty; + ScreenKeyboardManager.m_instance.isKeyboardActive = true; + } return ScreenKeyboardManager.m_instance; } } @@ -47,9 +53,29 @@ public class ScreenKeyboardManager : MonoBehaviour } } - // Token: 0x1700015D RID: 349 - // (get) Token: 0x06000A96 RID: 2710 RVA: 0x0002EAB4 File Offset: 0x0002CCB4 - public static bool IsCancel + // Token: 0x1700015B RID: 347 + // (get) Token: 0x06000A94 RID: 2708 RVA: 0x0002EA98 File Offset: 0x0002CC98 + public static string InputTextLastName + { + get + { + return ScreenKeyboardManager.Instance.m_inputTextLastName; + } + } + + // Token: 0x1700015C RID: 348 + // (set) Token: 0x06000A95 RID: 2709 RVA: 0x0002EAA4 File Offset: 0x0002CCA4 + public static string DebugInputTextLastName + { + set + { + ScreenKeyboardManager.Instance.m_inputTextLastName = value; + } + } + + // Token: 0x1700015D RID: 349 + // (get) Token: 0x06000A96 RID: 2710 RVA: 0x0002EAB4 File Offset: 0x0002CCB4 + public static bool IsCancel { get { @@ -59,108 +85,191 @@ public class ScreenKeyboardManager : MonoBehaviour } // Token: 0x06000A97 RID: 2711 RVA: 0x0002EAC8 File Offset: 0x0002CCC8 - public static IEnumerator Open(string defaultString = "") + public static IEnumerator Open(string defaultString = "", string defaultString2 = "") { - bool isKeyboardActive = true; - int width = 350; - int height = 50; - int fontSize = 24; - Color fontColor = Color.white; - Color inputBoxColor = new Color(87f/255f,48f / 255f, 55f / 255f, 255f / 255f); - - GameObject manager= ScreenKeyboardManager.Instance.gameObject; + //ScreenKeyboardManager.m_instance.isKeyboardActive = true; + //Debug.LogWarning("Name: " + defaultString + " = " + defaultString2); + GameObject manager = ScreenKeyboardManager.Instance.gameObject; Canvas canvas = manager.AddComponent(); - canvas.gameObject.AddComponent(); + CanvasScaler scaler = canvas.gameObject.AddComponent(); + scaler.uiScaleMode = CanvasScaler.ScaleMode.ScaleWithScreenSize; canvas.gameObject.AddComponent(); canvas.renderMode = RenderMode.ScreenSpaceOverlay; - GameObject container = new GameObject(); - container.name = "InputField"; - container.transform.parent = canvas.transform; - container.AddComponent(); - - Image _image = container.AddComponent(); - //_image.sprite = UnityEditor.AssetDatabase.GetBuiltinExtraResource("UI/Skin/UISprite.psd"); - _image.type = Image.Type.Sliced; - _image.color = inputBoxColor; - - Font font = (Font)Resources.Load("font/Cabin"); - - GameObject textContainer = new GameObject(); - textContainer.name = "Text"; - textContainer.transform.parent = container.transform; - Text _text = textContainer.AddComponent(); - RectTransform _textTransform = _text.GetComponent(); - _textTransform.sizeDelta = new Vector2(width, height); - _text.supportRichText = false; - _text.color = fontColor; - _text.font = font; - _text.fontSize = fontSize; - _text.horizontalOverflow = HorizontalWrapMode.Overflow; - _text.alignment = TextAnchor.MiddleCenter; - - GameObject placeholderContainer = new GameObject(); - placeholderContainer.name = "Placeholder"; - placeholderContainer.transform.parent = container.transform; - Text _placeholder = placeholderContainer.AddComponent(); - RectTransform _placeholderTransform = _placeholder.GetComponent(); - _placeholderTransform.sizeDelta = new Vector2(width, height); - _placeholder.color = fontColor; - _placeholder.font = font; - _placeholder.fontSize = fontSize; - _placeholder.fontStyle = FontStyle.Italic; - _placeholder.supportRichText = false; - _placeholder.horizontalOverflow = HorizontalWrapMode.Overflow; - _placeholder.text = "Enter your Name"; - _placeholder.alignment = TextAnchor.MiddleCenter; - - InputField _inputField = container.AddComponent(); - _inputField.targetGraphic = _image; - _inputField.textComponent = _text; - _inputField.placeholder = _placeholder; - RectTransform _inputFieldTransform = _inputField.GetComponent(); - _inputFieldTransform.localPosition = new Vector3(0, 0, 0); - _inputFieldTransform.sizeDelta = new Vector2(width, height); - _inputField.characterLimit = 7; - _inputField.characterValidation = InputField.CharacterValidation.Name; - _inputField.text = defaultString; - - string nameString = _inputField.text; - - while (isKeyboardActive) + InputField _inputFieldFirstName = createInputBox(canvas, "FirstName", defaultString, "Input First Name", new Vector3(-250, 50, 0)); + InputField _inputFieldLastName = createInputBox(canvas, "LastName", defaultString2, "Input Last Name", new Vector3(0, 50, 0)); + + createEqualsBox(canvas, "Equals", new Vector3(-125, 50, 0)); + createButton(canvas, "SubmitButton", new Vector3(-125, -35, 0)); + + string firstNameString = _inputFieldFirstName.text; + string lastNameString = _inputFieldLastName.text; + + while (ScreenKeyboardManager.m_instance.isKeyboardActive) { yield return 0; - if (Input.GetKeyDown(KeyCode.Return)) - { - nameString = _inputField.text; - ScreenKeyboardManager.Instance.m_inputText = nameString; - GameObject.Destroy(canvas.gameObject); + /*if (Input.GetKeyDown(KeyCode.Return)) + { + firstNameString = _inputFieldFirstName.text; + lastNameString = _inputFieldLastName.text; + ScreenKeyboardManager.Instance.m_inputText = firstNameString; + ScreenKeyboardManager.Instance.m_inputTextLastName = lastNameString; + GameObject.Destroy(canvas.gameObject); isKeyboardActive = false; - } + }*/ } - - //TODO fix TouchScreenKeyboard issue - /*ScreenKeyboardManager.Instance.m_inputText = defaultString; - ScreenKeyboardManager.Instance.m_keyboard = TouchScreenKeyboard.Open(defaultString, TouchScreenKeyboardType.NamePhonePad); - while (!ScreenKeyboardManager.Instance.m_keyboard.active) - { - yield return 0; - } - while (ScreenKeyboardManager.Instance.m_keyboard.active) - { - yield return 0; - } - if (ScreenKeyboardManager.Instance.m_keyboard.done) - { - ScreenKeyboardManager.Instance.m_inputText = ScreenKeyboardManager.Instance.m_keyboard.text; - }*/ yield break; } - // Token: 0x06000A98 RID: 2712 RVA: 0x0002EAEC File Offset: 0x0002CCEC - public static void Close() + public static InputField createInputBox(Canvas canvas, string objectName, string defaultString, string placeholderString, Vector3 position) + { + int width = 200; + int height = 50; + int fontSize = 24; + Color fontColor = Color.white; + Color inputBoxColor = new Color(87f / 255f, 48f / 255f, 55f / 255f, 255f / 255f); + + GameObject container = new GameObject(); + container.name = objectName; + container.transform.parent = canvas.transform; + container.AddComponent(); + + Image _image = container.AddComponent(); + //_image.sprite = UnityEditor.AssetDatabase.GetBuiltinExtraResource("UI/Skin/UISprite.psd"); + _image.type = Image.Type.Sliced; + _image.color = inputBoxColor; + + Font font = (Font)Resources.Load("font/Cabin"); + + GameObject textContainer = new GameObject(); + textContainer.name = "Text"; + textContainer.transform.parent = container.transform; + container.transform.localScale = new Vector3(1, 1, 1); + Text _text = textContainer.AddComponent(); + RectTransform _textTransform = _text.GetComponent(); + _textTransform.sizeDelta = new Vector2(width, height); + _text.supportRichText = false; + _text.color = fontColor; + _text.font = font; + _text.fontSize = fontSize; + _text.horizontalOverflow = HorizontalWrapMode.Overflow; + _text.alignment = TextAnchor.MiddleCenter; + + GameObject placeholderContainer = new GameObject(); + placeholderContainer.name = "Placeholder"; + placeholderContainer.transform.parent = container.transform; + Text _placeholder = placeholderContainer.AddComponent(); + RectTransform _placeholderTransform = _placeholder.GetComponent(); + _placeholderTransform.sizeDelta = new Vector2(width, height); + _placeholder.color = fontColor; + _placeholder.font = font; + _placeholder.fontSize = fontSize; + _placeholder.fontStyle = FontStyle.Italic; + _placeholder.supportRichText = false; + _placeholder.horizontalOverflow = HorizontalWrapMode.Overflow; + _placeholder.text = placeholderString; + _placeholder.alignment = TextAnchor.MiddleCenter; + + InputField _inputField = container.AddComponent(); + _inputField.targetGraphic = _image; + _inputField.textComponent = _text; + _inputField.placeholder = _placeholder; + RectTransform _inputFieldTransform = _inputField.GetComponent(); + _inputFieldTransform.localPosition = position; + _inputFieldTransform.sizeDelta = new Vector2(width, height); + _inputField.characterLimit = 7; + _inputField.characterValidation = InputField.CharacterValidation.Name; + _inputField.text = defaultString; + return _inputField; + } + + public static void createButton(Canvas canvas, string objectName, Vector3 position) + { + int width = 150; + int height = 50; + int fontSize = 24; + Color fontColor = Color.white; + Color inputBoxColor = new Color(242f / 255f, 151f / 255f, 161f / 255f, 255f / 255f); + + GameObject container = new GameObject(); + container.name = objectName; + container.transform.parent = canvas.transform; + container.transform.localPosition = position; + container.AddComponent(); + + + Image _image = container.AddComponent(); + _image.type = Image.Type.Sliced; + _image.color = inputBoxColor; + Button _button = container.AddComponent