Merge commit '8bc3916425915d8239ea4f817263efb2e28f9304' into daimini/gitflow_230407_multiplayersample-assets

Gems/kb3d_mps/Assets/KB3D_HighTechStreets/Prefabs/HTS_Road_G.prefab

@@ -1754,6 +1754,9 @@
                                 }
                             }
                         }
+                    },
+                    "DebugDrawSettings": {
+                        "LocallyEnabled": false
                     }
                 },
                 "Component_[17340959477533051509]": {
@@ -2215,7 +2218,7 @@
                 {
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[11882972241381921570]/Transform Data/Translate/0",
-                    "value": -15.723724365234375
+                    "value": -15.723724365234377
                 },
                 {
                     "op": "replace",

Gems/level_art_mps/Assets/JumpPad/jumppad.prefab

@@ -58,97 +58,6 @@
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 10078836605200387099
                 },
-                "Component_[10277696138249967250]": {
-                    "$type": "PopcornFXEmitterEditorComponent",
-                    "Id": 10277696138249967250,
-                    "ParticleSystem": {
-                        "assetId": {
-                            "guid": "{3FD29CAB-9815-5751-BFE2-31C5795D03EC}"
-                        },
-                        "assetHint": "popcornfx/particles/fx_jumppad.pkfx"
-                    },
-                    "PrewarmTime": 0.0,
-                    "AttributeList": {
-                        "Attributes": [
-                            {
-                                "Name": "GlobalScale",
-                                "Type": 31
-                            },
-                            {
-                                "Name": "Color",
-                                "Type": 34
-                            },
-                            {
-                                "Name": "Launch",
-                                "Type": 1
-                            },
-                            {
-                                "Name": "Range",
-                                "Type": 31
-                            },
-                            {
-                                "Name": "Brightness",
-                                "Type": 31
-                            },
-                            {
-                                "Name": "Bursts",
-                                "Type": 31
-                            },
-                            {
-                                "Name": "DistortionPower",
-                                "Type": 31
-                            }
-                        ],
-                        "AttributesRawData": "mpmZPwAAAAAAAAAAAAAAAAAAAAAAAIA/GFRAPgAAgD8AAAAAAAAAAAAAAAAAAAAAAACAPwAAAAAAAAAAAAAAAAAAoEAAAAAAAAAAAAAAAAAAAIA/AAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAA=="
-                    },
-                    "EditorAttributeList": {
-                        "AttributeCategories": [
-                            {
-                                "Attributes": [
-                                    {
-                                        "ValueFX": 1.0
-                                    },
-                                    {
-                                        "ValueFX": 2.0
-                                    }
-                                ]
-                            },
-                            {
-                                "Attributes": [
-                                    {
-                                        "Color": [
-                                            0.0,
-                                            1.0,
-                                            0.18782079219818115
-                                        ]
-                                    },
-                                    {
-                                        "ValueFX": 5.0
-                                    }
-                                ]
-                            },
-                            {
-                                "Attributes": [
-                                    {
-                                        "ValueFX": 1.0
-                                    }
-                                ]
-                            },
-                            {
-                                "Attributes": [
-                                    {}
-                                ]
-                            },
-                            {
-                                "Attributes": [
-                                    {
-                                        "ValueFX": 1.2000000476837158
-                                    }
-                                ]
-                            }
-                        ]
-                    }
-                },
                 "Component_[10423858960960691779]": {
                     "$type": "AZ::Render::EditorMeshComponent",
                     "Id": 10423858960960691779,
@@ -166,7 +75,10 @@
                 },
                 "Component_[12283440537049891922]": {
                     "$type": "EditorEntitySortComponent",
-                    "Id": 12283440537049891922
+                    "Id": 12283440537049891922,
+                    "Child Entity Order": [
+                        "Entity_[20239823635620]"
+                    ]
                 },
                 "Component_[12818888677478174901]": {
                     "$type": "EditorAudioTriggerComponent",
@@ -360,6 +272,152 @@
                     "Id": 9239518287260626782
                 }
             }
+        },
+        "Entity_[20239823635620]": {
+            "Id": "Entity_[20239823635620]",
+            "Name": "jumppadFx",
+            "Components": {
+                "Component_[10039726488493153784]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 10039726488493153784
+                },
+                "Component_[10918246284294112742]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 10918246284294112742,
+                    "Parent Entity": "Entity_[1104171344821059]",
+                    "Transform Data": {
+                        "Translate": [
+                            0.0,
+                            0.0,
+                            0.12310004234313965
+                        ],
+                        "Rotate": [
+                            180.0,
+                            0.0,
+                            180.0
+                        ]
+                    }
+                },
+                "Component_[1541676746712690353]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 1541676746712690353
+                },
+                "Component_[1613717797376241316]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 1613717797376241316
+                },
+                "Component_[16570740466809034129]": {
+                    "$type": "PopcornFXEmitterEditorComponent",
+                    "Id": 16570740466809034129,
+                    "ParticleSystem": {
+                        "assetId": {
+                            "guid": "{3FD29CAB-9815-5751-BFE2-31C5795D03EC}"
+                        },
+                        "assetHint": "popcornfx/particles/fx_jumppad.pkfx"
+                    },
+                    "PrewarmTime": 0.0,
+                    "AttributeList": {
+                        "Attributes": [
+                            {
+                                "Name": "GlobalScale",
+                                "Type": 31
+                            },
+                            {
+                                "Name": "Color",
+                                "Type": 34
+                            },
+                            {
+                                "Name": "Launch",
+                                "Type": 1
+                            },
+                            {
+                                "Name": "Range",
+                                "Type": 31
+                            },
+                            {
+                                "Name": "Brightness",
+                                "Type": 31
+                            },
+                            {
+                                "Name": "Bursts",
+                                "Type": 31
+                            },
+                            {
+                                "Name": "DistortionPower",
+                                "Type": 31
+                            }
+                        ],
+                        "AttributesRawData": "mpmZPwAAAAAAAAAAAAAAAAAAAAAAAIA/GFRAPgAAgD8AAAAAAAAAAAAAAAAAAAAAAACAPwAAAAAAAAAAAAAAAAAAoEAAAAAAAAAAAAAAAAAAAIA/AAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAA=="
+                    },
+                    "EditorAttributeList": {
+                        "AttributeCategories": [
+                            {
+                                "Attributes": [
+                                    {
+                                        "ValueFX": 1.0
+                                    },
+                                    {
+                                        "ValueFX": 2.0
+                                    }
+                                ]
+                            },
+                            {
+                                "Attributes": [
+                                    {
+                                        "Color": [
+                                            0.0,
+                                            1.0,
+                                            0.18782079219818115
+                                        ]
+                                    },
+                                    {
+                                        "ValueFX": 5.0
+                                    }
+                                ]
+                            },
+                            {
+                                "Attributes": [
+                                    {
+                                        "ValueFX": 1.0
+                                    }
+                                ]
+                            },
+                            {
+                                "Attributes": [
+                                    {}
+                                ]
+                            },
+                            {
+                                "Attributes": [
+                                    {
+                                        "ValueFX": 1.2000000476837158
+                                    }
+                                ]
+                            }
+                        ]
+                    }
+                },
+                "Component_[18363391600917116732]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 18363391600917116732
+                },
+                "Component_[2236560654144302887]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 2236560654144302887
+                },
+                "Component_[5961259476451355829]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 5961259476451355829
+                },
+                "Component_[6955340436542433750]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 6955340436542433750
+                },
+                "Component_[9227924109322544032]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 9227924109322544032
+                }
+            }
         }
     }
 }

Gems/level_art_mps/Assets/MalfunctioningShieldGenerator/mshieldgen.prefab

@@ -248,6 +248,22 @@
                                     "VariableName": "ExplodeTimesDuringMatch",
                                     "InitialValueSource": 1
                                 },
+                                {
+                                    "Datum": {
+                                        "isOverloadedStorage": false,
+                                        "scriptCanvasType": {
+                                            "m_type": 4,
+                                            "m_azType": "{FC3DA616-174B-48FD-9BFB-BC277132FB47}"
+                                        },
+                                        "isNullPointer": false,
+                                        "$type": "MultiplayerSample::SpawnDecalConfig"
+                                    },
+                                    "VariableId": {
+                                        "m_id": "{62E2846B-1201-4A3D-9C17-2A85C76998BE}"
+                                    },
+                                    "VariableName": "Weapon Impact Decal Config",
+                                    "InitialValueSource": 1
+                                },
                                 {
                                     "Datum": {
                                         "isOverloadedStorage": false,
@@ -317,6 +333,34 @@
                                     "VariableName": "ExplodeTimesDuringMatch",
                                     "InitialValueSource": 1
                                 },
+                                {
+                                    "Datum": {
+                                        "isOverloadedStorage": false,
+                                        "scriptCanvasType": {
+                                            "m_type": 4,
+                                            "m_azType": "{FC3DA616-174B-48FD-9BFB-BC277132FB47}"
+                                        },
+                                        "isNullPointer": false,
+                                        "$type": "MultiplayerSample::SpawnDecalConfig",
+                                        "value": {
+                                            "MaterialAssetId": {
+                                                "guid": "{FD203077-616F-53C5-9553-660CCB88DB7B}"
+                                            },
+                                            "Scale": 8.0,
+                                            "LifeTimeSec": 8.0,
+                                            "FadeInTimeSec": 0.25,
+                                            "FadeOutTimeSec": 4.0
+                                        }
+                                    },
+                                    "InputControlVisibility": {
+                                        "Value": 850104567
+                                    },
+                                    "VariableId": {
+                                        "m_id": "{62E2846B-1201-4A3D-9C17-2A85C76998BE}"
+                                    },
+                                    "VariableName": "Weapon Impact Decal Config",
+                                    "InitialValueSource": 1
+                                },
                                 {
                                     "Datum": {
                                         "isOverloadedStorage": false,