diff --git a/Assets/GWConquest/Animations/TransportUICircle.anim b/Assets/GWConquest/Animations/TransportUICircle.anim
index cfc213f..48b692a 100644
--- a/Assets/GWConquest/Animations/TransportUICircle.anim
+++ b/Assets/GWConquest/Animations/TransportUICircle.anim
@@ -22,7 +22,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: -6
+        value: -18
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -41,7 +41,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: -6
+        value: -18
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -55,21 +55,66 @@ AnimationClip:
     path: Icon
     classID: 224
     script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 60
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_SizeDelta.x
+    path: 
+    classID: 224
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 60
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_SizeDelta.y
+    path: 
+    classID: 224
+    script: {fileID: 0}
   m_PPtrCurves:
   - curve:
     - time: 0
-      value: {fileID: 21300000, guid: 9d02af9561347c349986baae6fb1fa27, type: 3}
+      value: {fileID: 21300000, guid: 2f346b30884e9424bbb8f1a1d98e2436, type: 3}
     attribute: m_Sprite
     path: IconBorder
     classID: 114
     script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   - curve:
     - time: 0
-      value: {fileID: 21300000, guid: c5c5d1f6b8fa0404ca44f3ea7c937909, type: 3}
+      value: {fileID: 21300000, guid: a43560515f2118344a10a45c5dda1764, type: 3}
     attribute: m_Sprite
     path: 
     classID: 114
     script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  - curve:
+    - time: 0
+      value: {fileID: 21300000, guid: a43560515f2118344a10a45c5dda1764, type: 3}
+    attribute: m_Sprite
+    path: CooldownCircle
+    classID: 114
+    script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_SampleRate: 60
   m_WrapMode: 0
   m_Bounds:
@@ -91,6 +136,13 @@ AnimationClip:
       typeID: 114
       customType: 0
       isPPtrCurve: 1
+    - serializedVersion: 2
+      path: 2180765602
+      attribute: 2015549526
+      script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+      typeID: 114
+      customType: 0
+      isPPtrCurve: 1
     - serializedVersion: 2
       path: 3316025061
       attribute: 1967290853
@@ -105,9 +157,24 @@ AnimationClip:
       typeID: 224
       customType: 28
       isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 0
+      attribute: 1967290853
+      script: {fileID: 0}
+      typeID: 224
+      customType: 28
+      isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 0
+      attribute: 38095219
+      script: {fileID: 0}
+      typeID: 224
+      customType: 28
+      isPPtrCurve: 0
     pptrCurveMapping:
-    - {fileID: 21300000, guid: 9d02af9561347c349986baae6fb1fa27, type: 3}
-    - {fileID: 21300000, guid: c5c5d1f6b8fa0404ca44f3ea7c937909, type: 3}
+    - {fileID: 21300000, guid: 2f346b30884e9424bbb8f1a1d98e2436, type: 3}
+    - {fileID: 21300000, guid: a43560515f2118344a10a45c5dda1764, type: 3}
+    - {fileID: 21300000, guid: a43560515f2118344a10a45c5dda1764, type: 3}
   m_AnimationClipSettings:
     serializedVersion: 2
     m_AdditiveReferencePoseClip: {fileID: 0}
@@ -134,7 +201,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: -6
+        value: -18
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -153,7 +220,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: -6
+        value: -18
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -167,6 +234,44 @@ AnimationClip:
     path: Icon
     classID: 224
     script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 60
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_SizeDelta.x
+    path: 
+    classID: 224
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 60
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_SizeDelta.y
+    path: 
+    classID: 224
+    script: {fileID: 0}
   m_EulerEditorCurves: []
   m_HasGenericRootTransform: 0
   m_HasMotionFloatCurves: 0
diff --git a/Assets/GWConquest/Animations/TransportUISquare.anim b/Assets/GWConquest/Animations/TransportUISquare.anim
index ae3c947..d68128b 100644
--- a/Assets/GWConquest/Animations/TransportUISquare.anim
+++ b/Assets/GWConquest/Animations/TransportUISquare.anim
@@ -55,6 +55,44 @@ AnimationClip:
     path: Icon
     classID: 224
     script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 50
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_SizeDelta.x
+    path: 
+    classID: 224
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 50
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_SizeDelta.y
+    path: 
+    classID: 224
+    script: {fileID: 0}
   m_PPtrCurves:
   - curve:
     - time: 0
@@ -70,6 +108,13 @@ AnimationClip:
     path: IconBorder
     classID: 114
     script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  - curve:
+    - time: 0
+      value: {fileID: 21300000, guid: b46dfde8947cfad43b62201933a3f714, type: 3}
+    attribute: m_Sprite
+    path: CooldownCircle
+    classID: 114
+    script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_SampleRate: 60
   m_WrapMode: 0
   m_Bounds:
@@ -91,6 +136,13 @@ AnimationClip:
       typeID: 114
       customType: 0
       isPPtrCurve: 1
+    - serializedVersion: 2
+      path: 2180765602
+      attribute: 2015549526
+      script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+      typeID: 114
+      customType: 0
+      isPPtrCurve: 1
     - serializedVersion: 2
       path: 3316025061
       attribute: 1967290853
@@ -105,9 +157,24 @@ AnimationClip:
       typeID: 224
       customType: 28
       isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 0
+      attribute: 1967290853
+      script: {fileID: 0}
+      typeID: 224
+      customType: 28
+      isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 0
+      attribute: 38095219
+      script: {fileID: 0}
+      typeID: 224
+      customType: 28
+      isPPtrCurve: 0
     pptrCurveMapping:
     - {fileID: 21300000, guid: b46dfde8947cfad43b62201933a3f714, type: 3}
     - {fileID: 21300000, guid: 4f67987e426b1a24fbb90a0360e17e6c, type: 3}
+    - {fileID: 21300000, guid: b46dfde8947cfad43b62201933a3f714, type: 3}
   m_AnimationClipSettings:
     serializedVersion: 2
     m_AdditiveReferencePoseClip: {fileID: 0}
@@ -167,6 +234,44 @@ AnimationClip:
     path: Icon
     classID: 224
     script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 50
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_SizeDelta.x
+    path: 
+    classID: 224
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 50
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_SizeDelta.y
+    path: 
+    classID: 224
+    script: {fileID: 0}
   m_EulerEditorCurves: []
   m_HasGenericRootTransform: 0
   m_HasMotionFloatCurves: 0
diff --git a/Assets/GWConquest/Animations/UnitBombardingLeft.anim b/Assets/GWConquest/Animations/UnitBombardingLeft.anim
index fcb88df..2c6195a 100644
--- a/Assets/GWConquest/Animations/UnitBombardingLeft.anim
+++ b/Assets/GWConquest/Animations/UnitBombardingLeft.anim
@@ -30,6 +30,22 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     path: EffectImage
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: {x: 0, y: 0, z: 136.738}
+        inSlope: {x: 0, y: 0, z: 0}
+        outSlope: {x: 0, y: 0, z: 0}
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: {x: 0, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0, y: 0.33333334, z: 0.33333334}
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    path: EffectImage (1)
   m_PositionCurves: []
   m_ScaleCurves:
   - curve:
@@ -80,7 +96,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: {x: 0.62996, y: 0.62996, z: 0.62996}
+        value: {x: 1.0135542, y: 0.66304225, z: 0.8417525}
         inSlope: {x: 0, y: 0, z: 0}
         outSlope: {x: 0, y: 0, z: 0}
         tangentMode: 0
@@ -91,6 +107,22 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     path: EffectImage
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: {x: 1.0135542, y: 0.66304225, z: 0.8417525}
+        inSlope: {x: 0, y: 0, z: 0}
+        outSlope: {x: 0, y: 0, z: 0}
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: {x: 0, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0, y: 0.33333334, z: 0.33333334}
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    path: EffectImage (1)
   m_FloatCurves:
   - curve:
       serializedVersion: 2
@@ -401,7 +433,7 @@ AnimationClip:
         outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.35
-        value: 2
+        value: 4
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -475,7 +507,7 @@ AnimationClip:
         outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.35
-        value: -2
+        value: -4
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -535,6 +567,81 @@ AnimationClip:
     path: Image
     classID: 224
     script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 0.28333333
+        value: 1
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1.5833334
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_IsActive
+    path: EffectImage (1)
+    classID: 1
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: -25.6
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_AnchoredPosition.x
+    path: EffectImage (1)
+    classID: 224
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 19.9
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_AnchoredPosition.y
+    path: EffectImage (1)
+    classID: 224
+    script: {fileID: 0}
   m_PPtrCurves:
   - curve:
     - time: 0.35
@@ -603,6 +710,75 @@ AnimationClip:
     path: EffectImage
     classID: 114
     script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  - curve:
+    - time: 0
+      value: {fileID: 21300000, guid: 65acb85e796636049a89fcae103fdede, type: 3}
+    - time: 0.35
+      value: {fileID: 21300000, guid: b3429ea0635ef324b94492484ee3e647, type: 3}
+    - time: 0.41666666
+      value: {fileID: 21300000, guid: 3523fed0c31b1c144ae744dbe422befc, type: 3}
+    - time: 0.48333332
+      value: {fileID: 21300000, guid: 6df2d3f5c08585247a703f0780b9816e, type: 3}
+    - time: 0.55
+      value: {fileID: 21300000, guid: b5b1d45c4fa96de4fa88d79df0792894, type: 3}
+    - time: 0.6166667
+      value: {fileID: 21300000, guid: af837b04b046da64d92855252e96bf63, type: 3}
+    - time: 0.68333334
+      value: {fileID: 21300000, guid: 4963b8ee91765734098144ca65b1123e, type: 3}
+    - time: 0.75
+      value: {fileID: 21300000, guid: 701889874cbb73f4496a2258d554294e, type: 3}
+    - time: 0.78333336
+      value: {fileID: 21300000, guid: 7ae282e7e29a60346b4aec149ce2791e, type: 3}
+    - time: 0.81666666
+      value: {fileID: 21300000, guid: 634a50837696fca45a6b4c4ab5d88ac4, type: 3}
+    - time: 0.85
+      value: {fileID: 21300000, guid: 517d26950e0b5e94da4f7e78fc5c2744, type: 3}
+    - time: 0.8833333
+      value: {fileID: 21300000, guid: 0ead56ec4cf65774a9cdc582caee0dda, type: 3}
+    - time: 0.9166667
+      value: {fileID: 21300000, guid: 0b0c6abee19c440469d12cb7934b3639, type: 3}
+    - time: 0.95
+      value: {fileID: 21300000, guid: 8589235c548f55944b87ecb5ce8c3208, type: 3}
+    - time: 0.98333335
+      value: {fileID: 21300000, guid: feb42f46a5eba3143af0381108e67b4a, type: 3}
+    - time: 1.0166667
+      value: {fileID: 21300000, guid: 99b6d0bb782afea4093e4ce2e3d91dbc, type: 3}
+    - time: 1.05
+      value: {fileID: 21300000, guid: 1ad3dae4d9e039749b01e80938827964, type: 3}
+    - time: 1.0833334
+      value: {fileID: 21300000, guid: 8a9c8a7c09df60d4ab72625a92087f39, type: 3}
+    - time: 1.1166667
+      value: {fileID: 21300000, guid: f3d065cc20acb5c409d1b4c7e27a80ff, type: 3}
+    - time: 1.15
+      value: {fileID: 21300000, guid: f647045a94e88f542b82248e73e67ba5, type: 3}
+    - time: 1.1833333
+      value: {fileID: 21300000, guid: c8ebcd149df75ea4fb08b17b59140a19, type: 3}
+    - time: 1.2166667
+      value: {fileID: 21300000, guid: 20cf5eaaee23d8341ae780fb1179e0c7, type: 3}
+    - time: 1.25
+      value: {fileID: 21300000, guid: 65acb85e796636049a89fcae103fdede, type: 3}
+    - time: 1.2833333
+      value: {fileID: 21300000, guid: 1457ccd2ec8f61b4cb3c91b9705a3dbc, type: 3}
+    - time: 1.3166667
+      value: {fileID: 21300000, guid: d4a232ba58b499b4b9bfa56c6a00d7f5, type: 3}
+    - time: 1.35
+      value: {fileID: 21300000, guid: bc7a221da2398194a9868c67d26fc9a5, type: 3}
+    - time: 1.3833333
+      value: {fileID: 21300000, guid: 0378682b00daf79419f9a03e4ae97caf, type: 3}
+    - time: 1.4166666
+      value: {fileID: 21300000, guid: d31b855ba338020488c56bdfa2f5d841, type: 3}
+    - time: 1.45
+      value: {fileID: 21300000, guid: 2f7df85901043044b838f758aff1477b, type: 3}
+    - time: 1.4833333
+      value: {fileID: 21300000, guid: 05248029f7a42ce4886b25138b0191d7, type: 3}
+    - time: 1.5166667
+      value: {fileID: 21300000, guid: 5df5298e815d5a34ab0de127bf580d32, type: 3}
+    - time: 1.55
+      value: {fileID: 21300000, guid: a256826e6a237344ebb64c28fdc189ee, type: 3}
+    attribute: m_Sprite
+    path: EffectImage (1)
+    classID: 114
+    script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_SampleRate: 60
   m_WrapMode: 0
   m_Bounds:
@@ -666,6 +842,13 @@ AnimationClip:
       typeID: 224
       customType: 28
       isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 813526734
+      attribute: 2086281974
+      script: {fileID: 0}
+      typeID: 1
+      customType: 0
+      isPPtrCurve: 0
     - serializedVersion: 2
       path: 1327555438
       attribute: 2015549526
@@ -673,6 +856,13 @@ AnimationClip:
       typeID: 114
       customType: 0
       isPPtrCurve: 1
+    - serializedVersion: 2
+      path: 813526734
+      attribute: 2015549526
+      script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+      typeID: 114
+      customType: 0
+      isPPtrCurve: 1
     - serializedVersion: 2
       path: 1327555438
       attribute: 4
@@ -680,6 +870,13 @@ AnimationClip:
       typeID: 4
       customType: 4
       isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 813526734
+      attribute: 4
+      script: {fileID: 0}
+      typeID: 4
+      customType: 4
+      isPPtrCurve: 0
     - serializedVersion: 2
       path: 1327555438
       attribute: 3
@@ -687,6 +884,13 @@ AnimationClip:
       typeID: 4
       customType: 0
       isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 813526734
+      attribute: 3
+      script: {fileID: 0}
+      typeID: 4
+      customType: 0
+      isPPtrCurve: 0
     - serializedVersion: 2
       path: 1327555438
       attribute: 1460864421
@@ -715,6 +919,20 @@ AnimationClip:
       typeID: 224
       customType: 28
       isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 813526734
+      attribute: 1460864421
+      script: {fileID: 0}
+      typeID: 224
+      customType: 28
+      isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 813526734
+      attribute: 538195251
+      script: {fileID: 0}
+      typeID: 224
+      customType: 28
+      isPPtrCurve: 0
     pptrCurveMapping:
     - {fileID: 21300000, guid: b3429ea0635ef324b94492484ee3e647, type: 3}
     - {fileID: 21300000, guid: 3523fed0c31b1c144ae744dbe422befc, type: 3}
@@ -747,6 +965,38 @@ AnimationClip:
     - {fileID: 21300000, guid: 05248029f7a42ce4886b25138b0191d7, type: 3}
     - {fileID: 21300000, guid: 5df5298e815d5a34ab0de127bf580d32, type: 3}
     - {fileID: 21300000, guid: a256826e6a237344ebb64c28fdc189ee, type: 3}
+    - {fileID: 21300000, guid: 65acb85e796636049a89fcae103fdede, type: 3}
+    - {fileID: 21300000, guid: b3429ea0635ef324b94492484ee3e647, type: 3}
+    - {fileID: 21300000, guid: 3523fed0c31b1c144ae744dbe422befc, type: 3}
+    - {fileID: 21300000, guid: 6df2d3f5c08585247a703f0780b9816e, type: 3}
+    - {fileID: 21300000, guid: b5b1d45c4fa96de4fa88d79df0792894, type: 3}
+    - {fileID: 21300000, guid: af837b04b046da64d92855252e96bf63, type: 3}
+    - {fileID: 21300000, guid: 4963b8ee91765734098144ca65b1123e, type: 3}
+    - {fileID: 21300000, guid: 701889874cbb73f4496a2258d554294e, type: 3}
+    - {fileID: 21300000, guid: 7ae282e7e29a60346b4aec149ce2791e, type: 3}
+    - {fileID: 21300000, guid: 634a50837696fca45a6b4c4ab5d88ac4, type: 3}
+    - {fileID: 21300000, guid: 517d26950e0b5e94da4f7e78fc5c2744, type: 3}
+    - {fileID: 21300000, guid: 0ead56ec4cf65774a9cdc582caee0dda, type: 3}
+    - {fileID: 21300000, guid: 0b0c6abee19c440469d12cb7934b3639, type: 3}
+    - {fileID: 21300000, guid: 8589235c548f55944b87ecb5ce8c3208, type: 3}
+    - {fileID: 21300000, guid: feb42f46a5eba3143af0381108e67b4a, type: 3}
+    - {fileID: 21300000, guid: 99b6d0bb782afea4093e4ce2e3d91dbc, type: 3}
+    - {fileID: 21300000, guid: 1ad3dae4d9e039749b01e80938827964, type: 3}
+    - {fileID: 21300000, guid: 8a9c8a7c09df60d4ab72625a92087f39, type: 3}
+    - {fileID: 21300000, guid: f3d065cc20acb5c409d1b4c7e27a80ff, type: 3}
+    - {fileID: 21300000, guid: f647045a94e88f542b82248e73e67ba5, type: 3}
+    - {fileID: 21300000, guid: c8ebcd149df75ea4fb08b17b59140a19, type: 3}
+    - {fileID: 21300000, guid: 20cf5eaaee23d8341ae780fb1179e0c7, type: 3}
+    - {fileID: 21300000, guid: 65acb85e796636049a89fcae103fdede, type: 3}
+    - {fileID: 21300000, guid: 1457ccd2ec8f61b4cb3c91b9705a3dbc, type: 3}
+    - {fileID: 21300000, guid: d4a232ba58b499b4b9bfa56c6a00d7f5, type: 3}
+    - {fileID: 21300000, guid: bc7a221da2398194a9868c67d26fc9a5, type: 3}
+    - {fileID: 21300000, guid: 0378682b00daf79419f9a03e4ae97caf, type: 3}
+    - {fileID: 21300000, guid: d31b855ba338020488c56bdfa2f5d841, type: 3}
+    - {fileID: 21300000, guid: 2f7df85901043044b838f758aff1477b, type: 3}
+    - {fileID: 21300000, guid: 05248029f7a42ce4886b25138b0191d7, type: 3}
+    - {fileID: 21300000, guid: 5df5298e815d5a34ab0de127bf580d32, type: 3}
+    - {fileID: 21300000, guid: a256826e6a237344ebb64c28fdc189ee, type: 3}
   m_AnimationClipSettings:
     serializedVersion: 2
     m_AdditiveReferencePoseClip: {fileID: 0}
@@ -1263,7 +1513,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 0.62996
+        value: 1.0135542
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -1282,7 +1532,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 0.62996
+        value: 0.66304225
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -1301,7 +1551,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 0.62996
+        value: 0.8417525
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -1329,7 +1579,7 @@ AnimationClip:
         outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.35
-        value: 2
+        value: 4
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -1403,7 +1653,7 @@ AnimationClip:
         outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.35
-        value: -2
+        value: -4
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -1463,6 +1713,195 @@ AnimationClip:
     path: Image
     classID: 224
     script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 0.28333333
+        value: 1
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1.5833334
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_IsActive
+    path: EffectImage (1)
+    classID: 1
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: localEulerAnglesRaw.x
+    path: EffectImage (1)
+    classID: 224
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: localEulerAnglesRaw.y
+    path: EffectImage (1)
+    classID: 224
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 136.738
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: localEulerAnglesRaw.z
+    path: EffectImage (1)
+    classID: 224
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: -25.6
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_AnchoredPosition.x
+    path: EffectImage (1)
+    classID: 224
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 19.9
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_AnchoredPosition.y
+    path: EffectImage (1)
+    classID: 224
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1.0135542
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalScale.x
+    path: EffectImage (1)
+    classID: 224
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0.66304225
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalScale.y
+    path: EffectImage (1)
+    classID: 224
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0.8417525
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalScale.z
+    path: EffectImage (1)
+    classID: 224
+    script: {fileID: 0}
   m_EulerEditorCurves:
   - curve:
       serializedVersion: 2
@@ -1494,6 +1933,36 @@ AnimationClip:
     path: EffectImage
     classID: 224
     script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve: []
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalEulerAngles.x
+    path: EffectImage (1)
+    classID: 224
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve: []
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalEulerAngles.y
+    path: EffectImage (1)
+    classID: 224
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve: []
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalEulerAngles.z
+    path: EffectImage (1)
+    classID: 224
+    script: {fileID: 0}
   m_HasGenericRootTransform: 0
   m_HasMotionFloatCurves: 0
   m_Events: []
diff --git a/Assets/GWConquest/Animations/UnitBombardingRight.anim b/Assets/GWConquest/Animations/UnitBombardingRight.anim
index 7b28ee2..0084237 100644
--- a/Assets/GWConquest/Animations/UnitBombardingRight.anim
+++ b/Assets/GWConquest/Animations/UnitBombardingRight.anim
@@ -30,6 +30,22 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     path: EffectImage
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: {x: 0, y: 0, z: 43.262}
+        inSlope: {x: 0, y: 0, z: 0}
+        outSlope: {x: 0, y: 0, z: 0}
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    path: EffectImage (1)
   m_PositionCurves: []
   m_ScaleCurves:
   - curve:
@@ -91,6 +107,22 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     path: Image
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: {x: 0.62996, y: 0.62996, z: 0.62996}
+        inSlope: {x: 0, y: 0, z: 0}
+        outSlope: {x: 0, y: 0, z: 0}
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: {x: 0, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0, y: 0.33333334, z: 0.33333334}
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    path: EffectImage (1)
   m_FloatCurves:
   - curve:
       serializedVersion: 2
@@ -401,7 +433,7 @@ AnimationClip:
         outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.35
-        value: -2
+        value: -4
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -475,7 +507,7 @@ AnimationClip:
         outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.35
-        value: -2
+        value: -4
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -535,6 +567,81 @@ AnimationClip:
     path: Image
     classID: 224
     script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 0.28333333
+        value: 1
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1.5833334
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_IsActive
+    path: EffectImage (1)
+    classID: 1
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 25.6
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_AnchoredPosition.x
+    path: EffectImage (1)
+    classID: 224
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 19.9
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_AnchoredPosition.y
+    path: EffectImage (1)
+    classID: 224
+    script: {fileID: 0}
   m_PPtrCurves:
   - curve:
     - time: 0.35
@@ -603,6 +710,75 @@ AnimationClip:
     path: EffectImage
     classID: 114
     script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  - curve:
+    - time: 0
+      value: {fileID: 21300000, guid: f647045a94e88f542b82248e73e67ba5, type: 3}
+    - time: 0.35
+      value: {fileID: 21300000, guid: b3429ea0635ef324b94492484ee3e647, type: 3}
+    - time: 0.41666666
+      value: {fileID: 21300000, guid: 3523fed0c31b1c144ae744dbe422befc, type: 3}
+    - time: 0.48333332
+      value: {fileID: 21300000, guid: 6df2d3f5c08585247a703f0780b9816e, type: 3}
+    - time: 0.55
+      value: {fileID: 21300000, guid: b5b1d45c4fa96de4fa88d79df0792894, type: 3}
+    - time: 0.6166667
+      value: {fileID: 21300000, guid: af837b04b046da64d92855252e96bf63, type: 3}
+    - time: 0.68333334
+      value: {fileID: 21300000, guid: 4963b8ee91765734098144ca65b1123e, type: 3}
+    - time: 0.75
+      value: {fileID: 21300000, guid: 701889874cbb73f4496a2258d554294e, type: 3}
+    - time: 0.78333336
+      value: {fileID: 21300000, guid: 7ae282e7e29a60346b4aec149ce2791e, type: 3}
+    - time: 0.81666666
+      value: {fileID: 21300000, guid: 634a50837696fca45a6b4c4ab5d88ac4, type: 3}
+    - time: 0.85
+      value: {fileID: 21300000, guid: 517d26950e0b5e94da4f7e78fc5c2744, type: 3}
+    - time: 0.8833333
+      value: {fileID: 21300000, guid: 0ead56ec4cf65774a9cdc582caee0dda, type: 3}
+    - time: 0.9166667
+      value: {fileID: 21300000, guid: 0b0c6abee19c440469d12cb7934b3639, type: 3}
+    - time: 0.95
+      value: {fileID: 21300000, guid: 8589235c548f55944b87ecb5ce8c3208, type: 3}
+    - time: 0.98333335
+      value: {fileID: 21300000, guid: feb42f46a5eba3143af0381108e67b4a, type: 3}
+    - time: 1.0166667
+      value: {fileID: 21300000, guid: 99b6d0bb782afea4093e4ce2e3d91dbc, type: 3}
+    - time: 1.05
+      value: {fileID: 21300000, guid: 1ad3dae4d9e039749b01e80938827964, type: 3}
+    - time: 1.0833334
+      value: {fileID: 21300000, guid: 8a9c8a7c09df60d4ab72625a92087f39, type: 3}
+    - time: 1.1166667
+      value: {fileID: 21300000, guid: f3d065cc20acb5c409d1b4c7e27a80ff, type: 3}
+    - time: 1.15
+      value: {fileID: 21300000, guid: f647045a94e88f542b82248e73e67ba5, type: 3}
+    - time: 1.1833333
+      value: {fileID: 21300000, guid: c8ebcd149df75ea4fb08b17b59140a19, type: 3}
+    - time: 1.2166667
+      value: {fileID: 21300000, guid: 20cf5eaaee23d8341ae780fb1179e0c7, type: 3}
+    - time: 1.25
+      value: {fileID: 21300000, guid: 65acb85e796636049a89fcae103fdede, type: 3}
+    - time: 1.2833333
+      value: {fileID: 21300000, guid: 1457ccd2ec8f61b4cb3c91b9705a3dbc, type: 3}
+    - time: 1.3166667
+      value: {fileID: 21300000, guid: d4a232ba58b499b4b9bfa56c6a00d7f5, type: 3}
+    - time: 1.35
+      value: {fileID: 21300000, guid: bc7a221da2398194a9868c67d26fc9a5, type: 3}
+    - time: 1.3833333
+      value: {fileID: 21300000, guid: 0378682b00daf79419f9a03e4ae97caf, type: 3}
+    - time: 1.4166666
+      value: {fileID: 21300000, guid: d31b855ba338020488c56bdfa2f5d841, type: 3}
+    - time: 1.45
+      value: {fileID: 21300000, guid: 2f7df85901043044b838f758aff1477b, type: 3}
+    - time: 1.4833333
+      value: {fileID: 21300000, guid: 05248029f7a42ce4886b25138b0191d7, type: 3}
+    - time: 1.5166667
+      value: {fileID: 21300000, guid: 5df5298e815d5a34ab0de127bf580d32, type: 3}
+    - time: 1.55
+      value: {fileID: 21300000, guid: a256826e6a237344ebb64c28fdc189ee, type: 3}
+    attribute: m_Sprite
+    path: EffectImage (1)
+    classID: 114
+    script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_SampleRate: 60
   m_WrapMode: 0
   m_Bounds:
@@ -666,6 +842,13 @@ AnimationClip:
       typeID: 224
       customType: 28
       isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 813526734
+      attribute: 2086281974
+      script: {fileID: 0}
+      typeID: 1
+      customType: 0
+      isPPtrCurve: 0
     - serializedVersion: 2
       path: 1327555438
       attribute: 2015549526
@@ -673,6 +856,13 @@ AnimationClip:
       typeID: 114
       customType: 0
       isPPtrCurve: 1
+    - serializedVersion: 2
+      path: 813526734
+      attribute: 2015549526
+      script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+      typeID: 114
+      customType: 0
+      isPPtrCurve: 1
     - serializedVersion: 2
       path: 1327555438
       attribute: 4
@@ -680,6 +870,13 @@ AnimationClip:
       typeID: 4
       customType: 4
       isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 813526734
+      attribute: 4
+      script: {fileID: 0}
+      typeID: 4
+      customType: 4
+      isPPtrCurve: 0
     - serializedVersion: 2
       path: 1327555438
       attribute: 3
@@ -687,6 +884,13 @@ AnimationClip:
       typeID: 4
       customType: 0
       isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 813526734
+      attribute: 3
+      script: {fileID: 0}
+      typeID: 4
+      customType: 0
+      isPPtrCurve: 0
     - serializedVersion: 2
       path: 1327555438
       attribute: 1460864421
@@ -715,6 +919,20 @@ AnimationClip:
       typeID: 224
       customType: 28
       isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 813526734
+      attribute: 1460864421
+      script: {fileID: 0}
+      typeID: 224
+      customType: 28
+      isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 813526734
+      attribute: 538195251
+      script: {fileID: 0}
+      typeID: 224
+      customType: 28
+      isPPtrCurve: 0
     pptrCurveMapping:
     - {fileID: 21300000, guid: b3429ea0635ef324b94492484ee3e647, type: 3}
     - {fileID: 21300000, guid: 3523fed0c31b1c144ae744dbe422befc, type: 3}
@@ -747,6 +965,38 @@ AnimationClip:
     - {fileID: 21300000, guid: 05248029f7a42ce4886b25138b0191d7, type: 3}
     - {fileID: 21300000, guid: 5df5298e815d5a34ab0de127bf580d32, type: 3}
     - {fileID: 21300000, guid: a256826e6a237344ebb64c28fdc189ee, type: 3}
+    - {fileID: 21300000, guid: f647045a94e88f542b82248e73e67ba5, type: 3}
+    - {fileID: 21300000, guid: b3429ea0635ef324b94492484ee3e647, type: 3}
+    - {fileID: 21300000, guid: 3523fed0c31b1c144ae744dbe422befc, type: 3}
+    - {fileID: 21300000, guid: 6df2d3f5c08585247a703f0780b9816e, type: 3}
+    - {fileID: 21300000, guid: b5b1d45c4fa96de4fa88d79df0792894, type: 3}
+    - {fileID: 21300000, guid: af837b04b046da64d92855252e96bf63, type: 3}
+    - {fileID: 21300000, guid: 4963b8ee91765734098144ca65b1123e, type: 3}
+    - {fileID: 21300000, guid: 701889874cbb73f4496a2258d554294e, type: 3}
+    - {fileID: 21300000, guid: 7ae282e7e29a60346b4aec149ce2791e, type: 3}
+    - {fileID: 21300000, guid: 634a50837696fca45a6b4c4ab5d88ac4, type: 3}
+    - {fileID: 21300000, guid: 517d26950e0b5e94da4f7e78fc5c2744, type: 3}
+    - {fileID: 21300000, guid: 0ead56ec4cf65774a9cdc582caee0dda, type: 3}
+    - {fileID: 21300000, guid: 0b0c6abee19c440469d12cb7934b3639, type: 3}
+    - {fileID: 21300000, guid: 8589235c548f55944b87ecb5ce8c3208, type: 3}
+    - {fileID: 21300000, guid: feb42f46a5eba3143af0381108e67b4a, type: 3}
+    - {fileID: 21300000, guid: 99b6d0bb782afea4093e4ce2e3d91dbc, type: 3}
+    - {fileID: 21300000, guid: 1ad3dae4d9e039749b01e80938827964, type: 3}
+    - {fileID: 21300000, guid: 8a9c8a7c09df60d4ab72625a92087f39, type: 3}
+    - {fileID: 21300000, guid: f3d065cc20acb5c409d1b4c7e27a80ff, type: 3}
+    - {fileID: 21300000, guid: f647045a94e88f542b82248e73e67ba5, type: 3}
+    - {fileID: 21300000, guid: c8ebcd149df75ea4fb08b17b59140a19, type: 3}
+    - {fileID: 21300000, guid: 20cf5eaaee23d8341ae780fb1179e0c7, type: 3}
+    - {fileID: 21300000, guid: 65acb85e796636049a89fcae103fdede, type: 3}
+    - {fileID: 21300000, guid: 1457ccd2ec8f61b4cb3c91b9705a3dbc, type: 3}
+    - {fileID: 21300000, guid: d4a232ba58b499b4b9bfa56c6a00d7f5, type: 3}
+    - {fileID: 21300000, guid: bc7a221da2398194a9868c67d26fc9a5, type: 3}
+    - {fileID: 21300000, guid: 0378682b00daf79419f9a03e4ae97caf, type: 3}
+    - {fileID: 21300000, guid: d31b855ba338020488c56bdfa2f5d841, type: 3}
+    - {fileID: 21300000, guid: 2f7df85901043044b838f758aff1477b, type: 3}
+    - {fileID: 21300000, guid: 05248029f7a42ce4886b25138b0191d7, type: 3}
+    - {fileID: 21300000, guid: 5df5298e815d5a34ab0de127bf580d32, type: 3}
+    - {fileID: 21300000, guid: a256826e6a237344ebb64c28fdc189ee, type: 3}
   m_AnimationClipSettings:
     serializedVersion: 2
     m_AdditiveReferencePoseClip: {fileID: 0}
@@ -1329,7 +1579,7 @@ AnimationClip:
         outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.35
-        value: -2
+        value: -4
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -1403,7 +1653,7 @@ AnimationClip:
         outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.35
-        value: -2
+        value: -4
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -1463,6 +1713,195 @@ AnimationClip:
     path: Image
     classID: 224
     script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 0.28333333
+        value: 1
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1.5833334
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_IsActive
+    path: EffectImage (1)
+    classID: 1
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: localEulerAnglesRaw.x
+    path: EffectImage (1)
+    classID: 224
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: localEulerAnglesRaw.y
+    path: EffectImage (1)
+    classID: 224
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 43.262
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: localEulerAnglesRaw.z
+    path: EffectImage (1)
+    classID: 224
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0.62996
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalScale.x
+    path: EffectImage (1)
+    classID: 224
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0.62996
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalScale.y
+    path: EffectImage (1)
+    classID: 224
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0.62996
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalScale.z
+    path: EffectImage (1)
+    classID: 224
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 25.6
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_AnchoredPosition.x
+    path: EffectImage (1)
+    classID: 224
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 19.9
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_AnchoredPosition.y
+    path: EffectImage (1)
+    classID: 224
+    script: {fileID: 0}
   m_EulerEditorCurves:
   - curve:
       serializedVersion: 2
@@ -1494,6 +1933,36 @@ AnimationClip:
     path: EffectImage
     classID: 224
     script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve: []
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalEulerAngles.x
+    path: EffectImage (1)
+    classID: 224
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve: []
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalEulerAngles.y
+    path: EffectImage (1)
+    classID: 224
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve: []
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalEulerAngles.z
+    path: EffectImage (1)
+    classID: 224
+    script: {fileID: 0}
   m_HasGenericRootTransform: 0
   m_HasMotionFloatCurves: 0
   m_Events: []
diff --git a/Assets/GWConquest/Prefabs/Effects/ParticleSystems/DustStorm Variant.prefab b/Assets/GWConquest/Prefabs/Effects/ParticleSystems/DustStorm Variant.prefab
index aee24c2..eb06d15 100644
--- a/Assets/GWConquest/Prefabs/Effects/ParticleSystems/DustStorm Variant.prefab	
+++ b/Assets/GWConquest/Prefabs/Effects/ParticleSystems/DustStorm Variant.prefab	
@@ -328,7 +328,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 435690, guid: 6abbc4ed7fcb5c54e94b08345eba46e9, type: 3}
       propertyPath: m_RootOrder
-      value: 21
+      value: 22
       objectReference: {fileID: 0}
     - target: {fileID: 435690, guid: 6abbc4ed7fcb5c54e94b08345eba46e9, type: 3}
       propertyPath: m_LocalScale.x
@@ -945,6 +945,75 @@ Transform:
     type: 3}
   m_PrefabInstance: {fileID: 4201273303516130280}
   m_PrefabAsset: {fileID: 0}
+--- !u!1001 &4641611716986644482
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 4201273303516524904}
+    m_Modifications:
+    - target: {fileID: 173668, guid: ae4427e80dceffe47b5179ce000667cb, type: 3}
+      propertyPath: m_Name
+      value: Asteroid_A
+      objectReference: {fileID: 0}
+    - target: {fileID: 415920, guid: ae4427e80dceffe47b5179ce000667cb, type: 3}
+      propertyPath: m_RootOrder
+      value: 20
+      objectReference: {fileID: 0}
+    - target: {fileID: 415920, guid: ae4427e80dceffe47b5179ce000667cb, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 309.40485
+      objectReference: {fileID: 0}
+    - target: {fileID: 415920, guid: ae4427e80dceffe47b5179ce000667cb, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 309.40485
+      objectReference: {fileID: 0}
+    - target: {fileID: 415920, guid: ae4427e80dceffe47b5179ce000667cb, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 309.40485
+      objectReference: {fileID: 0}
+    - target: {fileID: 415920, guid: ae4427e80dceffe47b5179ce000667cb, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 25.695
+      objectReference: {fileID: 0}
+    - target: {fileID: 415920, guid: ae4427e80dceffe47b5179ce000667cb, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -0.11819
+      objectReference: {fileID: 0}
+    - target: {fileID: 415920, guid: ae4427e80dceffe47b5179ce000667cb, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 8.7878
+      objectReference: {fileID: 0}
+    - target: {fileID: 415920, guid: ae4427e80dceffe47b5179ce000667cb, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 415920, guid: ae4427e80dceffe47b5179ce000667cb, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 415920, guid: ae4427e80dceffe47b5179ce000667cb, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 415920, guid: ae4427e80dceffe47b5179ce000667cb, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 415920, guid: ae4427e80dceffe47b5179ce000667cb, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 415920, guid: ae4427e80dceffe47b5179ce000667cb, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 415920, guid: ae4427e80dceffe47b5179ce000667cb, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: ae4427e80dceffe47b5179ce000667cb, type: 3}
 --- !u!1001 &4920507973368152756
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -1324,7 +1393,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 435690, guid: 6abbc4ed7fcb5c54e94b08345eba46e9, type: 3}
       propertyPath: m_RootOrder
-      value: 20
+      value: 21
       objectReference: {fileID: 0}
     - target: {fileID: 435690, guid: 6abbc4ed7fcb5c54e94b08345eba46e9, type: 3}
       propertyPath: m_LocalScale.x
diff --git a/Assets/GWConquest/Prefabs/UI/BattleUnitIcon.prefab b/Assets/GWConquest/Prefabs/UI/BattleUnitIcon.prefab
index 1736d61..8b679e0 100644
--- a/Assets/GWConquest/Prefabs/UI/BattleUnitIcon.prefab
+++ b/Assets/GWConquest/Prefabs/UI/BattleUnitIcon.prefab
@@ -60,6 +60,7 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 0.632, g: 0.632, b: 0.632, a: 1}
   m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -134,6 +135,7 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 0.2663314, g: 0.75402164, b: 0.990566, a: 0}
   m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -244,6 +246,7 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 0.8980392, g: 0.8980392, b: 0.8980392, a: 0.8784314}
   m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -378,6 +381,7 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 0.3137255}
   m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -433,6 +437,7 @@ RectTransform:
   - {fileID: 1619096850430010799}
   - {fileID: 4629381076523769751}
   - {fileID: 6898856656273588703}
+  - {fileID: 177763695987055706}
   - {fileID: 7828031372068586346}
   - {fileID: 5765232286481110788}
   m_Father: {fileID: 0}
@@ -466,6 +471,7 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 0.383, g: 0.383, b: 0.383, a: 1}
   m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -557,6 +563,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Navigation:
     m_Mode: 0
+    m_WrapAround: 0
     m_SelectOnUp: {fileID: 0}
     m_SelectOnDown: {fileID: 0}
     m_SelectOnLeft: {fileID: 0}
@@ -587,6 +594,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls:
       - m_Target: {fileID: 3984695676737472037}
+        m_TargetAssemblyTypeName: 
         m_MethodName: OnClick
         m_Mode: 1
         m_Arguments:
@@ -659,11 +667,12 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: ab8085661cb35e9469bcd4f6ddb9ee73, type: 3}
+  m_Sprite: {fileID: 0}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -746,6 +755,7 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 0}
   m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -886,6 +896,7 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 0, g: 0.8064513, b: 1, a: 0.6862745}
   m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -960,6 +971,7 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 0.3301887, g: 0.3301887, b: 0.3301887, a: 1}
   m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -1034,6 +1046,7 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 0.2216981, g: 0.74078524, b: 1, a: 1}
   m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -1108,6 +1121,82 @@ MonoBehaviour:
   m_Material: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!1 &5207331552277441255
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 177763695987055706}
+  - component: {fileID: 2930228756010970471}
+  - component: {fileID: 7979141325146176835}
+  m_Layer: 5
+  m_Name: EffectImage (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &177763695987055706
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5207331552277441255}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: -1}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 1687732570946376589}
+  m_RootOrder: 8
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 97.886215, y: 97.886215}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2930228756010970471
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5207331552277441255}
+  m_CullTransparentMesh: 0
+--- !u!114 &7979141325146176835
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5207331552277441255}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -1152,7 +1241,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 1687732570946376589}
-  m_RootOrder: 9
+  m_RootOrder: 10
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -1182,6 +1271,7 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 0.68235296}
   m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -1256,6 +1346,7 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -1330,6 +1421,7 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -1375,7 +1467,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 1687732570946376589}
-  m_RootOrder: 8
+  m_RootOrder: 9
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
@@ -1405,6 +1497,7 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -1493,6 +1586,7 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 0.31764707, g: 0.31764707, b: 0.31764707, a: 0.69411767}
   m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
diff --git a/Assets/GWConquest/Prefabs/UI/GarrisonPanel.prefab b/Assets/GWConquest/Prefabs/UI/GarrisonPanel.prefab
index 2ec0277..b8a8e78 100644
--- a/Assets/GWConquest/Prefabs/UI/GarrisonPanel.prefab
+++ b/Assets/GWConquest/Prefabs/UI/GarrisonPanel.prefab
@@ -60,6 +60,7 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 0.7607843}
   m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -172,6 +173,7 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 0.09019608}
   m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -200,6 +202,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Navigation:
     m_Mode: 3
+    m_WrapAround: 0
     m_SelectOnUp: {fileID: 0}
     m_SelectOnDown: {fileID: 0}
     m_SelectOnLeft: {fileID: 0}
@@ -243,6 +246,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 1069889124}
+  - component: {fileID: 2063260701327477825}
   m_Layer: 5
   m_Name: Content
   m_TagString: Untagged
@@ -269,6 +273,20 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: -0.000015258789}
   m_SizeDelta: {x: 0, y: 369.19482}
   m_Pivot: {x: 0, y: 1}
+--- !u!114 &2063260701327477825
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1069889123}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b0cffe833675a2942be0665d6d259496, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  Padding: 15
+  Spacing: 20
 --- !u!1 &1277175057
 GameObject:
   m_ObjectHideFlags: 0
@@ -332,6 +350,7 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 0.392}
   m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -438,6 +457,7 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -541,6 +561,7 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -569,6 +590,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Navigation:
     m_Mode: 3
+    m_WrapAround: 0
     m_SelectOnUp: {fileID: 0}
     m_SelectOnDown: {fileID: 0}
     m_SelectOnLeft: {fileID: 0}
@@ -599,6 +621,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls:
       - m_Target: {fileID: 1590972559}
+        m_TargetAssemblyTypeName: 
         m_MethodName: OpenTransportUI
         m_Mode: 1
         m_Arguments:
@@ -733,15 +756,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, type: 3}
---- !u!1 &2443912949472084106 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 3709556431398436641, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
-    type: 3}
-  m_PrefabInstance: {fileID: 1337701076232978347}
-  m_PrefabAsset: {fileID: 0}
 --- !u!224 &9198647461551696382 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
     type: 3}
   m_PrefabInstance: {fileID: 1337701076232978347}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &2443912949472084106 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 3709556431398436641, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+    type: 3}
+  m_PrefabInstance: {fileID: 1337701076232978347}
+  m_PrefabAsset: {fileID: 0}
diff --git a/Assets/GWConquest/Prefabs/UI/TransportUI/TransportUIElement.prefab b/Assets/GWConquest/Prefabs/UI/TransportUI/TransportUIElement.prefab
index 83d734b..2ebca2d 100644
--- a/Assets/GWConquest/Prefabs/UI/TransportUI/TransportUIElement.prefab
+++ b/Assets/GWConquest/Prefabs/UI/TransportUI/TransportUIElement.prefab
@@ -105,7 +105,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: -6, y: -6}
+  m_SizeDelta: {x: -12, y: -12}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2673194343256469686
 CanvasRenderer:
@@ -130,6 +130,7 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -207,6 +208,7 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -312,6 +314,7 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 0.69411767}
   m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -340,6 +343,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Navigation:
     m_Mode: 0
+    m_WrapAround: 0
     m_SelectOnUp: {fileID: 0}
     m_SelectOnDown: {fileID: 0}
     m_SelectOnLeft: {fileID: 0}
@@ -370,6 +374,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls:
       - m_Target: {fileID: 8452816462676908967}
+        m_TargetAssemblyTypeName: 
         m_MethodName: ToggleExpand
         m_Mode: 1
         m_Arguments:
@@ -646,11 +651,12 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 0.156, g: 0.156, b: 0.156, a: 0.49019608}
   m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: c5c5d1f6b8fa0404ca44f3ea7c937909, type: 3}
+  m_Sprite: {fileID: 21300000, guid: a43560515f2118344a10a45c5dda1764, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -687,6 +693,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Navigation:
     m_Mode: 3
+    m_WrapAround: 0
     m_SelectOnUp: {fileID: 0}
     m_SelectOnDown: {fileID: 0}
     m_SelectOnLeft: {fileID: 0}
@@ -717,6 +724,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls:
       - m_Target: {fileID: 8452816462676908967}
+        m_TargetAssemblyTypeName: 
         m_MethodName: OnClick
         m_Mode: 1
         m_Arguments:
@@ -806,11 +814,12 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 9d02af9561347c349986baae6fb1fa27, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 2f346b30884e9424bbb8f1a1d98e2436, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -880,11 +889,12 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 0.05882353}
   m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: c5c5d1f6b8fa0404ca44f3ea7c937909, type: 3}
+  m_Sprite: {fileID: 21300000, guid: a43560515f2118344a10a45c5dda1764, type: 3}
   m_Type: 3
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -955,6 +965,7 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 0.9433962, g: 0.8447119, b: 0.4494482, a: 1}
   m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -1022,7 +1033,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: -8, y: -8}
+  m_SizeDelta: {x: -17.7571, y: -17.7571}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2340644252149943780
 CanvasRenderer:
@@ -1047,6 +1058,7 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -1229,6 +1241,7 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
diff --git a/Assets/GWConquest/Scenes/GalaxyMap.unity b/Assets/GWConquest/Scenes/GalaxyMap.unity
index e55a4be..7f83f7a 100644
--- a/Assets/GWConquest/Scenes/GalaxyMap.unity
+++ b/Assets/GWConquest/Scenes/GalaxyMap.unity
@@ -62634,7 +62634,7 @@ PrefabInstance:
     - target: {fileID: 2523886465982048557, guid: 9ae35d7f911b63f4f95f432141dd5746,
         type: 3}
       propertyPath: m_RootOrder
-      value: 12
+      value: 11
       objectReference: {fileID: 0}
     - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746,
         type: 3}
@@ -70747,6 +70747,11 @@ PrefabInstance:
       propertyPath: ShapeModule.m_Texture
       value: 
       objectReference: {fileID: 0}
+    - target: {fileID: 4201273303530681384, guid: 09118807f6ce1b540986745109980a4b,
+        type: 3}
+      propertyPath: ShapeModule.radiusThickness
+      value: 1.0000
+      objectReference: {fileID: 0}
     - target: {fileID: 4201273303530681384, guid: 09118807f6ce1b540986745109980a4b,
         type: 3}
       propertyPath: InitialModule.maxNumParticles
@@ -81793,6 +81798,10 @@ MonoBehaviour:
     - {fileID: 151664, guid: fa49e460baf435b4780da7196c2ab473, type: 3}
     - {fileID: 141316, guid: 84cc3cd234dfc9d4d9d2e92c0eb0af75, type: 3}
     - {fileID: 130102, guid: 04d0bf4be9447154188d86f6e3b8dce9, type: 3}
+    - {fileID: 173668, guid: ae4427e80dceffe47b5179ce000667cb, type: 3}
+    - {fileID: 190680, guid: ead4c151b2850004782f62d3ac573cbe, type: 3}
+    - {fileID: 180238, guid: eeb1c2ea47bc7f04cb234f63e9bbf4dc, type: 3}
+    - {fileID: 103884, guid: 7f7566e20b9ffe54798c1bf42201e1a9, type: 3}
     DustPrefab: {fileID: 4201273303516097864, guid: 09118807f6ce1b540986745109980a4b,
       type: 3}
     DebrisFieldPrefab: {fileID: 499915743396727940, guid: fc1dc757cf0f129499f376fe4bc78380,
diff --git a/Assets/GWConquest/Scripts/Battle.cs b/Assets/GWConquest/Scripts/Battle.cs
index d9c038a..c42052f 100644
--- a/Assets/GWConquest/Scripts/Battle.cs
+++ b/Assets/GWConquest/Scripts/Battle.cs
@@ -425,55 +425,70 @@ namespace GWConquest
         {
             var weapon = action.Weapon;
 
-            if(!Check(weapon.Accuracy))
-                return;                    
-
-            if(Check(target.Class.Evasion))
-                return;
-
-            int damage = weapon.Damage;
-            float effArmour = target.Shields > 0 ? 0f : target.Class.Armour;
-            float modifier = GetArmourModifier(effArmour, weapon.Penetration);
-
-            damage = Mathf.RoundToInt(damage * modifier);
-
-            if(damage < 0)
-                damage = 0;
-
-            if(DebugUI.LogBattleEvents)
-                BoltLog.Info("Dealing {0} HP damage (armour modifier: {1}) to unit {2} from unit {3}", damage, modifier, target, action.Unit);
-
-            bool isGlancingHit = damage == 0 || modifier < 1f;
-
             WeaponType weaponType;
-            if(action.Unit.Class.UnitType == UnitType.Infantry)
+            if (action.Unit.Class.UnitType == UnitType.Infantry)
             {
                 weaponType = WeaponType.Light;
             }
-            else if(action.Unit.Class.ZoneType == ZoneType.Space)
+            else if (action.Unit.Class.ZoneType == ZoneType.Space)
             {
                 weaponType = WeaponType.Ship;
             }
-            else {
+            else
+            {
                 weaponType = weapon.Penetration > 1f ? WeaponType.Heavy : WeaponType.MG;
             }
 
-            target.TakeDamage(damage, action.Unit, isGlancingHit, weapon, weaponType);
+            bool hits = true;
 
-            if(target.RevealState != RevealState.Visible)
-            {
-                target.RevealState = RevealState.Visible;
-            }
+            if (!Check(weapon.Accuracy))
+                hits = false;
+
+            if (Check(target.Class.Evasion))
+                hits = false;
 
-            if(action.Unit.RevealState != RevealState.Visible)
+            if (hits)
             {
-                if(Check(GameManager.Instance.RevealChanceAttack))
+
+                int damage = weapon.Damage;
+                float effArmour = target.Shields > 0 ? 0f : target.Class.Armour;
+                float modifier = GetArmourModifier(effArmour, weapon.Penetration);
+
+                damage = Mathf.RoundToInt(damage * modifier);
+
+                if (damage < 0)
+                    damage = 0;
+
+                if (DebugUI.LogBattleEvents)
+                    BoltLog.Info("Dealing {0} HP damage (armour modifier: {1}) to unit {2} from unit {3}", damage, modifier, target, action.Unit);
+
+                bool isGlancingHit = damage == 0 || modifier < 1f;
+
+
+
+                target.TakeDamage(damage, action.Unit, isGlancingHit, weapon, weaponType);
+
+                if (target.RevealState != RevealState.Visible)
                 {
-                    if(DebugUI.LogBattleEvents)
-                        BoltLog.Info("Revealing unit {0} as it attacked unit {1}", action.Unit, target);
-                    action.Unit.IncreaseRevealLevel();
+                    target.RevealState = RevealState.Visible;
+                }
+
+                if (action.Unit.RevealState != RevealState.Visible)
+                {
+                    if (Check(GameManager.Instance.RevealChanceAttack))
+                    {
+                        if (DebugUI.LogBattleEvents)
+                            BoltLog.Info("Revealing unit {0} as it attacked unit {1}", action.Unit, target);
+                        action.Unit.IncreaseRevealLevel();
+                    }
                 }
             }
+
+            var evnt = UnitAttackingEvent.Create(action.Unit.entity);
+            evnt.Target = target.entity;
+            evnt.Hit = hits;
+            evnt.WeaponType = (int)weaponType;
+            evnt.Send();
         }
 
         private Unit FindTargetForCombat(UnitAction action)
diff --git a/Assets/GWConquest/Scripts/Formation.cs b/Assets/GWConquest/Scripts/Formation.cs
index 9239c12..c357d08 100644
--- a/Assets/GWConquest/Scripts/Formation.cs
+++ b/Assets/GWConquest/Scripts/Formation.cs
@@ -607,7 +607,7 @@ namespace GWConquest
 
             if(movingArmyIcon != null && ZoneType == ZoneType.Space)
             {
-                if(GameManager.Instance.ShowCircles || MovementState == FormationMovementState.Moving)
+                if(!IngameUI.PlanetViewEnabled && (GameManager.Instance.ShowCircles || MovementState == FormationMovementState.Moving))
                 {
                     movingArmyIcon.SetActive(true);
                     movingArmyIcon.GetComponent<StickToFormation>().Update();
diff --git a/Assets/GWConquest/Scripts/PlanetPlacement.cs b/Assets/GWConquest/Scripts/PlanetPlacement.cs
index 243207c..910668b 100644
--- a/Assets/GWConquest/Scripts/PlanetPlacement.cs
+++ b/Assets/GWConquest/Scripts/PlanetPlacement.cs
@@ -204,7 +204,10 @@ namespace GWConquest
                     
                     astTrans.localPosition = new Vector3(randomPos.x, 0f, randomPos.y);
                     astTrans.localRotation = Random.rotationUniform;
-                    astTrans.localScale = Vector3.one * Random.Range(asteroidSettings.MinAsteroidScale, asteroidSettings.MaxAsteroidScale);
+                    astTrans.localScale = astPrefab.transform.localScale * Random.Range(asteroidSettings.MinAsteroidScale, asteroidSettings.MaxAsteroidScale);
+
+                    astGO.AddComponent<RotateAsteroids>();
+
                     i++;
                 }
             }
diff --git a/Assets/GWConquest/Scripts/RotateAsteroids.cs b/Assets/GWConquest/Scripts/RotateAsteroids.cs
index fb8c5be..a0b50d2 100644
--- a/Assets/GWConquest/Scripts/RotateAsteroids.cs
+++ b/Assets/GWConquest/Scripts/RotateAsteroids.cs
@@ -5,19 +5,17 @@ namespace GWConquest
     public class RotateAsteroids : MonoBehaviour
     {
 
-        [SerializeField]
-        Vector3 rotationPerTick;
+        private Quaternion rotationPerTick;
 
         void Update()
         {
 
-            transform.localEulerAngles += rotationPerTick;
+            transform.localRotation *= rotationPerTick;
         }
 
-        [ContextMenu("Randomize")]
-        public void Randomize()
+        void Start()
         {
-            rotationPerTick = new Vector3(Random.Range(-0.1f, 0.1f), Random.Range(-0.1f, 0.1f), Random.Range(-0.1f, 0.1f));
+            rotationPerTick = Quaternion.AngleAxis(Random.Range(0.05f, 0.15f), Random.onUnitSphere);
         }
     }
 }
diff --git a/Assets/GWConquest/Scripts/SoundEffects.cs b/Assets/GWConquest/Scripts/SoundEffects.cs
index f549b8b..1f93f95 100644
--- a/Assets/GWConquest/Scripts/SoundEffects.cs
+++ b/Assets/GWConquest/Scripts/SoundEffects.cs
@@ -42,7 +42,7 @@ namespace GWConquest {
 
         public static SoundEffects Instance;
 
-        public List<Tuple<float,SoundEntry>> SoundQueue = new List<Tuple<float,SoundEntry>>();
+        public List<Tuple<float,SoundEntry,float>> SoundQueue = new List<Tuple<float,SoundEntry,float>>();
 
         private AudioMixer audioMixer;
 
@@ -58,7 +58,7 @@ namespace GWConquest {
             audioMixer.SetFloat("PlanetVolume", Util.VolumeToDB(planetAudioCurrent));
         }
 
-        private void PlayEntry(SoundEntry entry, AudioMixerGroup mixerGroup, bool loop = false)
+        private void PlayEntry(SoundEntry entry, AudioMixerGroup mixerGroup, bool loop = false, float volumeMultiplier=1f)
         {
             var go = new GameObject("Audio Source");
             go.transform.SetParent(transform);
@@ -76,7 +76,7 @@ namespace GWConquest {
             }
 
             source.clip = clip;
-            source.volume = entry.volume;
+            source.volume = Mathf.Clamp01(entry.volume * volumeMultiplier);
             source.pitch = 1f + entry.pitchDiff;
             source.Play();
             if(entry.skipSecs != 0f)
@@ -86,24 +86,20 @@ namespace GWConquest {
             sources.Add(source);
         }
 
-        public void PlayEffect(string effect){
-            var entry = GetEntry(effect);
-
-            if(entry != null)
-            {
-                PlayEntry(entry, MixerGroup);
-            }
-
-            
-        }
-
-        public void PlayEffect(string effect, float delay) {
+        public void PlayEffect(string effect, float delay=0f, float volumeMultilpier=1f) {
             var time = Time.time;
 
             var entry = GetEntry(effect);
             if(entry != null)
             {
-                SoundQueue.Add(new Tuple<float, SoundEntry>(time + delay, entry));
+                if(delay == 0f)
+                {
+                    PlayEntry(entry, MixerGroup, false, volumeMultilpier);
+                }
+                else 
+                {
+                    SoundQueue.Add(new Tuple<float, SoundEntry, float>(time + delay, entry, volumeMultilpier));
+                }
 
             }
         }
@@ -141,7 +137,7 @@ namespace GWConquest {
             {
                 if(time >= q.Item1)
                 {
-                    PlayEntry(q.Item2, MixerGroup);
+                    PlayEntry(q.Item2, MixerGroup, false, q.Item3);
                     SoundQueue.Remove(q);
                 }
             }
diff --git a/Assets/GWConquest/Scripts/UI/BattleUI.cs b/Assets/GWConquest/Scripts/UI/BattleUI.cs
index 6f47df5..ae39b03 100644
--- a/Assets/GWConquest/Scripts/UI/BattleUI.cs
+++ b/Assets/GWConquest/Scripts/UI/BattleUI.cs
@@ -238,7 +238,18 @@ namespace GWConquest
             var shotSize = shotRT.sizeDelta;
             Vector3 attackerPos = attacker.rectTransform.position;
             Vector3 targetPos;
-            if (target.Unit.IsInReserve)
+            if(target == null)
+            {
+                Vector3[] corners = new Vector3[4];
+                FlankPanel.GetWorldCorners(corners);
+                float x = (corners[0].x + corners[2].x) * 0.5f;
+                x += Random.Range(-20f, 20f);
+                
+                float y = attackerPos.y;
+                y += Random.Range(-40f, 40f);
+                targetPos = new Vector3(x, y, 0);
+            }
+            else if (target.Unit.IsInReserve)
             {
                 var panel = target.GetComponentInParent<BattleArmyPanel>();
                 Vector3[] corners = new Vector3[4];
@@ -262,7 +273,7 @@ namespace GWConquest
 
             if (audioEffect != null)
             {
-                SoundEffects.Instance.PlayEffect(audioEffect);
+                SoundEffects.Instance.PlayEffect(audioEffect, volumeMultilpier: target != null ? 1f: 0.5f);
             }
         }
 
diff --git a/Assets/GWConquest/Scripts/UI/IngameUI.cs b/Assets/GWConquest/Scripts/UI/IngameUI.cs
index 2295bce..3807d68 100644
--- a/Assets/GWConquest/Scripts/UI/IngameUI.cs
+++ b/Assets/GWConquest/Scripts/UI/IngameUI.cs
@@ -95,7 +95,7 @@ namespace GWConquest
 
             if(Input.GetKeyDown(KeyCode.F12))
             {
-                DebugUI.SetActive(true);
+                DebugUI.SetActive(!DebugUI.activeSelf);
             }
         }
 
diff --git a/Assets/GWConquest/Scripts/Unit.cs b/Assets/GWConquest/Scripts/Unit.cs
index c3c6f28..0fc7034 100644
--- a/Assets/GWConquest/Scripts/Unit.cs
+++ b/Assets/GWConquest/Scripts/Unit.cs
@@ -374,35 +374,43 @@ namespace GWConquest
                     CurrentIcon.PlayHitAnim(evnt);
                 }
                 
+            }
+        }
 
-                var attacker = evnt.Attacker?.GetComponent<Unit>();
-                if(attacker != null && attacker.IconEnabled)
-                {
-                    attacker.CurrentIcon.PlayAttackingAnim();
+        public override void OnEvent(UnitAttackingEvent evnt)
+        {
+            if(IconEnabled)
+            {
+                CurrentIcon.PlayAttackingAnim();
 
-                    if(attacker.Class.UnitType == UnitType.Artillery)
+                if(Class.UnitType == UnitType.Artillery)
+                {
+                    SoundEffects.Instance.PlayEffect("ArtilleryShot", volumeMultilpier: evnt.Hit? 1f: 0.5f);
+                }
+                else {
+                    
+                    var target = evnt.Target?.GetComponent<Unit>();
+                    WeaponType weaponType = (WeaponType)evnt.WeaponType;
+                    if(target != null && evnt.Hit)
                     {
-                        SoundEffects.Instance.PlayEffect("ArtilleryShot");
+                        CurrentIcon.GetComponentInParent<BattleUI>().SpawnShotEffect(CurrentIcon, target.CurrentIcon, weaponType);
                     }
                     else {
-                        
-                        CurrentIcon.GetComponentInParent<BattleUI>().SpawnShotEffect(attacker.CurrentIcon, CurrentIcon, weaponType);
+                        CurrentIcon.GetComponentInParent<BattleUI>().SpawnShotEffect(CurrentIcon, null, weaponType);
                     }
-
-                    
                 }
             }
             else if(Class.ZoneType == ZoneType.Space && IngameUI.PlanetViewEnabled)
             {
-                var attacker = evnt.Attacker?.GetComponent<Unit>();
-                if(attacker != null)
+                var target = evnt.Target?.GetComponent<Unit>();
+                if(evnt.Hit && target != null)
                 {
                     var planetView = IngameUI.Instance.PlanetView;
                     if(planetView.selectedPlanet == Formation.currentZone.planet)
                     {
                         if(planetView.FleetIcons.isActiveAndEnabled)
                         {
-                            planetView.FleetIcons.PlayShotEffect(attacker, this);
+                            planetView.FleetIcons.PlayShotEffect(this, target);
                         }
                     }
                 }
diff --git a/Assets/Photon/PhotonBolt/assemblies/bolt.user.dll b/Assets/Photon/PhotonBolt/assemblies/bolt.user.dll
index b55ce34..7cc6d9d 100644
Binary files a/Assets/Photon/PhotonBolt/assemblies/bolt.user.dll and b/Assets/Photon/PhotonBolt/assemblies/bolt.user.dll differ
diff --git a/Assets/Photon/PhotonBolt/assemblies/bolt.user.dll.mdb b/Assets/Photon/PhotonBolt/assemblies/bolt.user.dll.mdb
index aaeeb75..4f30b99 100644
Binary files a/Assets/Photon/PhotonBolt/assemblies/bolt.user.dll.mdb and b/Assets/Photon/PhotonBolt/assemblies/bolt.user.dll.mdb differ
diff --git a/Assets/Photon/PhotonBolt/project.json b/Assets/Photon/PhotonBolt/project.json
index 5965536..1e573f6 100644
--- a/Assets/Photon/PhotonBolt/project.json
+++ b/Assets/Photon/PhotonBolt/project.json
@@ -2838,6 +2838,56 @@
       "Name": "PlanetState",
       "Guid": "24a9f35a-88f4-4200-8b54-5af945d76586",
       "Groups": []
+    },
+    {
+      "$type": "Photon.Bolt.Compiler.EventDefinition, bolt.compiler",
+      "Properties": [
+        {
+          "Name": "Target",
+          "Enabled": true,
+          "Expanded": true,
+          "ReplicationMode": 1,
+          "Priority": 1,
+          "PropertyType": {
+            "$type": "Photon.Bolt.Compiler.PropertyTypeEntity, bolt.compiler"
+          },
+          "AssetSettings": {
+            "$type": "Photon.Bolt.Compiler.PropertyEventSettings, bolt.compiler"
+          }
+        },
+        {
+          "Name": "Hit",
+          "Enabled": true,
+          "Expanded": true,
+          "ReplicationMode": 1,
+          "Priority": 1,
+          "PropertyType": {
+            "$type": "Photon.Bolt.Compiler.PropertyTypeBool, bolt.compiler"
+          },
+          "AssetSettings": {
+            "$type": "Photon.Bolt.Compiler.PropertyEventSettings, bolt.compiler"
+          }
+        },
+        {
+          "Name": "WeaponType",
+          "Enabled": true,
+          "Expanded": true,
+          "ReplicationMode": 1,
+          "Priority": 1,
+          "PropertyType": {
+            "$type": "Photon.Bolt.Compiler.PropertyTypeInteger, bolt.compiler",
+            "MaxValue": 255
+          },
+          "AssetSettings": {
+            "$type": "Photon.Bolt.Compiler.PropertyEventSettings, bolt.compiler"
+          }
+        }
+      ],
+      "EntitySenders": 1,
+      "GlobalSenders": 3,
+      "Name": "UnitAttackingEvent",
+      "Guid": "8f9fe35b-31da-48c6-a2ea-29f3392e1395",
+      "Groups": []
     }
   ],
   "ActiveGroup": "Everything"
diff --git a/Assets/Vast Outer Space/Prefabs/Asteroids/Asteroid_A.prefab b/Assets/Vast Outer Space/Prefabs/Asteroids/Asteroid_A.prefab
index bd7c56b..005df95 100644
--- a/Assets/Vast Outer Space/Prefabs/Asteroids/Asteroid_A.prefab	
+++ b/Assets/Vast Outer Space/Prefabs/Asteroids/Asteroid_A.prefab	
@@ -3,13 +3,14 @@
 --- !u!1 &173668
 GameObject:
   m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 4
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
   m_Component:
-  - 4: {fileID: 415920}
-  - 33: {fileID: 3383324}
-  - 23: {fileID: 2332370}
+  - component: {fileID: 415920}
+  - component: {fileID: 3383324}
+  - component: {fileID: 2332370}
   m_Layer: 0
   m_Name: Asteroid_A
   m_TagString: Untagged
@@ -19,57 +20,65 @@ GameObject:
   m_IsActive: 1
 --- !u!4 &415920
 Transform:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 173668}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 10, y: 10, z: 10}
+  m_LocalScale: {x: 150, y: 150, z: 150}
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &3383324
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 173668}
+  m_Mesh: {fileID: 4300000, guid: 38c445290885e384197c7c05e3d49f5f, type: 3}
 --- !u!23 &2332370
 MeshRenderer:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 173668}
   m_Enabled: 1
   m_CastShadows: 1
   m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
   m_Materials:
   - {fileID: 2100000, guid: 2ab70d44e5d7dd44290aeaf27fe1d7f5, type: 2}
-  m_SubsetIndices: 
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
   m_StaticBatchRoot: {fileID: 0}
-  m_UseLightProbes: 1
-  m_ReflectionProbeUsage: 1
   m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
   m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
   m_PreserveUVs: 0
   m_IgnoreNormalsForChartDetection: 0
   m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
   m_MinimumChartSize: 4
   m_AutoUVMaxDistance: 0.5
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
+  m_SortingLayer: 0
   m_SortingOrder: 0
---- !u!33 &3383324
-MeshFilter:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 173668}
-  m_Mesh: {fileID: 4300000, guid: 38c445290885e384197c7c05e3d49f5f, type: 3}
---- !u!1001 &100100000
-Prefab:
-  m_ObjectHideFlags: 1
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications: []
-    m_RemovedComponents: []
-  m_ParentPrefab: {fileID: 0}
-  m_RootGameObject: {fileID: 173668}
-  m_IsPrefabParent: 1
+  m_AdditionalVertexStreams: {fileID: 0}
diff --git a/Assets/Vast Outer Space/Prefabs/Asteroids/Asteroid_B.prefab b/Assets/Vast Outer Space/Prefabs/Asteroids/Asteroid_B.prefab
index 858dc30..f335a3c 100644
--- a/Assets/Vast Outer Space/Prefabs/Asteroids/Asteroid_B.prefab	
+++ b/Assets/Vast Outer Space/Prefabs/Asteroids/Asteroid_B.prefab	
@@ -3,13 +3,14 @@
 --- !u!1 &190680
 GameObject:
   m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 4
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
   m_Component:
-  - 4: {fileID: 449400}
-  - 33: {fileID: 3339702}
-  - 23: {fileID: 2310886}
+  - component: {fileID: 449400}
+  - component: {fileID: 3339702}
+  - component: {fileID: 2310886}
   m_Layer: 0
   m_Name: Asteroid_B
   m_TagString: Untagged
@@ -19,57 +20,65 @@ GameObject:
   m_IsActive: 1
 --- !u!4 &449400
 Transform:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 190680}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 10, y: 10, z: 10}
+  m_LocalScale: {x: 150, y: 150, z: 150}
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &3339702
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 190680}
+  m_Mesh: {fileID: 4300002, guid: 38c445290885e384197c7c05e3d49f5f, type: 3}
 --- !u!23 &2310886
 MeshRenderer:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 190680}
   m_Enabled: 1
   m_CastShadows: 1
   m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
   m_Materials:
   - {fileID: 2100000, guid: 78fa8c6cf8494a8458e481f9665233b4, type: 2}
-  m_SubsetIndices: 
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
   m_StaticBatchRoot: {fileID: 0}
-  m_UseLightProbes: 1
-  m_ReflectionProbeUsage: 1
   m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
   m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
   m_PreserveUVs: 0
   m_IgnoreNormalsForChartDetection: 0
   m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
   m_MinimumChartSize: 4
   m_AutoUVMaxDistance: 0.5
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
+  m_SortingLayer: 0
   m_SortingOrder: 0
---- !u!33 &3339702
-MeshFilter:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 190680}
-  m_Mesh: {fileID: 4300002, guid: 38c445290885e384197c7c05e3d49f5f, type: 3}
---- !u!1001 &100100000
-Prefab:
-  m_ObjectHideFlags: 1
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications: []
-    m_RemovedComponents: []
-  m_ParentPrefab: {fileID: 0}
-  m_RootGameObject: {fileID: 190680}
-  m_IsPrefabParent: 1
+  m_AdditionalVertexStreams: {fileID: 0}
diff --git a/Assets/Vast Outer Space/Prefabs/Asteroids/Asteroid_C.prefab b/Assets/Vast Outer Space/Prefabs/Asteroids/Asteroid_C.prefab
index ba06879..327b447 100644
--- a/Assets/Vast Outer Space/Prefabs/Asteroids/Asteroid_C.prefab	
+++ b/Assets/Vast Outer Space/Prefabs/Asteroids/Asteroid_C.prefab	
@@ -3,13 +3,14 @@
 --- !u!1 &180238
 GameObject:
   m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 4
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
   m_Component:
-  - 4: {fileID: 484066}
-  - 33: {fileID: 3354870}
-  - 23: {fileID: 2387644}
+  - component: {fileID: 484066}
+  - component: {fileID: 3354870}
+  - component: {fileID: 2387644}
   m_Layer: 0
   m_Name: Asteroid_C
   m_TagString: Untagged
@@ -19,57 +20,65 @@ GameObject:
   m_IsActive: 1
 --- !u!4 &484066
 Transform:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 180238}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 10, y: 10, z: 10}
+  m_LocalScale: {x: 150, y: 150, z: 150}
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &3354870
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 180238}
+  m_Mesh: {fileID: 4300004, guid: 38c445290885e384197c7c05e3d49f5f, type: 3}
 --- !u!23 &2387644
 MeshRenderer:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 180238}
   m_Enabled: 1
   m_CastShadows: 1
   m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
   m_Materials:
   - {fileID: 2100000, guid: e907e370a06d3ff49b3215387775ed67, type: 2}
-  m_SubsetIndices: 
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
   m_StaticBatchRoot: {fileID: 0}
-  m_UseLightProbes: 1
-  m_ReflectionProbeUsage: 1
   m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
   m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
   m_PreserveUVs: 0
   m_IgnoreNormalsForChartDetection: 0
   m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
   m_MinimumChartSize: 4
   m_AutoUVMaxDistance: 0.5
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
+  m_SortingLayer: 0
   m_SortingOrder: 0
---- !u!33 &3354870
-MeshFilter:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 180238}
-  m_Mesh: {fileID: 4300004, guid: 38c445290885e384197c7c05e3d49f5f, type: 3}
---- !u!1001 &100100000
-Prefab:
-  m_ObjectHideFlags: 1
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications: []
-    m_RemovedComponents: []
-  m_ParentPrefab: {fileID: 0}
-  m_RootGameObject: {fileID: 180238}
-  m_IsPrefabParent: 1
+  m_AdditionalVertexStreams: {fileID: 0}
diff --git a/Assets/Vast Outer Space/Prefabs/Asteroids/Asteroid_D.prefab b/Assets/Vast Outer Space/Prefabs/Asteroids/Asteroid_D.prefab
index b8bf008..ff36f02 100644
--- a/Assets/Vast Outer Space/Prefabs/Asteroids/Asteroid_D.prefab	
+++ b/Assets/Vast Outer Space/Prefabs/Asteroids/Asteroid_D.prefab	
@@ -3,13 +3,14 @@
 --- !u!1 &103884
 GameObject:
   m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 4
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
   m_Component:
-  - 4: {fileID: 444136}
-  - 33: {fileID: 3371134}
-  - 23: {fileID: 2338898}
+  - component: {fileID: 444136}
+  - component: {fileID: 3371134}
+  - component: {fileID: 2338898}
   m_Layer: 0
   m_Name: Asteroid_D
   m_TagString: Untagged
@@ -19,57 +20,65 @@ GameObject:
   m_IsActive: 1
 --- !u!4 &444136
 Transform:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 103884}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 10, y: 10, z: 10}
+  m_LocalScale: {x: 150, y: 150, z: 150}
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &3371134
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 103884}
+  m_Mesh: {fileID: 4300006, guid: 38c445290885e384197c7c05e3d49f5f, type: 3}
 --- !u!23 &2338898
 MeshRenderer:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 103884}
   m_Enabled: 1
   m_CastShadows: 1
   m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
   m_Materials:
   - {fileID: 2100000, guid: 535a9a8f731dfd544b3bfd12756e002f, type: 2}
-  m_SubsetIndices: 
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
   m_StaticBatchRoot: {fileID: 0}
-  m_UseLightProbes: 1
-  m_ReflectionProbeUsage: 1
   m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
   m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
   m_PreserveUVs: 0
   m_IgnoreNormalsForChartDetection: 0
   m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
   m_MinimumChartSize: 4
   m_AutoUVMaxDistance: 0.5
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
+  m_SortingLayer: 0
   m_SortingOrder: 0
---- !u!33 &3371134
-MeshFilter:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 103884}
-  m_Mesh: {fileID: 4300006, guid: 38c445290885e384197c7c05e3d49f5f, type: 3}
---- !u!1001 &100100000
-Prefab:
-  m_ObjectHideFlags: 1
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications: []
-    m_RemovedComponents: []
-  m_ParentPrefab: {fileID: 0}
-  m_RootGameObject: {fileID: 103884}
-  m_IsPrefabParent: 1
+  m_AdditionalVertexStreams: {fileID: 0}