birkeh
/
o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updating the RPC test level to use the new TestLevelEntity autocomponent; this way the level entity and player use a different autocomponent. Updating scripts to use the new component as well

Browse Source 
Signed-off-by: Gene Walters <genewalt@amazon.com>
monroegm-disable-blank-issue-2
Gene Walters 4 years ago
parent 112e310419
commit 6311776b10
3 changed files with 3491 additions and 100 deletions
Show Stats Download Patch File Download Diff File

57
AutomatedTesting/Levels/Multiplayer/AutoComponent_RPC/AutoComponent_RPC.prefab
Unescape Escape View File

@ -568,22 +568,10 @@
"$type": "EditorScriptCanvasComponent",
"Id": 14750978061505735417,
"m_name": "GlobalGameData",
"m_assetHolder": {
"m_asset": {
"assetId": {
"guid": "{B16589A0-EA01-56BC-8141-91A3967FB95F}"
},
"assetHint": "levels/multiplayer/autocomponent_rpc/globalgamedata.scriptcanvas"
}
},
"runtimeDataIsValid": true,
"runtimeDataOverrides": {
"source": {
"assetId": {
"guid": "{B16589A0-EA01-56BC-8141-91A3967FB95F}"
},
"assetHint": "levels/multiplayer/autocomponent_rpc/globalgamedata.scriptcanvas"
}
"sourceHandle": {
"id": "{B16589A0-EA01-56BC-8141-91A3967FB95F}",
"path": "levels/multiplayer/autocomponent_rpc/globalgamedata.scriptcanvas"
}
},
"Component_[16436925042043744033]": {
@ -636,6 +624,13 @@
"$type": "SelectionComponent",
"Id": 12302672911455629152
},
"Component_[12517591696100736853]": {
"$type": "GenericComponentWrapper",
"Id": 12517591696100736853,
"m_template": {
"$type": "AutomatedTesting::NetworkTestLevelEntityComponent"
}
},
"Component_[14169903623243423134]": {
"$type": "EditorVisibilityComponent",
"Id": 14169903623243423134
@ -644,13 +639,6 @@
"$type": "EditorInspectorComponent",
"Id": 14607413934411389854
},
"Component_[15396284312416541768]": {
"$type": "GenericComponentWrapper",
"Id": 15396284312416541768,
"m_template": {
"$type": "Multiplayer::LocalPredictionPlayerInputComponent"
}
},
"Component_[15494977028055234270]": {
"$type": "EditorDisabledCompositionComponent",
"Id": 15494977028055234270
@ -682,22 +670,10 @@
"$type": "EditorScriptCanvasComponent",
"Id": 7256163899440301540,
"m_name": "AutoComponent_RPC_NetLevelEntity",
"m_assetHolder": {
"m_asset": {
"assetId": {
"guid": "{1D517006-AC01-5ECA-AE66-0E007871F0CD}"
},
"assetHint": "levels/multiplayer/autocomponent_rpc/autocomponent_rpc_netlevelentity.scriptcanvas"
}
},
"runtimeDataIsValid": true,
"runtimeDataOverrides": {
"source": {
"assetId": {
"guid": "{1D517006-AC01-5ECA-AE66-0E007871F0CD}"
},
"assetHint": "levels/multiplayer/autocomponent_rpc/autocomponent_rpc_netlevelentity.scriptcanvas"
}
"sourceHandle": {
"id": "{1D517006-AC01-5ECA-AE66-0E007871F0CD}",
"path": "levels/multiplayer/autocomponent_rpc/autocomponent_rpc_netlevelentity.scriptcanvas"
}
},
"Component_[731336627222243355]": {
@ -730,13 +706,6 @@
"$type": "NetBindComponent"
}
},
"Component_[9816897251206708579]": {
"$type": "GenericComponentWrapper",
"Id": 9816897251206708579,
"m_template": {
"$type": "AutomatedTesting::NetworkTestPlayerComponent"
}
},
"Component_[9880860858035405475]": {
"$type": "EditorOnlyEntityComponent",
"Id": 9880860858035405475

3085
AutomatedTesting/Levels/Multiplayer/AutoComponent_RPC/AutoComponent_RPC.scriptcanvas
View File

File diff suppressed because it is too large Load Diff

449
AutomatedTesting/Levels/Multiplayer/AutoComponent_RPC/AutoComponent_RPC_NetLevelEntity.scriptcanvas
Unescape Escape View File

@ -5,7 +5,7 @@
"ClassData": {
"m_scriptCanvas": {
"Id": {
"id": 7369225496155711251
"id": 7558387155527535988
},
"Name": "AutoComponent_RPC_NetLevelEntity",
"Components": {
@ -93,7 +93,6 @@
],
"Datums": [
{
"isOverloadedStorage": false,
"scriptCanvasType": {
"m_type": 1
},
@ -108,6 +107,9 @@
"methodType": 2,
"methodName": "GetAuthorityToClientNoParams_PlayFxEventByEntityId",
"className": "NetworkTestLevelEntityComponent",
"resultSlotIDs": [
{}
],
"inputSlots": [
{
"m_id": "{AE2A0AA3-99DD-4DE4-AFEA-7560F078943C}"
@ -688,6 +690,199 @@
}
}
},
{
"Id": {
"id": 11750998249450
},
"Name": "SC-Node(IsNetEntityRoleAuthority)",
"Components": {
"Component_[17217487756380135718]": {
"$type": "{E42861BD-1956-45AE-8DD7-CCFC1E3E5ACF} Method",
"Id": 17217487756380135718,
"Slots": [
{
"id": {
"m_id": "{C58EF254-1A51-443B-B35E-B26831323D27}"
},
"contracts": [
{
"$type": "SlotTypeContract"
}
],
"slotName": "EntityId: 0",
"Descriptor": {
"ConnectionType": 1,
"SlotType": 2
},
"DataType": 1
},
{
"id": {
"m_id": "{98927A53-663A-452D-ABAF-01D31F7D5D53}"
},
"contracts": [
{
"$type": "SlotTypeContract"
}
],
"slotName": "In",
"Descriptor": {
"ConnectionType": 1,
"SlotType": 1
}
},
{
"id": {
"m_id": "{89F646CA-FBC6-45D2-916B-0B47474EE693}"
},
"contracts": [
{
"$type": "SlotTypeContract"
}
],
"slotName": "Out",
"Descriptor": {
"ConnectionType": 2,
"SlotType": 1
}
},
{
"id": {
"m_id": "{3FFC81A6-5C31-4CBA-8253-5DF361F10610}"
},
"contracts": [
{
"$type": "SlotTypeContract"
}
],
"slotName": "Is Role Authority",
"DisplayDataType": {
"m_type": 0
},
"Descriptor": {
"ConnectionType": 2,
"SlotType": 2
},
"DataType": 1
}
],
"Datums": [
{
"isOverloadedStorage": false,
"scriptCanvasType": {
"m_type": 1
},
"isNullPointer": false,
"$type": "EntityId",
"value": {
"id": 2901262558
},
"label": "Entity Id"
}
],
"methodType": 2,
"methodName": "IsNetEntityRoleAuthority",
"className": "NetBindComponent",
"inputSlots": [
{
"m_id": "{C58EF254-1A51-443B-B35E-B26831323D27}"
}
],
"prettyClassName": "NetBindComponent"
}
}
},
{
"Id": {
"id": 13206992162794
},
"Name": "SC-Node(Gate)",
"Components": {
"Component_[18126119383071583133]": {
"$type": "Gate",
"Id": 18126119383071583133,
"Slots": [
{
"id": {
"m_id": "{3896AA13-516C-410F-AB9C-2CAA5E71AEF6}"
},
"contracts": [
{
"$type": "SlotTypeContract"
}
],
"slotName": "Condition",
"toolTip": "If true the node will signal the Output and proceed execution",
"Descriptor": {
"ConnectionType": 1,
"SlotType": 2
},
"DataType": 1
},
{
"id": {
"m_id": "{F651B19A-FD1A-44EB-9C16-0CDB44CD85AA}"
},
"contracts": [
{
"$type": "SlotTypeContract"
}
],
"slotName": "In",
"toolTip": "Input signal",
"Descriptor": {
"ConnectionType": 1,
"SlotType": 1
}
},
{
"id": {
"m_id": "{78807DC9-82B7-4893-ADA4-53E51C2AD3D1}"
},
"contracts": [
{
"$type": "SlotTypeContract"
}
],
"slotName": "True",
"toolTip": "Signaled if the condition provided evaluates to true.",
"Descriptor": {
"ConnectionType": 2,
"SlotType": 1
}
},
{
"id": {
"m_id": "{3B353484-F14C-4D93-AD1D-6F3EDAE4B71C}"
},
"contracts": [
{
"$type": "SlotTypeContract"
}
],
"slotName": "False",
"toolTip": "Signaled if the condition provided evaluates to false.",
"Descriptor": {
"ConnectionType": 2,
"SlotType": 1
}
}
],
"Datums": [
{
"isOverloadedStorage": false,
"scriptCanvasType": {
"m_type": 0
},
"isNullPointer": false,
"$type": "bool",
"value": false,
"label": "Condition"
}
]
}
}
},
{
"Id": {
"id": 57025381737912
@ -882,7 +1077,6 @@
],
"Datums": [
{
"isOverloadedStorage": false,
"scriptCanvasType": {
"m_type": 1
},
@ -897,6 +1091,9 @@
"methodType": 2,
"methodName": "AuthorityToClientNoParams_PlayFxByEntityId",
"className": "NetworkTestLevelEntityComponent",
"resultSlotIDs": [
{}
],
"inputSlots": [
{
"m_id": "{029728DF-0939-4D64-A9A1-3DB4B8AF127E}"
@ -1036,7 +1233,6 @@
],
"Datums": [
{
"isOverloadedStorage": false,
"scriptCanvasType": {
"m_type": 4,
"m_azType": "{F429F985-AF00-529B-8449-16E56694E5F9}"
@ -1223,34 +1419,6 @@
}
}
},
{
"Id": {
"id": 57055446508984
},
"Name": "srcEndpoint=(TimeDelay: Done), destEndpoint=(Repeater: Start)",
"Components": {
"Component_[6292481678297438578]": {
"$type": "{64CA5016-E803-4AC4-9A36-BDA2C890C6EB} Connection",
"Id": 6292481678297438578,
"sourceEndpoint": {
"nodeId": {
"id": 57012496836024
},
"slotId": {
"m_id": "{158B30BE-BD39-40AE-A8A8-F0E5694F0180}"
}
},
"targetEndpoint": {
"nodeId": {
"id": 56986727032248
},
"slotId": {
"m_id": "{07267CBA-B377-4B57-8A04-E322F8BFC07F}"
}
}
}
}
},
{
"Id": {
"id": 10269167405311
@ -1530,6 +1698,118 @@
}
}
}
},
{
"Id": {
"id": 13030898503658
},
"Name": "srcEndpoint=(TimeDelay: Done), destEndpoint=(IsNetEntityRoleAuthority: In)",
"Components": {
"Component_[14235185264262332827]": {
"$type": "{64CA5016-E803-4AC4-9A36-BDA2C890C6EB} Connection",
"Id": 14235185264262332827,
"sourceEndpoint": {
"nodeId": {
"id": 57012496836024
},
"slotId": {
"m_id": "{158B30BE-BD39-40AE-A8A8-F0E5694F0180}"
}
},
"targetEndpoint": {
"nodeId": {
"id": 11750998249450
},
"slotId": {
"m_id": "{98927A53-663A-452D-ABAF-01D31F7D5D53}"
}
}
}
}
},
{
"Id": {
"id": 14005856079850
},
"Name": "srcEndpoint=(IsNetEntityRoleAuthority: Out), destEndpoint=(If: In)",
"Components": {
"Component_[16302238484508620286]": {
"$type": "{64CA5016-E803-4AC4-9A36-BDA2C890C6EB} Connection",
"Id": 16302238484508620286,
"sourceEndpoint": {
"nodeId": {
"id": 11750998249450
},
"slotId": {
"m_id": "{89F646CA-FBC6-45D2-916B-0B47474EE693}"
}
},
"targetEndpoint": {
"nodeId": {
"id": 13206992162794
},
"slotId": {
"m_id": "{F651B19A-FD1A-44EB-9C16-0CDB44CD85AA}"
}
}
}
}
},
{
"Id": {
"id": 14302208823274
},
"Name": "srcEndpoint=(IsNetEntityRoleAuthority: Is Role Authority), destEndpoint=(If: Condition)",
"Components": {
"Component_[3887593885874168259]": {
"$type": "{64CA5016-E803-4AC4-9A36-BDA2C890C6EB} Connection",
"Id": 3887593885874168259,
"sourceEndpoint": {
"nodeId": {
"id": 11750998249450
},
"slotId": {
"m_id": "{3FFC81A6-5C31-4CBA-8253-5DF361F10610}"
}
},
"targetEndpoint": {
"nodeId": {
"id": 13206992162794
},
"slotId": {
"m_id": "{3896AA13-516C-410F-AB9C-2CAA5E71AEF6}"
}
}
}
}
},
{
"Id": {
"id": 14637216272362
},
"Name": "srcEndpoint=(If: True), destEndpoint=(Repeater: Start)",
"Components": {
"Component_[8721834474263401249]": {
"$type": "{64CA5016-E803-4AC4-9A36-BDA2C890C6EB} Connection",
"Id": 8721834474263401249,
"sourceEndpoint": {
"nodeId": {
"id": 13206992162794
},
"slotId": {
"m_id": "{78807DC9-82B7-4893-ADA4-53E51C2AD3D1}"
}
},
"targetEndpoint": {
"nodeId": {
"id": 56986727032248
},
"slotId": {
"m_id": "{07267CBA-B377-4B57-8A04-E322F8BFC07F}"
}
}
}
}
}
]
},
@ -1571,6 +1851,37 @@
}
}
},
{
"Key": {
"id": 11750998249450
},
"Value": {
"ComponentData": {
"{24CB38BB-1705-4EC5-8F63-B574571B4DCD}": {
"$type": "NodeSaveData"
},
"{328FF15C-C302-458F-A43D-E1794DE0904E}": {
"$type": "GeneralNodeTitleComponentSaveData",
"PaletteOverride": "MethodNodeTitlePalette"
},
"{7CC444B1-F9B3-41B5-841B-0C4F2179F111}": {
"$type": "GeometrySaveData",
"Position": [
100.0,
60.0
]
},
"{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}": {
"$type": "StylingComponentSaveData",
"SubStyle": ".method"
},
"{B1F49A35-8408-40DA-B79E-F1E3B64322CE}": {
"$type": "PersistentIdComponentSaveData",
"PersistentId": "{73B270BC-9743-41C1-9E48-0CAB5A63AC97}"
}
}
}
},
{
"Key": {
"id": 11993350262154
@ -1587,8 +1898,8 @@
"{7CC444B1-F9B3-41B5-841B-0C4F2179F111}": {
"$type": "GeometrySaveData",
"Position": [
-120.0,
340.0
60.0,
480.0
]
},
"{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}": {
@ -1618,8 +1929,8 @@
"{7CC444B1-F9B3-41B5-841B-0C4F2179F111}": {
"$type": "GeometrySaveData",
"Position": [
340.0,
360.0
520.0,
500.0
]
},
"{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}": {
@ -1633,6 +1944,36 @@
}
}
},
{
"Key": {
"id": 13206992162794
},
"Value": {
"ComponentData": {
"{24CB38BB-1705-4EC5-8F63-B574571B4DCD}": {
"$type": "NodeSaveData"
},
"{328FF15C-C302-458F-A43D-E1794DE0904E}": {
"$type": "GeneralNodeTitleComponentSaveData",
"PaletteOverride": "LogicNodeTitlePalette"
},
"{7CC444B1-F9B3-41B5-841B-0C4F2179F111}": {
"$type": "GeometrySaveData",
"Position": [
540.0,
60.0
]
},
"{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}": {
"$type": "StylingComponentSaveData"
},
"{B1F49A35-8408-40DA-B79E-F1E3B64322CE}": {
"$type": "PersistentIdComponentSaveData",
"PersistentId": "{3F73BD0E-D02D-4A48-9E25-F9FD4A0F1B89}"
}
}
}
},
{
"Key": {
"id": 16962627423626
@ -1649,8 +1990,8 @@
"{7CC444B1-F9B3-41B5-841B-0C4F2179F111}": {
"$type": "GeometrySaveData",
"Position": [
440.0,
-40.0
1240.0,
0.0
]
},
"{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}": {
@ -1680,8 +2021,8 @@
"{7CC444B1-F9B3-41B5-841B-0C4F2179F111}": {
"$type": "GeometrySaveData",
"Position": [
80.0,
-60.0
860.0,
0.0
]
},
"{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}": {
@ -1740,8 +2081,8 @@
"{7CC444B1-F9B3-41B5-841B-0C4F2179F111}": {
"$type": "GeometrySaveData",
"Position": [
800.0,
260.0
980.0,
400.0
]
},
"{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}": {
@ -1770,8 +2111,8 @@
"{7CC444B1-F9B3-41B5-841B-0C4F2179F111}": {
"$type": "GeometrySaveData",
"Position": [
420.0,
100.0
1220.0,
140.0
]
},
"{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}": {
@ -1800,8 +2141,8 @@
"{7CC444B1-F9B3-41B5-841B-0C4F2179F111}": {
"$type": "GeometrySaveData",
"Position": [
800.0,
460.0
980.0,
600.0
]
},
"{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}": {
@ -1877,16 +2218,16 @@
},
{
"Key": {
"id": 7369225496155711251
"id": 7558387155527535988
},
"Value": {
"ComponentData": {
"{5F84B500-8C45-40D1-8EFC-A5306B241444}": {
"$type": "SceneComponentSaveData",
"ViewParams": {
"Scale": 0.7585823890144868,
"AnchorX": -205.64674377441406,
"AnchorY": -467.9781799316406
"Scale": 0.9585879578077288,
"AnchorX": 488.2181091308594,
"AnchorY": -175.25778198242188
}
}
}
@ -1915,6 +2256,14 @@
"Key": 6462358712820489356,
"Value": 1
},
{
"Key": 8065262779685207188,
"Value": 1
},
{
"Key": 8452971738487658154,
"Value": 1
},
{
"Key": 10684225535275896474,
"Value": 3

Write Preview
Loading…
Cancel
Save