RR/jelito
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactoring multiplayer

Browse Source
This commit is contained in:
Brajanowski
2025-07-21 19:58:20 +02:00
parent 0d8cc0e291
commit bf94ccb9db
6 changed files with 29 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Assets/AddressableAssetsData/Windows/addressables_content_state.bin
View File

Binary file not shown.

2
Assets/RebootKit

Submodule Assets/RebootKit updated: a0a0f6303d...ea99249fe2

48
Assets/Settings/UniversalRenderPipelineGlobalSettings.asset
View File

@@ -33,28 +33,28 @@ MonoBehaviour:
m_Settings:
m_SettingsList:
m_List:
- rid: 6725240239300543130
- rid: 6725240239300543131
- rid: 6725240327908098065
- rid: 6725240327908098066
- rid: 6852985685364965378
- rid: 6852985685364965379
- rid: 6852985685364965380
- rid: 6852985685364965381
- rid: 6725240239300543132
- rid: 6725240239300543133
- rid: 6725240327908098067
- rid: 6725240327908098068
- rid: 6852985685364965384
- rid: 6852985685364965385
- rid: 6725240239300543134
- rid: 6725240239300543135
- rid: 6725240239300543136
- rid: 6725240239300543137
- rid: 6725240239300543138
- rid: 6725240239300543139
- rid: 6725240327908098069
- rid: 6725240327908098070
- rid: 6725240327908098071
- rid: 6725240327908098072
- rid: 6725240327908098073
- rid: 6725240327908098074
- rid: 6852985685364965392
- rid: 6725240239300543140
- rid: 6725240327908098075
- rid: 6852985685364965394
- rid: 8712630790384254976
- rid: 260979669776728064
- rid: 6725240239300543141
- rid: 6725240327908098076
m_RuntimeSettings:
m_List:
- rid: 6852985685364965378
@@ -103,14 +103,14 @@ MonoBehaviour:
m_xrOcclusionMeshPS: {fileID: 4800000, guid: 4431b1f1f743fbf4eb310a967890cbea, type: 3}
m_xrMirrorViewPS: {fileID: 4800000, guid: d5a307c014552314b9f560906d708772, type: 3}
m_xrMotionVector: {fileID: 4800000, guid: f89aac1e4f84468418fe30e611dff395, type: 3}
- rid: 6725240239300543130
- rid: 6725240327908098065
type: {class: URPShaderStrippingSetting, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_Version: 0
m_StripUnusedPostProcessingVariants: 1
m_StripUnusedVariants: 1
m_StripScreenCoordOverrideVariants: 1
- rid: 6725240239300543131
- rid: 6725240327908098066
type: {class: UniversalRenderPipelineEditorShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_AutodeskInteractive: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, type: 3}
@@ -122,7 +122,7 @@ MonoBehaviour:
m_DefaultSpeedTree7Shader: {fileID: 4800000, guid: 0f4122b9a743b744abe2fb6a0a88868b, type: 3}
m_DefaultSpeedTree8Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec, type: 3}
m_DefaultSpeedTree9Shader: {fileID: -6465566751694194690, guid: cbd3e1cc4ae141c42a30e33b4d666a61, type: 3}
- rid: 6725240239300543132
- rid: 6725240327908098067
type: {class: Renderer2DResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_Version: 0
@@ -137,7 +137,7 @@ MonoBehaviour:
m_DefaultLitMaterial: {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
m_DefaultUnlitMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
m_DefaultMaskMaterial: {fileID: 2100000, guid: 15d0c3709176029428a0da2f8cecf0b5, type: 2}
- rid: 6725240239300543133
- rid: 6725240327908098068
type: {class: UniversalRenderPipelineEditorMaterials, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_DefaultMaterial: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
@@ -146,7 +146,7 @@ MonoBehaviour:
m_DefaultTerrainMaterial: {fileID: 2100000, guid: 594ea882c5a793440b60ff72d896021e, type: 2}
m_DefaultDecalMaterial: {fileID: 2100000, guid: 31d0dcc6f2dd4e4408d18036a2c93862, type: 2}
m_DefaultSpriteMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
- rid: 6725240239300543134
- rid: 6725240327908098069
type: {class: GPUResidentDrawerResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.GPUDriven.Runtime}
data:
m_Version: 0
@@ -159,13 +159,13 @@ MonoBehaviour:
m_OcclusionCullingDebugKernels: {fileID: 7200000, guid: b23e766bcf50ca4438ef186b174557df, type: 3}
m_DebugOcclusionTestPS: {fileID: 4800000, guid: d3f0849180c2d0944bc71060693df100, type: 3}
m_DebugOccluderPS: {fileID: 4800000, guid: b3c92426a88625841ab15ca6a7917248, type: 3}
- rid: 6725240239300543135
- rid: 6725240327908098070
type: {class: STP/RuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_setupCS: {fileID: 7200000, guid: 33be2e9a5506b2843bdb2bdff9cad5e1, type: 3}
m_preTaaCS: {fileID: 7200000, guid: a679dba8ec4d9ce45884a270b0e22dda, type: 3}
m_taaCS: {fileID: 7200000, guid: 3923900e2b41b5e47bc25bfdcbcdc9e6, type: 3}
- rid: 6725240239300543136
- rid: 6725240327908098071
type: {class: ProbeVolumeBakingResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_Version: 1
@@ -178,12 +178,12 @@ MonoBehaviour:
skyOcclusionRT: {fileID: -5126288278712620388, guid: 5a2a534753fbdb44e96c3c78b5a6999d, type: 3}
renderingLayerCS: {fileID: -6772857160820960102, guid: 94a070d33e408384bafc1dea4a565df9, type: 3}
renderingLayerRT: {fileID: -5126288278712620388, guid: 94a070d33e408384bafc1dea4a565df9, type: 3}
- rid: 6725240239300543137
- rid: 6725240327908098072
type: {class: ProbeVolumeGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_Version: 1
m_ProbeVolumeDisableStreamingAssets: 0
- rid: 6725240239300543138
- rid: 6725240327908098073
type: {class: ProbeVolumeDebugResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_Version: 1
@@ -193,21 +193,21 @@ MonoBehaviour:
probeVolumeOffsetDebugShader: {fileID: 4800000, guid: db8bd7436dc2c5f4c92655307d198381, type: 3}
probeSamplingDebugMesh: {fileID: -3555484719484374845, guid: 20be25aac4e22ee49a7db76fb3df6de2, type: 3}
numbersDisplayTex: {fileID: 2800000, guid: 73fe53b428c5b3440b7e87ee830b608a, type: 3}
- rid: 6725240239300543139
- rid: 6725240327908098074
type: {class: IncludeAdditionalRPAssets, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_version: 0
m_IncludeReferencedInScenes: 0
m_IncludeAssetsByLabel: 0
m_LabelToInclude:
- rid: 6725240239300543140
- rid: 6725240327908098075
type: {class: ProbeVolumeRuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_Version: 1
probeVolumeBlendStatesCS: {fileID: 7200000, guid: a3f7b8c99de28a94684cb1daebeccf5d, type: 3}
probeVolumeUploadDataCS: {fileID: 7200000, guid: 0951de5992461754fa73650732c4954c, type: 3}
probeVolumeUploadDataL2CS: {fileID: 7200000, guid: 6196f34ed825db14b81fb3eb0ea8d931, type: 3}
- rid: 6725240239300543141
- rid: 6725240327908098076
type: {class: UniversalRenderPipelineEditorAssets, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_DefaultSettingsVolumeProfile: {fileID: 11400000, guid: eda47df5b85f4f249abf7abd73db2cb2, type: 2}

3
Assets/jelycho/Code/ButtonActor.cs
View File

@@ -40,6 +40,7 @@ namespace RebootReality.jelycho {
}
m_LastPressTime = DateTime.UtcNow;
PlayPressAnimation();
SendActorEvent((ushort) ButtonActorEvents.Pressed);
pressed?.Invoke();
@@ -49,6 +50,8 @@ namespace RebootReality.jelycho {
protected override void OnActorEventClient(ActorEvent actorEvent) {
if (actorEvent.EventID == (ushort) ButtonActorEvents.Pressed) {
PlayPressAnimation();
} else {
s_Logger.Error($"Unknown actor event: {actorEvent.EventID}");
}
}

2
Assets/jelycho/Code/Player/PlayerActor.cs
View File

@@ -169,8 +169,6 @@ namespace RebootReality.jelycho.Player {
protected override void OnActorCommandServer(ActorCommand actorCommand) {
base.OnActorCommandServer(actorCommand);
// @TODO: SECURITY, Check if commands come from the owner
if (actorCommand.CommandID == (ushort) PlayerActorCommands.UpdateRemoteState) {
RemotePlayerActorState remoteState = new RemotePlayerActorState();
DataSerializationUtils.Deserialize(actorCommand.Data, ref remoteState);