From 54ac57b0526e39fef014fde0085abd1900f845da Mon Sep 17 00:00:00 2001 From: Ava Gaiety Wroten Date: Thu, 18 Jun 2020 21:56:51 -0500 Subject: [PATCH] Charge point visuals --- Assets/Images/ring-inner.png | 3 + Assets/Images/ring-inner.png.meta | 92 ++++++++ Assets/Images/ring-middle.png | 3 + Assets/Images/ring-middle.png.meta | 92 ++++++++ Assets/Images/ring-outer.png | 3 + Assets/Images/ring-outer.png.meta | 92 ++++++++ Assets/Prefabs/Charge Point.prefab | 329 ++++++++++++++++++++++++++--- Assets/Scripts/ChargePoint.cs | 47 ++--- 8 files changed, 603 insertions(+), 58 deletions(-) create mode 100644 Assets/Images/ring-inner.png create mode 100644 Assets/Images/ring-inner.png.meta create mode 100644 Assets/Images/ring-middle.png create mode 100644 Assets/Images/ring-middle.png.meta create mode 100644 Assets/Images/ring-outer.png create mode 100644 Assets/Images/ring-outer.png.meta diff --git a/Assets/Images/ring-inner.png b/Assets/Images/ring-inner.png new file mode 100644 index 0000000..da6156f --- /dev/null +++ b/Assets/Images/ring-inner.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:deda210bbae7855fa59b8c0cfbe5559111181bfaf0d4ca2e83fe3dd4fafa8d52 +size 1014 diff --git a/Assets/Images/ring-inner.png.meta b/Assets/Images/ring-inner.png.meta new file mode 100644 index 0000000..a3c48c9 --- /dev/null +++ b/Assets/Images/ring-inner.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 8307603d71fb134439183cf65e8e820d +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: 0 + 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: 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: 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: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Images/ring-middle.png b/Assets/Images/ring-middle.png new file mode 100644 index 0000000..eec998b --- /dev/null +++ b/Assets/Images/ring-middle.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4846698825eac1a76ff3ea74e74210470982527f3110635566eb02ec06ff7156 +size 3375 diff --git a/Assets/Images/ring-middle.png.meta b/Assets/Images/ring-middle.png.meta new file mode 100644 index 0000000..2954f91 --- /dev/null +++ b/Assets/Images/ring-middle.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 4cf10c9933c5922449d90193cc75a0d5 +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: 0 + 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: 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: 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: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Images/ring-outer.png b/Assets/Images/ring-outer.png new file mode 100644 index 0000000..664d205 --- /dev/null +++ b/Assets/Images/ring-outer.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b744e1efebf2378dc067e0b8167c3b94af030b3048ecaacba931048a0b8d0a6f +size 5375 diff --git a/Assets/Images/ring-outer.png.meta b/Assets/Images/ring-outer.png.meta new file mode 100644 index 0000000..93ce8a6 --- /dev/null +++ b/Assets/Images/ring-outer.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: b05b9497a7900fe4e85319b044b72ecf +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: 0 + 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: 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: 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: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Charge Point.prefab b/Assets/Prefabs/Charge Point.prefab index 856d275..6e27fd7 100644 --- a/Assets/Prefabs/Charge Point.prefab +++ b/Assets/Prefabs/Charge Point.prefab @@ -25,10 +25,10 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 533259805913183039} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.001, y: 0.427, z: 0} + m_LocalPosition: {x: -0.15973234, y: 0.49040264, z: 2.8969903} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 6460630409594600935} + m_Father: {fileID: 8078302409970295304} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &8624767366122027771 @@ -106,10 +106,10 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2115639595389947858} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.441, y: 0.410388, z: 0} + m_LocalPosition: {x: 0.2822677, y: 0.47379065, z: 2.8969903} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 6460630409594600935} + m_Father: {fileID: 8078302409970295304} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &5502490108741403999 @@ -188,10 +188,10 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2145088882057884965} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.0058448613, y: -0.011204243, z: 0} + m_LocalPosition: {x: -0.1645772, y: 0.052198395, z: 2.8969903} m_LocalScale: {x: 2, y: 2, z: 1} m_Children: [] - m_Father: {fileID: 6460630409594600935} + m_Father: {fileID: 8078302409970295304} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &5538812306110336721 @@ -288,10 +288,10 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3036499615654771728} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.486, y: -0.00389719, z: 0} + m_LocalPosition: {x: -0.64473236, y: 0.059505448, z: 2.8969903} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 6460630409594600935} + m_Father: {fileID: 8078302409970295304} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &3105607526940146200 @@ -369,10 +369,10 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3652838443354060167} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.45074955, y: 0.410388, z: 0} + m_LocalPosition: {x: -0.6094819, y: 0.47379065, z: 2.8969903} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 6460630409594600935} + m_Father: {fileID: 8078302409970295304} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &1877868226631460792 @@ -450,10 +450,10 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3675907655934209244} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.45074955, y: -0.44, z: 0} + m_LocalPosition: {x: -0.6094819, y: -0.37659734, z: 2.8969903} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 6460630409594600935} + m_Father: {fileID: 8078302409970295304} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &5213464907230185837 @@ -506,6 +506,120 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &3698682414327576350 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 792061539816102330} + m_Layer: 0 + m_Name: Rings + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &792061539816102330 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3698682414327576350} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.8, y: 0.8, z: 0.8} + m_Children: + - {fileID: 1499804827103603045} + - {fileID: 3552387661451563522} + - {fileID: 3110419390413642942} + m_Father: {fileID: 6460630409594600935} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &3853660902213141176 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3552387661451563522} + - component: {fileID: 6589974153676156743} + m_Layer: 0 + m_Name: Middle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3552387661451563522 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3853660902213141176} + 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: 792061539816102330} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &6589974153676156743 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3853660902213141176} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 1480934547 + m_SortingLayer: -1 + m_SortingOrder: 10 + m_Sprite: {fileID: 21300000, guid: 4cf10c9933c5922449d90193cc75a0d5, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &4066522954635265837 GameObject: m_ObjectHideFlags: 0 @@ -531,10 +645,10 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4066522954635265837} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.49826902, y: -0.00389719, z: 0} + m_LocalPosition: {x: 0.33953667, y: 0.059505448, z: 2.8969903} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 6460630409594600935} + m_Father: {fileID: 8078302409970295304} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &5883079918801415090 @@ -612,10 +726,10 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4542086453183928819} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.441, y: -0.43999997, z: 0} + m_LocalPosition: {x: 0.2822677, y: -0.37659734, z: 2.8969903} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 6460630409594600935} + m_Father: {fileID: 8078302409970295304} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &5240500616154696878 @@ -668,6 +782,87 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &5122653595233040690 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3110419390413642942} + - component: {fileID: 5327535484520526573} + m_Layer: 0 + m_Name: Inner + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3110419390413642942 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5122653595233040690} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.002, y: 0.005, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 792061539816102330} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &5327535484520526573 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5122653595233040690} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 1480934547 + m_SortingLayer: -1 + m_SortingOrder: 10 + m_Sprite: {fileID: 21300000, guid: 8307603d71fb134439183cf65e8e820d, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &5147682121518660088 GameObject: m_ObjectHideFlags: 0 @@ -693,10 +888,10 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5147682121518660088} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.001, y: -0.456, z: 0} + m_LocalPosition: {x: -0.15973234, y: -0.39259738, z: 2.8969903} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 6460630409594600935} + m_Father: {fileID: 8078302409970295304} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &7042363659533391321 @@ -762,7 +957,6 @@ GameObject: - component: {fileID: 6460630409594600928} - component: {fileID: 5710502019638196348} - component: {fileID: 7366104516364390105} - - component: {fileID: 7527375662429560478} m_Layer: 0 m_Name: Charge Point m_TagString: Charge Point @@ -781,15 +975,8 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 7792043218584221543} - - {fileID: 1498948905889596033} - - {fileID: 7086850790961057470} - - {fileID: 2691996342777529510} - - {fileID: 9117742068069192473} - - {fileID: 7669589087037621858} - - {fileID: 7723446308647936362} - - {fileID: 746452137458552721} - - {fileID: 4887616433546186203} + - {fileID: 792061539816102330} + - {fileID: 8078302409970295304} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -810,7 +997,7 @@ BoxCollider2D: m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.5, y: 0.5} - oldSize: {x: 4, y: 4} + oldSize: {x: 1, y: 1} newSize: {x: 1, y: 1} adaptiveTilingThreshold: 0.5 drawMode: 0 @@ -832,6 +1019,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: chargesRequired: 1 + particleMultiplier: 400 + particleStartingAmount: 20 + chargedColor: {r: 0, g: 1, b: 0, a: 1} + unchargedColor: {r: 255, g: 182, b: 0, a: 1} --- !u!198 &5710502019638196348 ParticleSystem: m_ObjectHideFlags: 0 @@ -1400,7 +1591,7 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0 - maxNumParticles: 1000 + maxNumParticles: 10000 size3D: 0 rotation3D: 0 gravityModifier: @@ -5563,13 +5754,44 @@ ParticleSystemRenderer: m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} m_MaskInteraction: 0 ---- !u!212 &7527375662429560478 +--- !u!1 &7751990365253765159 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1499804827103603045} + - component: {fileID: 105965192494384718} + m_Layer: 0 + m_Name: Outer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1499804827103603045 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7751990365253765159} + 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: 792061539816102330} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &105965192494384718 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6460630409594600933} + m_GameObject: {fileID: 7751990365253765159} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -5602,8 +5824,8 @@ SpriteRenderer: m_SortingLayerID: 1480934547 m_SortingLayer: -1 m_SortingOrder: 10 - m_Sprite: {fileID: 21300000, guid: a51d30ef7dde7ad45937ac940c8d72ff, type: 3} - m_Color: {r: 1, g: 0.71440905, b: 0, a: 0} + m_Sprite: {fileID: 21300000, guid: b05b9497a7900fe4e85319b044b72ecf, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 @@ -5613,3 +5835,42 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &8246829870060127506 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8078302409970295304} + m_Layer: 0 + m_Name: Sprites + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8078302409970295304 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8246829870060127506} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.15873234, y: -0.06340264, z: -2.8969903} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 7792043218584221543} + - {fileID: 1498948905889596033} + - {fileID: 7086850790961057470} + - {fileID: 2691996342777529510} + - {fileID: 9117742068069192473} + - {fileID: 7669589087037621858} + - {fileID: 7723446308647936362} + - {fileID: 746452137458552721} + - {fileID: 4887616433546186203} + m_Father: {fileID: 6460630409594600935} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Scripts/ChargePoint.cs b/Assets/Scripts/ChargePoint.cs index 49c2df8..65a520d 100644 --- a/Assets/Scripts/ChargePoint.cs +++ b/Assets/Scripts/ChargePoint.cs @@ -5,24 +5,32 @@ using UnityEngine; public class ChargePoint : MonoBehaviour { public int chargesRequired = 1; + public float particleMultiplier = 100.0f; + public float particleStartingAmount = 20.0f; + public Color chargedColor = Color.green; + public Color unchargedColor = new Color(255, 182, 0); int charges = 0; bool charged = false; ChargeCounter chargeCounter; ParticleSystem ps; - SpriteRenderer sr; + SpriteRenderer outerRing; + SpriteRenderer middleRing; + SpriteRenderer innerRing; void Start() { chargeCounter = GameObject.FindWithTag("Charge Counter").GetComponent(); ps = GetComponent(); - sr = GetComponent(); + outerRing = transform.Find("Rings/Outer").GetComponent(); + middleRing = transform.Find("Rings/Middle").GetComponent(); + innerRing = transform.Find("Rings/Inner").GetComponent(); + VisualUpdate(); } public void adjustCharges(int amount = 1) { charges += amount; - Debug.Log("Charges is" + charges + "/" + chargesRequired); if (charges >= chargesRequired) { @@ -41,27 +49,18 @@ public class ChargePoint : MonoBehaviour void VisualUpdate() { var em = ps.emission; + Color transparent = Color.white; + transparent.a = 0; + + em.rateOverTime = (1.0f / chargesRequired * charges * particleMultiplier) + particleStartingAmount; + outerRing.color = unchargedColor; + middleRing.color = unchargedColor; + innerRing.color = unchargedColor; + if (chargesRequired < 3) innerRing.color = transparent; + if (chargesRequired < 2) middleRing.color = transparent; + if (charges >= 1) outerRing.color = chargedColor; + if (charges >= 2) middleRing.color = chargedColor; + if (charges >= 3) innerRing.color = chargedColor; - if (charges == 0) - { - em.rateOverTime = 5; - Color transparent = Color.white; - transparent.a = 0; - sr.color = transparent; - } - else if (!charged) - { - em.rateOverTime = 20; - Color orange = new Color(255, 182, 0); - orange.a = 0.1f; - sr.color = orange; - } - else - { - em.rateOverTime = 40; - Color green = Color.green; - green.a = 0.3f; - sr.color = green; - } } }