From 23f2db88f2ab79bc7de909dad7a8607edb4f941b Mon Sep 17 00:00:00 2001 From: Joe Anderson Date: Sat, 21 Dec 2024 11:10:50 +0000 Subject: [PATCH] Redesign lasers --- .../Training Game/Moving Static Laser.prefab | 23 +++++- .../Prefabs/Training Game/Static Laser.prefab | 67 ++++++++++++++---- Assets/images/Laser Beam.png | Bin 0 -> 4455 bytes ...aser Beam.png.meta => Laser Beam.png.meta} | 13 ++-- Assets/images/Laser Emitter Pair.png | Bin 0 -> 1893 bytes ...r.png.meta => Laser Emitter Pair.png.meta} | 13 ++-- Assets/images/Static Laser Beam.png | Bin 1440 -> 0 bytes Assets/images/Static Laser.png | Bin 1814 -> 0 bytes Assets/src/Oscillate.cs | 16 ++--- 9 files changed, 100 insertions(+), 32 deletions(-) create mode 100644 Assets/images/Laser Beam.png rename Assets/images/{Static Laser Beam.png.meta => Laser Beam.png.meta} (92%) create mode 100644 Assets/images/Laser Emitter Pair.png rename Assets/images/{Static Laser.png.meta => Laser Emitter Pair.png.meta} (92%) delete mode 100644 Assets/images/Static Laser Beam.png delete mode 100644 Assets/images/Static Laser.png 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 0000000000000000000000000000000000000000..13d8ad7b79ae35f85220bd65d0b4b17c7674a50b GIT binary patch literal 4455 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 Mr>mdKI;Vst07Q{s)&Kwi literal 0 HcmV?d00001 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 f0f9924a7f1f3f22bfabda895f942783f8b416d5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1440 zcmcgsO-vI(6rNHbSbj9(LBYei#>5!Ae?U!_b|bJ#8!a@onxcWQz!o;P-DY=5R}Uu2 z!H{TT{J9uoxR7`-#FOzZdQmarfkY3GcxZ@v13eIb-s~=IDaE7H%*>m4-}ioI-|KX= zueZ_D;z0;ChC^Zu_6C@Xb+xcw>pJuTHkTgj?M8D82Up=RFDJsuNCX`NxenF3_98ci zzz?}vP>m%cbivhHkcV7H9ZVHqSOhC-hMBynplSzy6?QyAFu{_&M-@{}r6ohvh^VF# z9MuMz>O0kzg?%7Dn{gGr&r}txHO#mR@*?06$8apqay-*cuzsFx<2(GQ^TGO4Q0>Zw z26Tk#A)@+b7kc<;KSJ(VC7v)6k+b}$nx>>NbwsAjbQW7e0h0$YEgKSHrc)W6H-n^w z;6cXMG)Y(x<8qKpM508Gs>y_pVkm|bJOn`mw6P=~6HhyII0eZG!^rY9oy+B@TpOio z<238{`)P)wInE0RuYM(CNTxTVAGVEb+7V@aR8z8sqGkweR~k_#jUY*4M}=X>X(-8} zr;P5T1qsqvL$ee^SE9+LvI7lkcBH`@71G+`%#^Y=$$AVs#sH3hABf4inwrG92q!oO z2F>C%UyRqUsGiGB37)dLn*y0!Q*G*tx_Hk zm9(7Eaef>NX;suzWG0GC79uPXOB5wUcziwrr8p)Tk|-Infa~AOa$crAj_bdJ@9267CPfGW{dEv~95VS6jv?k%>1ap(aW7jj8q+g)SbLfZ%)U~aac z;92+(nuV^M4~t##iJI@9I-8~#^m=&Z_tIOxnQFTGs;+xs?TatA@$UGUe0|l|U%lV* z(xvw=^S5`8-dcULH2%{!xFUZZWDfke|3vCMa!=}?Zh3x=`wz!IQ;Tcd$MyW4nJa06Y$EzHO;YmNj11M||% zkcg59UmvUF{9L`nl>DSry^7odkVyl#h zD=EpgRf_NpP;kyKN>wn^Gte_ovg1-vP_QXVNwW%aaf50H@@$ndN=gc>^!3Zj%k|2Q z_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUl_7?}%yCIAPA89t1Iggj1`H#(w@@srNGyP8 z0tW`fjW!?`SVab<7U$=bg8X7RRh&-qYp~RNC_K~YrvwwY-7g-)CtRic3k`> zxziXJn5;Zq978f#-_AOjC+sNDwt9KBO?g1i^dBpk!V2abVbb)FQTnJS^WcownNI;T zB!pdKCRXp-{bRLy-4PdYfWT3t*k^t=30`f-X~I=9x`!=Z~f{-&zQXfC_6z(CG7C+;*W zTkPpekDLVOseMlraapwMSVUh>?yMQ@zuWIf^Q_R)UKJ%eRo7i?@yTV(lcwKWd~9<3 zHIv!3ipMQmHaN2PC~c04PFo_#`nGI#&4GCW(*oz#bZoTdakzgj{mY}LpP${XOj3l-B!F z)z9M77lk-ZZSqt77O~xa!R5>8HNh)??flYP)M}#?)wzZX7rrsSU$}d!&33I_Q|E2h`Zb&32Y0We#P6+4 Rar;4qyQiz4%Q~loCIBk=QzQTY 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); - } - }