more improvements on journey and sentinel

This commit is contained in:
Nilton Constantino 2026-06-23 10:33:53 +01:00
parent 3eece75820
commit 1a9fe23fa0
No known key found for this signature in database
17 changed files with 23432 additions and 36912 deletions

View File

@ -45,9 +45,19 @@ MonoBehaviour:
connectionId: connection_1099167b7150449491c4cf0d1b4e9b0a
connectedEndpointId: endpoint_d6f5daa321f14376a237ac78ecdeb172
debugLabel: Socket endpoint_bb859113836e4b89860e97fb2589a4be
syncedAt: 2026-06-22T11:40:59.1742480Z
- endpointId: endpoint_e5c45da78d2545f4a250503639d6394b
kind: 0
worldTile:
x: 2
y: 1
socketFace: 1
required: 1
connectionId: connection_6cdcba126e8a4736952cfcc89d195826
connectedEndpointId: endpoint_955d173dc8d548b2a9c94099921c8931
debugLabel: Socket endpoint_e5c45da78d2545f4a250503639d6394b
syncedAt: 2026-06-23T09:20:00.7599030Z
contractVersion: 1
contractHash: 8794a04598a6a1b48d285f5021f6d3c871ebe8bb2f5819ce65ccdf9cd8f0fae4
contractHash: 9292783aca051d8aa4c0fe8f0d1b02d95ffbfffa425805db2e5588946badc8c8
floors:
- floorId: F0
FloorHeight: 0

View File

@ -0,0 +1,963 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 778f9d79eb2c410482efdc25b248dd46, type: 3}
m_Name: Stage-3.stage-definition
m_EditorClassIdentifier: Assembly-CSharp-Editor::Editor.GON.StageEditor.StageDefinition
id: stage-3.stage-definition
cellSize: 1
floorHeight: 6
activeFloorIndex: 0
stageTag: {fileID: 11400000, guid: 1a39dcfa3780544d8b1dbc484a3720e8, type: 2}
worldSync:
worldLayoutId: 4dac43bfd76a4286a40511c1cce4609b
worldStageId: stage_fb59a93990cd45709e459d59512ea43e
worldStageDisplayName: Stage 3
worldStageKind: 0
worldLayer: 0
worldTileSize: 24
worldLayerHeight: 24
worldTiles:
- x: 0
y: 2
- x: 1
y: 2
- x: 2
y: 2
- x: 3
y: 2
- x: 0
y: 3
- x: 1
y: 3
- x: 2
y: 3
- x: 3
y: 3
expectedEndpoints:
- endpointId: endpoint_955d173dc8d548b2a9c94099921c8931
kind: 0
worldTile:
x: 2
y: 2
socketFace: 0
required: 1
connectionId: connection_6cdcba126e8a4736952cfcc89d195826
connectedEndpointId: endpoint_e5c45da78d2545f4a250503639d6394b
debugLabel: Socket endpoint_955d173dc8d548b2a9c94099921c8931
syncedAt: 2026-06-23T09:09:59.0438210Z
contractVersion: 1
contractHash: 3a76f922dd442dba5e6001b144d6a46f50485090248f05e92ba257d4e7a80c0d
floors:
- floorId: F0
FloorHeight: 0
cells:
- x: -2
y: -2
structural: 10
- x: -1
y: -2
structural: 10
- x: 0
y: -2
structural: 10
- x: 1
y: -2
structural: 10
- x: -2
y: -1
structural: 10
- x: -1
y: -1
structural: 10
- x: 0
y: -1
structural: 10
- x: 1
y: -1
structural: 10
- x: -2
y: 0
structural: 10
- x: -1
y: 0
structural: 10
- x: 0
y: 0
structural: 10
- x: 1
y: 0
structural: 10
- x: -2
y: 1
structural: 10
- x: -1
y: 1
structural: 10
- x: 0
y: 1
structural: 10
- x: 1
y: 1
structural: 10
- x: 0
y: -12
structural: 10
- x: 1
y: -12
structural: 10
- x: 2
y: -12
structural: 10
- x: 3
y: -12
structural: 10
- x: 4
y: -12
structural: 10
- x: 5
y: -12
structural: 10
- x: 6
y: -12
structural: 10
- x: 7
y: -12
structural: 10
- x: 8
y: -12
structural: 10
- x: 9
y: -12
structural: 10
- x: 10
y: -12
structural: 10
- x: 11
y: -12
structural: 10
- x: 12
y: -12
structural: 10
- x: 13
y: -12
structural: 10
- x: 14
y: -12
structural: 10
- x: 15
y: -12
structural: 10
- x: 16
y: -12
structural: 10
- x: 17
y: -12
structural: 10
- x: 18
y: -12
structural: 10
- x: 19
y: -12
structural: 10
- x: 20
y: -12
structural: 10
- x: 21
y: -12
structural: 10
- x: 22
y: -12
structural: 10
- x: 23
y: -12
structural: 10
- x: 0
y: -11
structural: 10
- x: 1
y: -11
structural: 10
- x: 2
y: -11
structural: 10
- x: 3
y: -11
structural: 10
- x: 4
y: -11
structural: 10
- x: 5
y: -11
structural: 10
- x: 6
y: -11
structural: 10
- x: 7
y: -11
structural: 10
- x: 8
y: -11
structural: 10
- x: 9
y: -11
structural: 10
- x: 10
y: -11
structural: 10
- x: 11
y: -11
structural: 10
- x: 12
y: -11
structural: 10
- x: 13
y: -11
structural: 10
- x: 14
y: -11
structural: 10
- x: 15
y: -11
structural: 10
- x: 16
y: -11
structural: 10
- x: 17
y: -11
structural: 10
- x: 18
y: -11
structural: 10
- x: 19
y: -11
structural: 10
- x: 20
y: -11
structural: 10
- x: 21
y: -11
structural: 10
- x: 22
y: -11
structural: 10
- x: 23
y: -11
structural: 10
- x: 0
y: -10
structural: 10
- x: 1
y: -10
structural: 10
- x: 2
y: -10
structural: 10
- x: 3
y: -10
structural: 10
- x: 4
y: -10
structural: 10
- x: 5
y: -10
structural: 10
- x: 6
y: -10
structural: 10
- x: 7
y: -10
structural: 10
- x: 8
y: -10
structural: 10
- x: 9
y: -10
structural: 10
- x: 10
y: -10
structural: 10
- x: 11
y: -10
structural: 10
- x: 12
y: -10
structural: 10
- x: 13
y: -10
structural: 10
- x: 14
y: -10
structural: 10
- x: 15
y: -10
structural: 10
- x: 16
y: -10
structural: 10
- x: 17
y: -10
structural: 10
- x: 18
y: -10
structural: 10
- x: 19
y: -10
structural: 10
- x: 20
y: -10
structural: 10
- x: 21
y: -10
structural: 10
- x: 22
y: -10
structural: 10
- x: 23
y: -10
structural: 10
- x: 0
y: -9
structural: 10
- x: 1
y: -9
structural: 10
- x: 2
y: -9
structural: 10
- x: 3
y: -9
structural: 10
- x: 4
y: -9
structural: 10
- x: 5
y: -9
structural: 10
- x: 6
y: -9
structural: 10
- x: 7
y: -9
structural: 10
- x: 8
y: -9
structural: 10
- x: 9
y: -9
structural: 10
- x: 10
y: -9
structural: 10
- x: 11
y: -9
structural: 10
- x: 12
y: -9
structural: 10
- x: 13
y: -9
structural: 10
- x: 14
y: -9
structural: 10
- x: 15
y: -9
structural: 10
- x: 16
y: -9
structural: 10
- x: 17
y: -9
structural: 10
- x: 18
y: -9
structural: 10
- x: 19
y: -9
structural: 10
- x: 20
y: -9
structural: 10
- x: 21
y: -9
structural: 10
- x: 22
y: -9
structural: 10
- x: 23
y: -9
structural: 10
- x: 0
y: -8
structural: 10
- x: 1
y: -8
structural: 10
- x: 2
y: -8
structural: 10
- x: 3
y: -8
structural: 10
- x: 4
y: -8
structural: 10
- x: 5
y: -8
structural: 10
- x: 6
y: -8
structural: 10
- x: 7
y: -8
structural: 10
- x: 8
y: -8
structural: 10
- x: 9
y: -8
structural: 10
- x: 10
y: -8
structural: 10
- x: 11
y: -8
structural: 10
- x: 12
y: -8
structural: 10
- x: 13
y: -8
structural: 10
- x: 14
y: -8
structural: 10
- x: 15
y: -8
structural: 10
- x: 16
y: -8
structural: 10
- x: 17
y: -8
structural: 10
- x: 18
y: -8
structural: 10
- x: 19
y: -8
structural: 10
- x: 20
y: -8
structural: 10
- x: 21
y: -8
structural: 10
- x: 22
y: -8
structural: 10
- x: 23
y: -8
structural: 10
- x: 0
y: -7
structural: 10
- x: 1
y: -7
structural: 10
- x: 2
y: -7
structural: 10
- x: 3
y: -7
structural: 10
- x: 4
y: -7
structural: 10
- x: 5
y: -7
structural: 10
- x: 6
y: -7
structural: 10
- x: 7
y: -7
structural: 10
- x: 8
y: -7
structural: 10
- x: 9
y: -7
structural: 10
- x: 10
y: -7
structural: 10
- x: 11
y: -7
structural: 10
- x: 12
y: -7
structural: 10
- x: 13
y: -7
structural: 10
- x: 14
y: -7
structural: 10
- x: 15
y: -7
structural: 10
- x: 16
y: -7
structural: 10
- x: 17
y: -7
structural: 10
- x: 18
y: -7
structural: 10
- x: 19
y: -7
structural: 10
- x: 20
y: -7
structural: 10
- x: 21
y: -7
structural: 10
- x: 22
y: -7
structural: 10
- x: 23
y: -7
structural: 10
- x: 0
y: -6
structural: 10
- x: 1
y: -6
structural: 10
- x: 2
y: -6
structural: 10
- x: 3
y: -6
structural: 10
- x: 4
y: -6
structural: 10
- x: 5
y: -6
structural: 10
- x: 6
y: -6
structural: 10
- x: 7
y: -6
structural: 10
- x: 8
y: -6
structural: 10
- x: 9
y: -6
structural: 10
- x: 10
y: -6
structural: 10
- x: 11
y: -6
structural: 10
- x: 12
y: -6
structural: 10
- x: 13
y: -6
structural: 10
- x: 14
y: -6
structural: 10
- x: 15
y: -6
structural: 10
- x: 16
y: -6
structural: 10
- x: 17
y: -6
structural: 10
- x: 18
y: -6
structural: 10
- x: 19
y: -6
structural: 10
- x: 20
y: -6
structural: 10
- x: 21
y: -6
structural: 10
- x: 22
y: -6
structural: 10
- x: 23
y: -6
structural: 10
- x: 0
y: -5
structural: 10
- x: 1
y: -5
structural: 10
- x: 2
y: -5
structural: 10
- x: 3
y: -5
structural: 10
- x: 4
y: -5
structural: 10
- x: 5
y: -5
structural: 10
- x: 6
y: -5
structural: 10
- x: 7
y: -5
structural: 10
- x: 8
y: -5
structural: 10
- x: 9
y: -5
structural: 10
- x: 10
y: -5
structural: 10
- x: 11
y: -5
structural: 10
- x: 12
y: -5
structural: 10
- x: 13
y: -5
structural: 10
- x: 14
y: -5
structural: 10
- x: 15
y: -5
structural: 10
- x: 16
y: -5
structural: 10
- x: 17
y: -5
structural: 10
- x: 18
y: -5
structural: 10
- x: 19
y: -5
structural: 10
- x: 20
y: -5
structural: 10
- x: 21
y: -5
structural: 10
- x: 22
y: -5
structural: 10
- x: 23
y: -5
structural: 10
- x: 0
y: -4
structural: 10
- x: 1
y: -4
structural: 10
- x: 2
y: -4
structural: 10
- x: 3
y: -4
structural: 10
- x: 4
y: -4
structural: 10
- x: 5
y: -4
structural: 10
- x: 6
y: -4
structural: 10
- x: 7
y: -4
structural: 10
- x: 8
y: -4
structural: 10
- x: 9
y: -4
structural: 10
- x: 10
y: -4
structural: 10
- x: 11
y: -4
structural: 10
- x: 12
y: -4
structural: 10
- x: 13
y: -4
structural: 10
- x: 14
y: -4
structural: 10
- x: 15
y: -4
structural: 10
- x: 16
y: -4
structural: 10
- x: 17
y: -4
structural: 10
- x: 18
y: -4
structural: 10
- x: 19
y: -4
structural: 10
- x: 20
y: -4
structural: 10
- x: 21
y: -4
structural: 10
- x: 22
y: -4
structural: 10
- x: 23
y: -4
structural: 10
- x: 0
y: -3
structural: 10
- x: 1
y: -3
structural: 10
- x: 2
y: -3
structural: 10
- x: 3
y: -3
structural: 10
- x: 4
y: -3
structural: 10
- x: 5
y: -3
structural: 10
- x: 6
y: -3
structural: 10
- x: 7
y: -3
structural: 10
- x: 8
y: -3
structural: 10
- x: 9
y: -3
structural: 10
- x: 10
y: -3
structural: 10
- x: 11
y: -3
structural: 10
- x: 12
y: -3
structural: 10
- x: 13
y: -3
structural: 10
- x: 14
y: -3
structural: 10
- x: 15
y: -3
structural: 10
- x: 16
y: -3
structural: 10
- x: 17
y: -3
structural: 10
- x: 18
y: -3
structural: 10
- x: 19
y: -3
structural: 10
- x: 20
y: -3
structural: 10
- x: 21
y: -3
structural: 10
- x: 22
y: -3
structural: 10
- x: 23
y: -3
structural: 10
- x: 2
y: -2
structural: 10
- x: 3
y: -2
structural: 10
- x: 4
y: -2
structural: 10
- x: 5
y: -2
structural: 10
- x: 6
y: -2
structural: 10
- x: 7
y: -2
structural: 10
- x: 8
y: -2
structural: 10
- x: 9
y: -2
structural: 10
- x: 10
y: -2
structural: 10
- x: 11
y: -2
structural: 10
- x: 12
y: -2
structural: 10
- x: 13
y: -2
structural: 10
- x: 14
y: -2
structural: 10
- x: 15
y: -2
structural: 10
- x: 16
y: -2
structural: 10
- x: 17
y: -2
structural: 10
- x: 18
y: -2
structural: 10
- x: 19
y: -2
structural: 10
- x: 20
y: -2
structural: 10
- x: 21
y: -2
structural: 10
- x: 22
y: -2
structural: 10
- x: 23
y: -2
structural: 10
- x: 2
y: -1
structural: 10
- x: 3
y: -1
structural: 10
- x: 4
y: -1
structural: 10
- x: 5
y: -1
structural: 10
- x: 6
y: -1
structural: 10
- x: 7
y: -1
structural: 10
- x: 8
y: -1
structural: 10
- x: 9
y: -1
structural: 10
- x: 10
y: -1
structural: 10
- x: 11
y: -1
structural: 10
- x: 12
y: -1
structural: 10
- x: 13
y: -1
structural: 10
- x: 14
y: -1
structural: 10
- x: 15
y: -1
structural: 10
- x: 16
y: -1
structural: 10
- x: 17
y: -1
structural: 10
- x: 18
y: -1
structural: 10
- x: 19
y: -1
structural: 10
- x: 20
y: -1
structural: 10
- x: 21
y: -1
structural: 10
- x: 22
y: -1
structural: 10
- x: 23
y: -1
structural: 10
objects: []

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 986add1c4852f46ac80efdf48d291d8e
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -48,6 +48,29 @@ MonoBehaviour:
y: 1
- x: 3
y: 1
- id: stage_fb59a93990cd45709e459d59512ea43e
displayName: Stage 3
stageKind: 0
worldLayer: 0
color: {r: 0.530986, g: 0.26420996, b: 0.8053274, a: 0.8457824}
stageDefinition: {fileID: 11400000, guid: 986add1c4852f46ac80efdf48d291d8e, type: 2}
occupiedTiles:
- x: 0
y: 2
- x: 1
y: 2
- x: 2
y: 2
- x: 3
y: 2
- x: 0
y: 3
- x: 1
y: 3
- x: 2
y: 3
- x: 3
y: 3
endpoints:
- id: endpoint_bb859113836e4b89860e97fb2589a4be
stageId: stage_bd361c8ccbe4421cab5ad85cd71d081a
@ -65,8 +88,28 @@ MonoBehaviour:
kind: 0
required: 1
socketFace: 2
- id: endpoint_955d173dc8d548b2a9c94099921c8931
stageId: stage_fb59a93990cd45709e459d59512ea43e
worldTile:
x: 2
y: 2
kind: 0
required: 1
socketFace: 0
- id: endpoint_e5c45da78d2545f4a250503639d6394b
stageId: stage_bd361c8ccbe4421cab5ad85cd71d081a
worldTile:
x: 2
y: 1
kind: 0
required: 1
socketFace: 1
connections:
- id: connection_1099167b7150449491c4cf0d1b4e9b0a
endpointAId: endpoint_bb859113836e4b89860e97fb2589a4be
endpointBId: endpoint_d6f5daa321f14376a237ac78ecdeb172
directionality: 0
- id: connection_6cdcba126e8a4736952cfcc89d195826
endpointAId: endpoint_955d173dc8d548b2a9c94099921c8931
endpointBId: endpoint_e5c45da78d2545f4a250503639d6394b
directionality: 0

View File

@ -13,9 +13,9 @@ MonoBehaviour:
m_Name: JGraph-Test01
m_EditorClassIdentifier: Assembly-CSharp::Intrepid.Gameplay.Journey.JGraphSO
sourceWorldLayoutId: 4dac43bfd76a4286a40511c1cce4609b
publishedAt: 2026-06-22T11:40:47.6512990Z
publishedAt: 2026-06-23T09:22:33.3495120Z
schemaVersion: 1
contentHash: 6224a08985c67c0cf4d2fa4c9e88bf65f4b7137966b8432ed665f62c7c99778d
contentHash: 5ac6d753ef79c2b4221f437b44edf6e64c32709407d7bb8e41f95be668d03733
stages:
- id: stage_7f2050e54c664f349472c788bb702cce
displayName: Stage 1
@ -43,6 +43,27 @@ MonoBehaviour:
- x: 3
y: 1
tags: []
- id: stage_fb59a93990cd45709e459d59512ea43e
displayName: Stage 3
worldLayer: 0
occupiedTiles:
- x: 0
y: 2
- x: 1
y: 2
- x: 2
y: 2
- x: 3
y: 2
- x: 0
y: 3
- x: 1
y: 3
- x: 2
y: 3
- x: 3
y: 3
tags: []
endpoints:
- id: endpoint_bb859113836e4b89860e97fb2589a4be
stageId: stage_bd361c8ccbe4421cab5ad85cd71d081a
@ -60,8 +81,28 @@ MonoBehaviour:
kind: 0
required: 1
socketFace: 2
- id: endpoint_955d173dc8d548b2a9c94099921c8931
stageId: stage_fb59a93990cd45709e459d59512ea43e
worldTile:
x: 2
y: 2
kind: 0
required: 1
socketFace: 0
- id: endpoint_e5c45da78d2545f4a250503639d6394b
stageId: stage_bd361c8ccbe4421cab5ad85cd71d081a
worldTile:
x: 2
y: 1
kind: 0
required: 1
socketFace: 1
connections:
- id: connection_1099167b7150449491c4cf0d1b4e9b0a
endpointAId: endpoint_bb859113836e4b89860e97fb2589a4be
endpointBId: endpoint_d6f5daa321f14376a237ac78ecdeb172
directionality: 0
- id: connection_6cdcba126e8a4736952cfcc89d195826
endpointAId: endpoint_955d173dc8d548b2a9c94099921c8931
endpointBId: endpoint_e5c45da78d2545f4a250503639d6394b
directionality: 0

View File

@ -16,3 +16,4 @@ MonoBehaviour:
stagesTags:
- {fileID: 11400000, guid: b0fc23a68ad024c30a531fc69243b2a2, type: 2}
- {fileID: 11400000, guid: ed5f85b3145ce4eabae9b1382f675817, type: 2}
- {fileID: 11400000, guid: 1a39dcfa3780544d8b1dbc484a3720e8, type: 2}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1,17 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 05ed6f9811ad495c85269adab82741b3, type: 3}
m_Name: Stage 3
m_EditorClassIdentifier: Assembly-CSharp::Intrepid.Gameplay.Journey.StageTag
code: Stage 3
stageId: stage_fb59a93990cd45709e459d59512ea43e
localization: {fileID: 0}

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 1a39dcfa3780544d8b1dbc484a3720e8
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 6893f46caac244249b2dba6ed7fd0941
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -63,6 +63,14 @@ namespace Editor.GON.StageEditor
public List<StageFloorDefinition> floors = new();
public List<StageObjectDefinition> objects = new();
private void OnValidate()
{
if (stageTag.IsNotNull() && !string.IsNullOrWhiteSpace(worldSync.worldStageId))
{
stageTag.StageId = worldSync.worldStageId;
}
}
public StageFloorDefinition ActiveFloor
{
get

View File

@ -13,7 +13,11 @@ namespace Intrepid.Gameplay.Journey
[GroupConfigurations, SerializeField] private string stageId;
[GroupConfigurations, SerializeField] private LocalizationTag localization;
public string StageId => stageId;
public string StageId
{
get => stageId;
set => stageId = value;
}
public LocalizationTag Localization => localization;
}
}

View File

@ -34,5 +34,13 @@ namespace Intrepid.Gameplay.Journey.Stages.Sockets
{
OnValidate();
}
#if UNITY_EDITOR
private void OnDrawGizmos()
{
Gizmos.color = Color.red;
Gizmos.DrawWireSphere(deploymentPoint.position, .5f);
}
#endif
}
}

View File

@ -12,7 +12,7 @@ namespace Intrepid.Gameplay.Journey.Stages
{
public class StageManager : EventListener
{
[GroupConfigurations, SerializeField] private string stageId;
[GroupConfigurations, SerializeField] private StageTag stageTag;
[GroupDebug, SerializeField] private List<StageSocket> sockets;
private Dictionary<string, StageSocket> SocketMap { get; } = new();
@ -50,7 +50,7 @@ namespace Intrepid.Gameplay.Journey.Stages
sockets.Clear();
foreach (var stageSocket in GetComponentsInChildren<StageSocket>())
{
stageSocket.StageId = stageId;
stageSocket.StageId = stageTag.StageId;
sockets.Add(stageSocket);
SocketMap.Add(stageSocket.EndpointId, stageSocket);
}