From 060a832454dc4d1aee766f5ddd97084305b54aac Mon Sep 17 00:00:00 2001 From: pampas93 Date: Sun, 8 Aug 2021 20:38:11 -0600 Subject: [PATCH] Import and use project into Unity 2019.4.18. Works as expected (with no code changes) --- .vscode/settings.json | 56 ++++ .../ImageEffects/BloomAndFlaresEditor.cs | 2 +- .../Editor/ImageEffects/BloomEditor.cs | 2 +- .../Editor/ImageEffects/TonemappingEditor.cs | 2 +- .../Effects/ImageEffects/Scripts/Bloom.cs | 2 +- .../ImageEffects/Scripts/BloomAndFlares.cs | 2 +- .../ImageEffects/Scripts/DepthOfField.cs | 6 +- .../Effects/ImageEffects/Scripts/SunShafts.cs | 2 +- Assets/_TerrainAutoUpgrade.meta | 8 + ...ayer_ground012023054508611406.terrainlayer | Bin 0 -> 4316 bytes ...ground012023054508611406.terrainlayer.meta | 8 + ...layer_ground01793646612c42751.terrainlayer | Bin 0 -> 4316 bytes ..._ground01793646612c42751.terrainlayer.meta | 8 + ...layer_ground02ddfc8d7f3483abd.terrainlayer | Bin 0 -> 4316 bytes ..._ground02ddfc8d7f3483abd.terrainlayer.meta | 8 + ...ayer_ground038f9406e577a89d2d.terrainlayer | Bin 0 -> 4316 bytes ...ground038f9406e577a89d2d.terrainlayer.meta | 8 + Logs/Packages-Update.log | 45 +++ Packages/manifest.json | 42 +++ Packages/packages-lock.json | 312 ++++++++++++++++++ ProjectSettings/EditorSettings.asset | Bin 4168 -> 4268 bytes ProjectSettings/PackageManagerSettings.asset | 38 +++ ProjectSettings/PresetManager.asset | Bin 0 -> 4104 bytes ProjectSettings/ProjectVersion.txt | 3 +- ProjectSettings/VFXManager.asset | Bin 0 -> 4160 bytes ProjectSettings/XRSettings.asset | 10 + 26 files changed, 554 insertions(+), 10 deletions(-) create mode 100644 .vscode/settings.json create mode 100644 Assets/_TerrainAutoUpgrade.meta create mode 100644 Assets/_TerrainAutoUpgrade/layer_ground012023054508611406.terrainlayer create mode 100644 Assets/_TerrainAutoUpgrade/layer_ground012023054508611406.terrainlayer.meta create mode 100644 Assets/_TerrainAutoUpgrade/layer_ground01793646612c42751.terrainlayer create mode 100644 Assets/_TerrainAutoUpgrade/layer_ground01793646612c42751.terrainlayer.meta create mode 100644 Assets/_TerrainAutoUpgrade/layer_ground02ddfc8d7f3483abd.terrainlayer create mode 100644 Assets/_TerrainAutoUpgrade/layer_ground02ddfc8d7f3483abd.terrainlayer.meta create mode 100644 Assets/_TerrainAutoUpgrade/layer_ground038f9406e577a89d2d.terrainlayer create mode 100644 Assets/_TerrainAutoUpgrade/layer_ground038f9406e577a89d2d.terrainlayer.meta create mode 100644 Logs/Packages-Update.log create mode 100644 Packages/manifest.json create mode 100644 Packages/packages-lock.json create mode 100644 ProjectSettings/PackageManagerSettings.asset create mode 100644 ProjectSettings/PresetManager.asset create mode 100644 ProjectSettings/VFXManager.asset create mode 100644 ProjectSettings/XRSettings.asset diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..1060b04 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,56 @@ +{ + "files.exclude": + { + "**/.DS_Store":true, + "**/.git":true, + "**/.gitignore":true, + "**/.gitmodules":true, + "**/*.booproj":true, + "**/*.pidb":true, + "**/*.suo":true, + "**/*.user":true, + "**/*.userprefs":true, + "**/*.unityproj":true, + "**/*.dll":true, + "**/*.exe":true, + "**/*.pdf":true, + "**/*.mid":true, + "**/*.midi":true, + "**/*.wav":true, + "**/*.gif":true, + "**/*.ico":true, + "**/*.jpg":true, + "**/*.jpeg":true, + "**/*.png":true, + "**/*.psd":true, + "**/*.tga":true, + "**/*.tif":true, + "**/*.tiff":true, + "**/*.3ds":true, + "**/*.3DS":true, + "**/*.fbx":true, + "**/*.FBX":true, + "**/*.lxo":true, + "**/*.LXO":true, + "**/*.ma":true, + "**/*.MA":true, + "**/*.obj":true, + "**/*.OBJ":true, + "**/*.asset":true, + "**/*.cubemap":true, + "**/*.flare":true, + "**/*.mat":true, + "**/*.meta":true, + "**/*.prefab":true, + "**/*.unity":true, + "build/":true, + "Build/":true, + "Library/":true, + "library/":true, + "obj/":true, + "Obj/":true, + "ProjectSettings/":true, + "temp/":true, + "Temp/":true + } +} \ No newline at end of file diff --git a/Assets/NatureStarterKit2/Editor/ImageEffects/BloomAndFlaresEditor.cs b/Assets/NatureStarterKit2/Editor/ImageEffects/BloomAndFlaresEditor.cs index 2966e5d..42d3803 100644 --- a/Assets/NatureStarterKit2/Editor/ImageEffects/BloomAndFlaresEditor.cs +++ b/Assets/NatureStarterKit2/Editor/ImageEffects/BloomAndFlaresEditor.cs @@ -77,7 +77,7 @@ public override void OnInspectorGUI () { // display info text when screen blend mode cannot be used Camera cam = (target as BloomAndFlares).GetComponent(); if (cam != null) { - if (screenBlendMode.enumValueIndex==0 && ((cam.hdr && hdr.enumValueIndex==0) || (hdr.enumValueIndex==1))) { + if (screenBlendMode.enumValueIndex==0 && ((cam.allowHDR && hdr.enumValueIndex==0) || (hdr.enumValueIndex==1))) { EditorGUILayout.HelpBox("Screen blend is not supported in HDR. Using 'Add' instead.", MessageType.Info); } } diff --git a/Assets/NatureStarterKit2/Editor/ImageEffects/BloomEditor.cs b/Assets/NatureStarterKit2/Editor/ImageEffects/BloomEditor.cs index 6957591..58c9628 100644 --- a/Assets/NatureStarterKit2/Editor/ImageEffects/BloomEditor.cs +++ b/Assets/NatureStarterKit2/Editor/ImageEffects/BloomEditor.cs @@ -85,7 +85,7 @@ public override void OnInspectorGUI () { // display info text when screen blend mode cannot be used Camera cam = (target as Bloom).GetComponent(); if (cam != null) { - if (screenBlendMode.enumValueIndex==0 && ((cam.hdr && hdr.enumValueIndex==0) || (hdr.enumValueIndex==1))) { + if (screenBlendMode.enumValueIndex==0 && ((cam.allowHDR && hdr.enumValueIndex==0) || (hdr.enumValueIndex==1))) { EditorGUILayout.HelpBox("Screen blend is not supported in HDR. Using 'Add' instead.", MessageType.Info); } } diff --git a/Assets/NatureStarterKit2/Editor/ImageEffects/TonemappingEditor.cs b/Assets/NatureStarterKit2/Editor/ImageEffects/TonemappingEditor.cs index 613631f..f6128a4 100644 --- a/Assets/NatureStarterKit2/Editor/ImageEffects/TonemappingEditor.cs +++ b/Assets/NatureStarterKit2/Editor/ImageEffects/TonemappingEditor.cs @@ -42,7 +42,7 @@ public override void OnInspectorGUI () { Camera cam = (target as Tonemapping).GetComponent(); if (cam != null) { - if (!cam.hdr) { + if (!cam.allowHDR) { EditorGUILayout.HelpBox("The camera is not HDR enabled. This will likely break the Tonemapper.", MessageType.Warning); } else if (!(target as Tonemapping).validRenderTextureFormat) { diff --git a/Assets/NatureStarterKit2/Standard Assets/Effects/ImageEffects/Scripts/Bloom.cs b/Assets/NatureStarterKit2/Standard Assets/Effects/ImageEffects/Scripts/Bloom.cs index d5fd7a6..15f39ff 100644 --- a/Assets/NatureStarterKit2/Standard Assets/Effects/ImageEffects/Scripts/Bloom.cs +++ b/Assets/NatureStarterKit2/Standard Assets/Effects/ImageEffects/Scripts/Bloom.cs @@ -106,7 +106,7 @@ public void OnRenderImage (RenderTexture source, RenderTexture destination) doHdr = false; if (hdr == HDRBloomMode.Auto) - doHdr = source.format == RenderTextureFormat.ARGBHalf && GetComponent().hdr; + doHdr = source.format == RenderTextureFormat.ARGBHalf && GetComponent().allowHDR; else { doHdr = hdr == HDRBloomMode.On; } diff --git a/Assets/NatureStarterKit2/Standard Assets/Effects/ImageEffects/Scripts/BloomAndFlares.cs b/Assets/NatureStarterKit2/Standard Assets/Effects/ImageEffects/Scripts/BloomAndFlares.cs index 3769c21..da269f5 100644 --- a/Assets/NatureStarterKit2/Standard Assets/Effects/ImageEffects/Scripts/BloomAndFlares.cs +++ b/Assets/NatureStarterKit2/Standard Assets/Effects/ImageEffects/Scripts/BloomAndFlares.cs @@ -109,7 +109,7 @@ void OnRenderImage(RenderTexture source, RenderTexture destination) doHdr = false; if (hdr == HDRBloomMode.Auto) - doHdr = source.format == RenderTextureFormat.ARGBHalf && GetComponent().hdr; + doHdr = source.format == RenderTextureFormat.ARGBHalf && GetComponent().allowHDR; else { doHdr = hdr == HDRBloomMode.On; diff --git a/Assets/NatureStarterKit2/Standard Assets/Effects/ImageEffects/Scripts/DepthOfField.cs b/Assets/NatureStarterKit2/Standard Assets/Effects/ImageEffects/Scripts/DepthOfField.cs index 4b4ba8e..2ab0668 100644 --- a/Assets/NatureStarterKit2/Standard Assets/Effects/ImageEffects/Scripts/DepthOfField.cs +++ b/Assets/NatureStarterKit2/Standard Assets/Effects/ImageEffects/Scripts/DepthOfField.cs @@ -91,7 +91,7 @@ void ReleaseComputeResources () { void CreateComputeResources () { if (cbDrawArgs == null) { - cbDrawArgs = new ComputeBuffer (1, 16, ComputeBufferType.DrawIndirect); + cbDrawArgs = new ComputeBuffer (1, 16, ComputeBufferType.IndirectArguments); var args= new int[4]; args[0] = 0; args[1] = 1; args[2] = 0; args[3] = 0; cbDrawArgs.SetData (args); @@ -256,7 +256,7 @@ void OnRenderImage (RenderTexture source, RenderTexture destination) { dx11bokehMaterial.SetVector ("_Screen", new Vector3(1.0f/(1.0f*source.width), 1.0f/(1.0f*source.height), internalBlurWidth)); dx11bokehMaterial.SetPass (2); - Graphics.DrawProceduralIndirect (MeshTopology.Points, cbDrawArgs, 0); + Graphics.DrawProceduralIndirectNow (MeshTopology.Points, cbDrawArgs, 0); Graphics.Blit (dest2, destination); // hackaround for DX11 high resolution flipfun (OPTIMIZEME) @@ -330,7 +330,7 @@ void OnRenderImage (RenderTexture source, RenderTexture destination) { dx11bokehMaterial.SetTexture ("_MainTex", dx11BokehTexture); dx11bokehMaterial.SetVector ("_Screen", new Vector3(1.0f/(1.0f*rtLow2.width), 1.0f/(1.0f*rtLow2.height), internalBlurWidth)); dx11bokehMaterial.SetPass (1); - Graphics.DrawProceduralIndirect (MeshTopology.Points, cbDrawArgs, 0); + Graphics.DrawProceduralIndirectNow (MeshTopology.Points, cbDrawArgs, 0); // upsample & combine dofHdrMaterial.SetTexture ("_LowRez", rtLow2); diff --git a/Assets/NatureStarterKit2/Standard Assets/Effects/ImageEffects/Scripts/SunShafts.cs b/Assets/NatureStarterKit2/Standard Assets/Effects/ImageEffects/Scripts/SunShafts.cs index 480ef25..508ea52 100644 --- a/Assets/NatureStarterKit2/Standard Assets/Effects/ImageEffects/Scripts/SunShafts.cs +++ b/Assets/NatureStarterKit2/Standard Assets/Effects/ImageEffects/Scripts/SunShafts.cs @@ -90,7 +90,7 @@ void OnRenderImage (RenderTexture source, RenderTexture destination) { sunShaftsMaterial.SetVector ("_SunThreshold", sunThreshold); if (!useDepthTexture) { - var format= GetComponent().hdr ? RenderTextureFormat.DefaultHDR: RenderTextureFormat.Default; + var format= GetComponent().allowHDR ? RenderTextureFormat.DefaultHDR: RenderTextureFormat.Default; RenderTexture tmpBuffer = RenderTexture.GetTemporary (source.width, source.height, 0, format); RenderTexture.active = tmpBuffer; GL.ClearWithSkybox (false, GetComponent()); diff --git a/Assets/_TerrainAutoUpgrade.meta b/Assets/_TerrainAutoUpgrade.meta new file mode 100644 index 0000000..ed06245 --- /dev/null +++ b/Assets/_TerrainAutoUpgrade.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ebe264cc1542dbd42a58bb202763b9b3 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_TerrainAutoUpgrade/layer_ground012023054508611406.terrainlayer b/Assets/_TerrainAutoUpgrade/layer_ground012023054508611406.terrainlayer new file mode 100644 index 0000000000000000000000000000000000000000..1142490576d7346715728d07391a63aa3c1e89e3 GIT binary patch literal 4316 zcmeH~J!}+57>2*Wgr9`J1PK4I1PH$|cg6-AA)vqzq8N_Yia->wm_4{~-m~`B!KPuQ z2ns-yGzbI@LVzgf5P~vILKWyxqBIC7QUO)O@xHS==63hiNYppde7o~LGw*!+&7E&8 zGU+do8P7yyHm^!6?%P3`p*O$%YRmi zhyE^f`s2eMYf1mFLC5l+lj2IAp|+=?v+8rvMJyc|=zkrxJ%@YNe;&mK`~p<+`NT0E z`d@@f{{_S`9`|3E!Hxf-6j$;y^1BS3XSX=TL;oAlncot0)nNad5w|kSOY2)5Ow|!Elq`22Cs-84Nf1wQFMO$iVYw{idlf zKmHa-gZ<6-b7KZK`Qdl2;d+x_X9hRZ%g;ll3($SKS5C>vq-qaCiLx1;mryW=4M!($5B&3TRps5U z9P_2cG%~6E@p}5E!z;Sayt#C>_}jb*d`W1wW(ArRXjY(Efo27o75L-|@c)4_Urr7k z^D0B`(OkYQ*R~>q2vw)6~Y^*uSGo(0?9 E1FrKO8UO$Q literal 0 HcmV?d00001 diff --git a/Assets/_TerrainAutoUpgrade/layer_ground012023054508611406.terrainlayer.meta b/Assets/_TerrainAutoUpgrade/layer_ground012023054508611406.terrainlayer.meta new file mode 100644 index 0000000..a0ff9d0 --- /dev/null +++ b/Assets/_TerrainAutoUpgrade/layer_ground012023054508611406.terrainlayer.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ba4ed6c5a312a9b46bfd25b4804e794e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_TerrainAutoUpgrade/layer_ground01793646612c42751.terrainlayer b/Assets/_TerrainAutoUpgrade/layer_ground01793646612c42751.terrainlayer new file mode 100644 index 0000000000000000000000000000000000000000..7ffec49d5661f1844447df99e90b19c02acb83cc GIT binary patch literal 4316 zcmeH~Piz!b9LIl;mOm;K6#rEa2eDeUuHClu4*qZj3*-WrG(f*v?&PlVQcBd%+-h7dIc zsV z5_pk6bBI4*-2buE`gs12r?`^$@qAbD(5&wh`RGne`p=5!QZ+&b+%)T*;4kz7L?&doy}-OV*E{q}9&n$rKO$KY>pFr_h^Q(tj)9 zYW`2Bc)%bW1wRLs z`~~6|5B<+WrT;eK7?1mJ&)~-Y#S~X^1o>Tr&a>N*;-UX#=*;gWbk$=2?;>tx@GBAD znZd6`{N)r^x_;Lq&c6fAjo-pb%6 zzgz}4`MsUuVSW#wGr#^6kLQQKQ)rfs45mINzX44w9T^Na`3-7f>BwNX$!|y#OGgHt zKkL_}!uN|epYyo7=|Y&beu{`k(H zy|ss*bIg|()5xUp^WU3Cj`d8O`RBs7rPJN(_>$0W?FzIj(5^tc0__U4EAYQ7!2cI2 zd^wpp;nn8d+5Y^<*x>Nc@Nj;hI5aS_o9}b{4GwOGZ?4%J1>=~7{$DNFm!3hbxhH2d HvtZvNp=liK literal 0 HcmV?d00001 diff --git a/Assets/_TerrainAutoUpgrade/layer_ground01793646612c42751.terrainlayer.meta b/Assets/_TerrainAutoUpgrade/layer_ground01793646612c42751.terrainlayer.meta new file mode 100644 index 0000000..901b3dc --- /dev/null +++ b/Assets/_TerrainAutoUpgrade/layer_ground01793646612c42751.terrainlayer.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 581afafd8c3d1964a95422071200ef60 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_TerrainAutoUpgrade/layer_ground02ddfc8d7f3483abd.terrainlayer b/Assets/_TerrainAutoUpgrade/layer_ground02ddfc8d7f3483abd.terrainlayer new file mode 100644 index 0000000000000000000000000000000000000000..a2a8a2a11794fcb4a39a8ff9c119160fa0f72f59 GIT binary patch literal 4316 zcmeH~$!`=#6vkg+0%T#$0ts6O2#|yrZ-g<5SR~9Q3`1;1iE=>YnI1FAxX0>gCpJP# zpK<_;e*htc3yPA612=@=m{Sl3;1CIcP$Wb+a709kn0#M#mpwf_?L*E}QoXMJepRo& zel_E1i!8b$vh2Qyyp1a^B0XK*{hfWC-MLb?ysX#jNgFai(FBDVmpdf9swA8bh4bwiP9R^5>%e>o-@tXA(GcRM zpgchCjkxFf4s@hKj2d|-@^8cKBJ^mFFoKB8zXMkt=YPd$GZ-|Pe}UoQ%!KCr3sYRl zkMkt-7 z!P>Ca%2dj(?~oH%`wcpMFG+DFH}QN&pfmSU^v2d)KYo(tI-lh!9_9ZUI`gkUZ*0x^ z-vpd1|63^@<@ca7KR)b<)|~$x(7E!jOmQXmQQIG&v+AqRMH~|unEw)LdlqBX|6PhL z_%u}V_lOfb%6}dz^RFgO@MQiq8QkVyo8n5ofWHgSd3NhkJj#C=I{mFjS1tDcIp$6V z|0U+{XYk)*z9Gexso#~D^Y1`ob)|UHAO23EIVLjL`dEKGhBziNSZ@9G8seD9V7c|zXNY4W z1J9rJTcRR={4J0c``hp5ry1P(!|zmB>M7Tkd_M3$8z`28 zsy{FpxL&PX^>)kH$phtzdw4$vc^#a>z|710Zb^?E_G*Fl3NEMZFPBOaHFwyZ3?_UR z!m+A9rYnPbd{!FNwQm!`Fmex-PrEWHQ&_^=o7JhxWEO|;ceL07nO?BsKIOpgziJvlAkH>-LQO6+E4UXy}3Y&bf3{?)_3 zw^m<%$9ulC*hVIQy~zF9Gkxax)m67gm)^Mf4_^}6tzCh31=*J zp-&uu@DCUxTnItnzzJgXXksE<&>J7|AVCkt6DPy?Jk?#xboca{aGpx)?XKrn_0-#M z&Fu7wEV?PO^p=P`k1H-B1BL!l-(X*VvC=OOTdkH-5NC8PkXEbo+wUL#a{Y(TPu?$n zUq1EVn|Fa6a86+x5(%-SWd@;%CMe7}*CXK-CEy!CEnc+%y;rYJ9L$kh5k%!zRYRFIZqdx59tfAW8&U;M#R>Om} zVXc*^lwIE=pJ45m=*)XbhAa6I&$kCUy`M#IZ|VB+lQh@)JeT2-|32vSUxwb^(*DZ< z=ki~X;gP=wo&NZ+CtBM71<<+tS7x}9Td3_Z=&bsS=pv4Z4D>&X+Md8Y>%WR(2Yw1F z`AftJ9{Hb!O8?cw37+(SIfq;SH5sntGvxO*be`QS86NqcgUK z+8ll{=Ib(CnfhIhIsXo{H-5j*BL8a;ncwT}5cih<6!SMa@V{|>ze4BpuQ%K=ks*D4 zZyMs5$Y8mxZ?7Sai42zC!#(qRi(-fR-G@s4HgSS0VSax>Wquoo6FhnT8*{kL@0}cO z^XtpuHor|79_9Bhbmmvc@MM1YJB8+$$YASZ^BXY4F_FP?o8M+b91|HVxA_ek;+V+5 z^Jo2*s3<@F7D$Kv?e}wQ4!8N?cdp}ln_n@9+x$u?KIZzqu6ld*jO$Ce9Qf}IPgH}t zKRg|{UZYy~-j~V!A5?4Z?wz

);S>%)GMiR`h}0UL(-nxXWoftCdQ#;f}e}LDP33 zd{p-*b!|jXJ(5Or91sm@#0_+< zRvjmutk;7>p4(_(5N$O&u4~*l&g4^fQcsOkJvk~z(yE?@5@$0zFQs4(8;(vMd~x^B z-ulDC9P_2cHZu9+_L&RK=G9%7dVen5yYcM~z9e*8w*uV?bSu!UK(_+j3OsfN`2RqS zFDLsC`t_zaQP^Cplm-i1-7P~yx>%YRn23I#!)wu-YyL)Oc8L6g{(mjpmYqSZy{Bii HvvAvgA?qMm literal 0 HcmV?d00001 diff --git a/Assets/_TerrainAutoUpgrade/layer_ground038f9406e577a89d2d.terrainlayer.meta b/Assets/_TerrainAutoUpgrade/layer_ground038f9406e577a89d2d.terrainlayer.meta new file mode 100644 index 0000000..f867c23 --- /dev/null +++ b/Assets/_TerrainAutoUpgrade/layer_ground038f9406e577a89d2d.terrainlayer.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ee78c054005e2a74abefec1af2724168 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Logs/Packages-Update.log b/Logs/Packages-Update.log new file mode 100644 index 0000000..42aff81 --- /dev/null +++ b/Logs/Packages-Update.log @@ -0,0 +1,45 @@ + +=== Sun Aug 8 20:26:44 2021 + +Packages were changed. +Update Mode: resetToDefaultDependencies + +The following packages were added: + com.unity.collab-proxy@1.2.16 + com.unity.ide.rider@1.1.4 + com.unity.ide.vscode@1.2.3 + com.unity.modules.ai@1.0.0 + com.unity.modules.androidjni@1.0.0 + com.unity.modules.animation@1.0.0 + com.unity.modules.assetbundle@1.0.0 + com.unity.modules.audio@1.0.0 + com.unity.modules.cloth@1.0.0 + com.unity.modules.director@1.0.0 + com.unity.modules.imageconversion@1.0.0 + com.unity.modules.imgui@1.0.0 + com.unity.modules.jsonserialize@1.0.0 + com.unity.modules.particlesystem@1.0.0 + com.unity.modules.physics@1.0.0 + com.unity.modules.physics2d@1.0.0 + com.unity.modules.screencapture@1.0.0 + com.unity.modules.terrain@1.0.0 + com.unity.modules.terrainphysics@1.0.0 + com.unity.modules.tilemap@1.0.0 + com.unity.modules.ui@1.0.0 + com.unity.modules.uielements@1.0.0 + com.unity.modules.umbra@1.0.0 + com.unity.modules.unityanalytics@1.0.0 + com.unity.modules.unitywebrequest@1.0.0 + com.unity.modules.unitywebrequestassetbundle@1.0.0 + com.unity.modules.unitywebrequestaudio@1.0.0 + com.unity.modules.unitywebrequesttexture@1.0.0 + com.unity.modules.unitywebrequestwww@1.0.0 + com.unity.modules.vehicles@1.0.0 + com.unity.modules.video@1.0.0 + com.unity.modules.vr@1.0.0 + com.unity.modules.wind@1.0.0 + com.unity.modules.xr@1.0.0 + com.unity.test-framework@1.1.20 + com.unity.textmeshpro@2.1.1 + com.unity.timeline@1.2.17 + com.unity.ugui@1.0.0 diff --git a/Packages/manifest.json b/Packages/manifest.json new file mode 100644 index 0000000..4b8fc96 --- /dev/null +++ b/Packages/manifest.json @@ -0,0 +1,42 @@ +{ + "dependencies": { + "com.unity.collab-proxy": "1.2.16", + "com.unity.ide.rider": "1.1.4", + "com.unity.ide.vscode": "1.2.3", + "com.unity.test-framework": "1.1.20", + "com.unity.textmeshpro": "2.1.1", + "com.unity.timeline": "1.2.17", + "com.unity.ugui": "1.0.0", + "com.unity.modules.ai": "1.0.0", + "com.unity.modules.androidjni": "1.0.0", + "com.unity.modules.animation": "1.0.0", + "com.unity.modules.assetbundle": "1.0.0", + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.cloth": "1.0.0", + "com.unity.modules.director": "1.0.0", + "com.unity.modules.imageconversion": "1.0.0", + "com.unity.modules.imgui": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.particlesystem": "1.0.0", + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.physics2d": "1.0.0", + "com.unity.modules.screencapture": "1.0.0", + "com.unity.modules.terrain": "1.0.0", + "com.unity.modules.terrainphysics": "1.0.0", + "com.unity.modules.tilemap": "1.0.0", + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.uielements": "1.0.0", + "com.unity.modules.umbra": "1.0.0", + "com.unity.modules.unityanalytics": "1.0.0", + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.unitywebrequestassetbundle": "1.0.0", + "com.unity.modules.unitywebrequestaudio": "1.0.0", + "com.unity.modules.unitywebrequesttexture": "1.0.0", + "com.unity.modules.unitywebrequestwww": "1.0.0", + "com.unity.modules.vehicles": "1.0.0", + "com.unity.modules.video": "1.0.0", + "com.unity.modules.vr": "1.0.0", + "com.unity.modules.wind": "1.0.0", + "com.unity.modules.xr": "1.0.0" + } +} diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json new file mode 100644 index 0000000..5518649 --- /dev/null +++ b/Packages/packages-lock.json @@ -0,0 +1,312 @@ +{ + "dependencies": { + "com.unity.collab-proxy": { + "version": "1.2.16", + "depth": 0, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.ext.nunit": { + "version": "1.0.6", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.ide.rider": { + "version": "1.1.4", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.test-framework": "1.1.1" + }, + "url": "https://packages.unity.com" + }, + "com.unity.ide.vscode": { + "version": "1.2.3", + "depth": 0, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.test-framework": { + "version": "1.1.20", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.ext.nunit": "1.0.6", + "com.unity.modules.imgui": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.textmeshpro": { + "version": "2.1.1", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.ugui": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.timeline": { + "version": "1.2.17", + "depth": 0, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.ugui": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.imgui": "1.0.0" + } + }, + "com.unity.modules.ai": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.androidjni": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.animation": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.assetbundle": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.audio": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.cloth": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.physics": "1.0.0" + } + }, + "com.unity.modules.director": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.animation": "1.0.0" + } + }, + "com.unity.modules.imageconversion": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.imgui": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.jsonserialize": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.particlesystem": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.physics": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.physics2d": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.screencapture": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.imageconversion": "1.0.0" + } + }, + "com.unity.modules.subsystems": { + "version": "1.0.0", + "depth": 1, + "source": "builtin", + "dependencies": { + "com.unity.modules.jsonserialize": "1.0.0" + } + }, + "com.unity.modules.terrain": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.terrainphysics": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.terrain": "1.0.0" + } + }, + "com.unity.modules.tilemap": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.physics2d": "1.0.0" + } + }, + "com.unity.modules.ui": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.uielements": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.imgui": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0" + } + }, + "com.unity.modules.umbra": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.unityanalytics": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0" + } + }, + "com.unity.modules.unitywebrequest": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.unitywebrequestassetbundle": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.assetbundle": "1.0.0", + "com.unity.modules.unitywebrequest": "1.0.0" + } + }, + "com.unity.modules.unitywebrequestaudio": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.audio": "1.0.0" + } + }, + "com.unity.modules.unitywebrequesttexture": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.imageconversion": "1.0.0" + } + }, + "com.unity.modules.unitywebrequestwww": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.unitywebrequestassetbundle": "1.0.0", + "com.unity.modules.unitywebrequestaudio": "1.0.0", + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.assetbundle": "1.0.0", + "com.unity.modules.imageconversion": "1.0.0" + } + }, + "com.unity.modules.vehicles": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.physics": "1.0.0" + } + }, + "com.unity.modules.video": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.unitywebrequest": "1.0.0" + } + }, + "com.unity.modules.vr": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.xr": "1.0.0" + } + }, + "com.unity.modules.wind": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.xr": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.subsystems": "1.0.0" + } + } + } +} diff --git a/ProjectSettings/EditorSettings.asset b/ProjectSettings/EditorSettings.asset index c9c2060c6e45280e77e23dabbee675bb49fe83dd..89910c387cefbd9f92715158a73f32c7430de5aa 100644 GIT binary patch literal 4268 zcmeI0$!{D*6o;#Awy>HdVF`=bw_t381jq66Mr%` zcZD%_l4hD1TV7mxZ{h8QrFZw1*nj}LRa7;N*{jJHG* zbZ`pEyj2IWX0z-!VyDRm{1-6_4e*P^_o*Z9?Z&2{u=kApnryf|NBR{&CjnS$MxZy%B|S{brOQxN*ZVs{BOq}93ZnQ_(?h(*grIZ zFFOA41itC`BV#z~t4$pBL&eTY=|%o4^>vEyarN~mIDEJ^Twjloyvl8Tf9c{s4!a%( z+lJ#mLE_`$p9Xifn1s&T265EaE8x9>((w7dO6a)reGPnIPV4IT*XtwP*4Mu-{u$Wz zFxWO6{|yo!7k>fV*|p|cd|?>P23kM;&JpD*F-mEC`i_bQc+JscvzQeOC0)viZTs% zYhsUgVtr1u`9UO=F=#fmdfyL3D$eG)&>xUmQ<2{8wrF)?uIlMQq-2_i6am+xSZu68 zhwHXo80DRfs-B;zNQ)*9J{2|$U293yi2@aPV6l1ek?M^5Ezev}4&n}J}CS*+>rm^Hm z;t1Qx46*lH_5Qp9;j~RNFwMX;1JevlGf>I^-nA}8c|^a>^P58Rc|7XmR-yciS2C$A z3mtm&q_+tBZjJXV-PJ4IBwpD|^-2(~@I0YkHD?JM&-}5#=*iapRvDS&nDCAr+UGXX GW$b^XiuASs literal 4168 zcmeH~yN=U96o!x2-0u*eK}h=qK`R6lX`;QrQUqnOScwV^_6f|cR zstN)DA3&?>-H)BGhlBOQ+k@iZ`{u9VO`$&}LTt-;Kvc?+s$P^tfqXuORDKSqJRuNL zO$4+p{IaZ3zap7R?5zZAGDCnvHyDG5^i9|;IRl+zt&nzv?@2)SBiRov?J3DL z#$LlWT7DW_#u0xmb7-FdlySsUnS-ANlmU+Z-^(0*o&zkwyZxUR+}HmF@H)EvU;N7( z{ZF!n{w2wM`tYw$A5XDQUmkGF8~rb`hW<6lefk5`k8!5!|8?*>y8Yj1`BtKxu@O6` zvsVSpUu-QM+f1dqYzu9&4U;)*(rA(A#yZ)L*lLyPx5~-x#3U?ilV@s?x^;f7-e_Z6 z8s%0yo~n4C`_NP+iTvi&9IzFQsWp2XyGNX{t+gL#ak@x2K|>i@L3jUDJvGKXQFAVG z6{D4B1>07GleRiq%w~F7+t7T;f5*U! mR~Pza%BvH0YW1N`x#)I_`yTG0Zs|tLc{-Y9ZWJfSHGcp&?8W;4 diff --git a/ProjectSettings/PackageManagerSettings.asset b/ProjectSettings/PackageManagerSettings.asset new file mode 100644 index 0000000..6920e3a --- /dev/null +++ b/ProjectSettings/PackageManagerSettings.asset @@ -0,0 +1,38 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &1 +MonoBehaviour: + m_ObjectHideFlags: 61 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 13964, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_ScopedRegistriesSettingsExpanded: 1 + oneTimeWarningShown: 0 + m_Registries: + - m_Id: main + m_Name: + m_Url: https://packages.unity.com + m_Scopes: [] + m_IsDefault: 1 + m_UserSelectedRegistryName: + m_UserAddingNewScopedRegistry: 0 + m_RegistryInfoDraft: + m_ErrorMessage: + m_Original: + m_Id: + m_Name: + m_Url: + m_Scopes: [] + m_IsDefault: 0 + m_Modified: 0 + m_Name: + m_Url: + m_Scopes: + - + m_SelectedScopeIndex: 0 diff --git a/ProjectSettings/PresetManager.asset b/ProjectSettings/PresetManager.asset new file mode 100644 index 0000000000000000000000000000000000000000..1d4bb8e35eaf1049e76d17a2c2d9d32eae94ad8a GIT binary patch literal 4104 zcmeHFJx^3Y6uq;bd?TRpVX+A%#lj;bLL!7>LnH>XkZp;1=tGdz81`X8XvRNaV?jYf zv9TgCF|o4o4_KN|@gMjDKF^ui$G+KLKruJDcV^C+duQ&M5h<*SJm?dVM;I}PEG`5q z)un2%ydTKFBuSJ4Seb9{NRoX0bvFBRXS*F-?{0m+n*1{Z>JpxV)1HcGq$FmcO*BD? zl5cs@Ka}VK5SFB;M*bGLBLJ9h>gkl_-kb`+)5+&aIecDjfIPt&tWVFHlDt%MqTgW; z^NS>PcZWho1^8QsV+7C~fv4vY=$HwW$2;9psKKvAMv01~?CcWXhUXPi)aoDs} zJ&X@}_iTjC=3e;vNSq^tsn6^&Ybar7wpNTA*&f`UdjGiDjqM#66Bi>{+6Ww5vWgTDOVUG%mH;;-Jj~)d7 zLVrQ;g1_Key<>DuAZHKL&^H0nfE5eTNFq5AAB`u+b4mIPf ztqpHu6a*K!cs}uBe`JP^PTy~yuKPhfAi0HOjL64G5FY%nhDD&`K1TkdAio|6_m^k5 zf%!J9!^n1I9WojM$SbrH0C_%!gcPa{=Ht+xz_A&rzu{{VwX8pbJ?l68FnUv|-w3#t zep3~%@1FtA`h16IRO+{Ytfk*t#cTa7;H=MHMWa%mdur)-RPllq;NKx|e!or@_qphR zzDNS$WWEcqNPUyM$BXd$3_^pw=YP`Q_l?mC_&k#Fo+@6@9k?stJl~6q2EQNkw*Z;% zi;~!{&u=W-MSDkjluj#ea<)`(50tca?X2{ssj#_N%sQUjRvG~?@9fFNIc(Cl+6_0e zCHG|JAeWQgPm@*hekUyDIc~YNu`|P&OXb9^2ai}<`kr*q>J;i zeLN@kl+93hckPa@`p2a7Vybb#IA9zw4j2cF1I7X4fN{V$U>x{Y4xFEzO};!YO??3e C4S|dR literal 0 HcmV?d00001 diff --git a/ProjectSettings/XRSettings.asset b/ProjectSettings/XRSettings.asset new file mode 100644 index 0000000..482590c --- /dev/null +++ b/ProjectSettings/XRSettings.asset @@ -0,0 +1,10 @@ +{ + "m_SettingKeys": [ + "VR Device Disabled", + "VR Device User Alert" + ], + "m_SettingValues": [ + "False", + "False" + ] +} \ No newline at end of file