From 6004a3fe4d409da7bd4a6db52f542d7db8fb8ff8 Mon Sep 17 00:00:00 2001 From: Gregg Tavares Date: Mon, 24 Aug 2020 00:23:07 +0900 Subject: [PATCH] Unity 2020 --- .gitignore | 324 +++------------ Assets/{WebGLExample.meta => Scenes.meta} | 5 +- .../main.unity => Scenes/SampleScene.unity} | 372 ++++++++++-------- .../SampleScene.unity.meta} | 5 +- Assets/Scenes/SampleSceneSettings.lighting | 63 +++ .../Scenes/SampleSceneSettings.lighting.meta | 8 + Assets/SpinSpin.cs | 20 + .../Spin.cs.meta => SpinSpin.cs.meta} | 5 +- Assets/WebGLExample/Spin.cs | 16 - Assets/WebGLTemplates.meta | 5 +- .../{BetterTemplate.meta => Better2020.meta} | 5 +- .../Better2020/TemplateData.meta | 8 + .../Better2020/TemplateData/favicon.ico | Bin 0 -> 13275 bytes .../Better2020/TemplateData/favicon.ico.meta | 7 + .../TemplateData/fullscreen-button.png | Bin 0 -> 175 bytes .../TemplateData/fullscreen-button.png.meta | 7 + .../Better2020/TemplateData/style.css | 105 +++++ .../Better2020/TemplateData/style.css.meta | 7 + Assets/WebGLTemplates/Better2020/index.html | 101 +++++ .../index.html.meta | 5 +- .../{BetterTemplate => Better2020}/logo.png | Bin .../logo.png.meta | 5 +- .../WebGLTemplates/Better2020/thumbnail.png | Bin 0 -> 2288 bytes .../Better2020/thumbnail.png.meta | 7 + .../WebGLTemplates/BetterTemplate/index.html | 126 ------ Packages/manifest.json | 43 ++ Packages/packages-lock.json | 331 ++++++++++++++++ ProjectSettings/AudioManager.asset | 4 +- ProjectSettings/DynamicsManager.asset | 19 +- ProjectSettings/EditorBuildSettings.asset | 1 + ProjectSettings/EditorSettings.asset | 20 +- ProjectSettings/GraphicsSettings.asset | 6 +- ProjectSettings/NavMeshAreas.asset | 2 + ProjectSettings/NetworkManager.asset | 8 - ProjectSettings/Physics2DSettings.asset | 24 +- ProjectSettings/PresetManager.asset | 3 +- ProjectSettings/ProjectSettings.asset | 323 ++++++++------- ProjectSettings/ProjectVersion.txt | 3 +- ProjectSettings/QualitySettings.asset | 61 ++- ProjectSettings/TimelineSettings.asset | 15 + ProjectSettings/UnityConnectSettings.asset | 16 +- ProjectSettings/VFXManager.asset | 12 + ProjectSettings/VersionControlSettings.asset | 8 + ProjectSettings/XRSettings.asset | 10 + WebGLFitWindow.sln | 23 -- 45 files changed, 1343 insertions(+), 795 deletions(-) rename Assets/{WebGLExample.meta => Scenes.meta} (57%) rename Assets/{WebGLExample/main.unity => Scenes/SampleScene.unity} (57%) rename Assets/{WebGLExample/main.unity.meta => Scenes/SampleScene.unity.meta} (53%) create mode 100644 Assets/Scenes/SampleSceneSettings.lighting create mode 100644 Assets/Scenes/SampleSceneSettings.lighting.meta create mode 100644 Assets/SpinSpin.cs rename Assets/{WebGLExample/Spin.cs.meta => SpinSpin.cs.meta} (69%) delete mode 100644 Assets/WebGLExample/Spin.cs rename Assets/WebGLTemplates/{BetterTemplate.meta => Better2020.meta} (57%) create mode 100644 Assets/WebGLTemplates/Better2020/TemplateData.meta create mode 100644 Assets/WebGLTemplates/Better2020/TemplateData/favicon.ico create mode 100644 Assets/WebGLTemplates/Better2020/TemplateData/favicon.ico.meta create mode 100644 Assets/WebGLTemplates/Better2020/TemplateData/fullscreen-button.png create mode 100644 Assets/WebGLTemplates/Better2020/TemplateData/fullscreen-button.png.meta create mode 100644 Assets/WebGLTemplates/Better2020/TemplateData/style.css create mode 100644 Assets/WebGLTemplates/Better2020/TemplateData/style.css.meta create mode 100644 Assets/WebGLTemplates/Better2020/index.html rename Assets/WebGLTemplates/{BetterTemplate => Better2020}/index.html.meta (53%) rename Assets/WebGLTemplates/{BetterTemplate => Better2020}/logo.png (100%) rename Assets/WebGLTemplates/{BetterTemplate => Better2020}/logo.png.meta (53%) create mode 100644 Assets/WebGLTemplates/Better2020/thumbnail.png create mode 100644 Assets/WebGLTemplates/Better2020/thumbnail.png.meta delete mode 100644 Assets/WebGLTemplates/BetterTemplate/index.html create mode 100644 Packages/manifest.json create mode 100644 Packages/packages-lock.json delete mode 100644 ProjectSettings/NetworkManager.asset create mode 100644 ProjectSettings/TimelineSettings.asset create mode 100644 ProjectSettings/VFXManager.asset create mode 100644 ProjectSettings/VersionControlSettings.asset create mode 100644 ProjectSettings/XRSettings.asset delete mode 100644 WebGLFitWindow.sln diff --git a/.gitignore b/.gitignore index 2e9fb96..d0f7e4e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,285 +1,67 @@ -dist -Assets/AssetStoreTools -Assets/AssetStoreTools.meta -Assembly-CSharp-Editor.csproj -Assembly-CSharp.csproj -bin -Temp -Library -.DS_Store -*~ -*.swp -*.bat -*.bak -*.zip -temp -.mayaSwatches -.git -.svn -.hg -*.pyc -*.orig -.project -*.vpj -*.vpw -*.vpwhistu -*.vtg -*.unityproj -*.user -*.userprefs -*.unitypackage +# This .gitignore file should be placed at the root of your Unity project directory +# +# Get latest from https://github.com/github/gitignore/blob/master/Unity.gitignore +# +/[Ll]ibrary/ +/[Tt]emp/ +/[Oo]bj/ +/[Bb]uild/ +/[Bb]uilds/ +/[Ll]ogs/ +/[Oo]ut/ +/[Uu]ser[Ss]ettings/ + +# MemoryCaptures can get excessive in size. +# They also could contain extremely sensitive data +/[Mm]emoryCaptures/ + +# Asset meta data should only be ignored when the corresponding asset is also ignored +!/[Aa]ssets/**/*.meta + +# Uncomment this line if you wish to ignore the asset store tools plugin +# /[Aa]ssets/AssetStoreTools* + +# Autogenerated Jetbrains Rider plugin +/[Aa]ssets/Plugins/Editor/JetBrains* + +# Visual Studio cache directory +.vs/ -## Ignore Visual Studio temporary files, build results, and -## files generated by popular Visual Studio add-ons. +# Gradle cache directory +.gradle/ -# User-specific files +# Autogenerated VS/MD/Consulo solution and project files +ExportedObj/ +.consulo/ +*.csproj +*.unityproj +*.sln *.suo +*.tmp *.user -*.userosscache -*.sln.docstates - -# User-specific files (MonoDevelop/Xamarin Studio) *.userprefs - -# Build results -[Dd]ebug/ -[Dd]ebugPublic/ -[Rr]elease/ -[Rr]eleases/ -x64/ -x86/ -bld/ -[Bb]in/ -[Oo]bj/ -[Ll]og/ - -# Visual Studio 2015 cache/options directory -.vs/ -# Uncomment if you have tasks that create the project's static files in wwwroot -#wwwroot/ - -# MSTest test Results -[Tt]est[Rr]esult*/ -[Bb]uild[Ll]og.* - -# NUNIT -*.VisualState.xml -TestResult.xml - -# Build Results of an ATL Project -[Dd]ebugPS/ -[Rr]eleasePS/ -dlldata.c - -# DNX -project.lock.json -artifacts/ - -*_i.c -*_p.c -*_i.h -*.ilk -# *.meta UNITY NEEDS THIS -*.obj -*.pch -*.pdb -*.pgc -*.pgd -*.rsp -*.sbr -*.tlb -*.tli -*.tlh -*.tmp -*.tmp_proj -*.log -*.vspscc -*.vssscc -.builds *.pidb -*.svclog -*.scc - -# Chutzpah Test files -_Chutzpah* - -# Visual C++ cache files -ipch/ -*.aps -*.ncb +*.booproj +*.svd +*.pdb +*.mdb *.opendb -*.opensdf -*.sdf -*.cachefile *.VC.db -*.VC.VC.opendb - -# Visual Studio profiler -*.psess -*.vsp -*.vspx -*.sap - -# TFS 2012 Local Workspace -$tf/ - -# Guidance Automation Toolkit -*.gpState - -# ReSharper is a .NET coding add-in -_ReSharper*/ -*.[Rr]e[Ss]harper -*.DotSettings.user - -# JustCode is a .NET coding add-in -.JustCode - -# TeamCity is a build add-in -_TeamCity* -# DotCover is a Code Coverage Tool -*.dotCover +# Unity3D generated meta files +*.pidb.meta +*.pdb.meta +*.mdb.meta -# NCrunch -_NCrunch_* -.*crunch*.local.xml -nCrunchTemp_* +# Unity3D generated file on crash reports +sysinfo.txt -# MightyMoose -*.mm.* -AutoTest.Net/ - -# Web workbench (sass) -.sass-cache/ - -# Installshield output folder -[Ee]xpress/ - -# DocProject is a documentation generator add-in -DocProject/buildhelp/ -DocProject/Help/*.HxT -DocProject/Help/*.HxC -DocProject/Help/*.hhc -DocProject/Help/*.hhk -DocProject/Help/*.hhp -DocProject/Help/Html2 -DocProject/Help/html - -# Click-Once directory -publish/ - -# Publish Web Output -*.[Pp]ublish.xml -*.azurePubxml -# TODO: Comment the next line if you want to checkin your web deploy settings -# but database connection strings (with potential passwords) will be unencrypted -*.pubxml -*.publishproj - -# Microsoft Azure Web App publish settings. Comment the next line if you want to -# checkin your Azure Web App publish settings, but sensitive information contained -# in these scripts will be unencrypted -PublishScripts/ - -# NuGet Packages -*.nupkg -# The packages folder can be ignored because of Package Restore -**/packages/* -# except build/, which is used as an MSBuild target. -!**/packages/build/ -# Uncomment if necessary however generally it will be regenerated when needed -#!**/packages/repositories.config -# NuGet v3's project.json files produces more ignoreable files -*.nuget.props -*.nuget.targets - -# Microsoft Azure Build Output -csx/ -*.build.csdef - -# Microsoft Azure Emulator -ecf/ -rcf/ - -# Windows Store app package directories and files -AppPackages/ -BundleArtifacts/ -Package.StoreAssociation.xml -_pkginfo.txt - -# Visual Studio cache files -# files ending in .cache can be ignored -*.[Cc]ache -# but keep track of directories ending in .cache -!*.[Cc]ache/ - -# Others -ClientBin/ -~$* -*~ -*.dbmdl -*.dbproj.schemaview -*.pfx -*.publishsettings -node_modules/ -orleans.codegen.cs - -# Since there are multiple workflows, uncomment next line to ignore bower_components -# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) -#bower_components/ - -# RIA/Silverlight projects -Generated_Code/ - -# Backup & report files from converting an old project file -# to a newer Visual Studio version. Backup files are not needed, -# because we have git ;-) -_UpgradeReport_Files/ -Backup*/ -UpgradeLog*.XML -UpgradeLog*.htm - -# SQL Server files -*.mdf -*.ldf - -# Business Intelligence projects -*.rdl.data -*.bim.layout -*.bim_*.settings - -# Microsoft Fakes -FakesAssemblies/ - -# GhostDoc plugin setting file -*.GhostDoc.xml - -# Node.js Tools for Visual Studio -.ntvs_analysis.dat - -# Visual Studio 6 build log -*.plg - -# Visual Studio 6 workspace options file -*.opt - -# Visual Studio LightSwitch build output -**/*.HTMLClient/GeneratedArtifacts -**/*.DesktopClient/GeneratedArtifacts -**/*.DesktopClient/ModelManifest.xml -**/*.Server/GeneratedArtifacts -**/*.Server/ModelManifest.xml -_Pvt_Extensions - -# Paket dependency manager -.paket/paket.exe -paket-files/ - -# FAKE - F# Make -.fake/ +# Builds +*.apk +*.unitypackage -# JetBrains Rider -.idea/ -*.sln.iml +Assets/StreamingAssets/ +# Crashlytics generated file +crashlytics-build.properties diff --git a/Assets/WebGLExample.meta b/Assets/Scenes.meta similarity index 57% rename from Assets/WebGLExample.meta rename to Assets/Scenes.meta index 9d4be25..49136fe 100644 --- a/Assets/WebGLExample.meta +++ b/Assets/Scenes.meta @@ -1,9 +1,8 @@ fileFormatVersion: 2 -guid: de58256d808c44d18b22b22378068c7a +guid: 6925300ff78f5b14fa4cbb17de1bf1f9 folderAsset: yes -timeCreated: 1510672670 -licenseType: Free DefaultImporter: + externalObjects: {} userData: assetBundleName: assetBundleVariant: diff --git a/Assets/WebGLExample/main.unity b/Assets/Scenes/SampleScene.unity similarity index 57% rename from Assets/WebGLExample/main.unity rename to Assets/Scenes/SampleScene.unity index 98f745f..9f8d2e2 100644 --- a/Assets/WebGLExample/main.unity +++ b/Assets/Scenes/SampleScene.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 8 + serializedVersion: 9 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -37,32 +37,32 @@ RenderSettings: m_ReflectionBounces: 1 m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} - m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.44657844, g: 0.49641222, b: 0.57481694, a: 1} + m_Sun: {fileID: 705507994} + m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 - m_GIWorkflowMode: 0 + serializedVersion: 12 + m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 m_BounceScale: 1 m_IndirectOutputScale: 1 m_AlbedoBoost: 1 - m_TemporalCoherenceThreshold: 1 m_EnvironmentLightingMode: 0 m_EnableBakedLightmaps: 1 - m_EnableRealtimeLightmaps: 1 + m_EnableRealtimeLightmaps: 0 m_LightmapEditorSettings: - serializedVersion: 9 + serializedVersion: 12 m_Resolution: 2 m_BakeResolution: 40 - m_TextureWidth: 1024 - m_TextureHeight: 1024 + m_AtlasSize: 1024 m_AO: 0 m_AOMaxDistance: 1 m_CompAOExponent: 1 m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 m_Padding: 2 m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 @@ -72,22 +72,33 @@ LightmapSettings: m_FinalGatherRayCount: 256 m_ReflectionCompression: 2 m_MixedBakeMode: 2 - m_BakeBackend: 0 + m_BakeBackend: 1 m_PVRSampling: 1 m_PVRDirectSampleCount: 32 m_PVRSampleCount: 500 m_PVRBounces: 2 - m_PVRFiltering: 0 - m_PVRFilteringMode: 1 + m_PVREnvironmentSampleCount: 500 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 2 + m_PVRDenoiserTypeDirect: 0 + m_PVRDenoiserTypeIndirect: 0 + m_PVRDenoiserTypeAO: 0 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 0 m_PVRCulling: 1 m_PVRFilteringGaussRadiusDirect: 1 m_PVRFilteringGaussRadiusIndirect: 5 m_PVRFilteringGaussRadiusAO: 2 - m_PVRFilteringAtrousColorSigma: 1 - m_PVRFilteringAtrousNormalSigma: 1 - m_PVRFilteringAtrousPositionSigma: 1 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 1 + m_LightingSettings: {fileID: 4890085278179872738, guid: 4263982a16e3b5445a9bb86da7b1fff4, type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -107,16 +118,21 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 + debug: + m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &122213748 +--- !u!1 &705507993 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - - component: {fileID: 122213750} - - component: {fileID: 122213749} + - component: {fileID: 705507995} + - component: {fileID: 705507994} m_Layer: 0 m_Name: Directional Light m_TagString: Untagged @@ -124,19 +140,22 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!108 &122213749 +--- !u!108 &705507994 Light: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 122213748} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 705507993} m_Enabled: 1 - serializedVersion: 8 + serializedVersion: 10 m_Type: 1 + m_Shape: 0 m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} m_Intensity: 1 m_Range: 10 m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 m_CookieSize: 10 m_Shadows: m_Type: 2 @@ -146,6 +165,24 @@ Light: m_Bias: 0.05 m_NormalBias: 0.4 m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 m_Cookie: {fileID: 0} m_DrawHalo: 0 m_Flare: {fileID: 0} @@ -153,19 +190,24 @@ Light: m_CullingMask: serializedVersion: 2 m_Bits: 4294967295 - m_Lightmapping: 4 + m_RenderingLayerMask: 1 + m_Lightmapping: 1 + m_LightShadowCasterMode: 0 m_AreaSize: {x: 1, y: 1} m_BounceIntensity: 1 m_ColorTemperature: 6570 m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 m_ShadowRadius: 0 m_ShadowAngle: 0 ---- !u!4 &122213750 +--- !u!4 &705507995 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 122213748} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 705507993} m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} m_LocalPosition: {x: 0, y: 3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -173,18 +215,102 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} ---- !u!1 &479877112 +--- !u!1 &963194225 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - - component: {fileID: 479877117} - - component: {fileID: 479877116} - - component: {fileID: 479877115} - - component: {fileID: 479877114} - - component: {fileID: 479877113} + - component: {fileID: 963194228} + - component: {fileID: 963194227} + - component: {fileID: 963194226} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!81 &963194226 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 963194225} + m_Enabled: 1 +--- !u!20 &963194227 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 963194225} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &963194228 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 963194225} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1, z: -10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1975137828 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1975137833} + - component: {fileID: 1975137832} + - component: {fileID: 1975137831} + - component: {fileID: 1975137830} + - component: {fileID: 1975137829} m_Layer: 0 m_Name: Cube m_TagString: Untagged @@ -192,29 +318,49 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &479877113 +--- !u!114 &1975137829 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 479877112} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1975137828} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 166a5c2e14a6d441d9f5133078ed8231, type: 3} + m_Script: {fileID: 11500000, guid: 294cef1c4058f814d868d1a89763be98, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!23 &479877114 +--- !u!65 &1975137830 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1975137828} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &1975137831 MeshRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 479877112} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1975137828} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 m_Materials: - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} m_StaticBatchInfo: @@ -224,9 +370,11 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 - m_PreserveUVs: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 1 m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -235,31 +383,22 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 ---- !u!65 &479877115 -BoxCollider: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 479877112} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!33 &479877116 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1975137832 MeshFilter: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 479877112} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1975137828} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!4 &479877117 +--- !u!4 &1975137833 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 479877112} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1975137828} 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} @@ -267,92 +406,3 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1681945922 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 1681945927} - - component: {fileID: 1681945926} - - component: {fileID: 1681945925} - - component: {fileID: 1681945924} - - component: {fileID: 1681945923} - m_Layer: 0 - m_Name: Main Camera - m_TagString: MainCamera - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!81 &1681945923 -AudioListener: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1681945922} - m_Enabled: 1 ---- !u!124 &1681945924 -Behaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1681945922} - m_Enabled: 1 ---- !u!92 &1681945925 -Behaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1681945922} - m_Enabled: 1 ---- !u!20 &1681945926 -Camera: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1681945922} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 0 - orthographic size: 5 - m_Depth: -1 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 - m_StereoMirrorMode: 0 ---- !u!4 &1681945927 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1681945922} - m_LocalRotation: {x: -0.0871723, y: 0.89959055, z: -0.21045254, w: -0.37262255} - m_LocalPosition: {x: 1.8223023, y: 1.2756116, z: 1.8223028} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/WebGLExample/main.unity.meta b/Assets/Scenes/SampleScene.unity.meta similarity index 53% rename from Assets/WebGLExample/main.unity.meta rename to Assets/Scenes/SampleScene.unity.meta index 8c228fb..952bd1e 100644 --- a/Assets/WebGLExample/main.unity.meta +++ b/Assets/Scenes/SampleScene.unity.meta @@ -1,8 +1,7 @@ fileFormatVersion: 2 -guid: 6d000a3c19683461f9f9a10677ac5b7a -timeCreated: 1510671324 -licenseType: Free +guid: 9fc0d4010bbf28b4594072e72b8655ab DefaultImporter: + externalObjects: {} userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Scenes/SampleSceneSettings.lighting b/Assets/Scenes/SampleSceneSettings.lighting new file mode 100644 index 0000000..d9e8591 --- /dev/null +++ b/Assets/Scenes/SampleSceneSettings.lighting @@ -0,0 +1,63 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!850595691 &4890085278179872738 +LightingSettings: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: SampleSceneSettings + serializedVersion: 2 + m_GIWorkflowMode: 1 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 0 + m_RealtimeEnvironmentLighting: 1 + m_BounceScale: 1 + m_AlbedoBoost: 1 + m_IndirectOutputScale: 1 + m_UsingShadowmask: 1 + m_BakeBackend: 1 + m_LightmapMaxSize: 1024 + m_BakeResolution: 40 + m_Padding: 2 + m_TextureCompression: 1 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAO: 0 + m_MixedBakeMode: 2 + m_LightmapsBakeMode: 1 + m_FilterMode: 1 + m_LightmapParameters: {fileID: 0} + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_RealtimeResolution: 2 + m_ForceWhiteAlbedo: 0 + m_ForceUpdates: 0 + m_FinalGather: 0 + m_FinalGatherRayCount: 256 + m_FinalGatherFiltering: 1 + m_PVRCulling: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 500 + m_PVREnvironmentSampleCount: 500 + m_PVREnvironmentReferencePointCount: 2048 + m_LightProbeSampleCountMultiplier: 4 + m_PVRBounces: 2 + m_PVRRussianRouletteStartBounce: 2 + m_PVREnvironmentMIS: 0 + m_PVRFilteringMode: 2 + m_PVRDenoiserTypeDirect: 0 + m_PVRDenoiserTypeIndirect: 0 + m_PVRDenoiserTypeAO: 0 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 diff --git a/Assets/Scenes/SampleSceneSettings.lighting.meta b/Assets/Scenes/SampleSceneSettings.lighting.meta new file mode 100644 index 0000000..5c5d3a1 --- /dev/null +++ b/Assets/Scenes/SampleSceneSettings.lighting.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4263982a16e3b5445a9bb86da7b1fff4 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/SpinSpin.cs b/Assets/SpinSpin.cs new file mode 100644 index 0000000..c07197a --- /dev/null +++ b/Assets/SpinSpin.cs @@ -0,0 +1,20 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class SpinSpin : MonoBehaviour +{ + // Start is called before the first frame update + void Start() + { + t = GetComponent(); + } + + // Update is called once per frame + void Update() + { + t.localEulerAngles = t.localEulerAngles + new Vector3(0, Time.deltaTime * 120.0f, 0); + } + + Transform t; +} diff --git a/Assets/WebGLExample/Spin.cs.meta b/Assets/SpinSpin.cs.meta similarity index 69% rename from Assets/WebGLExample/Spin.cs.meta rename to Assets/SpinSpin.cs.meta index dfe2d2c..4b9a481 100644 --- a/Assets/WebGLExample/Spin.cs.meta +++ b/Assets/SpinSpin.cs.meta @@ -1,8 +1,7 @@ fileFormatVersion: 2 -guid: 166a5c2e14a6d441d9f5133078ed8231 -timeCreated: 1510669539 -licenseType: Free +guid: 294cef1c4058f814d868d1a89763be98 MonoImporter: + externalObjects: {} serializedVersion: 2 defaultReferences: [] executionOrder: 0 diff --git a/Assets/WebGLExample/Spin.cs b/Assets/WebGLExample/Spin.cs deleted file mode 100644 index 1e28e44..0000000 --- a/Assets/WebGLExample/Spin.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class Spin : MonoBehaviour { - - // Use this for initialization - void Start () { - - } - - // Update is called once per frame - void Update () { - gameObject.transform.Rotate(new Vector3(0, Time.deltaTime * 50.0f, 0)); - } -} diff --git a/Assets/WebGLTemplates.meta b/Assets/WebGLTemplates.meta index f9d6521..d883ada 100644 --- a/Assets/WebGLTemplates.meta +++ b/Assets/WebGLTemplates.meta @@ -1,9 +1,8 @@ fileFormatVersion: 2 -guid: 281f88952a06d48bd87c868061343c5b +guid: d231cfeb193a36b4588836f373a60310 folderAsset: yes -timeCreated: 1510669950 -licenseType: Free DefaultImporter: + externalObjects: {} userData: assetBundleName: assetBundleVariant: diff --git a/Assets/WebGLTemplates/BetterTemplate.meta b/Assets/WebGLTemplates/Better2020.meta similarity index 57% rename from Assets/WebGLTemplates/BetterTemplate.meta rename to Assets/WebGLTemplates/Better2020.meta index e4a9862..6188599 100644 --- a/Assets/WebGLTemplates/BetterTemplate.meta +++ b/Assets/WebGLTemplates/Better2020.meta @@ -1,9 +1,8 @@ fileFormatVersion: 2 -guid: f25bb8e07ed2f4b20aa116e1c94cea0a +guid: 0f4b37a4a517079498937641172663c6 folderAsset: yes -timeCreated: 1510669965 -licenseType: Free DefaultImporter: + externalObjects: {} userData: assetBundleName: assetBundleVariant: diff --git a/Assets/WebGLTemplates/Better2020/TemplateData.meta b/Assets/WebGLTemplates/Better2020/TemplateData.meta new file mode 100644 index 0000000..7adb0f4 --- /dev/null +++ b/Assets/WebGLTemplates/Better2020/TemplateData.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9058e872412fc7f4cabc01e4305948e1 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/WebGLTemplates/Better2020/TemplateData/favicon.ico b/Assets/WebGLTemplates/Better2020/TemplateData/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..dd6bf7e9cec4d87389fad00e34cd385321d748e1 GIT binary patch literal 13275 zcmdsdc|2BI+y9m^^DOfa5h}CDOjL#xQIRS0keM+n% zhFhln+v`5B^PcBC=bUHwJ@5O+yFQNEj2P?CSqhL*~JSgSHWA*i3pI3p-Y}61hE-j zR8iEuo4P!HPeJ$F4&myVu;(1%1`ln__#=WiMoC3U!}11~6LLICo3DzxGDwb98oCT# z=<4{9XfYet>0aBx)kYq~bULHjB*-YSiA?$N7j`29bLLs!?o_EcUpap|(K)Hh-+#JP zV0;TxQ^(a6h^XSq$H*v^W|VOh!W#G>BC2Ef5a*F>h(pDM7P?Oqc_e@`@Cro9B}5D< z;i>)~8YJN&sStLON%9V#8e$xK7I>;?<*9S%{%5qUdP%$?x9-6{6&o zg50dKu-8k@j3S_QHU#LF5RDP!syv2 zLR*thc2l#xy)!qvjBLXhjO`;k6W66Y^89F_Ci|tOrOBxtf}2t7N@QNvd%jfzg9O{R zN4L@p?Ow9tL$Oa@*$Hg_+~HDTCki$SmUg#QuPCAnjy{qRju=*7ODk$}xu4!EjewJY z_2yYg(b2kd_nAyAEFQ#B*A!X^5<~Bs-o3+l_KfY5%^qdJ;JfZY^$Mc}De3q9FX*)9 zW;zCfd$plQ{3RtNfhn&9#Bl0_=EXiOiWOIuKCUg4w-!I3g{~>!DDZz9D`52TeVaLG zgRGKOqI103fL}k95_iCVJ#EZ^j{qM!`9d+6VAXcuGZ)c-8FATK0&JKL+#C2cjQ#3Wr94ovoLk!Uo z6Roy}oY8N5_s$5dXFk0+N-iuMI&-J-Yfq#C|3?2vyb}8!L|H)bq!#~t2Be*=h`W>h zEIWJ5q3yNn^{}y1d`HIdbg9mrJC`aO%jwBX->AOL}*g3>m<;Oy*T>P<)pb;x92<^Qkt->w7nUb`LY+Ub2kfFtXfr7nTpm& z#?oaS8$L+aWV55$r4oXw+@#poj-I@5QC-b)z&Tak|G+UFUR@r{GwyzSnePa$I4wkn zh*dS{g$hc1TF2K}2YW9|Q^)l_dh#^-!w11ssa;V&cpoED&&s5j?Q8 zdyUwOG|xmrLZVITS;$jyyCe($2M;P^H|esp%Y>(<8fJ%%AGmS1FV*kkWK>lh zd+i`DCR4?N=*46zJ4D@Um4SibxRf|e=;OFpKW-A<%g>rn-k4X0R;wAF7E;@RxsAc2 z9LJCABKC!SS0kS?k`$MvIeHNhs=MhS4X@K8{b<0`o8?Qw-Z$}b(Hhx< zHYcGDMVt(6_U^Ry7ax13c^@Ukg+G7dW^R=}Q`ay%cH?vPfav)-^5v2rkNaIJO=I~W z+P1DPI@uZz5u4G^)mE{Oo`lczxv`vk7PaT|U9Z>Xz{U0L#4cS9)7PlLP>)N83isdLn5TMq?UmltsDu7%BV{uerZ}C?&fEedRxaINOGrs9?uUdlbY_$3 zM7>o{bl!0zXJK6w!rcC3hiF702B*tpd@eo9E|)y6@3i3CsHQ$QZtfh8>9#8~GqaOZ zjcRdAulV1T#wCUFcrFf8sKv12LflR0*3OSPmv4KZmDqxmYK1nlRow_UO3nurJoVP-e@IrmiDr$;Cihz=_GopkA_x;O?~zI-eXfLvrlhE zeV3%}4?m*7Wv5>#^i#|C{OkwgpmJlMF4XBW>+)v)OAOVPtgmH7ZCBf33tWsvCG;*( zl2Q24;|Ji$?Yc1@3>S)GYSi@#-dh>_G$V6PpFY*Im_D9lOG_u)@YO;cMaMuDL>G&Q=D>t4q}+LnW@B z)#>b78fGskpdE$I6iG!bS}3(($NV8TA)L5a-}n}Pss6?bb0mgePAKlaAZFippIE-T zOEzM0&{1eP8>QG*pCGb#eLWS8Z=#cGm!jQSg>CluW~FI(nK56O zXj(nkGgQe8${ZHkb(J;wpkoDwJHlR=rFSUwtV6Aka|bEf{Y9}g+J2TvUH^4USBhlR z&YerP((4Cq(lr#TwDW=igC%ourgAMp7I*^6OnuHGn(+n=3DI{JBadu^KE zp;Z2n>g8Q+&|N3onCV1zkY`3XA##iA1*X+J+a`NOG8}t^8V^p>|)r zz2zgbYxmC2Pws7#HG_)+x!Fm)qP~ImnVZs3ZY9xvI&^_O?PBuGLI6K>uL$*G1!V^8#$Qx^yQ%;EBjN30`eSe6NvqaAJQBis(Ik=ew?`%#kjD+h*cBtU2 zMpnD#sJpDrF&HY&v7ww{zy8F5ID^dviR(2cCnoSD!VJ18~v=x8^eaAs3hC_ z1QD_bdz1c_n(2{>E2w7F9n&cXw}pw(`FE!ia!eaTj!C&ux~82J9qQ)jpr-Qo& z!J0qg+{FGa(c%b6;u-bIt!I5B_q;Q2=LP1s6uws~I9MXlVvYAeqVDT2CM4I>^u~4} zCBgt*Lbx%Mf@b#KJ z#>vo$nFyEP-rf5C0LjU1y3_M(G+|Lu(|uQdno;lwIjqd|h3W8i95;tFQbcgr>&|q& zV;?AFaB=Ovbam9w-oc^dNuxl0Vd{4 zZOZcEiOZy+QDmcUVpA&64L@Dyq}+8&m?iIU>^7ZzT+t=x-0@uMXrEFZlq6;DW=x$)=i=N2grFDGW=7V726AqXuzR$DV+9ak&ILv&`s*-sd z$Bh)#O|aiki@A1i9{+mv%2<+c z-ifed?9n}qgz8so2botm#p9P9#MGze=7Mh-)LFcA-rpfB+qCj_vkqVAcX;F~gNs0P zCX{BxKwUUX;=9KS-OzKH?OoJ46>&m&sNiN@QgzEGVJa5s{2H)BcOI=hzORuat+pM^ zu6+;EV3Aaf3zn~+Bo2CCbNuu(hnxKBy(`APpURGol1eeEMRUeB?)c_}OZ2JxH?Xqkloq_+j0?pTKFO50A@3 z)$b)beRq+2S~pZRwxZI^rfNBGMbyJ$Sl9EYkXN6O21|D8$%=lnSv8WGJ2+7Biag!r zv($2?;mOih2(IBb%wK7wq>@uYOWYT=*)fc$&h+4`+Zzl@EV%xFS#l_WL7%x_hTwUy zF&hFSf@369&=LpQuM%WkqI2JMEUaKG(PPzwl0{H+*Ly+nYpFPqOj1wC{gRUwef@8b zqr52|wllu)lauk`V%@XQ_JJZg0UA!+1vm&0``u0&9? zS>UCNp)WR;x%1F5MmefjyMgxckVi|l15I=3g->duMBLHGc3R~}M@GJ;xGxD%<;Q0s z=XZL+o8i~e{dqi@l|-y@Gs+u&Zb-Xt@BXk@ek(&cz*&~+7@^sNfevh2`iR;se{y~k zsB)pJ3ruizipLyV-C929gc<049AKsE>STXb9ev_%*tyiOo8;w_bJM3h1(clgu93hf zKbltmj)Yn|NFhTnLJoCsV_~ja7Q@0Ods>lydc)KsapG?9_C%=#^Zp zWfytJ{x|p@OCz^iq6JfI(Ks@80~_se1zWf>jF`IF&Z3@~^SM_CpI%ybJG^g2;(7VOjga*jW2+VB(unX>CJH)cevNlk&{zpNo#EkN+b z)GM+tu0^9m`BcN(7Q3!XuKutUxai=@Ec?t?xI4yDL#goQ zENiZ*(EQ7{T?URDs_U~|JoBnj_m4u87m0jIuRNt3s=Q4zHa^as@1Uh$Wc2OF>1KOT z*khU6a%42j?)b32f}Tj`5ePb=nHELHTzTQ@Ij@x%Cr{7#=M_??u9vaIu*sUe>?v|Q zQ@Za_Xk0Hh;#DDGV-O>Oo*&p`Pd#^)ddwx> zEt=2T4d*_8Baw2`k3}tyA~2Ih z@8iCk)UH`}{7<#kEsaq}n(cm*Ok_{BXr}UCBpMnW=JfjFA$G^`fQv5S^y0j*O7ojj z{(9X#RLY?jO8G^hs_L2yMc)b>xr_8?i!!T;*rA5UltX3igqRxgt*x`gRhYe|exd>aTVB!8XREAI%#Ciiu7KdUTMB*ABw)34nJ=+)cLmS#_PFj0h?9h4#?ViSj3c#(c%(^pP zGiI04h~WFRNt{u|-dZb)GW+2m9kt6tqobS`rn_~IR|Li1S5ZLlO6(L(i31^=q7;?J zWD377q!)Eoy(Z(eK{Um38egyIdQ)bK{Lh^oA&OQlz4o)@ItX?$HQ&bDt8zVqsX?6E z^vlPtaMHlET94^D5{6{kyJgO5xzVira8~SyXmrb4zv&Y$E+3s1RFnCj4q>wockN+G zn9|9nU#Wz1b!yf5gE&{>=}C!)mj*xDn^L=8So-Xbpj4$swW!wU@!hIHcbonrwVw7t z<>hYIWx{Zej0eW1uO2^SWR z<>7AB>soaI`_YZ4uQ{|SZBukpVXIV51&eLE%8oNj@^lw78G}wjk!w?7CEFOIgU|jp zd%nd#y)C-TeAZ_*1!D|54XvieZfJ~#J}5?+?X5qE;Nzpj&`sv@L6KtS+sBqBJRf=A zLbXt&)a&RG3ErZ5n3YASAr6jRV`Cc3Qa4aFWbc)RC*YXqhgKs-0Ip94n`W0-`O{)* z6s7$OU^6-dVXvdY9xa9$wb4{AH5$>ZdCoB;R-RR^R5U zyS{!DnKO*ClGpn7MpntyrvLr(lI?fzmL8W_nwyIZYU3j1y0`M?+*_=XQ%05EiP76W zvGZ1B(84poSGomOnW z=7XGDoDfX6PDAZ|?%e$tCd&=X;y|I@k0trb=bL*sVI5kClz@~i5cf*S*kWBzE-!so zdL!yJ?Fmh*71yzOQ&ozDUXi+8iZIzd%ne#7a)Mcgg)n=%YS6dVm>oGDq7Oikx%&g^Q|{ATHKrKs!I}e<;T>#J^$J$;=NLZ z-NK!;#>t)>%@<#8r|t8ii-#Kh)6e5HT!aIaDOp?P@h1FNPHCilkP}brQ;o9n7p&TO z+)U?({@P1T#?)suqNc%uf?<7Hhy}GiLD_UcsLp4b5Lfsf*RBG~N!G}4#jWq9p$}js+=+~bVB8&*kZi#05h&p|_v9(y9-VlNL z_Vyh{Wzq$*qnmJ4O68*z?*!}#`NCwEC*g6l6EUV{x|OswG?>t(sIxO!)GC=*C;vt% z!HG!LTMKg@9v(vTBla$61eX`07L75dq>jr77$AOgsCv^N+&}tG&n`g8H6jYixmFYP)Pi zE6*%^{LUA-W6bpjk@>0G2o}DaAG4GD< zLaJHsbhDKQjfyKORQsMeXt?jx%d=eR*)ty1L#l81E}ov}H;g_fh@MOHrhj-b|H38B z*0uCE&Ocq`=FkT-OG}Z@uU9<0)_to@+3(;Q-uIyvsLGo#tGM`4ehAYQh_5fv?s!k3 z>oM1~?AFU1!aQ{C`Hb7&b7`tPmYG7)2W93xhHr;4;;+SD@h@JNsKNN$8ekKo!w*pE zFEVDAw^;SxJbUUmNhrBx{(RrPh3w%coa zmGch$gr#3ZO!NB}v2ERF9y!1Xksl%24=pVOQmvnp=2}Jdki+Hk=T;oTQmi(N$!+aj z&5jg)qPC;c-$RoLe`q<2p2j&em&dWQ64P#!>BK6=$)c%xb#C@-zCBPwoI__%h zlemzA>{e&=*w1?3gMCS3&ZdSfIsa>#X(-6J=!?mKFaJ^e0OIYk^%gX{WXFG%il2i5 z-wUo&vLrk_^~b%wkc;Ixj%^sr-1oS5Z5v-fKnW*>d)bt~d3} zl8%{$=?5{Ad>3uRn6!CXoUZ37+p?a+OIe;I3`kO5b6eF9I-3rI=zy*Eaik*8bkK)NsWPI=$GTNY@< z9Pr3Qc5mcf`*_@qo>k*%ZHVZ7dp^}K1#*t->_l^xIhTtpzDKjk2i_^#ibp;K@OdBc z$dX3tj>Wkq@>@&3Z=M#Vydv4#_n~5;B?{IG9w}!vM?Xr(1yz4V;d#=(|2{$Y@tpN{ zqwl-qA|lak;~`wg_mZnjV%Cu3nalHKI7H;cDt3|#)dnI=WN;z!A@J(SIm@oe#c48> zR)5b%8A3QG95s z1JS`-)QD2iXO5-}Ws*5d%TY|1LFMFkQT1HhmyB*7Zj}^ z6)L2L-GF=;3S{!XkN5pjq4eHBLuOdi3n}O&l7slJPPar&Elxj}GU9xm_!8oGF1OXanaNf00MHwV%ckPbdpgBE~% zxc+_P=VXHaFLePfW?1kzD}0KF4F-SzPs{cTJr*oIL2g!F$Dq{k&inY7*?&|CBBS z5Saii7Mfqy)xM|@c8Hm zyuZKqTaxg>!2!IxyNf*EhgZ;OSn>=X%!}CK-}MJT6WI3j33ix^ks7|JB!i{#H$;(} zjrDbSdTJ8;7|;eCG&2J|tiFJ~{#6?Q+8hiN*!e)`$H)oc?ygSkx){tBJUlo6=fB8; z-R{`HQbPQ2bw$~)ydBa{j*o?z5q|`G;$NW;_+_Fz3g2^cgzIXn;i~ddxaoZZTv}WR z-*deKUqbW%{EwZE45lQ2U?csjSiZndWmyS4HTea5|M5cy%#GOWU(r9{m63u7_VIMZ zu5tJS{F#mf4`!t$g^we)0P-B_b!2D|EBo5&DlEjy0l%%T#7^7T*nkzz3d1}swEq+j zztZ+_!Oq{?+r?h*A~G|O;=`wT*s(N$Jf{&p!Ct?Q@O9WCLxW)w2!g@&usPb8!>lx< zzw-KLb~vQ%?e2`73j7$f0B=u3AB2BnLqH$I7~tQ_ON&_9$3};-GIB6b!dKN*;QhT{ z_Qs3MXaCR#4rzP2IbmsneFR$gg8=Ma7vkf@(g*qmT^PA%rXq%)XQX1sfgju3Mp)Yb zzXkk#nHa;qn;0KOVgNJNU;apTFdo?Zo~t8v{2szL@NXYa7nlSGg4qxs191$*InaUq zsflo44HY?fXJ-dHr?H_98+)hA*or!kkDf2I~R+fcWTaX9)vYz&j3X z9Q@lD0LB7a9qt|AYlnKrF8ojYfbp+ix94RTKlh*NAM3}6Z2-R@wtxnBSXx|!uU}EeJ{RFXj@@fu?*Tc0FM?Qn zXfrS;HSx)>asvH>eHkAc1zy1!DM^1Bg8>hG?8mUVw5$XvZXgZl6^&koHP6dqZ3+Ae zj5+Ke_5quAv^HbMV=x%_f`Sy1pQy3+2Qd%CYOv1iw{I}84VVjP{ktI$^du(F`zI%=hw03MmLarfCJxkarpHa zh+kmep5p!^AN*SkD!|2p)f0&CAdeijh41t5c^OHVfsEkSd=7L9FqfS88F+1N6{~Bo zCmG0y;G%+j>{Q@OnyLy|e*u2^M{@uE8NfKe765CMmlVN2eyqWpo0~9*uMU=`u$+Vt z%*{-Tl^x(OdQv<%COqVjRX8Nj2kz_b!QKOmBJgkEY`_DM4Rl%Y(@1_l2`eKu1+gCR z)6v!fgWPU`==&`4jtlXd&pq8(9c*uJ!`s^!Ed5u={{MF|;GvyC>;(FtNAlkt>)XG| zdHBZ)vQJPoRd6$c4-VVGf8ifj2kT$4;_vnR&)x$*4*Lm&m)z_O7{up4Y9NM!ya)Cj z(1Y?hajdNlW%*}m{?#~u@kNoCWO(f|92@x%ZfkCWS65d4j-B35-G3VQ{%ZYy^bYv( z;aLMv z3)ypuQX(+0*MCy?f5s=E0eAr&i~;-d&vO2st?{3H4)*W=hTQ)@JpaBP@V|Wz>J*?X z!GZL{I)wuAkM+NAeNl{`b%59*hAw6ktzql|}N1ldUDJBrS&c z&YzzbfZv0;0Ph*-UWT7NO@v2BhOs#U1c9(%e=Pp^qkRYF0_+0tp|#m9Y|H?;?e)vN zUt=0LyMTQE`+N<28}J$$U)gFPft`a70KD7K4Zh@L*#Rz>eS<;0xe2aP|rGxr?2T6%Z;<4S`9Rz#F!;d1v;N&N<*mD-Zn1%Vdh)$7n zA(FF;3tl3zSsRP30q;PM01v9G$YE;&HI-#BHNrO?2`)@U2*D;dbg(>JRX>lV4{`_A zhKS6ExEa_I_?8BO2LTTNX9%CY|RB=R?yUyWwE*i^bh?P;2&W3%NLa3 z#K$pk3W8bVqQYS<JOYp?lC{{NBUmni;?G>!Y%}j%we;}-m78kx_>46-) zjbKpFUgl)~CEfx)0ptR@26S`~xdDCwGJu+ii~T>Bv%xwi5nRB@K#BMV5f)>DIt0My b05ANO@4xyR$aLsufT!Qj{e3+6SMUEH(9pSK literal 0 HcmV?d00001 diff --git a/Assets/WebGLTemplates/Better2020/TemplateData/favicon.ico.meta b/Assets/WebGLTemplates/Better2020/TemplateData/favicon.ico.meta new file mode 100644 index 0000000..3e40b69 --- /dev/null +++ b/Assets/WebGLTemplates/Better2020/TemplateData/favicon.ico.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 067a83d33a9eaba4b9b8808e63c8d03e +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/WebGLTemplates/Better2020/TemplateData/fullscreen-button.png b/Assets/WebGLTemplates/Better2020/TemplateData/fullscreen-button.png new file mode 100644 index 0000000000000000000000000000000000000000..e7b6496fc9c99bf761524e2b962b6de8bfca90d7 GIT binary patch literal 175 zcmeAS@N?(olHy`uVBq!ia0vp^Y9P$P3?%12mYf5mqyv0HT;`!cG1M + + + + + + {{{ PRODUCT_NAME }}} + + + + +
+ +
+ + + + + diff --git a/Assets/WebGLTemplates/BetterTemplate/index.html.meta b/Assets/WebGLTemplates/Better2020/index.html.meta similarity index 53% rename from Assets/WebGLTemplates/BetterTemplate/index.html.meta rename to Assets/WebGLTemplates/Better2020/index.html.meta index 26c861c..8230ed3 100644 --- a/Assets/WebGLTemplates/BetterTemplate/index.html.meta +++ b/Assets/WebGLTemplates/Better2020/index.html.meta @@ -1,8 +1,7 @@ fileFormatVersion: 2 -guid: 21a732ac9afba41ce9d0f72567db331f -timeCreated: 1510670098 -licenseType: Free +guid: 010cecec326b7164b93ad1e497c198ce DefaultImporter: + externalObjects: {} userData: assetBundleName: assetBundleVariant: diff --git a/Assets/WebGLTemplates/BetterTemplate/logo.png b/Assets/WebGLTemplates/Better2020/logo.png similarity index 100% rename from Assets/WebGLTemplates/BetterTemplate/logo.png rename to Assets/WebGLTemplates/Better2020/logo.png diff --git a/Assets/WebGLTemplates/BetterTemplate/logo.png.meta b/Assets/WebGLTemplates/Better2020/logo.png.meta similarity index 53% rename from Assets/WebGLTemplates/BetterTemplate/logo.png.meta rename to Assets/WebGLTemplates/Better2020/logo.png.meta index 42567c2..2198839 100644 --- a/Assets/WebGLTemplates/BetterTemplate/logo.png.meta +++ b/Assets/WebGLTemplates/Better2020/logo.png.meta @@ -1,8 +1,7 @@ fileFormatVersion: 2 -guid: d315c2e7033ee40bc86d677b2255a3f0 -timeCreated: 1510677364 -licenseType: Free +guid: f830e170412fc8a46a0bc72ecad57f1a DefaultImporter: + externalObjects: {} userData: assetBundleName: assetBundleVariant: diff --git a/Assets/WebGLTemplates/Better2020/thumbnail.png b/Assets/WebGLTemplates/Better2020/thumbnail.png new file mode 100644 index 0000000000000000000000000000000000000000..48e1dca64a5ccafa1d88ced1ce4ee0d9cd1ca8d7 GIT binary patch literal 2288 zcmc&$dr%a096wBwFb5lz@qxIkybSMl?+LeZI&jD1ltaP`kr8okcMn$XZr9y~yF(Cl zY?M&bF$|3IL1_*k8KsPlKxq)BmQkLDnkH(=9H$b5=?v}hxKXp5{G)c}_x}7o-^cI! z{mz!8BqxmXo$4zP2*zm>HL3i##@&2I@qN9z3 zbS_<&gkY3egyNKe5ZTN$j}{1`=ho1 zLo6yt)?)>^m=Xu)%>|-u2v1-pI25p%O%@ihslY*AgrB>&ArKgZaJecl#w`#?*QEez ziXi}n2o_>6ECC{wBC$dyQ^2zU2`qsjSPqFLLa_pYWr#Qu82&(B8iN~=R89P_EPkZ| zb2yGhAjoR9imXx*#biTbrBVsO5=bHu@(3Yow{WOUXkllLFlY!CV@R4KDGT6cL=99P zrviCRhfFZj9$E`K>?Yn}kPW3Fu?TjXGzi2o501`bOoPI43?fW~nXqsyj}?2cbPmN) zY!3A|)SlzV1n{oa={z!?s*Bm|5y5hC`Mep!4tXk?)!S(TN+nn-kHLtzd|u6&Zfj^n z%@8O@F?xzJjXYG!h{}LOERq1>i%APkS=m{STp%qI&xn_VR`Nl7`c!C%liu%l21X@^xQn| z#B|3Fl1Q@rtJ;TCXA!Y-cxEDj!EixP%$)`*5OcpjfrG=_0j+mi<2xr#5G|FheKBHkTab_Um<3SO;oJ==;oP>wgpOKl z)MTshC+2d-~wF;KMENJ;(x)W~}Us-XezyE4;R^9&8+`G0T@0FIFG8_nw92;ah z(I2=u|KSd^&vjNDYMO9M9U-(7R-vw88~=@0z2qPWSCd?cP5og;u}PASf-HUz5@6*s|~bTieDP)Q%JN_4nFVJ9^fmTt{JmZ*BQaV0+yS zYgaJsb@S}m&H~6kxA9jtsxr66Wm|USj5FKb0jDL^*R`D*-7NfUcXG&VY@K!oAk7nPby0n_B4h@OlT0y zsj9lSw)FLC*HnklFL~jv&K{;CGSk&y-@Eej`i$8vqPb@t?5sJx_2=R%m+uyB?QF_0 zs$5@ocZaA0bgMr7_-ft2(Is1)1lxnlM_EVv1Sz;8RoU(Q>M9btb!*k7+3PRN54{mW zW^Mn$=MwP|B@FzjM3XW1(ETYTg%y>ifs^~L8wZ3JjItl^or}%dJ}IThcdvg;wD;xk zzXaI%_Bq#_PG?u+jDbT*p=?`i^r+^^f=ymecKu;mIMD0A4A8!5t2V{XD}cr}xc^DC Mamkv4vCG%}37vB>ZvX%Q literal 0 HcmV?d00001 diff --git a/Assets/WebGLTemplates/Better2020/thumbnail.png.meta b/Assets/WebGLTemplates/Better2020/thumbnail.png.meta new file mode 100644 index 0000000..1482ff2 --- /dev/null +++ b/Assets/WebGLTemplates/Better2020/thumbnail.png.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f626db55f3501504c8c6b7602441112d +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/WebGLTemplates/BetterTemplate/index.html b/Assets/WebGLTemplates/BetterTemplate/index.html deleted file mode 100644 index 6f48c8a..0000000 --- a/Assets/WebGLTemplates/BetterTemplate/index.html +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - - %UNITY_WEB_NAME% - - - - -
-
- -
-
-
- - - - - - - diff --git a/Packages/manifest.json b/Packages/manifest.json new file mode 100644 index 0000000..d77c3f9 --- /dev/null +++ b/Packages/manifest.json @@ -0,0 +1,43 @@ +{ + "dependencies": { + "com.unity.collab-proxy": "1.3.8", + "com.unity.ide.rider": "1.2.1", + "com.unity.ide.visualstudio": "2.0.2", + "com.unity.ide.vscode": "1.2.1", + "com.unity.test-framework": "1.1.16", + "com.unity.textmeshpro": "3.0.1", + "com.unity.timeline": "1.3.4", + "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..6c9a281 --- /dev/null +++ b/Packages/packages-lock.json @@ -0,0 +1,331 @@ +{ + "dependencies": { + "com.unity.collab-proxy": { + "version": "1.3.8", + "depth": 0, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.ext.nunit": { + "version": "1.0.0", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.ide.rider": { + "version": "1.2.1", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.test-framework": "1.1.1" + }, + "url": "https://packages.unity.com" + }, + "com.unity.ide.visualstudio": { + "version": "2.0.2", + "depth": 0, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.ide.vscode": { + "version": "1.2.1", + "depth": 0, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.test-framework": { + "version": "1.1.16", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.ext.nunit": "1.0.0", + "com.unity.modules.imgui": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.textmeshpro": { + "version": "3.0.1", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.ugui": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.timeline": { + "version": "1.3.4", + "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.ui": "1.0.0", + "com.unity.modules.imgui": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.uielementsnative": "1.0.0" + } + }, + "com.unity.modules.uielementsnative": { + "version": "1.0.0", + "depth": 1, + "source": "builtin", + "dependencies": { + "com.unity.modules.ui": "1.0.0", + "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/AudioManager.asset b/ProjectSettings/AudioManager.asset index da61125..07ebfb0 100644 --- a/ProjectSettings/AudioManager.asset +++ b/ProjectSettings/AudioManager.asset @@ -3,15 +3,17 @@ --- !u!11 &1 AudioManager: m_ObjectHideFlags: 0 + serializedVersion: 2 m_Volume: 1 Rolloff Scale: 1 Doppler Factor: 1 Default Speaker Mode: 2 m_SampleRate: 0 - m_DSPBufferSize: 0 + m_DSPBufferSize: 1024 m_VirtualVoiceCount: 512 m_RealVoiceCount: 32 m_SpatializerPlugin: m_AmbisonicDecoderPlugin: m_DisableAudio: 0 m_VirtualizeEffects: 1 + m_RequestedDSPBufferSize: 1024 diff --git a/ProjectSettings/DynamicsManager.asset b/ProjectSettings/DynamicsManager.asset index 1931946..cdc1f3e 100644 --- a/ProjectSettings/DynamicsManager.asset +++ b/ProjectSettings/DynamicsManager.asset @@ -3,7 +3,7 @@ --- !u!55 &1 PhysicsManager: m_ObjectHideFlags: 0 - serializedVersion: 3 + serializedVersion: 11 m_Gravity: {x: 0, y: -9.81, z: 0} m_DefaultMaterial: {fileID: 0} m_BounceThreshold: 2 @@ -14,6 +14,21 @@ PhysicsManager: m_QueriesHitBackfaces: 0 m_QueriesHitTriggers: 1 m_EnableAdaptiveForce: 0 - m_EnablePCM: 1 + m_ClothInterCollisionDistance: 0 + m_ClothInterCollisionStiffness: 0 + m_ContactsGeneration: 1 m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff m_AutoSimulation: 1 + m_AutoSyncTransforms: 0 + m_ReuseCollisionCallbacks: 1 + m_ClothInterCollisionSettingsToggle: 0 + m_ContactPairsMode: 0 + m_BroadphaseType: 0 + m_WorldBounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 250, y: 250, z: 250} + m_WorldSubdivisions: 8 + m_FrictionType: 0 + m_EnableEnhancedDeterminism: 0 + m_EnableUnifiedHeightmaps: 1 + m_DefaultMaxAngluarSpeed: 7 diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 6dc24f7..0147887 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -5,3 +5,4 @@ EditorBuildSettings: m_ObjectHideFlags: 0 serializedVersion: 2 m_Scenes: [] + m_configObjects: {} diff --git a/ProjectSettings/EditorSettings.asset b/ProjectSettings/EditorSettings.asset index f33b6fb..de5d0b2 100644 --- a/ProjectSettings/EditorSettings.asset +++ b/ProjectSettings/EditorSettings.asset @@ -3,14 +3,28 @@ --- !u!159 &1 EditorSettings: m_ObjectHideFlags: 0 - serializedVersion: 4 + serializedVersion: 11 m_ExternalVersionControlSupport: Visible Meta Files m_SerializationMode: 2 + m_LineEndingsForNewScripts: 0 m_DefaultBehaviorMode: 0 + m_PrefabRegularEnvironment: {fileID: 0} + m_PrefabUIEnvironment: {fileID: 0} m_SpritePackerMode: 0 m_SpritePackerPaddingPower: 1 - m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd + m_EtcTextureCompressorBehavior: 1 + m_EtcTextureFastCompressor: 1 + m_EtcTextureNormalCompressor: 2 + m_EtcTextureBestCompressor: 4 + m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd;asmdef;rsp;asmref m_ProjectGenerationRootNamespace: - m_UserGeneratedProjectSuffix: m_CollabEditorSettings: inProgressEnabled: 1 + m_EnableTextureStreamingInEditMode: 1 + m_EnableTextureStreamingInPlayMode: 1 + m_AsyncShaderCompilation: 1 + m_EnterPlayModeOptionsEnabled: 0 + m_EnterPlayModeOptions: 3 + m_ShowLightmapResolutionOverlay: 1 + m_UseLegacyProbeSampleCount: 0 + m_SerializeInlineMappingsOnOneLine: 1 \ No newline at end of file diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index 6e7e2d9..43369e3 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -3,7 +3,7 @@ --- !u!30 &1 GraphicsSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 + serializedVersion: 13 m_Deferred: m_Mode: 1 m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0} @@ -35,8 +35,6 @@ GraphicsSettings: - {fileID: 15106, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0} m_PreloadedShaders: [] m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} @@ -61,3 +59,5 @@ GraphicsSettings: m_AlbedoSwatchInfos: [] m_LightsUseLinearIntensity: 0 m_LightsUseColorTemperature: 0 + m_LogWhenShaderIsCompiled: 0 + m_AllowEnlightenSupportForUpgradedProject: 0 diff --git a/ProjectSettings/NavMeshAreas.asset b/ProjectSettings/NavMeshAreas.asset index 6dd520f..3b0b7c3 100644 --- a/ProjectSettings/NavMeshAreas.asset +++ b/ProjectSettings/NavMeshAreas.asset @@ -85,5 +85,7 @@ NavMeshProjectSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + debug: + m_Flags: 0 m_SettingNames: - Humanoid diff --git a/ProjectSettings/NetworkManager.asset b/ProjectSettings/NetworkManager.asset deleted file mode 100644 index 5dc6a83..0000000 --- a/ProjectSettings/NetworkManager.asset +++ /dev/null @@ -1,8 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!149 &1 -NetworkManager: - m_ObjectHideFlags: 0 - m_DebugLevel: 0 - m_Sendrate: 15 - m_AssetToPrefab: {} diff --git a/ProjectSettings/Physics2DSettings.asset b/ProjectSettings/Physics2DSettings.asset index e3b2d0b..47880b1 100644 --- a/ProjectSettings/Physics2DSettings.asset +++ b/ProjectSettings/Physics2DSettings.asset @@ -3,7 +3,7 @@ --- !u!19 &1 Physics2DSettings: m_ObjectHideFlags: 0 - serializedVersion: 3 + serializedVersion: 4 m_Gravity: {x: 0, y: -9.81} m_DefaultMaterial: {fileID: 0} m_VelocityIterations: 8 @@ -19,11 +19,31 @@ Physics2DSettings: m_LinearSleepTolerance: 0.01 m_AngularSleepTolerance: 2 m_DefaultContactOffset: 0.01 + m_JobOptions: + serializedVersion: 2 + useMultithreading: 0 + useConsistencySorting: 0 + m_InterpolationPosesPerJob: 100 + m_NewContactsPerJob: 30 + m_CollideContactsPerJob: 100 + m_ClearFlagsPerJob: 200 + m_ClearBodyForcesPerJob: 200 + m_SyncDiscreteFixturesPerJob: 50 + m_SyncContinuousFixturesPerJob: 50 + m_FindNearestContactsPerJob: 100 + m_UpdateTriggerContactsPerJob: 100 + m_IslandSolverCostThreshold: 100 + m_IslandSolverBodyCostScale: 1 + m_IslandSolverContactCostScale: 10 + m_IslandSolverJointCostScale: 10 + m_IslandSolverBodiesPerJob: 50 + m_IslandSolverContactsPerJob: 50 m_AutoSimulation: 1 m_QueriesHitTriggers: 1 m_QueriesStartInColliders: 1 - m_ChangeStopsCallbacks: 0 m_CallbacksOnDisable: 1 + m_ReuseCollisionCallbacks: 1 + m_AutoSyncTransforms: 0 m_AlwaysShowColliders: 0 m_ShowColliderSleep: 1 m_ShowColliderContacts: 0 diff --git a/ProjectSettings/PresetManager.asset b/ProjectSettings/PresetManager.asset index 636a595..67a94da 100644 --- a/ProjectSettings/PresetManager.asset +++ b/ProjectSettings/PresetManager.asset @@ -3,4 +3,5 @@ --- !u!1386491679 &1 PresetManager: m_ObjectHideFlags: 0 - m_DefaultList: [] + serializedVersion: 2 + m_DefaultPresets: {} diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index ff026bf..741c779 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -3,8 +3,8 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 15 - productGUID: 865e7d7e40cf04fa7b8d411f1f9d31f0 + serializedVersion: 20 + productGUID: 64c3c6e2355b0f949ae2987c5d522a80 AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 AndroidEnableSustainedPerformanceMode: 0 @@ -12,8 +12,8 @@ PlayerSettings: targetDevice: 2 useOnDemandResources: 0 accelerometerFrequency: 60 - companyName: greggman - productName: WebGLFitWindow + companyName: DefaultCompany + productName: delme-webgl-2020 defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1} @@ -49,11 +49,12 @@ PlayerSettings: m_StereoRenderingPath: 0 m_ActiveColorSpace: 0 m_MTRendering: 1 + mipStripping: 0 + numberOfMipsStripped: 0 m_StackTraceTypes: 010000000100000001000000010000000100000001000000 iosShowActivityIndicatorOnLoading: -1 androidShowActivityIndicatorOnLoading: -1 - iosAppInBackgroundBehavior: 0 - displayResolutionDialog: 1 + iosUseCustomAppBackgroundBehavior: 0 iosAllowHTTPDownload: 1 allowedAutorotateToPortrait: 1 allowedAutorotateToPortraitUpsideDown: 1 @@ -63,10 +64,13 @@ PlayerSettings: use32BitDisplayBuffer: 1 preserveFramebufferAlpha: 0 disableDepthAndStencilBuffers: 0 + androidStartInFullscreen: 1 + androidRenderOutsideSafeArea: 1 + androidUseSwappy: 1 androidBlitType: 0 defaultIsNativeResolution: 1 macRetinaSupport: 1 - runInBackground: 0 + runInBackground: 1 captureSingleScreen: 0 muteOtherAudioSources: 0 Prepare IOS For Recording: 0 @@ -77,11 +81,11 @@ PlayerSettings: usePlayerLog: 1 bakeCollisionMeshes: 0 forceSingleInstance: 0 + useFlipModelSwapchain: 1 resizableWindow: 0 useMacAppStoreValidation: 0 macAppStoreCategory: public.app-category.games - gpuSkinning: 0 - graphicsJobs: 0 + gpuSkinning: 1 xboxPIXTextureCapture: 0 xboxEnableAvatar: 0 xboxEnableKinect: 0 @@ -89,42 +93,45 @@ PlayerSettings: xboxEnableFitness: 0 visibleInBackground: 1 allowFullscreenSwitch: 1 - graphicsJobMode: 0 - fullscreenMode: 2 + fullscreenMode: 1 xboxSpeechDB: 0 xboxEnableHeadOrientation: 0 xboxEnableGuest: 0 xboxEnablePIXSampling: 0 metalFramebufferOnly: 0 - n3dsDisableStereoscopicView: 0 - n3dsEnableSharedListOpt: 1 - n3dsEnableVSync: 0 xboxOneResolution: 0 xboxOneSResolution: 0 xboxOneXResolution: 3 xboxOneMonoLoggingLevel: 0 xboxOneLoggingLevel: 1 xboxOneDisableEsram: 0 + xboxOneEnableTypeOptimization: 0 xboxOnePresentImmediateThreshold: 0 switchQueueCommandMemory: 0 - videoMemoryForVertexBuffers: 0 - psp2PowerMode: 0 - psp2AcquireBGM: 1 + switchQueueControlMemory: 16384 + switchQueueComputeMemory: 262144 + switchNVNShaderPoolsGranularity: 33554432 + switchNVNDefaultPoolsGranularity: 16777216 + switchNVNOtherPoolsGranularity: 16777216 + switchNVNMaxPublicTextureIDCount: 0 + switchNVNMaxPublicSamplerIDCount: 0 + stadiaPresentMode: 0 + stadiaTargetFramerate: 0 + vulkanNumSwapchainBuffers: 3 vulkanEnableSetSRGBWrite: 0 - vulkanUseSWCommandBuffers: 0 m_SupportedAspectRatios: 4:3: 1 5:4: 1 16:10: 1 16:9: 1 Others: 1 - bundleVersion: 1.0 + bundleVersion: 0.1 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1 - xboxOneDisableKinectGpuReservation: 0 - xboxOneEnable7thCore: 0 + xboxOneDisableKinectGpuReservation: 1 + xboxOneEnable7thCore: 1 vrSettings: cardboard: depthFormat: 0 @@ -138,13 +145,24 @@ PlayerSettings: maximumSupportedHeadTracking: 1 hololens: depthFormat: 1 - depthBufferSharingEnabled: 0 + depthBufferSharingEnabled: 1 + lumin: + depthFormat: 0 + frameTiming: 2 + enableGLCache: 0 + glCacheMaxBlobSize: 524288 + glCacheMaxFileSize: 8388608 oculus: - sharedDepthBuffer: 0 - dashSupport: 0 + sharedDepthBuffer: 1 + dashSupport: 1 + lowOverheadMode: 0 + protectedContext: 0 + v2Signing: 1 enable360StereoCapture: 0 - protectGraphicsMemory: 0 + isWsaHolographicRemotingEnabled: 0 + enableFrameTimingStats: 0 useHDRDisplay: 0 + D3DHDRBitDepth: 0 m_ColorGamuts: 00000000 targetPixelDensity: 30 resolutionScalingMode: 0 @@ -153,7 +171,7 @@ PlayerSettings: applicationIdentifier: {} buildNumber: {} AndroidBundleVersionCode: 1 - AndroidMinSdkVersion: 16 + AndroidMinSdkVersion: 19 AndroidTargetSdkVersion: 0 AndroidPreferredInstallLocation: 1 aotOptions: @@ -165,31 +183,19 @@ PlayerSettings: CreateWallpaper: 0 APKExpansionFiles: 0 keepLoadedShadersAlive: 0 - StripUnusedMeshComponents: 0 - VertexChannelCompressionMask: 214 + StripUnusedMeshComponents: 1 + VertexChannelCompressionMask: 4054 iPhoneSdkVersion: 988 - iOSTargetOSVersionString: 8.0 + iOSTargetOSVersionString: 11.0 tvOSSdkVersion: 0 tvOSRequireExtendedGameController: 0 - tvOSTargetOSVersionString: 9.0 + tvOSTargetOSVersionString: 11.0 uIPrerenderedIcon: 0 uIRequiresPersistentWiFi: 0 uIRequiresFullScreen: 1 uIStatusBarHidden: 1 uIExitOnSuspend: 0 uIStatusBarStyle: 0 - iPhoneSplashScreen: {fileID: 0} - iPhoneHighResSplashScreen: {fileID: 0} - iPhoneTallHighResSplashScreen: {fileID: 0} - iPhone47inSplashScreen: {fileID: 0} - iPhone55inPortraitSplashScreen: {fileID: 0} - iPhone55inLandscapeSplashScreen: {fileID: 0} - iPhone58inPortraitSplashScreen: {fileID: 0} - iPhone58inLandscapeSplashScreen: {fileID: 0} - iPadPortraitSplashScreen: {fileID: 0} - iPadHighResPortraitSplashScreen: {fileID: 0} - iPadLandscapeSplashScreen: {fileID: 0} - iPadHighResLandscapeSplashScreen: {fileID: 0} appleTVSplashScreen: {fileID: 0} appleTVSplashScreen2x: {fileID: 0} tvOSSmallIconLayers: [] @@ -223,7 +229,7 @@ PlayerSettings: iOSURLSchemes: [] iOSBackgroundModes: 0 iOSMetalForceHardShadows: 0 - metalEditorSupport: 0 + metalEditorSupport: 1 metalAPIValidation: 1 iOSRenderExtraFrameOnPause: 0 appleDeveloperTeamID: @@ -233,47 +239,112 @@ PlayerSettings: tvOSManualSigningProvisioningProfileType: 0 appleEnableAutomaticSigning: 0 iOSRequireARKit: 0 + iOSAutomaticallyDetectAndAddCapabilities: 1 appleEnableProMotion: 0 - vulkanEditorSupport: 0 - clonedFromGUID: 00000000000000000000000000000000 - templatePackageId: - templateDefaultScene: - AndroidTargetArchitectures: 5 + clonedFromGUID: c0afd0d1d80e3634a9dac47e8a0426ea + templatePackageId: com.unity.template.3d@5.0.3 + templateDefaultScene: Assets/Scenes/SampleScene.unity + AndroidTargetArchitectures: 1 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} AndroidKeystoreName: AndroidKeyaliasName: AndroidBuildApkPerCpuArchitecture: 0 - AndroidTVCompatibility: 1 + AndroidTVCompatibility: 0 AndroidIsGame: 1 AndroidEnableTango: 0 androidEnableBanner: 1 androidUseLowAccuracyLocation: 0 + androidUseCustomKeystore: 0 m_AndroidBanners: - width: 320 height: 180 banner: {fileID: 0} androidGamepadSupportLevel: 0 - resolutionDialogBanner: {fileID: 0} + AndroidMinifyWithR8: 0 + AndroidMinifyRelease: 0 + AndroidMinifyDebug: 0 + AndroidValidateAppBundleSize: 1 + AndroidAppBundleSizeToValidate: 150 m_BuildTargetIcons: [] m_BuildTargetPlatformIcons: [] - m_BuildTargetBatching: [] - m_BuildTargetGraphicsAPIs: [] - m_BuildTargetVRSettings: [] - m_BuildTargetEnableVuforiaSettings: [] + m_BuildTargetBatching: + - m_BuildTarget: Standalone + m_StaticBatching: 1 + m_DynamicBatching: 0 + - m_BuildTarget: tvOS + m_StaticBatching: 1 + m_DynamicBatching: 0 + - m_BuildTarget: Android + m_StaticBatching: 1 + m_DynamicBatching: 0 + - m_BuildTarget: iPhone + m_StaticBatching: 1 + m_DynamicBatching: 0 + - m_BuildTarget: WebGL + m_StaticBatching: 0 + m_DynamicBatching: 0 + m_BuildTargetGraphicsJobs: + - m_BuildTarget: MacStandaloneSupport + m_GraphicsJobs: 0 + - m_BuildTarget: Switch + m_GraphicsJobs: 1 + - m_BuildTarget: MetroSupport + m_GraphicsJobs: 1 + - m_BuildTarget: AppleTVSupport + m_GraphicsJobs: 0 + - m_BuildTarget: BJMSupport + m_GraphicsJobs: 1 + - m_BuildTarget: LinuxStandaloneSupport + m_GraphicsJobs: 1 + - m_BuildTarget: PS4Player + m_GraphicsJobs: 1 + - m_BuildTarget: iOSSupport + m_GraphicsJobs: 0 + - m_BuildTarget: WindowsStandaloneSupport + m_GraphicsJobs: 1 + - m_BuildTarget: XboxOnePlayer + m_GraphicsJobs: 1 + - m_BuildTarget: LuminSupport + m_GraphicsJobs: 0 + - m_BuildTarget: AndroidPlayer + m_GraphicsJobs: 0 + - m_BuildTarget: WebGLSupport + m_GraphicsJobs: 0 + m_BuildTargetGraphicsJobMode: + - m_BuildTarget: PS4Player + m_GraphicsJobMode: 0 + - m_BuildTarget: XboxOnePlayer + m_GraphicsJobMode: 0 + m_BuildTargetGraphicsAPIs: + - m_BuildTarget: AndroidPlayer + m_APIs: 150000000b000000 + m_Automatic: 0 + - m_BuildTarget: iOSSupport + m_APIs: 10000000 + m_Automatic: 1 + - m_BuildTarget: AppleTVSupport + m_APIs: 10000000 + m_Automatic: 0 + - m_BuildTarget: WebGLSupport + m_APIs: 0b000000 + m_Automatic: 1 + m_BuildTargetVRSettings: + - m_BuildTarget: Standalone + m_Enabled: 0 + m_Devices: + - Oculus + - OpenVR openGLRequireES31: 0 openGLRequireES31AEP: 0 - m_TemplateCustomTags: {} + openGLRequireES32: 0 + m_TemplateCustomTags: + HIDE_FULL_SCREEN_BUTTON: mobileMTRendering: + Android: 1 iPhone: 1 tvOS: 1 - m_BuildTargetGroupLightmapEncodingQuality: - - m_BuildTarget: Standalone - m_EncodingQuality: 1 - - m_BuildTarget: XboxOne - m_EncodingQuality: 1 - - m_BuildTarget: PS4 - m_EncodingQuality: 1 + m_BuildTargetGroupLightmapEncodingQuality: [] m_BuildTargetGroupLightmapSettings: [] playModeTestRunnerEnabled: 0 runPlayModeTestAsEditModeTest: 0 @@ -284,12 +355,14 @@ PlayerSettings: cameraUsageDescription: locationUsageDescription: microphoneUsageDescription: + switchNMETAOverride: switchNetLibKey: switchSocketMemoryPoolSize: 6144 switchSocketAllocatorPoolSize: 128 switchSocketConcurrencyLimit: 14 switchScreenResolutionBehavior: 2 switchUseCPUProfiler: 0 + switchUseGOLDLinker: 0 switchApplicationID: 0x01004b9000490000 switchNSODependencies: switchTitleNames_0: @@ -383,6 +456,7 @@ PlayerSettings: switchRatingsInt_9: 0 switchRatingsInt_10: 0 switchRatingsInt_11: 0 + switchRatingsInt_12: 0 switchLocalCommunicationIds_0: switchLocalCommunicationIds_1: switchLocalCommunicationIds_2: @@ -396,7 +470,9 @@ PlayerSettings: switchAllowsVideoCapturing: 1 switchAllowsRuntimeAddOnContentInstall: 0 switchDataLossConfirmation: 0 - switchSupportedNpadStyles: 3 + switchUserAccountLockEnabled: 0 + switchSystemResourceMemory: 16777216 + switchSupportedNpadStyles: 22 switchNativeFsCacheSize: 32 switchIsHoldTypeHorizontal: 0 switchSupportedNpadCount: 8 @@ -424,7 +500,7 @@ PlayerSettings: ps4VideoOutPixelFormat: 0 ps4VideoOutInitialWidth: 1920 ps4VideoOutBaseModeInitialWidth: 1920 - ps4VideoOutReprojectionRate: 120 + ps4VideoOutReprojectionRate: 60 ps4PronunciationXMLPath: ps4PronunciationSIGPath: ps4BackgroundImagePath: @@ -437,6 +513,7 @@ PlayerSettings: ps4ShareFilePath: ps4ShareOverlayImagePath: ps4PrivacyGuardImagePath: + ps4ExtraSceSysFile: ps4NPtitleDatPath: ps4RemotePlayKeyAssignment: -1 ps4RemotePlayKeyMappingDir: @@ -449,17 +526,20 @@ PlayerSettings: ps4DownloadDataSize: 0 ps4GarlicHeapSize: 2048 ps4ProGarlicHeapSize: 2560 - ps4Passcode: O47XWS2qVOw5lxuBEBNue7b9PZS0hoI6 + playerPrefsMaxSize: 32768 + ps4Passcode: frAQBc8Wsa1xVPfvJcrgRYwTiizs2trQ ps4pnSessions: 1 ps4pnPresence: 1 ps4pnFriends: 1 ps4pnGameCustomData: 1 playerPrefsSupport: 0 enableApplicationExit: 0 + resetTempFolder: 1 restrictedAudioUsageRights: 0 ps4UseResolutionFallback: 0 ps4ReprojectionSupport: 0 ps4UseAudio3dBackend: 0 + ps4UseLowGarlicFragmentationMode: 1 ps4SocialScreenEnabled: 0 ps4ScriptOptimizationLevel: 0 ps4Audio3dVirtualSpeakerCount: 14 @@ -476,118 +556,72 @@ PlayerSettings: ps4disableAutoHideSplash: 0 ps4videoRecordingFeaturesUsed: 0 ps4contentSearchFeaturesUsed: 0 + ps4CompatibilityPS5: 0 + ps4GPU800MHz: 1 ps4attribEyeToEyeDistanceSettingVR: 0 ps4IncludedModules: [] + ps4attribVROutputEnabled: 0 monoEnv: - psp2Splashimage: {fileID: 0} - psp2NPTrophyPackPath: - psp2NPSupportGBMorGJP: 0 - psp2NPAgeRating: 12 - psp2NPTitleDatPath: - psp2NPCommsID: - psp2NPCommunicationsID: - psp2NPCommsPassphrase: - psp2NPCommsSig: - psp2ParamSfxPath: - psp2ManualPath: - psp2LiveAreaGatePath: - psp2LiveAreaBackroundPath: - psp2LiveAreaPath: - psp2LiveAreaTrialPath: - psp2PatchChangeInfoPath: - psp2PatchOriginalPackage: - psp2PackagePassword: pgabi9UOuSpM2Tlh01vOzwvSikHFswuz - psp2KeystoneFile: - psp2MemoryExpansionMode: 0 - psp2DRMType: 0 - psp2StorageType: 0 - psp2MediaCapacity: 0 - psp2DLCConfigPath: - psp2ThumbnailPath: - psp2BackgroundPath: - psp2SoundPath: - psp2TrophyCommId: - psp2TrophyPackagePath: - psp2PackagedResourcesPath: - psp2SaveDataQuota: 10240 - psp2ParentalLevel: 1 - psp2ShortTitle: Not Set - psp2ContentID: IV0000-ABCD12345_00-0123456789ABCDEF - psp2Category: 0 - psp2MasterVersion: 01.00 - psp2AppVersion: 01.00 - psp2TVBootMode: 0 - psp2EnterButtonAssignment: 2 - psp2TVDisableEmu: 0 - psp2AllowTwitterDialog: 1 - psp2Upgradable: 0 - psp2HealthWarning: 0 - psp2UseLibLocation: 0 - psp2InfoBarOnStartup: 0 - psp2InfoBarColor: 0 - psp2ScriptOptimizationLevel: 0 splashScreenBackgroundSourceLandscape: {fileID: 0} splashScreenBackgroundSourcePortrait: {fileID: 0} + blurSplashScreenBackground: 1 spritePackerPolicy: - webGLMemorySize: 256 + webGLMemorySize: 16 webGLExceptionSupport: 1 webGLNameFilesAsHashes: 0 - webGLDataCaching: 0 + webGLDataCaching: 1 webGLDebugSymbols: 0 webGLEmscriptenArgs: webGLModulesDirectory: - webGLTemplate: PROJECT:BetterTemplate + webGLTemplate: PROJECT:Better2020 webGLAnalyzeBuildSize: 0 webGLUseEmbeddedResources: 0 webGLCompressionFormat: 1 + webGLWasmArithmeticExceptions: 0 webGLLinkerTarget: 1 + webGLThreadsSupport: 0 + webGLDecompressionFallback: 0 scriptingDefineSymbols: {} platformArchitecture: {} scriptingBackend: {} il2cppCompilerConfiguration: {} + managedStrippingLevel: {} incrementalIl2cppBuild: {} allowUnsafeCode: 0 + useDeterministicCompilation: 1 additionalIl2CppArgs: - scriptingRuntimeVersion: 0 + scriptingRuntimeVersion: 1 + gcIncremental: 1 + gcWBarrierValidation: 0 apiCompatibilityLevelPerPlatform: {} m_RenderingPath: 1 m_MobileRenderingPath: 1 - metroPackageName: WebGLCube + metroPackageName: Template_3D metroPackageVersion: metroCertificatePath: metroCertificatePassword: metroCertificateSubject: metroCertificateIssuer: metroCertificateNotAfter: 0000000000000000 - metroApplicationDescription: WebGLCube + metroApplicationDescription: Template_3D wsaImages: {} metroTileShortName: metroTileShowName: 0 metroMediumTileShowName: 0 metroLargeTileShowName: 0 metroWideTileShowName: 0 + metroSupportStreamingInstall: 0 + metroLastRequiredScene: 0 metroDefaultTileSize: 1 metroTileForegroundText: 2 metroTileBackgroundColor: {r: 0.13333334, g: 0.17254902, b: 0.21568628, a: 0} - metroSplashScreenBackgroundColor: {r: 0.12941177, g: 0.17254902, b: 0.21568628, - a: 1} + metroSplashScreenBackgroundColor: {r: 0.12941177, g: 0.17254902, b: 0.21568628, a: 1} metroSplashScreenUseBackgroundColor: 0 platformCapabilities: {} + metroTargetDeviceFamilies: {} metroFTAName: metroFTAFileTypes: [] metroProtocolName: - metroCompilationOverrides: 1 - n3dsUseExtSaveData: 0 - n3dsCompressStaticMem: 1 - n3dsExtSaveDataNumber: 0x12345 - n3dsStackSize: 131072 - n3dsTargetPlatform: 2 - n3dsRegion: 7 - n3dsMediaSize: 0 - n3dsLogoStyle: 3 - n3dsTitle: GameName - n3dsProductCode: - n3dsApplicationId: 0xFF3FF XboxOneProductId: XboxOneUpdateKey: XboxOneSandboxId: @@ -606,23 +640,38 @@ PlayerSettings: XboxOneCapability: [] XboxOneGameRating: {} XboxOneIsContentPackage: 0 - XboxOneEnableGPUVariability: 0 + XboxOneEnableGPUVariability: 1 XboxOneSockets: {} XboxOneSplashScreen: {fileID: 0} XboxOneAllowedProductIds: [] XboxOnePersistentLocalStorageSize: 0 XboxOneXTitleMemory: 8 - xboxOneScriptCompiler: 0 + XboxOneOverrideIdentityName: + XboxOneOverrideIdentityPublisher: vrEditorSettings: daydream: daydreamIconForeground: {fileID: 0} daydreamIconBackground: {fileID: 0} - cloudServicesEnabled: {} - facebookSdkVersion: 7.9.4 - apiCompatibilityLevel: 2 + cloudServicesEnabled: + UNet: 1 + luminIcon: + m_Name: + m_ModelFolderPath: + m_PortalFolderPath: + luminCert: + m_CertPath: + m_SignPackage: 1 + luminIsChannelApp: 0 + luminVersion: + m_VersionCode: 1 + m_VersionName: + apiCompatibilityLevel: 6 cloudProjectId: + framebufferDepthMemorylessMode: 0 projectName: organizationId: cloudEnabled: 0 enableNativePlatformBackendsForNewInputSystem: 0 disableOldInputManagerSupport: 0 + legacyClampBlendShapeWeights: 0 + virtualTexturingSupportEnabled: 0 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 6169583..1b03d05 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1 +1,2 @@ -m_EditorVersion: 2018.2.7f1 +m_EditorVersion: 2020.1.3f1 +m_EditorVersionWithRevision: 2020.1.3f1 (cf5c4788e1d8) diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset index 86c047f..7b7658d 100644 --- a/ProjectSettings/QualitySettings.asset +++ b/ProjectSettings/QualitySettings.asset @@ -29,9 +29,16 @@ QualitySettings: vSyncCount: 0 lodBias: 0.3 maximumLODLevel: 0 + streamingMipmapsActive: 0 + streamingMipmapsAddAllCameras: 1 + streamingMipmapsMemoryBudget: 512 + streamingMipmapsRenderersPerFrame: 512 + streamingMipmapsMaxLevelReduction: 2 + streamingMipmapsMaxFileIORequests: 1024 particleRaycastBudget: 4 asyncUploadTimeSlice: 2 - asyncUploadBufferSize: 4 + asyncUploadBufferSize: 16 + asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 excludedTargetPlatforms: [] - serializedVersion: 2 @@ -57,9 +64,16 @@ QualitySettings: vSyncCount: 0 lodBias: 0.4 maximumLODLevel: 0 + streamingMipmapsActive: 0 + streamingMipmapsAddAllCameras: 1 + streamingMipmapsMemoryBudget: 512 + streamingMipmapsRenderersPerFrame: 512 + streamingMipmapsMaxLevelReduction: 2 + streamingMipmapsMaxFileIORequests: 1024 particleRaycastBudget: 16 asyncUploadTimeSlice: 2 - asyncUploadBufferSize: 4 + asyncUploadBufferSize: 16 + asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 excludedTargetPlatforms: [] - serializedVersion: 2 @@ -85,9 +99,16 @@ QualitySettings: vSyncCount: 1 lodBias: 0.7 maximumLODLevel: 0 + streamingMipmapsActive: 0 + streamingMipmapsAddAllCameras: 1 + streamingMipmapsMemoryBudget: 512 + streamingMipmapsRenderersPerFrame: 512 + streamingMipmapsMaxLevelReduction: 2 + streamingMipmapsMaxFileIORequests: 1024 particleRaycastBudget: 64 asyncUploadTimeSlice: 2 - asyncUploadBufferSize: 4 + asyncUploadBufferSize: 16 + asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 excludedTargetPlatforms: [] - serializedVersion: 2 @@ -113,9 +134,16 @@ QualitySettings: vSyncCount: 1 lodBias: 1 maximumLODLevel: 0 + streamingMipmapsActive: 0 + streamingMipmapsAddAllCameras: 1 + streamingMipmapsMemoryBudget: 512 + streamingMipmapsRenderersPerFrame: 512 + streamingMipmapsMaxLevelReduction: 2 + streamingMipmapsMaxFileIORequests: 1024 particleRaycastBudget: 256 asyncUploadTimeSlice: 2 - asyncUploadBufferSize: 4 + asyncUploadBufferSize: 16 + asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 excludedTargetPlatforms: [] - serializedVersion: 2 @@ -141,9 +169,16 @@ QualitySettings: vSyncCount: 1 lodBias: 1.5 maximumLODLevel: 0 + streamingMipmapsActive: 0 + streamingMipmapsAddAllCameras: 1 + streamingMipmapsMemoryBudget: 512 + streamingMipmapsRenderersPerFrame: 512 + streamingMipmapsMaxLevelReduction: 2 + streamingMipmapsMaxFileIORequests: 1024 particleRaycastBudget: 1024 asyncUploadTimeSlice: 2 - asyncUploadBufferSize: 4 + asyncUploadBufferSize: 16 + asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 excludedTargetPlatforms: [] - serializedVersion: 2 @@ -169,24 +204,28 @@ QualitySettings: vSyncCount: 1 lodBias: 2 maximumLODLevel: 0 + streamingMipmapsActive: 0 + streamingMipmapsAddAllCameras: 1 + streamingMipmapsMemoryBudget: 512 + streamingMipmapsRenderersPerFrame: 512 + streamingMipmapsMaxLevelReduction: 2 + streamingMipmapsMaxFileIORequests: 1024 particleRaycastBudget: 4096 asyncUploadTimeSlice: 2 - asyncUploadBufferSize: 4 + asyncUploadBufferSize: 16 + asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 excludedTargetPlatforms: [] m_PerPlatformDefaultQuality: Android: 2 + Lumin: 5 Nintendo 3DS: 5 Nintendo Switch: 5 PS4: 5 - PSM: 5 PSP2: 2 - Samsung TV: 2 + Stadia: 5 Standalone: 5 - Tizen: 2 - Web: 5 WebGL: 3 - WiiU: 5 Windows Store Apps: 5 XboxOne: 5 iPhone: 2 diff --git a/ProjectSettings/TimelineSettings.asset b/ProjectSettings/TimelineSettings.asset new file mode 100644 index 0000000..b4fbdb0 --- /dev/null +++ b/ProjectSettings/TimelineSettings.asset @@ -0,0 +1,15 @@ +%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: 11500000, guid: a287be6c49135cd4f9b2b8666c39d999, type: 3} + m_Name: + m_EditorClassIdentifier: + assetDefaultFramerate: 60 diff --git a/ProjectSettings/UnityConnectSettings.asset b/ProjectSettings/UnityConnectSettings.asset index 1be4600..fa0b146 100644 --- a/ProjectSettings/UnityConnectSettings.asset +++ b/ProjectSettings/UnityConnectSettings.asset @@ -3,25 +3,25 @@ --- !u!310 &1 UnityConnectSettings: m_ObjectHideFlags: 0 - m_Enabled: 1 + serializedVersion: 1 + m_Enabled: 0 m_TestMode: 0 - m_TestEventUrl: - m_TestConfigUrl: + m_EventOldUrl: https://api.uca.cloud.unity3d.com/v1/events + m_EventUrl: https://cdp.cloud.unity3d.com/v1/events + m_ConfigUrl: https://config.uca.cloud.unity3d.com m_TestInitMode: 0 CrashReportingSettings: - m_EventUrl: https://perf-events.cloud.unity3d.com/api/events/crashes - m_NativeEventUrl: https://perf-events.cloud.unity3d.com/symbolicate + m_EventUrl: https://perf-events.cloud.unity3d.com m_Enabled: 0 + m_LogBufferSize: 10 m_CaptureEditorExceptions: 1 UnityPurchasingSettings: m_Enabled: 0 m_TestMode: 0 UnityAnalyticsSettings: m_Enabled: 0 - m_InitializeOnStartup: 1 m_TestMode: 0 - m_TestEventUrl: - m_TestConfigUrl: + m_InitializeOnStartup: 1 UnityAdsSettings: m_Enabled: 0 m_InitializeOnStartup: 1 diff --git a/ProjectSettings/VFXManager.asset b/ProjectSettings/VFXManager.asset new file mode 100644 index 0000000..3a95c98 --- /dev/null +++ b/ProjectSettings/VFXManager.asset @@ -0,0 +1,12 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!937362698 &1 +VFXManager: + m_ObjectHideFlags: 0 + m_IndirectShader: {fileID: 0} + m_CopyBufferShader: {fileID: 0} + m_SortShader: {fileID: 0} + m_StripUpdateShader: {fileID: 0} + m_RenderPipeSettingsPath: + m_FixedTimeStep: 0.016666668 + m_MaxDeltaTime: 0.05 diff --git a/ProjectSettings/VersionControlSettings.asset b/ProjectSettings/VersionControlSettings.asset new file mode 100644 index 0000000..dca2881 --- /dev/null +++ b/ProjectSettings/VersionControlSettings.asset @@ -0,0 +1,8 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!890905787 &1 +VersionControlSettings: + m_ObjectHideFlags: 0 + m_Mode: Visible Meta Files + m_CollabEditorSettings: + inProgressEnabled: 1 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 diff --git a/WebGLFitWindow.sln b/WebGLFitWindow.sln deleted file mode 100644 index e1da81b..0000000 --- a/WebGLFitWindow.sln +++ /dev/null @@ -1,23 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebGLCube", "Assembly-CSharp.csproj", "{EE0CF490-FEC0-5CAB-0042-EE025B7D1984}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {EE0CF490-FEC0-5CAB-0042-EE025B7D1984}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EE0CF490-FEC0-5CAB-0042-EE025B7D1984}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EE0CF490-FEC0-5CAB-0042-EE025B7D1984}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EE0CF490-FEC0-5CAB-0042-EE025B7D1984}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(MonoDevelopProperties) = preSolution - StartupItem = Assembly-CSharp.csproj - EndGlobalSection -EndGlobal