diff --git a/AssetBundleCacher.cs b/AssetBundleCacher.cs index e056089e..df383907 100644 --- a/AssetBundleCacher.cs +++ b/AssetBundleCacher.cs @@ -107,27 +107,12 @@ namespace VRCX return; } // upgrade from Unity 2018 to 2019 - var UnityPlayerDll = Path.Combine(Program.BaseDirectory, "AssetBundleCacher\\UnityPlayer.dll"); - if (File.Exists(UnityPlayerDll)) - { - FileInfo UnityPlayerDllInfo = new FileInfo(UnityPlayerDll); - if (UnityPlayerDllInfo.Length == 23399880 || UnityPlayerDllInfo.Length == 37697480) - File.Delete(UnityPlayerDll); - var UnityData = Path.Combine(Program.BaseDirectory, "AssetBundleCacher\\AssetBundleCacher_Data\\data.unity3d"); - if (File.Exists(UnityData)) - File.Delete(UnityData); - } - if (!File.Exists(UnityPlayerDll)) + var UnityData = Path.Combine(Program.BaseDirectory, "AssetBundleCacher\\AssetBundleCacher_Data\\data.unity3d"); + if (File.Exists(UnityData)) { try { - using (var key = Registry.ClassesRoot.OpenSubKey(@"VRChat\shell\open\command")) - { - // "C:\Program Files (x86)\Steam\steamapps\common\VRChat\launch.exe" "%1" %* - var match = Regex.Match(key.GetValue(string.Empty) as string, "(?!\")(.+?\\\\VRChat.*)(!?\\\\launch.exe\")"); - var fileLocation = Path.Combine(match.Groups[1].Value, "UnityPlayer.dll"); - File.Copy(fileLocation, Path.Combine(Program.BaseDirectory, "AssetBundleCacher\\UnityPlayer.dll")); - } + File.Delete(UnityData); } catch { diff --git a/AssetBundleCacher/AssetBundleCacher.exe b/AssetBundleCacher/AssetBundleCacher.exe index 98d64385..7ab28f47 100644 Binary files a/AssetBundleCacher/AssetBundleCacher.exe and b/AssetBundleCacher/AssetBundleCacher.exe differ diff --git a/AssetBundleCacher/AssetBundleCacher_Data/Resources/unity_builtin_extra b/AssetBundleCacher/AssetBundleCacher_Data/Resources/unity_builtin_extra index d5facf26..903e99af 100644 Binary files a/AssetBundleCacher/AssetBundleCacher_Data/Resources/unity_builtin_extra and b/AssetBundleCacher/AssetBundleCacher_Data/Resources/unity_builtin_extra differ diff --git a/AssetBundleCacher/AssetBundleCacher_Data/globalgamemanagers b/AssetBundleCacher/AssetBundleCacher_Data/globalgamemanagers index ac587c59..166c43df 100644 Binary files a/AssetBundleCacher/AssetBundleCacher_Data/globalgamemanagers and b/AssetBundleCacher/AssetBundleCacher_Data/globalgamemanagers differ diff --git a/AssetBundleCacher/AssetBundleCacher_Data/globalgamemanagers.assets b/AssetBundleCacher/AssetBundleCacher_Data/globalgamemanagers.assets index 54049df1..29bc2931 100644 Binary files a/AssetBundleCacher/AssetBundleCacher_Data/globalgamemanagers.assets and b/AssetBundleCacher/AssetBundleCacher_Data/globalgamemanagers.assets differ diff --git a/AssetBundleCacher/AssetBundleCacher_Data/il2cpp_data/Metadata/global-metadata.dat b/AssetBundleCacher/AssetBundleCacher_Data/il2cpp_data/Metadata/global-metadata.dat index 5713dc8b..8cd69e4a 100644 Binary files a/AssetBundleCacher/AssetBundleCacher_Data/il2cpp_data/Metadata/global-metadata.dat and b/AssetBundleCacher/AssetBundleCacher_Data/il2cpp_data/Metadata/global-metadata.dat differ diff --git a/AssetBundleCacher/AssetBundleCacher_Data/level0 b/AssetBundleCacher/AssetBundleCacher_Data/level0 index 487a05e6..3f61f069 100644 Binary files a/AssetBundleCacher/AssetBundleCacher_Data/level0 and b/AssetBundleCacher/AssetBundleCacher_Data/level0 differ diff --git a/AssetBundleCacher/AssetBundleCacher_Data/sharedassets0.assets b/AssetBundleCacher/AssetBundleCacher_Data/sharedassets0.assets index 8a6cacf2..de64c3d2 100644 Binary files a/AssetBundleCacher/AssetBundleCacher_Data/sharedassets0.assets and b/AssetBundleCacher/AssetBundleCacher_Data/sharedassets0.assets differ diff --git a/AssetBundleCacher/GameAssembly.dll b/AssetBundleCacher/GameAssembly.dll index 372999a1..9d64a0b8 100644 Binary files a/AssetBundleCacher/GameAssembly.dll and b/AssetBundleCacher/GameAssembly.dll differ diff --git a/AssetBundleCacher/UnityPlayer.dll b/AssetBundleCacher/UnityPlayer.dll new file mode 100644 index 00000000..efdef3d5 Binary files /dev/null and b/AssetBundleCacher/UnityPlayer.dll differ