From ba5f4f83d1a25dc7ccf6e8970cca08a64f0c2065 Mon Sep 17 00:00:00 2001 From: laurids Date: Wed, 6 Jan 2021 18:08:25 +0100 Subject: [PATCH] UI Fixes, Formation Icons auf Planeten --- Assets/GWConquest/Prefabs/Formation.prefab | 2 +- Assets/GWConquest/Prefabs/UI/FleetIcon.prefab | 90 +++++++++++- .../GWConquest/Prefabs/UI/FleetsPanel.prefab | 4 +- Assets/GWConquest/Scenes/GalaxyMap.unity | 24 ++-- Assets/GWConquest/Scripts/Formation.cs | 16 ++- Assets/GWConquest/Scripts/UI/FleetIcons.cs | 14 +- Assets/GWConquest/Scripts/UI/FleetIconsUI.cs | 2 +- Assets/GWConquest/Scripts/UI/FormationIcon.cs | 10 ++ Assets/GWConquest/Scripts/UI/PlanetViewUI.cs | 2 +- Assets/GWConquest/Textures/Icons/1234.png | Bin 2937 -> 2376 bytes .../GWConquest/Textures/Icons/pfeilkreis.png | Bin 0 -> 1216 bytes .../Textures/Icons/pfeilkreis.png.meta | 128 ++++++++++++++++++ 12 files changed, 259 insertions(+), 33 deletions(-) create mode 100644 Assets/GWConquest/Textures/Icons/pfeilkreis.png create mode 100644 Assets/GWConquest/Textures/Icons/pfeilkreis.png.meta diff --git a/Assets/GWConquest/Prefabs/Formation.prefab b/Assets/GWConquest/Prefabs/Formation.prefab index 7b1ae52..4d495db 100644 --- a/Assets/GWConquest/Prefabs/Formation.prefab +++ b/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 diff --git a/Assets/GWConquest/Prefabs/UI/FleetIcon.prefab b/Assets/GWConquest/Prefabs/UI/FleetIcon.prefab index 63bc26e..7b6c00d 100644 --- a/Assets/GWConquest/Prefabs/UI/FleetIcon.prefab +++ b/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 diff --git a/Assets/GWConquest/Prefabs/UI/FleetsPanel.prefab b/Assets/GWConquest/Prefabs/UI/FleetsPanel.prefab index 4f7d31f..f414684 100644 --- a/Assets/GWConquest/Prefabs/UI/FleetsPanel.prefab +++ b/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} diff --git a/Assets/GWConquest/Scenes/GalaxyMap.unity b/Assets/GWConquest/Scenes/GalaxyMap.unity index b076245..de00b10 100644 --- a/Assets/GWConquest/Scenes/GalaxyMap.unity +++ b/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: diff --git a/Assets/GWConquest/Scripts/Formation.cs b/Assets/GWConquest/Scripts/Formation.cs index 1a80973..b878d7d 100644 --- a/Assets/GWConquest/Scripts/Formation.cs +++ b/Assets/GWConquest/Scripts/Formation.cs @@ -239,14 +239,20 @@ namespace GWConquest movingArmyIcon = Instantiate(movingArmyPrefab); movingArmyIcon.transform.SetParent(FindObjectOfType().PlanetView.DistrictIcons); movingArmyIcon.transform.localRotation = Quaternion.identity; - movingArmyIcon.GetComponent().target = transform; - movingArmyIcon.GetComponentInChildren().color = Player.Color; - movingArmyIcon.GetComponentInChildren().color = Player.Color; - Transform circleTransform = movingArmyIcon.GetComponentInChildren().transform; + var iconComp = movingArmyIcon.GetComponent(); + iconComp.UpdateDisplay(this); + iconComp.CanBeDragged = false; + var stick = movingArmyIcon.AddComponent(); + stick.target = transform; + //movingArmyIcon.GetComponent().target = transform; + //movingArmyIcon.GetComponentInChildren().color = Player.Color; + //movingArmyIcon.GetComponentInChildren().color = Player.Color; + iconComp.Arrow.gameObject.SetActive(true); + //Transform circleTransform = movingArmyIcon.GetComponentInChildren().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); diff --git a/Assets/GWConquest/Scripts/UI/FleetIcons.cs b/Assets/GWConquest/Scripts/UI/FleetIcons.cs index 463f56a..36ea537 100644 --- a/Assets/GWConquest/Scripts/UI/FleetIcons.cs +++ b/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(); @@ -55,7 +59,9 @@ namespace GWConquest rt.localRotation = Quaternion.identity; rt.localScale = DefaultIconScale * Vector3.one; - go.GetComponentInChildren().sprite = sp; + var img = go.GetComponentInChildren(); + img.sprite = sp; + img.color = Util.UpdateColorRGB(img.color, color); } public void Click() diff --git a/Assets/GWConquest/Scripts/UI/FleetIconsUI.cs b/Assets/GWConquest/Scripts/UI/FleetIconsUI.cs index 024b7d4..0c0d66d 100644 --- a/Assets/GWConquest/Scripts/UI/FleetIconsUI.cs +++ b/Assets/GWConquest/Scripts/UI/FleetIconsUI.cs @@ -60,7 +60,7 @@ namespace GWConquest public void FleetIconClicked(Formation f) { - GetComponentInParent().SelectZone(zone); + GetComponentInParent().ShowTransportUI(); } } } \ No newline at end of file diff --git a/Assets/GWConquest/Scripts/UI/FormationIcon.cs b/Assets/GWConquest/Scripts/UI/FormationIcon.cs index 8a39396..56bd94e 100644 --- a/Assets/GWConquest/Scripts/UI/FormationIcon.cs +++ b/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; + } } } diff --git a/Assets/GWConquest/Scripts/UI/PlanetViewUI.cs b/Assets/GWConquest/Scripts/UI/PlanetViewUI.cs index 0ebaf68..9fc2a57 100644 --- a/Assets/GWConquest/Scripts/UI/PlanetViewUI.cs +++ b/Assets/GWConquest/Scripts/UI/PlanetViewUI.cs @@ -356,7 +356,7 @@ namespace GWConquest { foreach (DistrictIcon icon in districtIcons) { - icon.OnDeselected(); + icon.OnDeselected(); } selectedZone = null; diff --git a/Assets/GWConquest/Textures/Icons/1234.png b/Assets/GWConquest/Textures/Icons/1234.png index 38469b7e446e1e5e87e58d669e0a8e6ecc0b4229..b145c1b12c2c38851b3b09f12a499d48925819cc 100644 GIT binary patch delta 2337 zcmV++3EuYk7RVBiKz{(wP)t-s0001wkB?kjT>t<73=9nC=jVfigCry*_xJa!tE)gj zKm-H?)6>&vXlM`+5bNvfC@3iV`}?=Iw@ge-+uPf8baWUP81L`zo12?7G&IA*!&q2Y z2nYz@-`{|MfE*kgqobodJUq+G%VcC^hlhu=v$I4*MAz5XY=3NQmzS3;EG)abyHHS2 zsHmv)^z`H7<{H0!c(c zRCr$PoqJo_N`DZ>g#Iw>gn%e}$?mhif7B%= zJ7h1jvoo_BN-5x{jTF5iezOn1EQ}<=|{GOY$|d;V_zD>o^A%T`$FqrfIp!Lm zPawfEPH?ShoTC2AImOjxQ9DERmvd&M#o-*ae~oioZxW4p+d?+`22KaxQ1{pQhW{{! z?^(8mY=ZCjA7i*c%~#<9|6>Y2Q18|Ff&VgtPJi0Oyqu;<7KhGH)OuBZn&QDxJ3ab^ zIx{-%3oPx2xzfiP zg?}tfa%XZp#085O9#6uw21jhQhU?we7yvZcu|4f`SOeDLrN0=vfKX zUL3M#lth`1Pm?ciONVqR+4jV#^S8;Kr$f3#n+)zyDu(++(^T(Cl^9D(qBpnOi6zD* zN>xF=<{<;|ZoR|AF3LSh)$oV6n==`!=T^d1K;;r|#8rvITa=2$=PN{oK7KyeCw~uR z>9>jDxU0d5x_F5)>M zB{gRK2D9ACRaBT8UZBeLhlM4`b${|>qlvl*zbL#M$Xp+^Xo^$lDaoAoD-yc`dvPlD z^eLVhBCox$7k7;!H9X*{GG867z71&nc21iej*{?IXmHp~! zWKUFYkD{S$AjQ&0UcG^Ouj>}gMljvYN)ouLvD`x=!{A_^LbWlS@xL56O@YCBn(^#v=^cqzEk(YN-R zubMoDsDbd-6B~xQD9}ON?|;R1x)$!LN3WbgBeu{b7p(|%y0Ow+E7Yt=v2Z$_%|@t$ z;Fvq|%g`B^(m@>rn>k{wxrqWj#Jgugw<%%^gWllacvED60ulJQr+R;vB$ud#=LuYy z(DbR-^O*D`fvUtKZmB!1=q$OZ=RKlC0Cdy52q&-}w3O1Dt*eb%2!CBvl4_t&ZH}P6 zKSqfFtQL-33iL+Kl8PeGk%G2BP@oIcLg;pg)o;!XC<>4woYnK3)f$S`x~0{t0;|_^ zWVX!7N?fSnGR{kr6B~-q+&6i%e%+u%2v*xIX%^3i#aZYEXdgGt%U*%lRJ*ZHTP}8a z_E8`R@_5vzI+H3PIDfDwUpuRU<9c>++kEVaiypFL9VG|e41&8HcX840haxH4wn*I)a5zgSL3JxU6>L_VQJAarv*=_u*Tm9Sv;V^3KPF3uYpWpas>;e4;x z$C(ygQYKpRMNuABkchOAG8M770@VQ_+u0Ur*2#d6l6o1Uao}k(YCO?*kzdE%8 zW?%Y?OY~~BXaCW9Kw^hrk&h}5dm@!t=1|67-9TZ?DkV&iI+EEOZESa(IFIlj$V`Po zsEhE|keh+*Zt~CL<5@LSB$v6zvqBV{Yrw`71<7Ujd65c+utX*s*(b>LX#i7_$tID5 zNJ>64;+ExYQ-75Di)W8|lKFKe@|vkiNyqbkUCXo4*4RL)Ebmt`W1F<}lbSNNrE=}b zX_-EMZ%WV8O=L;jmNBZ_^8TjSRLTbxuPHu(NMB=qOTH=(u`DyG-8p5`*?>>P4QCBL zl;k7VaaYuU)@Ey*5G}HW(j`xL4>m=37j-rhP0~BiBY#^6*@2(wu5am{a{VAgr4iF~Z{0IwNY+$=h3JWwPS5s2~4$!OXCLr@8?zjZwaT zSgrf*KiunZlv|t8YXXLX<>mOpchNdMzuB7~V@ek{=Tq4mV2bdEkJagTeAl}hkEhkg zVXjn1hr{7;I2;a#!{Kl^91e%W;cz${4u`|xa2hyFV`JlgV^O93=djS@00000NkvXX Hu0mjf$PSCv literal 2937 zcmeH}`#TegAIB$hS!f(Y$hBHE<{l1XGZ}4+?XYq^?zfZWlG#MLwtR71X31qCkrl}` zsyTAM9Lg=xS**zBKKGQbe*gaP{R7VDdETGb^Ld{4FQ4~MZz|T_Mgn*e2mk;iY*9$3 zLr(vcsNms-Bw5rQLLkD)1_7x4TWR6&5DI`}-~d2v=CS?Xj{*RK04y4B{nI2MAS5It zDk>^2E)D{LWMpLI<>i%>lvGt!H8nNCU@!y%(b3T{FfcGSHa0Uev$V8?!{G=70*OST zP$)DSjm2W|cszkXaC39>^78Wa^$iRR3ae*x26Q{`T$L!NI}dJO9qV3H<*FJd%mxAG*be zs4EcwfaG64CD5D|vIGE#9B8uw=J5ZOF&F`Zm^t*Ax|Ay7MoBQ=yH-@{ywq`I1)KvCU4p=lnWB;0B zLlAhnK7|G0sOM^lYOm7W4H$mM63+Z+q_(SwZdcrrPWy^zRQ+1oamwyENK5pT9k?z9 zrkVB(<1o3dMo3~MJ6�af7;*jY`7cRSFF3HNj-Hr2D${fu=jc`FFy0I%4}WK~xfi zqt7u(Mi$~?{Y@oc5(BG>JEO#9Rfp_fV}p%6)iC#KcBXyrYKZ3e<2z)9M-n0Y4Px>O zy!sTvXarcTn-_t~?lh^^r78Dh4N6w)<+4E<1?=WN^pntKN1E%i&HmLyy4 zjrVJg9iL>R3+;9j+>q5Ibjem5rn`^Eo3u86fB?5Ee}pfm*BdXEZPnCf@-U?aVXi%M zZ`&3=iEw|ITCA$ft?KqS{+WItb>Jg@v2yqP^rv|Aj6V0(NyeI|KNekZkFIafJB!_? zUajeKz?m5XTj%2)=f`#_uS42=J-F$P>?XbCFR|?xww;Sw>PU-UNFpWE@i)`!3WF>v zW@+PcTHfTs?ygCXP$zj0<>-RJOAS}2!OqO|_#fX_c7oU3bbE^e*xidCGrS_ls{PxaTXSQ5A(8g%#bS+H=j+L0)F_R`ftQ&#?BjOoM6^|l9~a&Kdl0cNupPp$P; zCr7kq5xkYk@UovnPU*?5jJskMOO+nrB|J&3FX**o?Xzx2@!D%#H(K))@-e~eH3I*Y zGk^W&x_w?;fqaHd-+zwBDyw1|v8F$kwH?8VuzS<}K{-%T-6})WFcG*y^m&ojtQT@% z*Wyk!C#wHi?~^tdt#LHXMJ|`qAB~>+JtAWtr25+Dyz_kD9B2rb#S-klq+=*$GJvyb z9Ew&P63egD<2aoS2V2-fMS-CUp2eRJf4wupzU%4H=i1F>+RT85LcCm-*C!Mv?mjC(U_bt5LeXu zXwk(*l~PKk$VmA4oXdl)b2rB*?)0EDVI?TA3@su>npQY73D>ctqV760$AG>P=`}Nx zzo*ilRcp|$EGb>&$T`rZHLQeV%>|5QBy|Pre-PIvf{$z=z$aU6(_0IN%NF!#M zWP;Cf57a8a%T6i^6gqdOVNMOW0a_^*`}pXNmN+>vk%P(71tLGq6m!43XDgM-!BvTV zh>;49A)j|SLRHdJ&E?DWrFEYl!Jnl|3k+lU>V<9OVJEw=#%keUwMa+Xs@t#zlZ3rE zk<&+>T{R9rH>_xK`TSi=8{mf{@Y~whVIe@QKGz z)}-Fq3)f3h`i-F&`%o|KDxTP-GA1~g2 zi9z00?cq2wxag{+Pi@7qOHY6qyvg=I__b%X$vqiSxk@B`(dF>zPHUFR-Bp6=eV+{q zNbGnyv*Wd=!`5zGZD9sES0>&0@Ex;2yhsv}M=fkVQY57Yd3VW4=Qt%HSmWM4;nWZAsN_A_ z1*rC0=2-D}8=e4FIl&rMWwuDg`{!FJP@;U2b(y(3a4yO}qQ3Uy^;xs_c!<6%utdAv z)9RY=^VVLA%*=o>Y?j*`U}mw@c@T`Z82qN(9ihX9|##>gRR` z?qKqoFpgYku{oDMP@|tUf&R_Tw0N86T%6w6CT!;y!^&2edRWdF&8^j*ahX!Wk7w?AT2cooB6VVd2V| zNQpp+#xAk9>aJk-^`z(nR8q9#8u+bdBF_AI@}J5(`EU2~mgOdnBO=LS&&S5~={%Eg ze6#n760#)foxM@1*9Qt~tt1zg(L1q_CY#0mQ9@cV%P5I0l*UYhHshQGqkGo%5zikN z5u-NqFGsbkOK0Pj^?8itS>DpM4!05UD}1+NC4*iCBSxi+_u3VL6qDgS9(rTYv=h=X z$Dc<)U?w{4v-&C;5ZF`w(&3XYUq#uAT(D2uTicQw5I?pvX85UGH&}$ujAC{73o2)X zhv4EdZP;fomEw1_`&z%9o#6Wne4g`Vou&w)r97fqC%KW5l++@7<_q^h8uu&FSV=PV g&CLJ6VSC*_u4|xSnXwip^s`XdTH7P55nc)Z1=R<5i~s-t diff --git a/Assets/GWConquest/Textures/Icons/pfeilkreis.png b/Assets/GWConquest/Textures/Icons/pfeilkreis.png new file mode 100644 index 0000000000000000000000000000000000000000..2d5fe5b85bdd28a863c894c48a76ad78699e735f GIT binary patch literal 1216 zcmeAS@N?(olHy`uVBq!ia0vp^cR-kf4M<8yoo@tEjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBufG}g$wN6f;nov&{$B>G+w|DG=q|;>@5+}}LIwl*-rN!s) z_?T__LkkU5RqKg4!C6v@oE#4#gm);O)SgVn;)a%P{|@Ad!FWwuS>{xC^1Eqf=A z+MNgM)~{c_xc>X4--i0ac?Ih$d(%$!o^O%9@%QiFk}pQ<_uAVE=OyG@GH0IZJ=-FE zCEEXc_3VV4Cg}^y{pT-RyuI@M3SJootalbN1}nk}r0*f7#?r=QN*@ zyN}KI>9OQPyeYSrf8FbAASawBz|PLTy1l*q<+X1za&qggz5ZI#y^}LfV7JZO{A^1; zpkZ_7&h>TQz47(=^QUJPFl*dfWA^k|!lAQkcKI}&HtadrGCT6;@`z=3{`l;WoVw9= z_56N$&O9}DclXPI+3TJ^m5x3&^NeL~j_&j1LuV7-tybHe^|=P9wC6+AsVTGDImM-) ze%Z5~^I77dqi$Bg8K=Jb?6{Dz{OMlb3&Jr^zI-XMk~+O2{`&u^x~VBoGLy1z8a`xN z9RKdXQwb}zm;}!CQ+;-}ac)oc-g&0+w4sU54%z5SGaZ8SzO!t1e&6}_)2C0<_2c*L zsbc^1@$vEd`g(eG^YZr1dQtZN=ki0hKK=Ue@bKlwj~`!uX106p-oIae{P?lmxBu?d zs=9s8pU>UbBERPP>*c_p@9p2ZZJXJ@#ammy{`~yhzJ9{1*6Pi8V(a8*ZyNz^?c?lmK8#)fTa$Dr>mdKI;Vst09_s8 A(*OVf literal 0 HcmV?d00001 diff --git a/Assets/GWConquest/Textures/Icons/pfeilkreis.png.meta b/Assets/GWConquest/Textures/Icons/pfeilkreis.png.meta new file mode 100644 index 0000000..53c9012 --- /dev/null +++ b/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: