B0.3.0C0.47.4适配CS2

Author: Co1Swet

CMakeLists.txt

@@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.31)
 project("MulNX_CS2")
 
 # 版本定义
-add_compile_definitions(MulNXVersion="B0.3.0C0.47.3")
+add_compile_definitions(MulNXVersion="B0.3.0C0.47.4")
 
 # 启用 LTO（仅 Release 配置）
 include(CheckIPOSupported)

bin/MulNX/CS2Injector/CS2Injector.exe

@@ -86,7 +86,7 @@ void StartImpl(HMODULE& hModule) {
             // CS2 声音功能模块
             .CreateModule<SpeakingController>("SpeakingController")
             .CreateModule<HitSoundFix>("HitSoundFix")
-            //.CreateModule<SoundCircleFix>("SoundCircleFix")
+            .CreateModule<SoundCircleFix>("SoundCircleFix")
 
             // CS2 Demo 相关模块
             .CreateModule<HookDemo>("HookDemo")
@@ -128,7 +128,7 @@ void StartImpl(HMODULE& hModule) {
         if (MulNXInfo::IsDebugVersion) {
             auto pHookConsole = core->ModuleManager()->FindModule<HookConsole>("HookConsole");
             auto [msg, rp] = MulNX::Message::Create<MulNX::NetExt>("Demo/Play"_hash);
-            rp->str1 = "111";
+            rp->str1 = "1234";
             pHookConsole->PublishAsync(std::move(msg));
             std::thread([]() {
                 MessageBoxW(NULL, L"MulNX 注入成功！", L"MulNX", MB_OK | MB_ICONINFORMATION);

bin/MulNX/CS2InternalHelper/CS2InternalHelper.dll

@@ -18,7 +18,6 @@ bool BombSpotController::Init() {
                 if (MulNX::MRead(pOBing->iTeamNum()) == CS2::ui8TeamNum::CT) {
                     *(int*)ctx->rdx = IM_COL32(255, 0, 0, 255);// -16776961 red
                 }
-                // ToDo: 在雷包掉落且正在观战T方成员时修改为白色
             }
             catch (...) {
 
@@ -27,7 +26,37 @@ bool BombSpotController::Init() {
             }).value();
         this->hkPos_Spot_WriteBombState->Attach();
         this->LogSucc(I18n("hook.attached", "Pos_Spot_WriteBombState where rdx is BombColor*"));
+
+        // auto Pos_CallGetPawnMaybeSetAllHUD = this->CS2->client.GetTextRegion().FindRegion(MulNX::CS2::Signatures::Spot::Pos_CallGetPawnMaybeSetAllHUD).Data();
+        // this->hkPos_CallGetPawnMaybeSetAllHUD = this->CreateHook("Pos_CallGetPawnMaybeSetAllHUD", Pos_CallGetPawnMaybeSetAllHUD + 14, [this](MulNX::Hook* hk, RegContext* ctx) {
+        //     if (!this->runFlag2.load())return MulNX::Hook::Then::Continue;
+        //     auto pOBing = this->CS2->client.TryGetObservingPawn();
+        //     auto pRet = (CS2::C_BaseEntity*)ctx->rax;
+        //     //auto name = pRet->GetName();
+        //     if (pOBing)ctx->rax = (uint64_t)pOBing;
+        //     return MulNX::Hook::Then::Continue;
+        //     }).value();
+        // this->hkPos_CallGetPawnMaybeSetAllHUD.Attach();
+
+        // auto testpos = this->CS2->client.GetBaseAddress() + 0xBA3546;
+        // static auto testhk = MulNX::Hook::Create((uint8_t*)testpos, [](MulNX::Hook*, RegContext* ctx) {
+        //     // r13 指向声音事件结构体，其第一个 QWORD 就是字符串指针
+        //     char* pStr = *(char**)(ctx->r13);
+        //     if (pStr) {
+        //         std::string teststr(pStr);
+        //         MessageBoxA(NULL, pStr, pStr, MB_OK);
+        //         if (teststr.find("Step") != std::string::npos) { // 注意大小写
+                    
+        //         }
+        //     }
+        //     return MulNX::Hook::Then::Continue;
+        //     }, true).value();
+        // testhk->Attach();
+        
         });
+    this->runFlag2 = true;
+
+
 
     this->SendUINode(this->GetName(), [this](MulNX::UINode* node) {return this->Menu(node);});
 

bin/MulNX/CS2OBTool/CS2OBTool.dll

@@ -3,7 +3,7 @@
 
 class BombSpotController :public CSViewPlayerModuleBase {
     std::unique_ptr<MulNX::Hook>hkPos_Spot_WriteBombState = nullptr;
+    WrapHook hkPos_CallGetPawnMaybeSetAllHUD{};
     void Menu(MulNX::UINode* node);
-public:
     bool Init()override;
 };

bin/MulNX/Log/Log_CS2Injector.txt

@@ -34,6 +34,8 @@ namespace MulNX {
                 inline const static MulNX::Memory::Pattern PosCallCmpDrawFlashDownHUD("84 C0 74 4C 8B 85 B0 02 00 00 49 8D 8D 48 03 00 00");
             }
             namespace Spot {
+                inline const static MulNX::Memory::Pattern Pos_CallGetPawnMaybeSetAllHUD("44 0F 29 9C 24 80 00 00 00 E8 ?? ?? ?? ?? 0F B6 BB 60 77 01 00 48 8B F0 41 BE 80 00 00 00");
+
                 inline const static MulNX::Memory::Pattern Pos_CmpToSetShow("38 5C 24 ?? 0F 84 ?? ?? ?? ?? 48 8B 0D ?? ?? ?? ?? F3 41 0F 10 8E ?? ?? ?? ?? F3 0F 10 41");// 从cvar定位
                 inline const static MulNX::Memory::Pattern Pos_WriteMaybeEnumToChangeRadarPlayerDraw("48 8B 6C 24 ?? 41 39 9E ?? ?? ?? ?? 74 ?? 33 D2");// 交叉引用
                 inline const static MulNX::Memory::Pattern Func_FinallyUpdatePlayerState("44 8B F2 41 81 E6 FF FF FF ?? 8B D8 41 33 DE");// 交叉引用
@@ -54,7 +56,7 @@ namespace MulNX {
             }
             namespace Sound {
                 inline const static MulNX::Memory::Pattern EmitHurtFeedbackSound("48 89 5C 24 ?? 48 89 6C 24 ?? 48 89 74 24 ?? 57 48 81 EC ?? ?? ?? ?? 49 8B E8");
-                inline const static MulNX::Memory::Pattern Pos_CallGetPawnUpdateCirclePos("48 85 C0 0F 84 ?? ?? 00 00 48 89 6C 24 40 48 8D 54 24");
+                inline const static MulNX::Memory::Pattern Pos_CallGetPawnUpdateCirclePos("48 85 C0 0F 84 ?? ?? 00 00 48 89 6C 24 ?? 48 8D 54 24 ?? 48 89 74 24 ?? 48 8B C8");
                 inline const static MulNX::Memory::Pattern Pos_CallGetPawnMaybeLocalPawnsAsyncSoundEnque("48 3B C3 75 1A 0F 28 DE");
                 inline const static MulNX::Memory::Pattern Pos_CallGetPawnMaybeOtherAsyncSoundEnque("48 3B C6 0F 85 ?? ?? ?? ?? 0F 28 DE");
             }