From 3a43e485fb671bb56da88357acb1e29df796ed90 Mon Sep 17 00:00:00 2001 From: laurids Date: Sat, 23 May 2020 21:56:19 +0200 Subject: [PATCH] =?UTF-8?q?Kleine=20UI=20=C3=84nderungen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/GWConquest/Prefabs/GuiPanel.prefab | 4 +- Assets/GWConquest/Scenes/GalaxyMap.unity | 285 ++++++++++++++++-- Assets/GWConquest/Scripts/GalaxyMapUI.cs | 7 +- Assets/GWConquest/Scripts/PlanetViewUI.cs | 20 ++ .../GWConquest/Textures/UI/Kreiss PFEIL.png | Bin 0 -> 2572 bytes .../Textures/UI/Kreiss PFEIL.png.meta | 128 ++++++++ .../Textures/UI/Materials/kreiswichs3.mat | 2 +- 7 files changed, 418 insertions(+), 28 deletions(-) create mode 100644 Assets/GWConquest/Textures/UI/Kreiss PFEIL.png create mode 100644 Assets/GWConquest/Textures/UI/Kreiss PFEIL.png.meta diff --git a/Assets/GWConquest/Prefabs/GuiPanel.prefab b/Assets/GWConquest/Prefabs/GuiPanel.prefab index a2fcc17..689e52e 100644 --- a/Assets/GWConquest/Prefabs/GuiPanel.prefab +++ b/Assets/GWConquest/Prefabs/GuiPanel.prefab @@ -59,8 +59,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 0.8784314} + m_Color: {r: 0.03, g: 0.03, b: 0.03, a: 0.8784314} m_RaycastTarget: 1 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -134,6 +135,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 0.5529412} m_RaycastTarget: 0 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] diff --git a/Assets/GWConquest/Scenes/GalaxyMap.unity b/Assets/GWConquest/Scenes/GalaxyMap.unity index a9d4ba6..266543b 100644 --- a/Assets/GWConquest/Scenes/GalaxyMap.unity +++ b/Assets/GWConquest/Scenes/GalaxyMap.unity @@ -14545,10 +14545,10 @@ MonoBehaviour: m_SelectOnRight: {fileID: 0} m_Transition: 1 m_Colors: - m_NormalColor: {r: 0, g: 0, b: 0, a: 1} - m_HighlightedColor: {r: 0.07, g: 0.07, b: 0.07, a: 1} - m_PressedColor: {r: 0.07058824, g: 0.07058824, b: 0.07058824, a: 1} - m_SelectedColor: {r: 0.07058824, g: 0.07058824, b: 0.07058824, a: 1} + m_NormalColor: {r: 0.03, g: 0.03, b: 0.03, a: 1} + m_HighlightedColor: {r: 0.1, g: 0.1, b: 0.1, a: 1} + m_PressedColor: {r: 0.1, g: 0.1, b: 0.1, a: 1} + m_SelectedColor: {r: 0.1, g: 0.1, b: 0.1, a: 1} m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} m_ColorMultiplier: 1 m_FadeDuration: 0.1 @@ -16504,7 +16504,7 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 1647585765} + m_Father: {fileID: 690503116} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &663080994 @@ -16792,6 +16792,41 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6ded4d2fd3f18ad40916c57fe4f6a566, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &668698209 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 668698210} + m_Layer: 5 + m_Name: TextPanel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &668698210 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 668698209} + 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: 1420890672} + 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!1 &675971137 GameObject: m_ObjectHideFlags: 0 @@ -17260,7 +17295,8 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -2000} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] + m_Children: + - {fileID: 663080993} m_Father: {fileID: 1992706994} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -19742,7 +19778,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &765894939 RectTransform: m_ObjectHideFlags: 0 @@ -19797,7 +19833,9 @@ MonoBehaviour: GroundDistrictName: {fileID: 701605851} SpaceDistrictName: {fileID: 1050884036} FleetIcons: {fileID: 1739782529} - GroundPanel: {fileID: 1167835967} + GroundPanel: {fileID: 1659880901} + GroundPlayerFleetPanel: {fileID: 1167835968} + GroundEnemyFleetPanel: {fileID: 2083163758} --- !u!1001 &766573527 PrefabInstance: m_ObjectHideFlags: 0 @@ -28772,6 +28810,21 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1420890671} m_PrefabAsset: {fileID: 0} +--- !u!114 &1167835968 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1167835967} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5d18c4f05f567d740a67f00ca1311ebb, type: 3} + m_Name: + m_EditorClassIdentifier: + FormationUIPrefab: {fileID: 1708373286441865769, guid: a6a199668f204da4980f4edf1c2f4fea, + type: 3} + FormationParent: {fileID: 668698209} --- !u!1001 &1172288249 PrefabInstance: m_ObjectHideFlags: 0 @@ -29639,10 +29692,10 @@ MonoBehaviour: m_SelectOnRight: {fileID: 0} m_Transition: 1 m_Colors: - m_NormalColor: {r: 0, g: 0, b: 0, a: 1} - m_HighlightedColor: {r: 0.07, g: 0.07, b: 0.07, a: 1} - m_PressedColor: {r: 0.07058824, g: 0.07058824, b: 0.07058824, a: 1} - m_SelectedColor: {r: 0.07058824, g: 0.07058824, b: 0.07058824, a: 1} + m_NormalColor: {r: 0.03, g: 0.03, b: 0.03, a: 1} + m_HighlightedColor: {r: 0.1, g: 0.1, b: 0.1, a: 1} + m_PressedColor: {r: 0.1, g: 0.1, b: 0.1, a: 1} + m_SelectedColor: {r: 0.1, g: 0.1, b: 0.1, a: 1} m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} m_ColorMultiplier: 1 m_FadeDuration: 0.1 @@ -32596,7 +32649,7 @@ PrefabInstance: - target: {fileID: 3709556431398436641, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, type: 3} propertyPath: m_Name - value: TroopsPanel + value: PlayerTroopsPanel objectReference: {fileID: 0} - target: {fileID: 3709556431398436641, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, type: 3} @@ -32661,7 +32714,7 @@ PrefabInstance: - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: -2 objectReference: {fileID: 0} - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, type: 3} @@ -32671,7 +32724,7 @@ PrefabInstance: - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: -4 objectReference: {fileID: 0} - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, type: 3} @@ -32691,7 +32744,7 @@ PrefabInstance: - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, type: 3} propertyPath: m_AnchorMax.x - value: 1 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, type: 3} @@ -36861,8 +36914,7 @@ Transform: m_LocalRotation: {x: 0.35157326, y: 0.2294723, z: -0.0893232, w: 0.90319437} m_LocalPosition: {x: 7.07, y: 37.71, z: -37.04} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 663080993} + m_Children: [] m_Father: {fileID: 690382256} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 42.538002, y: 28.511002, z: 0} @@ -36894,7 +36946,7 @@ Transform: m_GameObject: {fileID: 1653342036} m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.70710677} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 160, y: 160, z: 160} + m_LocalScale: {x: 130, y: 130, z: 130} m_Children: [] m_Father: {fileID: 1798411515} m_RootOrder: 0 @@ -37132,6 +37184,7 @@ RectTransform: m_Children: - {fileID: 903076478} - {fileID: 1420890672} + - {fileID: 2083163756} m_Father: {fileID: 765894939} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -41189,10 +41242,10 @@ MonoBehaviour: m_SelectOnRight: {fileID: 0} m_Transition: 1 m_Colors: - m_NormalColor: {r: 0, g: 0, b: 0, a: 1} - m_HighlightedColor: {r: 0.07, g: 0.07, b: 0.07, a: 1} - m_PressedColor: {r: 0.07058824, g: 0.07058824, b: 0.07058824, a: 1} - m_SelectedColor: {r: 0.07058824, g: 0.07058824, b: 0.07058824, a: 1} + m_NormalColor: {r: 0.03, g: 0.03, b: 0.03, a: 1} + m_HighlightedColor: {r: 0.1, g: 0.1, b: 0.1, a: 1} + m_PressedColor: {r: 0.1, g: 0.1, b: 0.1, a: 1} + m_SelectedColor: {r: 0.1, g: 0.1, b: 0.1, a: 1} m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} m_ColorMultiplier: 1 m_FadeDuration: 0.1 @@ -45321,6 +45374,41 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6ded4d2fd3f18ad40916c57fe4f6a566, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &2008829375 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2008829376} + m_Layer: 5 + m_Name: TextPanel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2008829376 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2008829375} + 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: 2083163756} + 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!1 &2012941591 GameObject: m_ObjectHideFlags: 0 @@ -46618,6 +46706,157 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -20, y: -20} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1001 &2083163755 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1659880902} + m_Modifications: + - target: {fileID: 3709556431398436641, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_Name + value: EnemyTroopsPanel + objectReference: {fileID: 0} + - target: {fileID: 3709556431398436641, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -2 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_SizeDelta.x + value: -4 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_SizeDelta.y + value: -4 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, type: 3} +--- !u!224 &2083163756 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + m_PrefabInstance: {fileID: 2083163755} + m_PrefabAsset: {fileID: 0} +--- !u!1 &2083163757 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3709556431398436641, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + m_PrefabInstance: {fileID: 2083163755} + m_PrefabAsset: {fileID: 0} +--- !u!114 &2083163758 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2083163757} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5d18c4f05f567d740a67f00ca1311ebb, type: 3} + m_Name: + m_EditorClassIdentifier: + FormationUIPrefab: {fileID: 1708373286441865769, guid: a6a199668f204da4980f4edf1c2f4fea, + type: 3} + FormationParent: {fileID: 2008829375} --- !u!1 &2087330812 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/GWConquest/Scripts/GalaxyMapUI.cs b/Assets/GWConquest/Scripts/GalaxyMapUI.cs index 5f2c03d..896099f 100644 --- a/Assets/GWConquest/Scripts/GalaxyMapUI.cs +++ b/Assets/GWConquest/Scripts/GalaxyMapUI.cs @@ -37,9 +37,10 @@ namespace GWConquest PlanetSelection.SetActive(true); PlanetSelection.transform.SetParent(planet.transform, false); Renderer r = PlanetSelection.GetComponentInChildren(); - Color newColor = Player.CurrentPlayer.Color; - newColor.a = r.material.color.a; - r.material.color = newColor; + if(Player.CurrentPlayer != null) + { + r.material.color.UpdateColorRGB(Player.CurrentPlayer.Color); + } PlanetNameText.text = SelectedPlanet.planetName; UpdateIndicator(); diff --git a/Assets/GWConquest/Scripts/PlanetViewUI.cs b/Assets/GWConquest/Scripts/PlanetViewUI.cs index 878177a..a151550 100644 --- a/Assets/GWConquest/Scripts/PlanetViewUI.cs +++ b/Assets/GWConquest/Scripts/PlanetViewUI.cs @@ -29,6 +29,9 @@ namespace GWConquest public GameObject GroundPanel; + public FleetPanelUI GroundPlayerFleetPanel; + public FleetPanelUI GroundEnemyFleetPanel; + private Planet selectedPlanet; private List districtIcons = new List(); private List districtConnectionLines = new List(); @@ -144,6 +147,23 @@ namespace GWConquest SpaceIndicatorPanel.SetActive(false); FleetIcons.gameObject.SetActive(false); GroundPanel.SetActive(true); + + Formation[] playerFormations; + Formation[] enemyFormations; + if(selectedDistrict == null) + { + playerFormations = selectedPlanet.GetAllFormations(ZoneType.Ground).Where(f => f.Player == Player.CurrentPlayer).ToArray(); + enemyFormations = selectedPlanet.GetAllFormations(ZoneType.Ground).Where(f => f.Player != Player.CurrentPlayer).ToArray(); + } + else + { + playerFormations = selectedDistrict.Zone.Formations.Where(f => f.Player == Player.CurrentPlayer).ToArray(); + enemyFormations = selectedDistrict.Zone.Formations.Where(f => f.Player != Player.CurrentPlayer).ToArray(); + } + + GroundPlayerFleetPanel.SetFormations(playerFormations); + GroundEnemyFleetPanel.SetFormations(enemyFormations); + } } } \ No newline at end of file diff --git a/Assets/GWConquest/Textures/UI/Kreiss PFEIL.png b/Assets/GWConquest/Textures/UI/Kreiss PFEIL.png new file mode 100644 index 0000000000000000000000000000000000000000..59fc92160c387491a58a8a3215529770b0aa5415 GIT binary patch literal 2572 zcmeH|`7;}e7RM7IlqR+iLK0e3RTZ_Qs6}0)ZWfRX{lNsnlzRu zEo!;0t)WsBr4^+}f=eD%c+ zmoFO|8=IJzn46nhT3T9LTie>&VzF2p4(IIb?CR=@$K$VEyXNif?d$97=jV6x=FQO1 z(1?f#B9Rys6-6SE;^X6!l9I?|a%yU7W@ctiPEKxaZeCtqK|#UOr%x*?Dku~Rl}fFu zs;aH6rPJy4_4N%64ULVBO-)TLEiJ9BtsNa5-QC>`2BWX9Z(v}6$z%=<4Gj+ukB*K` zOiWBpPO@06>FMd2nVGq{x%v5dHk-}iaJXFV!otGR($ezsGLOewU0q#UTl@a~`^Lt` z=H}+k&d$NX!QtT{pU*!+^#Ax@C9o8uJb1L*38Jk>3;+OS91A!QSxo={zy(-KGkm=7 z*OEJ4)3&g;Kp9zs= zG>^-=YWTe6R^(1h`&O75YLvi=Y5&#w`c{D-FZt|MTFJ8Gv-o!o&AD-`M^Os-PI0-@ zKXZlxQ@V6*0@IBS(q}0?+a+bpHPkPHQ?+l_2l%o@9g~2@i?wurvD5WKz63jaQ!k8; z1n!|QGk&Tdfx2(yz|Qp~@2rBvo{*ecS+(1PK1B@r-p|XpJ9e+_{%Hn(33t}_^{5ws zE8rL8O3HM?%E#Uc;gT)g61dmVv!L4d=8Z%1nAA)ejTYiqKl{RH*@O$Snp$0ZLWAH% zu}hbxPK85qXWv{DDs!kE$OvzI@ya6IAS|xJn4)n#tI+Ku?Jz0BBQ-=cm>P;38rRj- zt1PU}I9sGwR7-ZmT3M{8+b1!y!xsz##(T_w+1b#M=ZH7!`qNrvT^=ACAwAu2@2Z+; z;JE0BpwV041)PADyfGEcg$Hpze{KEpZ!@uIK(j%m*PSpS? zDMs?mKNNkiK)IQjO|w!w>(C+VkAcT~RnpjA-U`(s<(9I%}3Ou|K5XRC&$IOtOlkBjM<*!mzZzx4C~?HhR(q*CX#EnspJz zY<5H*kW`hn2RayOMh~a>MZ$E@Cu0-ML1=B0EAm#x6LnmIKa7ZdD<49-LgF>`s<~2} z+p|t`mbNT?NxRt8_zN+&yy-*?j<2wcaU7rzydkJhp`_bl#I(0Xs~ zS?UXcS8+5)T`5ZmD+(}9*ayX@Ey3fvXLcQG%V`d^Ow~mv-y15Cb2PDJif-lAv<^3g znxNcz!L;j5MnAvqkBMuVn>2E&;_jh59sWI&{zn-6uvhhtAO|&TE&I(F>3gSW5Y5gE z51TElS~!3opWGALg7n8Lg4#*@rs%$!lglaYChuRu$xYxA*QSwY^zw{BE$a096VG}j+SCKBiK-nE?_&HlL`cL$k#Wb6o;K7@N<&T{pc8Q&d zennhMHU75;^PJzt={b4Z2gKN)iKC_49XtCQ1(Q0vPq*pP5!@!TqMCWW&Z)d)U~r)@ U*5grJ;PFSsS~*(QoBOBy7xHr1i~s-t literal 0 HcmV?d00001 diff --git a/Assets/GWConquest/Textures/UI/Kreiss PFEIL.png.meta b/Assets/GWConquest/Textures/UI/Kreiss PFEIL.png.meta new file mode 100644 index 0000000..cce9e04 --- /dev/null +++ b/Assets/GWConquest/Textures/UI/Kreiss PFEIL.png.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: cec17709b55e6e3438e23c575d38f9ee +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: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + 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: 0 + spriteTessellationDetail: -1 + textureType: 0 + 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: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GWConquest/Textures/UI/Materials/kreiswichs3.mat b/Assets/GWConquest/Textures/UI/Materials/kreiswichs3.mat index bedb81d..d294f2a 100644 --- a/Assets/GWConquest/Textures/UI/Materials/kreiswichs3.mat +++ b/Assets/GWConquest/Textures/UI/Materials/kreiswichs3.mat @@ -42,7 +42,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: bc823f3aaf4ac0944bda814d4ace2a44, type: 3} + m_Texture: {fileID: 2800000, guid: cec17709b55e6e3438e23c575d38f9ee, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: