Small Fleet Icons (WIP), Fixes

Assets/GWConquest/Animations/FleetIcon.controller

@@ -1,8 +1,33 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1101 &-9134304281230999749
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 2
+    m_ConditionEvent: Small
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: -7549341647043909749}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0
+  m_TransitionOffset: 0
+  m_ExitTime: 0.75
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1102 &-7549341647043909749
 AnimatorState:
-  serializedVersion: 5
+  serializedVersion: 6
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -12,6 +37,7 @@ AnimatorState:
   m_CycleOffset: 0
   m_Transitions:
   - {fileID: 432087809510585664}
+  - {fileID: 5792764332646239327}
   m_StateMachineBehaviours: []
   m_Position: {x: 50, y: 50, z: 0}
   m_IKOnFeet: 0
@@ -29,7 +55,7 @@ AnimatorState:
   m_TimeParameter: 
 --- !u!1107 &-4945115439738441631
 AnimatorStateMachine:
-  serializedVersion: 5
+  serializedVersion: 6
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -41,7 +67,10 @@ AnimatorStateMachine:
     m_Position: {x: 380, y: -40, z: 0}
   - serializedVersion: 1
     m_State: {fileID: -7549341647043909749}
-    m_Position: {x: 376.59326, y: 95.48514, z: 0}
+    m_Position: {x: 380, y: 100, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 9198265562621750234}
+    m_Position: {x: 380, y: 240, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions: []
   m_EntryTransitions: []
@@ -66,7 +95,13 @@ AnimatorController:
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 9100000}
+    m_Controller: {fileID: 0}
+  - m_Name: Small
+    m_Type: 4
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 0}
   m_AnimatorLayers:
   - serializedVersion: 5
     m_Name: Base Layer
@@ -132,7 +167,7 @@ AnimatorStateTransition:
   m_CanTransitionToSelf: 1
 --- !u!1102 &5455739953621634429
 AnimatorState:
-  serializedVersion: 5
+  serializedVersion: 6
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -157,3 +192,55 @@ AnimatorState:
   m_MirrorParameter: 
   m_CycleOffsetParameter: 
   m_TimeParameter: 
+--- !u!1101 &5792764332646239327
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 1
+    m_ConditionEvent: Small
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 9198265562621750234}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0
+  m_TransitionOffset: 0
+  m_ExitTime: 0.5
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
+--- !u!1102 &9198265562621750234
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: FormationIconSmall
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: -9134304281230999749}
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7400000, guid: 3953e3a509d23a4418fda73d518136d4, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 

Assets/GWConquest/Animations/FormationIconSmall.anim

@@ -0,0 +1,223 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: FormationIconSmall
+  serializedVersion: 6
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves: []
+  m_PositionCurves: []
+  m_ScaleCurves:
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: {x: 0.55, y: 0.55, z: 0.55}
+        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: 
+  m_FloatCurves:
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        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: Coloured/Strengths
+    classID: 1
+    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
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_IsActive
+    path: Coloured/Kreis/Icons/PlanetName (2)
+    classID: 1
+    script: {fileID: 0}
+  m_PPtrCurves: []
+  m_SampleRate: 60
+  m_WrapMode: 0
+  m_Bounds:
+    m_Center: {x: 0, y: 0, z: 0}
+    m_Extent: {x: 0, y: 0, z: 0}
+  m_ClipBindingConstant:
+    genericBindings:
+    - serializedVersion: 2
+      path: 2806306492
+      attribute: 2086281974
+      script: {fileID: 0}
+      typeID: 1
+      customType: 0
+      isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 3125510277
+      attribute: 2086281974
+      script: {fileID: 0}
+      typeID: 1
+      customType: 0
+      isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 0
+      attribute: 3
+      script: {fileID: 0}
+      typeID: 4
+      customType: 0
+      isPPtrCurve: 0
+    pptrCurveMapping: []
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 0
+    m_OrientationOffsetY: 0
+    m_Level: 0
+    m_CycleOffset: 0
+    m_HasAdditiveReferencePose: 0
+    m_LoopTime: 1
+    m_LoopBlend: 0
+    m_LoopBlendOrientation: 0
+    m_LoopBlendPositionY: 0
+    m_LoopBlendPositionXZ: 0
+    m_KeepOriginalOrientation: 0
+    m_KeepOriginalPositionY: 1
+    m_KeepOriginalPositionXZ: 0
+    m_HeightFromFeet: 0
+    m_Mirror: 0
+  m_EditorCurves:
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0.55
+        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: 
+    classID: 224
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0.55
+        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: 
+    classID: 224
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0.55
+        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: 
+    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
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_IsActive
+    path: Coloured/Strengths
+    classID: 1
+    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
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_IsActive
+    path: Coloured/Kreis/Icons/PlanetName (2)
+    classID: 1
+    script: {fileID: 0}
+  m_EulerEditorCurves: []
+  m_HasGenericRootTransform: 0
+  m_HasMotionFloatCurves: 0
+  m_Events: []

Assets/GWConquest/Animations/FormationIconSmall.anim.meta

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

Assets/GWConquest/Prefabs/UI/PlanetIndicator.prefab

@@ -30,7 +30,7 @@ RectTransform:
   m_LocalScale: {x: -1, y: -1, z: 1}
   m_Children: []
   m_Father: {fileID: 1577843074573127529}
-  m_RootOrder: 0
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -75,6 +75,81 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &1002822775029745074
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2769750475733240597}
+  - component: {fileID: 6795421090904677716}
+  - component: {fileID: 6471207387427022042}
+  m_Layer: 5
+  m_Name: Image (2)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2769750475733240597
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1002822775029745074}
+  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: 3879185905057081487}
+  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: 115.94, y: 115.94}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6795421090904677716
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1002822775029745074}
+  m_CullTransparentMesh: 0
+--- !u!114 &6471207387427022042
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1002822775029745074}
+  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: 0.027999999, g: 0.027999999, b: 0.027999999, 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: 7f590b703cf5e894ba87509ddeee5bf6, type: 3}
+  m_Type: 3
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 1
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &1004975018085727846
 GameObject:
   m_ObjectHideFlags: 0
@@ -209,7 +284,7 @@ RectTransform:
   m_LocalScale: {x: -1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 949089614183720835}
-  m_RootOrder: 0
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -315,7 +390,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -463,6 +538,41 @@ MonoBehaviour:
   Padding: 0
   Horizontal: 1
   Vertical: 0
+--- !u!1 &1958229941333955264
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5045050247363159289}
+  m_Layer: 0
+  m_Name: EnemyPoint2
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5045050247363159289
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1958229941333955264}
+  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: 5555511443230997665}
+  m_RootOrder: 4
+  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: 59.2, y: -18.6}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &2095399765145761935
 GameObject:
   m_ObjectHideFlags: 0
@@ -490,6 +600,7 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
+  - {fileID: 2734772917523537784}
   - {fileID: 2625678746010572272}
   - {fileID: 529533629988970957}
   m_Father: {fileID: 3206999086042524838}
@@ -530,7 +641,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 3879185905057081487}
-  m_RootOrder: 0
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -575,6 +686,41 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &2255088856537910825
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2549171012196151800}
+  m_Layer: 0
+  m_Name: PlayerPoint2
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2549171012196151800
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2255088856537910825}
+  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: 5555511443230997665}
+  m_RootOrder: 1
+  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: -59.2, y: -18.6}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &2451066642176989824
 GameObject:
   m_ObjectHideFlags: 0
@@ -605,7 +751,7 @@ RectTransform:
   m_LocalScale: {x: -1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 949089614183720835}
-  m_RootOrder: 1
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -710,7 +856,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -784,7 +930,7 @@ RectTransform:
   m_LocalScale: {x: -1, y: -1, z: 1}
   m_Children: []
   m_Father: {fileID: 1577843074573127529}
-  m_RootOrder: 1
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -829,6 +975,41 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &2883039445500272202
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1108323479040954217}
+  m_Layer: 0
+  m_Name: PlayerPoint3
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1108323479040954217
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2883039445500272202}
+  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: 5555511443230997665}
+  m_RootOrder: 2
+  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: -77.8, y: 0}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &2946785577647416901
 GameObject:
   m_ObjectHideFlags: 0
@@ -895,6 +1076,116 @@ Animator:
   m_HasTransformHierarchy: 1
   m_AllowConstantClipSamplingOptimization: 1
   m_KeepAnimatorControllerStateOnDisable: 0
+--- !u!1 &3419344502731983881
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2894948623787483583}
+  m_Layer: 0
+  m_Name: EnemyPoint3
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2894948623787483583
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3419344502731983881}
+  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: 5555511443230997665}
+  m_RootOrder: 5
+  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: 77.8, y: 0}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &3432742352552251680
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4298513808820082869}
+  - component: {fileID: 8008125265786734229}
+  - component: {fileID: 1744895541014408764}
+  m_Layer: 5
+  m_Name: Image (2)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4298513808820082869
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3432742352552251680}
+  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: 6750907626847124730}
+  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: 115.94, y: 115.94}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8008125265786734229
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3432742352552251680}
+  m_CullTransparentMesh: 0
+--- !u!114 &1744895541014408764
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3432742352552251680}
+  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: 0.02745098, g: 0.02745098, b: 0.02745098, 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: 7f590b703cf5e894ba87509ddeee5bf6, type: 3}
+  m_Type: 3
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 1
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &3536075192841412823
 GameObject:
   m_ObjectHideFlags: 0
@@ -1049,7 +1340,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 3879185905057081487}
-  m_RootOrder: 1
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1124,7 +1415,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: -1, z: 1}
   m_Children: []
   m_Father: {fileID: 6750907626847124730}
-  m_RootOrder: 0
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1169,6 +1460,41 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &4393998371872616219
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1673277343227802497}
+  m_Layer: 0
+  m_Name: PlayerPoint1
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1673277343227802497
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4393998371872616219}
+  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: 5555511443230997665}
+  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: -59.2, y: 18.6}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &4882745342399101360
 GameObject:
   m_ObjectHideFlags: 0
@@ -1229,7 +1555,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -1300,6 +1626,7 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
+  - {fileID: 2769750475733240597}
   - {fileID: 5551721084081144133}
   - {fileID: 5244398785863296100}
   m_Father: {fileID: 3206999086042524838}
@@ -1340,7 +1667,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: -1, z: 1}
   m_Children: []
   m_Father: {fileID: 6750907626847124730}
-  m_RootOrder: 1
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1412,6 +1739,7 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
+  - {fileID: 4298513808820082869}
   - {fileID: 8919448470561112503}
   - {fileID: 2591312047826121234}
   m_Father: {fileID: 3206999086042524838}
@@ -1422,6 +1750,116 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &6085776502859706323
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2920843039525019817}
+  m_Layer: 0
+  m_Name: EnemyPoint1
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2920843039525019817
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6085776502859706323}
+  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: 5555511443230997665}
+  m_RootOrder: 3
+  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: 59.2, y: 18.6}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &6264242665516648090
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2734772917523537784}
+  - component: {fileID: 893066944017439527}
+  - component: {fileID: 6768490815798162643}
+  m_Layer: 5
+  m_Name: Image (4)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2734772917523537784
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6264242665516648090}
+  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: 1577843074573127529}
+  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: 115.94, y: 115.94}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &893066944017439527
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6264242665516648090}
+  m_CullTransparentMesh: 0
+--- !u!114 &6768490815798162643
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6264242665516648090}
+  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: 0.02745098, g: 0.02745098, b: 0.02745098, 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: 7f590b703cf5e894ba87509ddeee5bf6, type: 3}
+  m_Type: 3
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 1
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &7169571971754125867
 GameObject:
   m_ObjectHideFlags: 0
@@ -1449,6 +1887,7 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
+  - {fileID: 5781385992850890693}
   - {fileID: 7614578727491438161}
   - {fileID: 1340098551323402705}
   m_Father: {fileID: 3206999086042524838}
@@ -1469,7 +1908,6 @@ GameObject:
   m_Component:
   - component: {fileID: 7384831771431062766}
   - component: {fileID: 7384831771431062764}
-  - component: {fileID: 7384831771431062767}
   - component: {fileID: 6701703001733289505}
   - component: {fileID: 1235410532173918665}
   - component: {fileID: 995647594929474570}
@@ -1494,6 +1932,7 @@ RectTransform:
   - {fileID: 3206999086042524838}
   - {fileID: 7493439069602050584}
   - {fileID: 6852626612145593344}
+  - {fileID: 5555511443230997665}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1530,18 +1969,14 @@ MonoBehaviour:
   DistrictSymbols: {fileID: 6852626612145593344}
   DistrictSymbolPrefab: {fileID: 7541130419680964748, guid: 8fca0dbef7b398042895a2af57b648ea,
     type: 3}
---- !u!114 &7384831771431062767
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7384831771431062761}
-  m_Enabled: 0
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: e11e604ed3fa06f4bb0769de129bd71d, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
+  PlayerFleetPoints:
+  - {fileID: 1673277343227802497}
+  - {fileID: 2549171012196151800}
+  - {fileID: 1108323479040954217}
+  EnemyFleetPoints:
+  - {fileID: 2920843039525019817}
+  - {fileID: 5045050247363159289}
+  - {fileID: 2894948623787483583}
 --- !u!95 &6701703001733289505
 Animator:
   serializedVersion: 3
@@ -1648,7 +2083,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 0.54901963, b: 0.27058825, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -1664,3 +2099,119 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &8564401219005961352
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5555511443230997665}
+  m_Layer: 0
+  m_Name: FleetIconPoints
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5555511443230997665
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8564401219005961352}
+  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: 1673277343227802497}
+  - {fileID: 2549171012196151800}
+  - {fileID: 1108323479040954217}
+  - {fileID: 2920843039525019817}
+  - {fileID: 5045050247363159289}
+  - {fileID: 2894948623787483583}
+  m_Father: {fileID: 7384831771431062766}
+  m_RootOrder: 3
+  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!1 &8910806377604372441
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5781385992850890693}
+  - component: {fileID: 6488624209557714896}
+  - component: {fileID: 3442971932440507249}
+  m_Layer: 5
+  m_Name: Image (4)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5781385992850890693
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8910806377604372441}
+  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: 949089614183720835}
+  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: 115.94, y: 115.94}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6488624209557714896
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8910806377604372441}
+  m_CullTransparentMesh: 0
+--- !u!114 &3442971932440507249
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8910806377604372441}
+  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: 0.02745098, g: 0.02745098, b: 0.02745098, 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: 7f590b703cf5e894ba87509ddeee5bf6, type: 3}
+  m_Type: 3
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 1
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1

Assets/GWConquest/Scenes/GalaxyMap.unity

@@ -2594,6 +2594,7 @@ MonoBehaviour:
   DistrictName: Agri-District
   DistrictType: 5
   DistrictLevel: 2
+  Planet: {fileID: 0}
 --- !u!114 &40190439
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -5165,6 +5166,7 @@ MonoBehaviour:
   DistrictName: Agri-District II
   DistrictType: 5
   DistrictLevel: 2
+  Planet: {fileID: 0}
 --- !u!114 &86848884
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -7880,6 +7882,7 @@ MonoBehaviour:
   DistrictName: Agri-District II
   DistrictType: 5
   DistrictLevel: 1
+  Planet: {fileID: 0}
 --- !u!114 &113413690
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -9400,6 +9403,7 @@ MonoBehaviour:
   DistrictName: Agri-District I
   DistrictType: 5
   DistrictLevel: 1
+  Planet: {fileID: 0}
 --- !u!114 &131868900
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -13353,6 +13357,7 @@ MonoBehaviour:
   DistrictName: Agri-District
   DistrictType: 5
   DistrictLevel: 2
+  Planet: {fileID: 0}
 --- !u!114 &214596037
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -18023,6 +18028,7 @@ MonoBehaviour:
   DistrictName: Special District
   DistrictType: 6
   DistrictLevel: 0
+  Planet: {fileID: 0}
 --- !u!114 &302288826
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -19410,6 +19416,7 @@ MonoBehaviour:
   DistrictName: Special District
   DistrictType: 6
   DistrictLevel: 0
+  Planet: {fileID: 0}
 --- !u!114 &322489094
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -20521,6 +20528,7 @@ MonoBehaviour:
   DistrictName: Agri-District
   DistrictType: 5
   DistrictLevel: 1
+  Planet: {fileID: 0}
 --- !u!114 &353074288
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -42909,6 +42917,7 @@ MonoBehaviour:
   DistrictName: Agri-District
   DistrictType: 5
   DistrictLevel: 2
+  Planet: {fileID: 0}
 --- !u!114 &755114448
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -44118,6 +44127,7 @@ MonoBehaviour:
   DistrictName: Agri-District
   DistrictType: 5
   DistrictLevel: 1
+  Planet: {fileID: 0}
 --- !u!114 &769496622
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -44642,6 +44652,7 @@ MonoBehaviour:
   DistrictName: Agri-District II
   DistrictType: 5
   DistrictLevel: 2
+  Planet: {fileID: 0}
 --- !u!114 &776571280
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -47338,6 +47349,7 @@ MonoBehaviour:
   DistrictName: Agri-District III
   DistrictType: 5
   DistrictLevel: 2
+  Planet: {fileID: 0}
 --- !u!114 &829595064
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -48614,6 +48626,7 @@ MonoBehaviour:
   DistrictName: Special District
   DistrictType: 6
   DistrictLevel: 0
+  Planet: {fileID: 0}
 --- !u!114 &853110023
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -49719,6 +49732,7 @@ MonoBehaviour:
   DistrictName: Agri-District
   DistrictType: 5
   DistrictLevel: 1
+  Planet: {fileID: 0}
 --- !u!114 &884239768
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -55906,11 +55920,6 @@ MonoBehaviour:
     - {fileID: 21300000, guid: bd69db5c0d9fa824db9b1dad98b0dc39, type: 3}
     - {fileID: 21300000, guid: 3b81d9ff9816c8240b02293797c69234, type: 3}
     - {fileID: 21300000, guid: 20b330887e66df649a836337f051c7ad, type: 3}
-    - {fileID: 21300000, guid: 20b330887e66df649a836337f051c7ad, type: 3}
-    - {fileID: 21300000, guid: 20b330887e66df649a836337f051c7ad, type: 3}
-    - {fileID: 21300000, guid: 20b330887e66df649a836337f051c7ad, type: 3}
-    - {fileID: 21300000, guid: 20b330887e66df649a836337f051c7ad, type: 3}
-    - {fileID: 21300000, guid: 20b330887e66df649a836337f051c7ad, type: 3}
     SmallIcon: {fileID: 21300000, guid: e08b397bc0cb6f642bfe7743721d644f, type: 3}
   - type: 1
     LargeIcons:
@@ -62657,6 +62666,7 @@ MonoBehaviour:
   DistrictName: Agri-District I
   DistrictType: 5
   DistrictLevel: 3
+  Planet: {fileID: 0}
 --- !u!114 &1091417642
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -66651,6 +66661,7 @@ MonoBehaviour:
   DistrictName: Agri-District
   DistrictType: 5
   DistrictLevel: 1
+  Planet: {fileID: 0}
 --- !u!114 &1147370008
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -67577,6 +67588,7 @@ MonoBehaviour:
   DistrictName: Special District
   DistrictType: 6
   DistrictLevel: 0
+  Planet: {fileID: 0}
 --- !u!114 &1166148167
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -70110,6 +70122,7 @@ MonoBehaviour:
   DistrictName: Special District
   DistrictType: 6
   DistrictLevel: 0
+  Planet: {fileID: 0}
 --- !u!114 &1213153681
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -70747,6 +70760,7 @@ MonoBehaviour:
   DistrictName: Agri-District
   DistrictType: 5
   DistrictLevel: 2
+  Planet: {fileID: 0}
 --- !u!114 &1229600187
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -72804,6 +72818,7 @@ MonoBehaviour:
   DistrictName: Special District
   DistrictType: 6
   DistrictLevel: 0
+  Planet: {fileID: 0}
 --- !u!114 &1267657457
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -83113,6 +83128,7 @@ MonoBehaviour:
   DistrictName: Agri-District II
   DistrictType: 5
   DistrictLevel: 2
+  Planet: {fileID: 0}
 --- !u!114 &1409165553
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -83340,6 +83356,7 @@ MonoBehaviour:
   DistrictName: Agri-District II
   DistrictType: 5
   DistrictLevel: 3
+  Planet: {fileID: 0}
 --- !u!114 &1412114075
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -88308,6 +88325,7 @@ MonoBehaviour:
   DistrictName: Special District
   DistrictType: 6
   DistrictLevel: 0
+  Planet: {fileID: 0}
 --- !u!114 &1497715127
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -95042,6 +95060,7 @@ MonoBehaviour:
   DistrictName: Agri-District II
   DistrictType: 5
   DistrictLevel: 1
+  Planet: {fileID: 0}
 --- !u!114 &1658452144
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -98267,6 +98286,7 @@ MonoBehaviour:
   DistrictName: Agri-District
   DistrictType: 5
   DistrictLevel: 2
+  Planet: {fileID: 0}
 --- !u!114 &1724478289
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -100075,6 +100095,7 @@ MonoBehaviour:
   DistrictName: Agri-District I
   DistrictType: 5
   DistrictLevel: 1
+  Planet: {fileID: 0}
 --- !u!114 &1758196033
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -107884,6 +107905,7 @@ MonoBehaviour:
   DistrictName: Agri-District
   DistrictType: 5
   DistrictLevel: 2
+  Planet: {fileID: 0}
 --- !u!114 &1798405256
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -110036,6 +110058,7 @@ MonoBehaviour:
   DistrictName: Special District
   DistrictType: 6
   DistrictLevel: 0
+  Planet: {fileID: 0}
 --- !u!114 &1846341752
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -114160,6 +114183,7 @@ MonoBehaviour:
   DistrictName: Agri-District
   DistrictType: 5
   DistrictLevel: 1
+  Planet: {fileID: 0}
 --- !u!114 &1924742659
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -114999,6 +115023,7 @@ MonoBehaviour:
   DistrictName: Agri-District
   DistrictType: 5
   DistrictLevel: 1
+  Planet: {fileID: 0}
 --- !u!114 &1947037425
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -115253,6 +115278,7 @@ MonoBehaviour:
   DistrictName: Agri-District I
   DistrictType: 5
   DistrictLevel: 2
+  Planet: {fileID: 0}
 --- !u!114 &1952294460
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -117742,6 +117768,7 @@ MonoBehaviour:
   DistrictName: Agri-District I
   DistrictType: 5
   DistrictLevel: 2
+  Planet: {fileID: 0}
 --- !u!114 &1976539134
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -121201,6 +121228,7 @@ MonoBehaviour:
   DistrictName: Agri-District I
   DistrictType: 5
   DistrictLevel: 2
+  Planet: {fileID: 0}
 --- !u!114 &2042552056
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -125540,6 +125568,7 @@ MonoBehaviour:
   DistrictName: Agri-District
   DistrictType: 5
   DistrictLevel: 1
+  Planet: {fileID: 0}
 --- !u!114 &2141017712
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/GWConquest/Scripts/District.cs

@@ -169,7 +169,7 @@ namespace GWConquest
                 return DefaultSprite;
             }
             else {
-                return DistrictRegistry.Instance.Get(DistrictType).LargeIcons[DistrictLevel];
+                return DistrictRegistry.Instance.Get(DistrictType).GetLargeIcon(DistrictLevel);
             }
         }
 

Assets/GWConquest/Scripts/DistrictRegistry.cs

@@ -22,6 +22,17 @@ namespace GWConquest
             public DistrictType type;
             public Sprite[] LargeIcons;
             public Sprite SmallIcon;
+
+            public Sprite GetLargeIcon(int size)
+            {
+                if(size >= LargeIcons.Length)
+                {
+                    return LargeIcons[LargeIcons.Length - 1];
+                }
+                else {
+                    return LargeIcons[size];
+                }
+            }
         }
 
         public DistrictRegistryEntry[] Entries;

Assets/GWConquest/Scripts/Formation.cs

@@ -167,7 +167,7 @@ namespace GWConquest
 
         public GameObject movingArmyPrefab;
         public float movingArmyScale;
-        private GameObject movingArmyIcon;
+        public GameObject movingArmyIcon {get; private set;}
 
         private Vector3 arrivalPosition;
 
@@ -610,10 +610,17 @@ namespace GWConquest
 
                 if (movingArmyIcon != null && ZoneType == ZoneType.Space)
                 {
-                    if (!IngameUI.PlanetViewEnabled && (GWCamera.Instance.ShowCircles || MovementState == FormationMovementState.Moving))
+                    if (!IngameUI.PlanetViewEnabled)
                     {
-                        movingArmyIcon.SetActive(true);
-                        movingArmyIcon.GetComponent<StickToFormation>().Update();
+                        if(GWCamera.Instance.ShowCircles || MovementState == FormationMovementState.Moving)
+                        {
+                            movingArmyIcon.SetActive(true);
+                            movingArmyIcon.GetComponent<Animator>().SetBool("Small", false);
+                            var stick = movingArmyIcon.GetComponent<StickToFormation>();
+                            stick.overridePoint = null;
+                            stick.Update();
+                        }
+
                     }
                     else
                     {

Assets/GWConquest/Scripts/UI/PlanetIndicatorUI.cs

@@ -30,6 +30,9 @@ namespace GWConquest
         public RectTransform DistrictSymbols;
         public GameObject DistrictSymbolPrefab;
 
+        public RectTransform[] PlayerFleetPoints;
+        public RectTransform[] EnemyFleetPoints;
+
         private Dictionary<DistrictType, Image> DistrictSymbolDict = new Dictionary<DistrictType, Image>();
 
         [System.NonSerialized]
@@ -66,8 +69,10 @@ namespace GWConquest
             if ((DebugUI.ShowAllPlanets || Planet.VisibilityStatus == PlanetVisibilityStatus.Visible) && !GWCamera.Instance.ShowCircles)
             {
                 IEnumerable<Formation> formations = Planet.GetAllFormations(ZoneType.Space);
-                float playerStrength = formations.Sum(f => f.Player == Player.CurrentPlayer ? f.GetFormationStrength() : 0f);
-                float enemyStrength = formations.Sum(f => f.Player != Player.CurrentPlayer ? f.GetFormationStrength() : 0f);
+                var playerFormations = formations.Where(f => f.Player == Player.CurrentPlayer).ToList();
+                float playerStrength = playerFormations.Sum(f => f.GetFormationStrength());
+                var enemyFormations = formations.Where(f => f.Player != Player.CurrentPlayer).ToList();
+                float enemyStrength = enemyFormations.Sum(f => f.GetFormationStrength());
 
                 IEnumerable<Formation> formationsGround = Planet.GetAllFormations(ZoneType.Ground);
                 float playerStrengthGround = formationsGround.Sum(f => f.Player == Player.CurrentPlayer ? f.GetFormationStrength() : 0f);
@@ -107,6 +112,10 @@ namespace GWConquest
                     PlayerIndicatorGround.SetActive(false);
                     EnemyIndicatorGround.SetActive(false);
                 }
+
+                UpdateFormationIcons(playerFormations, PlayerFleetPoints);
+                UpdateFormationIcons(enemyFormations, EnemyFleetPoints);
+
             }
             else {
                 PlayerIndicator.SetActive(false);
@@ -116,6 +125,32 @@ namespace GWConquest
             }    
         }
 
+        private void UpdateFormationIcons(List<Formation> formations, RectTransform[] points)
+        {
+            if(formations.Count > 0)
+            {
+                formations.Sort((f1, f2) => f1.FormationNumber - f2.FormationNumber);
+                for(int i = 0; i < formations.Count; i++)
+                {
+                    var icon = formations[i].movingArmyIcon;
+                    if(icon != null)
+                    {
+                        if(i < points.Length)
+                        {
+                            icon.SetActive(true);
+                            var stick = icon.GetComponent<StickToFormation>();
+                            stick.overridePoint = points[i];
+                            stick.Update();
+                            icon.GetComponent<Animator>().SetBool("Small", true);
+                        }
+                        else {
+                            icon.SetActive(false);
+                        }
+                    }
+                }
+            }
+        }
+
         private void FixedUpdate() {
             if(GameManager.EntitiesLoaded && Planet != null && Util.IsPointOnScreen(Planet.transform.position))
             {
@@ -171,12 +206,12 @@ namespace GWConquest
                                 {
                                     if (typeDistricts.All(d => d.GetComponent<DistrictFactory>().IsProducing))
                                     {
-                                        color = controllingPlayer.Faction.FactionColor;
+                                        color = Player.CurrentPlayer.Faction.FactionColor;
                                     }
                                 }
                                 else
                                 {
-                                    color = controllingPlayer.Faction.FactionColor;
+                                    color = Player.CurrentPlayer.Faction.FactionColor;
                                 }
                             }
 

Assets/GWConquest/Scripts/UI/StickToFormation.cs

@@ -8,10 +8,17 @@ namespace GWConquest
     public class StickToFormation : MonoBehaviour
     {
         public Formation formation;
+        public Transform overridePoint;
 
         public void Update() {
             //if(formation.MovementState == FormationMovementState.Moving)
             //{
+
+            if(overridePoint != null)
+            {
+                transform.position = overridePoint.position;
+            }
+            else {
                 Vector3 dir;
                 if(formation.State.CurrentTransition.IsCurved)
                 {
@@ -57,7 +64,7 @@ namespace GWConquest
                 {
                     formationIcon.Arrow.localRotation = Quaternion.FromToRotation(Vector3.up, dir);
                 }
-            //}
+            }
         }
     }
 }

Assets/Photon/PhotonBolt/resources/BoltRuntimeSettings.asset

@@ -50,10 +50,10 @@ MonoBehaviour:
   debugStartPort: 54321
   debugBuildMode: 1
   debugStartMapName: GalaxyMap
-  debugPlayAsServer: 0
+  debugPlayAsServer: 1
   showDebugInfo: 0
   overrideTimeScale: 1
-  debugEditorMode: 2
+  debugEditorMode: 1
   consoleToggleKey: 9
   consoleVisibleByDefault: 0
   compilationWarnLevel: 4