Skip to content

Commit e574a64

Browse files
committed
优化Demo自动化录制,优化录制管线
优化性能
1 parent 5c71060 commit e574a64

29 files changed

Lines changed: 960 additions & 810 deletions

File tree

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.31)
44
project("MulNX_CS2")
55

66
# 版本定义
7-
add_compile_definitions(MulNXVersion="B0.2.0C0.35.0")
7+
add_compile_definitions(MulNXVersion="B0.2.0C0.36.0")
88

99
# 启用 LTO(仅 Release 配置)
1010
include(CheckIPOSupported)

bin/CalculateLines.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -107,12 +107,6 @@ def main():
107107
print(f"{'='*60}")
108108
for i, (file_path, lines) in enumerate(processed_files_sorted[:10]):
109109
print(f"{i+1:2d}. {file_path:<60} : {lines:>8,} 行")
110-
111-
print(f"\n{'='*60}")
112-
print("行数最少的10个文件:")
113-
print(f"{'='*60}")
114-
for i, (file_path, lines) in enumerate(processed_files_sorted[-10:]):
115-
print(f"{i+1:2d}. {file_path:<60} : {lines:>8,} 行")
116110

117111
# 显示排除的文件
118112
if excluded_files:
6.5 KB
Binary file not shown.
0 Bytes
Binary file not shown.

bin/MulNX/CS2OBTool/CS2OBTool.dll

47 KB
Binary file not shown.

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Collapsed=0
2121
DockId=0x0000000B,0
2222

2323
[Window][调试器]
24-
Pos=422,76
24+
Pos=156,617
2525
Size=1176,746
2626
Collapsed=0
2727

@@ -47,8 +47,8 @@ Size=663,340
4747
Collapsed=0
4848

4949
[Window][Demo辅助]
50-
Pos=289,175
51-
Size=842,884
50+
Pos=238,815
51+
Size=838,884
5252
Collapsed=0
5353
DockId=0x00000004,2
5454

@@ -86,8 +86,8 @@ Collapsed=0
8686
DockId=0x00000001,0
8787

8888
[Window][Demo]
89-
Pos=289,175
90-
Size=842,884
89+
Pos=238,815
90+
Size=838,884
9191
Collapsed=0
9292
DockId=0x00000004,0
9393

@@ -196,8 +196,8 @@ Collapsed=0
196196
DockId=0x00000004,1
197197

198198
[Window][Demo Recorder]
199-
Pos=1133,175
200-
Size=725,686
199+
Pos=1078,815
200+
Size=729,644
201201
Collapsed=0
202202
DockId=0x00000008,0
203203

@@ -207,14 +207,14 @@ Size=358,674
207207
Collapsed=0
208208

209209
[Window][录制任务创建]
210-
Pos=289,175
211-
Size=842,884
210+
Pos=238,815
211+
Size=838,884
212212
Collapsed=0
213213
DockId=0x00000004,1
214214

215215
[Window][录制参数调节]
216-
Pos=1133,863
217-
Size=725,196
216+
Pos=1078,1461
217+
Size=729,238
218218
Collapsed=0
219219
DockId=0x00000009,0
220220

@@ -255,11 +255,11 @@ Collapsed=0
255255
DockId=0x0000000C,3
256256

257257
[Docking][Data]
258-
DockNode ID=0x00000003 Pos=289,175 Size=1569,884 Split=X Selected=0x448D10F7
259-
DockNode ID=0x00000004 Parent=0x00000003 SizeRef=839,992 Selected=0x1A0AB2F3
260-
DockNode ID=0x00000007 Parent=0x00000003 SizeRef=723,992 Split=Y Selected=0x3C0020BC
261-
DockNode ID=0x00000008 Parent=0x00000007 SizeRef=725,686 Selected=0x3C0020BC
262-
DockNode ID=0x00000009 Parent=0x00000007 SizeRef=725,196 Selected=0x8538678F
258+
DockNode ID=0x00000003 Pos=238,815 Size=1569,884 Split=X Selected=0x448D10F7
259+
DockNode ID=0x00000004 Parent=0x00000003 SizeRef=838,992 Selected=0xE555D201
260+
DockNode ID=0x00000007 Parent=0x00000003 SizeRef=729,992 Split=Y Selected=0x8538678F
261+
DockNode ID=0x00000008 Parent=0x00000007 SizeRef=729,644 Selected=0x3C0020BC
262+
DockNode ID=0x00000009 Parent=0x00000007 SizeRef=729,238 Selected=0x8538678F
263263
DockNode ID=0x0000000A Pos=8,460 Size=1840,751 Split=X
264264
DockNode ID=0x0000000B Parent=0x0000000A SizeRef=376,407 Selected=0x2D59FDA6
265265
DockNode ID=0x0000000C Parent=0x0000000A SizeRef=74,407 Selected=0x4DB1B67D

bin/MulNX/Log/Log_CS2Injector.txt

Lines changed: 97 additions & 97 deletions
Large diffs are not rendered by default.

bin/MulNX/Log/Log_CS2OBTool.txt

Lines changed: 602 additions & 488 deletions
Large diffs are not rendered by default.

cm.txt

5.1 KB
Binary file not shown.

source/MulNX/Core/ModuleBase/ModuleBase.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,13 @@ void MulNX::ModuleBase::Update() {
6767
while (Channel->PullMessage(msg)) {
6868
this->ProcessMsg(msg);// 高优先级
6969
auto it = this->msgWaiters.find(msg.type);
70-
if (it != this->msgWaiters.end()) {
71-
auto waiters = std::move(it->second);
72-
this->msgWaiters.erase(it);
73-
for (auto& w : waiters) {
74-
w.result = &msg;
75-
w.handle.resume();// 由于模块代码内聚,这里应当是不出现已经处理的情况
76-
}
70+
if (it == this->msgWaiters.end())continue;
71+
72+
auto waiters = std::move(it->second);
73+
74+
for (auto& w : waiters) {
75+
w->result = &msg;
76+
w->h.resume();// 由于模块代码内聚,这里应当是不出现已经处理的情况
7777
}
7878
continue;
7979
}
@@ -90,8 +90,8 @@ MulNX::ModuleBase::~ModuleBase() {
9090
// 销毁所有挂起的消息等待协程
9191
for (auto& [type, vec] : msgWaiters) {
9292
for (auto& w : vec) {
93-
if (w.handle) {
94-
w.handle.destroy();
93+
if (w->h) {
94+
w->h.destroy();
9595
}
9696
}
9797
}

0 commit comments

Comments
 (0)