修复命中（含击杀）音效反馈

Author: Co1Swet

CMakeLists.txt

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

bin/MulNX/CS2Injector/CS2Injector.exe

@@ -44,5 +44,5 @@ Collapsed=0
 
 [Docking][Data]
 DockNode  ID=0x00000001 Pos=543,414 Size=801,517 Selected=0xC6EE3AFB
-DockSpace ID=0x633F05CB Window=0xFB32D03B Pos=0,0 Size=1898,1144 CentralNode=1 Selected=0x5B020FA6
+DockSpace ID=0x633F05CB Window=0xFB32D03B Pos=0,0 Size=1898,1144 CentralNode=1
 

bin/MulNX/CS2Injector/UISystem/Config/MulNXUIConfig.ini

@@ -96,19 +96,19 @@ Size=1920,1080
 Collapsed=0
 
 [Window][UI个性配置]
-Pos=1396,508
+Pos=1508,10
 Size=471,435
 Collapsed=0
 DockId=0x0000000D,0
 
 [Window][摄像机系统]
-Pos=1396,508
+Pos=1508,10
 Size=471,435
 Collapsed=0
 DockId=0x0000000D,2
 
 [Window][游戏设置]
-Pos=1396,508
+Pos=1508,10
 Size=471,435
 Collapsed=0
 DockId=0x0000000D,3
@@ -120,13 +120,13 @@ Collapsed=0
 DockId=0x00000002,3
 
 [Window][MulNX控制]
-Pos=1396,508
+Pos=1508,10
 Size=471,435
 Collapsed=0
 DockId=0x0000000D,10
 
 [Window][首页]
-Pos=1396,508
+Pos=1508,10
 Size=471,435
 Collapsed=0
 DockId=0x0000000D,1
@@ -149,19 +149,19 @@ Size=1159,801
 Collapsed=0
 
 [Window][2D视觉]
-Pos=1396,508
+Pos=1508,10
 Size=471,435
 Collapsed=0
 DockId=0x0000000D,4
 
 [Window][3D视觉]
-Pos=1396,508
+Pos=1508,10
 Size=471,435
 Collapsed=0
 DockId=0x0000000D,5
 
 [Window][镜头参数]
-Pos=1396,508
+Pos=1508,10
 Size=471,435
 Collapsed=0
 DockId=0x0000000D,9
@@ -173,13 +173,13 @@ Collapsed=0
 DockId=0x00000002,4
 
 [Window][视角视图]
-Pos=1396,508
+Pos=1508,10
 Size=471,435
 Collapsed=0
 DockId=0x0000000D,6
 
 [Window][声音控制]
-Pos=1396,508
+Pos=1508,10
 Size=471,435
 Collapsed=0
 DockId=0x0000000D,7
@@ -219,18 +219,18 @@ Collapsed=0
 DockId=0x00000009,0
 
 [Window][音视频]
-Pos=1544,282
+Pos=1541,322
 Size=406,434
 Collapsed=0
 
 [Window][实体列表探测器]
-Pos=1396,508
+Pos=1508,10
 Size=471,435
 Collapsed=0
 DockId=0x0000000D,11
 
 [Window][高级功能]
-Pos=1396,508
+Pos=1508,10
 Size=471,435
 Collapsed=0
 DockId=0x0000000D,8
@@ -291,7 +291,7 @@ DockNode      ID=0x00000003 Pos=183,736 Size=1378,716 Split=X Selected=0x448D10F
 DockNode      ID=0x0000000A Pos=820,750 Size=685,394 Split=X
   DockNode    ID=0x0000000B Parent=0x0000000A SizeRef=1042,407 Selected=0x2D59FDA6
   DockNode    ID=0x0000000C Parent=0x0000000A SizeRef=606,407 Selected=0x4DB1B67D
-DockNode      ID=0x0000000D Pos=1396,508 Size=471,435 Selected=0xC12FA4B6
+DockNode      ID=0x0000000D Pos=1508,10 Size=471,435 Selected=0x8BE9650D
 DockSpace     ID=0x633F05CB Window=0xFB32D03B Pos=0,0 Size=1920,1080 Split=Y Selected=0xC52A91C6
   DockNode    ID=0x00000001 Parent=0x633F05CB SizeRef=1920,39 Selected=0x38DB91B6
   DockNode    ID=0x00000002 Parent=0x633F05CB SizeRef=1920,1039 CentralNode=1

bin/MulNX/CS2InternalHelper/CS2InternalHelper.dll

@@ -10,9 +10,25 @@ bool HitSoundFix::Init() {
         });
 
     this->SubscribeSync("Hook/FireEventClientSide/player_hurt", [this](MulNX::Message& msg) {
-        auto&& [pEvent] = msg.Access<CS2::CGameEvent*>();       
-        this->HandleOnPlayerHurt(pEvent);
+        auto&& [pEvent] = msg.Access<CS2::CGameEvent*>();
+        try {
+            this->HandleOnPlayerHurt(pEvent);
+        }
+        catch (MulNX::Exception& e) {
+            this->LogError(e);
+        }
+        });
+
+    this->SubscribeSync("Hook/FireEventClientSide/player_death", [this](MulNX::Message& msg) {
+        auto&& [pEvent] = msg.Access<CS2::CGameEvent*>();
+        try {
+            this->HandleOnPlayerDeath(pEvent);
+        }
+        catch (MulNX::Exception& e) {
+            this->LogError(e);
+        }
         });
+
     return true;
 }
 
@@ -21,43 +37,93 @@ void HitSoundFix::HandleOnPlayerHurt(CS2::CGameEvent* event) {
     CS2::CKV3MemberName userid{ this->CS2Hashs->userid, -1, nullptr };
     CS2::CKV3MemberName hitgroup{ this->CS2Hashs->hitgroup, -1, nullptr };
 
-    try {
-        auto pOBingPawn = this->CS2->client.TryGetObservingPawn();
-        if (!pOBingPawn)return;
+    auto pOBingPawn = this->CS2->client.TryGetObservingPawn();
+    if (!pOBingPawn)return;
 
-        auto pAttackerPawn = event->GetPlayerPawn(attacker);
-        if (pOBingPawn != pAttackerPawn)return;
+    auto pAttackerPawn = event->GetPlayerPawn(attacker);
+    if (pOBingPawn != pAttackerPawn)return;
 
-        auto pVictimPawn = event->GetPlayerPawn(userid);
-        auto pCCSPlayer_ItemServices = static_cast<CS2::CCSPlayer_ItemServices*>(MulNX::MRead(pVictimPawn->pItemServices()));
+    auto pVictimPawn = event->GetPlayerPawn(userid);
+    auto pCCSPlayer_ItemServices = static_cast<CS2::CCSPlayer_ItemServices*>(MulNX::MRead(pVictimPawn->pItemServices()));
 
-        auto hitgroupValue = event->GetInt(hitgroup);
-        bool hasHelmet = MulNX::MRead(&pCCSPlayer_ItemServices->m_bHasHelmet);
-        auto armorValue = MulNX::MRead(pVictimPawn->m_ArmorValue());
+    auto hitgroupValue = event->GetInt(hitgroup);
+    bool hasHelmet = MulNX::MRead(pVictimPawn->m_bPrevHelmet());
+    auto armorValue = MulNX::MRead(pVictimPawn->m_ArmorValue());
 
-        const char* soundName = nullptr;
+    auto PraseSoundName = [&]()->const char* {
         if (hitgroupValue == 1) {  // 头部
-            soundName = hasHelmet ?
-                "Player.DamageHeadShotArmor.AttackerFeedback" :
-                "Player.DamageHeadShot.AttackerFeedback";
+            if (hasHelmet) {
+                return "Player.DamageHeadShotArmor.AttackerFeedback";
+            }
+            else {
+                return "Player.DamageHeadShot.AttackerFeedback";
+            }
         }
         else {  // 身体/其他部位
             if (armorValue > 0) {
-                soundName = "Player.DamageBodyArmor.AttackerFeedback";
+                return "Player.DamageBodyArmor.AttackerFeedback";
             }
             else {
-                soundName = "Player.DamageBody.AttackerFeedback";
+                return "Player.DamageBody.AttackerFeedback";
             }
             // 将来可以细化 hitgroup 区分四肢、腹部，或根据伤害类型（刀、燃烧）选择
         }
+        };
 
-        if (soundName) {
-            // 参数顺序：声源 = 受害者，过滤实体 = 观战者（即攻击者）
-            this->EmitHurtFeedbackSound(pVictimPawn, nullptr, soundName);
-        }
+    auto soundName = PraseSoundName();
+
+    if (soundName) {
+        // 参数顺序：声源 = 受害者，过滤实体 = 观战者（即攻击者）
+        this->EmitHurtFeedbackSound(pVictimPawn, nullptr, soundName);
     }
-    catch(MulNX::Exception& e) {
-        this->LogError(e);
+
+    return;
+}
+
+void HitSoundFix::HandleOnPlayerDeath(CS2::CGameEvent* event) {
+    CS2::CKV3MemberName attacker{ this->CS2Hashs->attacker, -1, nullptr };
+    CS2::CKV3MemberName userid{ this->CS2Hashs->userid, -1, nullptr };
+    CS2::CKV3MemberName hitgroup{ this->CS2Hashs->hitgroup, -1, nullptr };
+
+    auto pOBingPawn = this->CS2->client.TryGetObservingPawn();
+    if (!pOBingPawn)return;
+
+    auto pAttackerPawn = event->GetPlayerPawn(attacker);
+    if (pOBingPawn != pAttackerPawn)return;
+
+    auto pVictimPawn = event->GetPlayerPawn(userid);
+    auto pCCSPlayer_ItemServices = static_cast<CS2::CCSPlayer_ItemServices*>(MulNX::MRead(pVictimPawn->pItemServices()));
+
+    auto hitgroupValue = event->GetInt(hitgroup);
+    bool hasHelmet = MulNX::MRead(pVictimPawn->m_bPrevHelmet());
+    auto armorValue = MulNX::MRead(pVictimPawn->m_ArmorValue());
+
+    auto PraseSoundName = [&]()->const char* {
+        if (hitgroupValue == 1) {  // 头部
+            if (hasHelmet) {
+                return "Player.DeathHeadShotArmor.AttackerFeedback";
+            }
+            else {
+                return "Player.DeathHeadShot.AttackerFeedback";
+            }
+        }
+        else {  // 身体/其他部位
+            if (armorValue > 0) {
+                return "Player.DeathBodyArmor.AttackerFeedback";
+            }
+            else {
+                return "Player.DeathBody.AttackerFeedback";
+            }
+            // 将来可以细化 hitgroup 区分四肢、腹部，或根据伤害类型（刀、燃烧）选择
+        }
+        };
+
+    auto soundName = PraseSoundName();
+
+    if (soundName) {
+        // 参数顺序：声源 = 受害者，过滤实体 = 观战者（即攻击者）
+        this->EmitHurtFeedbackSound(pVictimPawn, nullptr, soundName);
     }
+
     return;
 }

bin/MulNX/CS2OBTool/CS2OBTool.dll

@@ -6,5 +6,6 @@ class HitSoundFix final :public CSModuleBase {
     using EmitHurtFeedbackSound_t = void(*)(CS2::C_CSPlayerPawn* pSourcePawn, CS2::C_CSPlayerPawn* pListenerPawn, const char* soundName);
     EmitHurtFeedbackSound_t EmitHurtFeedbackSound = nullptr;
     void HandleOnPlayerHurt(CS2::CGameEvent* event);
+    void HandleOnPlayerDeath(CS2::CGameEvent* event);
     bool Init()override;
 };