Merge pull request #304 from aws-lumberyard-dev/mcphedar/TrapsAndJumpPads

Mcphedar/traps and jump pads

Prefabs/Energy_Cannon_with_Energy_Ball.prefab

@@ -161,7 +161,7 @@
                             "BulletDrop": false
                         },
                         "HitEffect": {
-                            "HitMagnitude": 15.0
+                            "HitMagnitude": 10.0
                         }
                     }
                 },
@@ -287,7 +287,6 @@
                         "$type": "MultiplayerSample::EnergyCannonComponent",
                         "RateOfFireMs": 4000,
                         "BallLifetimeMs": 3800,
-                        "BuildUpTimeMs": 3300,
                         "FiringEffect": {
                             "ParticleAsset": {
                                 "guid": "{F16C718B-7B3D-5F6B-877C-0CA15AAE7544}"