Skip to content

Commit 146b458

Browse files
Co1SwetCo1Swet
committed
先把视角控制修了，存个档
1 parent 4aaef21 commit 146b458

49 files changed

Lines changed: 8084 additions & 6075 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎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.3.0C0.47.0")
7+
add_compile_definitions(MulNXVersion="B0.3.0C0.47.1")
88

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

‎bin/MulNX/CS2Injector/CS2Injector.exe‎

0 Bytes
Binary file not shown.

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,30 +4,30 @@ Size=400,400
44
Collapsed=0
55

66
[Window][首页]
7-
Pos=184,200
7+
Pos=161,234
88
Size=503,487
99
Collapsed=0
10-
DockId=0x00000005,0
10+
DockId=0x00000005,1
1111

1212
[Window][MulNX控制]
13-
Pos=184,200
13+
Pos=161,234
1414
Size=503,487
1515
Collapsed=0
16-
DockId=0x00000005,1
16+
DockId=0x00000005,2
1717

1818
[Window][UI个性配置]
19-
Pos=184,200
19+
Pos=161,234
2020
Size=503,487
2121
Collapsed=0
22-
DockId=0x00000005,2
22+
DockId=0x00000005,0
2323

2424
[Window][调试器]
25-
Pos=314,19
25+
Pos=467,78
2626
Size=1322,966
2727
Collapsed=0
2828

2929
[Window][CS2 Boot Loader]
30-
Pos=184,200
30+
Pos=161,234
3131
Size=503,487
3232
Collapsed=0
3333
DockId=0x00000005,3
@@ -43,6 +43,6 @@ Size=469,308
4343
Collapsed=0
4444

4545
[Docking][Data]
46-
DockNode ID=0x00000005 Pos=184,200 Size=503,487 Selected=0xC6EE3AFB
46+
DockNode ID=0x00000005 Pos=161,234 Size=503,487 Selected=0xC6EE3AFB
4747
DockSpace ID=0x633F05CB Window=0xFB32D03B Pos=0,0 Size=1898,1144 CentralNode=1
4848

‎bin/MulNX/CS2InternalHelper/CS2InternalHelper.dll‎

0 Bytes
Binary file not shown.

‎bin/MulNX/CS2OBTool/CS2OBTool.dll‎

-3.98 MB
Binary file not shown.

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

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -96,20 +96,20 @@ Size=1920,1080
9696
Collapsed=0
9797

9898
[Window][UI个性配置]
99-
Pos=1335,443
100-
Size=773,512
99+
Pos=1102,399
100+
Size=804,379
101101
Collapsed=0
102102
DockId=0x0000000D,0
103103

104104
[Window][摄像机系统]
105-
Pos=1335,443
106-
Size=773,512
105+
Pos=1597,25
106+
Size=804,954
107107
Collapsed=0
108108
DockId=0x0000000D,2
109109

110110
[Window][游戏设置]
111-
Pos=1335,443
112-
Size=773,512
111+
Pos=1597,25
112+
Size=804,954
113113
Collapsed=0
114114
DockId=0x0000000D,3
115115

@@ -120,14 +120,14 @@ Collapsed=0
120120
DockId=0x00000002,3
121121

122122
[Window][MulNX控制]
123-
Pos=1335,443
124-
Size=773,512
123+
Pos=1597,25
124+
Size=804,954
125125
Collapsed=0
126126
DockId=0x0000000D,10
127127

128128
[Window][首页]
129-
Pos=1335,443
130-
Size=773,512
129+
Pos=1597,25
130+
Size=804,954
131131
Collapsed=0
132132
DockId=0x0000000D,1
133133

@@ -149,20 +149,20 @@ Size=1159,801
149149
Collapsed=0
150150

151151
[Window][2D视觉]
152-
Pos=1335,443
153-
Size=773,512
152+
Pos=1597,25
153+
Size=804,954
154154
Collapsed=0
155155
DockId=0x0000000D,4
156156

157157
[Window][3D视觉]
158-
Pos=1335,443
159-
Size=773,512
158+
Pos=1597,25
159+
Size=804,954
160160
Collapsed=0
161161
DockId=0x0000000D,5
162162

163163
[Window][镜头参数]
164-
Pos=1335,443
165-
Size=773,512
164+
Pos=1597,25
165+
Size=804,954
166166
Collapsed=0
167167
DockId=0x0000000D,9
168168

@@ -173,16 +173,16 @@ Collapsed=0
173173
DockId=0x00000002,4
174174

175175
[Window][视角视图]
176-
Pos=1335,443
177-
Size=773,512
176+
Pos=1597,25
177+
Size=804,954
178178
Collapsed=0
179179
DockId=0x0000000D,6
180180

181181
[Window][声音控制]
182-
Pos=1335,443
183-
Size=773,512
182+
Pos=1597,25
183+
Size=804,954
184184
Collapsed=0
185-
DockId=0x0000000D,7
185+
DockId=0x0000000D,8
186186

187187
[Window][ui.game_enhance]
188188
Pos=910,157
@@ -202,7 +202,7 @@ Collapsed=0
202202
DockId=0x00000008,0
203203

204204
[Window][实验性功能]
205-
Pos=1556,403
205+
Pos=1377,302
206206
Size=358,674
207207
Collapsed=0
208208

@@ -219,21 +219,21 @@ Collapsed=0
219219
DockId=0x00000009,0
220220

221221
[Window][音视频]
222-
Pos=1414,173
222+
Pos=1336,389
223223
Size=567,449
224224
Collapsed=0
225225

226226
[Window][实体列表探测器]
227-
Pos=1335,443
228-
Size=773,512
227+
Pos=1597,25
228+
Size=804,954
229229
Collapsed=0
230230
DockId=0x0000000D,11
231231

232232
[Window][高级功能]
233-
Pos=1335,443
234-
Size=773,512
233+
Pos=1597,25
234+
Size=804,954
235235
Collapsed=0
236-
DockId=0x0000000D,8
236+
DockId=0x0000000D,7
237237

238238
[Window][语音控制]
239239
Pos=1241,132
@@ -286,7 +286,7 @@ DockNode ID=0x00000003 Pos=464,428 Size=1378,716 Split=X Selected=0x448D10F
286286
DockNode ID=0x0000000A Pos=1435,473 Size=685,394 Split=X
287287
DockNode ID=0x0000000B Parent=0x0000000A SizeRef=1042,407 Selected=0x2D59FDA6
288288
DockNode ID=0x0000000C Parent=0x0000000A SizeRef=606,407 Selected=0x4DB1B67D
289-
DockNode ID=0x0000000D Pos=1335,443 Size=773,512 Selected=0xC12FA4B6
289+
DockNode ID=0x0000000D Pos=1102,399 Size=804,379 Selected=0xA0EA48CF
290290
DockSpace ID=0x633F05CB Window=0xFB32D03B Pos=0,0 Size=1920,1080 Split=Y Selected=0xC52A91C6
291291
DockNode ID=0x00000001 Parent=0x633F05CB SizeRef=1920,32 Selected=0x38DB91B6
292292
DockNode ID=0x00000002 Parent=0x633F05CB SizeRef=1920,1046 CentralNode=1

‎bin/MulNX/Log/Log_CS2Injector.txt‎

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

‎bin/MulNX/Log/Log_CS2OBTool.txt‎

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

‎bin/MulNX/Log/crash.dmp‎

11.5 KB
Binary file not shown.

‎source/App/CS2OBTool/DllMain/DllMain.cpp‎

Lines changed: 74 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -32,86 +32,89 @@ void StartImpl(HMODULE& hModule) {
3232
.CreateModule<CSController>("CSController")
3333
// CS2关键接口
3434
.CreateModule<HookConsole>("HookConsole")
35-
.CreateModule<ConsoleOutput>("ConsoleOutput")
36-
.CreateModule<HookEntitySystem>("HookEntitySystem")
37-
.CreateModule<HookGameEvents>("HookGameEvents")
35+
.CreateModule<HookView>("HookView")
3836
.CreateModule<CS2Hash>("CS2Hash")
39-
.CreateModule<ParticleManager>("ParticleManager")
40-
.CreateModule<MaterialSystem>("MaterialSystem")
41-
.CreateModule<SceneSystem>("SceneSystem")
4237
.CreateModule<TimeController>("TimeController")
43-
.CreateModule<HookView>("HookView")
4438
.CreateModule<PlayerHub>("PlayerHub")
45-
// CS2功能模块
46-
.CreateModule<HitSoundFix>("HitSoundFix")
47-
.CreateModule<FreeCameraController>("FreeCameraController")
48-
.CreateModule<AdvancedViewController>("AdvancedViewController")
49-
.CreateModule<ObserverController>("ObserverController")
50-
.CreateModule<PlayerFlashController>("PlayerFlashController")
51-
.CreateModule<DeathMsgController>("DeathMsgController")
52-
.CreateModule<SkyController>("SkyController")
53-
.CreateModule<ESPBox>("ESPBox")
54-
.CreateModule<ESPSkeleton>("ESPSkeleton")
55-
.CreateModule<SkinController>("SkinController")
56-
.CreateModule<EntityListScanner>("EntityListScanner")
57-
.CreateModule<FlashRenderController>("FlashRenderController")
58-
// 玩家强相关
59-
.CreateModule<ProjectileTracker>("ProjectileTracker")
60-
.CreateModule<TrailsController>("TrailsController")
61-
.CreateModule<NameController>("NameController")
62-
.CreateModule<GlowController>("GlowController")
63-
.CreateModule<SmokeController>("SmokeController")
64-
.CreateModule<SpeakingController>("SpeakingController")
65-
.CreateModule<KeyboardOverlay>("KeyboardOverlay")
66-
.CreateModule<TeamIDColorController>("TeamIDColorController")
67-
.CreateModule<TeamIDRenderController>("TeamIDRenderController")
68-
.CreateModule<PlayerSpotRenderController>("PlayerSpotRenderController")
69-
.CreateModule<PlayerSpotColorController>("PlayerSpotColorController")
70-
.CreateModule<BombSpotController>("BombSpotController")
71-
.CreateModule<TeamCounterController>("TeamCounterController")
72-
// 摄像机系统
73-
.CreateModule<CameraSystem>("CameraSystem")
74-
.CreateModule<WorkspaceManager>("WorkspaceManager")
75-
.CreateModule<ProjectManager>("ProjectManager")
76-
.CreateModule<SolutionManager>("SolutionManager")
77-
.CreateModule<ElementManager>("ElementManager")
78-
// Demos
79-
.CreateModule<HookDemo>("HookDemo")
80-
.CreateModule<DemoSystem>("DemoSystem")
81-
.CreateModule<DemoAnalyzer>("DemoAnalyzer")
82-
.CreateModule<DemoHelper>("DemoHelper")
83-
.CreateModule<DemoJSONReader>("DemoJSONReader")
84-
.CreateModule<RecordTaskConfiger>("RecordTaskConfiger")
85-
.CreateModule<RecordTaskMaker>("RecordTaskMaker")
86-
.CreateModule<DemoRecorder>("DemoRecorder")
87-
.CreateModule<DemoPlaying>("DemoPlaying")
88-
.CreateModule<DemoEventsRender>("DemoEventsRender")
89-
// 较为上层
90-
.CreateModule<MiniMap>("MiniMap")
91-
.CreateModule<VirtualUser>("VirtualUser")
92-
.CreateModule<GameCfgManager>("GameCfgManager")
93-
.CreateModule<GameSettingsManager>("GameSettingsManager")
94-
// 音视频
95-
.CreateModule<MediaSystem>("MediaSystem")
96-
.CreateModule<MediaParamManager>("MediaParamManager")
97-
.CreateModule<VCD3D11Manager>("VCD3D11Manager")
98-
.CreateModule<AudioCapturer>("AudioCapturer")
99-
.CreateModule<VideoCapturer>("VideoCapturer")
100-
.CreateModule<AEncodeHelper>("AEncodeHelper")
101-
.CreateModule<VEncodeHelper>("VEncodeHelper")
102-
.CreateModule<MediaRecorder>("MediaRecorder")
103-
.CreateModule<MediaProcesser>("MediaProcesser")
104-
// 管理
105-
.CreateModule<MulNXController>("MulNXController")
106-
.CreateModule<UIDocker>("UIDocker")
39+
// .CreateModule<ConsoleOutput>("ConsoleOutput")
40+
// .CreateModule<HookEntitySystem>("HookEntitySystem")
41+
// .CreateModule<HookGameEvents>("HookGameEvents")
42+
43+
// .CreateModule<ParticleManager>("ParticleManager")
44+
// .CreateModule<MaterialSystem>("MaterialSystem")
45+
// .CreateModule<SceneSystem>("SceneSystem")
46+
47+
// // CS2功能模块
48+
// .CreateModule<HitSoundFix>("HitSoundFix")
49+
// //.CreateModule<SoundCircleFix>("SoundCircleFix")
50+
// .CreateModule<FreeCameraController>("FreeCameraController")
51+
// .CreateModule<AdvancedViewController>("AdvancedViewController")
52+
// .CreateModule<ObserverController>("ObserverController")
53+
// .CreateModule<PlayerFlashController>("PlayerFlashController")
54+
// .CreateModule<DeathMsgController>("DeathMsgController")
55+
// .CreateModule<SkyController>("SkyController")
56+
// .CreateModule<ESPBox>("ESPBox")
57+
// .CreateModule<ESPSkeleton>("ESPSkeleton")
58+
// .CreateModule<SkinController>("SkinController")
59+
// .CreateModule<EntityListScanner>("EntityListScanner")
60+
// .CreateModule<FlashRenderController>("FlashRenderController")
61+
// // 玩家强相关
62+
// .CreateModule<ProjectileTracker>("ProjectileTracker")
63+
// .CreateModule<TrailsController>("TrailsController")
64+
// .CreateModule<NameController>("NameController")
65+
// .CreateModule<GlowController>("GlowController")
66+
// .CreateModule<SmokeController>("SmokeController")
67+
// .CreateModule<SpeakingController>("SpeakingController")
68+
// .CreateModule<KeyboardOverlay>("KeyboardOverlay")
69+
// .CreateModule<TeamIDColorController>("TeamIDColorController")
70+
// .CreateModule<TeamIDRenderController>("TeamIDRenderController")
71+
// .CreateModule<PlayerSpotRenderController>("PlayerSpotRenderController")
72+
// .CreateModule<PlayerSpotColorController>("PlayerSpotColorController")
73+
// .CreateModule<BombSpotController>("BombSpotController")
74+
// .CreateModule<TeamCounterController>("TeamCounterController")
75+
// // 摄像机系统
76+
// .CreateModule<CameraSystem>("CameraSystem")
77+
// .CreateModule<WorkspaceManager>("WorkspaceManager")
78+
// .CreateModule<ProjectManager>("ProjectManager")
79+
// .CreateModule<SolutionManager>("SolutionManager")
80+
// .CreateModule<ElementManager>("ElementManager")
81+
// // Demos
82+
// .CreateModule<HookDemo>("HookDemo")
83+
// .CreateModule<DemoSystem>("DemoSystem")
84+
// .CreateModule<DemoAnalyzer>("DemoAnalyzer")
85+
// .CreateModule<DemoHelper>("DemoHelper")
86+
// .CreateModule<DemoJSONReader>("DemoJSONReader")
87+
// .CreateModule<RecordTaskConfiger>("RecordTaskConfiger")
88+
// .CreateModule<RecordTaskMaker>("RecordTaskMaker")
89+
// .CreateModule<DemoRecorder>("DemoRecorder")
90+
// .CreateModule<DemoPlaying>("DemoPlaying")
91+
// .CreateModule<DemoEventsRender>("DemoEventsRender")
92+
// // 较为上层
93+
// .CreateModule<MiniMap>("MiniMap")
94+
// .CreateModule<VirtualUser>("VirtualUser")
95+
// .CreateModule<GameCfgManager>("GameCfgManager")
96+
// .CreateModule<GameSettingsManager>("GameSettingsManager")
97+
// // 音视频
98+
// .CreateModule<MediaSystem>("MediaSystem")
99+
// .CreateModule<MediaParamManager>("MediaParamManager")
100+
// .CreateModule<VCD3D11Manager>("VCD3D11Manager")
101+
// .CreateModule<AudioCapturer>("AudioCapturer")
102+
// .CreateModule<VideoCapturer>("VideoCapturer")
103+
// .CreateModule<AEncodeHelper>("AEncodeHelper")
104+
// .CreateModule<VEncodeHelper>("VEncodeHelper")
105+
// .CreateModule<MediaRecorder>("MediaRecorder")
106+
// .CreateModule<MediaProcesser>("MediaProcesser")
107+
// // 管理
108+
// .CreateModule<MulNXController>("MulNXController")
109+
// .CreateModule<UIDocker>("UIDocker")
107110
;
108111
// 启动核心
109112
core->EntryInit(core.get());
110113
if (MulNXInfo::IsDebugVersion) {
111-
auto pHookConsole = core->ModuleManager()->FindModule<HookConsole>("HookConsole");
114+
//auto pHookConsole = core->ModuleManager()->FindModule<HookConsole>("HookConsole");
112115
auto [msg, rp] = MulNX::Message::Create<MulNX::NetExt>("Demo/Play"_hash);
113116
rp->str1 = "111";
114-
pHookConsole->PublishAsync(std::move(msg));
117+
//pHookConsole->PublishAsync(std::move(msg));
115118
std::thread([]() {
116119
MessageBoxW(NULL, L"MulNX 注入成功！", L"MulNX", MB_OK | MB_ICONINFORMATION);
117120
}).detach();

0 commit comments

Comments
 (0)