fix: lazy initializing - can't get class from `*` namespace
This commit is contained in:
parent
77fc61d9da
commit
573bfb870a
|
@ -98,7 +98,7 @@ namespace GakumasLocal::HookMain {
|
||||||
UnityResolve::UnityType::Transform* cameraTransformCache = nullptr;
|
UnityResolve::UnityType::Transform* cameraTransformCache = nullptr;
|
||||||
void CheckAndUpdateMainCamera() {
|
void CheckAndUpdateMainCamera() {
|
||||||
if (!Config::enableFreeCamera) return;
|
if (!Config::enableFreeCamera) return;
|
||||||
if (IsNativeObjectAlive(mainCameraCache)) return;
|
if (IsNativeObjectAlive(mainCameraCache) && IsNativeObjectAlive(cameraTransformCache)) return;
|
||||||
|
|
||||||
mainCameraCache = UnityResolve::UnityType::Camera::GetMain();
|
mainCameraCache = UnityResolve::UnityType::Camera::GetMain();
|
||||||
cameraTransformCache = mainCameraCache->GetTransform();
|
cameraTransformCache = mainCameraCache->GetTransform();
|
||||||
|
|
|
@ -619,9 +619,27 @@ private:
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static auto GetPClassFromUnknownNamespace(void* image, const char* klassName) -> void* {
|
||||||
|
const auto count = Invoke<int>("il2cpp_image_get_class_count", image);
|
||||||
|
for (auto i = 0; i < count; i++) {
|
||||||
|
const auto pClass = Invoke<void*>("il2cpp_image_get_class", image, i);
|
||||||
|
const auto className = Invoke<const char*>("il2cpp_class_get_name", pClass);
|
||||||
|
if (strcmp(className, klassName) == 0) {
|
||||||
|
return pClass;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nullptr;
|
||||||
|
}
|
||||||
|
|
||||||
static auto FillClass_Il2ccpp(Assembly* assembly, const char* namespaze, const char* klassName) -> Class* {
|
static auto FillClass_Il2ccpp(Assembly* assembly, const char* namespaze, const char* klassName) -> Class* {
|
||||||
auto image = Invoke<void*>("il2cpp_assembly_get_image", assembly->address);
|
auto image = Invoke<void*>("il2cpp_assembly_get_image", assembly->address);
|
||||||
const auto pClass = Invoke<void*>("il2cpp_class_from_name", image, namespaze, klassName);
|
void* pClass;
|
||||||
|
if (strcmp(namespaze, "*") == 0) {
|
||||||
|
pClass = GetPClassFromUnknownNamespace(image, klassName);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
pClass = Invoke<void*>("il2cpp_class_from_name", image, namespaze, klassName);
|
||||||
|
}
|
||||||
if (pClass == nullptr) return nullptr;
|
if (pClass == nullptr) return nullptr;
|
||||||
const auto pAClass = new Class();
|
const auto pAClass = new Class();
|
||||||
pAClass->address = pClass;
|
pAClass->address = pClass;
|
||||||
|
|
Loading…
Reference in New Issue