向新UI回调模式迁移

Author: Co1Swet

bin/MulNX/CS2Injector/CS2Injector.exe

@@ -4,33 +4,33 @@ Size=400,400
 Collapsed=0
 
 [Window][首页]
-Pos=148,223
-Size=503,487
+Pos=0,0
+Size=1898,1144
 Collapsed=0
-DockId=0x00000005,1
+DockId=0x633F05CB,1
 
 [Window][MulNX控制]
-Pos=148,223
-Size=503,487
+Pos=0,0
+Size=1898,1144
 Collapsed=0
-DockId=0x00000005,2
+DockId=0x633F05CB,2
 
 [Window][UI个性配置]
-Pos=148,223
-Size=503,487
+Pos=0,0
+Size=1898,1144
 Collapsed=0
-DockId=0x00000005,0
+DockId=0x633F05CB,0
 
 [Window][调试器]
 Pos=467,78
 Size=1322,966
 Collapsed=0
 
 [Window][CS2 Boot Loader]
-Pos=148,223
-Size=503,487
+Pos=0,0
+Size=1898,1144
 Collapsed=0
-DockId=0x00000005,3
+DockId=0x633F05CB,3
 
 [Window][UICoordinator]
 Pos=1271,131
@@ -43,6 +43,5 @@ Size=469,308
 Collapsed=0
 
 [Docking][Data]
-DockNode  ID=0x00000005 Pos=148,223 Size=503,487 Selected=0xC6EE3AFB
-DockSpace ID=0x633F05CB Window=0xFB32D03B Pos=0,0 Size=1898,1144 CentralNode=1
+DockSpace ID=0x633F05CB Window=0xFB32D03B Pos=0,0 Size=1898,1144 CentralNode=1 Selected=0xC6EE3AFB
 

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

@@ -15,7 +15,7 @@ Collapsed=0
 DockId=0x00000002,3
 
 [Window][玩家信息管理]
-Pos=562,527
+Pos=749,564
 Size=685,394
 Collapsed=0
 DockId=0x0000000B,0
@@ -96,19 +96,19 @@ Size=1920,1080
 Collapsed=0
 
 [Window][UI个性配置]
-Pos=1485,556
+Pos=1447,704
 Size=433,378
 Collapsed=0
 DockId=0x0000000D,0
 
 [Window][摄像机系统]
-Pos=1485,556
+Pos=1447,704
 Size=433,378
 Collapsed=0
 DockId=0x0000000D,2
 
 [Window][游戏设置]
-Pos=1485,556
+Pos=1447,704
 Size=433,378
 Collapsed=0
 DockId=0x0000000D,3
@@ -120,13 +120,13 @@ Collapsed=0
 DockId=0x00000002,3
 
 [Window][MulNX控制]
-Pos=1485,556
+Pos=1447,704
 Size=433,378
 Collapsed=0
 DockId=0x0000000D,10
 
 [Window][首页]
-Pos=1485,556
+Pos=1447,704
 Size=433,378
 Collapsed=0
 DockId=0x0000000D,1
@@ -149,19 +149,19 @@ Size=1159,801
 Collapsed=0
 
 [Window][2D视觉]
-Pos=1485,556
+Pos=1447,704
 Size=433,378
 Collapsed=0
 DockId=0x0000000D,4
 
 [Window][3D视觉]
-Pos=1485,556
+Pos=1447,704
 Size=433,378
 Collapsed=0
 DockId=0x0000000D,5
 
 [Window][镜头参数]
-Pos=1485,556
+Pos=1447,704
 Size=433,378
 Collapsed=0
 DockId=0x0000000D,9
@@ -173,13 +173,13 @@ Collapsed=0
 DockId=0x00000002,4
 
 [Window][视角视图]
-Pos=1485,556
+Pos=1447,704
 Size=433,378
 Collapsed=0
 DockId=0x0000000D,6
 
 [Window][声音控制]
-Pos=1485,556
+Pos=1447,704
 Size=433,378
 Collapsed=0
 DockId=0x0000000D,7
@@ -219,18 +219,18 @@ Collapsed=0
 DockId=0x00000009,0
 
 [Window][音视频]
-Pos=1409,88
+Pos=1561,145
 Size=406,434
 Collapsed=0
 
 [Window][实体列表探测器]
-Pos=1485,556
+Pos=1447,704
 Size=433,378
 Collapsed=0
 DockId=0x0000000D,11
 
 [Window][高级功能]
-Pos=1485,556
+Pos=1447,704
 Size=433,378
 Collapsed=0
 DockId=0x0000000D,8
@@ -283,10 +283,10 @@ DockNode      ID=0x00000003 Pos=464,428 Size=1378,716 Split=X Selected=0x448D10F
   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=562,527 Size=685,394 Split=X
+DockNode      ID=0x0000000A Pos=749,564 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=1485,556 Size=433,378 Selected=0x7773E0DE
+DockNode      ID=0x0000000D Pos=1447,704 Size=433,378 Selected=0x7773E0DE
 DockSpace     ID=0x633F05CB Window=0xFB32D03B Pos=0,0 Size=1920,1080 Split=Y Selected=0xC52A91C6
   DockNode    ID=0x00000001 Parent=0x633F05CB SizeRef=1920,31 Selected=0x38DB91B6
   DockNode    ID=0x00000002 Parent=0x633F05CB SizeRef=1920,1047 CentralNode=1

bin/MulNX/CS2InternalHelper/CS2InternalHelper.dll

@@ -70,6 +70,7 @@ void MulNX::UICoordinator::Window() {
 bool MulNX::UICoordinator::Init() {
     (*this)
         .SubscribeAsync("UISystem/ModulePush")
+        .SubscribeAsync("UISystem/UICallback")
         .SubscribeAsync("UINode/Swap");     // 订阅交换消息
     // 向 UISystem 注册本模块的根窗口回调
     this->SendUIRoot(this->GetName(), [this](auto&&...) {return this->Window();});
@@ -80,18 +81,22 @@ void MulNX::UICoordinator::ProcessMsg(MulNX::Message& msg) {
     switch (msg.type) {
     case "UISystem/ModulePush"_hash: {
         MulNX::UINode* pNode = msg.asp.get<MulNX::UINode>();
-        if (!pNode) break;
-
         size_t index = UINodes.size();
         UINodes.emplace_back(std::move(*pNode));
         auto& node = UINodes.back();
         nameToIndex[node.name] = index;
-        node.pCoordinator = this;
-
+        
         this->LogSucc(std::format("接收到UI节点: {} (索引 {})", node.name, index));
         break;
     }
+    case "UISystem/UICallback"_hash: {
+        MulNX::UINode node = std::move(*msg.asp.get<MulNX::UINode>());
+        auto&& [target, str] = msg.Access<uint64_t, const char*>();
+        this->UICallbacks[target].push_back(std::move(node));
 
+        this->LogSucc(std::format("UI节点: {} 回调于： {}", node.name, str));
+        break;
+    }
     case "UINode/Swap"_hash: {
         auto pNet = msg.asp.get<MulNX::NetExt>();
         if (!pNet) break;
@@ -165,9 +170,17 @@ void MulNX::UICoordinator::Render() {
     }
 }
 
-void MulNX::UICoordinator::CallUINode(std::string&& name) {
-    auto it = nameToIndex.find(name);
-    if (it != nameToIndex.end()) {
-        UINodes[it->second].Render(this, nullptr);
+void MulNX::UICoordinator::CallUINode(const std::string& name) {
+    auto it = this->nameToIndex.find(name);
+    if (it != this->nameToIndex.end()) {
+        this->UINodes[it->second].Render(this, nullptr);
+    }
+}
+
+void MulNX::UICoordinator::CallbackCall(uint64_t hash, Message* msg) {
+    auto it = this->UICallbacks.find(hash);
+    if (it == this->UICallbacks.end())return;
+    for (auto& callback : it->second) {
+        callback.Render(this, msg);
     }
 }

bin/MulNX/CS2OBTool/CS2OBTool.dll

@@ -1,10 +1,12 @@
 #pragma once
 #include <MulNX/Core/Module/Module.hpp>
+#include <map>
 
 namespace MulNX {
     class UICoordinator final :public MulNX::Module<UICoordinator> {
         std::unordered_map<std::string, size_t>nameToIndex{};
         std::vector<MulNX::UINode>UINodes{};
+        std::map<uint64_t, std::vector<MulNX::UINode>>UICallbacks{};
         struct Padding {
             float top = 0;
             float bottom = 0;
@@ -19,6 +21,7 @@ namespace MulNX {
     public:
         void HandleUpdate();
         void Render();
-        void CallUINode(std::string&& name);
+        void CallUINode(const std::string& name);
+        void CallbackCall(uint64_t hash, Message* msg);
     };
 }

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

@@ -6,22 +6,14 @@ namespace MulNX {
 
     template<typename T>
     class UIMixin {
-    private:
+        T* This() { return static_cast<T*>(this); }
         auto CreateUINode(std::string&& name, std::function<void(UICoordinator*, Message*)>&& func) {
-            // 创建UI节点
             MulNX::UINode UINode = MulNX::UINode::Create(This());
-            // 设置UI节点属性
             UINode.name = std::move(name);
             UINode.Render = std::move(func);
-            // 创建UI消息
             return MulNX::Message::Create<MulNX::UINode>("UISystem/ModulePush"_hash, std::move(UINode));
         }
     public:
-        T* This() { return static_cast<T*>(this); }
-        UIMixin() {
-
-        }
-
         void SendUINode(std::string&& name, std::function<void(UICoordinator*, Message*)>&& func) {
             auto [msg, rp] = this->CreateUINode(std::move(name), std::move(func));
             This()->PublishAsync(std::move(msg));
@@ -34,5 +26,16 @@ namespace MulNX {
             This()->PublishAsync(std::move(msg));
             This()->LogInfo(I18n("module.send_ui"));
         }
+        void UIRegisterCallback(const char* name, std::function<void(UICoordinator*, Message*)>&& func) {
+            MulNX::UINode UINode = MulNX::UINode::Create(This());
+            UINode.name = std::string(name);
+            UINode.Render = std::move(func);
+            auto [msg, pNode] = MulNX::Message::Create<MulNX::UINode>("UISystem/UICallback"_hash);
+            *pNode = std::move(UINode);
+            auto&& [target, str] = msg.Access<uint64_t, const char*>();
+            target = MulNX::HashString(name);
+            str = name;
+            This()->PublishAsync(std::move(msg));
+        }
     };
 }