Compare commits

..

No commits in common. "2.0_beta" and "CNBeta2.0.4-r2" have entirely different histories.

14 changed files with 36 additions and 60 deletions

20
Cargo.lock generated
View file

@ -239,6 +239,16 @@ version = "1.0.13"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
[[package]]
name = "vivian"
version = "0.0.1"
dependencies = [
"ilhook",
"num_enum",
"thiserror 2.0.11",
"windows",
]
[[package]] [[package]]
name = "windows" name = "windows"
version = "0.59.0" version = "0.59.0"
@ -431,13 +441,3 @@ checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b"
dependencies = [ dependencies = [
"memchr", "memchr",
] ]
[[package]]
name = "yixuan"
version = "0.0.1"
dependencies = [
"ilhook",
"num_enum",
"thiserror 2.0.11",
"windows",
]

View file

@ -1,5 +1,5 @@
[workspace] [workspace]
members = ["launcher", "yixuan"] members = ["launcher", "vivian"]
resolver = "2" resolver = "2"
[workspace.package] [workspace.package]

View file

@ -12,8 +12,8 @@ use windows::Win32::System::Threading::{
PROCESS_INFORMATION, STARTUPINFOA, PROCESS_INFORMATION, STARTUPINFOA,
}; };
const GAME_EXECUTABLE: PCSTR = s!("ZenlessZoneZero.exe"); const GAME_EXECUTABLE: PCSTR = s!("ZenlessZoneZeroBeta.exe");
const INJECT_DLL: &str = "yixuan.dll"; const INJECT_DLL: &str = "vivian.dll";
fn inject_standard(h_target: HANDLE, dll_path: &str) -> bool { fn inject_standard(h_target: HANDLE, dll_path: &str) -> bool {
unsafe { unsafe {

View file

@ -1,10 +1,10 @@
[package] [package]
name = "yixuan" name = "vivian"
edition = "2021" edition = "2021"
version.workspace = true version.workspace = true
[lib] [lib]
name = "yixuan" name = "vivian"
crate-type = ["cdylib"] crate-type = ["cdylib"]
[dependencies] [dependencies]

View file

@ -32,14 +32,12 @@ unsafe fn thread_fn() {
thread::sleep(Duration::from_secs(5)); thread::sleep(Duration::from_secs(5));
util::disable_memory_protection(); util::disable_memory_protection();
println!("yixuan-patch (2.0.0 PROD) is initializing"); println!("vivian-patch (2.0.4 BETA) is initializing");
println!( println!(
"to work with yixuan-rs: https://git.xeondev.com/yixuan-rs/yixuan-rs" "to work with vivian-rs: https://git.xeondev.com/vivian-rs/vivian-rs/src/branch/2.0_beta"
); );
println!("\nJoin us on Discord at https://discord.gg/reversedrooms\n\n\n");
let mut module_manager = NapModuleManager::default(); let mut module_manager = NapModuleManager::default();
module_manager.add::<Network>(); module_manager.add::<Network>();
module_manager.add::<HoyopassPatch>(); module_manager.add::<HoyopassPatch>();

View file

@ -3,12 +3,12 @@ use std::sync::atomic::{AtomicU32, Ordering};
use super::{ModuleInitError, NapModule, NapModuleContext}; use super::{ModuleInitError, NapModule, NapModuleContext};
const SET_DITHER_CONFIG: usize = 0x8CA93D0; const SET_DITHER_CONFIG: usize = 0x8DF8980;
const DITHER_CONFIG_AVATAR_USING_DITHER_ALPHA: usize = 0x49; const DITHER_CONFIG_AVATAR_USING_DITHER_ALPHA: usize = 0x41;
const ON_ENTER_SCENE_SC_NOTIFY: usize = 0x86E6F80; const ON_ENTER_SCENE_SC_NOTIFY: usize = 0x83862A0;
const ENTER_SCENE_SC_NOTIFY_SCENE_DATA: usize = 0x10; const ENTER_SCENE_SC_NOTIFY_SCENE_DATA: usize = 0x18;
const SCENE_DATA_SCENE_TYPE: usize = 0x74; const SCENE_DATA_SCENE_TYPE: usize = 0x6C;
const SCENE_TYPE_HALL: u32 = 1; const SCENE_TYPE_HALL: u32 = 1;
static LAST_ENTER_SCENE_TYPE: AtomicU32 = AtomicU32::new(0); static LAST_ENTER_SCENE_TYPE: AtomicU32 = AtomicU32::new(0);
@ -34,10 +34,8 @@ impl NapModule for NapModuleContext<CensorshipPatch> {
impl CensorshipPatch { impl CensorshipPatch {
pub unsafe extern "win64" fn on_set_dither_config(reg: *mut Registers, _: usize) { pub unsafe extern "win64" fn on_set_dither_config(reg: *mut Registers, _: usize) {
if LAST_ENTER_SCENE_TYPE.load(Ordering::SeqCst) == SCENE_TYPE_HALL { if LAST_ENTER_SCENE_TYPE.load(Ordering::SeqCst) == SCENE_TYPE_HALL {
if (*reg).rdx != 0 { println!("SetDitherConfig: disabling dither alpha");
println!("SetDitherConfig: disabling dither alpha"); *(((*reg).rdx as *mut u8).wrapping_add(DITHER_CONFIG_AVATAR_USING_DITHER_ALPHA)) = 0;
*(((*reg).rdx as *mut u8).wrapping_add(DITHER_CONFIG_AVATAR_USING_DITHER_ALPHA)) = 0;
}
} else { } else {
println!("SetDitherConfig: not in hall, ignoring"); println!("SetDitherConfig: not in hall, ignoring");
} }

View file

@ -7,14 +7,14 @@ use crate::{
util::{import, GAME_ASSEMBLY_BASE}, util::{import, GAME_ASSEMBLY_BASE},
}; };
import!(rsa_create() -> usize = 0x1B56F0F0); import!(rsa_create() -> usize = 0x1B56B2E0);
import!(rsa_from_xml_string(instance: usize, xml_string: usize) -> usize = 0x1B56F330); import!(rsa_from_xml_string(instance: usize, xml_string: usize) -> usize = 0x1B56B520);
import!(il2cpp_string_new(cstr: *const u8) -> usize = 0x115CCC0); import!(il2cpp_string_new(cstr: *const u8) -> usize = 0x115F1B0);
pub unsafe fn initialize_rsa_public_key() { pub unsafe fn initialize_rsa_public_key() {
const SERVER_PUBLIC_KEY: &str = include_str!("../../server_public_key.xml"); const SERVER_PUBLIC_KEY: &str = include_str!("../../server_public_key.xml");
let rsa_public_key_backdoor_field = let rsa_public_key_backdoor_field =
((*(GAME_ASSEMBLY_BASE.wrapping_add(0x5550778) as *const usize)) + 252784) as *mut usize; ((*(GAME_ASSEMBLY_BASE.wrapping_add(0x5552100) as *const usize)) + 252792) as *mut usize;
let rsa = rsa_create(); let rsa = rsa_create();
rsa_from_xml_string( rsa_from_xml_string(
@ -33,38 +33,18 @@ pub unsafe fn initialize_rsa_public_key() {
pub unsafe fn replace_sdk_public_key_string_literal() { pub unsafe fn replace_sdk_public_key_string_literal() {
const SDK_PUBLIC_KEY: &str = include_str!("../../sdk_public_key.xml"); const SDK_PUBLIC_KEY: &str = include_str!("../../sdk_public_key.xml");
*(GAME_ASSEMBLY_BASE.wrapping_add(0x5952CA8) as *mut usize) = il2cpp_string_new( *(GAME_ASSEMBLY_BASE.wrapping_add(0x5954398) as *mut usize) = il2cpp_string_new(
CString::new(SDK_PUBLIC_KEY) CString::new(SDK_PUBLIC_KEY)
.unwrap() .unwrap()
.to_bytes_with_nul() .to_bytes_with_nul()
.as_ptr(), .as_ptr(),
) as usize; ) as usize;
*(GAME_ASSEMBLY_BASE.wrapping_add(0x59760D0) as *mut usize) = il2cpp_string_new(
[
27818, 40348, 47410, 27936, 51394, 33172, 51987, 8709, 44748, 23705, 45753, 21092,
57054, 52661, 369, 62630, 11725, 7496, 36921, 28271, 34880, 52645, 31515, 18214, 3108,
2077, 13490, 25459, 58590, 47504, 15163, 8951, 44748, 23705, 45753, 29284, 57054,
52661, 43266, 17556, 17415, 52254, 32830,
]
.into_iter()
.enumerate()
.flat_map(|(i, v)| {
let b = (((i + ((i >> 31) >> 29)) & 0xF8).wrapping_sub(i)) as i16;
(((v << ((b + 11) & 0xF)) | (v >> ((-11 - b) & 0xF))) & 0xFFFF_u16)
.to_be_bytes()
.into_iter()
})
.chain([0])
.collect::<Vec<_>>()
.as_ptr(),
) as usize;
} }
pub unsafe fn monitor_network_state(interceptor: &mut Interceptor) { pub unsafe fn monitor_network_state(interceptor: &mut Interceptor) {
interceptor interceptor
.attach( .attach(
GAME_ASSEMBLY_BASE.wrapping_add(0xDE28090), GAME_ASSEMBLY_BASE.wrapping_add(0xD8AAEC0),
on_network_state_change, on_network_state_change,
) )
.unwrap(); .unwrap();

View file

@ -4,10 +4,10 @@ use crate::util::GAME_ASSEMBLY_BASE;
use super::{ModuleInitError, NapModule, NapModuleContext}; use super::{ModuleInitError, NapModule, NapModuleContext};
const ON_COMBO_INIT_SUCCESS: usize = 0x1ACAB470; const ON_COMBO_INIT_SUCCESS: usize = 0x1ACA72F0;
const STATICS: usize = 0x5550778; const STATICS: usize = 0x5552100;
const STATIC_ID: usize = 34512; const STATIC_ID: usize = 34512;
const FIELD_OFFSET: usize = 0x40; const FIELD_OFFSET: usize = 64;
pub struct HoyopassPatch; pub struct HoyopassPatch;

View file

@ -6,8 +6,8 @@ use crate::util::{self, import, read_csharp_string};
use super::{ModuleInitError, NapModule, NapModuleContext}; use super::{ModuleInitError, NapModule, NapModuleContext};
const MAKE_INITIAL_URL: usize = 0x1D14BCE0; const MAKE_INITIAL_URL: usize = 0x1D1458E0;
const WEB_REQUEST_CREATE: usize = 0x1CC33EF0; const WEB_REQUEST_CREATE: usize = 0x1CC2D2A0;
pub struct Network; pub struct Network;
@ -37,7 +37,7 @@ unsafe extern "win64" fn on_web_request_create(reg: *mut Registers, _: usize) {
} }
} }
import!(il2cpp_string_new(cstr: *const u8) -> usize = 0x115CCC0); import!(il2cpp_string_new(cstr: *const u8) -> usize = 0x115F1B0);
impl Network { impl Network {
const SDK_URL: &str = "http://127.0.0.1:20100"; const SDK_URL: &str = "http://127.0.0.1:20100";