Browse Source

Merge pull request 'URP init, Graphic & Project Settigns' (#4) from feature/urp into develop

Reviewed-on: #4
remotes/checkIfPRContentChanged-1717160137614929600/develop
AlexAT 2 years ago
parent
commit
ea104281bc
  1. 54
      Assets/Renderer/URP_Renderer.asset
  2. 72
      Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset
  3. 1
      Packages/manifest.json
  4. 76
      Packages/packages-lock.json
  5. 18
      ProjectSettings/BurstAotSettings_StandaloneWindows.json
  6. 6
      ProjectSettings/CommonBurstAotSettings.json
  7. 6
      ProjectSettings/EditorBuildSettings.asset
  8. 11
      ProjectSettings/Packages/com.unity.learn.iet-framework/Settings.json
  9. 0
      ProjectSettings/Packages/com.unity.services.core/Settings.json
  10. 9
      ProjectSettings/TagManager.asset

54
Assets/Renderer/URP_Renderer.asset

@ -82,33 +82,33 @@ MonoBehaviour:
m_Textures: m_Textures:
blueNoise64LTex: {fileID: 2800000, guid: e3d24661c1e055f45a7560c033dbb837, type: 3} blueNoise64LTex: {fileID: 2800000, guid: e3d24661c1e055f45a7560c033dbb837, type: 3}
bayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44, type: 3} bayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44, type: 3}
m_PrefilteringModeMainLightShadows: 1 m_PrefilteringModeMainLightShadows: 3
m_PrefilteringModeAdditionalLight: 4 m_PrefilteringModeAdditionalLight: 3
m_PrefilteringModeAdditionalLightShadows: 1 m_PrefilteringModeAdditionalLightShadows: 0
m_PrefilterXRKeywords: 0 m_PrefilterXRKeywords: 1
m_PrefilteringModeForwardPlus: 1 m_PrefilteringModeForwardPlus: 0
m_PrefilteringModeDeferredRendering: 1 m_PrefilteringModeDeferredRendering: 0
m_PrefilteringModeScreenSpaceOcclusion: 1 m_PrefilteringModeScreenSpaceOcclusion: 0
m_PrefilterDebugKeywords: 0 m_PrefilterDebugKeywords: 1
m_PrefilterWriteRenderingLayers: 0 m_PrefilterWriteRenderingLayers: 1
m_PrefilterHDROutput: 0 m_PrefilterHDROutput: 1
m_PrefilterSSAODepthNormals: 0 m_PrefilterSSAODepthNormals: 1
m_PrefilterSSAOSourceDepthLow: 0 m_PrefilterSSAOSourceDepthLow: 1
m_PrefilterSSAOSourceDepthMedium: 0 m_PrefilterSSAOSourceDepthMedium: 1
m_PrefilterSSAOSourceDepthHigh: 0 m_PrefilterSSAOSourceDepthHigh: 1
m_PrefilterSSAOInterleaved: 0 m_PrefilterSSAOInterleaved: 1
m_PrefilterSSAOBlueNoise: 0 m_PrefilterSSAOBlueNoise: 1
m_PrefilterSSAOSampleCountLow: 0 m_PrefilterSSAOSampleCountLow: 1
m_PrefilterSSAOSampleCountMedium: 0 m_PrefilterSSAOSampleCountMedium: 1
m_PrefilterSSAOSampleCountHigh: 0 m_PrefilterSSAOSampleCountHigh: 1
m_PrefilterDBufferMRT1: 0 m_PrefilterDBufferMRT1: 1
m_PrefilterDBufferMRT2: 0 m_PrefilterDBufferMRT2: 1
m_PrefilterDBufferMRT3: 0 m_PrefilterDBufferMRT3: 1
m_PrefilterSoftShadowsQualityLow: 0 m_PrefilterSoftShadowsQualityLow: 1
m_PrefilterSoftShadowsQualityMedium: 0 m_PrefilterSoftShadowsQualityMedium: 1
m_PrefilterSoftShadowsQualityHigh: 0 m_PrefilterSoftShadowsQualityHigh: 1
m_PrefilterSoftShadows: 0 m_PrefilterSoftShadows: 0
m_PrefilterScreenCoord: 0 m_PrefilterScreenCoord: 1
m_PrefilterNativeRenderPass: 0 m_PrefilterNativeRenderPass: 1
m_ShaderVariantLogLevel: 0 m_ShaderVariantLogLevel: 0
m_ShadowCascades: 0 m_ShadowCascades: 0

72
Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset

File diff suppressed because one or more lines are too long

1
Packages/manifest.json

@ -5,6 +5,7 @@
"com.unity.collab-proxy": "2.3.1", "com.unity.collab-proxy": "2.3.1",
"com.unity.feature.2d": "2.0.0", "com.unity.feature.2d": "2.0.0",
"com.unity.feature.development": "1.0.1", "com.unity.feature.development": "1.0.1",
"com.unity.multiplayer.samples.coop": "https://github.com/Unity-Technologies/com.unity.multiplayer.samples.coop.git?path=/Packages/com.unity.multiplayer.samples.coop#main",
"com.unity.multiplayer.tools": "1.1.1", "com.unity.multiplayer.tools": "1.1.1",
"com.unity.netcode.gameobjects": "1.8.1", "com.unity.netcode.gameobjects": "1.8.1",
"com.unity.postprocessing": "3.4.0", "com.unity.postprocessing": "3.4.0",

76
Packages/packages-lock.json

@ -205,6 +205,16 @@
"dependencies": {}, "dependencies": {},
"url": "https://packages.unity.com" "url": "https://packages.unity.com"
}, },
"com.unity.learn.iet-framework": {
"version": "3.1.3",
"depth": 1,
"source": "registry",
"dependencies": {
"com.unity.editorcoroutines": "1.0.0",
"com.unity.settings-manager": "1.0.3"
},
"url": "https://packages.unity.com"
},
"com.unity.mathematics": { "com.unity.mathematics": {
"version": "1.2.6", "version": "1.2.6",
"depth": 1, "depth": 1,
@ -212,6 +222,18 @@
"dependencies": {}, "dependencies": {},
"url": "https://packages.unity.com" "url": "https://packages.unity.com"
}, },
"com.unity.multiplayer.samples.coop": {
"version": "https://github.com/Unity-Technologies/com.unity.multiplayer.samples.coop.git?path=/Packages/com.unity.multiplayer.samples.coop#main",
"depth": 0,
"source": "git",
"dependencies": {
"com.unity.learn.iet-framework": "3.1.3",
"com.unity.multiplayer.tools": "1.1.0",
"com.unity.netcode.gameobjects": "1.8.1",
"com.unity.services.relay": "1.0.5"
},
"hash": "74afaebf85e062923fdad63f399315800b969c44"
},
"com.unity.multiplayer.tools": { "com.unity.multiplayer.tools": {
"version": "1.1.1", "version": "1.1.1",
"depth": 0, "depth": 0,
@ -310,6 +332,60 @@
"dependencies": {}, "dependencies": {},
"url": "https://packages.unity.com" "url": "https://packages.unity.com"
}, },
"com.unity.services.authentication": {
"version": "2.7.2",
"depth": 2,
"source": "registry",
"dependencies": {
"com.unity.nuget.newtonsoft-json": "3.2.1",
"com.unity.services.core": "1.10.1",
"com.unity.modules.unitywebrequest": "1.0.0",
"com.unity.ugui": "1.0.0"
},
"url": "https://packages.unity.com"
},
"com.unity.services.core": {
"version": "1.12.2",
"depth": 2,
"source": "registry",
"dependencies": {
"com.unity.modules.unitywebrequest": "1.0.0",
"com.unity.nuget.newtonsoft-json": "3.2.1",
"com.unity.modules.androidjni": "1.0.0"
},
"url": "https://packages.unity.com"
},
"com.unity.services.qos": {
"version": "1.2.1",
"depth": 2,
"source": "registry",
"dependencies": {
"com.unity.services.core": "1.4.0",
"com.unity.modules.unitywebrequest": "1.0.0",
"com.unity.nuget.newtonsoft-json": "3.0.2",
"com.unity.services.authentication": "2.0.0",
"com.unity.collections": "1.2.4"
},
"url": "https://packages.unity.com"
},
"com.unity.services.relay": {
"version": "1.0.5",
"depth": 1,
"source": "registry",
"dependencies": {
"com.unity.services.core": "1.4.0",
"com.unity.services.authentication": "2.0.0",
"com.unity.services.qos": "1.1.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.nuget.newtonsoft-json": "3.0.2",
"com.unity.transport": "1.3.0"
},
"url": "https://packages.unity.com"
},
"com.unity.settings-manager": { "com.unity.settings-manager": {
"version": "2.0.1", "version": "2.0.1",
"depth": 2, "depth": 2,

18
ProjectSettings/BurstAotSettings_StandaloneWindows.json

@ -0,0 +1,18 @@
{
"MonoBehaviour": {
"Version": 4,
"EnableBurstCompilation": true,
"EnableOptimisations": true,
"EnableSafetyChecks": false,
"EnableDebugInAllBuilds": false,
"DebugDataKind": 1,
"EnableArmv9SecurityFeatures": false,
"CpuMinTargetX32": 0,
"CpuMaxTargetX32": 0,
"CpuMinTargetX64": 0,
"CpuMaxTargetX64": 0,
"CpuTargetsX32": 6,
"CpuTargetsX64": 72,
"OptimizeFor": 0
}
}

6
ProjectSettings/CommonBurstAotSettings.json

@ -0,0 +1,6 @@
{
"MonoBehaviour": {
"Version": 4,
"DisabledWarnings": ""
}
}

6
ProjectSettings/EditorBuildSettings.asset

@ -5,12 +5,12 @@ EditorBuildSettings:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
serializedVersion: 2 serializedVersion: 2
m_Scenes: m_Scenes:
- enabled: 1
path: Assets/GameAssets/Scenes/Start.unity
guid: e3a36dd73be6a6641b76ff59c871e63e
- enabled: 1 - enabled: 1
path: Assets/GameAssets/Scenes/Gameplay.unity path: Assets/GameAssets/Scenes/Gameplay.unity
guid: 9fc0d4010bbf28b4594072e72b8655ab guid: 9fc0d4010bbf28b4594072e72b8655ab
- enabled: 1
path: Assets/GameAssets/Scenes/Start.unity
guid: e3a36dd73be6a6641b76ff59c871e63e
- enabled: 1 - enabled: 1
path: Assets/GameAssets/Scenes/Locations/Room1.unity path: Assets/GameAssets/Scenes/Locations/Room1.unity
guid: 6cbcd5c599f92144f80a32a8819f03e7 guid: 6cbcd5c599f92144f80a32a8819f03e7

11
ProjectSettings/Packages/com.unity.learn.iet-framework/Settings.json

@ -0,0 +1,11 @@
{
"m_Dictionary": {
"m_DictionaryValues": [
{
"type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
"key": "IET.DisplayWelcomeDialogOnStartup",
"value": "{\"m_Value\":false}"
}
]
}
}

0
ProjectSettings/Packages/com.unity.services.core/Settings.json

9
ProjectSettings/TagManager.asset

@ -38,6 +38,15 @@ TagManager:
- -
- -
m_SortingLayers: m_SortingLayers:
- name: Background
uniqueID: 1065907725
locked: 0
- name: Default - name: Default
uniqueID: 0 uniqueID: 0
locked: 0 locked: 0
- name: Foreground
uniqueID: 678295305
locked: 0
- name: UI
uniqueID: 1674803885
locked: 0

Loading…
Cancel
Save