新增玩家语音控制功能

Co1Swet · Co1Swet · commit f96f69a0a4d3 · 2026-06-08T19:18:54.000+08:00
UI开关快捷键配置外部化
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.31)
 project("MulNX_CS2")
 
 # 版本定义
-add_compile_definitions(MulNXVersion="B0.2.0C0.33.1")
+add_compile_definitions(MulNXVersion="B0.2.0C0.34.0")
 
 # 启用 LTO（仅 Release 配置）
 include(CheckIPOSupported)
diff --git a/bin/MulNX/CS2Injector/CS2Injector.exe b/bin/MulNX/CS2Injector/CS2Injector.exe
diff --git a/bin/MulNX/CS2InternalHelper/CS2InternalHelper.dll b/bin/MulNX/CS2InternalHelper/CS2InternalHelper.dll
diff --git a/bin/MulNX/CS2OBTool/CS2OBTool.dll b/bin/MulNX/CS2OBTool/CS2OBTool.dll
diff --git a/bin/MulNX/CS2OBTool/ShortcutManager/Config/shortcut.yaml b/bin/MulNX/CS2OBTool/ShortcutManager/Config/shortcut.yaml
@@ -59,4 +59,14 @@ binds:
       shift: false
       alt: true
       vkCode: 84
+      comboClick: 1
+    
+  - desc: "切换UI显示（Insert）"
+    msg: "UISystem/Toggle"
+    KCP:
+      usable: true
+      ctrl: false
+      shift: false
+      alt: false
+      vkCode: 45
       comboClick: 1
diff --git a/bin/MulNX/CS2OBTool/UISystem/Config/MulNXUIConfig.ini b/bin/MulNX/CS2OBTool/UISystem/Config/MulNXUIConfig.ini
@@ -15,8 +15,8 @@ Collapsed=0
 DockId=0x00000006,3
 
 [Window][玩家信息管理]
-Pos=566,797
-Size=739,649
+Pos=38,69
+Size=1536,751
 Collapsed=0
 DockId=0x0000000B,0
 
@@ -26,8 +26,8 @@ Size=1176,746
 Collapsed=0
 
 [Window][投掷物追踪器]
-Pos=1307,797
-Size=145,649
+Pos=1576,69
+Size=302,751
 Collapsed=0
 DockId=0x0000000C,0
 
@@ -237,18 +237,24 @@ Size=373,530
 Collapsed=0
 DockId=0x00000001,7
 
+[Window][语音控制]
+Pos=1576,69
+Size=302,751
+Collapsed=0
+DockId=0x0000000C,1
+
 [Docking][Data]
 DockNode      ID=0x00000003 Pos=289,175 Size=1569,884 Split=X Selected=0x448D10F7
   DockNode    ID=0x00000004 Parent=0x00000003 SizeRef=839,992 Selected=0x1A0AB2F3
   DockNode    ID=0x00000007 Parent=0x00000003 SizeRef=723,992 Split=Y Selected=0x3C0020BC
     DockNode  ID=0x00000008 Parent=0x00000007 SizeRef=725,686 Selected=0x3C0020BC
     DockNode  ID=0x00000009 Parent=0x00000007 SizeRef=725,196 Selected=0x8538678F
-DockNode      ID=0x0000000A Pos=566,797 Size=886,649 Split=X
+DockNode      ID=0x0000000A Pos=38,69 Size=1840,751 Split=X
   DockNode    ID=0x0000000B Parent=0x0000000A SizeRef=376,407 Selected=0x2D59FDA6
-  DockNode    ID=0x0000000C Parent=0x0000000A SizeRef=74,407 Selected=0x377637FC
+  DockNode    ID=0x0000000C Parent=0x0000000A SizeRef=74,407 Selected=0x1268A16B
 DockSpace     ID=0x633F05CB Window=0xFB32D03B Pos=0,350 Size=1920,530 Split=X
   DockNode    ID=0x00000001 Parent=0x633F05CB SizeRef=373,529 Selected=0x7773E0DE
   DockNode    ID=0x00000002 Parent=0x633F05CB SizeRef=1545,529 Split=X
     DockNode  ID=0x00000005 Parent=0x00000002 SizeRef=1175,1024 CentralNode=1 Selected=0x8BE9650D
-    DockNode  ID=0x00000006 Parent=0x00000002 SizeRef=368,1024 Selected=0x8BE9650D
+    DockNode  ID=0x00000006 Parent=0x00000002 SizeRef=368,1024 Selected=0xA0EA48CF
 
diff --git a/bin/MulNX/Log/Log_CS2Injector.txt b/bin/MulNX/Log/Log_CS2Injector.txt
diff --git a/bin/MulNX/Log/Log_CS2OBTool.txt b/bin/MulNX/Log/Log_CS2OBTool.txt
diff --git a/source/MulNX/Systems/UISystem/UISystem.cpp b/source/MulNX/Systems/UISystem/UISystem.cpp
@@ -1,13 +1,10 @@
 #include "UISystem.hpp"
-
 #include <MulNX/Base/CharUtility/CharUtility.hpp>
 #include <MulNX/Base/UI/UI.hpp>
 #include <MulNX/Core/Core.hpp>
 #include <MulNX/Systems/PathManager/PathManager.hpp>
 #include <MulNX/Systems/I18nManager/I18nManager.hpp>
 #include <MulNX/Systems/MessageManager/MessageManager.hpp>
-#include <MulNX/Systems/InputSystem/InputSystem.hpp>
-#include <MulNX/Systems/GlobalVars/GlobalVars.hpp>
 #include <yaml-cpp/yaml.h>
 #include <MulNXThirdParty/ImGuiStyleSerializer.h>
 #include <Windows.h>
@@ -27,6 +24,7 @@ bool MulNX::UISystem::Init() {
     this->UIContext.Core = this->Core;
     this->ISys()
         .SubscribeAsync("UISystem/Start")
+        .SubscribeAsync("UISystem/Toggle")
         .SubscribeAsync("UISystem/ModulePush")
         .SubscribeAsync("UISystem/SaveStyle");
 
@@ -55,6 +53,10 @@ void MulNX::UISystem::ProcessMsg(MulNX::Message& Msg) {
         io.ConfigFlags |= ImGuiConfigFlags_DockingEnable;
         break;
     }
+    case "UISystem/Toggle"_hash: {
+        this->UIContext.Active = !this->UIContext.Active;
+        break;
+    }
     case "UISystem/ModulePush"_hash: {
         MulNX::UINode* node = Msg.asp.get<MulNX::UINode>();
         this->UIContext.AddUINode(node->hSelf, std::move(*node));
@@ -70,10 +72,6 @@ void MulNX::UISystem::ProcessMsg(MulNX::Message& Msg) {
 
 void MulNX::UISystem::HandleUpdate() {
     this->Update();
-    if (!this->UISystemRunning)return;
-    if (this->pInputSystem->CheckComboClick(VK_INSERT, 1)) {
-        this->UIContext.Active = !this->UIContext.Active;
-    }
 }
 
 // ImGui窗口处理函数导入
diff --git a/source/MulNXExtensions/CS2/CSController/CSController.cpp b/source/MulNXExtensions/CS2/CSController/CSController.cpp
@@ -1,5 +1,6 @@
 #include "CSController.hpp"
 #include <MulNX/Base/UI/UI.hpp>
+#include <MulNXExtensions/CS2/CSModuleBase.hpp>
 #include <MulNXThirdParty/All_cs2_dumper.hpp>
 
 void CSController::Window(MulNX::UINode* node) {
@@ -202,6 +203,9 @@ void CSController::Main() {
     std::unique_lock lock(this->smutex);
     // 玩家控制器，地图上从1到10
     int playerNum = 0;
+    for (const auto& mod : this->ParticipateItCSModules) {
+        mod->OnItBegin();
+    }
     for (int i = 0; i < this->client.dwGameEntitySystem_highestEntityIndex(); ++i) {
         auto* entity = this->client.GetBaseEntity(i);
         if (!entity)continue;
@@ -215,8 +219,8 @@ void CSController::Main() {
         if (team != CS2::ui8TeamNum::T && team != CS2::ui8TeamNum::CT)continue;
         ++playerNum;
 
-        for (const auto& handle : this->handlesControlPlayer) {
-            handle(controller, pawn);
+        for (const auto& mod : this->ParticipateItCSModules) {
+            mod->OnItPlayer(i, controller, pawn);
         }
         //MulNX::MWrite(pawn->m_entitySpottedState()->m_bSpotted(), true);
 
@@ -233,6 +237,10 @@ void CSController::Main() {
 
 
     }
+    for (const auto& mod : this->ParticipateItCSModules) {
+        mod->OnItEnd();
+    }
+
     return;
 }
 
diff --git a/source/MulNXExtensions/CS2/CSController/CSController.hpp b/source/MulNXExtensions/CS2/CSController/CSController.hpp
@@ -62,7 +62,6 @@ class CSController final :public MulNX::ModuleBase {
     void OnTier0Load(MulNX::Message& msg);
     void OnPanoramaLoad(MulNX::Message& msg);
 public:
-    std::vector<std::function<bool(CS2::CCSPlayerController*, CS2::C_CSPlayerPawn*)>>handlesControlPlayer{};
     std::vector<class ICSModule*>ParticipateItCSModules{};
 
     CS2::Module::Client client{};
diff --git a/source/MulNXExtensions/CS2/CSModuleBase.hpp b/source/MulNXExtensions/CS2/CSModuleBase.hpp
@@ -15,8 +15,8 @@ class ICSModule {
     ~ICSModule() = default;
 
     virtual void OnItBegin() {};
-    virtual void OnItEntity(CS2::C_BaseEntity*) {};
-    virtual void OnItPlayer(CS2::CCSPlayerController*, CS2::C_CSPlayerPawn*) {};
+    virtual void OnItEntity(int index, CS2::C_BaseEntity*) {};
+    virtual void OnItPlayer(int index, CS2::CCSPlayerController*, CS2::C_CSPlayerPawn*) {};
     virtual void OnItEnd() {};
 };
 
diff --git a/source/MulNXExtensions/CS2/PlayerFlashController/PlayerFlashController.cpp b/source/MulNXExtensions/CS2/PlayerFlashController/PlayerFlashController.cpp
@@ -1,20 +1,18 @@
 #include "PlayerFlashController.hpp"
 #include <MulNX/Base/UI/UI.hpp>
 
-
 bool PlayerFlashController::Menu(MulNX::UINode* node) {
     MulNX::UI::Checkbox("强制移除闪光效果", this->bForceNoFlash);
     return true;
 }
 
 bool PlayerFlashController::Init() {
     this->ISys().SendUINode(this->GetName(), [this](MulNX::UINode* node) {return this->Menu(node);});
-    this->CS2->handlesControlPlayer.push_back([this](CS2::CCSPlayerController* controller, CS2::C_CSPlayerPawn* pawn) {return this->HandleForceFlash(controller, pawn);});
     return true;
 }
 
-bool PlayerFlashController::HandleForceFlash(CS2::CCSPlayerController* controller, CS2::C_CSPlayerPawn* pawn) {
-    if (!this->bForceNoFlash.load(std::memory_order_acquire))return true;
+void PlayerFlashController::OnItPlayer(int index, CS2::CCSPlayerController* controller, CS2::C_CSPlayerPawn* pawn) {
+    if (!this->bForceNoFlash.load(std::memory_order_acquire))return;
     try {
         auto m_flFlashBangTime = MulNX::MRead(pawn->m_flFlashBangTime());
         auto m_flFlashDuration = MulNX::MRead(pawn->m_flFlashDuration());
@@ -35,5 +33,5 @@ bool PlayerFlashController::HandleForceFlash(CS2::CCSPlayerController* controlle
         this->ISys().LogWarning(std::format("在修改闪光弹效果时发生错误：{}", e.what()).c_str());
     }
 
-    return true;
+    return;
 }
diff --git a/source/MulNXExtensions/CS2/PlayerFlashController/PlayerFlashController.hpp b/source/MulNXExtensions/CS2/PlayerFlashController/PlayerFlashController.hpp
@@ -1,12 +1,13 @@
 #pragma once
 #include <MulNXExtensions/CS2/CSModuleBase.hpp>
 
-class PlayerFlashController final :public CSModuleBase {
+class PlayerFlashController final :public CSModuleBaseT<PlayerFlashController> {
     static constexpr bool ParticipateIt = true;
 private:
     std::atomic<bool>bForceNoFlash = false;
+    void OnItPlayer(int index, CS2::CCSPlayerController* controller, CS2::C_CSPlayerPawn* pawn)override;
 public:
     bool Init()override;
     bool Menu(MulNX::UINode* node);
-    bool HandleForceFlash(CS2::CCSPlayerController* controller, CS2::C_CSPlayerPawn* pawn);
+    
 };
diff --git a/source/MulNXExtensions/CS2/PlayerHub/CSViewPlayerModuleBase.hpp b/source/MulNXExtensions/CS2/PlayerHub/CSViewPlayerModuleBase.hpp
@@ -4,9 +4,9 @@
 class ICSViewPlayerModule {
 public:
     virtual ~ICSViewPlayerModule() = default;
-    virtual void Player(MulNX::UINode* node) {};
-    virtual void Team(MulNX::UINode* node) {};
-    virtual void Menu(MulNX::UINode* node) {};
+    virtual void HubPlayer(MulNX::UINode* node) {};
+    virtual void HubTeam(MulNX::UINode* node) {};
+    virtual void HubWindow(MulNX::UINode* node) {};
 };
 
 template <typename T>
diff --git a/source/MulNXExtensions/CS2/PlayerHub/GlowController/GlowController.cpp b/source/MulNXExtensions/CS2/PlayerHub/GlowController/GlowController.cpp
@@ -3,7 +3,7 @@
 
 #include <MulNXExtensions/CS2/PlayerHub/PlayerHub.hpp>
 
-void GlowController::Player(MulNX::UINode* node) {
+void GlowController::HubPlayer(MulNX::UINode* node) {
     auto uid = this->Hub->currentSteamId.load(std::memory_order_acquire);
 
     // 1. 获取当前为该玩家设置的颜色（若存在），否则使用默认白色
@@ -38,7 +38,7 @@ void GlowController::Player(MulNX::UINode* node) {
         this->ISys().PublishAsync(std::move(msg));
     }
 }
-void GlowController::Team(MulNX::UINode* node) {
+void GlowController::HubTeam(MulNX::UINode* node) {
     auto team = this->Hub->currentTeam.load(std::memory_order_acquire);
 
     uint32_t currentColorU32 = IM_COL32(255, 255, 255, 255); // 默认白色
diff --git a/source/MulNXExtensions/CS2/PlayerHub/GlowController/GlowController.hpp b/source/MulNXExtensions/CS2/PlayerHub/GlowController/GlowController.hpp
@@ -8,8 +8,8 @@ class GlowController final :public CSViewPlayerModuleBase {
 public:
     bool Init()override;
     void ProcessMsg(MulNX::Message& Msg)override;
-    void Player(MulNX::UINode* node)override;
-    void Team(MulNX::UINode* node)override;
+    void HubPlayer(MulNX::UINode* node)override;
+    void HubTeam(MulNX::UINode* node)override;
 
     void MySetGlowColor(CS2::CGlowProperty* pGlowProperty, uint32_t* color);
 };
diff --git a/source/MulNXExtensions/CS2/PlayerHub/NameController/NameController.cpp b/source/MulNXExtensions/CS2/PlayerHub/NameController/NameController.cpp
@@ -9,7 +9,7 @@ using GetDecoratedPlayerName_t = const char* (*)(CS2::CCSPlayerController* This_
 
 using GetPlayerName_t = const char* (*)(CS2::CCSPlayerController*);
 
-void NameController::Player(MulNX::UINode* node) {
+void NameController::HubPlayer(MulNX::UINode* node) {
     auto uid = this->Hub->currentSteamId.load(std::memory_order_acquire);
     auto it = this->nameReplaceInfo.find(uid);
     if (it != this->nameReplaceInfo.end()) {
diff --git a/source/MulNXExtensions/CS2/PlayerHub/NameController/NameController.hpp b/source/MulNXExtensions/CS2/PlayerHub/NameController/NameController.hpp
@@ -13,8 +13,8 @@ class NameController final :public CSViewPlayerModuleBase {
 public:
     bool Init()override;
     void ProcessMsg(MulNX::Message& Msg)override;
-    void Player(MulNX::UINode* node)override;
-    void Team(MulNX::UINode* node)override {};
+    void HubPlayer(MulNX::UINode* node)override;
+    void HubTeam(MulNX::UINode* node)override {};
 
     bool SetReplace(Steam64UID uid, const std::string& newName);
 };
diff --git a/source/MulNXExtensions/CS2/PlayerHub/PlayerHub.cpp b/source/MulNXExtensions/CS2/PlayerHub/PlayerHub.cpp
@@ -66,7 +66,7 @@ bool PlayerHub::Window(MulNX::UINode* node) {
                 this->currentSteamId.store(info.steamID, std::memory_order_release);
                 this->currentTeam.store(info.teamNum, std::memory_order_release);
                 for (auto& mod : this->PlayerViewModules) {
-                    mod->Player(node);
+                    mod->HubPlayer(node);
                 }
                 ImGui::Separator();
                 if (ImGui::Button("关闭"))
@@ -80,7 +80,7 @@ bool PlayerHub::Window(MulNX::UINode* node) {
                 this->currentSteamId.store(0, std::memory_order_release);
                 this->currentTeam.store(team, std::memory_order_release);
                 for (auto& mod : this->PlayerViewModules) {
-                    mod->Team(node);
+                    mod->HubTeam(node);
                 }
                 ImGui::Separator();
                 if (ImGui::Button("关闭"))
@@ -135,7 +135,7 @@ bool PlayerHub::Window(MulNX::UINode* node) {
         ImGui::EndChild();
 
         for (auto& mod : this->PlayerViewModules) {
-            mod->Menu(node);
+            mod->HubWindow(node);
         }
     }
     catch (const std::exception& e) {
diff --git a/source/MulNXExtensions/CS2/PlayerHub/ProjectileTracker/ProjectileTracker.cpp b/source/MulNXExtensions/CS2/PlayerHub/ProjectileTracker/ProjectileTracker.cpp
@@ -12,7 +12,7 @@ static std::string GetControllerPlayerName(CS2::CCSPlayerController* pController
     return name.empty() ? "未知玩家" : name;
 }
 
-void ProjectileTracker::Menu(MulNX::UINode* node) {
+void ProjectileTracker::HubWindow(MulNX::UINode* node) {
     auto w = MulNX::UI::RAIIWindow("投掷物追踪器");
     MulNX::UI::Checkbox("启用功能", this->Enable);
 
diff --git a/source/MulNXExtensions/CS2/PlayerHub/ProjectileTracker/ProjectileTracker.hpp b/source/MulNXExtensions/CS2/PlayerHub/ProjectileTracker/ProjectileTracker.hpp
@@ -12,9 +12,9 @@ class ProjectileTracker final : public CSViewPlayerModuleBase {
 
     bool HandleProjectileAdd(CS2::C_BaseCSGrenadeProjectile* pProjectile);
 
-    void Menu(MulNX::UINode* node)override;
-    void Team(MulNX::UINode* node)override {};
-    void Player(MulNX::UINode* node)override {};
+    void HubWindow(MulNX::UINode* node)override;
+    void HubTeam(MulNX::UINode* node)override {};
+    void HubPlayer(MulNX::UINode* node)override {};
     void Main();
     MulNX::NewestBuffer<MulNX::Math::View> currentView{};
     void OnEntityAdd(MulNX::Message& msg);
diff --git a/source/MulNXExtensions/CS2/PlayerHub/SmokeController/SmokeController.cpp b/source/MulNXExtensions/CS2/PlayerHub/SmokeController/SmokeController.cpp
@@ -1,9 +1,8 @@
 #include "SmokeController.hpp"
 #include <MulNX/Base/UI/UI.hpp>
-
 #include <MulNXExtensions/CS2/PlayerHub/PlayerHub.hpp>
 
-void SmokeController::Player(MulNX::UINode* node) {
+void SmokeController::HubPlayer(MulNX::UINode* node) {
     auto uid = this->Hub->currentSteamId.load(std::memory_order_acquire);
 
     uint32_t currentColorU32 = IM_COL32(255, 255, 255, 255);
@@ -32,7 +31,7 @@ void SmokeController::Player(MulNX::UINode* node) {
     }
 }
 
-void SmokeController::Team(MulNX::UINode* node) {
+void SmokeController::HubTeam(MulNX::UINode* node) {
     auto team = this->Hub->currentTeam.load(std::memory_order_acquire);
 
     uint32_t currentColorU32 = IM_COL32(255, 255, 255, 255);
diff --git a/source/MulNXExtensions/CS2/PlayerHub/SmokeController/SmokeController.hpp b/source/MulNXExtensions/CS2/PlayerHub/SmokeController/SmokeController.hpp
@@ -10,8 +10,8 @@ class SmokeController final : public CSViewPlayerModuleBase {
     bool Init()override;
     void ProcessMsg(MulNX::Message& Msg)override;
 
-    void Player(MulNX::UINode* node)override;
-    void Team(MulNX::UINode* node)override;
+    void HubPlayer(MulNX::UINode* node)override;
+    void HubTeam(MulNX::UINode* node)override;
 
     void MySetSmokeProps(CS2::C_SmokeGrenadeProjectile* pSmoke);
 };
diff --git a/source/MulNXExtensions/CS2/PlayerHub/SpeakingController/SpeakingController.cpp b/source/MulNXExtensions/CS2/PlayerHub/SpeakingController/SpeakingController.cpp
diff --git a/source/MulNXExtensions/CS2/PlayerHub/SpeakingController/SpeakingController.hpp b/source/MulNXExtensions/CS2/PlayerHub/SpeakingController/SpeakingController.hpp
