UI Fixes, Formation Icons auf Planeten

Assets/GWConquest/Prefabs/Formation.prefab

@@ -156,7 +156,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   fleetIcon: {fileID: 3797021628422937969}
-  movingArmyPrefab: {fileID: 7920185636364354306, guid: 233d61789cbb0504cb4f2605549a5fd2,
+  movingArmyPrefab: {fileID: 6934264676097734670, guid: b4b4aee434157c54cb53399d1578f446,
     type: 3}
   movementSpeed: 150
   formationNumber: -1

Assets/GWConquest/Prefabs/UI/FleetIcon.prefab

@@ -1291,12 +1291,12 @@ RectTransform:
   - {fileID: 6934264675066306908}
   - {fileID: 6934264676539302133}
   m_Father: {fileID: 6934264676097734671}
-  m_RootOrder: 0
+  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: -7.5}
-  m_SizeDelta: {x: 0, y: -15}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6934264676081351466
 CanvasRenderer:
@@ -1319,7 +1319,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 0.8901961, b: 0.5647059, a: 0.7647059}
+  m_Color: {r: 1, g: 0.8901961, b: 0.5647059, a: 1}
   m_RaycastTarget: 1
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -1364,6 +1364,7 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
+  - {fileID: 9087990028491932013}
   - {fileID: 6934264676081351464}
   - {fileID: 6934264676898299648}
   m_Father: {fileID: 0}
@@ -1372,7 +1373,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: -72.50004, y: 48.4}
-  m_SizeDelta: {x: 55, y: 70}
+  m_SizeDelta: {x: 55, y: 55}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6934264676097735664
 CanvasRenderer:
@@ -1397,6 +1398,7 @@ MonoBehaviour:
   FormationImage: {fileID: 6934264676539302134}
   FormationNumberText: {fileID: 6934264675066306911}
   FormationNumberEnding: {fileID: 6934264676830680021}
+  Arrow: {fileID: 9087990028491932013}
   StrengthGameObjects:
   - {fileID: 6934264676128576589}
   - {fileID: 6934264675533803898}
@@ -1792,10 +1794,84 @@ RectTransform:
   - {fileID: 6934264675173919768}
   - {fileID: 6934264676736199430}
   m_Father: {fileID: 6934264676097734671}
-  m_RootOrder: 1
+  m_RootOrder: 2
+  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: 7.5}
+  m_SizeDelta: {x: 0, y: 15}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &8138893207784313283
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 9087990028491932013}
+  - component: {fileID: 3734965496566370340}
+  - component: {fileID: 1225776485717043420}
+  m_Layer: 5
+  m_Name: Pfeil
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &9087990028491932013
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8138893207784313283}
+  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: 6934264676097734671}
+  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_SizeDelta: {x: 28, y: 28}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3734965496566370340
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8138893207784313283}
+  m_CullTransparentMesh: 0
+--- !u!114 &1225776485717043420
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8138893207784313283}
+  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: 0.8901961, b: 0.5647059, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: c030c93c6ae6514459f0ec9b4d7686d6, 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

Assets/GWConquest/Prefabs/UI/FleetsPanel.prefab

@@ -145,7 +145,7 @@ MonoBehaviour:
   padding:
     m_Left: 10
     m_Right: 5
-    m_Top: 0
+    m_Top: 15
     m_Bottom: 0
   Spacing: {x: 15, y: 0}
 --- !u!1001 &7358977232838604920
@@ -158,7 +158,7 @@ PrefabInstance:
     - target: {fileID: 3709556431398436641, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
         type: 3}
       propertyPath: m_Name
-      value: FleetsPanel Variant
+      value: FleetsPanel
       objectReference: {fileID: 0}
     - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
         type: 3}

Assets/GWConquest/Scenes/GalaxyMap.unity

@@ -5657,7 +5657,7 @@ RectTransform:
   m_Father: {fileID: 1548826460}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 0.2712289}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 4, y: 20}
@@ -19573,7 +19573,7 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 75509415}
   m_HandleRect: {fileID: 75509414}
   m_Direction: 2
-  m_Value: 0
+  m_Value: 1
   m_Size: 1
   m_NumberOfSteps: 0
   m_OnValueChanged:
@@ -20830,7 +20830,7 @@ MonoBehaviour:
   m_HandleRect: {fileID: 71338308}
   m_Direction: 2
   m_Value: 1
-  m_Size: 1
+  m_Size: 0.7287711
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -38363,7 +38363,7 @@ MonoBehaviour:
   m_HandleRect: {fileID: 1659683066}
   m_Direction: 2
   m_Value: 0
-  m_Size: 0.764526
+  m_Size: 0.69200015
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -48052,8 +48052,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 77}
-  m_SizeDelta: {x: 0, y: 327}
+  m_AnchoredPosition: {x: 0, y: 0.000030517578}
+  m_SizeDelta: {x: 0, y: 10}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &755462606
 MonoBehaviour:
@@ -87800,7 +87800,7 @@ RectTransform:
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
+  m_AnchorMax: {x: 0.9672217, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 20, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -102863,7 +102863,7 @@ RectTransform:
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 0.764526}
+  m_AnchorMax: {x: 1, y: 0.69200015}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 4, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -115436,7 +115436,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: -233.19153, y: 25}
+  m_SizeDelta: {x: 0.00012207031, y: 25}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &1798217996
 MonoBehaviour:
@@ -126492,8 +126492,8 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 1387950577}
   m_HandleRect: {fileID: 1387950576}
   m_Direction: 0
-  m_Value: 0
-  m_Size: 1
+  m_Value: -0.0000011974901
+  m_Size: 0.9672217
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -132604,7 +132604,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: -0.000030517578}
-  m_SizeDelta: {x: 0, y: 157.5}
+  m_SizeDelta: {x: 0, y: 242.66667}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &2089647853
 MonoBehaviour:

Assets/GWConquest/Scripts/Formation.cs

@@ -239,14 +239,20 @@ namespace GWConquest
                     movingArmyIcon = Instantiate(movingArmyPrefab);
                     movingArmyIcon.transform.SetParent(FindObjectOfType<IngameUI>().PlanetView.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;
+                    var iconComp = movingArmyIcon.GetComponent<FormationIcon>();
+                    iconComp.UpdateDisplay(this);
+                    iconComp.CanBeDragged = false;
+                    var stick = movingArmyIcon.AddComponent<StickUIToPlanet>();
+                    stick.target = transform;
+                    //movingArmyIcon.GetComponent<StickUIToPlanet>().target = transform;
+                    //movingArmyIcon.GetComponentInChildren<UnityEngine.UI.Image>().color = Player.Color;
+                    //movingArmyIcon.GetComponentInChildren<UnityEngine.UI.Text>().color = Player.Color;
+                    iconComp.Arrow.gameObject.SetActive(true);
+                    //Transform circleTransform = movingArmyIcon.GetComponentInChildren<UnityEngine.UI.Image>().transform;
                     Camera cam = Camera.main;
                     Vector3 originPoint = RectTransformUtility.WorldToScreenPoint(cam, originZone.transform.position);
                     Vector3 targetPoint = RectTransformUtility.WorldToScreenPoint(cam, targetZone.transform.position);
-                    circleTransform.localRotation = Quaternion.FromToRotation(Vector3.up, targetPoint-originPoint);
+                    iconComp.Arrow.localRotation = Quaternion.FromToRotation(Vector3.up, targetPoint-originPoint);
 
                 } else { 
                     fleetIcon.SetActive(true);

Assets/GWConquest/Scripts/UI/FleetIcons.cs

@@ -20,12 +20,16 @@ namespace GWConquest
         {
             formation = f;
 
+            FleetTitle.text = f.FormationName;
+
+            var color = f.Player.Faction.FactionColor;
+
             var units = f.Units.ToList();
             int iconCount = Mathf.Min(units.Count, MaxIcons);
 
             if(iconCount > 0)
             {
-                SpawnIcon(units[0].Class.Sprite, Vector3.zero);
+                SpawnIcon(units[0].Class.Sprite, Vector3.zero, color);
                 if(iconCount > 1)
                 {
                     float deltaAngle = 2 * Mathf.PI / (iconCount - 1);
@@ -34,7 +38,7 @@ namespace GWConquest
                         float x = DefaultRadius * Mathf.Cos(i * deltaAngle);
                         float y = DefaultRadius * Mathf.Sin(i * deltaAngle);
 
-                        SpawnIcon(units[i].Class.Sprite, new Vector3(x, y, 0f));
+                        SpawnIcon(units[i].Class.Sprite, new Vector3(x, y, 0f), color);
                     }
                 }
                 
@@ -42,7 +46,7 @@ namespace GWConquest
             
         }
 
-        private void SpawnIcon(Sprite sp, Vector3 pos)
+        private void SpawnIcon(Sprite sp, Vector3 pos, Color color)
         {
             GameObject go = Instantiate(IconPrefab);
             RectTransform rt = go.GetComponent<RectTransform>();
@@ -55,7 +59,9 @@ namespace GWConquest
             rt.localRotation = Quaternion.identity;
             rt.localScale = DefaultIconScale * Vector3.one;
 
-            go.GetComponentInChildren<Image>().sprite = sp;
+            var img = go.GetComponentInChildren<Image>();
+            img.sprite = sp;
+            img.color = Util.UpdateColorRGB(img.color, color);
         }
 
         public void Click()

Assets/GWConquest/Scripts/UI/FleetIconsUI.cs

@@ -60,7 +60,7 @@ namespace GWConquest
 
         public void FleetIconClicked(Formation f)
         {
-            GetComponentInParent<PlanetViewUI>().SelectZone(zone);
+            GetComponentInParent<PlanetViewUI>().ShowTransportUI();
         }
     }
 }

Assets/GWConquest/Scripts/UI/FormationIcon.cs

@@ -11,12 +11,17 @@ namespace GWConquest {
         public Text FormationNumberText;
         public Text FormationNumberEnding;
 
+        public RectTransform Arrow;
+
         public GameObject[] StrengthGameObjects;
 
 
         [System.NonSerialized]
         public Formation CurrentFormation;
 
+        [System.NonSerialized]
+        public bool CanBeDragged = true;
+
         public Formation GetObject()
         {
             return CurrentFormation;
@@ -73,5 +78,10 @@ namespace GWConquest {
 
             return true;
         }
+
+        public override bool CanDrag()
+        {
+            return CanBeDragged;
+        }
     }
 }

Assets/GWConquest/Scripts/UI/PlanetViewUI.cs

@@ -356,7 +356,7 @@ namespace GWConquest
         {
             foreach (DistrictIcon icon in districtIcons)
             {
-                    icon.OnDeselected();
+                icon.OnDeselected();
             }
 
             selectedZone = null;

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

@@ -0,0 +1,128 @@
+fileFormatVersion: 2
+guid: c030c93c6ae6514459f0ec9b4d7686d6
+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: