From 396eb541c8fb6298dc05f1f4d8ae410ea019467e Mon Sep 17 00:00:00 2001 From: bitsandfoxes Date: Thu, 21 Aug 2025 17:06:48 +0200 Subject: [PATCH 1/4] Added mobile controls --- Assets/Graphics/Sprites/Direction.png | Bin 0 -> 282 bytes Assets/Graphics/Sprites/Direction.png.meta | 182 ++++ Assets/Graphics/Sprites/UI/Circle.png | Bin 0 -> 1916 bytes Assets/Graphics/Sprites/UI/Circle.png.meta | 182 ++++ Assets/Graphics/Sprites/UI/Ring.png | Bin 0 -> 2174 bytes Assets/Graphics/Sprites/UI/Ring.png.meta | 182 ++++ Assets/Scenes/BattleScene.unity | 985 ++++++++++++++---- Assets/Scripts/UI/FloatingOnScreenStick.cs | 70 ++ .../Scripts/UI/FloatingOnScreenStick.cs.meta | 2 + Assets/Scripts/UI/MobileControls.cs | 22 + Assets/Scripts/UI/MobileControls.cs.meta | 2 + .../Settings/InputSystem_Actions.inputactions | 305 +----- ProjectSettings/ProjectSettings.asset | 68 +- 13 files changed, 1488 insertions(+), 512 deletions(-) create mode 100644 Assets/Graphics/Sprites/Direction.png create mode 100644 Assets/Graphics/Sprites/Direction.png.meta create mode 100644 Assets/Graphics/Sprites/UI/Circle.png create mode 100644 Assets/Graphics/Sprites/UI/Circle.png.meta create mode 100644 Assets/Graphics/Sprites/UI/Ring.png create mode 100644 Assets/Graphics/Sprites/UI/Ring.png.meta create mode 100644 Assets/Scripts/UI/FloatingOnScreenStick.cs create mode 100644 Assets/Scripts/UI/FloatingOnScreenStick.cs.meta create mode 100644 Assets/Scripts/UI/MobileControls.cs create mode 100644 Assets/Scripts/UI/MobileControls.cs.meta diff --git a/Assets/Graphics/Sprites/Direction.png b/Assets/Graphics/Sprites/Direction.png new file mode 100644 index 0000000000000000000000000000000000000000..732c143cb8afa20791cc09505ad98be5e2cc6127 GIT binary patch literal 282 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|u6VjQhE&XX zd(B$tumX>3;KaZ0XPW43IBw_|ueNhJyX|QM4;G*@WFR0o@m}@%b00d@Zfoyy*mkwY zoA-z7Dz-NjLR)4|le!RFnB@A^{dm*W<%edu%GR~3RiqfO?w8xU z#;xL-Df_v+rgGcu8!q;C+_E=W(qWr%WZv?XTqPh34~_sh=;`1CQk!DRDB)9Mvk^B=g03a8$bi8po4TPnY*_`&?Wj2a)S UeyrIY5ddmdKI;Vst0GxMnpa1{> literal 0 HcmV?d00001 diff --git a/Assets/Graphics/Sprites/Direction.png.meta b/Assets/Graphics/Sprites/Direction.png.meta new file mode 100644 index 00000000..a078c2d3 --- /dev/null +++ b/Assets/Graphics/Sprites/Direction.png.meta @@ -0,0 +1,182 @@ +fileFormatVersion: 2 +guid: 37e3015ddcf9c4d9c99676a2558c3e0a +TextureImporter: + internalIDToNameTable: + - first: + 213: 7778766740815000049 + second: Direction_0 + externalObjects: {} + serializedVersion: 13 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 32 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: iOS + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: Direction_0 + rect: + serializedVersion: 2 + x: 6 + y: 1 + width: 52 + height: 41 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 1f1b6e8132bb3fb60800000000000000 + internalID: 7778766740815000049 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + Direction_0: 7778766740815000049 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Graphics/Sprites/UI/Circle.png b/Assets/Graphics/Sprites/UI/Circle.png new file mode 100644 index 0000000000000000000000000000000000000000..40fdb3dfe5bbc9920c5bab1a32be30356bcce991 GIT binary patch literal 1916 zcmah~X;2eq82+*eNq|5Sv<>A5l*8DeKoCSZbh$*l2wLkwu?+#GRU)Cx$WcfFi69y( z#a6*VgQIP!S_eE3imjoc)d+%}LP0r9Y6TS<7C91ONxGZhpH64`Yv1Sj-uHQ)Z+Ba(wfnA^t5HMecR$@Ym?v%vfKI^0si`(8y?xKRlA& z#YS>%+f&e8MAxEzgVW*cSE=O2dkqu5c4>(B;02*p;zc!xehW;0W?;(3njdh2rze=Q zoR($|cY2f|d(u)z37YP6lBG2t$y#AFIF%Th^8&fkX-=}y7Cw(_%wd!)q}039Oto@t zM!U3=51j zG(z}xefVy5H+u`Se)U#ax1UQ)18VCc9&Rikom>+p>;7VgLt7PRuQ5!0l(|bUr@;5fdK7=m_YPE%<`qEh7>3b*1^dM9$NYO6Q* zujseLJ3<7c(g;s=_r3UIsw7I9@e}SgQfU}N%{#Hxi`yRUEOx126c5l<$nWEN>fqed zQV)HFO88NxQFpV|OVn}7MQj{!XBtOe1d@Ku&d(lP&>h&BMK~p{(UmFpyj9%s(_KU@ z-nmW{0hS-yuopYd-pSCK{2n}rsOP&B(p-=EGlNG0>~VfT7C*0#9M!*U1-F@IDTv?pXkjg@c)KE9m_h1BOluXx*gK)2I4d zZTdl7HHd25bD(6#W8~Uskctd`5x*;Mg*(T-^~V7T94%^P?=q)~AFm-Vb_ebxj=`6o zT)G2X!O|sQ`Rwy#{zBPI;jA+r4g$ZJl5H=W8?L|}#7vO1*=k{4L(emn%@h^V7n?9; zTd;I~Vy~1Xeeh(`>w(n`<1oo4-w#2|dEr2))nVCdnIMA2Ak<6-1rII4i;PtboBVg{ z{~t8@mYY|B>4#0iYlNu(kjwlGZM$tFWe+q7%N@W)Ye38I`EsDdIc}C%C(RWo5=T7es5kBn19LioOA|$#{COC?A2`n zb^SMwgYr9|`eE*vL_n18$KI~EkdzQfRw=~E<|VFR`@ju?PZOxtoNayGa0s^Ol0WM+ zx06Bd*+;rI+sLP8w4BI-dn*q{CA zoJA$rJ>S4fq(*r`qSEta@FW%VCO*WoxII_2NA_q_$%-g!tnT+AwUXu}jUzo<@iW39+ITVv;ffWghL5-1 zs0cwdQoLGO5sGT+ESzFBs!>@uML4R_;#EsUB&s3dRanJZRO4geI=QGO&cbzKdg*x8 zcpuY~<5kdoOz(n)>%{ch33&`iA2OzeHy0svFO~Z~4^#RVz{g8c?1o?Jhq@$yE_x%cZ%O!;SP!%0U?wIoewWzhkSCF&fsZwQx`E zGmJa)jgDtWL_A4_J)uVWSDXb;$md73@=J;~ni{^6Zi-#7F(y#MozcfBM|jk>(=^lL zl*%k>n+wgcQ*mhVV=R1-mFzba)40oB#9LXBrA`k_}n%S%g&lr)vOhRK# zk^~~hSV<&nI$eOUV(`|i@J4RU?;nf=6sid5j zV#;n@NoHC$cnxewfSEvxVn{ah%x7`qnAM;A zu>N%1N!(zniT6482=%rvrB=S;t;spK16iI${@=DW<6#AjrhDv<18FZj?|OX+GGagO zkmeaL-fAfosiQSp{H-u0Y^XM#ptFrp#K)wB5|lp}tSt;KAuInZJxnpgwB5U-Ow;|a zr+@i!TWrtAV+?Yq_D?Jcoy0vf)v1ppUR$2dxu~nND3xM#_b6k+c3o_>?80G+^zy6c zZr<{4xn>5R-?N`kyAS(|A1z1^oROJc2I6+^5;WqX`YYf zqn{n)R!_5RB+z4a!C0y2xct6>H?xWdY6$BaxPH-9inXH>;Rr`UZa^esK> z2Vn+6SdaV@vAwEqeOyB{z`;4&!GQIqlRDfF!r;#C?+VtDX@#WS=^(Sn>{H_m@>Y^ZJ9jJ+3THOMi`q8gE;^ryO1XLmd5>Xtq zW?YmS`H+*Z6f8n(+<^vPG0lA|8{jU#C?=$QP6Fyj25%$d3fknO75E-Hh2-H~K!WoL zN_g0m>o2Uo)s!B=^tA^EDfV!^Ei>IZY01@TXLtZVwtUn1t3do80zl{Wv9P48dT3snN}}EE3aXALqo`eMyK@u2c8dn0sp4xi9N~}8e&~IT(2*v{_{L! z<2;=B~gOUIW31D1tmcG#{bxTekNvR~Bj$yq7Toi+_oZS*Z0bxNv`0F*O25 zVCwlMAtCKv>*<7W!0U|5fOBM3OO zGt*5Cg(^j{6f2)T=s<3M1TJuQ#5{RzL3m6F9DVi@4;{&zFFXK28!_!)c)6_s1w4;A zCkxhqwUbW@xn@CIWA)|#>PlaE*gl$GYbX?|C?4oqa7w`Kx;lSFt+_jUkHEutGDj9H zmovtxqITqOob zpi|iqW5(anKmw!6uKQe-pm)QwB%3tW$>u5sW)lj38cT;w!MH-_jB67x=fd zi^KsJM0F8E9TgW5m6a7s@bhll!4;2rg;t%UMZQ$oU=F5ys|P< zqHRq7`{erZ!t;)EETuS%W2t^`GDzs#p?00+j}s#*hR;}PGr!r-w)oq9@9Ma4AioFG zkoP{O+b!3{>5KYv((uV)M%syUCLMWSEUEZ@y5sjKqnq^+H(Kyl>Su41OqiK4hd-{J z_mjN}UT5fj2w560oK#(Sdav;BExzs4DYVrVikNHe@YE!-ps&d^S(aP+?yr>a>A$-p z`y5cXlH$URlv@jbN_!!Ai3E2!g`tb7NP;!N^SF8ap zq#9Ra*IchEbbO4mchoOw@nG>DvrOyCB>L+N;ae6i?_`P+_y2?Xf=(SnQBjZ3OwBUm zmc4Pi%g!$02QJIUt_qix4p<|C| literal 0 HcmV?d00001 diff --git a/Assets/Graphics/Sprites/UI/Ring.png.meta b/Assets/Graphics/Sprites/UI/Ring.png.meta new file mode 100644 index 00000000..dd4d72d6 --- /dev/null +++ b/Assets/Graphics/Sprites/UI/Ring.png.meta @@ -0,0 +1,182 @@ +fileFormatVersion: 2 +guid: a9b5f7e141902454a82a628f31cead2e +TextureImporter: + internalIDToNameTable: + - first: + 213: 4004708080983207187 + second: Ring_0 + externalObjects: {} + serializedVersion: 13 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + 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 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: iOS + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: Ring_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 256 + height: 256 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 31de32428c4939730800000000000000 + internalID: 4004708080983207187 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + Ring_0: 4004708080983207187 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/BattleScene.unity b/Assets/Scenes/BattleScene.unity index 8e71e518..24d23be4 100644 --- a/Assets/Scenes/BattleScene.unity +++ b/Assets/Scenes/BattleScene.unity @@ -119,68 +119,105 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1001 &1511250 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 2050277062} - m_Modifications: - - target: {fileID: 3306419623360918530, guid: 6cde6a2c228dc40d0b42ba0b19ca2fc3, type: 3} - propertyPath: m_Name - value: NotHotDogPickup - objectReference: {fileID: 0} - - target: {fileID: 5054089494736014737, guid: 6cde6a2c228dc40d0b42ba0b19ca2fc3, type: 3} - propertyPath: m_LocalPosition.x - value: -1.25315 - objectReference: {fileID: 0} - - target: {fileID: 5054089494736014737, guid: 6cde6a2c228dc40d0b42ba0b19ca2fc3, type: 3} - propertyPath: m_LocalPosition.y - value: -1.73883 - objectReference: {fileID: 0} - - target: {fileID: 5054089494736014737, guid: 6cde6a2c228dc40d0b42ba0b19ca2fc3, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5054089494736014737, guid: 6cde6a2c228dc40d0b42ba0b19ca2fc3, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5054089494736014737, guid: 6cde6a2c228dc40d0b42ba0b19ca2fc3, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5054089494736014737, guid: 6cde6a2c228dc40d0b42ba0b19ca2fc3, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5054089494736014737, guid: 6cde6a2c228dc40d0b42ba0b19ca2fc3, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5054089494736014737, guid: 6cde6a2c228dc40d0b42ba0b19ca2fc3, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5054089494736014737, guid: 6cde6a2c228dc40d0b42ba0b19ca2fc3, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5054089494736014737, guid: 6cde6a2c228dc40d0b42ba0b19ca2fc3, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 6cde6a2c228dc40d0b42ba0b19ca2fc3, type: 3} --- !u!4 &12107553 stripped Transform: m_CorrespondingSourceObject: {fileID: 3600334310735166755, guid: ce6ca319e4496403782aea5ae869c333, type: 3} m_PrefabInstance: {fileID: 854700013} m_PrefabAsset: {fileID: 0} +--- !u!1 &58301854 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 58301855} + - component: {fileID: 58301858} + - component: {fileID: 58301857} + - component: {fileID: 58301856} + m_Layer: 5 + m_Name: Move + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &58301855 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 58301854} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 943254751} + - {fileID: 1542384663} + m_Father: {fileID: 1036535424} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: -135} + m_SizeDelta: {x: 800, y: -135} + m_Pivot: {x: 0, y: 1} +--- !u!114 &58301856 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 58301854} + 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: 0} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + 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 &58301857 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 58301854} + m_CullTransparentMesh: 1 +--- !u!114 &58301858 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 58301854} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0f879836f87f64a5384590e43ce550ad, type: 3} + m_Name: + m_EditorClassIdentifier: + _movementRange: 50 + _stickTransform: {fileID: 943254751} + _ringTransform: {fileID: 1542384663} + _controlPath: /leftStick --- !u!1 &120418087 GameObject: m_ObjectHideFlags: 0 @@ -314,7 +351,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 300, y: 217} + m_AnchoredPosition: {x: 300, y: 130} m_SizeDelta: {x: 300, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &170557573 @@ -660,6 +697,10 @@ PrefabInstance: propertyPath: m_Name value: Enemy (2) objectReference: {fileID: 0} + - target: {fileID: 1001074756204391216, guid: ce6ca319e4496403782aea5ae869c333, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3600334310735166755, guid: ce6ca319e4496403782aea5ae869c333, type: 3} propertyPath: m_LocalScale.x value: 1 @@ -840,7 +881,7 @@ MonoBehaviour: m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 - m_ActiveFontFeatures: 00000000 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 1 checkPaddingRequired: 0 m_isRichText: 1 @@ -1071,68 +1112,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 451191727} m_CullTransparentMesh: 1 ---- !u!1001 &465467120 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 2050277062} - m_Modifications: - - target: {fileID: 3306419623360918530, guid: 6cde6a2c228dc40d0b42ba0b19ca2fc3, type: 3} - propertyPath: m_Name - value: NotHotDogPickup (1) - objectReference: {fileID: 0} - - target: {fileID: 5054089494736014737, guid: 6cde6a2c228dc40d0b42ba0b19ca2fc3, type: 3} - propertyPath: m_LocalPosition.x - value: 15.76 - objectReference: {fileID: 0} - - target: {fileID: 5054089494736014737, guid: 6cde6a2c228dc40d0b42ba0b19ca2fc3, type: 3} - propertyPath: m_LocalPosition.y - value: -1.25 - objectReference: {fileID: 0} - - target: {fileID: 5054089494736014737, guid: 6cde6a2c228dc40d0b42ba0b19ca2fc3, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5054089494736014737, guid: 6cde6a2c228dc40d0b42ba0b19ca2fc3, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5054089494736014737, guid: 6cde6a2c228dc40d0b42ba0b19ca2fc3, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5054089494736014737, guid: 6cde6a2c228dc40d0b42ba0b19ca2fc3, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5054089494736014737, guid: 6cde6a2c228dc40d0b42ba0b19ca2fc3, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5054089494736014737, guid: 6cde6a2c228dc40d0b42ba0b19ca2fc3, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5054089494736014737, guid: 6cde6a2c228dc40d0b42ba0b19ca2fc3, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5054089494736014737, guid: 6cde6a2c228dc40d0b42ba0b19ca2fc3, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 6cde6a2c228dc40d0b42ba0b19ca2fc3, type: 3} ---- !u!4 &465467121 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 5054089494736014737, guid: 6cde6a2c228dc40d0b42ba0b19ca2fc3, type: 3} - m_PrefabInstance: {fileID: 465467120} - m_PrefabAsset: {fileID: 0} --- !u!1001 &468660170 PrefabInstance: m_ObjectHideFlags: 0 @@ -1145,6 +1124,10 @@ PrefabInstance: propertyPath: m_Name value: Enemy (4) objectReference: {fileID: 0} + - target: {fileID: 1001074756204391216, guid: ce6ca319e4496403782aea5ae869c333, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3600334310735166755, guid: ce6ca319e4496403782aea5ae869c333, type: 3} propertyPath: m_LocalScale.x value: 1 @@ -1210,6 +1193,10 @@ PrefabInstance: propertyPath: m_Name value: Enemy (5) objectReference: {fileID: 0} + - target: {fileID: 1001074756204391216, guid: ce6ca319e4496403782aea5ae869c333, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3600334310735166755, guid: ce6ca319e4496403782aea5ae869c333, type: 3} propertyPath: m_LocalScale.x value: 1 @@ -7705,6 +7692,95 @@ Rigidbody2D: m_SleepingMode: 1 m_CollisionDetection: 0 m_Constraints: 0 +--- !u!1 &607887404 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 607887405} + - component: {fileID: 607887406} + - component: {fileID: 607887407} + - component: {fileID: 607887408} + m_Layer: 5 + m_Name: Pause + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &607887405 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 607887404} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1036535424} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 135} + m_Pivot: {x: 0.5, y: 1} +--- !u!114 &607887406 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 607887404} + 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: 0} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + 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 &607887407 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 607887404} + m_CullTransparentMesh: 1 +--- !u!114 &607887408 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 607887404} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6d54531977ecb194c95e2d3aa7a5d72a, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ControlPath: /escape --- !u!1 &619394800 GameObject: m_ObjectHideFlags: 0 @@ -7896,6 +7972,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1356383841} + - {fileID: 1036535424} - {fileID: 955496694} - {fileID: 1608051142} - {fileID: 1976005132} @@ -7904,7 +7981,6 @@ RectTransform: - {fileID: 1213143404} - {fileID: 2111087226} - {fileID: 1932945647} - - {fileID: 1394716926} - {fileID: 1730555520} - {fileID: 170557572} m_Father: {fileID: 0} @@ -7955,6 +8031,10 @@ PrefabInstance: propertyPath: m_Name value: Enemy (3) objectReference: {fileID: 0} + - target: {fileID: 1001074756204391216, guid: ce6ca319e4496403782aea5ae869c333, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3600334310735166755, guid: ce6ca319e4496403782aea5ae869c333, type: 3} propertyPath: m_LocalScale.x value: 1 @@ -9982,6 +10062,100 @@ Rigidbody2D: m_SleepingMode: 1 m_CollisionDetection: 0 m_Constraints: 0 +--- !u!1 &752410143 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 752410144} + - component: {fileID: 752410147} + - component: {fileID: 752410146} + - component: {fileID: 752410145} + m_Layer: 5 + m_Name: Look + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &752410144 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 752410143} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1671041760} + - {fileID: 1693333743} + m_Father: {fileID: 1036535424} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -135} + m_SizeDelta: {x: 800, y: -135} + m_Pivot: {x: 1, y: 1} +--- !u!114 &752410145 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 752410143} + 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: 0} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + 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 &752410146 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 752410143} + m_CullTransparentMesh: 1 +--- !u!114 &752410147 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 752410143} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0f879836f87f64a5384590e43ce550ad, type: 3} + m_Name: + m_EditorClassIdentifier: + _movementRange: 50 + _stickTransform: {fileID: 1671041760} + _ringTransform: {fileID: 1693333743} + _controlPath: /rightStick --- !u!1001 &774712748 PrefabInstance: m_ObjectHideFlags: 0 @@ -9994,6 +10168,10 @@ PrefabInstance: propertyPath: m_Name value: Enemy (1) objectReference: {fileID: 0} + - target: {fileID: 1001074756204391216, guid: ce6ca319e4496403782aea5ae869c333, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3600334310735166755, guid: ce6ca319e4496403782aea5ae869c333, type: 3} propertyPath: m_LocalScale.x value: 1 @@ -10111,6 +10289,10 @@ PrefabInstance: propertyPath: m_Name value: Enemy (6) objectReference: {fileID: 0} + - target: {fileID: 1001074756204391216, guid: ce6ca319e4496403782aea5ae869c333, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3600334310735166755, guid: ce6ca319e4496403782aea5ae869c333, type: 3} propertyPath: m_LocalScale.x value: 1 @@ -10285,6 +10467,138 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 856302570} m_CullTransparentMesh: 1 +--- !u!1001 &928173567 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2050277062} + m_Modifications: + - target: {fileID: 3306419623360918530, guid: 6cde6a2c228dc40d0b42ba0b19ca2fc3, type: 3} + propertyPath: m_Name + value: NotHotDogPickup + objectReference: {fileID: 0} + - target: {fileID: 5054089494736014737, guid: 6cde6a2c228dc40d0b42ba0b19ca2fc3, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5054089494736014737, guid: 6cde6a2c228dc40d0b42ba0b19ca2fc3, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5054089494736014737, guid: 6cde6a2c228dc40d0b42ba0b19ca2fc3, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5054089494736014737, guid: 6cde6a2c228dc40d0b42ba0b19ca2fc3, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5054089494736014737, guid: 6cde6a2c228dc40d0b42ba0b19ca2fc3, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5054089494736014737, guid: 6cde6a2c228dc40d0b42ba0b19ca2fc3, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5054089494736014737, guid: 6cde6a2c228dc40d0b42ba0b19ca2fc3, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5054089494736014737, guid: 6cde6a2c228dc40d0b42ba0b19ca2fc3, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5054089494736014737, guid: 6cde6a2c228dc40d0b42ba0b19ca2fc3, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5054089494736014737, guid: 6cde6a2c228dc40d0b42ba0b19ca2fc3, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6cde6a2c228dc40d0b42ba0b19ca2fc3, type: 3} +--- !u!1 &943254750 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 943254751} + - component: {fileID: 943254754} + - component: {fileID: 943254753} + m_Layer: 5 + m_Name: Stick + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &943254751 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 943254750} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 58301855} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 150, y: 135} + m_SizeDelta: {x: 90, y: 90} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &943254753 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 943254750} + m_CullTransparentMesh: 1 +--- !u!114 &943254754 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 943254750} + 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: 0.5019608} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: -2413806693520163455, guid: 020c7234c09e5469ca30098748f7a9a2, 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!1 &955496693 GameObject: m_ObjectHideFlags: 0 @@ -10509,11 +10823,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7445bbf6e7dae43f5b79872980c8e394, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!4 &995823417 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 5054089494736014737, guid: 6cde6a2c228dc40d0b42ba0b19ca2fc3, type: 3} - m_PrefabInstance: {fileID: 1511250} - m_PrefabAsset: {fileID: 0} --- !u!1 &996256049 GameObject: m_ObjectHideFlags: 0 @@ -10549,6 +10858,58 @@ Transform: - {fileID: 441343834} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1036535423 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1036535424} + - component: {fileID: 1036535425} + m_Layer: 5 + m_Name: Mobile Controls + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1036535424 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1036535423} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 607887405} + - {fileID: 58301855} + - {fileID: 752410144} + m_Father: {fileID: 715298358} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1036535425 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1036535423} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b3f45b93ee1dc4bdf94a4bbdb582f3f9, type: 3} + m_Name: + m_EditorClassIdentifier: + _forceEnable: 0 --- !u!1 &1101724733 GameObject: m_ObjectHideFlags: 0 @@ -11081,12 +11442,14 @@ MonoBehaviour: _mantisEnemyPrefab: {fileID: 1001074756204391216, guid: 5cf322e9a8a9b4558a6ff0eb1fe01569, type: 3} _deathEnemyPrefab: {fileID: 1001074756204391216, guid: b5ed0a0f1681f414cb7f4e96615eff9e, type: 3} _linearEnemyPrefab: {fileID: 1001074756204391216, guid: 13615944a37654f909032747ae273c6a, type: 3} + _randomEnemyPrefab: {fileID: 1001074756204391216, guid: 573b9f62ade4c4885a9382ccb4276bda, type: 3} _pickupPrefabs: - {fileID: 3306419623360918530, guid: a183b145bbc554a52aae5bc71fb06d98, type: 3} - {fileID: 3306419623360918530, guid: 3ef75a713fc044582be99ff13e620184, type: 3} - {fileID: 3306419623360918530, guid: a52115208a32b485e8a9cf76bda0d02b, type: 3} - {fileID: 3306419623360918530, guid: 6a6fc5df2c0c74e1581dfb8507d41f99, type: 3} - {fileID: 3306419623360918530, guid: c62e469089fde4fc98d1c3363f2ea177, type: 3} + - {fileID: 3306419623360918530, guid: d109130e8f6de4b86a470d567292aa28, type: 3} - {fileID: 3306419623360918530, guid: 6cde6a2c228dc40d0b42ba0b19ca2fc3, type: 3} _levelUpUI: {fileID: 3736684284675310825} _activePickupsUI: {fileID: 1213143406} @@ -11209,17 +11572,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1394716925} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 502204858} - m_Father: {fileID: 715298358} + m_Father: {fileID: 1932945647} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -520} + m_AnchoredPosition: {x: 0, y: -201} m_SizeDelta: {x: 960, y: 280} m_Pivot: {x: 0.5, y: 1} --- !u!114 &1394716927 @@ -11343,7 +11706,7 @@ MonoBehaviour: m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 - m_ActiveFontFeatures: 00000000 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 @@ -11385,6 +11748,10 @@ PrefabInstance: propertyPath: m_Name value: Enemy (7) objectReference: {fileID: 0} + - target: {fileID: 1001074756204391216, guid: ce6ca319e4496403782aea5ae869c333, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3600334310735166755, guid: ce6ca319e4496403782aea5ae869c333, type: 3} propertyPath: m_LocalScale.x value: 1 @@ -32081,6 +32448,81 @@ Tilemap: e31: 0 e32: 0 e33: 1 +--- !u!1 &1542384662 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1542384663} + - component: {fileID: 1542384665} + - component: {fileID: 1542384664} + m_Layer: 5 + m_Name: Ring + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1542384663 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1542384662} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 58301855} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 150, y: 135} + m_SizeDelta: {x: 195, y: 195} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1542384664 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1542384662} + m_CullTransparentMesh: 1 +--- !u!114 &1542384665 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1542384662} + 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: 0.5019608} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 4004708080983207187, guid: a9b5f7e141902454a82a628f31cead2e, 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!1 &1557932949 GameObject: m_ObjectHideFlags: 0 @@ -32398,34 +32840,6 @@ MonoBehaviour: m_Calls: [] m_ActionId: 6b444451-8a00-4d00-a97e-f47457f736a8 m_ActionName: Player/Look - - m_PersistentCalls: - m_Calls: [] - m_ActionId: 6c2ab1b8-8984-453a-af3d-a3c78ae1679a - m_ActionName: 'Player/Attack[/Mouse/leftButton,/Keyboard/enter]' - - m_PersistentCalls: - m_Calls: [] - m_ActionId: 852140f2-7766-474d-8707-702459ba45f3 - m_ActionName: 'Player/Interact[/Keyboard/e]' - - m_PersistentCalls: - m_Calls: [] - m_ActionId: 27c5f898-bc57-4ee1-8800-db469aca5fe3 - m_ActionName: 'Player/Crouch[/Keyboard/c]' - - m_PersistentCalls: - m_Calls: [] - m_ActionId: f1ba0d36-48eb-4cd5-b651-1c94a6531f70 - m_ActionName: 'Player/Jump[/Keyboard/space]' - - m_PersistentCalls: - m_Calls: [] - m_ActionId: 2776c80d-3c14-4091-8c56-d04ced07a2b0 - m_ActionName: 'Player/Previous[/Keyboard/1]' - - m_PersistentCalls: - m_Calls: [] - m_ActionId: b7230bb6-fc9b-4f52-8b25-f5e19cb2c2ba - m_ActionName: 'Player/Next[/Keyboard/2]' - - m_PersistentCalls: - m_Calls: [] - m_ActionId: 641cd816-40e6-41b4-8c3d-04687c349290 - m_ActionName: 'Player/Sprint[/Keyboard/leftShift]' - m_PersistentCalls: m_Calls: [] m_ActionId: 61490661-390c-466a-9503-730f52fa6da1 @@ -32538,6 +32952,10 @@ MonoBehaviour: m_CallState: 2 m_ActionId: d73633e2-7db7-450f-b3b4-8d94702600bf m_ActionName: 'UI/Pause[/Keyboard/escape]' + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 31c46e70-d308-4c62-ac8b-c11d56939cc9 + m_ActionName: 'Player/Tap[/Device Simulator Touchscreen/press]' m_NeverAutoSwitchControlSchemes: 0 m_DefaultControlScheme: m_DefaultActionMap: Player @@ -32715,6 +33133,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1608051141} m_CullTransparentMesh: 1 +--- !u!1 &1671041759 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1671041760} + - component: {fileID: 1671041762} + - component: {fileID: 1671041761} + m_Layer: 5 + m_Name: Stick + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1671041760 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1671041759} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 752410144} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -150, y: 135} + m_SizeDelta: {x: 90, y: 90} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1671041761 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1671041759} + m_CullTransparentMesh: 1 +--- !u!114 &1671041762 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1671041759} + 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: 0.5019608} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: -2413806693520163455, guid: 020c7234c09e5469ca30098748f7a9a2, 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!1 &1686016595 GameObject: m_ObjectHideFlags: 0 @@ -32859,6 +33352,81 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 +--- !u!1 &1693333742 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1693333743} + - component: {fileID: 1693333745} + - component: {fileID: 1693333744} + m_Layer: 5 + m_Name: Ring + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1693333743 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1693333742} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 752410144} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -150, y: 135} + m_SizeDelta: {x: 195, y: 195} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1693333744 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1693333742} + m_CullTransparentMesh: 1 +--- !u!114 &1693333745 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1693333742} + 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: 0.5019608} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 4004708080983207187, guid: a9b5f7e141902454a82a628f31cead2e, 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!1 &1703730787 GameObject: m_ObjectHideFlags: 0 @@ -33176,7 +33744,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: -300, y: 217} + m_AnchoredPosition: {x: -300, y: 130} m_SizeDelta: {x: 300, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1730555521 @@ -33416,7 +33984,7 @@ MonoBehaviour: m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 - m_ActiveFontFeatures: 00000000 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 1 checkPaddingRequired: 0 m_isRichText: 1 @@ -33800,7 +34368,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 1394716926} m_Father: {fileID: 715298358} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} @@ -34122,6 +34691,11 @@ MonoBehaviour: m_PointerBehavior: 0 m_CursorLockBehavior: 0 m_ScrollDeltaPerTick: 6 +--- !u!4 &2045264205 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5054089494736014737, guid: 6cde6a2c228dc40d0b42ba0b19ca2fc3, type: 3} + m_PrefabInstance: {fileID: 928173567} + m_PrefabAsset: {fileID: 0} --- !u!1 &2050277061 GameObject: m_ObjectHideFlags: 0 @@ -34151,8 +34725,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 995823417} - - {fileID: 465467121} + - {fileID: 2045264205} m_Father: {fileID: 1577739326} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2111087225 @@ -34365,7 +34938,7 @@ MonoBehaviour: m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 - m_ActiveFontFeatures: 00000000 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 @@ -35658,34 +36231,6 @@ MonoBehaviour: m_Calls: [] m_ActionId: 6b444451-8a00-4d00-a97e-f47457f736a8 m_ActionName: Player/Look - - m_PersistentCalls: - m_Calls: [] - m_ActionId: 6c2ab1b8-8984-453a-af3d-a3c78ae1679a - m_ActionName: 'Player/Attack[/Mouse/leftButton,/Keyboard/enter]' - - m_PersistentCalls: - m_Calls: [] - m_ActionId: 852140f2-7766-474d-8707-702459ba45f3 - m_ActionName: 'Player/Interact[/Keyboard/e]' - - m_PersistentCalls: - m_Calls: [] - m_ActionId: 27c5f898-bc57-4ee1-8800-db469aca5fe3 - m_ActionName: 'Player/Crouch[/Keyboard/c]' - - m_PersistentCalls: - m_Calls: [] - m_ActionId: f1ba0d36-48eb-4cd5-b651-1c94a6531f70 - m_ActionName: 'Player/Jump[/Keyboard/space]' - - m_PersistentCalls: - m_Calls: [] - m_ActionId: 2776c80d-3c14-4091-8c56-d04ced07a2b0 - m_ActionName: 'Player/Previous[/Keyboard/1]' - - m_PersistentCalls: - m_Calls: [] - m_ActionId: b7230bb6-fc9b-4f52-8b25-f5e19cb2c2ba - m_ActionName: 'Player/Next[/Keyboard/2]' - - m_PersistentCalls: - m_Calls: [] - m_ActionId: 641cd816-40e6-41b4-8c3d-04687c349290 - m_ActionName: 'Player/Sprint[/Keyboard/leftShift]' - m_PersistentCalls: m_Calls: [] m_ActionId: 61490661-390c-466a-9503-730f52fa6da1 @@ -35798,6 +36343,10 @@ MonoBehaviour: m_CallState: 2 m_ActionId: d73633e2-7db7-450f-b3b4-8d94702600bf m_ActionName: 'UI/Pause[/Keyboard/escape]' + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 31c46e70-d308-4c62-ac8b-c11d56939cc9 + m_ActionName: 'Player/Tap[/Device Simulator Touchscreen/press]' m_NeverAutoSwitchControlSchemes: 0 m_DefaultControlScheme: m_DefaultActionMap: UI @@ -35811,9 +36360,29 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1577739326} m_Modifications: + - target: {fileID: 19496004288067746, guid: 5e9a239886cdc4f36bd47c7e2ce1f506, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 7778766740815000049, guid: 37e3015ddcf9c4d9c99676a2558c3e0a, type: 3} + - target: {fileID: 19496004288067746, guid: 5e9a239886cdc4f36bd47c7e2ce1f506, type: 3} + propertyPath: m_Color.a + value: 0.627451 + objectReference: {fileID: 0} - target: {fileID: 19496004288067746, guid: 5e9a239886cdc4f36bd47c7e2ce1f506, type: 3} propertyPath: m_Enabled - value: 0 + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 19496004288067746, guid: 5e9a239886cdc4f36bd47c7e2ce1f506, type: 3} + propertyPath: m_SortingLayer + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 19496004288067746, guid: 5e9a239886cdc4f36bd47c7e2ce1f506, type: 3} + propertyPath: m_SortingOrder + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 19496004288067746, guid: 5e9a239886cdc4f36bd47c7e2ce1f506, type: 3} + propertyPath: m_SortingLayerID + value: 1750925873 objectReference: {fileID: 0} - target: {fileID: 71829853537045655, guid: 5e9a239886cdc4f36bd47c7e2ce1f506, type: 3} propertyPath: m_LocalPosition.x @@ -35869,7 +36438,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 292671231893397069, guid: 5e9a239886cdc4f36bd47c7e2ce1f506, type: 3} propertyPath: _hitPoints - value: 100 + value: 1 objectReference: {fileID: 0} - target: {fileID: 292671231893397069, guid: 5e9a239886cdc4f36bd47c7e2ce1f506, type: 3} propertyPath: _schnitzel @@ -35893,7 +36462,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4961075627311851740, guid: 5e9a239886cdc4f36bd47c7e2ce1f506, type: 3} propertyPath: orthographic size - value: 13 + value: 9.375 objectReference: {fileID: 0} - target: {fileID: 4961075627311851740, guid: 5e9a239886cdc4f36bd47c7e2ce1f506, type: 3} propertyPath: m_BackGroundColor.a @@ -35915,6 +36484,10 @@ PrefabInstance: propertyPath: m_Enabled value: 1 objectReference: {fileID: 0} + - target: {fileID: 5164901800226713887, guid: 5e9a239886cdc4f36bd47c7e2ce1f506, type: 3} + propertyPath: _forceEnable + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6690211913983570074, guid: 5e9a239886cdc4f36bd47c7e2ce1f506, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -35923,6 +36496,22 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 7065569398920272160, guid: 5e9a239886cdc4f36bd47c7e2ce1f506, type: 3} + propertyPath: m_LocalPosition.x + value: 0.271 + objectReference: {fileID: 0} + - target: {fileID: 7065569398920272160, guid: 5e9a239886cdc4f36bd47c7e2ce1f506, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 7065569398920272160, guid: 5e9a239886cdc4f36bd47c7e2ce1f506, type: 3} + propertyPath: m_LocalRotation.z + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 7065569398920272160, guid: 5e9a239886cdc4f36bd47c7e2ce1f506, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 90 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -36187,6 +36776,10 @@ PrefabInstance: propertyPath: m_Name value: Enemy objectReference: {fileID: 0} + - target: {fileID: 1001074756204391216, guid: ce6ca319e4496403782aea5ae869c333, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3600334310735166755, guid: ce6ca319e4496403782aea5ae869c333, type: 3} propertyPath: m_LocalScale.x value: 1 diff --git a/Assets/Scripts/UI/FloatingOnScreenStick.cs b/Assets/Scripts/UI/FloatingOnScreenStick.cs new file mode 100644 index 00000000..92505749 --- /dev/null +++ b/Assets/Scripts/UI/FloatingOnScreenStick.cs @@ -0,0 +1,70 @@ +using UnityEngine; +using UnityEngine.EventSystems; +using UnityEngine.InputSystem.Layouts; +using UnityEngine.InputSystem.OnScreen; + +namespace UI +{ + public class FloatingOnScreenStick : OnScreenControl, IDragHandler, IPointerDownHandler, IPointerUpHandler + { + [SerializeField] private float _movementRange = 50; + [SerializeField] private RectTransform _stickTransform; + [SerializeField] private RectTransform _ringTransform; + + [InputControl(layout = "Vector2")] + [SerializeField] private string _controlPath; + protected override string controlPathInternal + { + get => _controlPath; + set => _controlPath = value; + } + + private RectTransform _rectTransform; + + private Vector2 _startPos; + private Vector2 _pointerDownPos; + private Vector2 _dragPos; + + private void Start() + { + _rectTransform = (RectTransform)transform; + _startPos = _stickTransform.anchoredPosition; + } + + public void OnPointerDown(PointerEventData eventData) + { + if (eventData == null) + { + return; + } + + RectTransformUtility.ScreenPointToLocalPointInRectangle(_rectTransform, eventData.position, eventData.pressEventCamera, out _pointerDownPos); + _stickTransform.anchoredPosition = new Vector2(_pointerDownPos.x, _rectTransform.rect.height + _pointerDownPos.y); + _ringTransform.anchoredPosition = new Vector2(_pointerDownPos.x, _rectTransform.rect.height + _pointerDownPos.y); + } + + public void OnDrag(PointerEventData eventData) + { + if (eventData == null) + { + return; + } + + RectTransformUtility.ScreenPointToLocalPointInRectangle(_rectTransform, eventData.position, eventData.pressEventCamera, out _dragPos); + var delta = _dragPos - _pointerDownPos; + + delta = Vector2.ClampMagnitude(delta, _movementRange); + _stickTransform.anchoredPosition = new Vector2(_pointerDownPos.x, _rectTransform.rect.height + _pointerDownPos.y) + delta; + + var newPos = new Vector2(delta.x / _movementRange, delta.y / _movementRange); + SendValueToControl(newPos); + } + + public void OnPointerUp(PointerEventData eventData) + { + _stickTransform.anchoredPosition = _startPos; + _ringTransform.anchoredPosition = _startPos; + SendValueToControl(Vector2.zero); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/UI/FloatingOnScreenStick.cs.meta b/Assets/Scripts/UI/FloatingOnScreenStick.cs.meta new file mode 100644 index 00000000..43d811d5 --- /dev/null +++ b/Assets/Scripts/UI/FloatingOnScreenStick.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 0f879836f87f64a5384590e43ce550ad \ No newline at end of file diff --git a/Assets/Scripts/UI/MobileControls.cs b/Assets/Scripts/UI/MobileControls.cs new file mode 100644 index 00000000..0ff710fa --- /dev/null +++ b/Assets/Scripts/UI/MobileControls.cs @@ -0,0 +1,22 @@ +using UnityEngine; + +namespace UI +{ + public class MobileControls : MonoBehaviour + { + [SerializeField] private bool _forceEnable; + private void Awake() + { + if (_forceEnable) + { + return; + } + + if (Application.platform != RuntimePlatform.Android && + Application.platform != RuntimePlatform.IPhonePlayer) + { + gameObject.SetActive(false); + } + } + } +} diff --git a/Assets/Scripts/UI/MobileControls.cs.meta b/Assets/Scripts/UI/MobileControls.cs.meta new file mode 100644 index 00000000..0eae951f --- /dev/null +++ b/Assets/Scripts/UI/MobileControls.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: b3f45b93ee1dc4bdf94a4bbdb582f3f9 \ No newline at end of file diff --git a/Assets/Settings/InputSystem_Actions.inputactions b/Assets/Settings/InputSystem_Actions.inputactions index 8b1f0d99..6a1dd7b1 100644 --- a/Assets/Settings/InputSystem_Actions.inputactions +++ b/Assets/Settings/InputSystem_Actions.inputactions @@ -23,69 +23,6 @@ "interactions": "", "initialStateCheck": true }, - { - "name": "Attack", - "type": "Button", - "id": "6c2ab1b8-8984-453a-af3d-a3c78ae1679a", - "expectedControlType": "", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, - { - "name": "Interact", - "type": "Button", - "id": "852140f2-7766-474d-8707-702459ba45f3", - "expectedControlType": "Button", - "processors": "", - "interactions": "Hold", - "initialStateCheck": false - }, - { - "name": "Crouch", - "type": "Button", - "id": "27c5f898-bc57-4ee1-8800-db469aca5fe3", - "expectedControlType": "Button", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, - { - "name": "Jump", - "type": "Button", - "id": "f1ba0d36-48eb-4cd5-b651-1c94a6531f70", - "expectedControlType": "Button", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, - { - "name": "Previous", - "type": "Button", - "id": "2776c80d-3c14-4091-8c56-d04ced07a2b0", - "expectedControlType": "Button", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, - { - "name": "Next", - "type": "Button", - "id": "b7230bb6-fc9b-4f52-8b25-f5e19cb2c2ba", - "expectedControlType": "Button", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, - { - "name": "Sprint", - "type": "Button", - "id": "641cd816-40e6-41b4-8c3d-04687c349290", - "expectedControlType": "Button", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, { "name": "Mouse", "type": "Value", @@ -103,6 +40,15 @@ "processors": "", "interactions": "", "initialStateCheck": false + }, + { + "name": "Tap", + "type": "Value", + "id": "31c46e70-d308-4c62-ac8b-c11d56939cc9", + "expectedControlType": "Vector2", + "processors": "", + "interactions": "", + "initialStateCheck": true } ], "bindings": [ @@ -249,226 +195,6 @@ "isComposite": false, "isPartOfComposite": false }, - { - "name": "", - "id": "143bb1cd-cc10-4eca-a2f0-a3664166fe91", - "path": "/buttonWest", - "interactions": "", - "processors": "", - "groups": ";Gamepad", - "action": "Attack", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "05f6913d-c316-48b2-a6bb-e225f14c7960", - "path": "/leftButton", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "Attack", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "886e731e-7071-4ae4-95c0-e61739dad6fd", - "path": "/primaryTouch/tap", - "interactions": "", - "processors": "", - "groups": ";Touch", - "action": "Attack", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "ee3d0cd2-254e-47a7-a8cb-bc94d9658c54", - "path": "/trigger", - "interactions": "", - "processors": "", - "groups": "Joystick", - "action": "Attack", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "8255d333-5683-4943-a58a-ccb207ff1dce", - "path": "/{PrimaryAction}", - "interactions": "", - "processors": "", - "groups": "XR", - "action": "Attack", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "b3c1c7f0-bd20-4ee7-a0f1-899b24bca6d7", - "path": "/enter", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Attack", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "cbac6039-9c09-46a1-b5f2-4e5124ccb5ed", - "path": "/2", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Next", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "e15ca19d-e649-4852-97d5-7fe8ccc44e94", - "path": "/dpad/right", - "interactions": "", - "processors": "", - "groups": "Gamepad", - "action": "Next", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "f2e9ba44-c423-42a7-ad56-f20975884794", - "path": "/leftShift", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Sprint", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "8cbb2f4b-a784-49cc-8d5e-c010b8c7f4e6", - "path": "/leftStickPress", - "interactions": "", - "processors": "", - "groups": "Gamepad", - "action": "Sprint", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "d8bf24bf-3f2f-4160-a97c-38ec1eb520ba", - "path": "/trigger", - "interactions": "", - "processors": "", - "groups": "XR", - "action": "Sprint", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "eb40bb66-4559-4dfa-9a2f-820438abb426", - "path": "/space", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Jump", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "daba33a1-ad0c-4742-a909-43ad1cdfbeb6", - "path": "/buttonSouth", - "interactions": "", - "processors": "", - "groups": "Gamepad", - "action": "Jump", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "603f3daf-40bd-4854-8724-93e8017f59e3", - "path": "/secondaryButton", - "interactions": "", - "processors": "", - "groups": "XR", - "action": "Jump", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "1534dc16-a6aa-499d-9c3a-22b47347b52a", - "path": "/1", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Previous", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "25060bbd-a3a6-476e-8fba-45ae484aad05", - "path": "/dpad/left", - "interactions": "", - "processors": "", - "groups": "Gamepad", - "action": "Previous", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "1c04ea5f-b012-41d1-a6f7-02e963b52893", - "path": "/e", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Interact", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "b3f66d0b-7751-423f-908b-a11c5bd95930", - "path": "/buttonNorth", - "interactions": "", - "processors": "", - "groups": "Gamepad", - "action": "Interact", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "4f4649ac-64a8-4a73-af11-b3faef356a4d", - "path": "/buttonEast", - "interactions": "", - "processors": "", - "groups": "Gamepad", - "action": "Crouch", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "36e52cba-0905-478e-a818-f4bfcb9f3b9a", - "path": "/c", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Crouch", - "isComposite": false, - "isPartOfComposite": false - }, { "name": "", "id": "f78e5769-fc83-4164-b028-7a56faf355c8", @@ -512,6 +238,17 @@ "action": "Pause", "isComposite": false, "isPartOfComposite": false + }, + { + "name": "", + "id": "0328a504-56c9-413d-b17e-f54c8515dee2", + "path": "/Press", + "interactions": "", + "processors": "", + "groups": ";Touch", + "action": "Tap", + "isComposite": false, + "isPartOfComposite": false } ] }, @@ -541,7 +278,7 @@ "name": "Submit", "type": "Button", "id": "7607c7b6-cd76-4816-beef-bd0341cfe950", - "expectedControlType": "Button", + "expectedControlType": "", "processors": "", "interactions": "", "initialStateCheck": false diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 2cd30684..0077ced7 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -435,37 +435,8 @@ PlayerSettings: m_SubKind: iPad - m_BuildTarget: Android m_Icons: - - m_Textures: [] - m_Width: 432 - m_Height: 432 - m_Kind: 2 - m_SubKind: - - m_Textures: [] - m_Width: 324 - m_Height: 324 - m_Kind: 2 - m_SubKind: - - m_Textures: [] - m_Width: 216 - m_Height: 216 - m_Kind: 2 - m_SubKind: - - m_Textures: [] - m_Width: 162 - m_Height: 162 - m_Kind: 2 - m_SubKind: - - m_Textures: [] - m_Width: 108 - m_Height: 108 - m_Kind: 2 - m_SubKind: - - m_Textures: [] - m_Width: 81 - m_Height: 81 - m_Kind: 2 - m_SubKind: - - m_Textures: [] + - m_Textures: + - {fileID: 2800000, guid: 70bb34ca87f674d5da462b59236092f0, type: 3} m_Width: 192 m_Height: 192 m_Kind: 1 @@ -495,7 +466,8 @@ PlayerSettings: m_Height: 36 m_Kind: 1 m_SubKind: - - m_Textures: [] + - m_Textures: + - {fileID: 2800000, guid: 70bb34ca87f674d5da462b59236092f0, type: 3} m_Width: 192 m_Height: 192 m_Kind: 0 @@ -525,6 +497,38 @@ PlayerSettings: m_Height: 36 m_Kind: 0 m_SubKind: + - m_Textures: + - {fileID: 2800000, guid: 39e61b5b3f9d3e144ab6d2c7ae6b4bd2, type: 3} + - {fileID: 2800000, guid: 39e61b5b3f9d3e144ab6d2c7ae6b4bd2, type: 3} + m_Width: 432 + m_Height: 432 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 324 + m_Height: 324 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 216 + m_Height: 216 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 162 + m_Height: 162 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 108 + m_Height: 108 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 81 + m_Height: 81 + m_Kind: 2 + m_SubKind: m_BuildTargetBatching: - m_BuildTarget: Standalone m_StaticBatching: 1 From 6ab08b01275cc3fab8ce20da7b8485af1950d7cf Mon Sep 17 00:00:00 2001 From: bitsandfoxes Date: Thu, 21 Aug 2025 17:07:39 +0200 Subject: [PATCH 2/4] Added Steven, Beerboot, fixed static reset --- Assets/Graphics/Animation/Steven_0.controller | 72 ++++ .../Animation/Steven_0.controller.meta | 8 + Assets/Graphics/Animation/steven.anim | 75 ++++ Assets/Graphics/Animation/steven.anim.meta | 8 + Assets/Graphics/Sprites/Characters/steven.png | Bin 0 -> 690 bytes .../Sprites/Characters/steven.png.meta | 208 +++++++++++ Assets/Graphics/Sprites/Pickups/beerboot.png | Bin 0 -> 555 bytes .../Sprites/Pickups/beerboot.png.meta | 182 ++++++++++ Assets/Prefabs/Characters/RandomEnemy.prefab | 336 ++++++++++++++++++ .../Characters/RandomEnemy.prefab.meta | 7 + Assets/Prefabs/Pickups/BeerbootPickup.prefab | 154 ++++++++ .../Pickups/BeerbootPickup.prefab.meta | 7 + Assets/Prefabs/Pickups/NotHotDogPickup.prefab | 2 +- Assets/Resources/DemoConfig.asset | 10 +- Assets/Resources/Sentry/SentryOptions.asset | 2 +- Assets/Scenes/TitleScene.unity | 12 +- Assets/Scripts/Characters/Arrow.cs | 21 +- Assets/Scripts/Characters/Player.cs | 17 +- Assets/Scripts/Characters/RandomEnemy.cs | 48 +++ Assets/Scripts/Characters/RandomEnemy.cs.meta | 3 + Assets/Scripts/Managers/EventManager.cs | 8 + Assets/Scripts/Managers/SoundManager.cs | 8 + Assets/Scripts/Pickups/BeerbootPickup.cs | 27 ++ Assets/Scripts/Pickups/BeerbootPickup.cs.meta | 2 + .../SceneManagers/BattleSceneManager.cs | 25 +- Assets/Scripts/UI/HUD/HUD.cs | 2 + Assets/Scripts/Upgrades/UpgradeManager.cs | 8 + Assets/Scripts/Weapons/Dart/Dart.cs | 9 +- Assets/Scripts/Weapons/WeaponBase.cs | 2 +- Assets/Scripts/Weapons/WeaponManager.cs | 12 +- 30 files changed, 1231 insertions(+), 44 deletions(-) create mode 100644 Assets/Graphics/Animation/Steven_0.controller create mode 100644 Assets/Graphics/Animation/Steven_0.controller.meta create mode 100644 Assets/Graphics/Animation/steven.anim create mode 100644 Assets/Graphics/Animation/steven.anim.meta create mode 100644 Assets/Graphics/Sprites/Characters/steven.png create mode 100644 Assets/Graphics/Sprites/Characters/steven.png.meta create mode 100644 Assets/Graphics/Sprites/Pickups/beerboot.png create mode 100644 Assets/Graphics/Sprites/Pickups/beerboot.png.meta create mode 100644 Assets/Prefabs/Characters/RandomEnemy.prefab create mode 100644 Assets/Prefabs/Characters/RandomEnemy.prefab.meta create mode 100644 Assets/Prefabs/Pickups/BeerbootPickup.prefab create mode 100644 Assets/Prefabs/Pickups/BeerbootPickup.prefab.meta create mode 100644 Assets/Scripts/Characters/RandomEnemy.cs create mode 100644 Assets/Scripts/Characters/RandomEnemy.cs.meta create mode 100644 Assets/Scripts/Pickups/BeerbootPickup.cs create mode 100644 Assets/Scripts/Pickups/BeerbootPickup.cs.meta diff --git a/Assets/Graphics/Animation/Steven_0.controller b/Assets/Graphics/Animation/Steven_0.controller new file mode 100644 index 00000000..a45f3d54 --- /dev/null +++ b/Assets/Graphics/Animation/Steven_0.controller @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-8937947849679682698 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: steven + m_Speed: 0.1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: f99000ddab40e4e23bbdff2d48251e78, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &-2784300086276328584 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -8937947849679682698} + m_Position: {x: 250, y: 110, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -8937947849679682698} +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Steven_0 + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -2784300086276328584} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} diff --git a/Assets/Graphics/Animation/Steven_0.controller.meta b/Assets/Graphics/Animation/Steven_0.controller.meta new file mode 100644 index 00000000..64496d38 --- /dev/null +++ b/Assets/Graphics/Animation/Steven_0.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8c96e65ccb32948f2a6d38d78a3e4956 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Graphics/Animation/steven.anim b/Assets/Graphics/Animation/steven.anim new file mode 100644 index 00000000..f4d95768 --- /dev/null +++ b/Assets/Graphics/Animation/steven.anim @@ -0,0 +1,75 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: steven + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: -1610325370224775926, guid: a00de33a2e8484878a822f15f91c97bd, type: 3} + - time: 0.083333336 + value: {fileID: -6848235050473702349, guid: a00de33a2e8484878a822f15f91c97bd, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 12 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: -1610325370224775926, guid: a00de33a2e8484878a822f15f91c97bd, type: 3} + - {fileID: -6848235050473702349, guid: a00de33a2e8484878a822f15f91c97bd, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.16666667 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Graphics/Animation/steven.anim.meta b/Assets/Graphics/Animation/steven.anim.meta new file mode 100644 index 00000000..3cc8e218 --- /dev/null +++ b/Assets/Graphics/Animation/steven.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f99000ddab40e4e23bbdff2d48251e78 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Graphics/Sprites/Characters/steven.png b/Assets/Graphics/Sprites/Characters/steven.png new file mode 100644 index 0000000000000000000000000000000000000000..57d1b3429eecad72ed21b47fe4d36e80c1248ef6 GIT binary patch literal 690 zcmV;j0!{siP)Px%Y)M2xRA_W%rez}yNE9gv7#mx%(2^1>YNeqSHJ~8-16ELw zjjS|N6f#okCS_v-jwLGv9vN$01(#+ZI`8Z_@w;EHrsm7;?&Uu3o}S-5JHSR8J!`#? z`O&VmKj+8yv)@wt$Vw;wr3~0ES1KP^Q5hbpqSv3j2O6Ymoc7%OY4nVAvV8o zYAWQ&Q}MSbaJyu|E?F2)LNscHOozvl5PiE0yJRh;tEf!#*G7lIRW-bwNo7JFe4!d} z)@`TGUz`t8?UM7VGQrP$1hU}CwRLtXGQ}qafVyeYjvuSk0+W1l2CP$7s_A%+P4P2} zpf~8qdBy4Ce1PHY41n0Rm4fgXr}6)M|FzQg_0bz4 zzR;D#oM7VH&$M|Rhfnff?d)X+;PK&(%oq9~0{m-9f#rUityAGLdVIJ;^XrGG6XX>- zm%@A@2h*|uSbh;Pb$Ane;S5Lv%ED!(lP`5I1B*}8NibmkPZHgHrK^b_|IhypZSHc*UH||907*qoM6N<$f^qgpy8r+H literal 0 HcmV?d00001 diff --git a/Assets/Graphics/Sprites/Characters/steven.png.meta b/Assets/Graphics/Sprites/Characters/steven.png.meta new file mode 100644 index 00000000..a3d92f11 --- /dev/null +++ b/Assets/Graphics/Sprites/Characters/steven.png.meta @@ -0,0 +1,208 @@ +fileFormatVersion: 2 +guid: a00de33a2e8484878a822f15f91c97bd +TextureImporter: + internalIDToNameTable: + - first: + 213: -1610325370224775926 + second: Steven_0 + - first: + 213: -6848235050473702349 + second: Steven_1 + externalObjects: {} + serializedVersion: 13 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 32 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: iOS + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: Steven_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: a0de3fe8b99f6a9e0800000000000000 + internalID: -1610325370224775926 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Steven_1 + rect: + serializedVersion: 2 + x: 32 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 33cb22e418e26f0a0800000000000000 + internalID: -6848235050473702349 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5d0c6c3f634b64fb48ac5527cb655b45 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + Steven_0: -1610325370224775926 + Steven_1: -6848235050473702349 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Graphics/Sprites/Pickups/beerboot.png b/Assets/Graphics/Sprites/Pickups/beerboot.png new file mode 100644 index 0000000000000000000000000000000000000000..915b3fd2e990984834c6fc934ac0e0c00664e7b6 GIT binary patch literal 555 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}E~ycoX}-P; zT0k}j17mw80}DtA5K93u0|WB{Mh0de%?J`(zyz07Sip>6gA}f5OZp5{Hr3O`F(iWX zYM8Yjiy_Zf1|ii;T}&5)gP6r1D2T{(HE|a(?^?TH!D5#VzCeW~x|#w#hxgpx;*`m_OgL8yy^`0yFW}RUMeII8n$zqJ!bTRBgR~loQD4VHf{bYvKYm!ylTzRgmI0&7* z$6j~TU_Had-yuIE&+lQHB7E%B`46wQGt^tWa}DVz_Vr{`n8fKQW8?CNS77agjsNVl z5^6sG?MQsvVY-Q_$S;+Pp|Zd!-bZn!d{^mBRgw7-DutULRqwr}yt=hRS6INh@C>_I zY8Y$E)Ob%d-}&F=FNwT4Yb~I_+x+K7!A-+Ee+~b!HU`f3C|g$5&hp7w`SB9@!vAUi Z7^h#G5VG6U4H!WT44$rjF6*2UngGQ$(Ut%J literal 0 HcmV?d00001 diff --git a/Assets/Graphics/Sprites/Pickups/beerboot.png.meta b/Assets/Graphics/Sprites/Pickups/beerboot.png.meta new file mode 100644 index 00000000..db3af653 --- /dev/null +++ b/Assets/Graphics/Sprites/Pickups/beerboot.png.meta @@ -0,0 +1,182 @@ +fileFormatVersion: 2 +guid: 2275cd1cdd5404b10bb6221f0984640f +TextureImporter: + internalIDToNameTable: + - first: + 213: -6015938142849960470 + second: Beerboot_0 + externalObjects: {} + serializedVersion: 13 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + 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: 32 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: iOS + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: Beerboot_0 + rect: + serializedVersion: 2 + x: 4 + y: 0 + width: 24 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: ae574b40228138ca0800000000000000 + internalID: -6015938142849960470 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + Beerboot_0: -6015938142849960470 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Characters/RandomEnemy.prefab b/Assets/Prefabs/Characters/RandomEnemy.prefab new file mode 100644 index 00000000..a79e8a76 --- /dev/null +++ b/Assets/Prefabs/Characters/RandomEnemy.prefab @@ -0,0 +1,336 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1001074756204391216 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3600334310735166755} + - component: {fileID: 6784210260469842379} + - component: {fileID: 5600799151421303173} + - component: {fileID: 1832744029709189115} + - component: {fileID: 6295179934123336098} + - component: {fileID: -4973739486306597661} + m_Layer: 9 + m_Name: RandomEnemy + m_TagString: Enemy + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3600334310735166755 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1001074756204391216} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.3, y: 1.3, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4909442466296662449} + - {fileID: 4216872585056956903} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &6784210260469842379 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1001074756204391216} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + 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: -1421566537 + m_SortingLayer: 3 + m_SortingOrder: 0 + m_Sprite: {fileID: -1610325370224775926, guid: a00de33a2e8484878a822f15f91c97bd, 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!114 &5600799151421303173 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1001074756204391216} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6e628bb745354e60875d8b0fcb8f2b0d, type: 3} + m_Name: + m_EditorClassIdentifier: + _collisionDamage: 20 + hitpoints: 30 + _scoreValue: 50 + _xpValue: 25 + _speed: 3 + _damageTextPrefab: {fileID: 3046976478099630124, guid: f3d91c6924ee1487984efd1cdf4dab92, type: 3} + _xpDropPrefab: {fileID: 4537481635261412375, guid: 41573deea9de44cd3a8532bf5d4f24fc, type: 3} + _flashMaterial: {fileID: 2100000, guid: fd4fa7d682b474410a971d96b6c0d276, type: 2} + _flashDuration: 0.2 + _deathAnimDuration: 0.5 +--- !u!61 &1832744029709189115 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1001074756204391216} + m_Enabled: 1 + serializedVersion: 3 + 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_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0.053414807, y: -0.26} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1, y: 1} + newSize: {x: 1, y: 1} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 0.70224035, y: 0.32719874} + m_EdgeRadius: 0 +--- !u!50 &6295179934123336098 +Rigidbody2D: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1001074756204391216} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDamping: 0 + m_AngularDamping: 0.05 + m_GravityScale: 0 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 4 +--- !u!95 &-4973739486306597661 +Animator: + serializedVersion: 7 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1001074756204391216} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 8c96e65ccb32948f2a6d38d78a3e4956, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_AnimatePhysics: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!1001 &103302148038260753 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3600334310735166755} + m_Modifications: + - target: {fileID: 4317359433093859830, guid: 5a20386a13a5f4e99bc262a76ec7a7f9, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4317359433093859830, guid: 5a20386a13a5f4e99bc262a76ec7a7f9, type: 3} + propertyPath: m_LocalPosition.y + value: -0.392 + objectReference: {fileID: 0} + - target: {fileID: 4317359433093859830, guid: 5a20386a13a5f4e99bc262a76ec7a7f9, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4317359433093859830, guid: 5a20386a13a5f4e99bc262a76ec7a7f9, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4317359433093859830, guid: 5a20386a13a5f4e99bc262a76ec7a7f9, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4317359433093859830, guid: 5a20386a13a5f4e99bc262a76ec7a7f9, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4317359433093859830, guid: 5a20386a13a5f4e99bc262a76ec7a7f9, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4317359433093859830, guid: 5a20386a13a5f4e99bc262a76ec7a7f9, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4317359433093859830, guid: 5a20386a13a5f4e99bc262a76ec7a7f9, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4317359433093859830, guid: 5a20386a13a5f4e99bc262a76ec7a7f9, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6093841815183966471, guid: 5a20386a13a5f4e99bc262a76ec7a7f9, type: 3} + propertyPath: m_Name + value: Shadow + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5a20386a13a5f4e99bc262a76ec7a7f9, type: 3} +--- !u!4 &4216872585056956903 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4317359433093859830, guid: 5a20386a13a5f4e99bc262a76ec7a7f9, type: 3} + m_PrefabInstance: {fileID: 103302148038260753} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &5580679225969033144 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3600334310735166755} + m_Modifications: + - target: {fileID: 671979559521728009, guid: 74d00312fb0444649a17ed447713187d, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 671979559521728009, guid: 74d00312fb0444649a17ed447713187d, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 671979559521728009, guid: 74d00312fb0444649a17ed447713187d, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 671979559521728009, guid: 74d00312fb0444649a17ed447713187d, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 671979559521728009, guid: 74d00312fb0444649a17ed447713187d, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 671979559521728009, guid: 74d00312fb0444649a17ed447713187d, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 671979559521728009, guid: 74d00312fb0444649a17ed447713187d, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 671979559521728009, guid: 74d00312fb0444649a17ed447713187d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 671979559521728009, guid: 74d00312fb0444649a17ed447713187d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 671979559521728009, guid: 74d00312fb0444649a17ed447713187d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2265015289408140805, guid: 74d00312fb0444649a17ed447713187d, type: 3} + propertyPath: m_Name + value: Hitbox + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 74d00312fb0444649a17ed447713187d, type: 3} +--- !u!4 &4909442466296662449 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 671979559521728009, guid: 74d00312fb0444649a17ed447713187d, type: 3} + m_PrefabInstance: {fileID: 5580679225969033144} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/Characters/RandomEnemy.prefab.meta b/Assets/Prefabs/Characters/RandomEnemy.prefab.meta new file mode 100644 index 00000000..2c1fa2c4 --- /dev/null +++ b/Assets/Prefabs/Characters/RandomEnemy.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 573b9f62ade4c4885a9382ccb4276bda +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Pickups/BeerbootPickup.prefab b/Assets/Prefabs/Pickups/BeerbootPickup.prefab new file mode 100644 index 00000000..77e6bb0a --- /dev/null +++ b/Assets/Prefabs/Pickups/BeerbootPickup.prefab @@ -0,0 +1,154 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3306419623360918530 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5054089494736014737} + - component: {fileID: -4891330270059684481} + - component: {fileID: 2235537914035941605} + - component: {fileID: 8459684996225841193} + m_Layer: 0 + m_Name: BeerbootPickup + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5054089494736014737 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3306419623360918530} + 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} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &-4891330270059684481 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3306419623360918530} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a571b4a8eb7cd4bc783b642e24514e3d, type: 3} + m_Name: + m_EditorClassIdentifier: + _pickupSound: {fileID: 8300000, guid: 9f38fc745c8b64043b4a6a8d9ab8deab, type: 3} + _scoreValue: 50 + _effectDuration: 5 + _effectText: + _cooldownModifier: 0.5 +--- !u!212 &2235537914035941605 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3306419623360918530} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + 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: 23827671 + m_SortingLayer: -1 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: 2275cd1cdd5404b10bb6221f0984640f, 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!61 &8459684996225841193 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3306419623360918530} + m_Enabled: 1 + serializedVersion: 3 + 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: 1 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1, y: 1} + newSize: {x: 1, y: 1} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 1, y: 1} + m_EdgeRadius: 0 diff --git a/Assets/Prefabs/Pickups/BeerbootPickup.prefab.meta b/Assets/Prefabs/Pickups/BeerbootPickup.prefab.meta new file mode 100644 index 00000000..b4dd8e91 --- /dev/null +++ b/Assets/Prefabs/Pickups/BeerbootPickup.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d109130e8f6de4b86a470d567292aa28 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Pickups/NotHotDogPickup.prefab b/Assets/Prefabs/Pickups/NotHotDogPickup.prefab index 42ca05be..0f7bd91d 100644 --- a/Assets/Prefabs/Pickups/NotHotDogPickup.prefab +++ b/Assets/Prefabs/Pickups/NotHotDogPickup.prefab @@ -50,7 +50,7 @@ MonoBehaviour: _scoreValue: 50000 _effectDuration: 0 _effectText: That was not a hotdog! - _healAmount: -50 + _damageAmount: 25 _effectPrefab: {fileID: 3306419623360918530, guid: 59786710faf594f7283667e6bcac1405, type: 3} --- !u!212 &2235537914035941605 SpriteRenderer: diff --git a/Assets/Resources/DemoConfig.asset b/Assets/Resources/DemoConfig.asset index b5af9777..91eff8af 100644 --- a/Assets/Resources/DemoConfig.asset +++ b/Assets/Resources/DemoConfig.asset @@ -12,12 +12,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: dd9ba42fbcfea443dae0540ef0f44176, type: 3} m_Name: DemoConfig m_EditorClassIdentifier: - _enabled: 0 + _enabled: 1 _apiUrl: https://sentaur-leaderboard-f7z2cjcdzq-uc.a.run.app _user: Username: sentaur_gdc Password: survivor_whatsmyageagain42_survivor - _autoPlay: 1 - _notHotDogParticleEffect: 1 - _fetchUpgradeFromServer: 1 - _crashOnGameOver: 1 + _autoPlay: 0 + _notHotDogParticleEffect: 0 + _fetchUpgradeFromServer: 0 + _crashOnGameOver: 0 diff --git a/Assets/Resources/Sentry/SentryOptions.asset b/Assets/Resources/Sentry/SentryOptions.asset index e395f7ec..c75e7b23 100644 --- a/Assets/Resources/Sentry/SentryOptions.asset +++ b/Assets/Resources/Sentry/SentryOptions.asset @@ -14,7 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: k__BackingField: 1 k__BackingField: https://c3362e24f4a09a7fed28ea79ca8aa20e@o87286.ingest.us.sentry.io/4508969830973440 - k__BackingField: 1 + k__BackingField: 0 k__BackingField: 0 k__BackingField: 1000 k__BackingField: 1000 diff --git a/Assets/Scenes/TitleScene.unity b/Assets/Scenes/TitleScene.unity index e01837e1..f57a326b 100644 --- a/Assets/Scenes/TitleScene.unity +++ b/Assets/Scenes/TitleScene.unity @@ -235,7 +235,7 @@ RectTransform: 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: 300, y: -25} + m_AnchoredPosition: {x: 300, y: -37} m_SizeDelta: {x: 300, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &336748527 @@ -655,7 +655,7 @@ RectTransform: 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: -300, y: -25} + m_AnchoredPosition: {x: -300, y: -37} m_SizeDelta: {x: 300, y: 190} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1088436796 @@ -801,7 +801,7 @@ RectTransform: 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: 0, y: 339} + m_AnchoredPosition: {x: 0, y: 249} m_SizeDelta: {x: 800, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1216176712 @@ -981,7 +981,7 @@ RectTransform: 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: 0, y: 325} + m_AnchoredPosition: {x: 0, y: 235} m_SizeDelta: {x: 800, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1346300727 @@ -1592,7 +1592,7 @@ Camera: far clip plane: 1000 field of view: 60 orthographic: 1 - orthographic size: 8.84375 + orthographic size: 9.375 m_Depth: -1 m_CullingMask: serializedVersion: 2 @@ -1726,7 +1726,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: -20} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 841, y: 423} + m_AnchoredPosition: {x: 841, y: 285} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1658891216 diff --git a/Assets/Scripts/Characters/Arrow.cs b/Assets/Scripts/Characters/Arrow.cs index 0fc29391..ecae455e 100644 --- a/Assets/Scripts/Characters/Arrow.cs +++ b/Assets/Scripts/Characters/Arrow.cs @@ -2,15 +2,18 @@ public class Arrow : MonoBehaviour { - // Start is called once before the first execution of Update after the MonoBehaviour is created - void Start() + [SerializeField] private bool _forceEnable; + private void Awake() { - - } - - // Update is called once per frame - void Update() - { - + if (_forceEnable) + { + return; + } + + if (Application.platform != RuntimePlatform.Android && + Application.platform != RuntimePlatform.IPhonePlayer) + { + gameObject.SetActive(false); + } } } diff --git a/Assets/Scripts/Characters/Player.cs b/Assets/Scripts/Characters/Player.cs index 1925c361..3157622e 100644 --- a/Assets/Scripts/Characters/Player.cs +++ b/Assets/Scripts/Characters/Player.cs @@ -107,12 +107,7 @@ private void HandleMovement() lastPosition = transform.position; var movement = _moveAction.ReadValue(); - if (movement.magnitude <= 0) - { - return; - } - - _rigidBody.linearVelocity = movement.normalized * _playerMoveRate;; + _rigidBody.linearVelocity = movement.normalized * _playerMoveRate; if (movement.x > 0) { @@ -199,10 +194,18 @@ public IEnumerator RestoreDamageResist(float duration) _damageReductionAmount = 0f; } } - + public void SpawnPlayerText(string text) { Vector2 textPosition = new Vector2(transform.position.x, transform.position.y + 1.0f); _playerTextPrefab.Spawn(transform.root, textPosition, text); } + + private void OnDestroy() + { + if (_instance == this) + { + _instance = null; + } + } } diff --git a/Assets/Scripts/Characters/RandomEnemy.cs b/Assets/Scripts/Characters/RandomEnemy.cs new file mode 100644 index 00000000..39077e17 --- /dev/null +++ b/Assets/Scripts/Characters/RandomEnemy.cs @@ -0,0 +1,48 @@ +using UnityEngine; + +namespace Characters +{ + public class RandomEnemy : Enemy + { + private Vector2 _targetPosition; + private float _stoppingDistance = 0.5f; // How close to the target before picking a new one + private Camera _mainCamera; + private float _mapBorderOffset = 2f; // Keep targets away from screen edges + + protected override void Awake() + { + base.Awake(); + _mainCamera = Camera.main; + PickNewRandomTarget(); + } + + protected override Vector2 DetermineDirection(GameObject player) + { + var distanceToTarget = Vector2.Distance(transform.position, _targetPosition); + + if (distanceToTarget <= _stoppingDistance) + { + PickNewRandomTarget(); + } + + var direction = (_targetPosition - (Vector2)transform.position).normalized; + return direction; + } + + private void PickNewRandomTarget() + { + var bottomLeft = _mainCamera.ScreenToWorldPoint(Vector3.zero); + var topRight = _mainCamera.ScreenToWorldPoint(new Vector3(_mainCamera.pixelWidth, _mainCamera.pixelHeight, 0)); + + var minX = bottomLeft.x + _mapBorderOffset; + var maxX = topRight.x - _mapBorderOffset; + var minY = bottomLeft.y + _mapBorderOffset; + var maxY = topRight.y - _mapBorderOffset; + + _targetPosition = new Vector2( + Random.Range(minX, maxX), + Random.Range(minY, maxY) + ); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Characters/RandomEnemy.cs.meta b/Assets/Scripts/Characters/RandomEnemy.cs.meta new file mode 100644 index 00000000..b0d6cbc3 --- /dev/null +++ b/Assets/Scripts/Characters/RandomEnemy.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 6e628bb745354e60875d8b0fcb8f2b0d +timeCreated: 1755778611 \ No newline at end of file diff --git a/Assets/Scripts/Managers/EventManager.cs b/Assets/Scripts/Managers/EventManager.cs index f31de16d..0dce662f 100644 --- a/Assets/Scripts/Managers/EventManager.cs +++ b/Assets/Scripts/Managers/EventManager.cs @@ -81,4 +81,12 @@ public static void TriggerEvent(string eventName) { TriggerEvent(eventName, new EventData()); } + + private void OnDestroy() + { + if (_instance == this) + { + _instance = null; + } + } } diff --git a/Assets/Scripts/Managers/SoundManager.cs b/Assets/Scripts/Managers/SoundManager.cs index 63f79fd5..b87c75fe 100644 --- a/Assets/Scripts/Managers/SoundManager.cs +++ b/Assets/Scripts/Managers/SoundManager.cs @@ -57,4 +57,12 @@ public void PlayHitSound() _audioSource.Play(); _timeOfLastHitSound = Time.time; } + + void OnDestroy() + { + if (_instance == this) + { + _instance = null; + } + } } diff --git a/Assets/Scripts/Pickups/BeerbootPickup.cs b/Assets/Scripts/Pickups/BeerbootPickup.cs new file mode 100644 index 00000000..6497b042 --- /dev/null +++ b/Assets/Scripts/Pickups/BeerbootPickup.cs @@ -0,0 +1,27 @@ +using System.Collections; +using UnityEngine; + +public class BeerbootPickup : PickupBase +{ + [SerializeField] private float _cooldownModifier = 1.0f; + + protected override void OnCollect(Player player) + { + var currentEffectCooldownModifier = Player.Instance.WeaponManager.GlobalEffektCooldownModifier; + Player.Instance.WeaponManager.GlobalEffektCooldownModifier = _cooldownModifier; + + StartCoroutine(ResetEffectCooldown(currentEffectCooldownModifier)); + } + + private IEnumerator ResetEffectCooldown(float cooldownModifier) + { + yield return new WaitForSeconds(_effectDuration); + + Player.Instance.WeaponManager.GlobalEffektCooldownModifier = cooldownModifier; + } + + protected override string GetEffectText() + { + return $"+{_cooldownModifier}x speed!"; + } +} diff --git a/Assets/Scripts/Pickups/BeerbootPickup.cs.meta b/Assets/Scripts/Pickups/BeerbootPickup.cs.meta new file mode 100644 index 00000000..5c7495c2 --- /dev/null +++ b/Assets/Scripts/Pickups/BeerbootPickup.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: a571b4a8eb7cd4bc783b642e24514e3d \ No newline at end of file diff --git a/Assets/Scripts/SceneManagers/BattleSceneManager.cs b/Assets/Scripts/SceneManagers/BattleSceneManager.cs index 61dfde5a..15b6628b 100644 --- a/Assets/Scripts/SceneManagers/BattleSceneManager.cs +++ b/Assets/Scripts/SceneManagers/BattleSceneManager.cs @@ -82,6 +82,10 @@ public class BattleSceneManager : MonoBehaviour [SerializeField] [Tooltip("The linear enemy prefab to spawn")] private GameObject _linearEnemyPrefab; + + [SerializeField] + [Tooltip("The random enemy prefab to spawn")] + private GameObject _randomEnemyPrefab; [SerializeField] [Tooltip("List of pickup prefabs to randomly spawn")] @@ -154,9 +158,10 @@ public enum EnemyType { Sentaur = 0, Ant = 1, - DiagonalHead = 2, - Mantis = 3, - LinearHead = 4, + RandomHead = 2, + DiagonalHead = 3, + Mantis = 4, + LinearHead = 5, }; // what level enemies start appearing @@ -164,8 +169,10 @@ public enum EnemyType { { EnemyType.Sentaur, 0 }, // start { EnemyType.Ant, 2 }, // level 3 + { EnemyType.RandomHead, 3 }, // level 4 { EnemyType.DiagonalHead, 4 }, // level 5 { EnemyType.Mantis, 6 }, // level 7 + { EnemyType.LinearHead, 7 }, // level 8 }; [SerializeField] @@ -209,6 +216,9 @@ private enum GameState private void Awake() { _demoConfig = Resources.Load("DemoConfig") as DemoConfiguration; + + InputSystem.actions.FindActionMap("Player").Enable(); + InputSystem.actions.FindActionMap("UI").Disable(); } // Start is called before the first frame update @@ -479,7 +489,7 @@ void Update() // every 2 seconds, instantiate a new enemy prefab and position at the edge // of the viewport; - if (Time.time - _lastEnemySpawnTime > _enemySpawnRate) + if (_enemySpawnRate > 0 && Time.time - _lastEnemySpawnTime > _enemySpawnRate) { _lastEnemySpawnTime = Time.time; @@ -633,6 +643,10 @@ private void Spawn() { spawnRange = (int)EnemyType.Ant; } + if (_currentLevel >= _levelEnemyGate[EnemyType.RandomHead]) + { + spawnRange = (int)EnemyType.RandomHead; + } if (_currentLevel >= _levelEnemyGate[EnemyType.DiagonalHead]) { spawnRange = (int)EnemyType.DiagonalHead; @@ -652,6 +666,9 @@ private void Spawn() case (int)EnemyType.Ant: prefab = _antEnemyPrefab; break; + case (int)EnemyType.RandomHead: + prefab = _randomEnemyPrefab; + break; case (int)EnemyType.DiagonalHead: prefab = _headEnemyPrefab; break; diff --git a/Assets/Scripts/UI/HUD/HUD.cs b/Assets/Scripts/UI/HUD/HUD.cs index 659e997d..4daca78e 100644 --- a/Assets/Scripts/UI/HUD/HUD.cs +++ b/Assets/Scripts/UI/HUD/HUD.cs @@ -69,12 +69,14 @@ public void ShowPause() _gameOverText.text = "PAUSED"; _gameOverText.enabled = true; + _tryAgain.SetActive(true); _quit.SetActive(true); } public void HidePause() { _gameOverText.enabled = false; + _tryAgain.SetActive(false); _quit.SetActive(false); } diff --git a/Assets/Scripts/Upgrades/UpgradeManager.cs b/Assets/Scripts/Upgrades/UpgradeManager.cs index 0d72d70b..269344cb 100644 --- a/Assets/Scripts/Upgrades/UpgradeManager.cs +++ b/Assets/Scripts/Upgrades/UpgradeManager.cs @@ -86,4 +86,12 @@ public void LevelUpUpgradePath(UpgradePathBase upgradePath) } } } + + void OnDestroy() + { + if (_instance == this) + { + _instance = null; + } + } } diff --git a/Assets/Scripts/Weapons/Dart/Dart.cs b/Assets/Scripts/Weapons/Dart/Dart.cs index 339b12b0..cd4822dc 100644 --- a/Assets/Scripts/Weapons/Dart/Dart.cs +++ b/Assets/Scripts/Weapons/Dart/Dart.cs @@ -40,8 +40,8 @@ private void Awake() { _lookAction = InputSystem.actions.FindAction("Look"); _mouseAction = InputSystem.actions.FindAction("Mouse"); - - _arrow = FindFirstObjectByType(); + + _arrow = Player.Instance.GetComponentInChildren(); } public void Start() @@ -70,7 +70,10 @@ protected override void Update() // Create a rotation where the arrow's right vector points in the direction // This works better for 2D objects that should point in a direction float angle = Mathf.Atan2(_shootingDirection.y, _shootingDirection.x) * Mathf.Rad2Deg; - _arrow.transform.rotation = Quaternion.Euler(0, 0, angle); + if (_arrow != null) + { + _arrow.transform.rotation = Quaternion.Euler(0, 0, angle); + } } } diff --git a/Assets/Scripts/Weapons/WeaponBase.cs b/Assets/Scripts/Weapons/WeaponBase.cs index 3cd244f4..7cb74900 100644 --- a/Assets/Scripts/Weapons/WeaponBase.cs +++ b/Assets/Scripts/Weapons/WeaponBase.cs @@ -11,7 +11,7 @@ public abstract class WeaponBase : MonoBehaviour [SerializeField] public float BaseDamage; - public float Cooldown => BaseCooldown * Player.Instance.WeaponManager.GlobalCooldownModifier; + public float Cooldown => BaseCooldown * Player.Instance.WeaponManager.GlobalCooldownModifier * Player.Instance.WeaponManager.GlobalEffektCooldownModifier; public int Damage => (int)(Player.Instance.WeaponManager.GlobalDamageModifier * BaseDamage); public int Count => Player.Instance.WeaponManager.GlobalCountModifier; diff --git a/Assets/Scripts/Weapons/WeaponManager.cs b/Assets/Scripts/Weapons/WeaponManager.cs index 5ae117dc..3b69924d 100644 --- a/Assets/Scripts/Weapons/WeaponManager.cs +++ b/Assets/Scripts/Weapons/WeaponManager.cs @@ -3,14 +3,12 @@ public class WeaponManager : MonoBehaviour { - [SerializeField] - public float GlobalDamageModifier = 1.0f; + [SerializeField] public float GlobalDamageModifier = 1.0f; + [SerializeField] public float GlobalCooldownModifier = 1.0f; - [SerializeField] - public float GlobalCooldownModifier = 1.0f; - - [SerializeField] - public int GlobalCountModifier = 1; + public float GlobalEffektCooldownModifier = 1.0f; + + [SerializeField] public int GlobalCountModifier = 1; private List _weapons = new List(); From f7e76bc8d1f995cb4e680fe06191eadd7b54f245 Mon Sep 17 00:00:00 2001 From: bitsandfoxes Date: Fri, 22 Aug 2025 11:23:00 +0200 Subject: [PATCH 3/4] Mobile Edition --- Assets/Graphics/Sprites/mobile.png | Bin 0 -> 359 bytes Assets/Graphics/Sprites/mobile.png.meta | 182 ++++++++++++++++++++++++ Assets/Scenes/TitleScene.unity | 10 +- ProjectSettings/ProjectSettings.asset | 2 +- 4 files changed, 188 insertions(+), 6 deletions(-) create mode 100644 Assets/Graphics/Sprites/mobile.png create mode 100644 Assets/Graphics/Sprites/mobile.png.meta diff --git a/Assets/Graphics/Sprites/mobile.png b/Assets/Graphics/Sprites/mobile.png new file mode 100644 index 0000000000000000000000000000000000000000..0f63fe1c23aba9e4fbd3d31ea4f1c51ddb2db6e9 GIT binary patch literal 359 zcmV-t0hs=YP)Px$AxT6*RA_BMZ2*EG2!bF8 zg3CgK{j-S*9+ft&feZjSAFrQimGC)sX@{UuV<1}y2Ud~N*qf2A&YSRz{74DUWdVTZ z`fZy=Jn)W8x1$t+Q)j>Ki;mVk11`kZ{{f>{T0-vWMc}mA?`5UxUZdGn1gg~8{NBTj z0Zy>Sgc}31gn_ehV}Q##noQ`%0MH6nzoqxbi#M@3m;adi`v?He3mSDvX=!460NV~h z6002ovPDHLk FV1me9nJfSR literal 0 HcmV?d00001 diff --git a/Assets/Graphics/Sprites/mobile.png.meta b/Assets/Graphics/Sprites/mobile.png.meta new file mode 100644 index 00000000..8b95e862 --- /dev/null +++ b/Assets/Graphics/Sprites/mobile.png.meta @@ -0,0 +1,182 @@ +fileFormatVersion: 2 +guid: f89e6c85b4b224f3099c6dcba742755b +TextureImporter: + internalIDToNameTable: + - first: + 213: 8317682489136483153 + second: mobile_0 + externalObjects: {} + serializedVersion: 13 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + 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 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: iOS + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: mobile_0 + rect: + serializedVersion: 2 + x: 4 + y: 2 + width: 41 + height: 34 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 15b8777a7285e6370800000000000000 + internalID: 8317682489136483153 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + mobile_0: 8317682489136483153 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/TitleScene.unity b/Assets/Scenes/TitleScene.unity index f57a326b..048dedfd 100644 --- a/Assets/Scenes/TitleScene.unity +++ b/Assets/Scenes/TitleScene.unity @@ -1220,7 +1220,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 'Vienna DLC + m_text: 'Mobile Edition' m_isRightToLeft: 0 @@ -1466,7 +1466,7 @@ GameObject: - component: {fileID: 1455550798} - component: {fileID: 1455550797} m_Layer: 5 - m_Name: Austria + m_Name: Mobile m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1511,7 +1511,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 0468ed1f3e126421faf10af357bbc8ed, type: 3} + m_Sprite: {fileID: 21300000, guid: f89e6c85b4b224f3099c6dcba742755b, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1592,7 +1592,7 @@ Camera: far clip plane: 1000 field of view: 60 orthographic: 1 - orthographic size: 9.375 + orthographic size: 8.4375 m_Depth: -1 m_CullingMask: serializedVersion: 2 @@ -1726,7 +1726,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: -20} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 841, y: 285} + m_AnchoredPosition: {x: 841, y: 417} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1658891216 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 0077ced7..e56cafc0 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -94,7 +94,7 @@ PlayerSettings: usePlayerLog: 1 dedicatedServerOptimizations: 1 bakeCollisionMeshes: 0 - forceSingleInstance: 0 + forceSingleInstance: 1 useFlipModelSwapchain: 1 resizableWindow: 1 useMacAppStoreValidation: 0 From 215bae69b77509af729ce0b94cbebee9e17d7c34 Mon Sep 17 00:00:00 2001 From: bitsandfoxes Date: Fri, 22 Aug 2025 12:52:01 +0200 Subject: [PATCH 4/4] Fixed upgrade bug if there is only one more left --- Assets/Scenes/BattleScene.unity | 4 ++-- Assets/Scenes/TitleScene.unity | 30 ++++++++++++++-------------- Assets/Scripts/Upgrades/LevelUpUI.cs | 10 +++++++++- 3 files changed, 26 insertions(+), 18 deletions(-) diff --git a/Assets/Scenes/BattleScene.unity b/Assets/Scenes/BattleScene.unity index 24d23be4..3ffd5afb 100644 --- a/Assets/Scenes/BattleScene.unity +++ b/Assets/Scenes/BattleScene.unity @@ -36438,7 +36438,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 292671231893397069, guid: 5e9a239886cdc4f36bd47c7e2ce1f506, type: 3} propertyPath: _hitPoints - value: 1 + value: 100 objectReference: {fileID: 0} - target: {fileID: 292671231893397069, guid: 5e9a239886cdc4f36bd47c7e2ce1f506, type: 3} propertyPath: _schnitzel @@ -36462,7 +36462,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4961075627311851740, guid: 5e9a239886cdc4f36bd47c7e2ce1f506, type: 3} propertyPath: orthographic size - value: 9.375 + value: 8.4375 objectReference: {fileID: 0} - target: {fileID: 4961075627311851740, guid: 5e9a239886cdc4f36bd47c7e2ce1f506, type: 3} propertyPath: m_BackGroundColor.a diff --git a/Assets/Scenes/TitleScene.unity b/Assets/Scenes/TitleScene.unity index 048dedfd..8565333a 100644 --- a/Assets/Scenes/TitleScene.unity +++ b/Assets/Scenes/TitleScene.unity @@ -233,9 +233,9 @@ RectTransform: - {fileID: 965031613} m_Father: {fileID: 1354810445} 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: 300, y: -37} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 300, y: -500} m_SizeDelta: {x: 300, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &336748527 @@ -653,9 +653,9 @@ RectTransform: - {fileID: 418004990} m_Father: {fileID: 1354810445} 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: -300, y: -37} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: -300, y: -500} m_SizeDelta: {x: 300, y: 190} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1088436796 @@ -799,9 +799,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 1354810445} 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: 0, y: 249} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -210} m_SizeDelta: {x: 800, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1216176712 @@ -979,9 +979,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 1354810445} 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: 0, y: 235} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -221} m_SizeDelta: {x: 800, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1346300727 @@ -1724,9 +1724,9 @@ RectTransform: - {fileID: 1373028996} m_Father: {fileID: 1354810445} m_LocalEulerAnglesHint: {x: 0, y: 0, z: -20} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 841, y: 417} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -100, y: -110} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1658891216 diff --git a/Assets/Scripts/Upgrades/LevelUpUI.cs b/Assets/Scripts/Upgrades/LevelUpUI.cs index ca5ed217..a65c373f 100644 --- a/Assets/Scripts/Upgrades/LevelUpUI.cs +++ b/Assets/Scripts/Upgrades/LevelUpUI.cs @@ -59,9 +59,17 @@ private void OnEnable() } paths ??= UpgradeManager.Instance.GetRandomUpgradePaths(2); + if (paths == null || paths.Count == 0) + { + Debug.LogWarning("No upgrade paths available. Everything fully upgraded?"); + Time.timeScale = 1; + gameObject.SetActive(false); + return; + } + var upgradeChoice1 = paths[0]; - var upgradeChoice2 = paths[1]; + var upgradeChoice2 = paths.Count > 1 ? paths[1] : paths[0]; // In case there is only one upgrade left SetLevelOptionUI(upgradeChoice1, upgradeChoice2);