diff --git a/Assembly-CSharp-vs.csproj b/Assembly-CSharp-vs.csproj
index c4e975bac..2d56026a0 100644
--- a/Assembly-CSharp-vs.csproj
+++ b/Assembly-CSharp-vs.csproj
@@ -19,7 +19,7 @@
full
false
Temp\bin\Debug\
- DEBUG;TRACE;UNITY_STANDALONE_OSX;ENABLE_MICROPHONE;ENABLE_TEXTUREID_MAP;ENABLE_AUDIO_FMOD;UNITY_STANDALONE;ENABLE_MONO;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_GENERICS;ENABLE_SUBSTANCE;INCLUDE_WP8SUPPORT;ENABLE_MOVIES;ENABLE_WWW;ENABLE_IMAGEEFFECTS;ENABLE_WEBCAM;INCLUDE_METROSUPPORT;RENDER_SOFTWARE_CURSOR;ENABLE_NETWORK;ENABLE_PHYSICS;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_2D_PHYSICS;ENABLE_GAMECENTER;ENABLE_SHADOWS;ENABLE_AUDIO;ENABLE_NAVMESH_CARVING;ENABLE_DUCK_TYPING;ENABLE_SINGLE_INSTANCE_BUILD_SETTING;UNITY_4_3_1;UNITY_4_3;DEVELOPMENT_BUILD;ENABLE_PROFILER;UNITY_EDITOR;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE
+ DEBUG;TRACE;UNITY_STANDALONE_WIN;ENABLE_MICROPHONE;ENABLE_TEXTUREID_MAP;ENABLE_AUDIO_FMOD;UNITY_STANDALONE;ENABLE_MONO;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_GENERICS;ENABLE_SUBSTANCE;INCLUDE_WP8SUPPORT;ENABLE_MOVIES;ENABLE_WWW;ENABLE_IMAGEEFFECTS;ENABLE_WEBCAM;INCLUDE_METROSUPPORT;RENDER_SOFTWARE_CURSOR;ENABLE_NETWORK;ENABLE_PHYSICS;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_2D_PHYSICS;ENABLE_SHADOWS;ENABLE_AUDIO;ENABLE_NAVMESH_CARVING;ENABLE_DUCK_TYPING;ENABLE_SINGLE_INSTANCE_BUILD_SETTING;UNITY_4_3_1;UNITY_4_3;DEVELOPMENT_BUILD;ENABLE_PROFILER;UNITY_EDITOR;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE
prompt
4
0169
@@ -84,6 +84,7 @@
+
diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj
index c4e975bac..cf4c2d220 100644
--- a/Assembly-CSharp.csproj
+++ b/Assembly-CSharp.csproj
@@ -1,473 +1,1169 @@
-
+
- Debug
- AnyCPU
- 10.0.20506
- 2.0
- {8064C318-980D-5E6D-F7D0-C6A8C4DBEB3C}
- Library
- Properties
-
- Assembly-CSharp
- v3.5
- 512
- Assets
+ latest
+
+
+ Debug
+ AnyCPU
+ 10.0.20506
+ 2.0
+
+ {1084AC06-10AB-1CD5-2AF3-10FEEFEE7232}
+ Library
+ Properties
+ Assembly-CSharp
+ v4.7.1
+ 512
+ .
- true
- full
- false
- Temp\bin\Debug\
- DEBUG;TRACE;UNITY_STANDALONE_OSX;ENABLE_MICROPHONE;ENABLE_TEXTUREID_MAP;ENABLE_AUDIO_FMOD;UNITY_STANDALONE;ENABLE_MONO;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_GENERICS;ENABLE_SUBSTANCE;INCLUDE_WP8SUPPORT;ENABLE_MOVIES;ENABLE_WWW;ENABLE_IMAGEEFFECTS;ENABLE_WEBCAM;INCLUDE_METROSUPPORT;RENDER_SOFTWARE_CURSOR;ENABLE_NETWORK;ENABLE_PHYSICS;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_2D_PHYSICS;ENABLE_GAMECENTER;ENABLE_SHADOWS;ENABLE_AUDIO;ENABLE_NAVMESH_CARVING;ENABLE_DUCK_TYPING;ENABLE_SINGLE_INSTANCE_BUILD_SETTING;UNITY_4_3_1;UNITY_4_3;DEVELOPMENT_BUILD;ENABLE_PROFILER;UNITY_EDITOR;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE
- prompt
- 4
- 0169
+ true
+ full
+ false
+ Temp\Bin\Debug\
+ UNITY_2021_2_10;UNITY_2021_2;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;PLATFORM_ARCH_64;UNITY_64;UNITY_INCLUDE_TESTS;USE_SEARCH_ENGINE_API;USE_SEARCH_TABLE;USE_SEARCH_MODULE;USE_PROPERTY_DATABASE;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;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
+ prompt
+ 4
+ 0169
+ False
- pdbonly
- true
- Temp\bin\Release\
- TRACE
- prompt
- 4
- 0169
+ pdbonly
+ true
+ Temp\bin\Release\
+ prompt
+ 4
+ 0169
+ False
+
+
+ true
+ true
+ false
+ false
+ false
+
+
+ {E097FAD1-6243-4DAD-9C02-E9B9EFC3FFC1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ Package
+ 2.0.12
+ Game:1
+ StandaloneOSX:2
+ 2021.2.10f1
-
-
-
-
-
- C:/Program Files (x86)/Unity/Editor/Data/Managed/UnityEngine.dll
-
-
- C:/Program Files (x86)/Unity/Editor/Data/Managed/UnityEditor.dll
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.AIModule.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.ARModule.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.AccessibilityModule.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.AndroidJNIModule.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.AnimationModule.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.AssetBundleModule.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.AudioModule.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.ClothModule.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.ClusterInputModule.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.ClusterRendererModule.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.CoreModule.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.CrashReportingModule.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.DSPGraphModule.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.DirectorModule.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.GIModule.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.GameCenterModule.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.GridModule.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.HotReloadModule.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.IMGUIModule.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.ImageConversionModule.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.InputModule.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.InputLegacyModule.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.JSONSerializeModule.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.LocalizationModule.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.ParticleSystemModule.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.PerformanceReportingModule.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.PhysicsModule.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.Physics2DModule.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.ProfilerModule.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.RuntimeInitializeOnLoadManagerInitializerModule.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.ScreenCaptureModule.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.SharedInternalsModule.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.SpriteMaskModule.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.SpriteShapeModule.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.StreamingModule.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.SubstanceModule.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.SubsystemsModule.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.TLSModule.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.TerrainModule.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.TerrainPhysicsModule.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.TextCoreFontEngineModule.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.TextCoreTextEngineModule.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.TextRenderingModule.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.TilemapModule.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.UIModule.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.UIElementsModule.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.UIElementsNativeModule.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.UNETModule.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.UmbraModule.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.UnityAnalyticsModule.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.UnityConnectModule.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.UnityCurlModule.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.UnityTestProtocolModule.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.UnityWebRequestModule.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.UnityWebRequestAssetBundleModule.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.UnityWebRequestAudioModule.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.UnityWebRequestTextureModule.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.UnityWebRequestWWWModule.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.VFXModule.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.VRModule.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.VehiclesModule.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.VideoModule.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.VirtualTexturingModule.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.WindModule.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\Managed\UnityEngine\UnityEngine.XRModule.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\Managed\UnityEngine\UnityEditor.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\Managed\UnityEngine\UnityEditor.CoreModule.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\Managed\UnityEngine\UnityEditor.DeviceSimulatorModule.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\Managed\UnityEngine\UnityEditor.DiagnosticsModule.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\Managed\UnityEngine\UnityEditor.GraphViewModule.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\Managed\UnityEngine\UnityEditor.PackageManagerUIModule.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\Managed\UnityEngine\UnityEditor.QuickSearchModule.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\Managed\UnityEngine\UnityEditor.SceneTemplateModule.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\Managed\UnityEngine\UnityEditor.TextCoreFontEngineModule.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\Managed\UnityEngine\UnityEditor.TextCoreTextEngineModule.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\Managed\UnityEngine\UnityEditor.UIBuilderModule.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\Managed\UnityEngine\UnityEditor.UIElementsModule.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\Managed\UnityEngine\UnityEditor.UIElementsSamplesModule.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\Managed\UnityEngine\UnityEditor.UIServiceModule.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\Managed\UnityEngine\UnityEditor.UnityConnectModule.dll
+
+
+ Library\PackageCache\com.unity.nuget.newtonsoft-json@2.0.0\Runtime\Newtonsoft.Json.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\PlaybackEngines\iOSSupport\UnityEditor.iOS.Extensions.Xcode.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\PlaybackEngines\iOSSupport\UnityEditor.iOS.Extensions.Common.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\PlaybackEngines\AndroidPlayer\Unity.Android.Types.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\PlaybackEngines\AndroidPlayer\Unity.Android.Gradle.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\ref\2.1.0\netstandard.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\Microsoft.Win32.Primitives.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.AppContext.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Buffers.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Collections.Concurrent.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Collections.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Collections.NonGeneric.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Collections.Specialized.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.ComponentModel.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.ComponentModel.EventBasedAsync.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.ComponentModel.Primitives.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.ComponentModel.TypeConverter.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Console.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Data.Common.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Diagnostics.Contracts.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Diagnostics.Debug.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Diagnostics.FileVersionInfo.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Diagnostics.Process.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Diagnostics.StackTrace.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Diagnostics.TextWriterTraceListener.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Diagnostics.Tools.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Diagnostics.TraceSource.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Diagnostics.Tracing.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Drawing.Primitives.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Dynamic.Runtime.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Globalization.Calendars.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Globalization.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Globalization.Extensions.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.IO.Compression.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.IO.Compression.ZipFile.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.IO.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.IO.FileSystem.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.IO.FileSystem.DriveInfo.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.IO.FileSystem.Primitives.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.IO.FileSystem.Watcher.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.IO.IsolatedStorage.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.IO.MemoryMappedFiles.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.IO.Pipes.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.IO.UnmanagedMemoryStream.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Linq.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Linq.Expressions.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Linq.Parallel.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Linq.Queryable.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Memory.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Net.Http.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Net.NameResolution.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Net.NetworkInformation.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Net.Ping.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Net.Primitives.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Net.Requests.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Net.Security.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Net.Sockets.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Net.WebHeaderCollection.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Net.WebSockets.Client.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Net.WebSockets.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Numerics.Vectors.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.ObjectModel.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Reflection.DispatchProxy.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Reflection.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Reflection.Emit.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Reflection.Emit.ILGeneration.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Reflection.Emit.Lightweight.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Reflection.Extensions.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Reflection.Primitives.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Resources.Reader.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Resources.ResourceManager.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Resources.Writer.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Runtime.CompilerServices.VisualC.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Runtime.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Runtime.Extensions.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Runtime.Handles.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Runtime.InteropServices.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Runtime.InteropServices.RuntimeInformation.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Runtime.Numerics.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Runtime.Serialization.Formatters.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Runtime.Serialization.Json.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Runtime.Serialization.Primitives.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Runtime.Serialization.Xml.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Security.Claims.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Security.Cryptography.Algorithms.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Security.Cryptography.Csp.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Security.Cryptography.Encoding.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Security.Cryptography.Primitives.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Security.Cryptography.X509Certificates.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Security.Principal.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Security.SecureString.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Text.Encoding.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Text.Encoding.Extensions.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Text.RegularExpressions.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Threading.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Threading.Overlapped.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Threading.Tasks.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Threading.Tasks.Extensions.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Threading.Tasks.Parallel.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Threading.Thread.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Threading.ThreadPool.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Threading.Timer.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.ValueTuple.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Xml.ReaderWriter.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Xml.XDocument.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Xml.XmlDocument.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Xml.XmlSerializer.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Xml.XPath.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Xml.XPath.XDocument.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\Extensions\2.0.0\System.Runtime.InteropServices.WindowsRuntime.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\mscorlib.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.ComponentModel.Composition.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.Core.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.Data.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.Drawing.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.IO.Compression.FileSystem.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.Net.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.Numerics.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.Runtime.Serialization.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.ServiceModel.Web.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.Transactions.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.Web.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.Windows.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.Xml.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.Xml.Linq.dll
+
+
+ C:\Program Files\Unity\Hub\Editor\2021.2.10f1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.Xml.Serialization.dll
+
+
+ Library\ScriptAssemblies\Unity.VSCode.Editor.dll
+
+
+ Library\ScriptAssemblies\Unity.TextMeshPro.Editor.dll
+
+
+ Library\ScriptAssemblies\Unity.VisualStudio.Editor.dll
+
+
+ Library\ScriptAssemblies\Unity.Sysroot.Linux_x86_64.dll
+
+
+ Library\ScriptAssemblies\Unity.Toolchain.Win-x86_64-Linux-x86_64.dll
+
+
+ Library\ScriptAssemblies\Unity.Timeline.Editor.dll
+
+
+ Library\ScriptAssemblies\Unity.Timeline.dll
+
+
+ Library\ScriptAssemblies\Unity.TextMeshPro.dll
+
+
+ Library\ScriptAssemblies\UnityEditor.UI.dll
+
+
+ Library\ScriptAssemblies\Unity.PlasticSCM.Editor.dll
+
+
+ Library\ScriptAssemblies\Unity.Rider.Editor.dll
+
+
+ Library\ScriptAssemblies\UnityEngine.UI.dll
+
+
+ Library\ScriptAssemblies\Unity.SysrootPackage.Editor.dll
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Assets/Materials/New Render Texture.mat b/Assets/Materials/New Render Texture.mat
new file mode 100644
index 000000000..e42ef141a
Binary files /dev/null and b/Assets/Materials/New Render Texture.mat differ
diff --git a/Assets/Resources/font/Cabin.ttf b/Assets/Resources/font/Cabin.ttf
new file mode 100644
index 000000000..7c57306e7
Binary files /dev/null and b/Assets/Resources/font/Cabin.ttf differ
diff --git a/Assets/Resources/shader/effect/Mosaic.shader b/Assets/Resources/shader/effect/Mosaic.shader
index 4c9d4f135..a6328bd5b 100644
--- a/Assets/Resources/shader/effect/Mosaic.shader
+++ b/Assets/Resources/shader/effect/Mosaic.shader
@@ -1,93 +1,81 @@
-Shader "QO/Effect/Mosaic" {
-Properties {
- _tex0 ("_tex0 : Original Image (RGBA)", 2D) = "white" {}
- _tex1 ("_tex1 : Transform Image (RGBA)", 2D) = "white" {}
- _X ("x pixels", Float) = 0
- _Y ("y pixels", Float) = 0
- _MX ("min x pixels", Float) = 16
- _MY ("min y pixels", Float) = 9
- _time ("time rate", Range(0,1)) = 0
-}
-SubShader {
- LOD 200
- Tags { "QUEUE"="Transparent" "RenderType"="Transparent" }
- Pass {
- Tags { "QUEUE"="Transparent" "RenderType"="Transparent" }
- Blend SrcAlpha OneMinusSrcAlpha
-Program "vp" {
-SubProgram "gles " {
-"!!GLES
-
-
-#ifdef VERTEX
-
-varying mediump vec4 xlv_TEXCOORD0;
-varying lowp vec4 xlv_COLOR0;
-uniform highp mat4 glstate_matrix_mvp;
-attribute vec4 _glesMultiTexCoord0;
-attribute vec4 _glesVertex;
-void main ()
+Shader "QO/Effect/Mosaic"
{
- gl_Position = (glstate_matrix_mvp * _glesVertex);
- xlv_COLOR0 = vec4(1.0, 1.0, 1.0, 1.0);
- xlv_TEXCOORD0 = _glesMultiTexCoord0;
-}
+ Properties
+ {
+ _tex0("_tex0 : Original Image (RGBA)", 2D) = "white" {}
+ _tex1("_tex1 : Transform Image (RGBA)", 2D) = "white" {}
+ _X("x pixels", Float) = 0
+ _Y("y pixels", Float) = 0
+ _MX("min x pixels", Float) = 16
+ _MY("min y pixels", Float) = 9
+ _time("time rate", Range(0,1)) = 0
+ }
+ SubShader
+ {
+ LOD 200
+ Tags { "QUEUE" = "Transparent" "RenderType" = "Transparent" }
+ Blend SrcAlpha OneMinusSrcAlpha
+ Lighting Off
+ Pass
+ {
+ ZTest Always ZWrite Off
+ Fog { Mode off }
-#endif
-#ifdef FRAGMENT
-varying mediump vec4 xlv_TEXCOORD0;
-uniform mediump float _time;
-uniform mediump float _MY;
-uniform mediump float _MX;
-uniform mediump float _Y;
-uniform mediump float _X;
-uniform sampler2D _tex1;
-uniform sampler2D _tex0;
-void main ()
-{
- mediump float tmpvar_1;
- tmpvar_1 = (1.0 - sin((_time * 3.14)));
- mediump float tmpvar_2;
- tmpvar_2 = ((tmpvar_1 * _X) + _MX);
- mediump float tmpvar_3;
- tmpvar_3 = ((tmpvar_1 * _Y) + _MY);
- mediump vec2 tmpvar_4;
- tmpvar_4.x = max (0.0, min (1.0, (floor((xlv_TEXCOORD0.x * tmpvar_2)) / tmpvar_2)));
- tmpvar_4.y = max (0.0, min (1.0, (floor((xlv_TEXCOORD0.y * tmpvar_3)) / tmpvar_3)));
- lowp vec4 tmpvar_5;
- tmpvar_5 = texture2D (_tex0, tmpvar_4);
- mediump float tmpvar_6;
- mediump float t_7;
- t_7 = max (min ((((1.0 - _time) - 0.45) / 0.11), 1.0), 0.0);
- tmpvar_6 = (t_7 * (t_7 * (3.0 - (2.0 * t_7))));
- mediump vec4 tmpvar_8;
- tmpvar_8.xyz = tmpvar_5.xyz;
- tmpvar_8.w = tmpvar_6;
- lowp vec4 tmpvar_9;
- tmpvar_9 = texture2D (_tex1, tmpvar_4);
- mediump vec4 tmpvar_10;
- tmpvar_10.xyz = tmpvar_9.xyz;
- tmpvar_10.w = (1.0 - tmpvar_6);
- mediump vec4 tmpvar_11;
- tmpvar_11.xyz = ((tmpvar_8.xyz * tmpvar_6) + (tmpvar_10.xyz * tmpvar_10.w));
- tmpvar_11.w = (tmpvar_6 + tmpvar_10.w);
- gl_FragData[0] = tmpvar_11;
-}
-
-
-
-#endif"
-}
-}
-Program "fp" {
-SubProgram "gles " {
-"!!GLES"
-}
-}
- }
-}
-Fallback "VertexLit"
+ CGPROGRAM
+ #pragma vertex vert_img
+ #pragma fragment frag
+ #pragma fragmentoption ARB_precision_hint_fastest
+ #include "UnityCG.cginc"
+
+
+ uniform sampler2D _tex0;
+ uniform sampler2D _tex1;
+ uniform float _X;
+ uniform float _Y;
+ uniform float _MX;
+ uniform float _MY;
+ uniform float _time;
+
+
+ fixed4 frag(v2f_img i) :COLOR
+ {
+ //Setup for UV
+ float tmpvar_1 = (1.0 - sin(mul(_time,3.14)));
+ float tmpvar_2 = mul(tmpvar_1, _X) + _MX;
+ float tmpvar_3 = mul(tmpvar_1, _Y) + _MY;
+ float tmpvar_4_x = float(max(0.0, min(1.0, floor(mul(i.uv.x, tmpvar_2)) / tmpvar_2)));
+ float tmpvar_4_y = float(max(0.0, min(1.0, floor(mul(i.uv.y, tmpvar_3)) / tmpvar_3)));
+ float2 tmpvar_4 = float2(tmpvar_4_x, tmpvar_4_y);
+
+ //Textures
+ float4 tmpvar_5 = tex2D(_tex0, tmpvar_4);
+ float4 tmpvar_9 = tex2D(_tex1, tmpvar_4);
+
+ //Setup for 6
+ float t_7 = max(min((((1 - _time) - 0.45) / 0.11), 1.0), 0.0);
+ float tmpvar_6 = mul(t_7 , mul(t_7 , (3.0 - mul(2.0 , t_7))));
+
+ //Setup for 8
+ float4 tmpvar_8 = float4(tmpvar_5.x, tmpvar_5.y, tmpvar_5.z, tmpvar_6);
+
+ //Setup for 10
+ float4 tmpvar_10 = float4(tmpvar_9.x, tmpvar_9.y, tmpvar_9.z, (1.0 - tmpvar_6));
+
+ //Final output
+ float3 tmpvar_11_xyz = ((float3(tmpvar_8.x, tmpvar_8.y, tmpvar_8.z) * tmpvar_6) + (float3(tmpvar_10.x, tmpvar_10.y, tmpvar_10.z) * tmpvar_10.w));
+ float tmpvar_11_w = (tmpvar_6 + tmpvar_10.w);
+ float4 tmpvar_11 = float4(tmpvar_11_xyz.x, tmpvar_11_xyz.y, tmpvar_11_xyz.z, tmpvar_11_w);
+
+ //Return output
+ return tmpvar_11;
+ }
+
+ ENDCG
+ }
+ }
+
+FallBack off
}
\ No newline at end of file
diff --git a/Assets/Resources/shader/effect/OLD/CrossFade1.shader b/Assets/Resources/shader/effect/OLD/CrossFade1.shader
deleted file mode 100644
index b4a28899e..000000000
--- a/Assets/Resources/shader/effect/OLD/CrossFade1.shader
+++ /dev/null
@@ -1,85 +0,0 @@
-Shader "QO/Effect/CrossFade1" {
-Properties {
- _tex0 ("_tex0 : Original Image (RGBA)", 2D) = "white" {}
- _tex1 ("_tex1 : Transform Image (RGBA)", 2D) = "white" {}
- _time ("_time : TimeRate", Range(0,1)) = 0
-}
-SubShader {
- LOD 200
- Tags { "QUEUE"="Transparent" "RenderType"="Transparent" }
- Pass {
- Tags { "QUEUE"="Transparent" "RenderType"="Transparent" }
- Blend SrcAlpha OneMinusSrcAlpha
-Program "vp" {
-SubProgram "gles " {
-"!!GLES
-
-
-#ifdef VERTEX
-
-varying lowp vec2 xlv_TEXCOORD0;
-varying lowp vec4 xlv_COLOR0;
-uniform highp mat4 glstate_matrix_mvp;
-attribute vec4 _glesMultiTexCoord0;
-attribute vec4 _glesVertex;
-void main ()
-{
- lowp vec2 tmpvar_1;
- highp vec2 tmpvar_2;
- tmpvar_2 = _glesMultiTexCoord0.xy;
- tmpvar_1 = tmpvar_2;
- gl_Position = (glstate_matrix_mvp * _glesVertex);
- xlv_COLOR0 = vec4(1.0, 1.0, 1.0, 1.0);
- xlv_TEXCOORD0 = tmpvar_1;
-}
-
-
-
-#endif
-#ifdef FRAGMENT
-
-varying lowp vec2 xlv_TEXCOORD0;
-uniform lowp float _time;
-uniform sampler2D _tex1;
-uniform sampler2D _tex0;
-void main ()
-{
- mediump vec4 t0_1;
- highp float alpha_2;
- mediump vec4 toImage_3;
- mediump vec4 fromImage_4;
- lowp vec4 tmpvar_5;
- tmpvar_5 = texture2D (_tex0, xlv_TEXCOORD0);
- fromImage_4 = tmpvar_5;
- lowp vec4 tmpvar_6;
- tmpvar_6 = texture2D (_tex1, xlv_TEXCOORD0);
- toImage_3 = tmpvar_6;
- lowp float tmpvar_7;
- tmpvar_7 = min (1.0, max (0.0, _time));
- mediump float tmpvar_8;
- tmpvar_8 = (fromImage_4.w * (1.0 - tmpvar_7));
- alpha_2 = tmpvar_8;
- highp vec4 tmpvar_9;
- tmpvar_9.xyz = (fromImage_4.xyz * alpha_2);
- tmpvar_9.w = alpha_2;
- t0_1 = tmpvar_9;
- mediump vec4 tmpvar_10;
- tmpvar_10.w = 1.0;
- tmpvar_10.xyz = (t0_1.xyz + (toImage_3.xyz * (1.0 - t0_1.w)));
- gl_FragData[0] = tmpvar_10;
-}
-
-
-
-#endif"
-}
-}
-Program "fp" {
-SubProgram "gles " {
-"!!GLES"
-}
-}
- }
-}
-Fallback "VertexLit"
-}
\ No newline at end of file
diff --git a/Assets/Resources/shader/effect/OLD/Transition.shader b/Assets/Resources/shader/effect/OLD/Transition.shader
deleted file mode 100644
index e88d440f7..000000000
--- a/Assets/Resources/shader/effect/OLD/Transition.shader
+++ /dev/null
@@ -1,98 +0,0 @@
-Shader "QO/Effect/Transition1" {
-Properties {
- _tex0 ("_tex0 : Original Image (RGBA)", 2D) = "white" {}
- _tex1 ("_tex1 : Transform Image (RGBA)", 2D) = "white" {}
- _tex2 ("_tex2 : Pattern (GrayScale)", 2D) = "white" {}
- _time ("_time : TimeRate", Range(0,1)) = 0
- _grad ("_grad : Gradation Level", Float) = 0.1
-}
-SubShader {
- LOD 200
- Tags { "QUEUE"="Transparent" "RenderType"="Transparent" }
- Pass {
- Tags { "QUEUE"="Transparent" "RenderType"="Transparent" }
- Blend SrcAlpha OneMinusSrcAlpha
-Program "vp" {
-SubProgram "gles " {
-"!!GLES
-
-
-#ifdef VERTEX
-
-varying lowp vec2 xlv_TEXCOORD0;
-varying lowp vec4 xlv_COLOR0;
-uniform highp mat4 glstate_matrix_mvp;
-attribute vec4 _glesMultiTexCoord0;
-attribute vec4 _glesVertex;
-void main ()
-{
- lowp vec2 tmpvar_1;
- highp vec2 tmpvar_2;
- tmpvar_2 = _glesMultiTexCoord0.xy;
- tmpvar_1 = tmpvar_2;
- gl_Position = (glstate_matrix_mvp * _glesVertex);
- xlv_COLOR0 = vec4(1.0, 1.0, 1.0, 1.0);
- xlv_TEXCOORD0 = tmpvar_1;
-}
-
-
-
-#endif
-#ifdef FRAGMENT
-
-varying lowp vec2 xlv_TEXCOORD0;
-uniform lowp float _grad;
-uniform lowp float _time;
-uniform sampler2D _tex2;
-uniform sampler2D _tex1;
-uniform sampler2D _tex0;
-void main ()
-{
- mediump float grad_1;
- mediump vec4 toImage_2;
- mediump vec4 fromImage_3;
- mediump vec3 trans_4;
- lowp vec3 tmpvar_5;
- tmpvar_5 = texture2D (_tex2, xlv_TEXCOORD0).xyz;
- trans_4 = tmpvar_5;
- lowp vec4 tmpvar_6;
- tmpvar_6.w = 1.0;
- tmpvar_6.xyz = texture2D (_tex0, xlv_TEXCOORD0).xyz;
- fromImage_3 = tmpvar_6;
- lowp vec4 tmpvar_7;
- tmpvar_7.w = 1.0;
- tmpvar_7.xyz = texture2D (_tex1, xlv_TEXCOORD0).xyz;
- toImage_2 = tmpvar_7;
- lowp float tmpvar_8;
- tmpvar_8 = (_grad * 0.5);
- grad_1 = tmpvar_8;
- mediump float tmpvar_9;
- tmpvar_9 = max (0.0, (trans_4.x - grad_1));
- mediump float t_10;
- t_10 = max (min (((_time - tmpvar_9) / (min (1.0, (trans_4.x + grad_1)) - tmpvar_9)), 1.0), 0.0);
- mediump vec4 tmpvar_11;
- tmpvar_11.xyz = toImage_2.xyz;
- tmpvar_11.w = (toImage_2.w * (t_10 * (t_10 * (3.0 - (2.0 * t_10)))));
- mediump vec4 tmpvar_12;
- tmpvar_12.xyz = fromImage_3.xyz;
- tmpvar_12.w = (1.0 - tmpvar_11.w);
- mediump vec4 tmpvar_13;
- tmpvar_13.xyz = ((toImage_2.xyz * tmpvar_11.w) + (fromImage_3.xyz * tmpvar_12.w));
- tmpvar_13.w = (tmpvar_11.w + tmpvar_12.w);
- gl_FragData[0] = tmpvar_13;
-}
-
-
-
-#endif"
-}
-}
-Program "fp" {
-SubProgram "gles " {
-"!!GLES"
-}
-}
- }
-}
-Fallback "VertexLit"
-}
\ No newline at end of file
diff --git a/Assets/Resources/shader/effect/Ripple.shader b/Assets/Resources/shader/effect/Ripple.shader
index f24d5a7d7..f54b5f028 100644
--- a/Assets/Resources/shader/effect/Ripple.shader
+++ b/Assets/Resources/shader/effect/Ripple.shader
@@ -1,127 +1,90 @@
-Shader "QO/Effect/Ripple" {
-Properties {
- _tex0 ("_tex0 : Original Image (RGBA)", 2D) = "white" {}
- _tex1 ("_tex1 : Transform Image (RGBA)", 2D) = "white" {}
- _time ("_time : time rate", Range(0,1)) = 0
- _pow ("_pow : screen wave power", Float) = 2
- _w ("_w : ripple wave width", Float) = 1.5
- _h ("_h : ripple wave height", Float) = 5
- _speed ("_speed : ripple wave speed", Float) = 2
-}
-SubShader {
- LOD 200
- Tags { "QUEUE"="Transparent" "RenderType"="Transparent" }
- Pass {
- Tags { "QUEUE"="Transparent" "RenderType"="Transparent" }
- Blend SrcAlpha OneMinusSrcAlpha
-Program "vp" {
-SubProgram "gles " {
-"!!GLES
-
-
-#ifdef VERTEX
-
-varying mediump vec2 xlv_TEXCOORD0;
-varying lowp vec4 xlv_COLOR0;
-uniform highp mat4 glstate_matrix_mvp;
-attribute vec4 _glesMultiTexCoord0;
-attribute vec4 _glesVertex;
-void main ()
+Shader "QO/Effect/Ripple"
{
- mediump vec2 tmpvar_1;
- highp vec2 tmpvar_2;
- tmpvar_2 = _glesMultiTexCoord0.xy;
- tmpvar_1 = tmpvar_2;
- gl_Position = (glstate_matrix_mvp * _glesVertex);
- xlv_COLOR0 = vec4(1.0, 1.0, 1.0, 1.0);
- xlv_TEXCOORD0 = tmpvar_1;
-}
-
-
-
-#endif
-#ifdef FRAGMENT
-
-varying mediump vec2 xlv_TEXCOORD0;
-uniform mediump float _speed;
-uniform mediump float _w;
-uniform mediump float _h;
-uniform mediump float _pow;
-uniform mediump float _time;
-uniform sampler2D _tex1;
-uniform sampler2D _tex0;
-void main ()
-{
- lowp float check2_1;
- lowp float check1_2;
- mediump vec2 tmpvar_3;
- tmpvar_3.x = (xlv_TEXCOORD0.x - 0.5);
- tmpvar_3.y = ((xlv_TEXCOORD0.y - 0.5) * 0.5625);
- mediump float tmpvar_4;
- tmpvar_4 = (_time * _speed);
- mediump float tmpvar_5;
- tmpvar_5 = sqrt(dot (tmpvar_3, tmpvar_3));
- mediump float tmpvar_6;
- tmpvar_6 = (tmpvar_4 - (_w * 0.01));
- mediump float tmpvar_7;
- tmpvar_7 = ((_time - 0.25) * _speed);
- mediump float tmpvar_8;
- tmpvar_8 = sqrt(dot (tmpvar_3, tmpvar_3));
- mediump float tmpvar_9;
- tmpvar_9 = (tmpvar_7 - (_w * 0.01));
- mediump float tmpvar_10;
- tmpvar_10 = ((_time - 0.5) * _speed);
- mediump float tmpvar_11;
- tmpvar_11 = sqrt(dot (tmpvar_3, tmpvar_3));
- mediump float tmpvar_12;
- tmpvar_12 = (tmpvar_10 - (_w * 0.01));
- mediump float tmpvar_13;
- tmpvar_13 = ((_time - 0.75) * _speed);
- mediump float tmpvar_14;
- tmpvar_14 = sqrt(dot (tmpvar_3, tmpvar_3));
- mediump float tmpvar_15;
- tmpvar_15 = (tmpvar_13 - (_w * 0.01));
- mediump float tmpvar_16;
- tmpvar_16 = (1.0 - _time);
- mediump vec2 tmpvar_17;
- tmpvar_17 = ((((((tmpvar_3 * ((sin((((tmpvar_4 - tmpvar_5) / (tmpvar_4 - tmpvar_6)) * 3.14159)) * _h) * 0.02)) * float(((float(((tmpvar_5 - tmpvar_6) >= 0.0)) + float(((tmpvar_4 - tmpvar_5) >= 0.0))) >= 2.0))) + ((tmpvar_3 * ((sin((((tmpvar_7 - tmpvar_8) / (tmpvar_7 - tmpvar_9)) * 3.14159)) * _h) * 0.02)) * float(((float(((tmpvar_8 - tmpvar_9) >= 0.0)) + float(((tmpvar_7 - tmpvar_8) >= 0.0))) >= 2.0)))) + ((tmpvar_3 * ((sin((((tmpvar_10 - tmpvar_11) / (tmpvar_10 - tmpvar_12)) * 3.14159)) * _h) * 0.02)) * float(((float(((tmpvar_11 - tmpvar_12) >= 0.0)) + float(((tmpvar_10 - tmpvar_11) >= 0.0))) >= 2.0)))) + ((tmpvar_3 * ((sin((((tmpvar_13 - tmpvar_14) / (tmpvar_13 - tmpvar_15)) * 3.14159)) * _h) * 0.02)) * float(((float(((tmpvar_14 - tmpvar_15) >= 0.0)) + float(((tmpvar_13 - tmpvar_14) >= 0.0))) >= 2.0)))) * tmpvar_16);
- mediump vec2 tmpvar_18;
- tmpvar_18 = (xlv_TEXCOORD0 + (((tmpvar_3 * (sin((50.2654 * (sqrt(dot (tmpvar_3, tmpvar_3)) * _time))) * (_pow * 0.01))) * tmpvar_16) + tmpvar_17));
- mediump float tmpvar_19;
- tmpvar_19 = float((-0.01 >= (xlv_TEXCOORD0.y + tmpvar_17.y)));
- check1_2 = tmpvar_19;
- mediump float tmpvar_20;
- tmpvar_20 = float((-0.01 >= (1.0 - (xlv_TEXCOORD0.y + tmpvar_17.y))));
- check2_1 = tmpvar_20;
- lowp float tmpvar_21;
- tmpvar_21 = float((0.0 >= (check1_2 + check2_1)));
- lowp vec4 tmpvar_22;
- tmpvar_22 = texture2D (_tex0, tmpvar_18);
- mediump vec4 tmpvar_23;
- tmpvar_23.xyz = tmpvar_22.xyz;
- tmpvar_23.w = (1.0 - _time);
- lowp vec4 tmpvar_24;
- tmpvar_24 = texture2D (_tex1, tmpvar_18);
- mediump vec4 tmpvar_25;
- tmpvar_25.xyz = tmpvar_24.xyz;
- tmpvar_25.w = (1.0 - tmpvar_23.w);
- mediump vec4 tmpvar_26;
- tmpvar_26.xyz = (((tmpvar_23.xyz * tmpvar_23.w) + (tmpvar_25.xyz * tmpvar_25.w)) * tmpvar_21);
- tmpvar_26.w = (tmpvar_23.w + tmpvar_25.w);
- gl_FragData[0] = tmpvar_26;
-}
-
-
-
-#endif"
-}
-}
-Program "fp" {
-SubProgram "gles " {
-"!!GLES"
-}
-}
- }
-}
-Fallback "VertexLit"
+ Properties
+ {
+ _tex0("_tex0 : Original Image (RGBA)", 2D) = "white" {}
+ _tex1("_tex1 : Transform Image (RGBA)", 2D) = "white" {}
+ _time("time rate", Range(0,1)) = 0
+ _pow("_pow : screen wave power", Float) = 2
+ _w("_w : ripple wave width", Float) = 1.5
+ _h("_h : ripple wave height", Float) = 5
+ _speed("_speed : ripple wave speed", Float) = 2
+
+ }
+
+ SubShader
+ {
+ LOD 200
+ Tags { "QUEUE" = "Transparent" "RenderType" = "Transparent" }
+ Blend SrcAlpha OneMinusSrcAlpha
+ Lighting Off
+
+ Pass
+ {
+ ZTest Always ZWrite Off
+ Fog { Mode off }
+
+
+ CGPROGRAM
+ #pragma vertex vert_img
+ #pragma fragment frag
+ #pragma fragmentoption ARB_precision_hint_fastest
+ #include "UnityCG.cginc"
+
+
+ uniform sampler2D _tex0;
+ uniform sampler2D _tex1;
+ uniform float _time;
+ uniform float _w;
+ uniform float _h;
+ uniform float _pow;
+ uniform float _speed;
+
+
+
+ fixed4 frag(v2f_img i) :COLOR
+ {
+
+ float2 tmpvar_3 = float2((i.uv.x - 0.5), ((i.uv.y - 0.5) * 0.5625));
+
+ float tmpvar_4 = (_time * _speed);
+ float tmpvar_5 = sqrt(dot(tmpvar_3, tmpvar_3));
+ float tmpvar_6 = (tmpvar_4 - (_w * 0.01));
+ float tmpvar_7 = ((_time - 0.25) * _speed);
+ float tmpvar_8 = sqrt(dot(tmpvar_3, tmpvar_3));
+ float tmpvar_9 = (tmpvar_7 - (_w * 0.01));
+ float tmpvar_10 = ((_time - 0.5) * _speed);
+ float tmpvar_11 = sqrt(dot(tmpvar_3, tmpvar_3));
+ float tmpvar_12 = (tmpvar_10 - (_w * 0.01));
+ float tmpvar_13 = ((_time - 0.75) * _speed);
+ float tmpvar_14 = sqrt(dot(tmpvar_3, tmpvar_3));
+ float tmpvar_15 = (tmpvar_13 - (_w * 0.01));
+ float tmpvar_16 = (1.0 - _time);
+ float2 tmpvar_17 = ((((((tmpvar_3 * ((sin((((tmpvar_4 - tmpvar_5) / (tmpvar_4 - tmpvar_6)) * 3.14159)) * _h) * 0.02)) * float(((float(((tmpvar_5 - tmpvar_6) >= 0.0)) + float(((tmpvar_4 - tmpvar_5) >= 0.0))) >= 2.0))) + ((tmpvar_3 * ((sin((((tmpvar_7 - tmpvar_8) / (tmpvar_7 - tmpvar_9)) * 3.14159)) * _h) * 0.02)) * float(((float(((tmpvar_8 - tmpvar_9) >= 0.0)) + float(((tmpvar_7 - tmpvar_8) >= 0.0))) >= 2.0)))) + ((tmpvar_3 * ((sin((((tmpvar_10 - tmpvar_11) / (tmpvar_10 - tmpvar_12)) * 3.14159)) * _h) * 0.02)) * float(((float(((tmpvar_11 - tmpvar_12) >= 0.0)) + float(((tmpvar_10 - tmpvar_11) >= 0.0))) >= 2.0)))) + ((tmpvar_3 * ((sin((((tmpvar_13 - tmpvar_14) / (tmpvar_13 - tmpvar_15)) * 3.14159)) * _h) * 0.02)) * float(((float(((tmpvar_14 - tmpvar_15) >= 0.0)) + float(((tmpvar_13 - tmpvar_14) >= 0.0))) >= 2.0)))) * tmpvar_16);
+ float2 tmpvar_18 = (i.uv + (((tmpvar_3 * (sin((50.2654 * (sqrt(dot(tmpvar_3, tmpvar_3)) * _time))) * (_pow * 0.01))) * tmpvar_16) + tmpvar_17));
+ float tmpvar_19 = float((-0.01 >= (i.uv.y + tmpvar_17.y)));
+ float check1_2 = tmpvar_19;
+ float tmpvar_20 = float((-0.01 >= (1.0 - (i.uv.y + tmpvar_17.y))));
+ float check2_1 = tmpvar_20;
+ float tmpvar_21 = float((0.0 >= (check1_2 + check2_1)));
+ float4 tmpvar_22 = tex2D (_tex0, tmpvar_18);
+
+ float4 tmpvar_23 = float4(tmpvar_22.x, tmpvar_22.y, tmpvar_22.z, 1.0 - _time);
+
+ float4 tmpvar_24 = tex2D (_tex1, tmpvar_18);
+
+ float4 tmpvar_25 = float4(tmpvar_24.x, tmpvar_24.y, tmpvar_24.z, 1.0 - tmpvar_23.w);
+
+ float3 tmpvar_26_xyz = (((tmpvar_23.xyz * tmpvar_23.w) + (tmpvar_25.xyz * tmpvar_25.w)) * tmpvar_21);
+ float tmpvar_26_w = (tmpvar_23.w + tmpvar_25.w);
+ float4 tmpvar_26 = float4(tmpvar_26_xyz.x, tmpvar_26_xyz.y, tmpvar_26_xyz.z, tmpvar_26_w);
+
+ return tmpvar_26;
+ }
+
+ ENDCG
+ }
+ }
+
+ FallBack off
}
\ No newline at end of file
diff --git a/Assets/Resources/shader/effect/Wave.shader b/Assets/Resources/shader/effect/Wave.shader
index ccbbcba9f..6aac70cba 100644
--- a/Assets/Resources/shader/effect/Wave.shader
+++ b/Assets/Resources/shader/effect/Wave.shader
@@ -1,111 +1,71 @@
-Shader "QO/Effect/Wave" {
-Properties {
- _tex0 ("_tex0 : Original Image (RGBA)", 2D) = "white" {}
- _tex1 ("_tex1 : Transform Image (RGBA)", 2D) = "white" {}
- _power ("_power : Wave Power", Float) = 0
- _count ("_count : Go Return Count", Float) = 0
- _time ("_time : Time Rate (0 to 1)", Range(0,1)) = 0
-}
-SubShader {
- LOD 200
- Tags { "QUEUE"="Transparent" "RenderType"="Transparent" }
- Pass {
- Tags { "QUEUE"="Transparent" "RenderType"="Transparent" }
- Blend SrcAlpha OneMinusSrcAlpha
-Program "vp" {
-SubProgram "gles " {
-"!!GLES
+Shader "QO/Effect/Wave"
+{
+ Properties
+ {
+ _tex0("_tex0 : Original Image (RGBA)", 2D) = "white" {}
+ _tex1("_tex1 : Transform Image (RGBA)", 2D) = "white" {}
+ _power("_power : Wave Power", Float) = 0
+ _count("_count : Go Return Count", Float) = 0
+ _time("_time : Time Rate (0 to 1)", Range(0,1)) = 0
+ }
-#ifdef VERTEX
+ SubShader
+ {
+ LOD 200
+ Tags { "QUEUE" = "Transparent" "RenderType" = "Transparent" }
+ Blend SrcAlpha OneMinusSrcAlpha
+ Lighting Off
-varying lowp vec2 xlv_TEXCOORD0;
-varying lowp vec4 xlv_COLOR0;
-uniform highp mat4 glstate_matrix_mvp;
-attribute vec4 _glesMultiTexCoord0;
-attribute vec4 _glesVertex;
-void main ()
-{
- lowp vec2 tmpvar_1;
- highp vec2 tmpvar_2;
- tmpvar_2 = _glesMultiTexCoord0.xy;
- tmpvar_1 = tmpvar_2;
- gl_Position = (glstate_matrix_mvp * _glesVertex);
- xlv_COLOR0 = vec4(1.0, 1.0, 1.0, 1.0);
- xlv_TEXCOORD0 = tmpvar_1;
-}
+ Pass
+ {
+ ZTest Always ZWrite Off
+ Fog { Mode off }
+ CGPROGRAM
+ #pragma vertex vert_img
+ #pragma fragment frag
+ #pragma fragmentoption ARB_precision_hint_fastest
+ #include "UnityCG.cginc"
-#endif
-#ifdef FRAGMENT
-varying lowp vec2 xlv_TEXCOORD0;
-uniform highp float _time;
-uniform highp float _count;
-uniform highp float _power;
-uniform sampler2D _tex1;
-uniform sampler2D _tex0;
-void main ()
-{
- mediump vec4 t0_1;
- lowp float check2_2;
- lowp float check1_3;
- mediump float wave_4;
- mediump float theta_5;
- mediump float sin_omega_6;
- highp float tmpvar_7;
- tmpvar_7 = sin((_time * 3.14159));
- sin_omega_6 = tmpvar_7;
- highp float tmpvar_8;
- tmpvar_8 = (((sin_omega_6 * 3.14159) * (_count * 2.0)) * (0.5 - xlv_TEXCOORD0.y));
- theta_5 = tmpvar_8;
- mediump float tmpvar_9;
- tmpvar_9 = cos(theta_5);
- highp float tmpvar_10;
- tmpvar_10 = ((tmpvar_9 * sin_omega_6) * _power);
- wave_4 = tmpvar_10;
- mediump float tmpvar_11;
- tmpvar_11 = (xlv_TEXCOORD0.x + wave_4);
- mediump vec2 tmpvar_12;
- tmpvar_12.x = tmpvar_11;
- tmpvar_12.y = xlv_TEXCOORD0.y;
- mediump float tmpvar_13;
- tmpvar_13 = float((-0.01 >= tmpvar_11));
- check1_3 = tmpvar_13;
- mediump float tmpvar_14;
- tmpvar_14 = float((-0.01 >= (1.0 - tmpvar_11)));
- check2_2 = tmpvar_14;
- lowp float tmpvar_15;
- tmpvar_15 = float((0.0 >= (check1_3 + check2_2)));
- lowp vec4 tmpvar_16;
- tmpvar_16 = texture2D (_tex0, tmpvar_12);
- highp vec4 tmpvar_17;
- tmpvar_17.xyz = tmpvar_16.xyz;
- tmpvar_17.w = (1.0 - _time);
- t0_1 = tmpvar_17;
- lowp vec4 tmpvar_18;
- tmpvar_18 = texture2D (_tex1, tmpvar_12);
- mediump vec4 tmpvar_19;
- tmpvar_19.xyz = tmpvar_18.xyz;
- tmpvar_19.w = (1.0 - t0_1.w);
- mediump vec4 tmpvar_20;
- tmpvar_20.xyz = (((t0_1.xyz * t0_1.w) + (tmpvar_19.xyz * tmpvar_19.w)) * tmpvar_15);
- tmpvar_20.w = (t0_1.w + tmpvar_19.w);
- gl_FragData[0] = tmpvar_20;
-}
+ uniform sampler2D _tex0;
+ uniform sampler2D _tex1;
+ uniform float _count;
+ uniform float _power;
+ uniform float _time;
+
+ fixed4 frag(v2f_img i) :COLOR
+ {
+ float sin_omega_6 = sin((_time * 3.14159));
+ float theta_5 = (((sin_omega_6 * 3.14159) * (_count * 2.0)) * (0.5 - i.uv.y));
+ float tmpvar_9 = cos(theta_5);
+ float wave_4 = ((tmpvar_9 * sin_omega_6) * _power);
+ float tmpvar_11 = (i.uv.x + wave_4);
+ float2 tmpvar_12 = float2(tmpvar_11, i.uv.y);
+ float check1_3 = float((-0.01 >= tmpvar_11));
+ float check2_2 = float((-0.01 >= (1.0 - tmpvar_11)));
+ float tmpvar_15 = float((0.0 >= (check1_3 + check2_2)));
+ float4 tmpvar_16 = tex2D (_tex0, tmpvar_12);
+
+ float4 tmpvar_17 = float4(tmpvar_16.x, tmpvar_16.y, tmpvar_16.z, (1.0 - _time));
+
+ float4 t0_1 = tmpvar_17;
+ float4 tmpvar_18 = tex2D (_tex1, tmpvar_12);
+
+ float4 tmpvar_19 = float4(tmpvar_18.x, tmpvar_18.y, tmpvar_18.z, (1.0 - t0_1.w));
+
+ float3 tmpvar_20_xyz = (((t0_1.xyz * t0_1.w) + (tmpvar_19.xyz * tmpvar_19.w)) * tmpvar_15);
+ float tmpvar_20_w = (t0_1.w + tmpvar_19.w);
+ float4 tmpvar_20 = float4(tmpvar_20_xyz.x, tmpvar_20_xyz.y, tmpvar_20_xyz.z, tmpvar_20_w);
+ return tmpvar_20;
+ }
+ ENDCG
+ }
+ }
-#endif"
-}
-}
-Program "fp" {
-SubProgram "gles " {
-"!!GLES"
-}
-}
- }
-}
-Fallback "VertexLit"
+FallBack off
}
\ No newline at end of file
diff --git a/Assets/Resources/shader/movie/YCbCrtoRGB.cginc b/Assets/Resources/shader/movie/YCbCrtoRGB.cginc
new file mode 100644
index 000000000..66ee61f7d
--- /dev/null
+++ b/Assets/Resources/shader/movie/YCbCrtoRGB.cginc
@@ -0,0 +1,38 @@
+fixed4 SampleYCbCr ( half2 Yuv, half2 CbCruv)
+{
+ #ifdef UNITY_COMPILER_CG
+ fixed4 YCrCb = fixed4(tex2D (_YTex, Yuv).a + 0.001, tex2D (_CrTex, CbCruv).a + 0.001, tex2D (_CbTex, CbCruv).a + 0.001, 1.0);
+ #else
+ fixed4 YCrCb = fixed4(tex2D (_YTex, Yuv).a, tex2D (_CrTex, CbCruv).a, tex2D (_CbTex, CbCruv).a, 1.0);
+ #endif
+
+ return YCrCb;
+}
+
+
+half4 YCbCrToRGB( half4 YCbCr )
+{
+ //Spent ages on these
+ //www.theora.org/doc/Theora.pdf
+ //R = ((Y - (16.0/255.0)) * (255.0/219.0)) + (2*(1 - 0.299)*((Cr - (128.0/255.0)) * (255.0/244.0)))
+ //G = ((Y - (16.0/255.0)) * (255.0/219.0)) - (2 * (((1 - 0.114)*0.114)/(1 - 0.114 - 0.299)) * ((Cb - (128.0/255.0)) * (255.0/244.0))) - (2 * (((1 - 0.299)*0.299)/(1 - 0.114 - 0.299)) * ((Cr - (128.0/255.0)) * (255.0/244.0)))
+ //B = ((Y - (16.0/255.0)) * (255.0/219.0)) + (2*(1 - 0.114)*((Cb - (128.0/255.0)) * (255.0/244.0)))
+
+ //half4 YCbCr2R = half4(1.16438, 1.4652, 0, -0.808535);
+ //half4 YCbCr2G = half4(1.16438, -0.714136, -0.359651, 0.46594);
+ //half4 YCbCr2B = half4(1.16438, 0,1.85189, -1.00263);
+
+ //However the original ones are more accurate with a colour bar test video
+ half4 YCbCr2R = half4(1.1643828125, 1.59602734375, 0, -.87078515625);
+ half4 YCbCr2G = half4(1.1643828125, -.81296875, -.39176171875, .52959375);
+ half4 YCbCr2B = half4(1.1643828125, 0, 2.017234375, -1.081390625);
+
+ half4 rgbVec;
+
+ rgbVec.x = dot(YCbCr2R, YCbCr);
+ rgbVec.y = dot(YCbCr2G, YCbCr);
+ rgbVec.z = dot(YCbCr2B, YCbCr);
+ rgbVec.w = 1.0f;
+
+ return rgbVec;
+}
\ No newline at end of file
diff --git a/Assets/Resources/shader/movie/YCrCbtoRGB Add.shader b/Assets/Resources/shader/movie/YCrCbtoRGB Add.shader
deleted file mode 100644
index c37c78bbc..000000000
--- a/Assets/Resources/shader/movie/YCrCbtoRGB Add.shader
+++ /dev/null
@@ -1,73 +0,0 @@
-Shader "Color Space/YCrCbtoRGB Add" {
-Properties {
- _YTex ("Y (RGB)", 2D) = "white" {}
- _CbTex ("Cb (RGB)", 2D) = "white" {}
- _CrTex ("Cr (RGB)", 2D) = "white" {}
-}
-SubShader {
- Tags { "QUEUE"="Overlay" "RenderType"="Opaque" }
- Pass {
- Tags { "QUEUE"="Overlay" "RenderType"="Opaque" }
- Fog {
- Color (0,0,0,0)
- }
- Blend One One
- ColorMask RGB
-Program "vp" {
-SubProgram "gles " {
-"!!GLES
-
-
-#ifdef VERTEX
-
-varying highp vec2 xlv_TEXCOORD0;
-uniform highp vec4 _YTex_ST;
-uniform highp mat4 glstate_matrix_mvp;
-attribute vec4 _glesMultiTexCoord0;
-attribute vec4 _glesVertex;
-void main ()
-{
- gl_Position = (glstate_matrix_mvp * _glesVertex);
- xlv_TEXCOORD0 = ((_glesMultiTexCoord0.xy * _YTex_ST.xy) + _YTex_ST.zw);
-}
-
-
-
-#endif
-#ifdef FRAGMENT
-
-varying highp vec2 xlv_TEXCOORD0;
-uniform sampler2D _CrTex;
-uniform sampler2D _CbTex;
-uniform sampler2D _YTex;
-void main ()
-{
- mediump vec4 rgbVec_1;
- mediump vec4 yuvVec_2;
- lowp vec4 tmpvar_3;
- tmpvar_3.w = 1.0;
- tmpvar_3.x = texture2D (_YTex, xlv_TEXCOORD0).x;
- tmpvar_3.y = texture2D (_CbTex, xlv_TEXCOORD0).y;
- tmpvar_3.z = texture2D (_CrTex, xlv_TEXCOORD0).z;
- yuvVec_2 = tmpvar_3;
- rgbVec_1.x = dot (vec4(1.16438, 0.0, 1.59603, -0.870785), yuvVec_2);
- rgbVec_1.y = dot (vec4(1.16438, -0.391762, -0.812969, 0.529594), yuvVec_2);
- rgbVec_1.z = dot (vec4(1.16438, 2.01723, 0.0, -1.08139), yuvVec_2);
- rgbVec_1.w = 0.3;
- gl_FragData[0] = rgbVec_1;
-}
-
-
-
-#endif"
-}
-}
-Program "fp" {
-SubProgram "gles " {
-"!!GLES"
-}
-}
- }
-}
-Fallback "VertexLit"
-}
\ No newline at end of file
diff --git a/Assets/Resources/shader/movie/YCrCbtoRGB.shader b/Assets/Resources/shader/movie/YCrCbtoRGB.shader
index 14679540a..779db776c 100644
--- a/Assets/Resources/shader/movie/YCrCbtoRGB.shader
+++ b/Assets/Resources/shader/movie/YCrCbtoRGB.shader
@@ -1,81 +1,59 @@
-Shader "Color Space/YCrCbtoRGB" {
-Properties {
- _YTex ("Y (RGB)", 2D) = "white" {}
- _CrTex ("Cr (RGB)", 2D) = "white" {}
- _CbTex ("Cb (RGB)", 2D) = "white" {}
-}
-SubShader {
- Tags { "RenderType"="Opaque" }
- Pass {
- Tags { "RenderType"="Opaque" }
- Fog {
- Color (0,0,0,0)
- }
- ColorMask RGB
-Program "vp" {
-SubProgram "gles " {
-"!!GLES
- #define SHADER_API_GLES 1
- #define tex2D texture2D
+// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)'
+Shader "Color Space/YCbCrtoRGB"
+{
+ Properties
+ {
+ _YTex ("Y (RGB)", 2D) = "black" {}
+ _CrTex ("Cr (RGB)", 2D) = "gray" {}
+ _CbTex ("Cb (RGB)", 2D) = "gray" {}
+ }
+ SubShader
+ {
+ Tags { "RenderType"="Opaque" }
+ Pass
+ {
+ ColorMask RGB
+ Lighting Off Fog { Color (0,0,0,0) }
- #ifdef VERTEX
- #define gl_ModelViewProjectionMatrix glstate_matrix_mvp
- uniform mat4 glstate_matrix_mvp;
+ CGPROGRAM
+ #pragma vertex vert
+ #pragma fragment frag
- varying mediump vec2 xlv_TEXCOORD1;
- varying mediump vec2 xlv_TEXCOORD0;
+ #include "UnityCG.cginc"
- uniform highp vec4 _YTex_ST;
- uniform highp vec4 _CbTex_ST;
- attribute vec4 _glesMultiTexCoord0;
- attribute vec4 _glesVertex;
- void main ()
- {
- mediump vec2 tmpvar_1;
- mediump vec2 tmpvar_2;
- highp vec2 tmpvar_3;
- tmpvar_3 = ((_glesMultiTexCoord0.xy * _YTex_ST.xy) + _YTex_ST.zw);
- tmpvar_1 = tmpvar_3;
- highp vec2 tmpvar_4;
- tmpvar_4 = ((_glesMultiTexCoord0.xy * _CbTex_ST.xy) + _CbTex_ST.zw);
- tmpvar_2 = tmpvar_4;
- gl_Position = (gl_ModelViewProjectionMatrix * _glesVertex);
- xlv_TEXCOORD0 = tmpvar_1;
- xlv_TEXCOORD1 = tmpvar_2;
- }
+ sampler2D _YTex;
+ sampler2D _CbTex;
+ sampler2D _CrTex;
+
+ #include "YCbCrtoRGB.cginc"
- #endif
- #ifdef FRAGMENT
-
- varying mediump vec2 xlv_TEXCOORD1;
- varying mediump vec2 xlv_TEXCOORD0;
- uniform sampler2D _YTex;
- uniform sampler2D _CrTex;
- uniform sampler2D _CbTex;
- void main ()
- {
- lowp vec4 rgbVec;
- lowp vec4 tmpvar_1;
- tmpvar_1.w = 1.0;
- tmpvar_1.x = texture2D (_YTex, xlv_TEXCOORD0).x;
- tmpvar_1.y = texture2D (_CrTex, xlv_TEXCOORD1).y;
- tmpvar_1.z = texture2D (_CbTex, xlv_TEXCOORD1).z;
- rgbVec.x = dot (vec4(1.16438, 0.0, 1.59603, -0.870785), tmpvar_1);
- rgbVec.y = dot (vec4(1.16438, -0.391762, -0.812969, 0.529594), tmpvar_1);
- rgbVec.z = dot (vec4(1.16438, 2.01723, 0.0, -1.08139), tmpvar_1);
- rgbVec.w = 1.0;
- gl_FragData[0] = rgbVec;
- }
+ struct v2f
+ {
+ float4 pos : SV_POSITION;
+ half2 uvY : TEXCOORD0;
+ half2 uvCbCr : TEXCOORD1;
+ };
- #endif"
-}
-}
-Program "fp" {
-SubProgram "gles " {
-"!!GLES"
-}
-}
- }
+ float4 _YTex_ST;
+ float4 _CbTex_ST;
+
+ v2f vert (appdata_base v)
+ {
+ v2f o;
+ o.pos = UnityObjectToClipPos (v.vertex);
+ o.uvY = TRANSFORM_TEX (v.texcoord, _YTex);
+ o.uvCbCr = TRANSFORM_TEX (v.texcoord, _CbTex);
+ return o;
+ }
+
+ fixed4 frag (v2f i) : COLOR
+ {
+ return YCbCrToRGB(SampleYCbCr( i.uvY, i.uvCbCr));
+ }
+ ENDCG
+ }
+ }
}
-}
\ No newline at end of file
+
+
diff --git a/Assets/Resources/shader/movie/YCrCbtoRGBChromaKey.shader b/Assets/Resources/shader/movie/YCrCbtoRGBChromaKey.shader
index 6a2434e64..9ab3a977f 100644
--- a/Assets/Resources/shader/movie/YCrCbtoRGBChromaKey.shader
+++ b/Assets/Resources/shader/movie/YCrCbtoRGBChromaKey.shader
@@ -1,90 +1,92 @@
-Shader "Color Space/YCrCbtoRGB Chroma Key" {
-Properties {
- _YTex ("Y (RGB)", 2D) = "white" {}
- _CrTex ("Cr (RGB)", 2D) = "white" {}
- _CbTex ("Cb (RGB)", 2D) = "white" {}
- _KeyYCrCb ("Key Color YCrCb", Vector) = (0,0,0,-0.6)
- _KeyScale ("Comparison Scale", Vector) = (0.2,1,1,4.5)
-}
-SubShader {
- Tags { "QUEUE"="Transparent" "IGNOREPROJECTOR"="True" "RenderType"="Transparent" }
- Pass {
- Tags { "QUEUE"="Transparent" "IGNOREPROJECTOR"="True" "RenderType"="Transparent" }
- ZWrite Off
- Fog {
- Color (0,0,0,0)
- }
- Blend SrcAlpha OneMinusSrcAlpha
-Program "vp" {
-SubProgram "gles " {
-"!!GLES
- #define SHADER_API_GLES 1
- #define tex2D texture2D
-
-
- #ifdef VERTEX
- #define gl_ModelViewProjectionMatrix glstate_matrix_mvp
- uniform mat4 glstate_matrix_mvp;
-
- varying mediump vec2 xlv_TEXCOORD1;
- varying mediump vec2 xlv_TEXCOORD0;
-
- uniform highp vec4 _YTex_ST;
- uniform highp vec4 _CbTex_ST;
- attribute vec4 _glesMultiTexCoord0;
- attribute vec4 _glesVertex;
- void main ()
- {
- mediump vec2 tmpvar_1;
- mediump vec2 tmpvar_2;
- highp vec2 tmpvar_3;
- tmpvar_3 = ((_glesMultiTexCoord0.xy * _YTex_ST.xy) + _YTex_ST.zw);
- tmpvar_1 = tmpvar_3;
- highp vec2 tmpvar_4;
- tmpvar_4 = ((_glesMultiTexCoord0.xy * _CbTex_ST.xy) + _CbTex_ST.zw);
- tmpvar_2 = tmpvar_4;
- gl_Position = (gl_ModelViewProjectionMatrix * _glesVertex);
- xlv_TEXCOORD0 = tmpvar_1;
- xlv_TEXCOORD1 = tmpvar_2;
- }
-
-
-
- #endif
- #ifdef FRAGMENT
-
- varying mediump vec2 xlv_TEXCOORD1;
- varying mediump vec2 xlv_TEXCOORD0;
- uniform sampler2D _YTex;
- uniform mediump vec4 _KeyYCrCb;
- uniform mediump vec4 _KeyScale;
- uniform sampler2D _CrTex;
- uniform sampler2D _CbTex;
- void main ()
- {
- lowp vec4 rgbVec;
- lowp vec4 tmpvar_1;
- tmpvar_1.w = 1.0;
- tmpvar_1.x = texture2D (_YTex, xlv_TEXCOORD0).x;
- tmpvar_1.y = texture2D (_CrTex, xlv_TEXCOORD1).y;
- tmpvar_1.z = texture2D (_CbTex, xlv_TEXCOORD1).z;
- rgbVec.x = dot (vec4(1.16438, 0.0, 1.59603, -0.870785), tmpvar_1);
- rgbVec.y = dot (vec4(1.16438, -0.391762, -0.812969, 0.529594), tmpvar_1);
- rgbVec.z = dot (vec4(1.16438, 2.01723, 0.0, -1.08139), tmpvar_1);
- mediump float tmpvar_2;
- tmpvar_2 = ((length (((tmpvar_1.xyz - _KeyYCrCb.xyz) * _KeyScale.xyz)) + _KeyYCrCb.w) * _KeyScale.w);
- rgbVec.w = tmpvar_2;
- gl_FragData[0] = rgbVec;
- }
-
- #endif"
-}
-}
-Program "fp" {
-SubProgram "gles " {
-"!!GLES"
-}
-}
- }
+// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)'
+
+Shader "Color Space/YCbCrtoRGB Chroma Key"
+{
+ Properties
+ {
+ _YTex ("Y (RGB)", 2D) = "black" {}
+ _CrTex ("Cr (RGB)", 2D) = "gray" {}
+ _CbTex ("Cb (RGB)", 2D) = "gray" {}
+
+ [YCbCr] _KeyYCbCr ("Chroma Key Color", Vector) = (0,0,0,-0.6)
+ [YCbCrPriority] _YCbCRDeltaScale ("YCbCr priority", Vector) = (0.1,1,1) //Different CbCr means a more different color than a different Y
+ _LowThreshold ("Low threashold", Range(0.0, 1.0)) = 0.2
+ _HighThreshold ("High threashold", Range(0.0, 1.0)) = 0.25
+ }
+ SubShader
+ {
+ Tags {"Queue"="Transparent" "IgnoreProjector"="True" "RenderType"="Transparent"}
+ Pass
+ {
+ Lighting Off Fog { Color (0,0,0,0) }
+ Blend SrcAlpha OneMinusSrcAlpha
+ ZWrite Off
+
+ CGPROGRAM
+ #pragma vertex vert
+ #pragma fragment frag
+
+ #include "UnityCG.cginc"
+
+ sampler2D _YTex;
+ sampler2D _CbTex;
+ sampler2D _CrTex;
+
+ #include "YCbCrtoRGB.cginc"
+
+ half3 _KeyYCbCr;
+ half4 _YCbCRDeltaScale;
+ half _LowThreshold;
+ half _HighThreshold;
+
+ struct v2f
+ {
+ float4 pos : SV_POSITION;
+ half2 uvY : TEXCOORD0;
+ half4 uvCbCr : TEXCOORD1; // u,v,offset,normalise
+ };
+
+ float4 _YTex_ST;
+ float4 _CbTex_ST;
+
+ v2f vert (appdata_base v)
+ {
+ v2f o;
+ o.pos = UnityObjectToClipPos (v.vertex);
+ o.uvY = TRANSFORM_TEX (v.texcoord, _YTex);
+ o.uvCbCr.xy = TRANSFORM_TEX (v.texcoord, _CbTex);
+
+ //Work out the threasholds in the vertex shader
+ //float scaleLength = length(_YCbCRDeltaScale);
+ float scaleLength = _YCbCRDeltaScale.w;
+
+ float bottom = _LowThreshold * scaleLength;
+ float top = _HighThreshold * scaleLength;
+
+ float range = top - bottom;
+ float offset = -bottom;
+
+ float normalise = 1.0/range;
+
+ o.uvCbCr.z = offset;
+ o.uvCbCr.w = normalise;
+
+ return o;
+ }
+
+ fixed4 frag (v2f i) : COLOR
+ {
+ fixed4 YCbCr = SampleYCbCr( i.uvY, i.uvCbCr);
+ fixed4 rgbVec = YCbCrToRGB(YCbCr);
+
+ half3 deltaVec = (YCbCr.xyz - _KeyYCbCr.xyz) * _YCbCRDeltaScale.xyz;
+
+ rgbVec.w = (length(deltaVec) + i.uvCbCr.z)* i.uvCbCr.w;
+
+ return rgbVec;
+ }
+ ENDCG
+ }
+ }
}
-}
\ No newline at end of file
+
diff --git a/Assets/Resources/shader/movie/YCrCbtoRGBSplitAlpha.shader b/Assets/Resources/shader/movie/YCrCbtoRGBSplitAlpha.shader
index 1608fbbb7..1050b4b76 100644
--- a/Assets/Resources/shader/movie/YCrCbtoRGBSplitAlpha.shader
+++ b/Assets/Resources/shader/movie/YCrCbtoRGBSplitAlpha.shader
@@ -1,100 +1,79 @@
-Shader "Color Space/YCrCbtoRGB Split Alpha" {
-Properties {
- _YTex ("Y (RGB)", 2D) = "white" {}
- _CrTex ("Cr (RGB)", 2D) = "white" {}
- _CbTex ("Cb (RGB)", 2D) = "white" {}
-}
-SubShader {
- Tags { "QUEUE"="Transparent" "IGNOREPROJECTOR"="True" "RenderType"="Transparent" }
- Pass {
- Tags { "QUEUE"="Transparent" "IGNOREPROJECTOR"="True" "RenderType"="Transparent" }
- ZWrite Off
- Fog {
- Color (0,0,0,0)
- }
- Blend SrcAlpha OneMinusSrcAlpha
- ColorMask RGB
-Program "vp" {
-SubProgram "gles " {
-"!!GLES
- #define SHADER_API_GLES 1
- #define tex2D texture2D
-
-
- #ifdef VERTEX
- #define gl_ModelViewProjectionMatrix glstate_matrix_mvp
- uniform mat4 glstate_matrix_mvp;
-
- varying mediump vec2 xlv_TEXCOORD2;
- varying mediump vec2 xlv_TEXCOORD1;
- varying mediump vec2 xlv_TEXCOORD0;
+// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)'
- uniform highp vec4 _YTex_ST;
- uniform highp vec4 _CbTex_ST;
- attribute vec4 _glesMultiTexCoord0;
- attribute vec4 _glesVertex;
- void main ()
- {
- highp vec4 texcoordTop;
- highp vec4 texcoordBottom;
- mediump vec2 tmpvar_1;
- mediump vec2 tmpvar_2;
- mediump vec2 tmpvar_3;
- texcoordBottom = _glesMultiTexCoord0;
- texcoordBottom.y = (_glesMultiTexCoord0.y / 2.0);
- texcoordTop = _glesMultiTexCoord0;
- texcoordTop.y = (texcoordBottom.y + 0.5);
- highp vec2 tmpvar_4;
- tmpvar_4 = ((texcoordTop.xy * _YTex_ST.xy) + _YTex_ST.zw);
- tmpvar_1 = tmpvar_4;
- highp vec2 tmpvar_5;
- tmpvar_5 = ((texcoordBottom.xy * _YTex_ST.xy) + _YTex_ST.zw);
- tmpvar_2 = tmpvar_5;
- highp vec2 tmpvar_6;
- tmpvar_6 = ((texcoordTop.xy * _CbTex_ST.xy) + _CbTex_ST.zw);
- tmpvar_3 = tmpvar_6;
- gl_Position = (gl_ModelViewProjectionMatrix * _glesVertex);
- xlv_TEXCOORD0 = tmpvar_1;
- xlv_TEXCOORD1 = tmpvar_2;
- xlv_TEXCOORD2 = tmpvar_3;
- }
+Shader "Color Space/YCrCbtoRGB Split Alpha"
+{
+ Properties
+ {
+ _YTex ("Y (RGB)", 2D) = "black" {}
+ _CrTex ("Cr (RGB)", 2D) = "gray" {}
+ _CbTex ("Cb (RGB)", 2D) = "gray" {}
+ [KeywordEnum(Vertical, Horizontal)] Mode ("Alpha Mode", Float) = 0
+ }
+ SubShader
+ {
+ Tags { "Queue"="Transparent" "IgnoreProjector"="True" "RenderType"="Transparent" }
+ Pass
+ {
+ Blend SrcAlpha OneMinusSrcAlpha
+ ColorMask RGB
+ Lighting Off Fog { Color (0,0,0,0) }
+ ZWrite Off
+ CGPROGRAM
+ #pragma vertex vert
+ #pragma fragment frag
+ #pragma multi_compile MODE_VERTICAL MODE_HORIZONTAL
- #endif
- #ifdef FRAGMENT
+ #include "UnityCG.cginc"
- varying mediump vec2 xlv_TEXCOORD2;
- varying mediump vec2 xlv_TEXCOORD1;
- varying mediump vec2 xlv_TEXCOORD0;
- uniform sampler2D _YTex;
- uniform sampler2D _CrTex;
- uniform sampler2D _CbTex;
- void main ()
- {
- lowp vec4 rgbVec;
- lowp vec4 tmpvar_1;
- tmpvar_1.w = 1.0;
- tmpvar_1.x = texture2D (_YTex, xlv_TEXCOORD0).x;
- tmpvar_1.y = texture2D (_CrTex, xlv_TEXCOORD2).y;
- tmpvar_1.z = texture2D (_CbTex, xlv_TEXCOORD2).z;
- rgbVec.x = dot (vec4(1.16438, 0.0, 1.59603, -0.870785), tmpvar_1);
- rgbVec.y = dot (vec4(1.16438, -0.391762, -0.812969, 0.529594), tmpvar_1);
- rgbVec.z = dot (vec4(1.16438, 2.01723, 0.0, -1.08139), tmpvar_1);
- rgbVec.w = ((texture2D (_YTex, xlv_TEXCOORD1).y - 0.0627451) * 1.16438);
- gl_FragData[0] = rgbVec;
- }
+ sampler2D _YTex;
+ sampler2D _CbTex;
+ sampler2D _CrTex;
+
+ #include "YCbCrtoRGB.cginc"
+
+ struct v2f
+ {
+ float4 pos : SV_POSITION;
+ half2 uvY : TEXCOORD0;
+ half2 uvAlpha : TEXCOORD1;
+ half2 uvCbCr : TEXCOORD2;
+ };
+ float4 _YTex_ST;
+ float4 _CbTex_ST;
+ v2f vert (appdata_base v)
+ {
+ v2f o;
+ o.pos = UnityObjectToClipPos (v.vertex);
+
+ float4 texcoordBottom = v.texcoord;
+ float4 texcoordTop = v.texcoord;
+#if MODE_VERTICAL
+ texcoordBottom.y = ( v.texcoord.y / 2.0f );
+ texcoordTop.y = texcoordBottom.y + 0.5f;
+#else
+ texcoordBottom.x = ( v.texcoord.x / 2.0f );
+ texcoordTop.x = texcoordBottom.x + 0.5f;
+#endif
+
+ o.uvY = TRANSFORM_TEX (texcoordTop, _YTex);
+ o.uvAlpha = TRANSFORM_TEX (texcoordBottom, _YTex);
+ o.uvCbCr = TRANSFORM_TEX (texcoordTop, _CbTex);
+ return o;
+ }
- #endif"
-}
-}
-Program "fp" {
-SubProgram "gles " {
-"!!GLES"
-}
-}
- }
+ fixed4 frag (v2f i) : COLOR
+ {
+ fixed4 rgbVec = YCbCrToRGB(SampleYCbCr( i.uvY, i.uvCbCr));
+
+ rgbVec.w = ((tex2D(_YTex, i.uvAlpha).a - (16.0/255.0)) * (255.0/219.0));
+
+ return rgbVec;
+ }
+ ENDCG
+ }
+ }
}
-}
\ No newline at end of file
diff --git a/Assets/Resources/shader/movie/YCrCbtoRGBTrans.shader b/Assets/Resources/shader/movie/YCrCbtoRGBTrans.shader
index 05efffed9..116f927e8 100644
--- a/Assets/Resources/shader/movie/YCrCbtoRGBTrans.shader
+++ b/Assets/Resources/shader/movie/YCrCbtoRGBTrans.shader
@@ -1,90 +1,63 @@
-Shader "Color Space/YCrCbtoRGB Trans" {
-Properties {
- _YTex ("Y (RGB)", 2D) = "white" {}
- _CrTex ("Cr (RGB)", 2D) = "white" {}
- _CbTex ("Cb (RGB)", 2D) = "white" {}
- _TintColor ("Color", Color) = (1,1,1,1)
+// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)'
+
+Shader "Color Space/YCbCrtoRGB Trans"
+{
+ Properties
+ {
+ _YTex ("Y (RGB)", 2D) = "black" {}
+ _CrTex ("Cr (RGB)", 2D) = "gray" {}
+ _CbTex ("Cb (RGB)", 2D) = "gray" {}
+ _TintColor ("Color", COLOR) = (1,1,1,1)
+ }
+ SubShader
+ {
+ Tags { "Queue"="Transparent" "IgnoreProjector"="True" "RenderType"="Transparent" }
+ Pass
+ {
+ Blend SrcAlpha OneMinusSrcAlpha
+ ColorMask RGB
+ Lighting Off Fog { Color (0,0,0,0) }
+ ZWrite Off
+
+ CGPROGRAM
+ #pragma vertex vert
+ #pragma fragment frag
+
+ #include "UnityCG.cginc"
+
+ sampler2D _YTex;
+ sampler2D _CbTex;
+ sampler2D _CrTex;
+
+ #include "YCbCrtoRGB.cginc"
+
+ fixed4 _TintColor;
+
+ struct v2f
+ {
+ float4 pos : SV_POSITION;
+ half2 uvY : TEXCOORD0;
+ half2 uvCbCr : TEXCOORD1;
+ };
+
+ float4 _YTex_ST;
+ float4 _CbTex_ST;
+
+ v2f vert (appdata_base v)
+ {
+ v2f o;
+ o.pos = UnityObjectToClipPos (v.vertex);
+ o.uvY = TRANSFORM_TEX (v.texcoord, _YTex);
+ o.uvCbCr = TRANSFORM_TEX (v.texcoord, _CbTex);
+ return o;
+ }
+
+ fixed4 frag (v2f i) : COLOR
+ {
+ return YCbCrToRGB(SampleYCbCr( i.uvY, i.uvCbCr))*_TintColor;
+ }
+ ENDCG
+ }
+ }
}
-SubShader {
- Tags { "QUEUE"="Transparent" "IGNOREPROJECTOR"="True" "RenderType"="Transparent" }
- Pass {
- Tags { "QUEUE"="Transparent" "IGNOREPROJECTOR"="True" "RenderType"="Transparent" }
- ZWrite Off
- Fog {
- Color (0,0,0,0)
- }
- Blend SrcAlpha OneMinusSrcAlpha
- ColorMask RGB
-Program "vp" {
-SubProgram "gles " {
-"!!GLES
- #define SHADER_API_GLES 1
- #define tex2D texture2D
-
- #ifdef VERTEX
- #define gl_ModelViewProjectionMatrix glstate_matrix_mvp
- uniform mat4 glstate_matrix_mvp;
-
- varying mediump vec2 xlv_TEXCOORD1;
- varying mediump vec2 xlv_TEXCOORD0;
-
- uniform highp vec4 _YTex_ST;
- uniform highp vec4 _CbTex_ST;
- attribute vec4 _glesMultiTexCoord0;
- attribute vec4 _glesVertex;
- void main ()
- {
- mediump vec2 tmpvar_1;
- mediump vec2 tmpvar_2;
- highp vec2 tmpvar_3;
- tmpvar_3 = ((_glesMultiTexCoord0.xy * _YTex_ST.xy) + _YTex_ST.zw);
- tmpvar_1 = tmpvar_3;
- highp vec2 tmpvar_4;
- tmpvar_4 = ((_glesMultiTexCoord0.xy * _CbTex_ST.xy) + _CbTex_ST.zw);
- tmpvar_2 = tmpvar_4;
- gl_Position = (gl_ModelViewProjectionMatrix * _glesVertex);
- xlv_TEXCOORD0 = tmpvar_1;
- xlv_TEXCOORD1 = tmpvar_2;
- }
-
-
-
- #endif
- #ifdef FRAGMENT
-
- varying mediump vec2 xlv_TEXCOORD1;
- varying mediump vec2 xlv_TEXCOORD0;
- uniform sampler2D _YTex;
- uniform lowp vec4 _TintColor;
- uniform sampler2D _CrTex;
- uniform sampler2D _CbTex;
- void main ()
- {
- lowp vec4 rgbVec;
- lowp vec4 tmpvar_1;
- tmpvar_1.w = 1.0;
- tmpvar_1.x = texture2D (_YTex, xlv_TEXCOORD0).x;
- tmpvar_1.y = texture2D (_CrTex, xlv_TEXCOORD1).y;
- tmpvar_1.z = texture2D (_CbTex, xlv_TEXCOORD1).z;
- rgbVec.x = dot (vec4(1.16438, 0.0, 1.59603, -0.870785), tmpvar_1);
- rgbVec.y = dot (vec4(1.16438, -0.391762, -0.812969, 0.529594), tmpvar_1);
- rgbVec.z = dot (vec4(1.16438, 2.01723, 0.0, -1.08139), tmpvar_1);
- rgbVec.w = 1.0;
- lowp vec4 tmpvar_2;
- tmpvar_2 = (rgbVec * _TintColor);
- rgbVec = tmpvar_2;
- gl_FragData[0] = tmpvar_2;
- }
-
- #endif"
-}
-}
-Program "fp" {
-SubProgram "gles " {
-"!!GLES"
-}
-}
- }
-}
-}
\ No newline at end of file
diff --git a/Assets/Resources/shader/sprite/Sprite Add.shader b/Assets/Resources/shader/sprite/Sprite Add.shader
index 6b05cd0d8..12647dc04 100644
--- a/Assets/Resources/shader/sprite/Sprite Add.shader
+++ b/Assets/Resources/shader/sprite/Sprite Add.shader
@@ -1,3 +1,5 @@
+// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)'
+
Shader "QO/Sprite Add"
{
Properties
@@ -45,7 +47,7 @@ Shader "QO/Sprite Add"
float2 uv_2 = _UVWH.xy;
float2 wh_1 = _UVWH.zw;
o.color = v.color;
- o.vertex = mul(UNITY_MATRIX_MVP, v.vertex);
+ o.vertex = UnityObjectToClipPos(v.vertex);
o.texcoord = ((v.texcoord * wh_1) + uv_2);
return o;
}
diff --git a/Assets/Resources/shader/sprite/Sprite Back.shader b/Assets/Resources/shader/sprite/Sprite Back.shader
index c0160b9ad..02d0e4074 100644
--- a/Assets/Resources/shader/sprite/Sprite Back.shader
+++ b/Assets/Resources/shader/sprite/Sprite Back.shader
@@ -1,3 +1,5 @@
+// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)'
+
Shader "QO/Sprite Back"
{
Properties
@@ -45,7 +47,7 @@ Shader "QO/Sprite Back"
float2 uv_2 = _UVWH.xy;
float2 wh_1 = _UVWH.zw;
o.color = v.color;
- o.vertex = mul(UNITY_MATRIX_MVP, v.vertex);
+ o.vertex = UnityObjectToClipPos(v.vertex);
o.texcoord = ((v.texcoord * wh_1) + uv_2);
return o;
}
diff --git a/Assets/Resources/shader/sprite/Sprite Flash.shader b/Assets/Resources/shader/sprite/Sprite Flash.shader
index 13d6a015b..780e9a08a 100644
--- a/Assets/Resources/shader/sprite/Sprite Flash.shader
+++ b/Assets/Resources/shader/sprite/Sprite Flash.shader
@@ -1,3 +1,5 @@
+// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)'
+
Shader "QO/Sprite Flash"
{
Properties
@@ -47,7 +49,7 @@ Shader "QO/Sprite Flash"
float2 uv_2 = _UVWH.xy;
float2 wh_1 = _UVWH.zw;
o.color = v.color;
- o.vertex = mul(UNITY_MATRIX_MVP, v.vertex);
+ o.vertex = UnityObjectToClipPos(v.vertex);
o.texcoord = ((v.texcoord * wh_1) + uv_2);
return o;
}
diff --git a/Assets/Resources/shader/sprite/Sprite NoTexAlpha.shader b/Assets/Resources/shader/sprite/Sprite NoTexAlpha.shader
index 873522092..dc3e7efcf 100644
--- a/Assets/Resources/shader/sprite/Sprite NoTexAlpha.shader
+++ b/Assets/Resources/shader/sprite/Sprite NoTexAlpha.shader
@@ -1,3 +1,5 @@
+// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)'
+
Shader "QO/Sprite NoTexAlpha"
{
Properties
@@ -45,7 +47,7 @@ Shader "QO/Sprite NoTexAlpha"
float2 uv_2 = _UVWH.xy;
float2 wh_1 = _UVWH.zw;
o.color = v.color;
- o.vertex = mul(UNITY_MATRIX_MVP, v.vertex);
+ o.vertex = UnityObjectToClipPos(v.vertex);
o.texcoord = ((v.texcoord * wh_1) + uv_2);
return o;
}
@@ -53,7 +55,7 @@ Shader "QO/Sprite NoTexAlpha"
half4 frag (v2f IN) : COLOR
{
float3 rest = tex2D(_MainTex, IN.texcoord).xyz;
- float4 together = (rest.x,rest.y, rest.z, 0.0);
+ float4 together = float4(rest.x,rest.y, rest.z, 0.0);
//float4 tex = tex2D(_MainTex, IN.texcoord);
float4 tmpvar_1 = (together * _Color);
return tmpvar_1;
diff --git a/Assets/Resources/shader/sprite/Sprite.shader b/Assets/Resources/shader/sprite/Sprite.shader
index 70bfef3bd..25696e4b5 100644
--- a/Assets/Resources/shader/sprite/Sprite.shader
+++ b/Assets/Resources/shader/sprite/Sprite.shader
@@ -1,4 +1,6 @@
-Shader "QO/Sprite"
+// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)'
+
+Shader "QO/Sprite"
{
Properties
{
@@ -45,7 +47,7 @@
float2 uv_2 = _UVWH.xy;
float2 wh_1 = _UVWH.zw;
o.color = v.color;
- o.vertex = mul(UNITY_MATRIX_MVP, v.vertex);
+ o.vertex = UnityObjectToClipPos(v.vertex);
o.texcoord = ((v.texcoord * wh_1) + uv_2);
return o;
}
diff --git a/Assets/Resources/shader/sprite/TextSprite.shader b/Assets/Resources/shader/sprite/TextSprite.shader
index 311b1d10c..398a0ca32 100644
--- a/Assets/Resources/shader/sprite/TextSprite.shader
+++ b/Assets/Resources/shader/sprite/TextSprite.shader
@@ -1,3 +1,5 @@
+// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)'
+
Shader "QO/TextSprite"
{
Properties
@@ -52,7 +54,7 @@ Shader "QO/TextSprite"
v2f vert (appdata_t v)
{
v2f o;
- o.vertex = mul(UNITY_MATRIX_MVP, v.vertex);
+ o.vertex = UnityObjectToClipPos(v.vertex);
o.color = v.color;
o.texcoord = v.texcoord;
return o;
diff --git a/Assets/Scene/Scenes/Init.unity b/Assets/Scene/Scenes/Init.unity
index 865d4b6f8..8c5056799 100644
Binary files a/Assets/Scene/Scenes/Init.unity and b/Assets/Scene/Scenes/Init.unity differ
diff --git a/Assets/Scene/Scenes/SceneTitleCredits.unity b/Assets/Scene/Scenes/SceneTitleCredits.unity
new file mode 100644
index 000000000..d55002bd8
Binary files /dev/null and b/Assets/Scene/Scenes/SceneTitleCredits.unity differ
diff --git a/Assets/Scene/ShaderTestingGrounds.unity b/Assets/Scene/ShaderTestingGrounds.unity
deleted file mode 100644
index 96c848cbd..000000000
Binary files a/Assets/Scene/ShaderTestingGrounds.unity and /dev/null differ
diff --git a/Assets/Scripts/Assembly-CSharp/AdventureMenuWindow.cs b/Assets/Scripts/Assembly-CSharp/AdventureMenuWindow.cs
index 308d21d82..e3b2c6926 100644
--- a/Assets/Scripts/Assembly-CSharp/AdventureMenuWindow.cs
+++ b/Assets/Scripts/Assembly-CSharp/AdventureMenuWindow.cs
@@ -52,8 +52,8 @@ public class AdventureMenuWindow : SubTaskBaseWindow
int num2 = 272;
GameObject gameObject = GameObject.CreatePrimitive(PrimitiveType.Quad);
//gameObject.renderer.material = new Material(Resources.Load("Shader/Sprite/Sprite") as Shader);
- gameObject.renderer.material = new Material(Shader.Find("QO/Sprite") as Shader);
- gameObject.renderer.material.mainTexture = tex;
+ gameObject.GetComponent().material = new Material(Shader.Find("QO/Sprite") as Shader);
+ gameObject.GetComponent().material.mainTexture = tex;
gameObject.transform.parent = base.transform;
float num3 = (float)tex.width * scale_w;
float num4 = (float)tex.height * scale_h;
@@ -138,7 +138,7 @@ public class AdventureMenuWindow : SubTaskBaseWindow
new BaseWindow.UIImage("Confirm", 136, 182, this.wndz + 3, "screen/common/sys_dialog", true, false),
new BaseWindow.UIButton("Confirm_YES", 312, 277, this.wndz + 4, "screen/common/dlog_btn_y", true, false, 1, 2, 0),
new BaseWindow.UIButton("Confirm_NO", 513, 277, this.wndz + 4, "screen/common/dlog_btn_n", true, false, 1, 2, 0),
- new BaseWindow.UIText("Confirm_MSG", 480, 230, this.wndz + 4, "タイトル画面へ戻りますか？", 28, UnityTextSprite.PositionType.Center, UnityTextSprite.PositionType.TopLeft, byte.MaxValue, byte.MaxValue, byte.MaxValue, byte.MaxValue)
+ new BaseWindow.UIText("Confirm_MSG", 480, 230, this.wndz + 4, UnityApp.Instance.isJapanese ? "タイトル画面へ戻りますか？" : "Return to Title Screen？", 28, UnityTextSprite.PositionType.Center, UnityTextSprite.PositionType.TopLeft, byte.MaxValue, byte.MaxValue, byte.MaxValue, byte.MaxValue)
};
}
return new BaseWindow.UIComponent[]
@@ -157,7 +157,7 @@ public class AdventureMenuWindow : SubTaskBaseWindow
new BaseWindow.UIImage("Confirm", 136, 182, this.wndz + 3, "screen/common/sys_dialog", true, false),
new BaseWindow.UIButton("Confirm_YES", 312, 277, this.wndz + 4, "screen/common/dlog_btn_y", true, false, 1, 2, 0),
new BaseWindow.UIButton("Confirm_NO", 513, 277, this.wndz + 4, "screen/common/dlog_btn_n", true, false, 1, 2, 0),
- new BaseWindow.UIText("Confirm_MSG", 480, 230, this.wndz + 4, "回想を停止しますか？", 28, UnityTextSprite.PositionType.Center, UnityTextSprite.PositionType.TopLeft, byte.MaxValue, byte.MaxValue, byte.MaxValue, byte.MaxValue)
+ new BaseWindow.UIText("Confirm_MSG", 480, UnityApp.Instance.isJapanese ? 230 : 210, this.wndz + 4, UnityApp.Instance.isJapanese ? "回想を停止しますか？" : "Do you want to stop\nreplaying this event？", 28, UnityTextSprite.PositionType.Center, UnityTextSprite.PositionType.TopLeft, byte.MaxValue, byte.MaxValue, byte.MaxValue, byte.MaxValue)
};
}
@@ -254,7 +254,15 @@ public class AdventureMenuWindow : SubTaskBaseWindow
base.GameObjectShow("CofirmCollision", show);
if (show)
{
- this.SetText("Confirm_MSG", (!AdventureMenuWindow.IsNormal) ? "回想を停止しますか？" : "タイトル画面へ戻りますか？");
+ if (UnityApp.Instance.isJapanese)
+ {
+ this.SetText("Confirm_MSG", (!AdventureMenuWindow.IsNormal) ? "回想を停止しますか？" : "タイトル画面へ戻りますか？");
+ }
+ else
+ {
+ this.SetText("Confirm_MSG", (!AdventureMenuWindow.IsNormal) ? "Do you want to stop\nreplaying this event？" : "Return to Title Screen？");
+ }
+
}
else
{
diff --git a/Assets/Scripts/Assembly-CSharp/BaseWindow.cs b/Assets/Scripts/Assembly-CSharp/BaseWindow.cs
index 1ef7e8658..a0d86c3b9 100644
--- a/Assets/Scripts/Assembly-CSharp/BaseWindow.cs
+++ b/Assets/Scripts/Assembly-CSharp/BaseWindow.cs
@@ -247,9 +247,9 @@ public abstract class BaseWindow : MonoBehaviourWrap
ImageObject imageObject = ImageObject.Create(uiObject, base.transform, collisionEnable);
imageObject.RendererEnableAfterLoad = RendererEnableAfterLoad;
GameObject gameObject = imageObject.gameObject;
- if (gameObject.collider != null)
+ if (gameObject.GetComponent() != null)
{
- gameObject.collider.enabled = (collisionEnable && RendererEnableAfterLoad);
+ gameObject.GetComponent().enabled = (collisionEnable && RendererEnableAfterLoad);
}
this.UIGameObjectsDic.Add(gameObject.name, gameObject);
this.imageObjectList.Add(imageObject);
@@ -300,13 +300,13 @@ public abstract class BaseWindow : MonoBehaviourWrap
{
return;
}
- if (go.renderer != null)
+ if (go.GetComponent() != null)
{
- go.renderer.enabled = show;
+ go.GetComponent().enabled = show;
}
- if (go.collider != null)
+ if (go.GetComponent() != null)
{
- go.collider.enabled = show;
+ go.GetComponent().enabled = show;
}
}
@@ -573,7 +573,8 @@ public abstract class BaseWindow : MonoBehaviourWrap
GameObject gameObject = window.gameObject;
UnityTextSprite unityTextSprite = new UnityTextSprite(false, gameObject);
unityTextSprite.obj.name = this.name;
- unityTextSprite.Show = false;
+ //Changed to true, revisit later
+ unityTextSprite.Show = true;
unityTextSprite.Font = Singleton.Instance.Font;
unityTextSprite.ClearText();
unityTextSprite.SetColor(this.color);
diff --git a/Assets/Scripts/Assembly-CSharp/CreateSprite.cs b/Assets/Scripts/Assembly-CSharp/CreateSprite.cs
index 9a486925b..bfb4088a1 100644
--- a/Assets/Scripts/Assembly-CSharp/CreateSprite.cs
+++ b/Assets/Scripts/Assembly-CSharp/CreateSprite.cs
@@ -49,7 +49,7 @@ public class CreateSprite : MonoBehaviour
{
Mesh mesh = CreateSprite.CreateMesh();
mesh.RecalculateBounds();
- mesh.Optimize();
+ ;
return mesh;
}
@@ -70,21 +70,21 @@ public class CreateSprite : MonoBehaviour
{
obj.transform.localPosition = new Vector3(0f, 0f, -1000f);
obj.transform.localScale = new Vector3(1f, 1f, 1f);
- obj.camera.orthographic = true;
- obj.camera.orthographicSize = (float)(ScreenH / 2);
- obj.camera.nearClipPlane = 0f;
- obj.camera.farClipPlane = 20000f;
- obj.camera.renderingPath = RenderingPath.VertexLit;
- obj.camera.clearFlags = CameraClearFlags.Color;
- obj.camera.backgroundColor = new Color(0f, 0f, 0f, 1f);
+ obj.GetComponent().orthographic = true;
+ obj.GetComponent().orthographicSize = (float)(ScreenH / 2);
+ obj.GetComponent().nearClipPlane = 0f;
+ obj.GetComponent().farClipPlane = 20000f;
+ obj.GetComponent().renderingPath = RenderingPath.VertexLit;
+ obj.GetComponent().clearFlags = CameraClearFlags.Color;
+ obj.GetComponent().backgroundColor = new Color(0f, 0f, 0f, 1f);
if (IsSprite)
{
- obj.camera.cullingMask &= 1 << LayerMask.NameToLayer("Sprite");
- obj.camera.gameObject.layer = LayerMask.NameToLayer("Sprite");
+ obj.GetComponent().cullingMask &= 1 << LayerMask.NameToLayer("Sprite");
+ obj.GetComponent().gameObject.layer = LayerMask.NameToLayer("Sprite");
}
else
{
- obj.camera.cullingMask &= ~(1 << LayerMask.NameToLayer("Sprite"));
+ obj.GetComponent().cullingMask &= ~(1 << LayerMask.NameToLayer("Sprite"));
}
}
diff --git a/Assets/Scripts/Assembly-CSharp/CreditsWindow.cs b/Assets/Scripts/Assembly-CSharp/CreditsWindow.cs
new file mode 100644
index 000000000..68b6e36d2
--- /dev/null
+++ b/Assets/Scripts/Assembly-CSharp/CreditsWindow.cs
@@ -0,0 +1,406 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using Qoo;
+using UnityEngine;
+
+// Token: 0x02000113 RID: 275
+public class CreditsWindow : BaseWindow
+{
+ private Dictionary dict = null;
+
+ // Token: 0x06000746 RID: 1862 RVA: 0x0001F45C File Offset: 0x0001D65C
+ protected sealed override string GetBGMName()
+ {
+ return "honobono1_a_ali";
+ }
+
+ // Token: 0x06000747 RID: 1863 RVA: 0x0001F464 File Offset: 0x0001D664
+ protected sealed override void OnAwake()
+ {
+ this.moveBackGround = new CreditsWindow.MoveBackGround();
+ this.pageManager = new CreditsWindow.PageManager(5);
+ }
+
+ // Token: 0x06000748 RID: 1864 RVA: 0x0001F480 File Offset: 0x0001D680
+ protected sealed override string[] newSceneTextureNameArray()
+ {
+ return new string[]
+ {
+ "screen/title/help_01",
+ "screen/title/help_02",
+ "screen/title/help_03",
+ "screen/title/help_04",
+ "screen/title/help_05",
+ "screen/common/cancel",
+ "screen/cgmemory/cgm_arwl",
+ "screen/cgmemory/cgm_arwr"
+ };
+ }
+
+ // Token: 0x06000749 RID: 1865 RVA: 0x0001F4D8 File Offset: 0x0001D6D8
+ protected sealed override void BeforeInit()
+ {
+ }
+
+ // Token: 0x0600074A RID: 1866 RVA: 0x0001F4DC File Offset: 0x0001D6DC
+ protected sealed override void AfterInit()
+ {
+ //this.moveBackGround.Init(base.GetGameObject("Before"), base.GetGameObject("After"), base.GetGameObject("BackGround"));
+ float delay = 0f;
+ int repeat = 0;
+ float speed = 0.8f;
+ //ImageObject imageObject = base.GetImageObject("ArrowL");
+ //imageObject.AddImageAnimation(new ImageAnimationLocalPosition(repeat, speed, delay, MoveType.LoopSin000to180, new Vector3(0f, 0f, 0f), new Vector3(-25f, 0f, 0f)));
+ //ImageObject imageObject2 = base.GetImageObject("ArrowR");
+ //imageObject2.AddImageAnimation(new ImageAnimationLocalPosition(repeat, speed, delay, MoveType.LoopSin000to180, new Vector3(0f, 0f, 0f), new Vector3(25f, 0f, 0f)));
+ }
+
+ // Token: 0x0600074B RID: 1867 RVA: 0x0001F5AC File Offset: 0x0001D7AC
+ protected sealed override BaseWindow.UIComponent[] newComponentArray()
+ {
+ //string currentFPath = this.pageManager.GetCurrentFPath();
+ return new BaseWindow.UIComponent[]
+ {
+ //new BaseWindow.UIImage("Before", 0, 0, this.wndz - 1, currentFPath, false, false),
+ //new BaseWindow.UIImage("After", 0, 0, this.wndz - 1, currentFPath, false, false),
+ //new BaseWindow.UIImage("BackGround", 0, 0, this.wndz, currentFPath, true, true),
+ new BaseWindow.UIImage("BackGround", 0, 0, this.wndz, "screen/title/cgm_bg_1", true, true),
+ new BaseWindow.UIText("Credits", 480, 0, this.wndz + 4, "English Translation Credits", 50, UnityTextSprite.PositionType.Center, UnityTextSprite.PositionType.TopLeft, byte.MaxValue, byte.MaxValue, byte.MaxValue, byte.MaxValue),
+ new BaseWindow.UIText("Credits_1", 10, 100, this.wndz + 4, "Administrator:\n *vocaotome\n *stellarroze \n\nImage Editor:\n *Spicy Diamond\n *Straydog12\n *vocaotome\n *Pandora \n *andi_91\n\nProgrammer:\n *Falaina\n\nTesters:\n *Eldiatricc\n *vocaotome", 20, UnityTextSprite.PositionType.TopLeft, UnityTextSprite.PositionType.TopLeft, byte.MaxValue, byte.MaxValue, byte.MaxValue, byte.MaxValue),
+ new BaseWindow.UIText("Credits_2", 255, 100, this.wndz + 4, "Translators:\n *vocaotome \n *final_account\n *Kaylin \n *Aubrey\n *Noriri\n *HakaiEve\n *Yukihime\n *Spinster\n *Chirigirl13\n *Shinsuki\n *Ciara\n *amuletcross\n *NuitNoire\n *Atikal07\n *Neri\n *ask-the-mock-turtle", 20, UnityTextSprite.PositionType.TopLeft, UnityTextSprite.PositionType.TopLeft, byte.MaxValue, byte.MaxValue, byte.MaxValue, byte.MaxValue),
+ new BaseWindow.UIText("Credits_3", 510, 100, this.wndz + 4, "Editors:\n *Hattingmad\n *Eldiatricc\n *Shay\n *Liza\n *Mimi\n *Lucy\n *Jes\n *Shinsuki\n *Suzubelle-chan\n *Pandora\n *Daeyamati\n *Kytana\n\nTranslation-Checkers:\n *vocaotome", 20, UnityTextSprite.PositionType.TopLeft, UnityTextSprite.PositionType.TopLeft, byte.MaxValue, byte.MaxValue, byte.MaxValue, byte.MaxValue),
+ new BaseWindow.UIText("Credits_4", 765, 100, this.wndz + 4, "Proof-Readers:\n *sonic\n *Shay\n *Shinsuki\n *Liza\n *Grimm\n *Mio\n *Maisa\n *Marie\n *Mellissa \n *Jes\n *Ayame Jay\n *Kyatana\n\nSpecial Thanks:\n *yu_eriyama\n *yuvie", 20, UnityTextSprite.PositionType.TopLeft, UnityTextSprite.PositionType.TopLeft, byte.MaxValue, byte.MaxValue, byte.MaxValue, byte.MaxValue),
+ new BaseWindow.UIButton("Cancel", 887, 6, this.wndz + 3, "screen/common/cancel", true, true, 1, 2, 0),
+ //new BaseWindow.UIImage("ArrowL", 33, 80, this.wndz + 3, "screen/cgmemory/cgm_arwl", false, true),
+ //new BaseWindow.UIImage("ArrowR", 848, 80, this.wndz + 3, "screen/cgmemory/cgm_arwr", false, true)
+ };
+ }
+
+ // Token: 0x0600074C RID: 1868 RVA: 0x0001F684 File Offset: 0x0001D884
+ protected sealed override void OnBaseWindowOnButton(string obj)
+ {
+ if (obj != null)
+ {
+ if (this.dict == null)
+ {
+ this.dict = new Dictionary(1)
+ {
+ {
+ "Cancel",
+ 0
+ }
+ };
+ }
+ int num;
+ if (this.dict.TryGetValue(obj, out num))
+ {
+ if (num == 0)
+ {
+ base.PlaySE_Cancel();
+ SceneManager.BackScene();
+ }
+ }
+ }
+ }
+
+ // Token: 0x0600074D RID: 1869 RVA: 0x0001F6EC File Offset: 0x0001D8EC
+ protected override void OnBaseWindowUpdate()
+ {
+ if (this.moveBackGround.Moving)
+ {
+ if (!this.moveBackGround.Update())
+ {
+ base.SetTexture("BackGround", "screen/title/" + this.pageManager.GetCurrentFPath());
+ }
+ return;
+ }
+ INPUT_STATUS status = UnityApp.Input.Status;
+ if (status == INPUT_STATUS.DRAG || status == INPUT_STATUS.FLICK)
+ {
+ //this.OnFlick(UnityApp.Input.SlideDragVector);
+ }
+ }
+
+ // Token: 0x0600074E RID: 1870 RVA: 0x0001F770 File Offset: 0x0001D970
+ /*private void OnFlick(SLIDE_VECTOR slide)
+ {
+ string currentFPath = this.pageManager.GetCurrentFPath();
+ if (slide != SLIDE_VECTOR.LEFT)
+ {
+ if (slide == SLIDE_VECTOR.RIGHT)
+ {
+ base.PlaySE_Select();
+ this.pageManager.Left();
+ }
+ }
+ else
+ {
+ base.PlaySE_Select();
+ this.pageManager.Right();
+ }
+ string currentFPath2 = this.pageManager.GetCurrentFPath();
+ if (currentFPath2 != currentFPath)
+ {
+ Qoo.Debug.Print(currentFPath2);
+ this.ChangeBG(currentFPath, currentFPath2, slide);
+ }
+ }*/
+
+ // Token: 0x0600074F RID: 1871 RVA: 0x0001F7F4 File Offset: 0x0001D9F4
+ private void ChangeBG(string beforePath, string afterPath, SLIDE_VECTOR slide)
+ {
+ this.moveBackGround.ChangeBG(beforePath, afterPath, slide);
+ if (this.moveBackGround.Update())
+ {
+ base.StartCoroutine(this.TransitionCoroutine(this.moveBackGround.param));
+ }
+ }
+
+ // Token: 0x06000750 RID: 1872 RVA: 0x0001F838 File Offset: 0x0001DA38
+ private IEnumerator TransitionCoroutine(CreditsWindow.TransitionParam param)
+ {
+ EffectManager.Init(param.effectName, 500, param.renderer, param.before, param.after);
+ yield return base.StartCoroutine(EffectManager.StartEffect());
+ param.action();
+ yield break;
+ }
+
+ // Token: 0x040006A8 RID: 1704
+ private readonly int wndz;
+
+ // Token: 0x040006A9 RID: 1705
+ private CreditsWindow.MoveBackGround moveBackGround;
+
+ // Token: 0x040006AA RID: 1706
+ private CreditsWindow.PageManager pageManager;
+
+ // Token: 0x02000114 RID: 276
+ private class PageManager
+ {
+ // Token: 0x06000751 RID: 1873 RVA: 0x0001F864 File Offset: 0x0001DA64
+ public PageManager(int pageMax_)
+ {
+ this.page = 0;
+ this.pageMax = pageMax_;
+ }
+
+ // Token: 0x06000752 RID: 1874 RVA: 0x0001F87C File Offset: 0x0001DA7C
+ public string GetCurrentFPath()
+ {
+ return this.getName(this.page);
+ }
+
+ // Token: 0x06000753 RID: 1875 RVA: 0x0001F88C File Offset: 0x0001DA8C
+ public string LeftFPath()
+ {
+ return this.getName(this.getLeft());
+ }
+
+ // Token: 0x06000754 RID: 1876 RVA: 0x0001F89C File Offset: 0x0001DA9C
+ public string RightFPath()
+ {
+ return this.getName(this.getRight());
+ }
+
+ // Token: 0x06000755 RID: 1877 RVA: 0x0001F8AC File Offset: 0x0001DAAC
+ public void Left()
+ {
+ this.page = this.getLeft();
+ }
+
+ // Token: 0x06000756 RID: 1878 RVA: 0x0001F8BC File Offset: 0x0001DABC
+ public void Right()
+ {
+ this.page = this.getRight();
+ }
+
+ // Token: 0x06000757 RID: 1879 RVA: 0x0001F8CC File Offset: 0x0001DACC
+ private string getName(int page)
+ {
+ return (page + 1).ToString("screen/title/help_00");
+ }
+
+ // Token: 0x06000758 RID: 1880 RVA: 0x0001F8EC File Offset: 0x0001DAEC
+ private int getLeft()
+ {
+ return (this.page != 0) ? (this.page - 1) : (this.pageMax - 1);
+ }
+
+ // Token: 0x06000759 RID: 1881 RVA: 0x0001F91C File Offset: 0x0001DB1C
+ private int getRight()
+ {
+ return (this.page != this.pageMax - 1) ? (this.page + 1) : 0;
+ }
+
+ // Token: 0x040006AC RID: 1708
+ private int page;
+
+ // Token: 0x040006AD RID: 1709
+ private int pageMax;
+ }
+
+ // Token: 0x02000115 RID: 277
+ private class MoveImage
+ {
+ // Token: 0x0600075A RID: 1882 RVA: 0x0001F940 File Offset: 0x0001DB40
+ public MoveImage()
+ {
+ this.go = null;
+ }
+
+ // Token: 0x0600075B RID: 1883 RVA: 0x0001F950 File Offset: 0x0001DB50
+ public void Init(GameObject go_)
+ {
+ this.go = go_;
+ }
+
+ // Token: 0x0600075C RID: 1884 RVA: 0x0001F95C File Offset: 0x0001DB5C
+ public void SetTexture(string fpath)
+ {
+ ImageObject component = this.go.GetComponent();
+ if (component == null)
+ {
+ return;
+ }
+ component.SetTexture("screen/title/" + fpath);
+ }
+
+ // Token: 0x0600075D RID: 1885 RVA: 0x0001F994 File Offset: 0x0001DB94
+ public Texture Texture()
+ {
+ ImageObject component = this.go.GetComponent();
+ if (component == null)
+ {
+ return null;
+ }
+ return component.Texture;
+ }
+
+ // Token: 0x040006AE RID: 1710
+ private GameObject go;
+ }
+
+ // Token: 0x02000116 RID: 278
+ private class TransitionParam
+ {
+ // Token: 0x0600075E RID: 1886 RVA: 0x0001F9C4 File Offset: 0x0001DBC4
+ public TransitionParam(string effectName_ = null, Texture before_ = null, Texture after_ = null, Renderer renderer_ = null, Action action_ = null)
+ {
+ this.effectName = effectName_;
+ this.before = before_;
+ this.after = after_;
+ this.renderer = renderer_;
+ this.action = action_;
+ }
+
+ // Token: 0x040006AF RID: 1711
+ public string effectName;
+
+ // Token: 0x040006B0 RID: 1712
+ public Texture before;
+
+ // Token: 0x040006B1 RID: 1713
+ public Texture after;
+
+ // Token: 0x040006B2 RID: 1714
+ public Renderer renderer;
+
+ // Token: 0x040006B3 RID: 1715
+ public Action action;
+ }
+
+ // Token: 0x02000117 RID: 279
+ private class MoveBackGround
+ {
+ // Token: 0x0600075F RID: 1887 RVA: 0x0001F9F4 File Offset: 0x0001DBF4
+ public MoveBackGround()
+ {
+ this.param = null;
+ this.before = new CreditsWindow.MoveImage();
+ this.after = new CreditsWindow.MoveImage();
+ this.moving = false;
+ }
+
+ // Token: 0x170000DE RID: 222
+ // (get) Token: 0x06000760 RID: 1888 RVA: 0x0001FA2C File Offset: 0x0001DC2C
+ public bool Moving
+ {
+ get
+ {
+ return this.moving;
+ }
+ }
+
+ // Token: 0x06000761 RID: 1889 RVA: 0x0001FA34 File Offset: 0x0001DC34
+ public void Init(GameObject before_, GameObject after_, GameObject bg_)
+ {
+ this.before.Init(before_);
+ this.after.Init(after_);
+ ImageObject component = bg_.GetComponent();
+ if (component == null)
+ {
+ return;
+ }
+ this.renderer = component.GetComponent();
+ }
+
+ // Token: 0x06000762 RID: 1890 RVA: 0x0001FA7C File Offset: 0x0001DC7C
+ public void ChangeBG(string beforePath, string afterPath, SLIDE_VECTOR slide)
+ {
+ string text = this.calcVector(slide);
+ this.before.SetTexture(beforePath);
+ this.after.SetTexture(afterPath);
+ if (text != null)
+ {
+ this.moving = true;
+ this.param = new CreditsWindow.TransitionParam(text, this.before.Texture(), this.after.Texture(), this.renderer, new Action(this.SetTransitionFinish));
+ }
+ }
+
+ // Token: 0x06000763 RID: 1891 RVA: 0x0001FAEC File Offset: 0x0001DCEC
+ public bool Update()
+ {
+ return this.moving;
+ }
+
+ // Token: 0x06000764 RID: 1892 RVA: 0x0001FAF4 File Offset: 0x0001DCF4
+ private string calcVector(SLIDE_VECTOR slide)
+ {
+ switch (slide)
+ {
+ case SLIDE_VECTOR.LEFT:
+ return "/bytes/effect/grad_r";
+ case SLIDE_VECTOR.RIGHT:
+ return "/bytes/effect/grad_l";
+ case SLIDE_VECTOR.UP:
+ return "/bytes/effect/grad_d";
+ case SLIDE_VECTOR.DOWN:
+ return "/bytes/effect/grad_u";
+ default:
+ return null;
+ }
+ }
+
+ // Token: 0x06000765 RID: 1893 RVA: 0x0001FB3C File Offset: 0x0001DD3C
+ private void SetTransitionFinish()
+ {
+ this.moving = false;
+ }
+
+ // Token: 0x040006B4 RID: 1716
+ public CreditsWindow.TransitionParam param;
+
+ // Token: 0x040006B5 RID: 1717
+ private CreditsWindow.MoveImage before;
+
+ // Token: 0x040006B6 RID: 1718
+ private CreditsWindow.MoveImage after;
+
+ // Token: 0x040006B7 RID: 1719
+ private Renderer renderer;
+
+ // Token: 0x040006B8 RID: 1720
+ private bool moving;
+ }
+}
diff --git a/Assets/Scripts/Assembly-CSharp/EffectManager.cs b/Assets/Scripts/Assembly-CSharp/EffectManager.cs
index 02b88927f..f82f8088f 100644
--- a/Assets/Scripts/Assembly-CSharp/EffectManager.cs
+++ b/Assets/Scripts/Assembly-CSharp/EffectManager.cs
@@ -253,7 +253,6 @@ public class EffectManager : MonoBehaviour
// Token: 0x060008E4 RID: 2276 RVA: 0x0002728C File Offset: 0x0002548C
private static IEnumerator loadTexture()
{
- Debug.LogWarning (EffectManager.Instance.EffectName);
string path = Application.streamingAssetsPath + Pathing.ToPlatformAssetBundleName(EffectManager.Instance.EffectName);
byte[] data = System.IO.File.ReadAllBytes(path + ".png");
Texture2D tex = new Texture2D(0, 0, TextureFormat.RGBA32, false, true);
diff --git a/Assets/Scripts/Assembly-CSharp/GalleryCGWindow.cs b/Assets/Scripts/Assembly-CSharp/GalleryCGWindow.cs
index b96f10b7d..0c8f25d85 100644
--- a/Assets/Scripts/Assembly-CSharp/GalleryCGWindow.cs
+++ b/Assets/Scripts/Assembly-CSharp/GalleryCGWindow.cs
@@ -330,10 +330,10 @@ public class GalleryCGWindow : BaseWindow
// Token: 0x060006DD RID: 1757 RVA: 0x0001CFF8 File Offset: 0x0001B1F8
public void SetRendererEnable(bool lr, bool ud)
{
- this.gameObject[0].renderer.enabled = lr;
- this.gameObject[1].renderer.enabled = lr;
- this.gameObject[2].renderer.enabled = ud;
- this.gameObject[3].renderer.enabled = ud;
+ this.gameObject[0].GetComponent().enabled = lr;
+ this.gameObject[1].GetComponent().enabled = lr;
+ this.gameObject[2].GetComponent().enabled = ud;
+ this.gameObject[3].GetComponent().enabled = ud;
}
// Token: 0x0400066D RID: 1645
diff --git a/Assets/Scripts/Assembly-CSharp/GalleryInputNameDialogWindow.cs b/Assets/Scripts/Assembly-CSharp/GalleryInputNameDialogWindow.cs
index ae809788a..73faf8786 100644
--- a/Assets/Scripts/Assembly-CSharp/GalleryInputNameDialogWindow.cs
+++ b/Assets/Scripts/Assembly-CSharp/GalleryInputNameDialogWindow.cs
@@ -119,23 +119,42 @@ public class GalleryInputNameDialogWindow : BaseWindow
switch (this.type)
{
case GalleryInputNameDialogType.EMPTY:
- return "名前が入力されていません。";
+ return UnityApp.Instance.isJapanese ? "名前が入力されていません。" : "No name entered";
case GalleryInputNameDialogType.OVER:
- return "入力できる名前は７文字までです。";
+ return UnityApp.Instance.isJapanese ? "入力できる名前は７文字までです。" : "You can enter up to 7 characters";
case GalleryInputNameDialogType.INVALIDCHAR:
- return "表示できない文字が含まれています。";
+ return UnityApp.Instance.isJapanese ? "表示できない文字が含まれています。" : "Input contains characters that cannot be displayed";
case GalleryInputNameDialogType.CONFIRM:
- if (line == 0)
- {
- string galleryInputNameDialog_Name = UIValue.GalleryInputNameDialog_Name;
- string paramString = GameData.GetParamString("familyname", string.Empty);
- return string.Format("「{0}＝{1}」です。", galleryInputNameDialog_Name, paramString);
- }
- if (line != 1)
- {
- return string.Empty;
- }
- return "よろしいですか？";
+ if (UnityApp.Instance.isJapanese)
+ {
+ if (line == 0)
+ {
+ string galleryInputNameDialog_Name = UIValue.GalleryInputNameDialog_Name;
+ string paramString = GameData.GetParamString("familyname", string.Empty);
+ return string.Format("「{0}＝{1}」です。", galleryInputNameDialog_Name, paramString);
+ }
+ if (line != 1)
+ {
+ return string.Empty;
+ }
+ return "よろしいですか？";
+
+ }
+ else
+ {
+ 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);
+ }
+ if (line != 1)
+ {
+ return string.Empty;
+ }
+ return string.Empty;
+ }
+
default:
return string.Empty;
}
diff --git a/Assets/Scripts/Assembly-CSharp/GalleryInputNameKeyboardWindow.cs b/Assets/Scripts/Assembly-CSharp/GalleryInputNameKeyboardWindow.cs
index 152d8c4ca..ef48e3454 100644
--- a/Assets/Scripts/Assembly-CSharp/GalleryInputNameKeyboardWindow.cs
+++ b/Assets/Scripts/Assembly-CSharp/GalleryInputNameKeyboardWindow.cs
@@ -15,14 +15,15 @@ public class GalleryInputNameKeyboardWindow : BaseWindow
public IEnumerator Run()
{
string initvalue = UIValue.GalleryInputNameDialog_Name;
- switch (Application.platform)
+ yield return NameInputKeyboard.Open(initvalue, false);
+ /*switch (Application.platform)
{
case RuntimePlatform.IPhonePlayer:
case RuntimePlatform.Android:
yield return NameInputKeyboard.Open(initvalue, false);
goto IL_82;
- }
- NameInputKeyboard.DebugInputText = initvalue;
+ }*/
+ //NameInputKeyboard.DebugInputText = initvalue;
IL_82:
UIValue.GalleryInputNameDialog_Name = NameInputKeyboard.InputText;
UIValue.GalleryInputNameDialog_Exit = GalleryInputNameDialogExitType.INPUT;
diff --git a/Assets/Scripts/Assembly-CSharp/GalleryMovieWindow.cs b/Assets/Scripts/Assembly-CSharp/GalleryMovieWindow.cs
index a0db6c221..26b4b9603 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", ""));
+ yield return base.StartCoroutine(MovieManager.PlayMovie("mp4/high/op_movie.mp4", this.gameObject));
this.state = GalleryMovieWindow.STATE.END;
yield break;
}
diff --git a/Assets/Scripts/Assembly-CSharp/HelpWindow.cs b/Assets/Scripts/Assembly-CSharp/HelpWindow.cs
index bad1cf462..31969318d 100644
--- a/Assets/Scripts/Assembly-CSharp/HelpWindow.cs
+++ b/Assets/Scripts/Assembly-CSharp/HelpWindow.cs
@@ -336,7 +336,7 @@ public class HelpWindow : BaseWindow
{
return;
}
- this.renderer = component.renderer;
+ this.renderer = component.GetComponent();
}
// Token: 0x06000762 RID: 1890 RVA: 0x0001FA7C File Offset: 0x0001DC7C
diff --git a/Assets/Scripts/Assembly-CSharp/ImageObject.cs b/Assets/Scripts/Assembly-CSharp/ImageObject.cs
index 95c93f058..50ddf81a6 100644
--- a/Assets/Scripts/Assembly-CSharp/ImageObject.cs
+++ b/Assets/Scripts/Assembly-CSharp/ImageObject.cs
@@ -85,9 +85,9 @@ public class ImageObject : MonoBehaviour
{
GameObject gameObject = GameObject.CreatePrimitive(PrimitiveType.Quad);
//gameObject.renderer.material = new Material(Resources.Load("Shader/Sprite/Sprite") as Shader);
- gameObject.renderer.material = new Material(Shader.Find("QO/Sprite") as Shader);
+ gameObject.GetComponent().material = new Material(Shader.Find("QO/Sprite") as Shader);
gameObject.transform.parent = parent;
- gameObject.collider.enabled = collisionEnable;
+ gameObject.GetComponent().enabled = collisionEnable;
ImageObject imageObject = gameObject.AddComponent();
imageObject.UIObject = uiObject;
imageObject.InitObject(true, uiObject);
@@ -119,7 +119,7 @@ public class ImageObject : MonoBehaviour
{
GraphicManager.ReleaseTexture(this.imageUnityTexture);
this.imageUnityTexture = null;
- base.renderer.material.mainTexture = null;
+ base.GetComponent().material.mainTexture = null;
}
this.changeTexture = true;
this.UIObject.UITexture.TexturePath = texturePath;
@@ -180,7 +180,7 @@ public class ImageObject : MonoBehaviour
int num2 = this.ImageBlockIndex % this.UIObject.UITexture.BlockNum + 1;
Vector2 vector = new Vector2(1f / (float)this.UIObject.UITexture.BlockX, 1f / (float)this.UIObject.UITexture.BlockY);
Vector2 vector2 = new Vector2(1f - vector.x * (float)num, 1f - vector.y * (float)num2);
- base.transform.renderer.material.SetVector("_UVWH", new Vector4(vector2.x, vector2.y, vector.x, vector.y));
+ base.transform.GetComponent().material.SetVector("_UVWH", new Vector4(vector2.x, vector2.y, vector.x, vector.y));
}
// Token: 0x06000BC8 RID: 3016 RVA: 0x00031B74 File Offset: 0x0002FD74
@@ -188,17 +188,17 @@ public class ImageObject : MonoBehaviour
{
this.loadCompleted = true;
this.imageUnityTexture = unityTexture;
- base.renderer.material.mainTexture = unityTexture.m_Texture;
+ base.GetComponent().material.mainTexture = unityTexture.m_Texture;
// TODO issue with changeTexture, fix later
//base.renderer.enabled = (this.changeTexture && this.rendererEnableAfterLoad);
- base.renderer.enabled = this.rendererEnableAfterLoad;
+ base.GetComponent().enabled = this.rendererEnableAfterLoad;
this.OnTextureLoadComplete2();
}
// Token: 0x06000BC9 RID: 3017 RVA: 0x00031BD0 File Offset: 0x0002FDD0
public void ApplyRendererEnableAfterLoad()
{
- base.renderer.enabled = this.rendererEnableAfterLoad;
+ base.GetComponent().enabled = this.rendererEnableAfterLoad;
}
// Token: 0x06000BCA RID: 3018 RVA: 0x00031BE4 File Offset: 0x0002FDE4
diff --git a/Assets/Scripts/Assembly-CSharp/ImageObject2.cs b/Assets/Scripts/Assembly-CSharp/ImageObject2.cs
index 3b2956383..ee262c585 100644
--- a/Assets/Scripts/Assembly-CSharp/ImageObject2.cs
+++ b/Assets/Scripts/Assembly-CSharp/ImageObject2.cs
@@ -79,11 +79,11 @@ public class ImageObject2
{
get
{
- return this.m_GameObject.collider.enabled;
+ return this.m_GameObject.GetComponent().enabled;
}
set
{
- this.m_GameObject.collider.enabled = value;
+ this.m_GameObject.GetComponent().enabled = value;
}
}
@@ -94,11 +94,11 @@ public class ImageObject2
{
get
{
- return this.m_GameObject.renderer.enabled;
+ return this.m_GameObject.GetComponent().enabled;
}
set
{
- this.m_GameObject.collider.enabled = value;
+ this.m_GameObject.GetComponent().enabled = value;
}
}
@@ -117,7 +117,7 @@ public class ImageObject2
{
GameObject gameObject = GameObject.CreatePrimitive(PrimitiveType.Quad);
//gameObject.renderer.material = new Material(Resources.Load("Shader/Sprite/Sprite") as Shader);
- gameObject.renderer.material = new Material(Shader.Find("QO/Sprite") as Shader);
+ gameObject.GetComponent().material = new Material(Shader.Find("QO/Sprite") as Shader);
gameObject.name = name;
gameObject.transform.parent = parent;
return new ImageObject2(gameObject, x, y, z, uniTex);
@@ -126,8 +126,8 @@ public class ImageObject2
// Token: 0x06000BDB RID: 3035 RVA: 0x00031E0C File Offset: 0x0003000C
public void Hidden(bool hidden)
{
- this.m_GameObject.renderer.enabled = !hidden;
- this.m_GameObject.collider.enabled = !hidden;
+ this.m_GameObject.GetComponent().enabled = !hidden;
+ this.m_GameObject.GetComponent().enabled = !hidden;
}
// Token: 0x06000BDC RID: 3036 RVA: 0x00031E44 File Offset: 0x00030044
@@ -171,7 +171,7 @@ public class ImageObject2
{
return;
}
- this.m_GameObject.renderer.material.mainTexture = this.m_UniTex.m_Texture;
+ this.m_GameObject.GetComponent().material.mainTexture = this.m_UniTex.m_Texture;
if (fixedTexture)
{
this.FixedTexture();
@@ -188,7 +188,7 @@ public class ImageObject2
public void SetTextureUVWH(Vector4 uvwh)
{
this.m_UVWH = uvwh;
- this.m_GameObject.renderer.material.SetVector("_UVWH", this.m_UVWH);
+ this.m_GameObject.GetComponent().material.SetVector("_UVWH", this.m_UVWH);
}
// Token: 0x06000BE4 RID: 3044 RVA: 0x00031F30 File Offset: 0x00030130
diff --git a/Assets/Scripts/Assembly-CSharp/IntroductionWindow.cs b/Assets/Scripts/Assembly-CSharp/IntroductionWindow.cs
index d8eed4ea3..d4397b8db 100644
--- a/Assets/Scripts/Assembly-CSharp/IntroductionWindow.cs
+++ b/Assets/Scripts/Assembly-CSharp/IntroductionWindow.cs
@@ -71,7 +71,7 @@ public class IntroductionWindow : BaseWindow
new BaseWindow.UIImage("DummyMessage", 304, 275, this.wndz + 1, filenameMessage, false, false),
new BaseWindow.UIImage("BackGround", 0, 0, this.wndz, filenameBackGround, false, true),
new BaseWindow.UIImage("Message", 304, 275, this.wndz + 1, filenameMessage, false, true),
- new BaseWindow.UIButton("Start", 465, 172, this.wndz + 1, filenameButton, true, this.GetStartButtonShow(), 1, 2, 0),
+ //new BaseWindow.UIButton("Start", 465, 172, this.wndz + 1, filenameButton, true, this.GetStartButtonShow(), 1, 2, 0),
new BaseWindow.UIImage("SampleVoice", 50, 423, this.wndz + 1, "screen/title/kyara_voice", true, voiceButtonShow),
new BaseWindow.UIButton("SampleVoice1", 45, 460, this.wndz + 1, "screen/sysmenu/sys_smv", true, voiceButtonShow, 1, 2, 0),
new BaseWindow.UIButton("SampleVoice2", 127, 460, this.wndz + 1, "screen/sysmenu/sys_smv", true, voiceButtonShow, 1, 2, 0),
@@ -92,7 +92,7 @@ public class IntroductionWindow : BaseWindow
return;
}
this.SetCharaTexture(string.Empty);
- base.SetTexture("Start", this.GetFilenameButton());
+ //base.SetTexture("Start", this.GetFilenameButton());
this.SetButtonShow();
base.RestartAnimation("ArrowL");
base.RestartAnimation("ArrowR");
@@ -153,7 +153,7 @@ public class IntroductionWindow : BaseWindow
base.GameObjectShow("SampleVoice1", voiceButtonShow);
base.GameObjectShow("SampleVoice2", voiceButtonShow);
base.GameObjectShow("SampleVoice3", voiceButtonShow);
- base.GameObjectShow("Start", this.GetStartButtonShow());
+ //base.GameObjectShow("Start", this.GetStartButtonShow());
}
// Token: 0x0600076F RID: 1903 RVA: 0x00020184 File Offset: 0x0001E384
diff --git a/Assets/Scripts/Assembly-CSharp/ListItemObject.cs b/Assets/Scripts/Assembly-CSharp/ListItemObject.cs
index aedbb3361..3b806b1f7 100644
--- a/Assets/Scripts/Assembly-CSharp/ListItemObject.cs
+++ b/Assets/Scripts/Assembly-CSharp/ListItemObject.cs
@@ -30,7 +30,7 @@ public class ListItemObject : MonoBehaviour
// Token: 0x06000646 RID: 1606 RVA: 0x0001A064 File Offset: 0x00018264
private IEnumerator WaitLoadTextureCoroutine()
{
- while (base.renderer.material.mainTexture == null)
+ while (base.GetComponent().material.mainTexture == null)
{
yield return 0;
}
@@ -67,10 +67,10 @@ public class ListItemObject : MonoBehaviour
this.m_ImageObject.OriginalPosition = base.transform.localPosition;
this.m_ImageObject.OnViewPosition = this.m_ImageObject.OriginalPosition;
this.m_ImageObject.OnViewScale = this.m_ImageObject.OriginalScale;
- if (base.renderer.material.mainTexture != null)
+ if (base.GetComponent().material.mainTexture != null)
{
- localScale.x = (float)base.renderer.material.mainTexture.width;
- localScale.y = (float)base.renderer.material.mainTexture.height;
+ localScale.x = (float)base.GetComponent().material.mainTexture.width;
+ localScale.y = (float)base.GetComponent().material.mainTexture.height;
base.transform.localScale = localScale;
this.scaling();
this.positioning();
@@ -126,11 +126,11 @@ public class ListItemObject : MonoBehaviour
float num = this.ListViewScale.y / this.m_ImageObject.OriginalScale.y;
if (this.isBotOver)
{
- base.renderer.material.SetVector("_UVWH", new Vector4(0f, 1f - num, 1f, num));
+ base.GetComponent().material.SetVector("_UVWH", new Vector4(0f, 1f - num, 1f, num));
}
else
{
- base.renderer.material.SetVector("_UVWH", new Vector4(0f, 0f, 1f, num));
+ base.GetComponent().material.SetVector("_UVWH", new Vector4(0f, 0f, 1f, num));
}
}
diff --git a/Assets/Scripts/Assembly-CSharp/LogoMovieWindow.cs b/Assets/Scripts/Assembly-CSharp/LogoMovieWindow.cs
index 64378be44..ef75d4020 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", ""));
+ yield return base.StartCoroutine(MovieManager.PlayMovie("mp4/normal/quinrose_logo_8.mp4", this.gameObject));
this.state = LogoMovieWindow.STATE.END;
yield break;
}
diff --git a/Assets/Scripts/Assembly-CSharp/Man2D.cs b/Assets/Scripts/Assembly-CSharp/Man2D.cs
index e093ac4b4..5232b4527 100644
--- a/Assets/Scripts/Assembly-CSharp/Man2D.cs
+++ b/Assets/Scripts/Assembly-CSharp/Man2D.cs
@@ -51,16 +51,14 @@ public class Man2D : Singleton
private void OnEnable()
{
this.m_Sprite.Enable();
- //TODO determine why camera breaks
- base.camera.enabled = true;
- //base.camera.enabled = false;
+ base.GetComponent().enabled = true;
}
// Token: 0x06000978 RID: 2424 RVA: 0x00029EF4 File Offset: 0x000280F4
private void OnDisable()
{
this.m_Sprite.Disable();
- base.camera.enabled = false;
+ base.GetComponent().enabled = false;
}
// Token: 0x06000979 RID: 2425 RVA: 0x00029F10 File Offset: 0x00028110
@@ -266,7 +264,7 @@ public class Man2D : Singleton
// Token: 0x0600098E RID: 2446 RVA: 0x0002A2A4 File Offset: 0x000284A4
public void UpdateFrameBuffer()
{
- if (base.camera.targetTexture != null && this.m_FrameBufferAr[this.m_nFrameNo] != null)
+ if (base.GetComponent().targetTexture != null && this.m_FrameBufferAr[this.m_nFrameNo] != null)
{
this.m_FrameBufferAr[this.m_nFrameNo].IsReady = true;
}
@@ -277,7 +275,7 @@ public class Man2D : Singleton
}
if (this.m_FrameBufferAr[this.m_nFrameNo] != null)
{
- base.camera.targetTexture = this.m_FrameBufferAr[this.m_nFrameNo].Tex;
+ base.GetComponent().targetTexture = this.m_FrameBufferAr[this.m_nFrameNo].Tex;
}
}
@@ -286,15 +284,15 @@ public class Man2D : Singleton
{
base.gameObject.AddComponent();
CreateSprite.CreateSpriteCamera(base.gameObject, this.m_nScreenH, true);
- base.gameObject.camera.aspect = 1.7647059f;
+ base.gameObject.GetComponent().aspect = 1.7647059f;
}
// Token: 0x06000990 RID: 2448 RVA: 0x0002A390 File Offset: 0x00028590
private void CreateSpriteManager()
{
this.m_Sprite = new ManSprite();
- float z = base.camera.transform.localPosition.z;
- this.m_Sprite.SetZ(base.camera.nearClipPlane + z, base.camera.farClipPlane + z);
+ float z = base.GetComponent().transform.localPosition.z;
+ this.m_Sprite.SetZ(base.GetComponent().nearClipPlane + z, base.GetComponent().farClipPlane + z);
this.m_Sprite.SetScreenSize(this.m_nScreenW, this.m_nScreenH);
}
@@ -316,14 +314,14 @@ public class Man2D : Singleton
this.m_FrameBufferAr[i] = new FrameBuffer(w, h, "2D Sprite FrameBuffer" + i);
}
this.m_nFrameNo = 0;
- base.camera.targetTexture = this.m_FrameBufferAr[this.m_nFrameNo].Tex;
+ base.GetComponent().targetTexture = this.m_FrameBufferAr[this.m_nFrameNo].Tex;
}
// Token: 0x06000992 RID: 2450 RVA: 0x0002A4B8 File Offset: 0x000286B8
public void ReleaseFrameBuffer()
{
Qoo.Debug.Print("Release Frame Buffer");
- base.camera.targetTexture = null;
+ base.GetComponent().targetTexture = null;
for (int i = 0; i < this.m_FrameBufferAr.Length; i++)
{
if (this.m_FrameBufferAr[i] != null)
diff --git a/Assets/Scripts/Assembly-CSharp/Meter.cs b/Assets/Scripts/Assembly-CSharp/Meter.cs
index 64dfd6b48..f3e36c56c 100644
--- a/Assets/Scripts/Assembly-CSharp/Meter.cs
+++ b/Assets/Scripts/Assembly-CSharp/Meter.cs
@@ -27,7 +27,7 @@ public class Meter : MonoBehaviour
// Token: 0x0600064F RID: 1615 RVA: 0x0001A4D0 File Offset: 0x000186D0
protected virtual IEnumerator WaitLoadTextureCoroutine()
{
- while (base.gameObject.renderer.material.mainTexture == null)
+ while (base.gameObject.GetComponent().material.mainTexture == null)
{
yield return 0;
}
diff --git a/Assets/Scripts/Assembly-CSharp/MeterCollider.cs b/Assets/Scripts/Assembly-CSharp/MeterCollider.cs
index 150a61d28..2c9872a92 100644
--- a/Assets/Scripts/Assembly-CSharp/MeterCollider.cs
+++ b/Assets/Scripts/Assembly-CSharp/MeterCollider.cs
@@ -16,7 +16,7 @@ public class MeterCollider : MonoBehaviour
// Token: 0x06000656 RID: 1622 RVA: 0x0001A5E0 File Offset: 0x000187E0
private IEnumerator WaitLoadTextureCoroutine()
{
- while (this.m_MeterObject.renderer.material.mainTexture == null)
+ while (this.m_MeterObject.GetComponent().material.mainTexture == null)
{
yield return 0;
}
@@ -27,7 +27,7 @@ public class MeterCollider : MonoBehaviour
{
this.m_Collider = base.gameObject.AddComponent();
}
- this.m_Collider.size = new Vector3((float)this.m_MeterObject.renderer.material.mainTexture.width, (float)this.m_MeterObject.renderer.material.mainTexture.height, 1f);
+ this.m_Collider.size = new Vector3((float)this.m_MeterObject.GetComponent().material.mainTexture.width, (float)this.m_MeterObject.GetComponent().material.mainTexture.height, 1f);
this.m_Collider.center = new Vector3(0f, 0f, -3f);
this.m_ImageObject = this.m_MeterObject.GetComponent();
yield break;
diff --git a/Assets/Scripts/Assembly-CSharp/MovieManager.cs b/Assets/Scripts/Assembly-CSharp/MovieManager.cs
index 745be16a5..cd11454c7 100644
--- a/Assets/Scripts/Assembly-CSharp/MovieManager.cs
+++ b/Assets/Scripts/Assembly-CSharp/MovieManager.cs
@@ -1,9 +1,10 @@
using System;
using System.Collections;
using UnityEngine;
+using UnityEngine.Video;
// Token: 0x0200017E RID: 382
-public class MovieManager
+public static class MovieManager
{
//TODO fix movie playing. either make platform specific versions OR make platform agnostic
@@ -15,11 +16,64 @@ public class MovieManager
yield break;
}*/
- public static IEnumerator PlayMovie(string path, string mode)
+ //public static IEnumerator PlayMovie(string path, string mode)
+
+ public static IEnumerator PlayMovie(string filePath, GameObject gameObject)
{
+ int m_width = 960;
+ int m_height = 544;
+ yield return 0;
+ yield return 0;
+ UnitySprite movieFrame = new UnitySprite(false, gameObject, false);
+ movieFrame.CalcRenderImageOffset(m_width, m_height);
+ movieFrame.Update(m_width, m_height, 10f);
+ movieFrame.SetName("Movie Frame");
+
+
+ //NewCode
+ string path = filePath;
+ if (path.IndexOf('/') == 0)
+ {
+ path = path.Substring(1);
+ }
+ string pathExt = System.IO.Path.GetExtension(path);
+ path = path.Substring(0, path.Length - pathExt.Length);
+
+ 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.isLooping = false;
+ movieFrame.SetMaterial(newMat, 960, 544);
+ m_tex.renderMode = UnityEngine.Video.VideoRenderMode.MaterialOverride;
+
+
+ //OLD Code
+ //movieFrame.SetMaterial(movie.Play(name, MOVIE_TEX_TYPE.ADD, false), 960, 544);
+ //yield return 0;
+ //while (movie.IsPlay)
+ //m_tex.Play();
+ yield return 0;
+ while (!m_tex.isPrepared)
+ {
+ yield return 0;
+ }
+ yield return 0;
+ while (m_tex.isPlaying || !m_tex.isPrepared)
+ {
+ if (Input.GetMouseButtonDown(0))
+ {
+ break;
+ }
+ movieFrame.CalcRenderImageOffset(m_width, m_height);
+ movieFrame.Update(m_width, m_height, 10f);
+ yield return 0;
+ }
+ //GameObject.Destroy(gameObject);
//Handheld.PlayFullScreenMovie(path, Color.black, mode);
yield return 0;
yield break;
}
+
}
diff --git a/Assets/Scripts/Assembly-CSharp/MovieTex.cs b/Assets/Scripts/Assembly-CSharp/MovieTex.cs
index aa292d472..1e31b3891 100644
--- a/Assets/Scripts/Assembly-CSharp/MovieTex.cs
+++ b/Assets/Scripts/Assembly-CSharp/MovieTex.cs
@@ -1,6 +1,7 @@
using System;
using Qoo;
using UnityEngine;
+using UnityEngine.Video;
// Token: 0x02000180 RID: 384
public class MovieTex : MonoBehaviour
@@ -34,10 +35,25 @@ public class MovieTex : MonoBehaviour
{
path = path.Substring(1);
}
- this.m_tex = base.gameObject.AddComponent();
- this.m_tex.m_path = path;
- this.m_tex.m_loop = isLoop;
- if (eType != MOVIE_TEX_TYPE.NORMAL)
+ string pathExt = System.IO.Path.GetExtension(path);
+ path = path.Substring(0, path.Length - pathExt.Length);
+
+ //this.m_tex = base.gameObject.AddComponent();
+
+ this.m_tex = base.gameObject.AddComponent();
+ this.m_tex.playOnAwake = false;
+ Material newMat = new Material(Shader.Find("QO/Sprite") as Shader);
+ /*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.isLooping = isLoop;
+ this.m_tex.renderMode = UnityEngine.Video.VideoRenderMode.MaterialOverride;
+ //this.m_tex.targetMaterialRenderer = newMat;
+ this.m_tex.Play();
+ //GameObject.Find();
+
+ /*if (eType != MOVIE_TEX_TYPE.NORMAL)
{
if (eType != MOVIE_TEX_TYPE.ADD)
{
@@ -46,15 +62,19 @@ public class MovieTex : MonoBehaviour
}
else
{
- this.m_tex.m_movieMaterial = new Material(Resources.Load("Shader/Movie/YCrCbtoRGB Add") as Shader);
+ //this.m_tex.m_movieMaterial = new Material(Resources.Load("Shader/Movie/YCrCbtoRGB Add") as Shader);
+ this.m_tex.m_movieMaterial = new Material(Shader.Find("QO/Sprite") as Shader);
}
}
else
{
- this.m_tex.m_movieMaterial = new Material(Resources.Load("Shader/Movie/YCrCbtoRGB") as Shader);
- }
- this.m_tex.Play();
- return this.m_tex.MovieMaterial;
+ //this.m_tex.m_movieMaterial = new Material(Resources.Load("Shader/Movie/YCrCbtoRGB") as Shader);
+ this.m_tex.m_movieMaterial = new Material(Shader.Find("QO/Sprite") as Shader);
+ }*/
+
+ //return gameObject.GetComponent().material;
+ //return this.m_tex.MovieMaterial;
+ return newMat;
}
// Token: 0x06000AD3 RID: 2771 RVA: 0x0002F764 File Offset: 0x0002D964
@@ -69,5 +89,6 @@ public class MovieTex : MonoBehaviour
}
// Token: 0x040008C0 RID: 2240
- private MobileMovieTexture m_tex;
+ //private MobileMovieTexture m_tex;
+ private VideoPlayer m_tex;
}
diff --git a/Assets/Scripts/Assembly-CSharp/NameInputKeyboard.cs b/Assets/Scripts/Assembly-CSharp/NameInputKeyboard.cs
index 31255b13c..53b347b82 100644
--- a/Assets/Scripts/Assembly-CSharp/NameInputKeyboard.cs
+++ b/Assets/Scripts/Assembly-CSharp/NameInputKeyboard.cs
@@ -58,7 +58,15 @@ public class NameInputKeyboard : MonoBehaviour
}
if (ScreenKeyboardManager.IsCancel)
{
- NameInputKeyboard.Instance.m_inputText = "アリス";
+ if (UnityApp.Instance.isJapanese)
+ {
+ NameInputKeyboard.Instance.m_inputText = "アリス";
+ }
+ else
+ {
+ NameInputKeyboard.Instance.m_inputText = "Alice";
+ }
+
}
else
{
diff --git a/Assets/Scripts/Assembly-CSharp/OptionSoundMeter.cs b/Assets/Scripts/Assembly-CSharp/OptionSoundMeter.cs
index 6af2ff6e0..2ae4a263b 100644
--- a/Assets/Scripts/Assembly-CSharp/OptionSoundMeter.cs
+++ b/Assets/Scripts/Assembly-CSharp/OptionSoundMeter.cs
@@ -28,7 +28,7 @@ public class OptionSoundMeter : Meter
// Token: 0x06000679 RID: 1657 RVA: 0x0001AE14 File Offset: 0x00019014
protected override IEnumerator WaitLoadTextureCoroutine()
{
- while (base.gameObject.renderer.material.mainTexture == null)
+ while (base.gameObject.GetComponent().material.mainTexture == null)
{
yield return 0;
}
diff --git a/Assets/Scripts/Assembly-CSharp/OptionVoiceMeter.cs b/Assets/Scripts/Assembly-CSharp/OptionVoiceMeter.cs
index 155f1c2ad..ee8a3b3dc 100644
--- a/Assets/Scripts/Assembly-CSharp/OptionVoiceMeter.cs
+++ b/Assets/Scripts/Assembly-CSharp/OptionVoiceMeter.cs
@@ -19,7 +19,7 @@ public class OptionVoiceMeter : Meter
// Token: 0x0600067F RID: 1663 RVA: 0x0001AF2C File Offset: 0x0001912C
protected override IEnumerator WaitLoadTextureCoroutine()
{
- while (base.gameObject.renderer.material.mainTexture == null)
+ while (base.gameObject.GetComponent().material.mainTexture == null)
{
yield return 0;
}
diff --git a/Assets/Scripts/Assembly-CSharp/ParamWnd.cs b/Assets/Scripts/Assembly-CSharp/ParamWnd.cs
index 054258205..ffd14c391 100644
--- a/Assets/Scripts/Assembly-CSharp/ParamWnd.cs
+++ b/Assets/Scripts/Assembly-CSharp/ParamWnd.cs
@@ -60,7 +60,7 @@ public class ParamWnd : Singleton
"fps:",
(1f / Time.deltaTime).ToString("0.0"),
" heap:",
- Profiler.usedHeapSize / 1048576U,
+ UnityEngine.Profiling.Profiler.usedHeapSize / 1048576U,
"MB all=",
SystemInfo.systemMemorySize,
"MB"
diff --git a/Assets/Scripts/Assembly-CSharp/QO/AllocMem.cs b/Assets/Scripts/Assembly-CSharp/QO/AllocMem.cs
index c7bd313b4..003a7d719 100644
--- a/Assets/Scripts/Assembly-CSharp/QO/AllocMem.cs
+++ b/Assets/Scripts/Assembly-CSharp/QO/AllocMem.cs
@@ -46,7 +46,7 @@ namespace QO
stringBuilder.Append("usedHeapSize ");
stringBuilder.Append(string.Concat(new object[]
{
- Profiler.usedHeapSize / 1024f,
+ UnityEngine.Profiling.Profiler.usedHeapSize / 1024f,
" KB / ",
(float)SystemInfo.systemMemorySize * 1024f,
" KB"
diff --git a/Assets/Scripts/Assembly-CSharp/Qoo/Def/ErrorDef.cs b/Assets/Scripts/Assembly-CSharp/Qoo/Def/ErrorDef.cs
index 728edd218..b93f82911 100644
--- a/Assets/Scripts/Assembly-CSharp/Qoo/Def/ErrorDef.cs
+++ b/Assets/Scripts/Assembly-CSharp/Qoo/Def/ErrorDef.cs
@@ -5,6 +5,21 @@ namespace Qoo.Def
// Token: 0x020000C8 RID: 200
public class ErrorDef
{
+ void Awake()
+ {
+ ERROR_MSG_NO_GLYPH = "Contains characters that cannot be displayed";
+ ERROR_MSG_MAX_OVER = "You can enter up to 7 characters for the name.";
+ ERROR_MSG_NO_NAME = "No name has been entered.";
+ ERROR_MSG_FAIL_CONNECT = "Connection failed. Try again later";
+ ERROR_MSG_ASSERT_FORMAT = "We apologize for the inconvenience.\nA critical error has occurred.\n\nError Code ={0}\n{1}\n\nPlease send the above information to\n\n\nThank you";
+ ERROR_MSG_UNKOWN = "Unexpected error";
+ ERROR_MSG_FAIL_SAVE = "Failed to save game";
+ ERROR_MSG_FAIL_LOAD = "Failed to load save file";
+ CONFIRM_MSG_0 = "Is {0} {1} Correct?";
+ CONFIRM_MSG_1 = "";
+
+ }
+
// Token: 0x040004A1 RID: 1185
public const string DLG_CG = "sys_dialog";
@@ -57,34 +72,34 @@ namespace Qoo.Def
public const int DLG_MSG_OFS_Y = 40;
// Token: 0x040004B2 RID: 1202
- public const string ERROR_MSG_NO_GLYPH = "表示できない文字が含まれています。";
+ public string ERROR_MSG_NO_GLYPH = "表示できない文字が含まれています。";
// Token: 0x040004B3 RID: 1203
- public const string ERROR_MSG_MAX_OVER = "入力できる名前は７文字までです。";
+ public string ERROR_MSG_MAX_OVER = "入力できる名前は７文字までです。";
// Token: 0x040004B4 RID: 1204
- public const string ERROR_MSG_NO_NAME = "名前が入力されていません。";
+ public string ERROR_MSG_NO_NAME = "名前が入力されていません。";
// Token: 0x040004B5 RID: 1205
- public const string ERROR_MSG_FAIL_CONNECT = "通信に失敗しました。通信状態の良いところで再度接続を試みてください。";
+ public string ERROR_MSG_FAIL_CONNECT = "通信に失敗しました。通信状態の良いところで再度接続を試みてください。";
// Token: 0x040004B6 RID: 1206
- public const string ERROR_MSG_ASSERT_FORMAT = "ご迷惑をお掛けし、大変申し訳ございません。\n継続不能なエラーが発生しました。\n\nエラーコード={0}\n{1}\n\n上記のエラーコードを記載し、\n＜info@quinrose.com＞までご連絡ください。\n\nご協力のほどよろしくお願い申し上げます。";
+ public string ERROR_MSG_ASSERT_FORMAT = "ご迷惑をお掛けし、大変申し訳ございません。\n継続不能なエラーが発生しました。\n\nエラーコード={0}\n{1}\n\n上記のエラーコードを記載し、\n＜info@quinrose.com＞までご連絡ください。\n\nご協力のほどよろしくお願い申し上げます。";
// Token: 0x040004B7 RID: 1207
- public const string ERROR_MSG_UNKOWN = "予期せぬエラー";
+ public string ERROR_MSG_UNKOWN = "予期せぬエラー";
// Token: 0x040004B8 RID: 1208
- public const string ERROR_MSG_FAIL_SAVE = "ゲームデータの保存を正常に終了できませんでした。";
+ public string ERROR_MSG_FAIL_SAVE = "ゲームデータの保存を正常に終了できませんでした。";
// Token: 0x040004B9 RID: 1209
- public const string ERROR_MSG_FAIL_LOAD = "ゲームデータの読込を正常に終了できませんでした。";
+ public string ERROR_MSG_FAIL_LOAD = "ゲームデータの読込を正常に終了できませんでした。";
// Token: 0x040004BA RID: 1210
- public const string CONFIRM_MSG_0 = "「{0}＝{1}」です。";
+ public string CONFIRM_MSG_0 = "「{0}＝{1}」です。";
// Token: 0x040004BB RID: 1211
- public const string CONFIRM_MSG_1 = "よろしいですか？";
+ public string CONFIRM_MSG_1 = "よろしいですか？";
// Token: 0x040004BC RID: 1212
public const float WAIT_TIME = 1f;
diff --git a/Assets/Scripts/Assembly-CSharp/Qoo/Def/GameDef.cs b/Assets/Scripts/Assembly-CSharp/Qoo/Def/GameDef.cs
index 8f2a50b34..d57a42cc2 100644
--- a/Assets/Scripts/Assembly-CSharp/Qoo/Def/GameDef.cs
+++ b/Assets/Scripts/Assembly-CSharp/Qoo/Def/GameDef.cs
@@ -90,8 +90,8 @@ namespace Qoo.Def
// Token: 0x040004FE RID: 1278
private static readonly GameDef.GAME_PARAM_TABLE[] g_GameParamTable = new GameDef.GAME_PARAM_TABLE[]
{
- new GameDef.GAME_PARAM_TABLE("firstname", "アリス", false),
- new GameDef.GAME_PARAM_TABLE("familyname", "リデル", false),
+ UnityApp.Instance.isJapanese? new GameDef.GAME_PARAM_TABLE("firstname", "アリス", false) : new GameDef.GAME_PARAM_TABLE("firstname", "Alice", false),
+ UnityApp.Instance.isJapanese? new GameDef.GAME_PARAM_TABLE("familyname", "リデル", false) : new GameDef.GAME_PARAM_TABLE("familyname", "Liddell", false),
new GameDef.GAME_PARAM_TABLE("scene", string.Empty, false),
new GameDef.GAME_PARAM_TABLE("memory", string.Empty, false),
new GameDef.GAME_PARAM_TABLE("map_bg", string.Empty, false),
diff --git a/Assets/Scripts/Assembly-CSharp/Qoo/Def/PaymentDef.cs b/Assets/Scripts/Assembly-CSharp/Qoo/Def/PaymentDef.cs
index 7bfc4cc54..616f033e2 100644
--- a/Assets/Scripts/Assembly-CSharp/Qoo/Def/PaymentDef.cs
+++ b/Assets/Scripts/Assembly-CSharp/Qoo/Def/PaymentDef.cs
@@ -5,6 +5,7 @@ namespace Qoo.Def
// Token: 0x020000D7 RID: 215
public class PaymentDef
{
+
// Token: 0x04000554 RID: 1364
public const string APLICATION_ID = "";
@@ -32,28 +33,14 @@ namespace Qoo.Def
// Token: 0x0400055C RID: 1372
public const float DLG_ENDTIME = 1f;
- // Token: 0x0400055D RID: 1373
- public const string SCCESS_MSG_PURCHASE = "アドオンの購入が完了しました。";
-
- // Token: 0x0400055E RID: 1374
- public const string PROCESS_MSG_PURCHASE = "購入処理中です。";
-
- // Token: 0x0400055F RID: 1375
- public const string SCCESS_MSG_RENEWAL_LIST = "アドオンの購入履歴を更新しました。";
-
- // Token: 0x04000560 RID: 1376
- public const string PROCESS_MSG_RENEWAL_LIST = "アドオン購入履歴を更新中です。";
-
- // Token: 0x04000561 RID: 1377
- public const string SCCESS_MSG_RESTORE = "リストア（アドオン情報の復元）が完了しました。";
-
- // Token: 0x04000562 RID: 1378
- public const string PROCESS_MSG_RESTORE = "リストア処理中です。";
-
- // Token: 0x04000563 RID: 1379
- public const string ERROR_MSG_FAIL_CONNECT = "通信に失敗しました。\n通信状態の良いところで再度接続を試みてください。";
-
- // Token: 0x04000564 RID: 1380
- public const string ERROR_MSG_NOUSE_APP = "App内での購入が許可されていません。\n「機能制限」の設定画面から\n「App内での購入」をオンにしてください。";
+ //Should no longer be needed
+ public string SCCESS_MSG_PURCHASE = "アドオンの購入が完了しました。";
+ public string PROCESS_MSG_PURCHASE = "購入処理中です。";
+ public string SCCESS_MSG_RENEWAL_LIST = "アドオンの購入履歴を更新しました。";
+ public string PROCESS_MSG_RENEWAL_LIST = "アドオン購入履歴を更新中です。";
+ public string SCCESS_MSG_RESTORE = "リストア（アドオン情報の復元）が完了しました。";
+ public string PROCESS_MSG_RESTORE = "リストア処理中です。";
+ public string ERROR_MSG_FAIL_CONNECT = "通信に失敗しました。\n通信状態の良いところで再度接続を試みてください。";
+ public string ERROR_MSG_NOUSE_APP = "App内での購入が許可されていません。\n「機能制限」の設定画面から\n「App内での購入」をオンにしてください。";
}
}
diff --git a/Assets/Scripts/Assembly-CSharp/Qoo/Def/SaveLoadDef.cs b/Assets/Scripts/Assembly-CSharp/Qoo/Def/SaveLoadDef.cs
index 0d476870b..458de6c5d 100644
--- a/Assets/Scripts/Assembly-CSharp/Qoo/Def/SaveLoadDef.cs
+++ b/Assets/Scripts/Assembly-CSharp/Qoo/Def/SaveLoadDef.cs
@@ -5,6 +5,16 @@ namespace Qoo.Def
// Token: 0x020000D8 RID: 216
public class SaveLoadDef
{
+ void Awake()
+ {
+ if (!UnityApp.Instance.isJapanese)
+ {
+ MSG_SAVE_CONFIRM = "Do you want to save?";
+ MSG_OVER_CONFIRM = "Do you want to overwrite this save？";
+ MSG_LOAD_CONFIRM = "Do you want to load this save？";
+ }
+ }
+
// Token: 0x04000565 RID: 1381
public const string DLG_CG = "screen/common/sys_dialog";
@@ -21,12 +31,12 @@ namespace Qoo.Def
public const int DLG_MSG_Y = 230;
// Token: 0x0400056A RID: 1386
- public const string MSG_SAVE_CONFIRM = "セーブしますか？";
+ public string MSG_SAVE_CONFIRM = "セーブしますか？";
// Token: 0x0400056B RID: 1387
- public const string MSG_OVER_CONFIRM = "上書きしますか？";
+ public string MSG_OVER_CONFIRM = "上書きしますか？";
// Token: 0x0400056C RID: 1388
- public const string MSG_LOAD_CONFIRM = "ロードしますか？";
+ public string MSG_LOAD_CONFIRM = "ロードしますか？";
}
}
diff --git a/Assets/Scripts/Assembly-CSharp/Qoo/DispAssert.cs b/Assets/Scripts/Assembly-CSharp/Qoo/DispAssert.cs
index 59cf052ae..e8fcc9ebf 100644
--- a/Assets/Scripts/Assembly-CSharp/Qoo/DispAssert.cs
+++ b/Assets/Scripts/Assembly-CSharp/Qoo/DispAssert.cs
@@ -71,7 +71,7 @@ namespace Qoo
{
this.guiStyle = GUI.skin.textArea;
this.guiStyle.fontSize = 20;
- string format = "ご迷惑をお掛けし、大変申し訳ございません。\n継続不能なエラーが発生しました。\n\nエラーコード={0}\n{1}\n\n上記のエラーコードを記載し、\n＜info@quinrose.com＞までご連絡ください。\n\nご協力のほどよろしくお願い申し上げます。";
+ string format = "ご迷惑をお掛けし、大変申し訳ございません。\n継続不能なエラーが発生しました。\n\nエラーコード={0}\n{1}\n\n上記のエラーコードを記載し、\n＜ArnethMyndraavn@gmail.com＞までご連絡ください。\n\nご協力のほどよろしくお願い申し上げます。";
string str = "E";
int num = (int)this.errorCode;
string text = string.Format(format, str + num.ToString("0000"), this.errorMessage);
diff --git a/Assets/Scripts/Assembly-CSharp/Qoo/Game/KsExec.cs b/Assets/Scripts/Assembly-CSharp/Qoo/Game/KsExec.cs
index e47e08cea..010b31103 100644
--- a/Assets/Scripts/Assembly-CSharp/Qoo/Game/KsExec.cs
+++ b/Assets/Scripts/Assembly-CSharp/Qoo/Game/KsExec.cs
@@ -44,12 +44,14 @@ namespace Qoo.Game
}
KsInput.Enable = false;
KsInput.Clear();
- bool flag = KsExec.ExecPay(Param, Value, count);
+ /*bool flag = KsExec.ExecPay(Param, Value, count);
if (flag)
{
KsInput.Enable = true;
}
- return flag;
+ return flag;*/
+ //should disable all payment checks
+ return true;
}
}
else
@@ -74,11 +76,20 @@ namespace Qoo.Game
// Token: 0x06000612 RID: 1554 RVA: 0x0001943C File Offset: 0x0001763C
public static bool InputName(int count)
{
+ //UnityEngine.Debug.LogWarning(count);
if (count == 0)
{
+ UnityEngine.Debug.LogWarning("first");
KsExec.confirm = false;
KsExec.confirmResult = false;
- KsExec.editName = "アリス";
+ if (UnityApp.Instance.isJapanese)
+ {
+ KsExec.editName = "アリス";
+ }
+ else
+ {
+ KsExec.editName = "Alice";
+ }
NameInputKeyboard.DebugInputText = KsExec.editName;
KsExec.KeyboardMain();
}
@@ -99,28 +110,40 @@ namespace Qoo.Game
KsExec.editName = NameInputKeyboard.InputText;
if (KsExec.editName.Length == 0 || KsExec.checkSpaceOnly(KsExec.editName))
{
- UnityTask.SetSubNoUnityTask(MessageDlg.ExecDlg("名前が入力されていません。", null));
+ UnityTask.SetSubNoUnityTask(MessageDlg.ExecDlg("No name entered", null));
KsExec.KeyboardMain();
}
else if (KsExec.editName.Length > 7)
{
- UnityTask.SetSubNoUnityTask(MessageDlg.ExecDlg("入力できる名前は７文字までです。", null));
+ UnityTask.SetSubNoUnityTask(MessageDlg.ExecDlg("You can enter up to 7 characters for the name.", null));
KsExec.KeyboardMain();
}
else if (!Singleton.Instance.Font.Font.CheckGlyph(KsExec.editName))
{
- UnityTask.SetSubNoUnityTask(MessageDlg.ExecDlg("表示できない文字が含まれています。", null));
+ UnityTask.SetSubNoUnityTask(MessageDlg.ExecDlg("Contains characters that cannot be displayed.", null));
KsExec.KeyboardMain();
}
else
{
string arg = KsExec.editName;
string paramString = GameData.GetParamString("familyname", string.Empty);
- string[] msgs = new string[]
- {
- string.Format("「{0}＝{1}」です。", arg, paramString),
- "よろしいですか？"
- };
+ string[] msgs;
+ if (UnityApp.Instance.isJapanese)
+ {
+ msgs = new string[]
+ {
+ string.Format("「{0}＝{1}」です。", arg, paramString),
+ "よろしいですか？"
+ };
+ }
+ else
+ {
+ msgs = new string[]
+ {
+ string.Format("Is {0} {1} correct?", arg, paramString)
+ };
+
+ }
UnityTask.SetSubNoUnityTask(MessageDlg.ExecDlg(msgs, new Action(KsExec.SetResult)));
KsExec.confirm = true;
KsExec.confirmResult = false;
@@ -145,13 +168,14 @@ namespace Qoo.Game
// Token: 0x06000614 RID: 1556 RVA: 0x00019604 File Offset: 0x00017804
private static void KeyboardMain()
{
- switch (UnityEngine.Application.platform)
+ UnityTask.SetSubTask(NameInputKeyboard.Open(KsExec.editName, true));
+ /*switch (UnityEngine.Application.platform)
{
case RuntimePlatform.IPhonePlayer:
case RuntimePlatform.Android:
UnityTask.SetSubTask(NameInputKeyboard.Open(KsExec.editName, true));
break;
- }
+ }*/
}
// Token: 0x06000615 RID: 1557 RVA: 0x0001964C File Offset: 0x0001784C
diff --git a/Assets/Scripts/Assembly-CSharp/Qoo/Graphics/Movie.cs b/Assets/Scripts/Assembly-CSharp/Qoo/Graphics/Movie.cs
index 47bcd3397..8d5fe35a9 100644
--- a/Assets/Scripts/Assembly-CSharp/Qoo/Graphics/Movie.cs
+++ b/Assets/Scripts/Assembly-CSharp/Qoo/Graphics/Movie.cs
@@ -1,4 +1,5 @@
using System;
+using System.Collections;
using Qoo.File;
using UnityEngine;
@@ -8,7 +9,7 @@ namespace Qoo.Graphics
public static class Movie
{
// Token: 0x06000165 RID: 357 RVA: 0x000066A4 File Offset: 0x000048A4
- internal static void Play(string name, bool IsSkip)
+ internal static IEnumerator Play(string name, bool IsSkip)
{
FileId fileId = new FileId(string.Empty);
fileId.Set(name);
@@ -17,7 +18,7 @@ namespace Qoo.Graphics
Debug.Print(string.Format("INFO:Start Movie({0} Skip={1})", text, IsSkip.ToString()));
//TODO fix movie playing. either make platform specific versions OR make platform agnostic
//UnityTask.SetSubTask(MovieManager.PlayMovie(text, FullScreenMovieControlMode.CancelOnInput));
- UnityTask.SetSubTask(MovieManager.PlayMovie(text, ""));
+ yield return MovieManager.PlayMovie(text, new GameObject());
}
}
}
diff --git a/Assets/Scripts/Assembly-CSharp/Qoo/Ks/KsTagInfo_MOVIE.cs b/Assets/Scripts/Assembly-CSharp/Qoo/Ks/KsTagInfo_MOVIE.cs
index 92697b837..a18256bca 100644
--- a/Assets/Scripts/Assembly-CSharp/Qoo/Ks/KsTagInfo_MOVIE.cs
+++ b/Assets/Scripts/Assembly-CSharp/Qoo/Ks/KsTagInfo_MOVIE.cs
@@ -29,6 +29,7 @@ namespace Qoo.Ks
// Token: 0x060002DF RID: 735 RVA: 0x00009ED0 File Offset: 0x000080D0
public override TAG_RESULT Run(EventPlayer player, TagData tag)
{
+ UnityEngine.Debug.LogWarning("RUN");
Singleton.Instance.ResetMessage();
Singleton.Instance.Show(false);
if (!player.RestoreOn)
diff --git a/Assets/Scripts/Assembly-CSharp/SaveLoadManager.cs b/Assets/Scripts/Assembly-CSharp/SaveLoadManager.cs
index 98bb0aeb5..aa55ccd3e 100644
--- a/Assets/Scripts/Assembly-CSharp/SaveLoadManager.cs
+++ b/Assets/Scripts/Assembly-CSharp/SaveLoadManager.cs
@@ -77,28 +77,28 @@ public class SaveLoadManager
catch (Exception ex2)
{
Qoo.Debug.Print(ex2.Message);
- DispAssert.Show(ErrorDef.ASSERT_ERROR_CODE.FAIL_SAVE_CATCH_EXCEPTION, "ゲームデータの保存を正常に終了できませんでした。");
+ DispAssert.Show(ErrorDef.ASSERT_ERROR_CODE.FAIL_SAVE_CATCH_EXCEPTION, UnityApp.Instance.isJapanese ? "ゲームデータの保存を正常に終了できませんでした。" : "The game data could not be saved");
break;
}
}
if (array == null)
{
Qoo.Debug.Print("####Save file create error");
- DispAssert.Show(ErrorDef.ASSERT_ERROR_CODE.FAIL_SAVE_DATA_CREATE, "ゲームデータの保存を正常に終了できませんでした。");
+ DispAssert.Show(ErrorDef.ASSERT_ERROR_CODE.FAIL_SAVE_DATA_CREATE, UnityApp.Instance.isJapanese ? "ゲームデータの保存を正常に終了できませんでした。" : "The game data could not be saved");
return false;
}
string text2 = BytesHash.CreateHashCode(array);
if (text2 == null)
{
Qoo.Debug.Print("####hash = null death");
- DispAssert.Show(ErrorDef.ASSERT_ERROR_CODE.FAIL_SAVE_HASHCODE_CREATE, "ゲームデータの保存を正常に終了できませんでした。");
+ DispAssert.Show(ErrorDef.ASSERT_ERROR_CODE.FAIL_SAVE_HASHCODE_CREATE, UnityApp.Instance.isJapanese ? "ゲームデータの保存を正常に終了できませんでした。" : "The game data could not be saved");
return false;
}
info.HashCode = text2;
if (SaveLoadManager.SaveToXML("H_" + text + "_TMP", info, Encoding.UTF8, false) == null)
{
Qoo.Debug.Print("header file save error");
- DispAssert.Show(ErrorDef.ASSERT_ERROR_CODE.FAIL_SAVE_HEADER_CREATE, "ゲームデータの保存を正常に終了できませんでした。");
+ DispAssert.Show(ErrorDef.ASSERT_ERROR_CODE.FAIL_SAVE_HEADER_CREATE, UnityApp.Instance.isJapanese ? "ゲームデータの保存を正常に終了できませんでした。" : "The game data could not be saved");
return false;
}
try
@@ -180,20 +180,20 @@ public class SaveLoadManager
catch (Exception ex2)
{
Qoo.Debug.Print(ex2.Message);
- DispAssert.Show(ErrorDef.ASSERT_ERROR_CODE.FAIL_LOAD_CATCH_EXCEPTION, "ゲームデータの読込を正常に終了できませんでした。");
+ DispAssert.Show(ErrorDef.ASSERT_ERROR_CODE.FAIL_LOAD_CATCH_EXCEPTION, UnityApp.Instance.isJapanese ? "ゲームデータの読込を正常に終了できませんでした。" : "The game data could not be loaded");
break;
}
}
if (array == null)
{
- DispAssert.Show(ErrorDef.ASSERT_ERROR_CODE.FAIL_LOAD, "ゲームデータの読込を正常に終了できませんでした。");
+ DispAssert.Show(ErrorDef.ASSERT_ERROR_CODE.FAIL_LOAD, UnityApp.Instance.isJapanese ? "ゲームデータの読込を正常に終了できませんでした。" : "The game data could not be loaded");
return null;
}
string hashCode = BytesHash.CreateHashCode(array);
if (!saveFileInfo.CheckHash(hashCode))
{
Qoo.Debug.Print("hash ga tigau yo");
- DispAssert.Show(ErrorDef.ASSERT_ERROR_CODE.UNMATCH_SAVE_HASH, "ゲームデータの読込を正常に終了できませんでした。");
+ DispAssert.Show(ErrorDef.ASSERT_ERROR_CODE.UNMATCH_SAVE_HASH, UnityApp.Instance.isJapanese ? "ゲームデータの読込を正常に終了できませんでした。" : "The game data could not be loaded");
return null;
}
return array;
diff --git a/Assets/Scripts/Assembly-CSharp/SaveLoadWindow.cs b/Assets/Scripts/Assembly-CSharp/SaveLoadWindow.cs
index 62670d1a7..2e69eae89 100644
--- a/Assets/Scripts/Assembly-CSharp/SaveLoadWindow.cs
+++ b/Assets/Scripts/Assembly-CSharp/SaveLoadWindow.cs
@@ -91,13 +91,13 @@ public class SaveLoadWindow : BaseWindow
switch (ct)
{
case SaveLoadWindow.ConfrmType.Save:
- this.SetText("SaveConfirmMsg", (!show) ? string.Empty : "セーブしますか？");
+ this.SetText("SaveConfirmMsg", (!show) ? string.Empty : UnityApp.Instance.isJapanese ? "セーブしますか？" : "Do you want to save?");
break;
case SaveLoadWindow.ConfrmType.Load:
- this.SetText("LoadConfirmMsg", (!show) ? string.Empty : "ロードしますか？");
+ this.SetText("LoadConfirmMsg", (!show) ? string.Empty : UnityApp.Instance.isJapanese ? "ロードしますか？" : "Do you want to load this save?");
break;
case SaveLoadWindow.ConfrmType.Over:
- this.SetText("OverConfirmMsg", (!show) ? string.Empty : "上書きしますか？");
+ this.SetText("OverConfirmMsg", (!show) ? string.Empty : UnityApp.Instance.isJapanese ? "上書きしますか？" : "Do you want to overwrite this Save?");
break;
}
}
@@ -329,9 +329,9 @@ public class SaveLoadWindow : BaseWindow
new BaseWindow.UIImage("Confirm", 136, 182, this.wndz + 3, "screen/common/sys_dialog", true, false),
new BaseWindow.UIButton("Confirm_YES", 312, 277, this.wndz + 4, "screen/common/dlog_btn_y", true, false, 1, 2, 0),
new BaseWindow.UIButton("Confirm_NO", 513, 277, this.wndz + 4, "screen/common/dlog_btn_n", true, false, 1, 2, 0),
- new BaseWindow.UIText("SaveConfirmMsg", 480, 230, this.wndz + 4, "セーブしますか？", 28, UnityTextSprite.PositionType.Center, UnityTextSprite.PositionType.TopLeft, byte.MaxValue, byte.MaxValue, byte.MaxValue, byte.MaxValue),
- new BaseWindow.UIText("LoadConfirmMsg", 480, 230, this.wndz + 4, "ロードしますか？", 28, UnityTextSprite.PositionType.Center, UnityTextSprite.PositionType.TopLeft, byte.MaxValue, byte.MaxValue, byte.MaxValue, byte.MaxValue),
- new BaseWindow.UIText("OverConfirmMsg", 480, 230, this.wndz + 4, "上書きしますか？", 28, UnityTextSprite.PositionType.Center, UnityTextSprite.PositionType.TopLeft, byte.MaxValue, byte.MaxValue, byte.MaxValue, byte.MaxValue)
+ new BaseWindow.UIText("SaveConfirmMsg", 480, 230, this.wndz + 4, UnityApp.Instance.isJapanese ? "セーブしますか？" : "Do you want to save?", 28, UnityTextSprite.PositionType.Center, UnityTextSprite.PositionType.TopLeft, byte.MaxValue, byte.MaxValue, byte.MaxValue, byte.MaxValue),
+ new BaseWindow.UIText("LoadConfirmMsg", 480, 230, this.wndz + 4, UnityApp.Instance.isJapanese ? "ロードしますか？" : "Do you want to load this save?", 28, UnityTextSprite.PositionType.Center, UnityTextSprite.PositionType.TopLeft, byte.MaxValue, byte.MaxValue, byte.MaxValue, byte.MaxValue),
+ new BaseWindow.UIText("OverConfirmMsg", 480, 230, this.wndz + 4, UnityApp.Instance.isJapanese ? "上書きしますか？" : "Do you want to overwrite this Save?", 28, UnityTextSprite.PositionType.Center, UnityTextSprite.PositionType.TopLeft, byte.MaxValue, byte.MaxValue, byte.MaxValue, byte.MaxValue)
};
}
diff --git a/Assets/Scripts/Assembly-CSharp/SceneManager.cs b/Assets/Scripts/Assembly-CSharp/SceneManager.cs
index 2a6f587c6..14b2d6c09 100644
--- a/Assets/Scripts/Assembly-CSharp/SceneManager.cs
+++ b/Assets/Scripts/Assembly-CSharp/SceneManager.cs
@@ -1,6 +1,7 @@
using System;
using System.Collections;
using System.Collections.Generic;
+using UnityEngine.SceneManagement;
using UnityEngine;
// Token: 0x0200013B RID: 315
@@ -114,24 +115,23 @@ public class SceneManager : MonoBehaviour
}
// Token: 0x0600088C RID: 2188 RVA: 0x00026388 File Offset: 0x00024588
- /*private static AsyncOperation LoadScene(string sceneName)
+ private static AsyncOperation LoadScene(string sceneName)
{
- return Application.LoadLevelAdditiveAsync(sceneName);
- }*/
-
- private static void LoadScene(string sceneName)
- {
- Application.LoadLevelAdditive(sceneName);
+ return UnityEngine.SceneManagement.SceneManager.LoadSceneAsync(sceneName, LoadSceneMode.Additive);
+ //return Application.LoadLevelAdditiveAsync(sceneName);
}
// Token: 0x0600088D RID: 2189 RVA: 0x00026390 File Offset: 0x00024590
private static void UnloadScene(string sceneName)
{
+ //UnityEngine.SceneManagement.SceneManager.UnloadScene(sceneName);
GameObject gameObject = GameObject.Find(sceneName);
if (gameObject != null)
{
UnityEngine.Object.Destroy(gameObject);
}
+ Application.UnloadLevel(sceneName);
+
Resources.UnloadUnusedAssets();
}
@@ -156,8 +156,8 @@ public class SceneManager : MonoBehaviour
// Token: 0x06000891 RID: 2193 RVA: 0x000263FC File Offset: 0x000245FC
private IEnumerator WaitForLoadScene(string currentSceneName, string nextSceneName, Action action)
{
- //AsyncOperation ao = SceneManager.LoadScene(nextSceneName);
- SceneManager.LoadScene(nextSceneName);
+ AsyncOperation ao = SceneManager.LoadScene(nextSceneName);
+ //SceneManager.LoadScene(nextSceneName);
if (currentSceneName != null)
{
SceneManager.UnloadScene(currentSceneName);
@@ -166,10 +166,10 @@ public class SceneManager : MonoBehaviour
{
action(nextSceneName);
}
- /*while (ao.progress < 1f)
+ while (ao.progress < 1f)
{
yield return new WaitForSeconds(0.1f);
- }*/
+ }
GameObject go = GameObject.Find(nextSceneName + "/Wnd");
if (go != null)
{
diff --git a/Assets/Scripts/Assembly-CSharp/ScreenEffect.cs b/Assets/Scripts/Assembly-CSharp/ScreenEffect.cs
index 8bc6253e1..a91be0f80 100644
--- a/Assets/Scripts/Assembly-CSharp/ScreenEffect.cs
+++ b/Assets/Scripts/Assembly-CSharp/ScreenEffect.cs
@@ -42,7 +42,7 @@ public class ScreenEffect
{
ScreenEffect.Init(99, Color.black, null);
}
- ScreenEffect.goScreenEffect.renderer.material.SetColor("_Color", work.Offset);
+ ScreenEffect.goScreenEffect.GetComponent().material.SetColor("_Color", work.Offset);
work.Update();
yield return 0;
}
@@ -57,7 +57,7 @@ public class ScreenEffect
if (ScreenEffect.goScreenEffect == null)
{
ScreenEffect.goScreenEffect = GameObject.CreatePrimitive(PrimitiveType.Quad);
- ScreenEffect.goScreenEffect.renderer.material = new Material(Resources.Load("Shader/Color/UnlitColor") as Shader);
+ ScreenEffect.goScreenEffect.GetComponent().material = new Material(Resources.Load("Shader/Color/UnlitColor") as Shader);
ScreenEffect.goScreenEffect.transform.localScale = new Vector3(960f, 544f, 1f);
ScreenEffect.goScreenEffect.name = "__ScreenEffenct";
}
@@ -71,7 +71,7 @@ public class ScreenEffect
//ScreenEffect.goScreenEffect.transform.localPosition = new Vector3(2000f, 0f, (float)(-(float)z));
ScreenEffect.goScreenEffect.transform.localPosition = new Vector3(0f, 0f, (float)(-(float)z));
}
- ScreenEffect.goScreenEffect.renderer.material.SetColor("_Color", color);
+ ScreenEffect.goScreenEffect.GetComponent().material.SetColor("_Color", color);
}
// Token: 0x060008EF RID: 2287 RVA: 0x000274EC File Offset: 0x000256EC
diff --git a/Assets/Scripts/Assembly-CSharp/ScreenKeyboardManager.cs b/Assets/Scripts/Assembly-CSharp/ScreenKeyboardManager.cs
index e514c0e66..f707ebc0c 100644
--- a/Assets/Scripts/Assembly-CSharp/ScreenKeyboardManager.cs
+++ b/Assets/Scripts/Assembly-CSharp/ScreenKeyboardManager.cs
@@ -1,6 +1,8 @@
-using System;
+
+using System;
using System.Collections;
using UnityEngine;
+using UnityEngine.UI;
// Token: 0x02000174 RID: 372
public class ScreenKeyboardManager : MonoBehaviour
@@ -59,6 +61,86 @@ public class ScreenKeyboardManager : MonoBehaviour
// Token: 0x06000A97 RID: 2711 RVA: 0x0002EAC8 File Offset: 0x0002CCC8
public static IEnumerator Open(string defaultString = "")
{
+ 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;
+
+ Canvas canvas = manager.AddComponent