diff --git a/Assets/Unity/Prefabs/Training Game/Moving Static Laser.prefab b/Assets/Unity/Prefabs/Training Game/Moving Static Laser.prefab index 7157a086..97c3971f 100644 --- a/Assets/Unity/Prefabs/Training Game/Moving Static Laser.prefab +++ b/Assets/Unity/Prefabs/Training Game/Moving Static Laser.prefab @@ -235,6 +235,7 @@ GameObject: - component: {fileID: 5633569635942151663} - component: {fileID: 5633569635942151649} - component: {fileID: 3086422471175238755} + - component: {fileID: 8486463336291640574} m_Layer: 15 m_Name: Beam m_TagString: Untagged @@ -301,7 +302,7 @@ SpriteRenderer: m_SortingLayer: 2 m_SortingOrder: 1 m_Sprite: {fileID: 21300000, guid: dde82fa72012f48cdbac8b8d80101279, type: 3} - m_Color: {r: 0.54901963, g: 0, b: 0, a: 1} + m_Color: {r: 1, g: 0, b: 0, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 @@ -347,7 +348,7 @@ BoxCollider2D: m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.5, y: 0.5} - oldSize: {x: 0.4, y: 7} + oldSize: {x: 1.2666667, y: 7} newSize: {x: 0.4, y: 6.0666666} adaptiveTilingThreshold: 0.5 drawMode: 0 @@ -410,6 +411,24 @@ MonoBehaviour: LaserHumTransform: {fileID: 2727955123760763624} MinY: -3.5 MaxY: 3.5 +--- !u!114 &8486463336291640574 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5633569635942151661} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 68a817e8c6bf94c38be7b0ea3a19cc6a, type: 3} + m_Name: + m_EditorClassIdentifier: + Transform: {fileID: 5633569635942151662} + BaseScale: 1 + OscillationSpeed: 60 + OscillationScale: 0.1 + XAxis: 1 + YAxis: 0 --- !u!1 &5633569635997688980 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Unity/Prefabs/Training Game/Static Laser.prefab b/Assets/Unity/Prefabs/Training Game/Static Laser.prefab index 7d0a8a53..4931c148 100644 --- a/Assets/Unity/Prefabs/Training Game/Static Laser.prefab +++ b/Assets/Unity/Prefabs/Training Game/Static Laser.prefab @@ -13,6 +13,7 @@ GameObject: - component: {fileID: 3067488481799572040} - component: {fileID: 3067488481799572041} - component: {fileID: 1202314657713874280} + - component: {fileID: 2647012434572189458} m_Layer: 15 m_Name: Beam m_TagString: Untagged @@ -27,6 +28,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3067488481799572045} + serializedVersion: 2 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} @@ -35,7 +37,6 @@ Transform: - {fileID: 6005183075563472532} - {fileID: 3901073867738938440} m_Father: {fileID: 3067488481852135619} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &3067488481799572043 SpriteRenderer: @@ -79,7 +80,7 @@ SpriteRenderer: m_SortingLayer: 2 m_SortingOrder: 1 m_Sprite: {fileID: 21300000, guid: dde82fa72012f48cdbac8b8d80101279, type: 3} - m_Color: {r: 0, g: 0.30588236, b: 0.78039217, a: 1} + m_Color: {r: 0, g: 0.39215687, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 @@ -99,6 +100,25 @@ BoxCollider2D: m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 @@ -106,7 +126,7 @@ BoxCollider2D: m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.5, y: 0.5} - oldSize: {x: 0.4, y: 7} + oldSize: {x: 1.2666667, y: 7} newSize: {x: 0.4, y: 6.0666666} adaptiveTilingThreshold: 0.5 drawMode: 0 @@ -167,9 +187,26 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: LaserHumTransform: {fileID: 6005183075563472532} - AudioLowPassFilter: {fileID: 4413527252640353038} MinY: -3.5 MaxY: 3.5 +--- !u!114 &2647012434572189458 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3067488481799572045} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 68a817e8c6bf94c38be7b0ea3a19cc6a, type: 3} + m_Name: + m_EditorClassIdentifier: + Transform: {fileID: 3067488481799572042} + BaseScale: 1 + OscillationSpeed: 60 + OscillationScale: 0.1 + XAxis: 1 + YAxis: 0 --- !u!1 &3067488481852135618 GameObject: m_ObjectHideFlags: 0 @@ -194,6 +231,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3067488481852135618} + serializedVersion: 2 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} @@ -201,7 +239,6 @@ Transform: m_Children: - {fileID: 3067488481799572042} m_Father: {fileID: 3067488482230891370} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &3067488481852135616 SpriteRenderer: @@ -278,6 +315,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3067488482230891372} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 5.4333, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -287,7 +325,6 @@ Transform: - {fileID: 3067488481852135619} - {fileID: 3067488482870971722} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &3067488482870971725 GameObject: @@ -313,13 +350,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3067488482870971725} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 1.1833, y: 0, z: 2.5009727} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3067488482230891370} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &3067488482870971723 SpriteRenderer: @@ -397,13 +434,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3067488483275559858} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -1.216666, y: 0, z: 2.5009727} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3067488482230891370} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &3067488483275559856 SpriteRenderer: @@ -462,6 +499,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 3067488481799572042} m_Modifications: - target: {fileID: 1186061867552009996, guid: 583bbe636a139433d854b0ad783de470, @@ -525,6 +563,9 @@ PrefabInstance: value: Laser Damage objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 583bbe636a139433d854b0ad783de470, type: 3} --- !u!114 &3374771667547269398 stripped MonoBehaviour: @@ -549,6 +590,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 3067488481799572042} m_Modifications: - target: {fileID: 1504687451264260564, guid: da5610c3757554b9ba970e31cb5a5187, @@ -612,13 +654,10 @@ PrefabInstance: value: Laser Hum objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: da5610c3757554b9ba970e31cb5a5187, type: 3} ---- !u!169 &4413527252640353038 stripped -AudioLowPassFilter: - m_CorrespondingSourceObject: {fileID: 8829576262920721486, guid: da5610c3757554b9ba970e31cb5a5187, - type: 3} - m_PrefabInstance: {fileID: 5167611688005803840} - m_PrefabAsset: {fileID: 0} --- !u!4 &6005183075563472532 stripped Transform: m_CorrespondingSourceObject: {fileID: 1504687451264260564, guid: da5610c3757554b9ba970e31cb5a5187, diff --git a/Assets/images/Laser Beam.png b/Assets/images/Laser Beam.png new file mode 100644 index 00000000..13d8ad7b Binary files /dev/null and b/Assets/images/Laser Beam.png differ diff --git a/Assets/images/Static Laser Beam.png.meta b/Assets/images/Laser Beam.png.meta similarity index 92% rename from Assets/images/Static Laser Beam.png.meta rename to Assets/images/Laser Beam.png.meta index bb9ad6fb..b16a5cc5 100644 --- a/Assets/images/Static Laser Beam.png.meta +++ b/Assets/images/Laser Beam.png.meta @@ -3,7 +3,7 @@ guid: dde82fa72012f48cdbac8b8d80101279 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 11 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -20,11 +20,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 - ignoreMasterTextureLimit: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -63,6 +64,8 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -74,6 +77,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -86,6 +90,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -98,6 +103,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -114,9 +120,8 @@ TextureImporter: weights: [] secondaryTextures: [] nameFileIdTable: {} - spritePackingTag: + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/images/Laser Emitter Pair.png b/Assets/images/Laser Emitter Pair.png new file mode 100644 index 00000000..31b975d1 Binary files /dev/null and b/Assets/images/Laser Emitter Pair.png differ diff --git a/Assets/images/Static Laser.png.meta b/Assets/images/Laser Emitter Pair.png.meta similarity index 92% rename from Assets/images/Static Laser.png.meta rename to Assets/images/Laser Emitter Pair.png.meta index d013dbb4..34a9e035 100644 --- a/Assets/images/Static Laser.png.meta +++ b/Assets/images/Laser Emitter Pair.png.meta @@ -3,7 +3,7 @@ guid: 6bb718fdcfd1543b88e29b396de80638 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 11 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -20,11 +20,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 - ignoreMasterTextureLimit: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -63,6 +64,8 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -74,6 +77,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -86,6 +90,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -98,6 +103,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -114,9 +120,8 @@ TextureImporter: weights: [] secondaryTextures: [] nameFileIdTable: {} - spritePackingTag: + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/images/Static Laser Beam.png b/Assets/images/Static Laser Beam.png deleted file mode 100644 index f0f9924a..00000000 Binary files a/Assets/images/Static Laser Beam.png and /dev/null differ diff --git a/Assets/images/Static Laser.png b/Assets/images/Static Laser.png deleted file mode 100644 index aa5ebca5..00000000 Binary files a/Assets/images/Static Laser.png and /dev/null differ diff --git a/Assets/src/Oscillate.cs b/Assets/src/Oscillate.cs index 50302614..66b9bb5e 100644 --- a/Assets/src/Oscillate.cs +++ b/Assets/src/Oscillate.cs @@ -8,19 +8,19 @@ public class Oscillate : MonoBehaviour { public float BaseScale; public float OscillationSpeed; public float OscillationScale; + public bool XAxis = true, YAxis = true; void Update() { if (TestMode.Enabled) return; + + float t = Mathf.Sin(Time.time * OscillationSpeed); + float scale = BaseScale + (t * OscillationScale); + Transform.localScale = new Vector3( - Scale(), - Scale() + XAxis ? scale : 1f, + YAxis ? scale : 1f, + 1f ); } - - float Scale() { - var sine = (float)Math.Sin(Time.time * OscillationSpeed); - return BaseScale + (sine * OscillationScale); - } - }