diff --git a/src/game_engine/unity/il2cpp/builds.rs b/src/game_engine/unity/il2cpp/builds.rs index 0eaaa875..0d3ce256 100644 --- a/src/game_engine/unity/il2cpp/builds.rs +++ b/src/game_engine/unity/il2cpp/builds.rs @@ -116,9 +116,9 @@ pub(super) const BUILDS: &[Build] = &[ }, }, }, - // Unity 2018.2.0f2, metadata version 24, x64. + // Unity 2018.2.0f1, metadata version 24, x64. Build { - unity: (2018, 2, 0, 30296), + unity: (2018, 2, 0, 44229), profile: Profile { pointer_size: PointerSize::Bit64, assembly: AssemblyOffsets { @@ -155,9 +155,9 @@ pub(super) const BUILDS: &[Build] = &[ }, }, }, - // Unity 2018.2.0f2, metadata version 24, x86. + // Unity 2018.2.0f1, metadata version 24, x86. Build { - unity: (2018, 2, 0, 30296), + unity: (2018, 2, 0, 44229), profile: Profile { pointer_size: PointerSize::Bit32, assembly: AssemblyOffsets { @@ -272,9 +272,9 @@ pub(super) const BUILDS: &[Build] = &[ }, }, }, - // Unity 2019.1.0f2, metadata version 24, x64. + // Unity 2019.1.0f1, metadata version 24, x64. Build { - unity: (2019, 1, 0, 11155), + unity: (2019, 1, 0, 21026), profile: Profile { pointer_size: PointerSize::Bit64, assembly: AssemblyOffsets { @@ -311,9 +311,9 @@ pub(super) const BUILDS: &[Build] = &[ }, }, }, - // Unity 2019.1.0f2, metadata version 24, x86. + // Unity 2019.1.0f1, metadata version 24, x86. Build { - unity: (2019, 1, 0, 11155), + unity: (2019, 1, 0, 21026), profile: Profile { pointer_size: PointerSize::Bit32, assembly: AssemblyOffsets { diff --git a/src/game_engine/unity/il2cpp/collections_tests.rs b/src/game_engine/unity/il2cpp/collections_tests.rs index 751de049..0d3a4f99 100644 --- a/src/game_engine/unity/il2cpp/collections_tests.rs +++ b/src/game_engine/unity/il2cpp/collections_tests.rs @@ -14,7 +14,7 @@ use std::vec; use std::vec::Vec; const BASE: u64 = 0x60_0000; -const MEASURED_2019: (u16, u16, u16, u16) = (2019, 1, 0, 11155); +const MEASURED_2019: (u16, u16, u16, u16) = (2019, 1, 0, 21026); fn put(image: &mut [u8], at: u64, bytes: &[u8]) { let at = at as usize; diff --git a/src/game_engine/unity/il2cpp/profiles.rs b/src/game_engine/unity/il2cpp/profiles.rs index b3a46724..2f2fad9d 100644 --- a/src/game_engine/unity/il2cpp/profiles.rs +++ b/src/game_engine/unity/il2cpp/profiles.rs @@ -24,18 +24,18 @@ profiles! { UNITY_2018_1_0F1_X86_64 = 0; /// Unity 2018.1.0f1, file version `2018.1.0.30795`, x86. UNITY_2018_1_0F1_X86 = 1; - /// Unity 2018.2.0f2, file version `2018.2.0.30296`, x86-64. - UNITY_2018_2_0F2_X86_64 = 2; - /// Unity 2018.2.0f2, file version `2018.2.0.30296`, x86. - UNITY_2018_2_0F2_X86 = 3; + /// Unity 2018.2.0f1, file version `2018.2.0.44229`, x86-64. + UNITY_2018_2_0F1_X86_64 = 2; + /// Unity 2018.2.0f1, file version `2018.2.0.44229`, x86. + UNITY_2018_2_0F1_X86 = 3; /// Unity 2018.3.0f1, file version `2018.3.0.9156`, x86-64. UNITY_2018_3_0F1_X86_64 = 4; /// Unity 2018.3.0f1, file version `2018.3.0.9156`, x86. UNITY_2018_3_0F1_X86 = 5; - /// Unity 2019.1.0f2, file version `2019.1.0.11155`, x86-64. - UNITY_2019_1_0F2_X86_64 = 6; - /// Unity 2019.1.0f2, file version `2019.1.0.11155`, x86. - UNITY_2019_1_0F2_X86 = 7; + /// Unity 2019.1.0f1, file version `2019.1.0.21026`, x86-64. + UNITY_2019_1_0F1_X86_64 = 6; + /// Unity 2019.1.0f1, file version `2019.1.0.21026`, x86. + UNITY_2019_1_0F1_X86 = 7; /// Unity 2020.2.0f1, file version `2020.2.0.8671`, x86-64. UNITY_2020_2_0F1_X86_64 = 8; /// Unity 2020.2.0f1, file version `2020.2.0.8671`, x86. @@ -68,9 +68,9 @@ mod tests { UNITY_2018_1_0F1_X86, ), ( - (2018, 2, 0, 30296), - UNITY_2018_2_0F2_X86_64, - UNITY_2018_2_0F2_X86, + (2018, 2, 0, 44229), + UNITY_2018_2_0F1_X86_64, + UNITY_2018_2_0F1_X86, ), ( (2018, 3, 0, 9156), @@ -78,9 +78,9 @@ mod tests { UNITY_2018_3_0F1_X86, ), ( - (2019, 1, 0, 11155), - UNITY_2019_1_0F2_X86_64, - UNITY_2019_1_0F2_X86, + (2019, 1, 0, 21026), + UNITY_2019_1_0F1_X86_64, + UNITY_2019_1_0F1_X86, ), ( (2020, 2, 0, 8671), diff --git a/src/game_engine/unity/il2cpp/walk_tests.rs b/src/game_engine/unity/il2cpp/walk_tests.rs index 060246c6..5069b244 100644 --- a/src/game_engine/unity/il2cpp/walk_tests.rs +++ b/src/game_engine/unity/il2cpp/walk_tests.rs @@ -118,7 +118,7 @@ impl Player { } } -const MEASURED_2019: (u16, u16, u16, u16) = (2019, 1, 0, 11155); +const MEASURED_2019: (u16, u16, u16, u16) = (2019, 1, 0, 21026); const MEASURED_2022: (u16, u16, u16, u16) = (2022, 2, 0, 56532); const MEASURED_6000_5: (u16, u16, u16, u16) = (6000, 5, 0, 46204); diff --git a/src/game_engine/unity/mono/builds.rs b/src/game_engine/unity/mono/builds.rs index 1c741a60..ce39582c 100644 --- a/src/game_engine/unity/mono/builds.rs +++ b/src/game_engine/unity/mono/builds.rs @@ -242,7 +242,7 @@ pub(super) const BUILDS: &[Build] = &[ // Unity 2017.1.0, mono-2.0-bdwgc.dll, x64. Build { debug_id: debug_id("f6e9366e-08b8-4e78-bafe-7c8aafaaf7b8", 1), - unity: (2017, 1, 0, 9747), + unity: (2017, 1, 0, 32737), profile: Profile { pointer_size: PointerSize::Bit64, library: Library::MonoBdwgc, @@ -291,7 +291,7 @@ pub(super) const BUILDS: &[Build] = &[ // Unity 2017.1.0, mono-2.0-bdwgc.dll, x86. Build { debug_id: debug_id("aef8adb1-0052-4953-88f2-fd56544ccb87", 1), - unity: (2017, 1, 0, 9747), + unity: (2017, 1, 0, 32737), profile: Profile { pointer_size: PointerSize::Bit32, library: Library::MonoBdwgc, diff --git a/src/game_engine/unity/mono/profiles.rs b/src/game_engine/unity/mono/profiles.rs index 7a006ac5..be346175 100644 --- a/src/game_engine/unity/mono/profiles.rs +++ b/src/game_engine/unity/mono/profiles.rs @@ -28,12 +28,12 @@ profiles! { UNITY_5_0_0F4_WINDOWS_MONO_X86_64 = 0; /// Unity 5.0.0f4, `mono.dll`, x86, file version `5.0.0.39095`. UNITY_5_0_0F4_WINDOWS_MONO_X86 = 1; - /// Unity 2017.1.0f3, `mono-2.0-bdwgc.dll`, x86-64, file version - /// `2017.1.0.9747`. - UNITY_2017_1_0F3_WINDOWS_MONO_BDWGC_X86_64 = 2; - /// Unity 2017.1.0f3, `mono-2.0-bdwgc.dll`, x86, file version - /// `2017.1.0.9747`. - UNITY_2017_1_0F3_WINDOWS_MONO_BDWGC_X86 = 3; + /// Unity 2017.1.0f1, `mono-2.0-bdwgc.dll`, x86-64, file version + /// `2017.1.0.32737`. + UNITY_2017_1_0F1_WINDOWS_MONO_BDWGC_X86_64 = 2; + /// Unity 2017.1.0f1, `mono-2.0-bdwgc.dll`, x86, file version + /// `2017.1.0.32737`. + UNITY_2017_1_0F1_WINDOWS_MONO_BDWGC_X86 = 3; /// Unity 2017.2.0f1, `mono-2.0-bdwgc.dll`, x86-64, file version /// `2017.2.0.58714`. UNITY_2017_2_0F1_WINDOWS_MONO_BDWGC_X86_64 = 4; diff --git a/src/game_engine/unity/mono/profiles_tests.rs b/src/game_engine/unity/mono/profiles_tests.rs index 09152571..e473b40e 100644 --- a/src/game_engine/unity/mono/profiles_tests.rs +++ b/src/game_engine/unity/mono/profiles_tests.rs @@ -24,16 +24,16 @@ fn windows_constants_name_the_expected_profiles() { UNITY_5_0_0F4_WINDOWS_MONO_X86, ), ( - (2017, 1, 0, 9747), + (2017, 1, 0, 32737), Library::MonoBdwgc, PointerSize::Bit64, - UNITY_2017_1_0F3_WINDOWS_MONO_BDWGC_X86_64, + UNITY_2017_1_0F1_WINDOWS_MONO_BDWGC_X86_64, ), ( - (2017, 1, 0, 9747), + (2017, 1, 0, 32737), Library::MonoBdwgc, PointerSize::Bit32, - UNITY_2017_1_0F3_WINDOWS_MONO_BDWGC_X86, + UNITY_2017_1_0F1_WINDOWS_MONO_BDWGC_X86, ), ( (2017, 2, 0, 58714),