优化

Co1Swet · Co1Swet · commit b0bb135a56fb · 2026-07-20T18:30:30.000+08:00
diff --git a/bin/MulNX/CS2Injector/CS2Injector.exe b/bin/MulNX/CS2Injector/CS2Injector.exe
diff --git a/bin/MulNX/CS2Injector/UISystem/Config/MulNXUIConfig.ini b/bin/MulNX/CS2Injector/UISystem/Config/MulNXUIConfig.ini
@@ -4,19 +4,19 @@ Size=400,400
 Collapsed=0
 
 [Window][首页]
-Pos=543,414
+Pos=543,415
 Size=801,517
 Collapsed=0
 DockId=0x00000001,0
 
 [Window][MulNX控制]
-Pos=543,414
+Pos=543,415
 Size=801,517
 Collapsed=0
 DockId=0x00000001,2
 
 [Window][UI个性配置]
-Pos=543,414
+Pos=543,415
 Size=801,517
 Collapsed=0
 DockId=0x00000001,1
@@ -27,7 +27,7 @@ Size=1322,966
 Collapsed=0
 
 [Window][CS2 Boot Loader]
-Pos=543,414
+Pos=543,415
 Size=801,517
 Collapsed=0
 DockId=0x00000001,3
@@ -43,6 +43,6 @@ Size=469,308
 Collapsed=0
 
 [Docking][Data]
-DockNode  ID=0x00000001 Pos=543,414 Size=801,517 Selected=0xC6EE3AFB
+DockNode  ID=0x00000001 Pos=543,415 Size=801,517 Selected=0xC6EE3AFB
 DockSpace ID=0x633F05CB Window=0xFB32D03B Pos=0,0 Size=1898,1144 CentralNode=1
 
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/UISystem/Config/MulNXUIConfig.ini b/bin/MulNX/CS2OBTool/UISystem/Config/MulNXUIConfig.ini
@@ -37,7 +37,7 @@ Size=508,530
 Collapsed=0
 
 [Window][小地图窗口]
-Pos=181,53
+Pos=367,245
 Size=1432,983
 Collapsed=0
 
@@ -47,7 +47,7 @@ Size=663,340
 Collapsed=0
 
 [Window][Demo辅助]
-Pos=-515,160
+Pos=80,783
 Size=736,716
 Collapsed=0
 DockId=0x00000004,2
@@ -86,7 +86,7 @@ Collapsed=0
 DockId=0x00000002,0
 
 [Window][Demo]
-Pos=-515,160
+Pos=80,783
 Size=736,716
 Collapsed=0
 DockId=0x00000004,0
@@ -96,20 +96,20 @@ Size=1920,1080
 Collapsed=0
 
 [Window][UI个性配置]
-Pos=1466,715
-Size=471,435
+Pos=665,610
+Size=750,333
 Collapsed=0
 DockId=0x0000000D,0
 
 [Window][摄像机系统]
-Pos=1466,715
-Size=471,435
+Pos=665,610
+Size=750,333
 Collapsed=0
 DockId=0x0000000D,2
 
 [Window][游戏设置]
-Pos=1466,715
-Size=471,435
+Pos=665,610
+Size=750,333
 Collapsed=0
 DockId=0x0000000D,3
 
@@ -120,14 +120,14 @@ Collapsed=0
 DockId=0x00000002,3
 
 [Window][MulNX控制]
-Pos=1466,715
-Size=471,435
+Pos=665,610
+Size=750,333
 Collapsed=0
 DockId=0x0000000D,10
 
 [Window][首页]
-Pos=1466,715
-Size=471,435
+Pos=665,610
+Size=750,333
 Collapsed=0
 DockId=0x0000000D,1
 
@@ -149,20 +149,20 @@ Size=1159,801
 Collapsed=0
 
 [Window][2D视觉]
-Pos=1466,715
-Size=471,435
+Pos=665,610
+Size=750,333
 Collapsed=0
 DockId=0x0000000D,4
 
 [Window][3D视觉]
-Pos=1466,715
-Size=471,435
+Pos=665,610
+Size=750,333
 Collapsed=0
 DockId=0x0000000D,5
 
 [Window][镜头参数]
-Pos=1466,715
-Size=471,435
+Pos=665,610
+Size=750,333
 Collapsed=0
 DockId=0x0000000D,9
 
@@ -173,14 +173,14 @@ Collapsed=0
 DockId=0x00000002,4
 
 [Window][视角视图]
-Pos=1466,715
-Size=471,435
+Pos=665,610
+Size=750,333
 Collapsed=0
 DockId=0x0000000D,6
 
 [Window][声音控制]
-Pos=1466,715
-Size=471,435
+Pos=665,610
+Size=750,333
 Collapsed=0
 DockId=0x0000000D,7
 
@@ -196,7 +196,7 @@ Collapsed=0
 DockId=0x00000004,1
 
 [Window][Demo Recorder]
-Pos=223,160
+Pos=818,783
 Size=640,521
 Collapsed=0
 DockId=0x00000008,0
@@ -207,13 +207,13 @@ Size=358,674
 Collapsed=0
 
 [Window][录制任务创建]
-Pos=-515,160
+Pos=80,783
 Size=736,716
 Collapsed=0
 DockId=0x00000004,1
 
 [Window][录制参数调节]
-Pos=223,683
+Pos=818,1306
 Size=640,193
 Collapsed=0
 DockId=0x00000009,0
@@ -224,14 +224,14 @@ Size=406,434
 Collapsed=0
 
 [Window][实体列表探测器]
-Pos=1466,715
-Size=471,435
+Pos=665,610
+Size=750,333
 Collapsed=0
 DockId=0x0000000D,11
 
 [Window][高级功能]
-Pos=1466,715
-Size=471,435
+Pos=665,610
+Size=750,333
 Collapsed=0
 DockId=0x0000000D,8
 
@@ -283,15 +283,15 @@ Size=551,354
 Collapsed=0
 
 [Docking][Data]
-DockNode      ID=0x00000003 Pos=-515,160 Size=1378,716 Split=X Selected=0x448D10F7
+DockNode      ID=0x00000003 Pos=80,783 Size=1378,716 Split=X Selected=0x448D10F7
   DockNode    ID=0x00000004 Parent=0x00000003 SizeRef=838,992 Selected=0xE555D201
   DockNode    ID=0x00000007 Parent=0x00000003 SizeRef=729,992 Split=Y Selected=0x8538678F
     DockNode  ID=0x00000008 Parent=0x00000007 SizeRef=729,644 Selected=0x3C0020BC
     DockNode  ID=0x00000009 Parent=0x00000007 SizeRef=729,238 Selected=0x8538678F
 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=1466,715 Size=471,435 Selected=0x7773E0DE
+DockNode      ID=0x0000000D Pos=665,610 Size=750,333 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
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/App/CS2OBTool/UIDocker/UIDocker.cpp b/source/App/CS2OBTool/UIDocker/UIDocker.cpp
@@ -22,10 +22,7 @@ void UIDocker::MainDraw(MulNX::UICoordinator* uico) {
     ImGui::End();
 
     ImGui::Begin(I18n("高级功能").c_str());
-    MulNX::UI::Checkbox("小地图窗口", this->Core->ModuleManager()->FindModule("MiniMap")->showWindow);
-    MulNX::UI::Checkbox("游戏配置管理器窗口", this->Core->ModuleManager()->FindModule("GameCfgManager")->showWindow);
-    MulNX::UI::Checkbox("Demo", this->Core->ModuleManager()->FindModule("DemoSystem")->showWindow);
-    MulNX::UI::Checkbox("玩家信息管理窗口", this->Core->ModuleManager()->FindModule("PlayerHub")->showWindow);
+    uico->CallbackCall("UI.Advanced"_hash, nullptr);
     ImGui::End();
 
     ImGui::Begin(I18n("3D视觉").c_str());
diff --git a/source/MulNXExtensions/CS2/Buildup/PlayerHub/PlayerHub.cpp b/source/MulNXExtensions/CS2/Buildup/PlayerHub/PlayerHub.cpp
@@ -142,5 +142,8 @@ bool PlayerHub::Window(MulNX::UICoordinator* uico) {
 
 bool PlayerHub::Init() {
     this->SendUIRoot(this->GetName(), [this](auto* uico, auto&&...) {return this->Window(uico);});
+    this->UIRegisterCallback("UI.Advanced", [this](auto&&...) {
+        MulNX::UI::Checkbox("玩家信息管理", this->showWindow);
+        });
     return true;
 }
diff --git a/source/MulNXExtensions/CS2/Feature/DemoSystem/DemoSystem.cpp b/source/MulNXExtensions/CS2/Feature/DemoSystem/DemoSystem.cpp
@@ -121,6 +121,10 @@ bool DemoSystem::Init() {
         .SubscribeAsync("Window/Drag/FileDrop")
         ;
 
+    this->UIRegisterCallback("UI.Advanced", [this](auto&&...) {
+        MulNX::UI::Checkbox("Demo系统", this->showWindow);
+        });
+
     this->SendUIRoot(this->GetName(), [this](auto uico, auto&&...) {
         return this->Window(uico);
         });
diff --git a/source/MulNXExtensions/CS2/Feature/Visual/ESPBox/ESPBox.cpp b/source/MulNXExtensions/CS2/Feature/Visual/ESPBox/ESPBox.cpp
@@ -5,6 +5,7 @@
 void ESPBox::Draw() {
     if (!this->runFlag1.load(std::memory_order_acquire))return;
 
+    std::shared_lock lock(this->CS2->smutex);
     for (int i = 1; i <= 10; ++i) {
         if (!this->CS2->GetPlayerMsg(i).Alive)continue;
         const DirectX::XMFLOAT3 EyePos3D = this->CS2->GetPlayerMsg(i).EyePosition;
diff --git a/source/MulNXExtensions/CS2/Intro/CSController/CSController.cpp b/source/MulNXExtensions/CS2/Intro/CSController/CSController.cpp
@@ -169,6 +169,5 @@ void CSController::Main() {
 }
 
 D_Player& CSController::GetPlayerMsg(int Index) {
-    std::shared_lock lock(this->smutex);
     return this->CS2EBGameData.Players[Index];
 }
diff --git a/source/MulNXExtensions/CS2/Outro/GameCfgManager/GameCfgManager.cpp b/source/MulNXExtensions/CS2/Outro/GameCfgManager/GameCfgManager.cpp
@@ -111,6 +111,10 @@ bool GameCfgManager::Init() {
 	//初始化Cfg文件列表
     this->UpdateCfgList();
     this->SendUIRoot(this->GetName(), [this](auto&&...) {return this->Window();});
+    this->UIRegisterCallback("UI.Advanced", [this](auto&&...) {
+        MulNX::UI::Checkbox("游戏配置管理器", this->showWindow);
+        });
+    
     return true;
 }
 
diff --git a/source/MulNXExtensions/CS2/Outro/MiniMap/MiniMap.cpp b/source/MulNXExtensions/CS2/Outro/MiniMap/MiniMap.cpp
@@ -1,7 +1,7 @@
 #include "MiniMap.hpp"
 #include <MulNX/Base/UI/UI.hpp>
 
-bool MiniMap::UINodeFunc() {
+bool MiniMap::Window() {
     auto w = MulNX::UI::RAIIWindow("小地图窗口", this->showWindow);
     if (!w)return true;
 
@@ -16,13 +16,6 @@ bool MiniMap::UINodeFunc() {
     style.Colors[ImGuiCol_ChildBg] = ImVec4(0.0f, 0.0f, 0.0f, 0.0f);  // 完全透明子窗口背景
     style.Colors[ImGuiCol_Border] = ImVec4(0.0f, 0.0f, 0.0f, 0.0f);   // 透明边框
 
-    if (false) {
-        // 恢复样式
-        style.Colors[ImGuiCol_WindowBg] = oldWindowBg;
-        style.Colors[ImGuiCol_ChildBg] = oldChildBg;
-        style.Colors[ImGuiCol_Border] = oldBorder;
-        return true;
-    }
     // 计算地图绘制区域：如果随窗口联动则使用剩余内容区域的正方形
     ImVec2 mapSizeVec;
     if (this->FollowWindow) {
@@ -55,9 +48,9 @@ bool MiniMap::UINodeFunc() {
     ImVec2 mousePos = ImGui::GetIO().MousePos;
     bool mouseInMap = (mousePos.x >= TopLeft.x && mousePos.x <= BottomRight.x && mousePos.y >= TopLeft.y && mousePos.y <= BottomRight.y);
 
+    std::shared_lock lk(this->CS2->smutex);
     // 绘制玩家并处理点击
     for (int i = 1; i <= 10; ++i) {
-        std::shared_lock lk(this->CS2->smutex);
         D_Player& Player = this->CS2->GetPlayerMsg(i);
         if (!Player.Alive)continue;
         ImVec2 PositionInMiniMap = ImVec2(centerScreen.x + Player.Position.x * worldToPixel, centerScreen.y - Player.Position.y * worldToPixel);
@@ -114,7 +107,12 @@ bool MiniMap::UINodeFunc() {
 }
 
 bool MiniMap::Init() {
-    this->SendUIRoot(this->GetName(), [this](auto&&...) {return this->UINodeFunc();});
+    this->SendUIRoot(this->GetName(), [this](auto&&...) { this->Window();});
+
+    this->UIRegisterCallback("UI.Advanced", [this](auto&&...) {
+        MulNX::UI::Checkbox("小地图", this->showWindow);
+        });
+
     this->SendTask("Main", "MulNXMain", [this]()->bool {
         this->Main();
         return true;
@@ -123,7 +121,7 @@ bool MiniMap::Init() {
 }
 
 void MiniMap::Main() {
-    if (this->pInputSystem->CheckWithPack(MulNX::KeyCheckPack{ true,false,false,true,'M',1 })) {
+    if (this->pInputSystem->CheckWithPack(MulNX::KeyCheckPack{ true,false,false,true,'M',3 })) {
         this->showWindow = !this->showWindow;
     }
 
diff --git a/source/MulNXExtensions/CS2/Outro/MiniMap/MiniMap.hpp b/source/MulNXExtensions/CS2/Outro/MiniMap/MiniMap.hpp
@@ -2,7 +2,6 @@
 #include <Intro/CSModuleBase.hpp>
 
 class MiniMap final :public CSModuleBase {
-private:
     // 可配置项：地图像素大小（正方形），世界->像素 缩放，中心玩家索引，是否自动适配
     float MapSize = 200.0f; // 默认 200x200
     float Zoom = 0.15f;     // world units -> pixels
@@ -14,5 +13,5 @@ class MiniMap final :public CSModuleBase {
     bool FollowWindow = true;
     bool Init()override;
     void Main();
-    bool UINodeFunc();
+    bool Window();
 };

Original file line number	Diff line number	Diff line change
`@@ -142,5 +142,8 @@ bool PlayerHub::Window(MulNX::UICoordinator* uico) {`
`142`	`142`
`143`	`143`	`bool PlayerHub::Init() {`
`144`	`144`	`this->SendUIRoot(this->GetName(), [this](auto* uico, auto&&...) {return this->Window(uico);});`
	`145`	`+ this->UIRegisterCallback("UI.Advanced", [this](auto&&...) {`
	`146`	`+ MulNX::UI::Checkbox("玩家信息管理", this->showWindow);`
	`147`	`+ });`
`145`	`148`	`return true;`
`146`	`149`	`}`