mirror of
https://github.com/YimMenu/YimMenuV2.git
synced 2026-10-11 09:48:08 +08:00
Merge branch 'enhanced' of https://github.com/YimMenu/YimMenuV2 into enhanced
This commit is contained in:
commit
e18f937039
4 files changed
+40
-40
No files matched your search
@@ -69,8 +69,8 @@ namespace YimMenu
|
||||
}
|
||||
|
||||
ImU32 defaultIconColor = IM_COL32(255, 255, 255, 255);
|
||||
ImU32 activeIconColor = IM_COL32(120, 90, 160, 255);
|
||||
ImU32 hoveredIconColor = IM_COL32(90, 70, 120, 255);
|
||||
ImU32 activeIconColor = IM_COL32(46, 204, 113, 255); // GTA green
|
||||
ImU32 hoveredIconColor = IM_COL32(36, 174, 93, 255); // Darker hover
|
||||
|
||||
ImU32 iconColor = submenu == m_ActiveSubmenu ? activeIconColor : (ImGui::IsItemHovered() ? hoveredIconColor : defaultIconColor);
|
||||
|
||||
@@ -81,8 +81,8 @@ namespace YimMenu
|
||||
ImGui::PopFont();
|
||||
|
||||
ImU32 defaultTextColor = IM_COL32(255, 255, 255, 255);
|
||||
ImU32 activeTextColor = IM_COL32(120, 90, 160, 255);
|
||||
ImU32 hoveredTextColor = IM_COL32(90, 70, 120, 255);
|
||||
ImU32 activeTextColor = IM_COL32(46, 204, 113, 255); // GTA green
|
||||
ImU32 hoveredTextColor = IM_COL32(36, 174, 93, 255); // Darker hover
|
||||
|
||||
ImU32 textColor = submenu == m_ActiveSubmenu ? activeTextColor : (ImGui::IsItemHovered() ? hoveredTextColor : defaultTextColor);
|
||||
|
||||
@@ -154,4 +154,4 @@ namespace YimMenu
|
||||
|
||||
return nullptr;
|
||||
}
|
||||
}
|
||||
}
|
||||
+13
-13
@@ -66,29 +66,29 @@ namespace YimMenu
|
||||
|
||||
style.Colors[ImGuiCol_Border] = ImVec4(0.28f, 0.28f, 0.28f, 0.25f);
|
||||
style.Colors[ImGuiCol_FrameBg] = ImVec4(0.15f, 0.15f, 0.17f, 1.00f);
|
||||
style.Colors[ImGuiCol_FrameBgHovered] = ImVec4(0.40f, 0.30f, 0.50f, 0.75f);
|
||||
style.Colors[ImGuiCol_FrameBgActive] = ImVec4(0.45f, 0.35f, 0.60f, 0.85f);
|
||||
style.Colors[ImGuiCol_FrameBgHovered] = ImVec4(0.35f, 0.59f, 0.35f, 0.75f);
|
||||
style.Colors[ImGuiCol_FrameBgActive] = ImVec4(0.47f, 0.75f, 0.47f, 0.85f);
|
||||
|
||||
style.Colors[ImGuiCol_Button] = ImVec4(0.40f, 0.30f, 0.50f, 1.00f);
|
||||
style.Colors[ImGuiCol_ButtonHovered] = ImVec4(0.50f, 0.40f, 0.60f, 1.00f);
|
||||
style.Colors[ImGuiCol_ButtonActive] = ImVec4(0.60f, 0.45f, 0.70f, 1.00f);
|
||||
style.Colors[ImGuiCol_Button] = ImVec4(0.35f, 0.59f, 0.35f, 1.00f);
|
||||
style.Colors[ImGuiCol_ButtonHovered] = ImVec4(0.40f, 0.65f, 0.40f, 1.00f);
|
||||
style.Colors[ImGuiCol_ButtonActive] = ImVec4(0.47f, 0.75f, 0.47f, 1.00f);
|
||||
|
||||
style.Colors[ImGuiCol_TitleBg] = ImVec4(0.06f, 0.06f, 0.07f, 1.00f);
|
||||
style.Colors[ImGuiCol_TitleBgActive] = ImVec4(0.09f, 0.09f, 0.11f, 1.00f);
|
||||
style.Colors[ImGuiCol_TitleBgCollapsed] = ImVec4(0.04f, 0.04f, 0.05f, 1.00f);
|
||||
|
||||
style.Colors[ImGuiCol_Tab] = ImVec4(0.35f, 0.30f, 0.45f, 0.85f);
|
||||
style.Colors[ImGuiCol_TabHovered] = ImVec4(0.50f, 0.40f, 0.60f, 0.85f);
|
||||
style.Colors[ImGuiCol_TabActive] = ImVec4(0.60f, 0.45f, 0.70f, 1.00f);
|
||||
style.Colors[ImGuiCol_Tab] = ImVec4(0.30f, 0.55f, 0.30f, 0.85f);
|
||||
style.Colors[ImGuiCol_TabHovered] = ImVec4(0.40f, 0.65f, 0.40f, 0.85f);
|
||||
style.Colors[ImGuiCol_TabActive] = ImVec4(0.47f, 0.75f, 0.47f, 1.00f);
|
||||
|
||||
style.Colors[ImGuiCol_Header] = ImVec4(0.30f, 0.25f, 0.40f, 1.00f);
|
||||
style.Colors[ImGuiCol_HeaderHovered] = ImVec4(0.45f, 0.35f, 0.60f, 1.00f);
|
||||
style.Colors[ImGuiCol_HeaderActive] = ImVec4(0.55f, 0.40f, 0.65f, 1.00f);
|
||||
style.Colors[ImGuiCol_Header] = ImVec4(0.30f, 0.50f, 0.30f, 1.00f);
|
||||
style.Colors[ImGuiCol_HeaderHovered] = ImVec4(0.40f, 0.65f, 0.40f, 1.00f);
|
||||
style.Colors[ImGuiCol_HeaderActive] = ImVec4(0.47f, 0.75f, 0.47f, 1.00f);
|
||||
|
||||
style.Colors[ImGuiCol_PlotLines] = ImVec4(0.80f, 0.80f, 0.00f, 0.00f);
|
||||
style.Colors[ImGuiCol_PlotLinesHovered] = ImVec4(1.00f, 0.85f, 0.00f, 1.00f);
|
||||
style.Colors[ImGuiCol_PlotHistogram] = ImVec4(0.40f, 0.30f, 0.50f, 1.00f);
|
||||
style.Colors[ImGuiCol_PlotHistogramHovered] = ImVec4(0.60f, 0.45f, 0.70f, 1.00f);
|
||||
style.Colors[ImGuiCol_PlotHistogram] = ImVec4(0.35f, 0.59f, 0.35f, 1.00f);
|
||||
style.Colors[ImGuiCol_PlotHistogramHovered] = ImVec4(0.47f, 0.75f, 0.47f, 1.00f);
|
||||
|
||||
style.GrabRounding = style.FrameRounding = style.ChildRounding = style.WindowRounding = 8.0f;
|
||||
}
|
||||
|
||||
@@ -360,7 +360,7 @@ namespace YimMenu
|
||||
SetJoinRequestPoolTypePatch = BytePatches::Add(ptr.Sub(5).As<std::uint8_t*>(), std::to_array<std::uint8_t>({0xB8, 0x00, 0x00, 0x00, 0x00}));
|
||||
});
|
||||
|
||||
constexpr auto handleJoinRequestIgnorePoolPatchPtrn = Pattern<"41 83 FF 05 ? 30 43">("HandleJoinRequestIgnorePoolPatch");
|
||||
constexpr auto handleJoinRequestIgnorePoolPatchPtrn = Pattern<"83 FD 05 ? ? ? 00 00 00 48 8B">("HandleJoinRequestIgnorePoolPatch");
|
||||
scanner.Add(handleJoinRequestIgnorePoolPatchPtrn, [this](PointerCalculator ptr) {
|
||||
HandleJoinRequestIgnorePoolPatch = BytePatches::Add(ptr.Add(4).As<std::uint8_t*>(), 0xEB);
|
||||
});
|
||||
@@ -395,7 +395,7 @@ namespace YimMenu
|
||||
GameSkeleton = ptr.Add(0x9).Add(3).Rip().As<rage::gameSkeleton*>();
|
||||
});
|
||||
|
||||
constexpr auto SetExplosiveAmmoOnlinePatchPtrn = Pattern<"48 83 EC 28 80 3D ? ? ? ? 00 0F 85 ? ? ? ? E9 ? ? ? ? 48 8B 45 28">("SetExplosiveAmmoOnlinePatch");
|
||||
constexpr auto SetExplosiveAmmoOnlinePatchPtrn = Pattern<"48 83 EC 28 80 3D ? ? ? ? 00 0F 85 ? ? ? ? E9 ? ? ? ? 56 57 53 48 81 EC B0 00 00 00">("SetExplosiveAmmoOnlinePatch");
|
||||
scanner.Add(SetExplosiveAmmoOnlinePatchPtrn, [this](PointerCalculator ptr) {
|
||||
BytePatches::Add(ptr.Add(0xB).As<std::uint16_t*>(), 0x04EB)->Apply();
|
||||
});
|
||||
|
||||
@@ -30,24 +30,24 @@
|
||||
return glb.As<str*>(); \
|
||||
}
|
||||
|
||||
DEFINE_GLOBAL_ACCESSOR(GlobalPlayerBD, 2657994);
|
||||
DEFINE_GLOBAL_ACCESSOR(GPBD_FM, 1845270);
|
||||
DEFINE_GLOBAL_ACCESSOR(GPBD_FM_2, 1882925);
|
||||
DEFINE_GLOBAL_ACCESSOR(GPBD_FM_3, 1887694);
|
||||
DEFINE_GLOBAL_ACCESSOR(GPBD_Flow, 1977875);
|
||||
DEFINE_GLOBAL_ACCESSOR(GPBD_Kicking, 1874328);
|
||||
DEFINE_GLOBAL_ACCESSOR(GPBD_MissionName, 1873815);
|
||||
DEFINE_GLOBAL_ACCESSOR(GSBD, 2648917);
|
||||
DEFINE_GLOBAL_ACCESSOR(GSBD_BlockB, 2650415);
|
||||
DEFINE_GLOBAL_ACCESSOR(GSBD_FM, 1835557);
|
||||
DEFINE_GLOBAL_ACCESSOR(GSBD_FM_Events, 1917230);
|
||||
DEFINE_GLOBAL_ACCESSOR(GSBD_Kicking, 1877529);
|
||||
DEFINE_GLOBAL_ACCESSOR(GSBD_PropertyInstances, 1937699);
|
||||
DEFINE_GLOBAL_ACCESSOR(g_AMC_playerBD, 2699624);
|
||||
DEFINE_GLOBAL_ACCESSOR(GSBD_RandomEvents, 1882524);
|
||||
DEFINE_GLOBAL_ACCESSOR(MPSV, 1586543);
|
||||
DEFINE_GLOBAL_ACCESSOR(GlobalPlayerBD, 2658019);
|
||||
DEFINE_GLOBAL_ACCESSOR(GPBD_FM, 1845274);
|
||||
DEFINE_GLOBAL_ACCESSOR(GPBD_FM_2, 1845274);
|
||||
DEFINE_GLOBAL_ACCESSOR(GPBD_FM_3, 1888882);
|
||||
DEFINE_GLOBAL_ACCESSOR(GPBD_Flow, 1980192);
|
||||
DEFINE_GLOBAL_ACCESSOR(GPBD_Kicking, 1873852);
|
||||
DEFINE_GLOBAL_ACCESSOR(GPBD_MissionName, 1873339);
|
||||
DEFINE_GLOBAL_ACCESSOR(GSBD, 2648932);
|
||||
DEFINE_GLOBAL_ACCESSOR(GSBD_BlockB, 2650431);
|
||||
DEFINE_GLOBAL_ACCESSOR(GSBD_FM, 1845274);
|
||||
DEFINE_GLOBAL_ACCESSOR(GSBD_FM_Events, 1918514);
|
||||
DEFINE_GLOBAL_ACCESSOR(GSBD_Kicking, 1877053);
|
||||
DEFINE_GLOBAL_ACCESSOR(GSBD_PropertyInstances, 1939705);
|
||||
DEFINE_GLOBAL_ACCESSOR(g_AMC_playerBD, 2699749);
|
||||
DEFINE_GLOBAL_ACCESSOR(GSBD_RandomEvents, 1882048);
|
||||
DEFINE_GLOBAL_ACCESSOR(MPSV, 1586547);
|
||||
DEFINE_GLOBAL_ACCESSOR(g_SavedMPGlobals, 2359296);
|
||||
DEFINE_GLOBAL_ACCESSOR(FreemodeGeneral, 2739945);
|
||||
DEFINE_GLOBAL_ACCESSOR(DailyObjectivesState, 1574744);
|
||||
DEFINE_GLOBAL_ACCESSOR(WeeklyChallenge, 2738999);
|
||||
DEFINE_GLOBAL_ACCESSOR(FreemodeDelivery, 1950961);
|
||||
DEFINE_GLOBAL_ACCESSOR(FreemodeGeneral, 2740191);
|
||||
DEFINE_GLOBAL_ACCESSOR(DailyObjectivesState, 1574745);
|
||||
DEFINE_GLOBAL_ACCESSOR(WeeklyChallenge, 2739243);
|
||||
DEFINE_GLOBAL_ACCESSOR(FreemodeDelivery, 1953035);
|
||||
Reference in new issue
Block a user