diff --git a/.gitignore b/.gitignore index 173f4fb..76078df 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,8 @@ /Logs/ /Packages/ /Usersettings/ - +Assembly-CSharp-Editor-firstpass.csproj +Assembly-CSharp.csproj +PhysicsProject.sln .vs/ .vscode/ \ No newline at end of file diff --git a/Assets/Resources/images/UU_Flag.png b/Assets/Resources/images/UU_Flag.png new file mode 100644 index 0000000..534635a Binary files /dev/null and b/Assets/Resources/images/UU_Flag.png differ diff --git a/Assets/Resources/images/UU_Flag.png.meta b/Assets/Resources/images/UU_Flag.png.meta new file mode 100644 index 0000000..b0b1109 --- /dev/null +++ b/Assets/Resources/images/UU_Flag.png.meta @@ -0,0 +1,135 @@ +fileFormatVersion: 2 +guid: 02716d37dc1bad6418e541e38588691a +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + 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: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + 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: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + 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: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/images/UU_Flag_mirrored.png b/Assets/Resources/images/UU_Flag_mirrored.png new file mode 100644 index 0000000..39aa3cb Binary files /dev/null and b/Assets/Resources/images/UU_Flag_mirrored.png differ diff --git a/Assets/Resources/images/UU_Flag_mirrored.png.meta b/Assets/Resources/images/UU_Flag_mirrored.png.meta new file mode 100644 index 0000000..f9f4f04 --- /dev/null +++ b/Assets/Resources/images/UU_Flag_mirrored.png.meta @@ -0,0 +1,135 @@ +fileFormatVersion: 2 +guid: 658a2fb438bc5b84fa7c6724723a4030 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + 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: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + 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: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + 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: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/material/UNFlag.mat b/Assets/Resources/material/UUFlag.mat similarity index 95% rename from Assets/Resources/material/UNFlag.mat rename to Assets/Resources/material/UUFlag.mat index a06c296..79b2b3b 100644 --- a/Assets/Resources/material/UNFlag.mat +++ b/Assets/Resources/material/UUFlag.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: UNFlag + m_Name: UUFlag m_Shader: {fileID: 4800000, guid: 735c2ca2e215f794cafd0447f53d66ac, type: 3} m_ValidKeywords: [] m_InvalidKeywords: @@ -51,7 +51,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 906b8ea5c4d9e114c9b1bd3f2d26e6d6, type: 3} + m_Texture: {fileID: 2800000, guid: 658a2fb438bc5b84fa7c6724723a4030, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -121,7 +121,7 @@ Material: - _ZWrite: 1 - __dirty: 1 m_Colors: - - _Color: {r: 0.023139918, g: 0.3773585, b: 0.086178824, a: 1} + - _Color: {r: 0.11320752, g: 0.11320752, b: 0.11320752, a: 1} - _DetailColor: {r: 1, g: 1, b: 1, a: 0} - _DetailSpecularColor: {r: 1, g: 1, b: 1, a: 0} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/Resources/material/UNFlag.mat.meta b/Assets/Resources/material/UUFlag.mat.meta similarity index 100% rename from Assets/Resources/material/UNFlag.mat.meta rename to Assets/Resources/material/UUFlag.mat.meta diff --git a/obj/Debug/.NETFramework,Version=v4.7.1.AssemblyAttributes.cs b/obj/Debug/.NETFramework,Version=v4.7.1.AssemblyAttributes.cs new file mode 100644 index 0000000..2afc031 --- /dev/null +++ b/obj/Debug/.NETFramework,Version=v4.7.1.AssemblyAttributes.cs @@ -0,0 +1,4 @@ +// +using System; +using System.Reflection; +[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.7.1", FrameworkDisplayName = ".NET Framework 4.7.1")] diff --git a/obj/Debug/Assembly-CSharp-Editor-firstpass.csproj.AssemblyReference.cache b/obj/Debug/Assembly-CSharp-Editor-firstpass.csproj.AssemblyReference.cache new file mode 100644 index 0000000..cd413c9 Binary files /dev/null and b/obj/Debug/Assembly-CSharp-Editor-firstpass.csproj.AssemblyReference.cache differ diff --git a/obj/Debug/Assembly-CSharp.csproj.AssemblyReference.cache b/obj/Debug/Assembly-CSharp.csproj.AssemblyReference.cache new file mode 100644 index 0000000..58160ab Binary files /dev/null and b/obj/Debug/Assembly-CSharp.csproj.AssemblyReference.cache differ