Transitions auf Planeten

Assets/GWConquest/Prefabs/Formation.prefab

@@ -29,7 +29,7 @@ Transform:
   m_GameObject: {fileID: 3797021628422937969}
   m_LocalRotation: {x: 0.7071057, y: 0.00000017881392, z: 0.00000008940696, w: 0.70710796}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 7.6183, y: 7.6183, z: 7.6183}
+  m_LocalScale: {x: 8, y: 8, z: 8}
   m_Children: []
   m_Father: {fileID: 8292977142823461081}
   m_RootOrder: 0
@@ -158,8 +158,9 @@ MonoBehaviour:
   unitIconPrefab: {fileID: 3490316418910827002, guid: 823be9508eb6c31478f39dff23361625,
     type: 3}
   fleetIcon: {fileID: 3797021628422937969}
+  movingArmyPrefab: {fileID: 7920185636364354306, guid: 233d61789cbb0504cb4f2605549a5fd2,
+    type: 3}
   movementSpeed: 150
-  sprite: {fileID: 21300000, guid: a725f0b3a4d26a945a5b8ccbcffef516, type: 3}
 --- !u!114 &-4037000077425190141
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/GWConquest/Prefabs/MovingArmyIcon.prefab

@@ -0,0 +1,215 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &7920185636292591646
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7920185636292591641}
+  - component: {fileID: 7920185636292591643}
+  - component: {fileID: 7920185636292591640}
+  m_Layer: 5
+  m_Name: Circle
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7920185636292591641
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7920185636292591646}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 7920185636364354317}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: -20, y: -20}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7920185636292591643
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7920185636292591646}
+  m_CullTransparentMesh: 0
+--- !u!114 &7920185636292591640
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7920185636292591646}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 370850b08f1a45a4289ac90c3734199f, type: 3}
+  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 &7920185636364354306
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7920185636364354317}
+  - component: {fileID: 7920185636364354316}
+  - component: {fileID: 6817227591455877562}
+  m_Layer: 5
+  m_Name: MovingArmyIcon
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7920185636364354317
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7920185636364354306}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 7920185636868552046}
+  - {fileID: 7920185636292591641}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  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: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7920185636364354316
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7920185636364354306}
+  m_CullTransparentMesh: 0
+--- !u!114 &6817227591455877562
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7920185636364354306}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0d18f53b7611f3644afea9c395a4812c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  target: {fileID: 0}
+--- !u!1 &7920185636868552047
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7920185636868552046}
+  - component: {fileID: 7920185636868552040}
+  - component: {fileID: 7920185636868552041}
+  m_Layer: 5
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7920185636868552046
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7920185636868552047}
+  m_LocalRotation: {x: -0.00000008429362, y: -0.0000016015797, z: 0.00000008940697,
+    w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.48521993, y: 0.48521987, z: 0.48521996}
+  m_Children: []
+  m_Father: {fileID: 7920185636364354317}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7920185636868552040
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7920185636868552047}
+  m_CullTransparentMesh: 0
+--- !u!114 &7920185636868552041
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7920185636868552047}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: c47f9c9ae53006b46bef8b5c48a002a5, type: 3}
+    m_FontSize: 83
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 83
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: IV

Assets/GWConquest/Prefabs/MovingArmyIcon.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 233d61789cbb0504cb4f2605549a5fd2
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/GWConquest/Scenes/GalaxyMap.unity

@@ -7557,17 +7557,17 @@ PrefabInstance:
     - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: -16.09
+      value: -20.43
       objectReference: {fileID: 0}
     - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: 12.13
+      value: 16.62
       objectReference: {fileID: 0}
     - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb,
         type: 3}
       propertyPath: m_LocalPosition.z
-      value: 0.68
+      value: -3.57
       objectReference: {fileID: 0}
     - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb,
         type: 3}
@@ -9142,7 +9142,7 @@ PrefabInstance:
     - target: {fileID: 135309575519242482, guid: 00cbbb3475b1b0640a802c21a905203b,
         type: 3}
       propertyPath: m_Radius
-      value: 34.3
+      value: 35.44
       objectReference: {fileID: 0}
     m_RemovedComponents:
     - {fileID: 95714714518320300, guid: 00cbbb3475b1b0640a802c21a905203b, type: 3}
@@ -13014,6 +13014,7 @@ RectTransform:
   - {fileID: 593026048}
   - {fileID: 59851046}
   - {fileID: 1546794982489047014}
+  - {fileID: 1465220856}
   m_Father: {fileID: 765894939}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -39022,17 +39023,17 @@ PrefabInstance:
     - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: -14.57
+      value: -14.37
       objectReference: {fileID: 0}
     - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: 14.7
+      value: 14.28
       objectReference: {fileID: 0}
     - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb,
         type: 3}
       propertyPath: m_LocalPosition.z
-      value: -16.43
+      value: -17.21
       objectReference: {fileID: 0}
     - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb,
         type: 3}
@@ -53104,17 +53105,17 @@ PrefabInstance:
     - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: 1.14
+      value: -9.71
       objectReference: {fileID: 0}
     - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: 19.95
+      value: 22.94
       objectReference: {fileID: 0}
     - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb,
         type: 3}
       propertyPath: m_LocalPosition.z
-      value: -2.71
+      value: -9.27
       objectReference: {fileID: 0}
     - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb,
         type: 3}
@@ -71510,6 +71511,12 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 59300c3dd14d29d4895f5f18e85d7eb3, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!224 &1465220856 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 7920185636364354317, guid: 233d61789cbb0504cb4f2605549a5fd2,
+    type: 3}
+  m_PrefabInstance: {fileID: 7920185637225070069}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1466570028
 GameObject:
   m_ObjectHideFlags: 0
@@ -98141,17 +98148,17 @@ PrefabInstance:
     - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: -11.29
+      value: -16
       objectReference: {fileID: 0}
     - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: 15.69
+      value: 18.83
       objectReference: {fileID: 0}
     - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb,
         type: 3}
       propertyPath: m_LocalPosition.z
-      value: -5.75
+      value: -9.8
       objectReference: {fileID: 0}
     - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb,
         type: 3}
@@ -106970,6 +106977,130 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 2f11b55f5ed06ea47ad34fa5be334264, type: 3}
+--- !u!1001 &7920185637225070069
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 244030531}
+    m_Modifications:
+    - target: {fileID: 7920185636364354306, guid: 233d61789cbb0504cb4f2605549a5fd2,
+        type: 3}
+      propertyPath: m_Name
+      value: MovingArmyIcon
+      objectReference: {fileID: 0}
+    - target: {fileID: 7920185636364354306, guid: 233d61789cbb0504cb4f2605549a5fd2,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7920185636364354317, guid: 233d61789cbb0504cb4f2605549a5fd2,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7920185636364354317, guid: 233d61789cbb0504cb4f2605549a5fd2,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7920185636364354317, guid: 233d61789cbb0504cb4f2605549a5fd2,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7920185636364354317, guid: 233d61789cbb0504cb4f2605549a5fd2,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7920185636364354317, guid: 233d61789cbb0504cb4f2605549a5fd2,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7920185636364354317, guid: 233d61789cbb0504cb4f2605549a5fd2,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7920185636364354317, guid: 233d61789cbb0504cb4f2605549a5fd2,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7920185636364354317, guid: 233d61789cbb0504cb4f2605549a5fd2,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 7920185636364354317, guid: 233d61789cbb0504cb4f2605549a5fd2,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7920185636364354317, guid: 233d61789cbb0504cb4f2605549a5fd2,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7920185636364354317, guid: 233d61789cbb0504cb4f2605549a5fd2,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7920185636364354317, guid: 233d61789cbb0504cb4f2605549a5fd2,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7920185636364354317, guid: 233d61789cbb0504cb4f2605549a5fd2,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7920185636364354317, guid: 233d61789cbb0504cb4f2605549a5fd2,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 100
+      objectReference: {fileID: 0}
+    - target: {fileID: 7920185636364354317, guid: 233d61789cbb0504cb4f2605549a5fd2,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 100
+      objectReference: {fileID: 0}
+    - target: {fileID: 7920185636364354317, guid: 233d61789cbb0504cb4f2605549a5fd2,
+        type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 7920185636364354317, guid: 233d61789cbb0504cb4f2605549a5fd2,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 7920185636364354317, guid: 233d61789cbb0504cb4f2605549a5fd2,
+        type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 7920185636364354317, guid: 233d61789cbb0504cb4f2605549a5fd2,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 7920185636364354317, guid: 233d61789cbb0504cb4f2605549a5fd2,
+        type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 7920185636364354317, guid: 233d61789cbb0504cb4f2605549a5fd2,
+        type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 233d61789cbb0504cb4f2605549a5fd2, type: 3}
 --- !u!1 &8285035487986869186
 GameObject:
   m_ObjectHideFlags: 0

Assets/GWConquest/Scripts/Formation.cs

@@ -75,8 +75,10 @@ namespace GWConquest
 
         public GameObject fleetIcon;
 
+        public GameObject movingArmyPrefab;
+        private GameObject movingArmyIcon;
+
         public float movementSpeed = 1f;
-        public Sprite sprite;
 
         [System.NonSerialized]
         public bool IsExpandedInMenu = true;
@@ -149,8 +151,38 @@ namespace GWConquest
         private void OnTransitStateChanged()
         {
             animDistanceCovered = 0;
-            fleetIcon.SetActive(state.IsInTransit);
-            fleetIcon.GetComponent<Renderer>().material.color = Player.Color;
+            if(state.IsInTransit)
+            {
+                if(state.CurrentTransition.IsCurved) {
+                    movingArmyIcon = Instantiate(movingArmyPrefab);
+                    movingArmyIcon.transform.SetParent(FindObjectOfType<PlanetViewUI>().DistrictIcons);
+                    movingArmyIcon.transform.localRotation = Quaternion.identity;
+                    movingArmyIcon.GetComponent<StickUIToPlanet>().target = transform;
+                    movingArmyIcon.GetComponentInChildren<UnityEngine.UI.Image>().color = Player.Color;
+                    movingArmyIcon.GetComponentInChildren<UnityEngine.UI.Text>().color = Player.Color;
+                    Transform circleTransform = movingArmyIcon.GetComponentInChildren<UnityEngine.UI.Image>().transform;
+                    Camera cam = Camera.main;
+                    Vector3 originPoint = RectTransformUtility.WorldToScreenPoint(cam, Zone.GetFromId(state.CurrentTransition.OriginZone).transform.position);
+                    Vector3 targetPoint = RectTransformUtility.WorldToScreenPoint(cam, Zone.GetFromId(state.CurrentTransition.TargetZone).transform.position);
+                    circleTransform.localRotation = Quaternion.FromToRotation(Vector3.up, targetPoint-originPoint);
+
+                } else { 
+                    fleetIcon.SetActive(true);
+                    fleetIcon.GetComponent<Renderer>().material.color = Player.Color;
+                }
+                
+            }
+            else
+            {
+                fleetIcon.SetActive(false);
+                if(movingArmyIcon != null)
+                {
+                    Destroy(movingArmyIcon);
+                    movingArmyIcon = null;
+                }
+            }
+
+
         }
 
         public override void SimulateOwner()
@@ -202,6 +234,7 @@ namespace GWConquest
                 Zone targetZone = Zone.GetFromId(state.CurrentTransition.TargetZone);
                 Vector3 oldPos = transform.position;
                 Vector3 newPos;
+                Quaternion newRot;
                 if(state.CurrentTransition.IsCurved)
                 {
                     
@@ -211,17 +244,18 @@ namespace GWConquest
                     newPos = Vector3.Slerp(originPos, targetPos,
                         animDistanceCovered / state.CurrentTransition.TransitionLength);
                     newPos += planetPos;
+                    newRot = Quaternion.LookRotation(newPos - oldPos, newPos - planetPos);
                 }
                 else
                 {
                     newPos = Vector3.Lerp(originZone.transform.position,
                        targetZone.transform.position,
                        animDistanceCovered / state.CurrentTransition.TransitionLength);
+                    newRot = Quaternion.LookRotation(newPos - oldPos, Vector3.up);
                 }
                
                 transform.position = newPos;
-                transform.rotation = Quaternion.FromToRotation(Vector3.forward,
-                    newPos - oldPos);
+                transform.rotation = newRot;
                 
             }
             else if(currentZone != null)

Assets/GWConquest/Textures/Icons/1234.png.meta

@@ -0,0 +1,128 @@
+fileFormatVersion: 2
+guid: 370850b08f1a45a4289ac90c3734199f
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 2
+    aniso: 2
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: -1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 2
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/GWConquest/Textures/Icons/Materials/Army Moving.mat

@@ -0,0 +1,84 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Army Moving
+  m_Shader: {fileID: 10760, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: _ALPHABLEND_ON
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: 370850b08f1a45a4289ac90c3734199f, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _BumpScale: 1
+    - _ColorMask: 15
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 10
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 2
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 5
+    - _Stencil: 0
+    - _StencilComp: 8
+    - _StencilOp: 0
+    - _StencilReadMask: 255
+    - _StencilWriteMask: 255
+    - _UVSec: 0
+    - _UseUIAlphaClip: 0
+    - _ZWrite: 0
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

Assets/GWConquest/Textures/Icons/Materials/Army Moving.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: beb6a5954dab0324a818231a26682703
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: