diff --git a/Assets/GWConquest/Resources/Database/Units.csv b/Assets/GWConquest/Resources/Database/Units.csv index 3783481..a9b1151 100644 --- a/Assets/GWConquest/Resources/Database/Units.csv +++ b/Assets/GWConquest/Resources/Database/Units.csv @@ -74,31 +74,31 @@ Storm Pioneers,RokurantStormPioneers,Infantry,Infantry,45,1,2,0,0.5,0.55,0,0,0,1 Transport Truck,RokurantTransportTruck,Armour,Vehicle,50,0,0,0,0,0.5,0,0,0,4,2,0,10,100,100,100,,,,,,,,,, ,,,,,,,,,,,,,,,,,,,,,,,,,,,,, Voteine,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -Fast Assault Tank,VoteineFastAssaultTank,Armour,Vehicle,40,1/2,8/3,3/1,0.75/0.8,1,1,1,0.35,5,2,0,10,100,100,100,,,,,,,,,, -Hover Tank,VoteineHoverTank,Armour,Vehicle,45,3,5,1.5,0.8,2,1,1,0.15,5,2,0,10,100,100,100,,,,,,,,,, +Fast Assault Tank,VoteineFastAssaultTank,Armour,Vehicle,40,1/2,8/3,3/1,0.75/0.8,1,10,1,0.35,5,2,0,10,100,100,100,,,,,,,,,, +Hover Tank,VoteineHoverTank,Armour,Vehicle,45,3,5,1.5,0.8,2,10,1,0.15,5,2,0,10,100,100,100,,,,,,,,,, Light Hover Tank,VoteineLHoverTank,Armour,Vehicle,40,3,5,1.5,0.75,1.45,0,1,0.3,5,2,0,10,100,100,100,,,,,,,,,, Voteine Infantry,VoteineInfantry,Infantry,Infantry,32,2,4,0,0.6,0.4,0,0,0,0.8,3,0,10,100,100,100,,,,,,,,,, Voteine Infantry Elite,VoteineInfantryElite,Infantry,Infantry,38,3,4,0,0.6,0.4,0,0,0,0.8,3,0,10,100,100,100,,,,,,,,,, Voteine Drones,VoteineDrones,Infantry,Infantry,8,1,1,0,0.4,0.3,0,0,0.75,1,0,0,10,100,100,100,,,,,,,,,, ,,,,,,,,,,,,,,,,,,,,,,,,,,,,, Whythler,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -Husain Jet-Bike Squad,WythlerJetBikeSquad1,Armour,Vehicle,60,4,4,2,0.8,1,2,1,0.6,6,2,0,10,100,100,100,,,,,,,,,, -Winhali Jet-Bike Squad,WythlerJetBikeSquad2,Armour,Vehicle,60,2/4,4/3,2/0.5,0.8/0.7,1,2,1,0.65,6,2,0,10,100,100,100,,,,,,,,,, -Lenphra Jet-Bike Squad,WythlerJetBikeSquad3,Armour,Vehicle,60,2/1,4/10,2/4,0.8/0.7,1,2,1,0.55,6,2,0,10,100,100,100,,,,,,,,,, -Light Attack Speeder,WythlerLAttackSpeeder,Armour,Vehicle,70,3,4,4,0.85,2,2,2,0.3,5,2,0,10,100,100,100,,,,,,,,,, -Attack Speeder,WythlerAttackSpeeder,Armour,Vehicle,90,1/3,12/4,4/2,0.85/0.7,2,2,2,0.35,4,2,0,10,100,100,100,,,,,,,,,, -Heavy Attack Speeder,WythlerHAttackSpeeder,Armour,Vehicle,100,1/4,18/4,5/2,0.85/0.7,2.5,3,2,0.2,4,2,0,10,100,100,100,,,,,,,,,, -Heavy Transport Speeder,WythlerHTransportSpeeder,Armour,Vehicle,90,3,4,4,0.85,3,3,2,0.2,4,2,0,10,100,100,100,,,,,,,,,, +Husain Jet-Bike Squad,WythlerJetBikeSquad1,Armour,Vehicle,60,4,4,2,0.8,1,20,1,0.6,6,2,0,10,100,100,100,,,,,,,,,, +Winhali Jet-Bike Squad,WythlerJetBikeSquad2,Armour,Vehicle,60,2/4,4/3,2/0.5,0.8/0.7,1,20,1,0.65,6,2,0,10,100,100,100,,,,,,,,,, +Lenphra Jet-Bike Squad,WythlerJetBikeSquad3,Armour,Vehicle,60,2/1,4/10,2/4,0.8/0.7,1,20,1,0.55,6,2,0,10,100,100,100,,,,,,,,,, +Light Attack Speeder,WythlerLAttackSpeeder,Armour,Vehicle,70,3,4,4,0.85,2,20,2,0.3,5,2,0,10,100,100,100,,,,,,,,,, +Attack Speeder,WythlerAttackSpeeder,Armour,Vehicle,90,1/3,12/4,4/2,0.85/0.7,2,20,2,0.35,4,2,0,10,100,100,100,,,,,,,,,, +Heavy Attack Speeder,WythlerHAttackSpeeder,Armour,Vehicle,100,1/4,18/4,5/2,0.85/0.7,2.5,30,2,0.2,4,2,0,10,100,100,100,,,,,,,,,, +Heavy Transport Speeder,WythlerHTransportSpeeder,Armour,Vehicle,90,3,4,4,0.85,3,30,2,0.2,4,2,0,10,100,100,100,,,,,,,,,, Transport Vehicle,WythlerTransportVehicle,Armour,Vehicle,75,2,1,1,0.7,0.75,0,0,0,2,2,0,10,100,100,100,,,,,,,,,, Tankhunter,WythlerTankhunter,Armour,Vehicle,60,1,11,2,0.65,0.5,0,0,0,2,2,0,10,100,100,100,,,1200,,,,,,, -Wythler Squad,WythlerSquad,Infantry,Infantry,45,3/4,4/3,2/0.5,0.9/0.8,1,2,1,0,,,,10,100,100,100,,,,,,,,,, -Power Armour Squad,PowerArmourSquad,Infantry,Infantry,45,3/4,4/3,2/0.5,0.9/0.8,1,2,1,0,0.8,2,0,10,100,100,100,1,,,,,,,,, +Wythler Squad,WythlerSquad,Infantry,Infantry,45,3/4,4/3,2/0.5,0.9/0.8,1,20,1,0,,,,10,100,100,100,,,,,,,,,, +Power Armour Squad,PowerArmourSquad,Infantry,Infantry,45,3/4,4/3,2/0.5,0.9/0.8,1,20,1,0,0.8,2,0,10,100,100,100,1,,,,,,,,, Rabble,Rabble,City,Infantry,15,1,4,0,0.5,0,0,0,0,1.2,2,0,10,100,100,100,1,,,,,,,,, -Wyth Palace Guard,WythPalaceGuard,Infantry,Infantry,40,2,3,0,0.8,1,1,2.5,0,0.8,2,0,10,100,100,100,1,,,,,,,,, -Assassins,Assassins,Infantry,Infantry,5,1,10,0,0.3,0.3,1,2.5,0.2,2,,0,10,100,100,100,,stealth I,,,,,,,, +Wyth Palace Guard,WythPalaceGuard,Infantry,Infantry,40,2,3,0,0.8,1,10,2.5,0,0.8,2,0,10,100,100,100,1,,,,,,,,, +Assassins,Assassins,Infantry,Infantry,5,1,10,0,0.3,0.3,10,2.5,0.2,2,,0,10,100,100,100,,stealth I,,,,,,,, Disciplinary Master,WythlerDisciplinaryMaster,Infantry,Infantry,25,1,4,0,0.5,0.3,0,0,0,1,,0,10,100,100,100,,,,,,,,,, Charnal Guard,CharnalGuard,Infantry,Infantry,60,2,2,0,0.9,0.3,0,0,0,1,,0,10,100,100,100,,,,,,,,,, -Hushtan Ginetiphracts,Ginetiphracts,Infantry,Infantry,20,1,4,0,0.5,0,0,0,0,1,2,0,10,100,100,100,,,,,,,,,, +Ginetiphracts,Ginetiphracts,Infantry,Infantry,20,1,4,0,0.5,0,0,0,0,1,2,0,10,100,100,100,,,,,,,,,, ,,,,,,,,,,,,,,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,,,,,,,,,,,,,, Republic Remnants,,,,,,,,,,,,,,,,,,,,,,,,,,,,, @@ -113,24 +113,26 @@ Elysian Jet Infantry,ElysianJetInfantry,Infantry,Infantry,30,2,3,0,0.65,0.5,0,0, Elysian Recon Infantry,ElysianReconInfantry,Infantry,Infantry,35,1/1,8/4,1/0.3,0.7/0.7,0.3,0,0,0.5,2,2,0,10,100,100,100,,stealth II,,,,,,,, ,,,,,,,,,,,,,,,,,100,100,100,,,,,,,,,, Yar-Kassy,,,,,,,,,,,,,,,,,100,100,100,,,,,,,,,, -Dervish Assault Tank,YarkassyAssaultTank,Armour,Vehicle,90,1/2,8/3,3/1,0.75/0.8,1,1,1,0.35,4.5,2,0,10,100,100,100,,,,,,,,,, +Dervish Assault Tank,YarkassyAssaultTank,Armour,Vehicle,90,1/2,8/3,3/1,0.75/0.8,1,0,0,0.35,4.5,2,0,10,100,100,100,,,,,,,,,, Desert Raider Squad,YarkassyDesertRaiderSquad,Infantry,Infantry,35,2,2,0,0.5,0.5,0,0,0,0.8,2,0,10,100,100,100,1,,,,,,,,, Elite Marksmen Squad,YarkassyEliteMarksmen,Infantry,Infantry,18,1,5,0.5,0.95,0,0,0,0.25,1.3,2,0,10,100,100,100,,stealth I,,,,,,,, Ghar Haclem Ark'venuur Serpents,YarkassySerpents,Infantry,Infantry,25,3,2,0.5,0.45,0,0,0,0,1,2,0,10,100,100,100,1,,,,,,,,, ,,,,,,,,,,,,,,,,,,,,,,,,,,,,, Arca,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -Scum,ArcaScum,City,Infantry,20,2,1,0,0.25,0,0,0,0,1.1,1,0,10,100,100,100,0,,,,,,,,, +Arca Scum,ArcaScum,City,Infantry,20,2,1,0,0.25,0,0,0,0,1.1,1,0,10,100,100,100,0,,,,,,,,, +Arca Veterans,ArcaVeterans,City,Infantry,20,2,1,0,0.25,0,0,0,0,1.1,1,0,10,100,100,100,0,,,,,,,,, +Arca Raiders,ArcaRaiders,City,Infantry,20,2,1,0,0.25,0,0,0,0,1.1,1,0,10,100,100,100,0,,,,,,,,, ,,,,,,,,,,,,,,,,,,,,,,,,,,,,, Zami,,,,,,,,,,,,,,,,,,,,,,,,,,,,, Cryo-Clone Squad,ZamiCryoCloneSquad,Infantry,Infantry,25,2,2,0,0.75,0,0,0,0,1.5,2,0,10,100,100,100,0,,,,,,,,, Immortals Cryo-Clone Squad,ImmortalsCryo-CloneSquad,Infantry,Infantry,35,3,2,0,0.8,0.55,0,0,0,1.5,2,0,10,100,100,100,0,,,,,,,,, -Zami War Tripod,ZamiWarTripod,Armour,Vehicle,100,2/6,4/1,2.5/0,0.8/0.8,2.5,2,1,0,2,2,0,10,100,100,100,,,,,,,,,, -Zami War Strider,ZamiWarStrider,Armour,Vehicle,85,1/7,4/1,2.5/0,0.75/0.75,2,2,1,0,2,2,0,10,100,100,100,,,,,,,,,, +Zami War Tripod,ZamiWarTripod,Armour,Vehicle,100,2/6,4/1,2.5/0,0.8/0.8,2.5,20,1,0,2,2,0,10,100,100,100,,,,,,,,,, +Zami War Strider,ZamiWarStrider,Armour,Vehicle,85,1/7,4/1,2.5/0,0.75/0.75,2,20,1,0,2,2,0,10,100,100,100,,,,,,,,,, Conscripted Miner Slaves,ConscriptedMinerSlaves,City,Infantry,12,2,3,0,0.45,0,0,0,0,1.2,2,0,10,100,100,100,1,,,,,,,,, -Satyr-9 Varanguard,Satyr-9Varanguard,City,Infantry,40,3,3,0.5,0.9,1,0,0,0,1,2,0,10,100,100,100,1,,,,,,,,, +Satyr-9 Varanguard,Satyr9Varanguard,City,Infantry,40,3,3,0.5,0.9,1,0,0,0,1,2,0,10,100,100,100,1,,,,,,,,, Krioss Ravager Pack,KriossRavagerPack,Infantry,Infantry,50,5,2,1,0.45,0.75,0,0,1,5,3,0,10,100,100,100,,,,,,,,,, Snagaa Newborn,SnagaaNewborn,Infantry,Infantry,15,2,1,0,0.3,0,0,0,0,1.5,0,0,10,100,100,100,,,,,,,,,, -Axa Axa,AxaAxa,Infantry,Vehicle,45,4,1,0,0.7,0.5,1,2.5,0,1,0,0,10,100,100,100,,,,,,,,,, +Axa Axa,AxaAxa,Infantry,Vehicle,45,4,1,0,0.7,0.5,10,2.5,0,1,0,0,10,100,100,100,,,,,,,,,, ,,,,,,,,,,,,,,,,,,,,,,,,,,,,, Stuntreen,,,,,,,,,,,,,,,,,,,,,,,,,,,,, Headtaker Commando,HeadtakerCommando,City,Infantry,20,1,4,0,0.5,0.3,0,0,0,1,2,0,10,100,100,100,1,,,,,,,,, diff --git a/Assets/GWConquest/Resources/UnitIcons/ArcaRaiders.png b/Assets/GWConquest/Resources/UnitIcons/ArcaRaiders.png new file mode 100644 index 0000000..8c24040 Binary files /dev/null and b/Assets/GWConquest/Resources/UnitIcons/ArcaRaiders.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/ArcaRaiders.png.meta b/Assets/GWConquest/Resources/UnitIcons/ArcaRaiders.png.meta new file mode 100644 index 0000000..9db8304 --- /dev/null +++ b/Assets/GWConquest/Resources/UnitIcons/ArcaRaiders.png.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: 99fb45360d0731149bc1499e89bb2e6f +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/Resources/UnitIcons/ArcaVeterans.png b/Assets/GWConquest/Resources/UnitIcons/ArcaVeterans.png new file mode 100644 index 0000000..ace57a3 Binary files /dev/null and b/Assets/GWConquest/Resources/UnitIcons/ArcaVeterans.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/ArcaVeterans.png.meta b/Assets/GWConquest/Resources/UnitIcons/ArcaVeterans.png.meta new file mode 100644 index 0000000..913e6ea --- /dev/null +++ b/Assets/GWConquest/Resources/UnitIcons/ArcaVeterans.png.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: 24911c9e3b0f1dc4b881d99f00d6af98 +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/Resources/UnitIcons/InobriaTunnelFighter.png b/Assets/GWConquest/Resources/UnitIcons/InobriaTunnelFighter.png index 7c3075a..d1cd959 100644 Binary files a/Assets/GWConquest/Resources/UnitIcons/InobriaTunnelFighter.png and b/Assets/GWConquest/Resources/UnitIcons/InobriaTunnelFighter.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/Satyr9Varanguard.png b/Assets/GWConquest/Resources/UnitIcons/Satyr9Varanguard.png new file mode 100644 index 0000000..0d7227d Binary files /dev/null and b/Assets/GWConquest/Resources/UnitIcons/Satyr9Varanguard.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/Satyr9Varanguard.png.meta b/Assets/GWConquest/Resources/UnitIcons/Satyr9Varanguard.png.meta new file mode 100644 index 0000000..26eadfb --- /dev/null +++ b/Assets/GWConquest/Resources/UnitIcons/Satyr9Varanguard.png.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: 428c30a130ff4594db50084a4b05e7cc +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/Resources/UnitIcons/SpiceHealerPack.png b/Assets/GWConquest/Resources/UnitIcons/SpiceHealerPack.png index edb61d5..24283ec 100644 Binary files a/Assets/GWConquest/Resources/UnitIcons/SpiceHealerPack.png and b/Assets/GWConquest/Resources/UnitIcons/SpiceHealerPack.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/SpiceHealerPack.png.meta b/Assets/GWConquest/Resources/UnitIcons/SpiceHealerPack.png.meta index 81eeac2..a478613 100644 --- a/Assets/GWConquest/Resources/UnitIcons/SpiceHealerPack.png.meta +++ b/Assets/GWConquest/Resources/UnitIcons/SpiceHealerPack.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 61e0f80903a223942b6c71078616b8ec +guid: 939ff18c19c11fa40bb34fb8d3d99165 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/GWConquest/Resources/UnitIcons/VoteineDrones.png b/Assets/GWConquest/Resources/UnitIcons/VoteineDrones.png new file mode 100644 index 0000000..9b7dce6 Binary files /dev/null and b/Assets/GWConquest/Resources/UnitIcons/VoteineDrones.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/VoteineDrones.png.meta b/Assets/GWConquest/Resources/UnitIcons/VoteineDrones.png.meta new file mode 100644 index 0000000..3752bb6 --- /dev/null +++ b/Assets/GWConquest/Resources/UnitIcons/VoteineDrones.png.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: c8d5621c73da4924fadd3e0e07a3a85f +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/Scenes/GalaxyMap.unity b/Assets/GWConquest/Scenes/GalaxyMap.unity index e0dc0eb..8653075 100644 --- a/Assets/GWConquest/Scenes/GalaxyMap.unity +++ b/Assets/GWConquest/Scenes/GalaxyMap.unity @@ -34080,6 +34080,80 @@ Transform: type: 3} m_PrefabInstance: {fileID: 658800763} m_PrefabAsset: {fileID: 0} +--- !u!1 &660634484 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 660634485} + - component: {fileID: 660634487} + - component: {fileID: 660634486} + m_Layer: 5 + m_Name: Image (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &660634485 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 660634484} + 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: 892998596} + 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: 99.5, y: -6.1000214} + m_SizeDelta: {x: 44.548096, y: 44.548096} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &660634486 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 660634484} + 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: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 61480eaaa5513e1478042637eeadbaca, 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 +--- !u!222 &660634487 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 660634484} + m_CullTransparentMesh: 0 --- !u!4 &662262807 stripped Transform: m_CorrespondingSourceObject: {fileID: 4428860687156642, guid: 00cbbb3475b1b0640a802c21a905203b, @@ -47878,6 +47952,8 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 551023862} + - {fileID: 1387768290} + - {fileID: 660634485} m_Father: {fileID: 120212469} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -50468,6 +50544,7 @@ GameObject: - component: {fileID: 948716780} - component: {fileID: 948716795} - component: {fileID: 948716794} + - component: {fileID: 948716796} m_Layer: 0 m_Name: TestUnitsZami m_TagString: Untagged @@ -50744,6 +50821,23 @@ MonoBehaviour: playerId: 6 zone: {fileID: 24269502} assignAsLeader: 0 +--- !u!114 &948716796 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 948716779} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e3fbe30dead34c49a8585bf21ae46af, type: 3} + m_Name: + m_EditorClassIdentifier: + unitName: VoteineDrones + unitCount: 4 + playerId: 0 + zone: {fileID: 24269502} + assignAsLeader: 0 --- !u!1 &952141928 GameObject: m_ObjectHideFlags: 0 @@ -67453,7 +67547,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 36004159} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1251065788 MonoBehaviour: @@ -77669,6 +77763,80 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 59300c3dd14d29d4895f5f18e85d7eb3, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1387768289 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1387768290} + - component: {fileID: 1387768292} + - component: {fileID: 1387768291} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1387768290 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1387768289} + 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: 892998596} + 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: -99.5, y: -6.1} + m_SizeDelta: {x: 44.548096, y: 44.548096} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1387768291 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1387768289} + 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: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 61480eaaa5513e1478042637eeadbaca, 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 +--- !u!222 &1387768292 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1387768289} + m_CullTransparentMesh: 0 --- !u!1 &1387950575 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/GWConquest/Textures/Icons/Defeated.png b/Assets/GWConquest/Textures/Icons/Defeated.png new file mode 100644 index 0000000..d8a647b Binary files /dev/null and b/Assets/GWConquest/Textures/Icons/Defeated.png differ diff --git a/Assets/GWConquest/Textures/Icons/Defeated.png.meta b/Assets/GWConquest/Textures/Icons/Defeated.png.meta new file mode 100644 index 0000000..a122ad3 --- /dev/null +++ b/Assets/GWConquest/Textures/Icons/Defeated.png.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: 61480eaaa5513e1478042637eeadbaca +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: