From 29555c16d0e8c32b3fc45bca2653f3968743c01b Mon Sep 17 00:00:00 2001 From: kingjuulian06 <128752981+kingjuulian06@users.noreply.github.com> Date: Mon, 25 Dec 2023 02:00:16 +0100 Subject: [PATCH] Pause Menu Updated --- .plastic/plastic.changes | Bin 9157 -> 10938 bytes .plastic/plastic.wktree | Bin 15350 -> 17030 bytes Assets/Materials/Element 10.png | Bin 987 -> 0 bytes Assets/Materials/Element 10.png.meta | 135 --- Assets/Materials/Element 11.png | Bin 547 -> 0 bytes Assets/Materials/Element 11.png.meta | 135 --- Assets/Materials/Element 13.png | Bin 2383 -> 0 bytes Assets/Materials/Element 13.png.meta | 135 --- Assets/Materials/block.png.meta | 135 --- Assets/Materials/jumppad_1.1.png | Bin 2667 -> 0 bytes Assets/Materials/jumppad_1.1.png.meta | 135 --- Assets/Materials/player.png.meta | 135 --- Assets/Prefabs/5 Decke.prefab | 167 +++- Assets/Prefabs/Big Spike.prefab | 31 +- Assets/Prefabs/Block.prefab | 32 +- Assets/Prefabs/Jumppad_klein.prefab | 30 +- Assets/Prefabs/Oben_Block.prefab | 33 +- Assets/{Resources => Prefabs}/Player.prefab | 144 +++- .../{Resources => Prefabs}/Player.prefab.meta | 0 Assets/Prefabs/Small Spike.prefab | 32 +- Assets/{ => Resources}/Element 10.png | Bin Assets/{ => Resources}/Element 10.png.meta | 34 +- Assets/{ => Resources}/Element 11.png | Bin Assets/{ => Resources}/Element 11.png.meta | 34 +- .../Element 14.png} | Bin .../Element 14.png.meta} | 34 +- Assets/{Materials => Resources}/Kette.png | Bin .../{Materials => Resources}/Kette.png.meta | 34 +- Assets/{ => Resources}/Kette_1.png | Bin Assets/{ => Resources}/Kette_1.png.meta | 0 Assets/{Materials => Resources}/block.png | Bin Assets/{ => Resources}/block.png.meta | 34 +- Assets/{Materials => Resources}/jumppad_1.png | Bin .../jumppad_1.png.meta | 34 +- Assets/{Materials => Resources}/player.png | Bin Assets/{ => Resources}/player.png.meta | 34 +- Assets/Scenes/Level_01.unity | 797 +++++++++++++++++- Assets/Scenes/Pause_Menu.unity | 125 --- Assets/Scenes/Pause_Menu.unity.meta | 7 - Assets/Scripts/BlockScript.cs | 8 +- Assets/Scripts/ConnectToServer.cs | 26 - Assets/Scripts/ConnectToServer.cs.meta | 11 - Assets/Scripts/CreateAndJoinLevel.cs | 2 +- Assets/Scripts/EndPauseMenuScript.cs | 29 + Assets/Scripts/EndPauseMenuScript.cs.meta | 2 + Assets/Scripts/LevelScoller.cs | 16 +- Assets/Scripts/PauseMenu.cs | 16 +- Assets/Scripts/SpawnPlayers.cs | 18 - Assets/Scripts/SpawnPlayers.cs.meta | 11 - Assets/block.png | Bin 2753 -> 0 bytes Assets/player.png | Bin 1886 -> 0 bytes ProjectSettings/EditorBuildSettings.asset | 6 +- ProjectSettings/ProjectSettings.asset | 12 +- 53 files changed, 1454 insertions(+), 1149 deletions(-) delete mode 100644 Assets/Materials/Element 10.png delete mode 100644 Assets/Materials/Element 10.png.meta delete mode 100644 Assets/Materials/Element 11.png delete mode 100644 Assets/Materials/Element 11.png.meta delete mode 100644 Assets/Materials/Element 13.png delete mode 100644 Assets/Materials/Element 13.png.meta delete mode 100644 Assets/Materials/block.png.meta delete mode 100644 Assets/Materials/jumppad_1.1.png delete mode 100644 Assets/Materials/jumppad_1.1.png.meta delete mode 100644 Assets/Materials/player.png.meta rename Assets/{Resources => Prefabs}/Player.prefab (84%) rename Assets/{Resources => Prefabs}/Player.prefab.meta (100%) rename Assets/{ => Resources}/Element 10.png (100%) rename Assets/{ => Resources}/Element 10.png.meta (81%) rename Assets/{ => Resources}/Element 11.png (100%) rename Assets/{ => Resources}/Element 11.png.meta (81%) rename Assets/{Materials/Element 12.png => Resources/Element 14.png} (100%) rename Assets/{Materials/Element 12.png.meta => Resources/Element 14.png.meta} (81%) rename Assets/{Materials => Resources}/Kette.png (100%) rename Assets/{Materials => Resources}/Kette.png.meta (81%) rename Assets/{ => Resources}/Kette_1.png (100%) rename Assets/{ => Resources}/Kette_1.png.meta (100%) rename Assets/{Materials => Resources}/block.png (100%) rename Assets/{ => Resources}/block.png.meta (81%) rename Assets/{Materials => Resources}/jumppad_1.png (100%) rename Assets/{Materials => Resources}/jumppad_1.png.meta (81%) rename Assets/{Materials => Resources}/player.png (100%) rename Assets/{ => Resources}/player.png.meta (81%) delete mode 100644 Assets/Scenes/Pause_Menu.unity delete mode 100644 Assets/Scenes/Pause_Menu.unity.meta delete mode 100644 Assets/Scripts/ConnectToServer.cs delete mode 100644 Assets/Scripts/ConnectToServer.cs.meta create mode 100644 Assets/Scripts/EndPauseMenuScript.cs create mode 100644 Assets/Scripts/EndPauseMenuScript.cs.meta delete mode 100644 Assets/Scripts/SpawnPlayers.cs delete mode 100644 Assets/Scripts/SpawnPlayers.cs.meta delete mode 100644 Assets/block.png delete mode 100644 Assets/player.png diff --git a/.plastic/plastic.changes b/.plastic/plastic.changes index fc0c2293b843604e5c1cd5d152743711f30415be..88dc8638f4042af14d4f5c2f67627e89f39d7145 100644 GIT binary patch delta 662 zcmX@=zAJRXZ$`F>e_|PVHtRE$F!6~xB_?O57v-1cr35DzO`gl6%(!UsL3V3lDHMtP zoSf96$%O*Sj0-`sTs+P>`NgU3iMgqhFN(=AE|{z+X2XdP11X#jQ5am3SX2U6I1j84 zAqG-77o>3VVwPw|tgq**tA=CWkj{GWe1JFlo~UP?e>X>qD=YF_E&gKR2{b3lrD zrBK8T#WfjcgAJJ`zMoNKbC^UOJ3DVcPGTj{&5069lMg8@n|ww7Ain?u0|TFHPHJvy zUWtOC$>ah>dB!O~jarj;DGKrnBV_an^3o?SWKv+93^q1H@iZG}QciwyHdxCfm=-QR zupnIZM38E3gbfB@*)vS;X>${oUf?B*oQ@nAzVu@NDBvVR%vcQL1N0} zJViyu9+(CWA(-$*MK#85kV-aA@6?i#RIppRVCuN|z=CiyJ3%Vhxe6eG1`3!Cm{M+j zh$vib`{a*&Hj_=1su-C!uU8UdWEBl4%Fmj-M@dGo78t@HV0@nmOfQ)nucRbpVPX~# e;-6<;Y@U^$XBMjOl#vnUS#E24HFEMgWpMxk%iHPz delta 216 zcmdlLdenWwZ$^%Ze`2{g7#J7?0uoD$Q{yM=GpRCuo_vwhnp+ei;+vXRIyr|~jqwvm zbaO0YA=6}cwrED3&5PNjS^0#V^YijjlS@MKgHwyjCf{dPV7w1fC?Jj^ky?mZzgCY#la|x{HJO6a{$+;5y8HG0M iO4hMYu2MY6$TWF{!llUq%BLqU)~IG=+AOar#s~oZElZXF diff --git a/.plastic/plastic.wktree b/.plastic/plastic.wktree index 3f1faa26c46d2e608ba39a1da0278511c41e418b..7662232fbf5287dd89f1c7df4a6c28d233860845 100644 GIT binary patch delta 656 zcmexX-qy;v;k3|XaSj2-C6g7o#5oyj86aTuA0cZN_KmLEI%iq#Y_=1>!^FroSz0Qd ziw7vr?USFBR5{sDMqzWUbU2f+s8eEcc6w2MXYkXJ3Rb-UEGUR1sI0^|AEGk2B(bOju5unkC6XXesd*&|h9-Ii zdFhh_wWJuQ0QGB4F0mHj7DmWUo?xxaI2mlRvh{f`&ZM0DNiZ#Jd|(N%>WM%> zdxQlBaMcrFs*x-(0Bh+-)nW+O(g)MRg>cj4erpxRUZ8{>A8%G^Zb3m}N<2bG4@?J# z5L9weNh;j*E|^+2KClGXEuA2h+*}1YiIu5EaHSnErR@9=8L--R KkXjZ{ssjM>)z^>! delta 253 zcmZo`W&BpY;k1xoEdvA?-)90dmP~FGR^I$y$byA^7V8V^v#)M%wiCa@#KMD%)z-9=l`m*ry2Nxuk=LO^> zR;CsegLPe=yiwbp2SwOWU5W7$SWlehZuZH43=cC3Z9ZVMh<&oD^-)Hq$?;a#CSSHW I&jRu!0J#)Z7ytkO diff --git a/Assets/Materials/Element 10.png b/Assets/Materials/Element 10.png deleted file mode 100644 index 1c4fb2358f823c10087d0225813fb62d00e8b534..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 987 zcmV<110?*3P)4k`)%8a(zNbD*2xC6IzP>J5yPQwYUta$FP5T8d%kl*987%vKIiG&y{qhnI zcsZZGFU#_6S(cvwAIGfB0%f?bnH8oS@SQ#>t-`DVKMs~wVY&fV^hqfdW)%2nsFVs* z4Y;9CN~bWJz`cReDNHk9gFY#h!b}2Nhe@R{#eg09q%;b%2<#msjY9eX2lPoP6lM@O zIz$SE)B{fFljs$)3!EK*ULoy(3i>2!h0FrA9-dku<$#L%BwB^60<|BURw3Ph2KppQ zg^U8N9-2}i)qsZjBszs`0<9mIP9e>J4*Dc2g-imy9+pZW#ek0bBpQV*0=*xUMj`xw z0s15gg$x3t9+E;K^nii-BzT4B0;3-gULov&0Qw|og~$R?9u8U|Bv^&00?{4} zRw3Mgfchjzg@^)CzgnH01RhPFfTeFY_2bqSSo*e8SEx2%>1$5)$TbC)zP3~qstj2Ax>GxLErF%4FExeJ1D3ww zRE}OlVCfr6Md8$drEj|F#rjKI>T)0D!Y0ZX5H!x%;dmOkBv z6?P9;`pg-QoHuu=HVfr|>#p>7(fe*?WPd zkE0ufZv&P-x~|wnVCm!Ps_?1w(e{S!^Z!r(>*%k+*yVhB{s*2o0-ooLH%b5i002ov JPDHLkV1jowzMcR8 diff --git a/Assets/Materials/Element 10.png.meta b/Assets/Materials/Element 10.png.meta deleted file mode 100644 index f514f166..00000000 --- a/Assets/Materials/Element 10.png.meta +++ /dev/null @@ -1,135 +0,0 @@ -fileFormatVersion: 2 -guid: 343f7433f71fea34683593662713e6e7 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMasterTextureLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 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 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Materials/Element 11.png b/Assets/Materials/Element 11.png deleted file mode 100644 index 15028977cecf211b1898f411c76c17581b355904..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 547 zcmV+;0^I$HP)w3J5mZJAPy!u5LJhbJG2`*m z;E^TW*WSHd?LXXT-~4vNFa)cePlsa&VgK~?^I>)41Hlg>UGY9c2=C|9;l<#@OC|yT z;XPhYZ&ne_0p7twCJ{{mF5n?^h-LsI@Q^7)6MzYL$PA)-zzjTO0#P+!0UlD1s1~pS z9#V~{60jm3Qj4e#Pyi39L{tSRh=;vsrO zT0jCkM2$!ZNQ8%I5$OO4@em~<6(BJlqC=zsRDg%55Geo^;UOBt?tlvM5CvjaK*e~d zJ7PCL19+$_Vi!O|c&Hmds) z1>7(m5=RsRbi6T9L=iy8n^g_s2Bc;Y1^Mguxtvyu>_03EM+(TJ;n zj@PXy#6>{I>)tBjETH4jw1{{Y(DCS+MVtUS9&L9KZvY*Sz6s(8=y+vA42$cJcWhu`Ug~d{!-vkKnVZ<002ovPDHLkV1gQN*JA(x diff --git a/Assets/Materials/Element 11.png.meta b/Assets/Materials/Element 11.png.meta deleted file mode 100644 index fa37ffac..00000000 --- a/Assets/Materials/Element 11.png.meta +++ /dev/null @@ -1,135 +0,0 @@ -fileFormatVersion: 2 -guid: a75780b3f1ed4d84ab2f47cdcc67a2c3 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMasterTextureLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 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 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Materials/Element 13.png b/Assets/Materials/Element 13.png deleted file mode 100644 index 9e03a08d2ed97829bdf713d590da2df4deb7723d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2383 zcmc&$_ct4i8pc;2p?ud!l-gChR&h0@G**JE5-XuKaz(Y&j@F2+YJF;@#OM$s#E4B1 zTB4DbT5VCI^-;ShF(aRQ&ixzi{o#3@bKdv7zr5!>=Xp}>Y%K-&B=|TuI0Rr&GsKzV z&v1|T_cQ*|Kc#UdfIuiJgoA@$_&?wroryj=weBtRG*SX?vmE;Vc%$IMt0IT#5Gu=wkhFY9 z<;vF<9LB6()yx&{ya#G31JgGt! zaSCYUikX4Oz;8v36WyZ>0QM?KpkA zHxIkRhf<}y@;Z4WoGHO-WZpXNrI!Zj(scQ*$;PrJ zV4&c);l24t%)z2+ZH+%0R};ai1GcvOY@eXs!LX^;AUE~AS&MJ<9RH7BH!?ad_9~cM zxRo_{fs2G!jKk2nlNj!9mxeJGw}%9=t|yl+Jj-H0%VU!HliQVF1IL~2w^6!r zk7_y^TM^wY1C!{A4@p2Z+ltJHh0@{c39T8MmB}QlAbCjY1z`%v8e&dzpnka2z*c*i zXq9iFYGk%^TaAUbP^2}xh$W#5?9$ukl`-+*fk=Q_9?-A$&H(eMs|(9s3NQ#MbT)Kw zLK;wrqH8SJFI3}xaO=#Ptc@bn>s;IyLzi0R90t*ZBn@oObwGg=qZu}pjCTl6MbN+7 zZ)-?yE{A8~`AhJrYLq6gCH6!xu(ftha>LK?1U)ew)#B6q1(JdVVU2wS1fNSkEWB7s z=SVrD1I?_f^m;B9IJoHM!oLH_#~0fgu|ET= z!`QINJFK*fpmshGglv{*d`-Y@qwCsX`K&<1lQC^!o2*m-;sOaFbaPOh+f9^jikLYi zO&dy!EEa6`x*X^>NZgrk;FENUV?;grI>4lXHvMj#{AymEnK6Ij7NYsdU=xA z@>j$q-ee19QX)Y<%c}Mt;h{SBGz+(JmaL()C}8hUX+F=hNEdaUZoIXT@2SM*Y}@BK z6uWn`)3UA|Xbq`l(kx>P{fyZC^!fy3ksQ9NgkaLcn`Z?iefPsF^@IjR>unU9QywCS z!ZvirI0mk53m)W5>7pd?xEdefY8qJ6)%P~o!?#n*_;#7g{ilot&9#|Edj$hi`2jFu zrNhds5xiQJbo9``UMBUIgiVD-NreTly-N9IYEAQlldVsg6Ysa_hUK*O=}|ZWYoW<> z*M0u^ILF=$0mD8P6%i?Ga`0~9$;Vd8<3iKtyXs4ChxJE6ApML}WZKY^w1l zZ1hr&7~oje*^z(WD1zJlXUxP&1zr_@Ns5HdK-Vt52u8x=+{D3fiz&8BP{=EVM6{-E$#4 z^$;{w&(|27O3=5my|@4E&xdU;-P^C#0=9Ux#Lxm2HN)=MlAmFZuN0r6i%)6Laj;{{ z4a_QuOP3jAR$Gv#bJ%_Pqj_~jzLPj@^w-gpTHh*B> zEbiVHCWau(uAf$k?KXz2EQv%!YXuzo11am0(ItWthdPeFOpBQ*UFm3-SjBEjxqdMJ zaR$s_WFYyjW%6G6PJ^3cLao{ak8c&y}RwwUYUjK{w#7D1G0;BRr!}1S>Z=!t)L9TqRkqNp&i6{5sp2M4;AY z>LmaJ1f2{hyBQ!HTd>V-dK_z3J#C?muE*^2nM_vCZ+?;@<9+8l$#r=YF569hCHz|M zAE78!Bi@yTB|YqAmg2ZGKP b9Bi&}E$_nb7$KjthQt9gw>7JUc*Oq=ku7d% diff --git a/Assets/Materials/Element 13.png.meta b/Assets/Materials/Element 13.png.meta deleted file mode 100644 index 9e2ee0af..00000000 --- a/Assets/Materials/Element 13.png.meta +++ /dev/null @@ -1,135 +0,0 @@ -fileFormatVersion: 2 -guid: 890820d9cb6776d49980bfa830f5d0e1 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMasterTextureLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 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 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Materials/block.png.meta b/Assets/Materials/block.png.meta deleted file mode 100644 index 6b603b17..00000000 --- a/Assets/Materials/block.png.meta +++ /dev/null @@ -1,135 +0,0 @@ -fileFormatVersion: 2 -guid: dc58f015e3ddee043899ce6032859f72 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMasterTextureLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 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 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Materials/jumppad_1.1.png b/Assets/Materials/jumppad_1.1.png deleted file mode 100644 index 01b4de564d0c9801b08be349f266fd6ba16c8de9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2667 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 + logic = GetComponent(); + } + public void ClosePauseMenu(){ + pauseMenu.SetActive(false); + BG_Music.Play(); + bgscript.ScrollSpeed = 0.5f; + } + + public void ExitGame() { + pauseMenu.SetActive(false); + SceneManager.LoadScene(1); + } +} diff --git a/Assets/Scripts/EndPauseMenuScript.cs.meta b/Assets/Scripts/EndPauseMenuScript.cs.meta new file mode 100644 index 00000000..86791943 --- /dev/null +++ b/Assets/Scripts/EndPauseMenuScript.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: c973e36edacbad745be546656dbf9e74 \ No newline at end of file diff --git a/Assets/Scripts/LevelScoller.cs b/Assets/Scripts/LevelScoller.cs index 0d6d634f..84bed622 100644 --- a/Assets/Scripts/LevelScoller.cs +++ b/Assets/Scripts/LevelScoller.cs @@ -5,7 +5,7 @@ using UnityEngine; public class LevelScoller : MonoBehaviour { RectTransform myRectTransform; - public int i; + public int i = 0; private void Start() { @@ -13,13 +13,19 @@ public class LevelScoller : MonoBehaviour } public void LeftClick() { - myRectTransform.localPosition += Vector3.right * 1500; - i -= 1; + if (i==0) {} + else { + myRectTransform.localPosition += Vector3.right * 1500; + i -= 1; + } } public void RightClick() { - myRectTransform.localPosition += Vector3.left * 1500; - i += 1; + if (i==2) {} + else{ + myRectTransform.localPosition += Vector3.left * 1500; + i += 1; + } } } diff --git a/Assets/Scripts/PauseMenu.cs b/Assets/Scripts/PauseMenu.cs index b6c18b93..05cd7a35 100644 --- a/Assets/Scripts/PauseMenu.cs +++ b/Assets/Scripts/PauseMenu.cs @@ -1,6 +1,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; +using UnityEngine.SceneManagement; public class PauseMenu : MonoBehaviour { @@ -11,7 +12,18 @@ public class PauseMenu : MonoBehaviour public LogicScript logic; + public void ClosePauseMenu(){ + pauseMenu.SetActive(false); + BG_Music.Play(); + bgscript.ScrollSpeed = 1f; + logic.IsFreezed = false; + } + public void ExitGame() { + pauseMenu.SetActive(false); + SceneManager.LoadScene(1); + } + void Start() { bgscript = GameObject.FindGameObjectWithTag("Background").GetComponent(); @@ -24,6 +36,8 @@ public class PauseMenu : MonoBehaviour pauseMenu.SetActive(true); BG_Music.Stop(); bgscript.ScrollSpeed = 0f; - } + } } + + } diff --git a/Assets/Scripts/SpawnPlayers.cs b/Assets/Scripts/SpawnPlayers.cs deleted file mode 100644 index 0cf33dfa..00000000 --- a/Assets/Scripts/SpawnPlayers.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -using Photon.Pun; - -public class SpawnPlayers : MonoBehaviour -{ - public GameObject playerPrefab; - - public int x; - public int y; - - private void Start() - { - Vector2 startPosition = new Vector2(x, y); - PhotonNetwork.Instantiate(playerPrefab.name, startPosition, Quaternion.identity); - } -} diff --git a/Assets/Scripts/SpawnPlayers.cs.meta b/Assets/Scripts/SpawnPlayers.cs.meta deleted file mode 100644 index a0be39f6..00000000 --- a/Assets/Scripts/SpawnPlayers.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 85a58a3c02a4c704bac27c095e959c6c -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/block.png b/Assets/block.png deleted file mode 100644 index 081a6e7a0cac09dddcda2c25d87cb661f21cf21e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2753 zcmZuzXH*mD5)Hiv>7Yng>4*`DB#Y8SDWS+BQ3M181r0%J3`LM)UT6veYU0wAb*X`c z5W4i9P(l#`XjG&Gh(V-C^0L0?Iq%2&F*9f8&fGhHzBwPp8D=XXdRP&kn4LEx9qt=1bGo21^|dj|6@F3w74GtfN0nyYYVq%90R|QDGQhDZ6mIPM>s{1 zB?A-#4#E9XZrnUCjY*NSrX(qTw~+BpGhg|OIlNeg*%Z1{l+vY;9%4>13aT+q5sK8r z7!L-_2xwGmcCHBzfd{v?wl-FDFH>ohwUeOh5l#yr#?T4%AByX{xN&0HiaV|G_kr)R zcNAK8S7zw(ajXith3^}jww!Xq)-(5|+Kn7UjM$M<3f@OdUZFFDlKtL$dk@6;%(bjA zdeOByIP>T{(ApJ)kz3dBmhdxggX%_9!mdRWEcNeQ&uim*Q@J-Rx5KiKg5XZzJv{+`&~5rU)siRIX02}go+0@^bDdUv+IfQ-Y)e8K zn=Rh-;+|gF&kZn}P>LKB-J@xD~njtIee^}&1hsB?nSBK@8O_fK0z6~_D zH*Rpg$iyU&S_4uw=8<$<6-w#Rtm9kL&ePH(fVN!=yB)p|)47i#o@zNrgn((IGn$fM zRW1cNzhdPXQ=`l_{6t>5LZZRVPNR@!>wVhU>sEz|i~=Y)>!uQhadb9)hJ*scYUpRE zb^^u4(6GlY!6!7*#3id6u5mq#KfZYy3f-EhTGqV$TV9w#9Da3Xw;dA2X%VQ&Dh-4< z2Wd4?zsvx|Gjt$;iG@GX4~+SXb@AI~;^N}Ip`lX!C7K`d%3F>eo|TDD0c%^9wg5G) z4z%U5ib^W-O#8`sU^-B;2NAPjb)E}7JWwhbzir&+&tOo_yN4hgh_RkeFxJtA$3La| zFc{8e)LqObmU34$&nFV{Vp)b|RlOalji($LUarr?mOXILJ@)x$qa8?uwjHX2@&fZd z{raRyPU*N!GuovweppH z9w`Q2KhDZXTyEBOF^NK}{1;bnq0SvAFQ0lACF`(cgZbD0Q2yzU6!ZV3JiF+s2g~bk zF7`1qa=jE*JAgCHM%lg%_wrYYxh3_B?0`Alf7w)_k)t+@dC2K_^_x+#Tf}H73Pd4+ z^crOS2>x~JMXui{3sd-Svg5Yv^s$%Z=FPy$rBq3{@Vdt0ho{W0(7h*3$W?3;Bbt>U z1!kqo3~?-xgn8JDWa*pA6GQM^iSd;{~RvTbxEfw|c zJvT1)?^G1i{!i{9&hRmiW1`x zrf@Av0`G`my33zQ-pTf(vP~~?G^-&}$drkWD9K0ZmZQn<`ZZX=C0aQ3x=Hz4^Ht9k z2qdmR%#mX_iBP2U7wpbcDp=@KWJsBwafPHyNdOfrSmTW$(VZlzG1tgnaK-#qrdqFjIB1(On>x7BH|J81<2W@`vgbRO zR4JFWe?cxhU;7?SY%ndB>!2|C!yH_(I zR$dn6i$R$rV7XX$!GkcX<{k$gd#{(GCo&wV4dV&J702_-=zV&RR*OJA84v zP-Q;g_sY2|nTB7g^J3VCsnXwfNE<4f72u}=aB*)qV7#L|0{;@}J1i9U>6P8W$m0p(Nsr1;VteXq2ur)Lw}l9_L>LPrlX$J5pvi`; z!simAuOM?Y8If#I9T-(u@gk-E!0_)Y#PdXw7;U}S`AbGg$pv3sC^m~_HBC!ee+3NE z-;9wYW~WYPuOyLd)4QJ&g@*SB%`ubnMTB-%=)zX|Oteg+H#k%|k3-t#c|8>}-;F80 z429Q^dO+b_(|w0>S@vpIn>;{PJ8K^*?;gCf z+$w37w)Np%{MmSMbd5+%$R^E0$!5@xEvQol*=HiUzd@@Y1UcvLTdYd-FgzG+^Jou6$E1F1i7TG_9Z4~^r# zsZyb+LRs@zV8dS_u{}|(2P+~z>t=xtNwub4+wIfs>_v?G903IExtqM$I9CqCy_E${ k#JT~XEB95}zj6S<0vc1t_(=D-e^S6D8<=&arBC9&0iO|T>Hq)$ diff --git a/Assets/player.png b/Assets/player.png deleted file mode 100644 index c647cafb0435ba5d3f6d1f0c17ed43386f788ac8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1886 zcmV-k2ch_hP)=p)`P%Xh`{ENKg~?K~x}B zk${y45~IQ3g8?)o#3%L1_^2kPqCOC!5mdwisYDz9fIewrh=~^b6H^PZ$TbzX9@qA| z*EM_GnU%2Z?ab`_xtmXNP1@ehZ+`RL*_oZ$-){*HoIeF%Eh0j4e_-RuefV_at5FZ- z!Xqd4;>7(s;WgeO-1a^He2;|_Y4o&h5^g()w|z0OSPCcWu81J`YzXg872X18&3)EnFLHE|Nnr$B^L8RI*!z7?($#X)cZ6C){WBR~U3qs^IB7s~1iR2Tg4C84e(Fxh@ zR}})P;e!-pUVVa?`#?%OHEshL1(fN8A`K`T(*rd}-!ZU;$KN2P2U4QSBnF+EHfKsB zO5{&R$1(vaXdes=Ye`dmlv`(hVj%A;J|q)rl0t2KeDqH;OI?s z8^ivFF7txomM>p~Md+u5?!-89nak+<>IJIf{ptMC^{-Id55nq8RE95&fFx{m{r(-b zFU$fSJNPbMKC+*SLo~d!bqBynKplPIvZSABP4Xy433T(t%tAFs$fnxhTgTuPD8?3x z;O3oM;;0fes`(;Bz{7_Q;+ZGkh&d-6%$Z3UxaOIUmC6#Wh!=5^2LmSnqvgi z93!CS7y&iM2&g$mK+Q1%YK{?5bL`HZ-D~=Kk4N$%l}h5um5e%``+ItntX#Dc{S3!* zCrVwmd$9Yux=*94JJN>kmEb0*3eJaY$W{`?+aLTzVPC?i>Px8108~*3TMI2TeIwkt zxT1Jv_!5Q?0cm%+S8rPfg+|&Us`(;BKv}!oaYXT|wqsw_W1#FPUJ-EVfq%Xe?KVW1 za}+(0hc6Skt8nV;VI|_fz%g4OZ=S*tK6Rn9fA`a&aV}QG9>~j=&d**${?3Qcmu!z_ ze;QxHU=~nDrld-V8pX@Ym!{?JGHt71zYJr>UaobCW?Oc~UPUr(F($jK;f%c| z;j4iM>{BU8kE4I$|2Xu%6x&{$_9H%8&n94L-)r~R-Au(8uF?I#?#L}+E}@!Zves*k z>4BO<72t`|@Ymn5tk&C)KOzD=%lraGf+DL46X01}7y&iM2&g$mK+Q1%YK{?5bButR zV+7P3BcSFO0X4@6s5wSJ%`pOMjuB9Er~*8L`1^u$hpRuWqbQ;U&MpR3fM<}u2L~`` z?wpFg>%TJ8^QK@0Vk-Q<6_u^;ssPxKf*EM))E-KYZkLh@Vs>sd8=y#)Ew~ws=5%PDP|1R9CHaR z!E+KLG6hNKeqiqM2#A$HL$ZaNv0|dsa|38@P9imb!L$icY4H=mMomIHIx-C6xtKk_ z?Z3a#l;h(~j^S!1gW>crb28kS@b?1=_I>*U@uqIS{<~eL55r2%!;xFpaWm+r8NO@m z0!F?#gobsGM}9R;C3w5;E51U9rf$LX%e3VzpBzOi@;JHYF{lyeM8=*>-8l9pY5ZnbL>$_^5=AfliDIvT?lEuT}{au-=I; zAEpyy*|kQvfHCfAnI6cGP?boGE9zXQ>@|)Q0nN=kKSEVf_u(T$5IHL`=G@@MGy=wW zoimqEZus;0A8%M#V^jOM+c@DrJ)=BH2?qr diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 184febd0..ff74f65b 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -8,15 +8,15 @@ EditorBuildSettings: - enabled: 0 path: Assets/Scenes/Loading_Screen.unity guid: 6491cb6d9680e214e9404ef479e07b42 + - enabled: 0 + path: Assets/Scenes/Pause_Menu.unity + guid: 87ca1619e6402204c9432061705dd240 - enabled: 1 path: Assets/Scenes/Start Menu.unity guid: 2cda990e2423bbf4892e6590ba056729 - enabled: 1 path: Assets/Scenes/Lobby.unity guid: 8240615bc55e9ac4a84999a9b6359255 - - enabled: 1 - path: Assets/Scenes/Pause_Menu.unity - guid: 87ca1619e6402204c9432061705dd240 - enabled: 1 path: Assets/Scenes/Level_01.unity guid: f31bc3f5439bc684194182ee640e22fa diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 51f7b87c..1f7f5fff 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -12,8 +12,8 @@ PlayerSettings: targetDevice: 2 useOnDemandResources: 0 accelerometerFrequency: 60 - companyName: DefaultCompany - productName: My project + companyName: Kingjuulian + productName: Square Dash defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1} @@ -81,7 +81,7 @@ PlayerSettings: androidPredictiveBackSupport: 0 defaultIsNativeResolution: 1 macRetinaSupport: 1 - runInBackground: 0 + runInBackground: 1 captureSingleScreen: 0 muteOtherAudioSources: 0 Prepare IOS For Recording: 0 @@ -94,7 +94,7 @@ PlayerSettings: bakeCollisionMeshes: 0 forceSingleInstance: 0 useFlipModelSwapchain: 1 - resizableWindow: 0 + resizableWindow: 1 useMacAppStoreValidation: 0 macAppStoreCategory: public.app-category.games gpuSkinning: 0 @@ -106,7 +106,7 @@ PlayerSettings: xboxEnableFitness: 0 visibleInBackground: 1 allowFullscreenSwitch: 1 - fullscreenMode: 1 + fullscreenMode: 0 xboxSpeechDB: 0 xboxEnableHeadOrientation: 0 xboxEnableGuest: 0 @@ -138,7 +138,7 @@ PlayerSettings: vulkanEnableLateAcquireNextImage: 0 vulkanEnableCommandBufferRecycling: 1 loadStoreDebugModeEnabled: 0 - bundleVersion: 1.0 + bundleVersion: 1.1 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0