From 790fad9f8d090816b9d3b026f162cc6a41202d35 Mon Sep 17 00:00:00 2001 From: Laurids Jeppe Date: Sat, 10 Jul 2021 13:07:35 +0200 Subject: [PATCH] Bombarding Icon, small UI changes --- Assets/GWConquest/Prefabs/UI/FlankUI.prefab | 152 ++++++++++++++++++ .../UI/UnitInfoPanel/InfoPanelButton.prefab | 25 ++- Assets/GWConquest/Scenes/GalaxyMap.unity | 2 + Assets/GWConquest/Scripts/UI/BattleFlankUI.cs | 19 +++ Assets/GWConquest/Scripts/UI/BattleUI.cs | 7 + Assets/GWConquest/Textures/Icons/X_Blast.png | Bin 0 -> 1391 bytes .../Textures/Icons/X_Blast.png.meta | 128 +++++++++++++++ Assets/GWConquest/Textures/Icons/X_aim444.png | Bin 0 -> 554 bytes .../Textures/Icons/X_aim444.png.meta | 128 +++++++++++++++ .../GWConquest/Textures/UI/kreiswichs444.png | Bin 0 -> 842 bytes .../Textures/UI/kreiswichs444.png.meta | 128 +++++++++++++++ 11 files changed, 584 insertions(+), 5 deletions(-) create mode 100644 Assets/GWConquest/Textures/Icons/X_Blast.png create mode 100644 Assets/GWConquest/Textures/Icons/X_Blast.png.meta create mode 100644 Assets/GWConquest/Textures/Icons/X_aim444.png create mode 100644 Assets/GWConquest/Textures/Icons/X_aim444.png.meta create mode 100644 Assets/GWConquest/Textures/UI/kreiswichs444.png create mode 100644 Assets/GWConquest/Textures/UI/kreiswichs444.png.meta diff --git a/Assets/GWConquest/Prefabs/UI/FlankUI.prefab b/Assets/GWConquest/Prefabs/UI/FlankUI.prefab index a060e27..ef47abd 100644 --- a/Assets/GWConquest/Prefabs/UI/FlankUI.prefab +++ b/Assets/GWConquest/Prefabs/UI/FlankUI.prefab @@ -108,6 +108,8 @@ RectTransform: - {fileID: 3529282704362558771} - {fileID: 335503723518179647} - {fileID: 8085052938175271119} + - {fileID: 3536641625903406562} + - {fileID: 2784919200071465695} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -138,6 +140,8 @@ MonoBehaviour: RightFrontline: {fileID: 7510832164935520711} CanvasGroup: {fileID: 8668185966868266328} DisabledAlpha: 0.25 + BombardedImageLeft: {fileID: 4435938290225379374} + BombardedImageRight: {fileID: 9221938974357844206} --- !u!225 &8668185966868266328 CanvasGroup: m_ObjectHideFlags: 0 @@ -169,6 +173,80 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &4435938290225379374 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3536641625903406562} + - component: {fileID: 6947087069041277002} + - component: {fileID: 6416625725763179479} + m_Layer: 5 + m_Name: BlastIcon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &3536641625903406562 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4435938290225379374} + 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: 0} + m_Children: [] + m_Father: {fileID: 2893350996044003037} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: -10, y: 0} + m_SizeDelta: {x: 24, y: 24} + m_Pivot: {x: 0, y: 0.5} +--- !u!222 &6947087069041277002 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4435938290225379374} + m_CullTransparentMesh: 0 +--- !u!114 &6416625725763179479 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4435938290225379374} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0.7254902} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 78838c1b1c119f94aaf2f2aaa3f90778, 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: 2.32 --- !u!1 &6557863728900301975 GameObject: m_ObjectHideFlags: 0 @@ -391,3 +469,77 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 2.32 +--- !u!1 &9221938974357844206 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2784919200071465695} + - component: {fileID: 5223024933216193248} + - component: {fileID: 1424979196823302626} + m_Layer: 5 + m_Name: BlastIcon (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &2784919200071465695 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9221938974357844206} + 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: 2893350996044003037} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 10, y: 0} + m_SizeDelta: {x: 24, y: 24} + m_Pivot: {x: 0, y: 0.5} +--- !u!222 &5223024933216193248 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9221938974357844206} + m_CullTransparentMesh: 0 +--- !u!114 &1424979196823302626 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9221938974357844206} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0.7254902} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 78838c1b1c119f94aaf2f2aaa3f90778, 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: 2.32 diff --git a/Assets/GWConquest/Prefabs/UI/UnitInfoPanel/InfoPanelButton.prefab b/Assets/GWConquest/Prefabs/UI/UnitInfoPanel/InfoPanelButton.prefab index f6b0846..164f1d6 100644 --- a/Assets/GWConquest/Prefabs/UI/UnitInfoPanel/InfoPanelButton.prefab +++ b/Assets/GWConquest/Prefabs/UI/UnitInfoPanel/InfoPanelButton.prefab @@ -14,6 +14,7 @@ GameObject: - component: {fileID: 7821828295594674660} - component: {fileID: 489060003446475101} - component: {fileID: 6709600915898355427} + - component: {fileID: 936164327184617446} m_Layer: 5 m_Name: InfoPanelButton m_TagString: Untagged @@ -63,7 +64,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.03, g: 0.03, b: 0.03, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: @@ -112,8 +113,8 @@ MonoBehaviour: m_SelectOnRight: {fileID: 0} m_Transition: 1 m_Colors: - m_NormalColor: {r: 0.03, g: 0.03, b: 0.03, a: 1} - m_HighlightedColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} + m_NormalColor: {r: 0, g: 0, b: 0, a: 1} + m_HighlightedColor: {r: 0.09, g: 0.09, b: 0.09, a: 1} m_PressedColor: {r: 0.25, g: 0.25, b: 0.25, a: 1} m_SelectedColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} @@ -166,6 +167,20 @@ MonoBehaviour: sprite: {fileID: 21300000, guid: aaf78e1a9f8a1614b90555189916a21e, type: 3} - action: 2 sprite: {fileID: 21300000, guid: c5a8e4ac431b58d4c9e9786dd03c0f61, type: 3} +--- !u!114 &936164327184617446 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1085982531018394466} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 342dd2fd557feed438ce05e1625dee09, type: 3} + m_Name: + m_EditorClassIdentifier: + smoothTime: 0.1 + scaleFactor: 1.1 --- !u!1 &4510811153664870994 GameObject: m_ObjectHideFlags: 0 @@ -300,11 +315,11 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 0.69411767} m_RaycastTarget: 0 - m_Maskable: 1 + m_Maskable: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 9d02af9561347c349986baae6fb1fa27, type: 3} + m_Sprite: {fileID: 21300000, guid: 0055e38087b03e04dbfa4f836125f31d, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/GWConquest/Scenes/GalaxyMap.unity b/Assets/GWConquest/Scenes/GalaxyMap.unity index 80c25e5..2894d41 100644 --- a/Assets/GWConquest/Scenes/GalaxyMap.unity +++ b/Assets/GWConquest/Scenes/GalaxyMap.unity @@ -128604,6 +128604,8 @@ MonoBehaviour: EnemyLossesTransform: {fileID: 1127011322} LossIconPrefab: {fileID: 6815987390155653563, guid: a56da3162d4abbd4c8843cb7eb895034, type: 3} + SelectingCursorTexture: {fileID: 2800000, guid: 7def3dc0e886ba14b82f9c8929fd7468, + type: 3} --- !u!1 &1997081172 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/GWConquest/Scripts/UI/BattleFlankUI.cs b/Assets/GWConquest/Scripts/UI/BattleFlankUI.cs index f221794..059a543 100644 --- a/Assets/GWConquest/Scripts/UI/BattleFlankUI.cs +++ b/Assets/GWConquest/Scripts/UI/BattleFlankUI.cs @@ -17,6 +17,9 @@ namespace GWConquest { public CanvasGroup CanvasGroup; public float DisabledAlpha; + public GameObject BombardedImageLeft; + public GameObject BombardedImageRight; + private BattleUI battleUI; public RectTransform RectTransform { @@ -105,6 +108,22 @@ namespace GWConquest { } } + // TODO increase performance + private void FixedUpdate() { + if(BattleFlank != null) + { + var BombardedImage = BattleFlank.Player == Player.CurrentPlayer ? BombardedImageLeft : BombardedImageRight; + + if(BattleFlank.Battle.AllUnits.Where(u => u.IsShelling && u.FlankTarget == BattleFlank).FirstOrDefault() != null) + { + BombardedImage.SetActive(true); + } + else { + BombardedImage.SetActive(false); + } + } + } + } } \ No newline at end of file diff --git a/Assets/GWConquest/Scripts/UI/BattleUI.cs b/Assets/GWConquest/Scripts/UI/BattleUI.cs index d19fbf8..7fa3694 100644 --- a/Assets/GWConquest/Scripts/UI/BattleUI.cs +++ b/Assets/GWConquest/Scripts/UI/BattleUI.cs @@ -53,6 +53,8 @@ namespace GWConquest public RectTransform EnemyLossesTransform; public GameObject LossIconPrefab; + public Texture2D SelectingCursorTexture; + [System.NonSerialized] public bool SelectingTarget = false; [System.NonSerialized] @@ -525,6 +527,9 @@ namespace GWConquest SelectingTarget = true; SelectingTargetUnit = unit; + Vector2 hotspot = new Vector2(SelectingCursorTexture.width/2, SelectingCursorTexture.height/2); + Cursor.SetCursor(SelectingCursorTexture, hotspot, CursorMode.Auto); + foreach (var hh in GetComponentsInChildren()) { hh.enabled = false; @@ -541,6 +546,8 @@ namespace GWConquest SelectingTarget = false; SelectingTargetUnit = null; + Cursor.SetCursor(null, Vector2.zero, CursorMode.Auto); + foreach (var hh in GetComponentsInChildren()) { hh.enabled = true; diff --git a/Assets/GWConquest/Textures/Icons/X_Blast.png b/Assets/GWConquest/Textures/Icons/X_Blast.png new file mode 100644 index 0000000000000000000000000000000000000000..ab819501cd5fc8ef617d74228560c80a0c655d69 GIT binary patch literal 1391 zcmV-#1(5oQP)Px#1ZP1_K>z@;j|==^1poj7G*C=bMF0Q*3JMAd2?;{eeOFgkMn*=NnVEcid`L)0*4EY!4-W(c1k=;gH#awrkB>h;KN}kxDJd!W`S}nK z5LH!G`uh5DadBm3Wnp1qva+&JP*5Em9rE(>(b3Ti3=F}+!J?v~1_lPFr>ExT<_il8 z=;-K$g@uZWiu?QfAt52!+S(o-9*c{MZ*Oni-QD;1_c=K^n3$L)B_(5HV`pb)k&%%# zH8mU@9P#n-(9qD#%*>{yro_a=CnqQG@9$JpREUU(sHmv^{{DG+d9JRm;NakTdU`xO zJbr$DcXxM5NlEnd^z7{HbaZqoDk^q%cJ=l3_V)HsQBk3xp~}k2@bK^v5fNx;Xu7(( z-{0SJb8}*1Vl6E#`1tt!{r&Cj?HCvszrVjnM@O5Ro0F51PEJlVG&G!?oEH}t?(Xi- z&(HJo^Wx&-4h{~9iHYOmQ%DYJh-%LPA1BL_`%86%!K^x3{<6-rfxj4a393 zz`(#378awUquAKkt*xyqD=Qx#AIQka>+9<}Iyy^BOS!qZczAe2LqjkyFr=iUGBPr= zv$Jq;aE*XBO?e12=_#(o&W#<32;bRa{vGi!2kdb!2!6DYwZ940>nu~K~y+T z&6Mp+R6!KR&t9)4SEe?V)w5V;i!ZCLtA^ULq&LI8hDoVg=G|;bx5RuY2|*H}PfJDg zVGWAHq@YlG!RSS*f37n#N4Z+EU;Dw{^W2$dW@pZvx$r;YSm!S z<_I9t7Awv2UZdbh)D?MNz<;#V^1gd0Eh}dwG2Lobe^H4+R+1`A`45<}3IoSj5+!)x zj3*FlPD&A?UvbS|qj#gVh*&2@eFH#vagVX7nS~@AL2Rri(Gmq{MX%9lYnOr7d}^Ae z?C7NJcLALC8e?N|L&lJt2B17nMx-?N*k?n%%4nUF9sUyR(Ti+J(Zezl(&+TVdF(T7 zWgNI5y9Y5)DG?`1yiIPlYQXp#p&BHqYXO@J2*Fg$0fDJHliDG zx_}=0SeT;RBHm*c?IYZX?wPyP<}S*f9U=kw%q+2u5WEqz53_Szc@!f;ABib*Ilzs0 ze_6+%qa(4RY*Y-(R0I!rtJvOW z?NbCP`(+r34kJ!cvMLOk6=Wv(xvJb~!?8(A|VCYz6sf}nzOei=o{ zcki`NUMxutjF~L22;{8&E^bu!VuI4bh)rqiC>9|;f1P7lIfyU9s!5}=;e6mX#`=iP z9De%D!!(t0>;%6s4O?H<-eT9vS9N2USdxqt-l254E%-*QLxuC)p!iN__Jj2<+nC7y xlph2yhp7JOvU)LtE1j_Kqb5Y?H_Lwk@CU!^f@qDcMce=Y002ovPDHLkV1k^_kXir$ literal 0 HcmV?d00001 diff --git a/Assets/GWConquest/Textures/Icons/X_Blast.png.meta b/Assets/GWConquest/Textures/Icons/X_Blast.png.meta new file mode 100644 index 0000000..7a5586b --- /dev/null +++ b/Assets/GWConquest/Textures/Icons/X_Blast.png.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: 78838c1b1c119f94aaf2f2aaa3f90778 +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: diff --git a/Assets/GWConquest/Textures/Icons/X_aim444.png b/Assets/GWConquest/Textures/Icons/X_aim444.png new file mode 100644 index 0000000000000000000000000000000000000000..aaf6d94b9ed32738de5a0db1736ac8fd13349e45 GIT binary patch literal 554 zcmV+_0@eMAP)Px#1ZP1_K>z@;j|==^1poj5Y*0*8MF0Q*J3Bk&<>g69N&o-<3=9lCJv|8t35$!1 z_xJY;3kv}O0cdDwbaZqA0s;pI2g%9F?d|PVRaH?@QO?fJ4h|0FtLA2j|3zl7msIlj=@>kP`Q|##u@P_A9tkI%Y{Y zoEZXuZ}_x|ivR!s07*qoM6N<$g7)g^DF6Tf literal 0 HcmV?d00001 diff --git a/Assets/GWConquest/Textures/Icons/X_aim444.png.meta b/Assets/GWConquest/Textures/Icons/X_aim444.png.meta new file mode 100644 index 0000000..73f33d8 --- /dev/null +++ b/Assets/GWConquest/Textures/Icons/X_aim444.png.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: 7def3dc0e886ba14b82f9c8929fd7468 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + 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: 1 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: 1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + 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: 1 + spriteTessellationDetail: -1 + textureType: 7 + 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/kreiswichs444.png b/Assets/GWConquest/Textures/UI/kreiswichs444.png new file mode 100644 index 0000000000000000000000000000000000000000..5a947fadf5d867f46f74a98b3a19b7aa58cd1bf0 GIT binary patch literal 842 zcmV-Q1GW5#P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vG-)Bpe})B)=!Nu~e*0^dnQK~z{r)tNnO z6j2n0cV!EU6c!d+q)3?}LWC6l0|TZ=X<_LP2xw^$ut=H0GDQk2u~0!FU}I@vr(j{B zU_`+{1TBU2d1lUC5;yyi*_qv&7hY!WnLGEqd+z6)ZMUXGuh;8vS%gcl8~5T6{(xV+ zZ@1fjHC9C>p@>`HvH@?wb$A4mDDTBpn8bU30AInEi2lR1IUukL_uy~%8s3G97zyh{ z-DmI^?n8e-y`a%6a66pr!m;9pA=-KvZS7c&N7I3ZR^Vr76w>&c8nk8aJc3{0T9~VW z1~%bOcsoqBgSI!|_sTwaaVr|Q5vIm~k5y=7x56|Tc)>_2ayd+m178jW#cqaaG^ps9 zw7VOR-NiH( z)w~yc7F9DCCI=?_1eh({=MU7FX1y7Va!<_*H=)`}5L%CU9#rc|2GjtwT!yEQd4$$n z&~tdtawfPB2lG@YAAbCwG0o1vR9J(CeKkxo13s6-_hd;kDw+iFSIum^>I;6-cbFyvFPJ1#Y~zu|hmlm|`I2M_ zyqJ<@O{N_klhga4ft1KKK~dXKpe>i6i4(bL3mpm;+z(u?!*B2-jhexzyo2$sJI(`c z-$NJkYxsEQv)X_I2fUGWYkLasz_FsO6LlX$-#z!A4HxF`n@U1Y0?{-0L#);M2lcde US)8yfNB{r;07*qoM6N<$f>zFcMgRZ+ literal 0 HcmV?d00001 diff --git a/Assets/GWConquest/Textures/UI/kreiswichs444.png.meta b/Assets/GWConquest/Textures/UI/kreiswichs444.png.meta new file mode 100644 index 0000000..dbaf092 --- /dev/null +++ b/Assets/GWConquest/Textures/UI/kreiswichs444.png.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: 0055e38087b03e04dbfa4f836125f31d +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: 1 + 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: