Merge commit '578c7b203eaab3994fdd3a39d5b1d5e63d75c4e6' into mbalfour/gitflow_230330_o3de_multiplayersample_assets

Signed-off-by: Mike Balfour <[email protected]>

Gems/level_art_mps/Assets/Teleporter_Platform/Teleporter.prefab

@@ -90,7 +90,7 @@
                         "Translate": [
                             0.0,
                             0.0,
-                            1.6311988830566406
+                            1.6426494121551514
                         ]
                     }
                 },
@@ -104,13 +104,25 @@
                     "Id": 7892090471544718256,
                     "ParticleSystem": {
                         "assetId": {
-                            "guid": "{F16C718B-7B3D-5F6B-877C-0CA15AAE7544}"
+                            "guid": "{EAD91758-94E3-597E-94CF-FB52F72B7252}"
                         },
-                        "assetHint": "popcornfx/particles/energyballtrap/fx_energyballtrap_buildup.pkfx"
+                        "assetHint": "popcornfx/particles/defenseturret/fx_defenseturret_projectile.pkfx"
                     },
                     "PrewarmTime": 0.0,
                     "AttributeList": {
                         "Attributes": [
+                            {
+                                "Name": "Fire Rate",
+                                "Type": 31
+                            },
+                            {
+                                "Name": "Color1",
+                                "Type": 34
+                            },
+                            {
+                                "Name": "Color2",
+                                "Type": 34
+                            },
                             {
                                 "Name": "Color Intensity",
                                 "Type": 31
@@ -120,17 +132,34 @@
                                 "Type": 31
                             }
                         ],
-                        "AttributesRawData": "AAAAQAAAAAAAAAAAAAAAAAAAgD8AAAAAAAAAAAAAAAA="
+                        "AttributesRawData": "AABAQAAAAAAAAAAAAAAAAAAAgD/YGNM+AAAAAAAAgD9Qv/E+AAAAAAAAgD8AAIA/AACAPwAAAAAAAAAAAAAAAAAAgEAAAAAAAAAAAAAAAAA="
                     },
                     "EditorAttributeList": {
                         "AttributeCategories": [
                             {
                                 "Attributes": [
                                     {
-                                        "ValueFX": 2.0
+                                        "ValueFX": 3.0
+                                    },
+                                    {
+                                        "Color": [
+                                            1.0,
+                                            0.41229891777038574,
+                                            0.0
+                                        ]
+                                    },
+                                    {
+                                        "Color": [
+                                            0.47216272354125977,
+                                            0.0,
+                                            1.0
+                                        ]
                                     },
                                     {
                                         "ValueFX": 1.0
+                                    },
+                                    {
+                                        "ValueFX": 4.0
                                     }
                                 ]
                             }