Skip to content

Commit bbf0a39

Browse files
DerpyNewbieDerpyNewbie
authored
Merge pull request #40 from Centurion-Creative-Connect/dev/0.7.x
Make it compatible with 0.7.0-alpha.1
2 parents a969c7d + cf6771a commit bbf0a39

26 files changed

Lines changed: 625 additions & 1900 deletions

‎Packages/org.centurioncc.system.commands/Runtime/CenturionCC.System.Commands.asmdef‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
"GUID:99835874ee819da44948776e0df4ff1d",
77
"GUID:849b8c6574848ed44b9f0ccd066aff2b",
88
"GUID:5199dcddf07051b4493992e0e426d200",
9-
"GUID:666af2e0f78f1bd4bb9c42682a8c9f13"
9+
"GUID:666af2e0f78f1bd4bb9c42682a8c9f13",
10+
"GUID:b75c79fd3b1b70444a173745d05bdf9c"
1011
],
1112
"includePlatforms": [],
1213
"excludePlatforms": [],

‎Packages/org.centurioncc.system.commands/Runtime/Command/DamageDataResolverCommand.asset‎

Lines changed: 6 additions & 138 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ MonoBehaviour:
4444
Data:
4545
- Name:
4646
Entry: 12
47-
Data: 7
47+
Data: 5
4848
- Name:
4949
Entry: 7
5050
Data:
@@ -218,7 +218,7 @@ MonoBehaviour:
218218
Data: 11|System.RuntimeType, mscorlib
219219
- Name:
220220
Entry: 1
221-
Data: CenturionCC.System.Player.PlayerManager, CenturionCC.System
221+
Data: CenturionCC.System.Player.PlayerManagerBase, CenturionCC.System
222222
- Name:
223223
Entry: 8
224224
Data:
@@ -276,150 +276,18 @@ MonoBehaviour:
276276
- Name:
277277
Entry: 7
278278
Data:
279-
- Name: $k
280-
Entry: 1
281-
Data: syncerMgr
282-
- Name: $v
283-
Entry: 7
284-
Data: 16|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
285-
- Name: <Name>k__BackingField
286-
Entry: 1
287-
Data: syncerMgr
288-
- Name: <UserType>k__BackingField
289-
Entry: 7
290-
Data: 17|System.RuntimeType, mscorlib
291-
- Name:
292-
Entry: 1
293-
Data: CenturionCC.System.Player.DamageDataSyncerManager, CenturionCC.System
294-
- Name:
295-
Entry: 8
296-
Data:
297-
- Name: <SystemType>k__BackingField
298-
Entry: 9
299-
Data: 12
300-
- Name: <SyncMode>k__BackingField
301-
Entry: 7
302-
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
303-
- Name:
304-
Entry: 6
305-
Data:
306-
- Name:
307-
Entry: 8
308-
Data:
309-
- Name: <IsSerialized>k__BackingField
310-
Entry: 5
311-
Data: true
312-
- Name: _fieldAttributes
313-
Entry: 7
314-
Data: 18|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
315-
- Name:
316-
Entry: 12
317-
Data: 2
318-
- Name:
319-
Entry: 7
320-
Data: 19|UnityEngine.SerializeField, UnityEngine.CoreModule
321-
- Name:
322-
Entry: 8
323-
Data:
324-
- Name:
325-
Entry: 7
326-
Data: 20|UnityEngine.HideInInspector, UnityEngine.CoreModule
327-
- Name:
328-
Entry: 8
329-
Data:
330-
- Name:
331-
Entry: 13
332-
Data:
333-
- Name:
334-
Entry: 8
335-
Data:
336-
- Name:
337-
Entry: 8
338-
Data:
339-
- Name:
340-
Entry: 8
341-
Data:
342-
- Name:
343-
Entry: 7
344-
Data:
345-
- Name: $k
346-
Entry: 1
347-
Data: resolver
348-
- Name: $v
349-
Entry: 7
350-
Data: 21|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
351-
- Name: <Name>k__BackingField
352-
Entry: 1
353-
Data: resolver
354-
- Name: <UserType>k__BackingField
355-
Entry: 7
356-
Data: 22|System.RuntimeType, mscorlib
357-
- Name:
358-
Entry: 1
359-
Data: CenturionCC.System.Player.DamageDataResolver, CenturionCC.System
360-
- Name:
361-
Entry: 8
362-
Data:
363-
- Name: <SystemType>k__BackingField
364-
Entry: 9
365-
Data: 12
366-
- Name: <SyncMode>k__BackingField
367-
Entry: 7
368-
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
369-
- Name:
370-
Entry: 6
371-
Data:
372-
- Name:
373-
Entry: 8
374-
Data:
375-
- Name: <IsSerialized>k__BackingField
376-
Entry: 5
377-
Data: true
378-
- Name: _fieldAttributes
379-
Entry: 7
380-
Data: 23|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
381-
- Name:
382-
Entry: 12
383-
Data: 2
384-
- Name:
385-
Entry: 7
386-
Data: 24|UnityEngine.SerializeField, UnityEngine.CoreModule
387-
- Name:
388-
Entry: 8
389-
Data:
390-
- Name:
391-
Entry: 7
392-
Data: 25|UnityEngine.HideInInspector, UnityEngine.CoreModule
393-
- Name:
394-
Entry: 8
395-
Data:
396-
- Name:
397-
Entry: 13
398-
Data:
399-
- Name:
400-
Entry: 8
401-
Data:
402-
- Name:
403-
Entry: 8
404-
Data:
405-
- Name:
406-
Entry: 8
407-
Data:
408-
- Name:
409-
Entry: 7
410-
Data:
411279
- Name: $k
412280
Entry: 1
413281
Data: mockData
414282
- Name: $v
415283
Entry: 7
416-
Data: 26|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
284+
Data: 16|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
417285
- Name: <Name>k__BackingField
418286
Entry: 1
419287
Data: mockData
420288
- Name: <UserType>k__BackingField
421289
Entry: 7
422-
Data: 27|System.RuntimeType, mscorlib
290+
Data: 17|System.RuntimeType, mscorlib
423291
- Name:
424292
Entry: 1
425293
Data: CenturionCC.System.Util.MockDamageData, CenturionCC.System.Commands
@@ -443,13 +311,13 @@ MonoBehaviour:
443311
Data: true
444312
- Name: _fieldAttributes
445313
Entry: 7
446-
Data: 28|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
314+
Data: 18|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
447315
- Name:
448316
Entry: 12
449317
Data: 1
450318
- Name:
451319
Entry: 7
452-
Data: 29|UnityEngine.SerializeField, UnityEngine.CoreModule
320+
Data: 19|UnityEngine.SerializeField, UnityEngine.CoreModule
453321
- Name:
454322
Entry: 8
455323
Data:

‎Packages/org.centurioncc.system.commands/Runtime/Command/DamageDataResolverCommand.cs‎

Lines changed: 4 additions & 149 deletions
Original file line numberDiff line numberDiff line change
@@ -1,175 +1,30 @@
11
using CenturionCC.System.Player;
2-
using CenturionCC.System.Player.MassPlayer;
32
using CenturionCC.System.Util;
43
using DerpyNewbie.Common;
54
using DerpyNewbie.Logger;
65
using UdonSharp;
76
using UnityEngine;
8-
using VRC.SDK3.Data;
9-
using VRC.SDKBase;
107

118
namespace CenturionCC.System.Command
129
{
1310
[UdonBehaviourSyncMode(BehaviourSyncMode.None)]
1411
public class DamageDataResolverCommand : NewbieConsoleCommandHandler
1512
{
1613
[SerializeField] [HideInInspector] [NewbieInject]
17-
private PlayerManager playerManager;
18-
19-
[SerializeField] [HideInInspector] [NewbieInject]
20-
private DamageDataSyncerManager syncerMgr;
21-
22-
[SerializeField] [HideInInspector] [NewbieInject]
23-
private DamageDataResolver resolver;
14+
private PlayerManagerBase playerManager;
2415

2516
[SerializeField] private MockDamageData mockData;
2617

2718
public override string Label => "DamageDataResolver";
2819
public override string[] Aliases => new[] { "DmgResolver", "DDResolver" };
29-
public override string Description => "Configures DamageDataResolver";
20+
public override string Description => "no-op";
3021

3122
public override string Usage =>
32-
"<command> <getAssumedDiedTime|getConfirmedDiedTime|testInvokeHit|useTimeBasedCheck> [value] OR <command> <printEvents|pause|continue|isPaused>";
23+
"no-op";
3324

3425
public override string OnCommand(NewbieConsole console, string label, string[] vars, ref string[] envVars)
3526
{
36-
if (vars.Length == 0)
37-
return console.PrintUsage(this);
38-
39-
switch (vars[0].ToLower())
40-
{
41-
// all strings are lowered
42-
// ReSharper disable StringLiteralTypo
43-
case "getassumed":
44-
case "getassumedtime":
45-
case "getassumeddiedtime":
46-
{
47-
if (vars.Length <= 1)
48-
{
49-
console.Println("Requires Player ID value as argument");
50-
return ConsoleLiteral.GetNone();
51-
}
52-
53-
var playerId = ConsoleParser.TryParseInt(vars[1]);
54-
if (playerId <= 0)
55-
{
56-
console.Println("Requires proper Player ID");
57-
return ConsoleLiteral.GetNone();
58-
}
59-
60-
var assumedTime = resolver.GetAssumedDiedTime(playerId);
61-
return assumedTime.ToString("O");
62-
}
63-
case "getconfirmed":
64-
case "getconfirmedtime":
65-
case "getconfirmeddiedtime":
66-
{
67-
if (vars.Length <= 1)
68-
{
69-
console.Println("Requires Player ID value as second argument");
70-
return ConsoleLiteral.GetNone();
71-
}
72-
73-
var playerId = ConsoleParser.TryParseInt(vars[1]);
74-
if (playerId <= 0)
75-
{
76-
console.Println("Requires proper Player ID");
77-
return ConsoleLiteral.GetNone();
78-
}
79-
80-
var confirmedTime = resolver.GetConfirmedDiedTime(playerId);
81-
return confirmedTime.ToString("O");
82-
}
83-
case "ispaused":
84-
{
85-
var paused = syncerMgr.ProcessingPaused;
86-
return ConsoleLiteral.Of(paused);
87-
}
88-
case "printevents":
89-
{
90-
if (syncerMgr.GetEventsJson(JsonExportType.Beautify, out var jsonToken))
91-
{
92-
var jsonStr = jsonToken.String;
93-
console.Println(jsonStr);
94-
return jsonStr;
95-
}
96-
97-
console.Println(jsonToken.Error.ToString());
98-
return ConsoleLiteral.GetNone();
99-
}
100-
case "pause":
101-
{
102-
console.Println("Requested SyncerManager to pause processing");
103-
syncerMgr.PauseProcessing();
104-
return ConsoleLiteral.GetNone();
105-
}
106-
case "continue":
107-
{
108-
console.Println("Requested SyncerManager to continue processing");
109-
syncerMgr.ContinueProcessing();
110-
return ConsoleLiteral.GetNone();
111-
}
112-
case "testinvokehit":
113-
{
114-
if (vars.Length <= 1)
115-
{
116-
console.Println("Requires Player ID value as second argument");
117-
return ConsoleLiteral.GetNone();
118-
}
119-
120-
var playerId = ConsoleParser.TryParseInt(vars[1]);
121-
if (playerId <= 0)
122-
{
123-
console.Println("Requires proper Player ID");
124-
return ConsoleLiteral.GetNone();
125-
}
126-
127-
var model = (PlayerModel)playerManager.GetPlayerById(playerId);
128-
if (model == null)
129-
{
130-
console.Println("Requires in-game Player ID");
131-
return ConsoleLiteral.GetNone();
132-
}
133-
134-
if (model.PlayerView == null)
135-
{
136-
console.Println("Requires player model with view");
137-
return ConsoleLiteral.GetNone();
138-
}
139-
140-
var view = model.PlayerView;
141-
var pCol = view.GetColliders()[0];
142-
143-
mockData.SetData(
144-
true,
145-
Networking.LocalPlayer.playerId,
146-
Networking.LocalPlayer.GetPosition(),
147-
Networking.LocalPlayer.GetRotation(),
148-
Networking.GetNetworkDateTime(),
149-
"TestInvokeHit"
150-
);
151-
152-
console.Println($"Directly damaged a player `{NewbieUtils.GetPlayerName(model.VrcPlayer)}`");
153-
pCol.OnDamage(mockData, model.Position);
154-
return ConsoleLiteral.GetNone();
155-
}
156-
case "timebased":
157-
case "usetimebasedcheck":
158-
{
159-
if (vars.Length > 1)
160-
{
161-
resolver.useTimeBasedCheck = ConsoleParser.TryParseBoolean(vars[1], resolver.useTimeBasedCheck);
162-
}
163-
164-
console.Println($"{resolver.useTimeBasedCheck}");
165-
return ConsoleLiteral.Of(resolver.useTimeBasedCheck);
166-
}
167-
default:
168-
{
169-
return console.PrintUsage(this);
170-
}
171-
// ReSharper restore StringLiteralTypo
172-
}
27+
return "";
17328
}
17429
}
17530
}

0 commit comments

Comments
 (0)