4.7.0 package

2019-01-16 16:55:05 +01:00 · 2019-01-16 16:55:05 +01:00 · 151d56d121
--- a/Assets/Demo/Scripts/FPV/FirstPersonCharacter/Prefabs/FPSController.prefab
+++ b/Assets/Demo/Scripts/FPV/FirstPersonCharacter/Prefabs/FPSController.prefab
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4fe6b8ac8a63663f531e0e9dfc76ef052ca7b5266d79cd7728274380481dd9c3
-size 8380
+oid sha256:e7336deff3d761a21505fe5e1b1192a6d8a19f61aceba88708522a9354e50ed8
+size 10901
--- a/Assets/Demo/Scripts/utilities/Editor/ReplaceSelected.cs
+++ b/Assets/Demo/Scripts/utilities/Editor/ReplaceSelected.cs
@ -105,9 +105,10 @@ public class ReplaceSelected : ScriptableWizard
        foreach (Transform t in transforms)
        {
            GameObject g;
-            PrefabType pref = PrefabUtility.GetPrefabType(replacement);
+            //PrefabType pref = PrefabUtility.GetPrefabType(replacement);
+            PrefabAssetType pref = PrefabUtility.GetPrefabAssetType(replacement);

-            if (pref == PrefabType.Prefab || pref == PrefabType.ModelPrefab)
+            if (pref != PrefabAssetType.NotAPrefab)
            {
                g = (GameObject)PrefabUtility.InstantiatePrefab(replacement);
            }
--- a/Assets/Demo/Settings/HDRenderPipelineAsset
+++ b/Assets/Demo/Settings/HDRenderPipelineAsset
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:24765afc831cf09a36c95d7064531e1b6e5929e47e03b11412b727c920254913
+oid sha256:abf4c3493183f4eef40e6f7393502e5a0fa9b4f770f5ac7d51af54e12f18e8f1
 size 6172
--- a/Assets/Demo/Settings/SSS/Demo
+++ b/Assets/Demo/Settings/SSS/Demo
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:92e6406ac26a6b96ccd146be169e7484e0094e349475d1fc91dfb95f2915779a
+oid sha256:26bea974e444020dadc9778c0bb354182092ba8bf4e6673138a52814117aea19
 size 4253
--- a/Assets/Demo/Video_Loader.unity
+++ b/Assets/Demo/Video_Loader.unity
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8bf005022fd8a7a23f63553970662ae12c70c131b66b8acf157425d9eedb1fab
-size 29977
+oid sha256:ee109ad8645bad8c5f13a22f87c3d12472499e88aa2843ddc19ef9466e3a5b38
+size 32495
--- a/Assets/Demo/Video_Timeline.unity
+++ b/Assets/Demo/Video_Timeline.unity
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:791c8fe153d43bd8be92e50f9ba2864a302cc5a205a80f033bc39a6f715bc07b
-size 533640
+oid sha256:546aff0bec2ca978bfc7b9f66c13129d7704244cb5753fbf54d9fc06ea7ace71
+size 533886
--- a/Assets/Graph/GenericMaterials/Grounds/Material/Moss_01.mat
+++ b/Assets/Graph/GenericMaterials/Grounds/Material/Moss_01.mat
@ -5,11 +5,13 @@ Material:
  serializedVersion: 6
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
  m_Name: Moss_01
  m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _DISABLE_DBUFFER _HEIGHTMAP _MAPPING_PLANAR _MASKMAP _MATERIAL_FEATURE_SUBSURFACE_SCATTERING
-    _MATERIAL_FEATURE_TRANSMISSION _NORMALMAP _NORMALMAP_TANGENT_SPACE _THICKNESSMAP
+  m_ShaderKeywords: _DISABLE_DBUFFER _DISPLACEMENT_LOCK_TILING_SCALE _HEIGHTMAP _MAPPING_PLANAR
+    _MASKMAP _MATERIAL_FEATURE_SUBSURFACE_SCATTERING _MATERIAL_FEATURE_TRANSMISSION
+    _NORMALMAP _NORMALMAP_TANGENT_SPACE _THICKNESSMAP _VERTEX_DISPLACEMENT _VERTEX_DISPLACEMENT_LOCK_OBJECT_SCALE
  m_LightmapFlags: 4
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0
@ -175,7 +177,7 @@ Material:
    - _DiffusionProfile: 7
    - _DisplacementLockObjectScale: 1
    - _DisplacementLockTilingScale: 1
-    - _DisplacementMode: 0
+    - _DisplacementMode: 1
    - _DistortionBlendMode: 0
    - _DistortionBlurBlendMode: 0
    - _DistortionBlurDstBlend: 1
@ -210,7 +212,7 @@ Material:
    - _GlossyReflections: 1
    - _HdrpVersion: 1
    - _HeightAmplitude: 0.02
-    - _HeightCenter: 0.5
+    - _HeightCenter: 1
    - _HeightMapParametrization: 0
    - _HeightMax: 1
    - _HeightMin: -1
@ -239,6 +241,7 @@ Material:
    - _PPDPrimitiveWidth: 1
    - _Parallax: 0.02
    - _PreRefractionPass: 0
+    - _ReceivesSSR: 1
    - _RefractionMode: 0
    - _RefractionModel: 0
    - _RefractionSSRayModel: 0
@ -263,6 +266,7 @@ Material:
    - _SubsurfaceProfile: 7
    - _SubsurfaceRadius: 1
    - _SupportDBuffer: 0
+    - _SupportDecals: 1
    - _SurfaceType: 0
    - _TessellationBackFaceCullEpsilon: -0.25
    - _TessellationFactor: 15
--- a/Assets/Graph/Lighting/Decals/DECALS.prefab
+++ b/Assets/Graph/Lighting/Decals/DECALS.prefab
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f561aba5e6c4a1de2ed46e6fdfbfbbb353b606007db17396245c1fec16ebc6d0
-size 37506
+oid sha256:560bf2593a4f988aee0873a0634338c11e38b54339dc3ad73e7486f46945913f
+size 39020
--- a/Assets/Graph/Lighting/Textures/gaslantern_Glass_BaseColor.png
+++ b/Assets/Graph/Lighting/Textures/gaslantern_Glass_BaseColor.png
--- a/Assets/Graph/Lighting/Textures/gaslantern_Glass_BaseColor.png.meta
+++ b/Assets/Graph/Lighting/Textures/gaslantern_Glass_BaseColor.png.meta
@ -60,7 +60,40 @@ TextureImporter:
  platformSettings:
  - serializedVersion: 2
    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
+    maxTextureSize: 256
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Standalone
+    maxTextureSize: 256
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: XboxOne
+    maxTextureSize: 256
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: PS4
+    maxTextureSize: 256
    resizeAlgorithm: 0
    textureFormat: -1
    textureCompression: 1
--- a/Assets/Graph/Lighting/Textures/gaslantern_Glass_MaskMap.png
+++ b/Assets/Graph/Lighting/Textures/gaslantern_Glass_MaskMap.png
--- a/Assets/Graph/Lighting/Textures/gaslantern_Glass_MaskMap.png.meta
+++ b/Assets/Graph/Lighting/Textures/gaslantern_Glass_MaskMap.png.meta
@ -60,7 +60,7 @@ TextureImporter:
  platformSettings:
  - serializedVersion: 2
    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
+    maxTextureSize: 512
    resizeAlgorithm: 0
    textureFormat: -1
    textureCompression: 1
@ -71,7 +71,29 @@ TextureImporter:
    androidETC2FallbackOverride: 0
  - serializedVersion: 2
    buildTarget: Standalone
-    maxTextureSize: 2048
+    maxTextureSize: 512
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: XboxOne
+    maxTextureSize: 512
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: PS4
+    maxTextureSize: 512
    resizeAlgorithm: 0
    textureFormat: -1
    textureCompression: 1
--- a/Assets/Graph/Lighting/Textures/gaslantern_Glass_Normal.png
+++ b/Assets/Graph/Lighting/Textures/gaslantern_Glass_Normal.png
--- a/Assets/Graph/Lighting/Textures/gaslantern_Glass_Normal.png.meta
+++ b/Assets/Graph/Lighting/Textures/gaslantern_Glass_Normal.png.meta
@ -60,7 +60,40 @@ TextureImporter:
  platformSettings:
  - serializedVersion: 2
    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
+    maxTextureSize: 512
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Standalone
+    maxTextureSize: 512
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: XboxOne
+    maxTextureSize: 512
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: PS4
+    maxTextureSize: 512
    resizeAlgorithm: 0
    textureFormat: -1
    textureCompression: 1
--- a/Assets/Graph/Lighting/Textures/gaslantern_MetalPainted_BaseColor.png
+++ b/Assets/Graph/Lighting/Textures/gaslantern_MetalPainted_BaseColor.png
--- a/Assets/Graph/Lighting/Textures/gaslantern_MetalPainted_BaseColor.png.meta
+++ b/Assets/Graph/Lighting/Textures/gaslantern_MetalPainted_BaseColor.png.meta
@ -60,7 +60,40 @@ TextureImporter:
  platformSettings:
  - serializedVersion: 2
    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
+    maxTextureSize: 256
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Standalone
+    maxTextureSize: 256
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: XboxOne
+    maxTextureSize: 256
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: PS4
+    maxTextureSize: 256
    resizeAlgorithm: 0
    textureFormat: -1
    textureCompression: 1
--- a/Assets/Graph/Lighting/Textures/gaslantern_MetalPainted_MaskMap.png.meta
+++ b/Assets/Graph/Lighting/Textures/gaslantern_MetalPainted_MaskMap.png.meta
@ -5,7 +5,7 @@ TextureImporter:
  externalObjects: {}
  serializedVersion: 7
  mipmaps:
-    mipMapMode: 0
+    mipMapMode: 1
    enableMipMap: 1
    sRGBTexture: 0
    linearTexture: 0
@ -32,7 +32,7 @@ TextureImporter:
  textureSettings:
    serializedVersion: 2
    filterMode: -1
-    aniso: -1
+    aniso: 2
    mipBias: -100
    wrapU: -1
    wrapV: -1
@ -60,7 +60,7 @@ TextureImporter:
  platformSettings:
  - serializedVersion: 2
    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
+    maxTextureSize: 1024
    resizeAlgorithm: 0
    textureFormat: -1
    textureCompression: 1
@ -71,7 +71,29 @@ TextureImporter:
    androidETC2FallbackOverride: 0
  - serializedVersion: 2
    buildTarget: Standalone
-    maxTextureSize: 2048
+    maxTextureSize: 1024
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: XboxOne
+    maxTextureSize: 1024
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: PS4
+    maxTextureSize: 1024
    resizeAlgorithm: 0
    textureFormat: -1
    textureCompression: 1
--- a/Assets/Graph/Lighting/Textures/gaslantern_MetalPainted_Normal.png.meta
+++ b/Assets/Graph/Lighting/Textures/gaslantern_MetalPainted_Normal.png.meta
@ -60,7 +60,40 @@ TextureImporter:
  platformSettings:
  - serializedVersion: 2
    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
+    maxTextureSize: 1024
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Standalone
+    maxTextureSize: 1024
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: XboxOne
+    maxTextureSize: 1024
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: PS4
+    maxTextureSize: 1024
    resizeAlgorithm: 0
    textureFormat: -1
    textureCompression: 1
--- a/Assets/Graph/Models/Trees/Textures/Branches_MSK.tga
+++ b/Assets/Graph/Models/Trees/Textures/Branches_MSK.tga
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:71683cde27ae8d7240f40e4a3bcd4d555621044541ceffbb4c5e1080b20b4b75
+oid sha256:fc01461ae2d73c826bd2d362d0a7c9d756c9bcbf59e0b87244c65d2e4446deeb
 size 8388652
--- a/Assets/Graph/ThirdPersonCharacter/Challenger/ChallengerThirdPersonCharacter.prefab
+++ b/Assets/Graph/ThirdPersonCharacter/Challenger/ChallengerThirdPersonCharacter.prefab
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0e99cee96cf334b6656ce7239a0130ebbd123c5b5f274afd1bcdf00d71c847b7
-size 92994
+oid sha256:1c6b5bd24e146284b67ab4a2eb383f82ff5441eee9d506fc428a6910474d123f
+size 92987
--- a/Assets/Graph/ThirdPersonCharacter/Challenger/Materials/SGR_ThreadMapDetail.shadersubgraph
+++ b/Assets/Graph/ThirdPersonCharacter/Challenger/Materials/SGR_ThreadMapDetail.shadersubgraph
@ -4,61 +4,61 @@
            "typeInfo": {
                "fullName": "UnityEditor.ShaderGraph.BooleanShaderProperty"
            },
-            "JSONnodeData": "{\n    \"m_Value\": true,\n    \"m_Name\": \"UseThreadMap\",\n    \"m_GeneratePropertyBlock\": true,\n    \"m_Guid\": {\n        \"m_GuidSerialized\": \"d6aaba38-49a3-41d1-8163-914932324589\"\n    },\n    \"m_DefaultReferenceName\": \"Boolean_AA2071D6\",\n    \"m_OverrideReferenceName\": \"_UseThreadMap\"\n}"
+            "JSONnodeData": "{\n    \"m_Value\": true,\n    \"m_Name\": \"UseThreadMap\",\n    \"m_GeneratePropertyBlock\": true,\n    \"m_Guid\": {\n        \"m_GuidSerialized\": \"d6aaba38-49a3-41d1-8163-914932324589\"\n    },\n    \"m_OverrideReferenceName\": \"_UseThreadMap\"\n}"
        },
        {
            "typeInfo": {
                "fullName": "UnityEditor.ShaderGraph.TextureShaderProperty"
            },
-            "JSONnodeData": "{\n    \"m_Value\": {\n        \"m_SerializedTexture\": \"\",\n        \"m_Guid\": \"0864a2ad592505446b25b8dfa63ffd80\"\n    },\n    \"m_Name\": \"ThreadMap\",\n    \"m_GeneratePropertyBlock\": true,\n    \"m_Guid\": {\n        \"m_GuidSerialized\": \"110f2c7b-3415-4e1f-b153-d0756fef216a\"\n    },\n    \"m_DefaultReferenceName\": \"Texture2D_4013167B\",\n    \"m_OverrideReferenceName\": \"_ThreadMap\",\n    \"m_Modifiable\": true,\n    \"m_DefaultType\": 2\n}"
+            "JSONnodeData": "{\n    \"m_Value\": {\n        \"m_SerializedTexture\": \"\",\n        \"m_Guid\": \"0864a2ad592505446b25b8dfa63ffd80\"\n    },\n    \"m_Name\": \"ThreadMap\",\n    \"m_GeneratePropertyBlock\": true,\n    \"m_Guid\": {\n        \"m_GuidSerialized\": \"110f2c7b-3415-4e1f-b153-d0756fef216a\"\n    },\n    \"m_OverrideReferenceName\": \"_ThreadMap\",\n    \"m_Modifiable\": true,\n    \"m_DefaultType\": 2\n}"
        },
        {
            "typeInfo": {
                "fullName": "UnityEditor.ShaderGraph.Vector2ShaderProperty"
            },
-            "JSONnodeData": "{\n    \"m_Value\": {\n        \"x\": 1.0,\n        \"y\": 1.0,\n        \"z\": 0.0,\n        \"w\": 0.0\n    },\n    \"m_Name\": \"UV\",\n    \"m_GeneratePropertyBlock\": true,\n    \"m_Guid\": {\n        \"m_GuidSerialized\": \"0cfe9596-beed-43cb-a7c1-28df7483f9ed\"\n    },\n    \"m_DefaultReferenceName\": \"Vector2_18BA5697\",\n    \"m_OverrideReferenceName\": \"_UV\"\n}"
+            "JSONnodeData": "{\n    \"m_Value\": {\n        \"x\": 1.0,\n        \"y\": 1.0,\n        \"z\": 0.0,\n        \"w\": 0.0\n    },\n    \"m_Name\": \"UV\",\n    \"m_GeneratePropertyBlock\": true,\n    \"m_Guid\": {\n        \"m_GuidSerialized\": \"0cfe9596-beed-43cb-a7c1-28df7483f9ed\"\n    },\n    \"m_OverrideReferenceName\": \"_UV\"\n}"
        },
        {
            "typeInfo": {
                "fullName": "UnityEditor.ShaderGraph.Vector3ShaderProperty"
            },
-            "JSONnodeData": "{\n    \"m_Value\": {\n        \"x\": 0.5,\n        \"y\": 0.5,\n        \"z\": 1.0,\n        \"w\": 0.0\n    },\n    \"m_Name\": \"Normals\",\n    \"m_GeneratePropertyBlock\": true,\n    \"m_Guid\": {\n        \"m_GuidSerialized\": \"fa1b3334-3023-478f-8d87-82bcdec6ab47\"\n    },\n    \"m_DefaultReferenceName\": \"Vector3_AFFB47E5\",\n    \"m_OverrideReferenceName\": \"_Normals\"\n}"
+            "JSONnodeData": "{\n    \"m_Value\": {\n        \"x\": 0.5,\n        \"y\": 0.5,\n        \"z\": 1.0,\n        \"w\": 0.0\n    },\n    \"m_Name\": \"Normals\",\n    \"m_GeneratePropertyBlock\": true,\n    \"m_Guid\": {\n        \"m_GuidSerialized\": \"fa1b3334-3023-478f-8d87-82bcdec6ab47\"\n    },\n    \"m_OverrideReferenceName\": \"_Normals\"\n}"
        },
        {
            "typeInfo": {
                "fullName": "UnityEditor.ShaderGraph.Vector1ShaderProperty"
            },
-            "JSONnodeData": "{\n    \"m_Value\": 0.5,\n    \"m_Name\": \"Smoothness\",\n    \"m_GeneratePropertyBlock\": true,\n    \"m_Guid\": {\n        \"m_GuidSerialized\": \"f4d01d77-ecd0-43d5-9ed6-16cf78e4612a\"\n    },\n    \"m_DefaultReferenceName\": \"Vector1_34701477\",\n    \"m_OverrideReferenceName\": \"_Smoothness\",\n    \"m_FloatType\": 0,\n    \"m_RangeValues\": {\n        \"x\": 0.0,\n        \"y\": 1.0\n    }\n}"
+            "JSONnodeData": "{\n    \"m_Value\": 0.5,\n    \"m_Name\": \"Smoothness\",\n    \"m_GeneratePropertyBlock\": true,\n    \"m_Guid\": {\n        \"m_GuidSerialized\": \"f4d01d77-ecd0-43d5-9ed6-16cf78e4612a\"\n    },\n    \"m_OverrideReferenceName\": \"_Smoothness\",\n    \"m_FloatType\": 0,\n    \"m_RangeValues\": {\n        \"x\": 0.0,\n        \"y\": 1.0\n    }\n}"
        },
        {
            "typeInfo": {
                "fullName": "UnityEditor.ShaderGraph.Vector1ShaderProperty"
            },
-            "JSONnodeData": "{\n    \"m_Value\": 1.0,\n    \"m_Name\": \"Alpha\",\n    \"m_GeneratePropertyBlock\": true,\n    \"m_Guid\": {\n        \"m_GuidSerialized\": \"fc9b7ab9-d83b-4887-a555-28692897d85b\"\n    },\n    \"m_DefaultReferenceName\": \"Vector1_61CD5374\",\n    \"m_OverrideReferenceName\": \"_Alpha\",\n    \"m_FloatType\": 0,\n    \"m_RangeValues\": {\n        \"x\": 0.0,\n        \"y\": 1.0\n    }\n}"
+            "JSONnodeData": "{\n    \"m_Value\": 1.0,\n    \"m_Name\": \"Alpha\",\n    \"m_GeneratePropertyBlock\": true,\n    \"m_Guid\": {\n        \"m_GuidSerialized\": \"fc9b7ab9-d83b-4887-a555-28692897d85b\"\n    },\n    \"m_OverrideReferenceName\": \"_Alpha\",\n    \"m_FloatType\": 0,\n    \"m_RangeValues\": {\n        \"x\": 0.0,\n        \"y\": 1.0\n    }\n}"
        },
        {
            "typeInfo": {
                "fullName": "UnityEditor.ShaderGraph.Vector1ShaderProperty"
            },
-            "JSONnodeData": "{\n    \"m_Value\": 1.0,\n    \"m_Name\": \"AmbientOcclusion\",\n    \"m_GeneratePropertyBlock\": true,\n    \"m_Guid\": {\n        \"m_GuidSerialized\": \"d2df6573-0f7e-4c62-b020-b8e4bbdae1f1\"\n    },\n    \"m_DefaultReferenceName\": \"Vector1_BF2B2008\",\n    \"m_OverrideReferenceName\": \"_AmbientOcclusion\",\n    \"m_FloatType\": 0,\n    \"m_RangeValues\": {\n        \"x\": 0.0,\n        \"y\": 1.0\n    }\n}"
+            "JSONnodeData": "{\n    \"m_Value\": 1.0,\n    \"m_Name\": \"AmbientOcclusion\",\n    \"m_GeneratePropertyBlock\": true,\n    \"m_Guid\": {\n        \"m_GuidSerialized\": \"d2df6573-0f7e-4c62-b020-b8e4bbdae1f1\"\n    },\n    \"m_OverrideReferenceName\": \"_AmbientOcclusion\",\n    \"m_FloatType\": 0,\n    \"m_RangeValues\": {\n        \"x\": 0.0,\n        \"y\": 1.0\n    }\n}"
        },
        {
            "typeInfo": {
                "fullName": "UnityEditor.ShaderGraph.Vector1ShaderProperty"
            },
-            "JSONnodeData": "{\n    \"m_Value\": 0.5,\n    \"m_Name\": \"Thread AO Strength\",\n    \"m_GeneratePropertyBlock\": true,\n    \"m_Guid\": {\n        \"m_GuidSerialized\": \"d935cf22-0a1b-43f1-b1fa-be9764d04755\"\n    },\n    \"m_DefaultReferenceName\": \"Vector1_2870F26B\",\n    \"m_OverrideReferenceName\": \"_ThreadAOStrength\",\n    \"m_FloatType\": 1,\n    \"m_RangeValues\": {\n        \"x\": 0.0,\n        \"y\": 1.0\n    }\n}"
+            "JSONnodeData": "{\n    \"m_Value\": 0.5,\n    \"m_Name\": \"Thread AO Strength\",\n    \"m_GeneratePropertyBlock\": true,\n    \"m_Guid\": {\n        \"m_GuidSerialized\": \"d935cf22-0a1b-43f1-b1fa-be9764d04755\"\n    },\n    \"m_OverrideReferenceName\": \"_ThreadAOStrength\",\n    \"m_FloatType\": 1,\n    \"m_RangeValues\": {\n        \"x\": 0.0,\n        \"y\": 1.0\n    }\n}"
        },
        {
            "typeInfo": {
                "fullName": "UnityEditor.ShaderGraph.Vector1ShaderProperty"
            },
-            "JSONnodeData": "{\n    \"m_Value\": 0.5,\n    \"m_Name\": \"Thread Normal Strength\",\n    \"m_GeneratePropertyBlock\": true,\n    \"m_Guid\": {\n        \"m_GuidSerialized\": \"e96918ee-3bfd-4c51-b6d2-54b34d9ad706\"\n    },\n    \"m_DefaultReferenceName\": \"Vector1_3DE8C8A3\",\n    \"m_OverrideReferenceName\": \"_ThreadNormalStrength\",\n    \"m_FloatType\": 1,\n    \"m_RangeValues\": {\n        \"x\": 0.0,\n        \"y\": 2.0\n    }\n}"
+            "JSONnodeData": "{\n    \"m_Value\": 0.5,\n    \"m_Name\": \"Thread Normal Strength\",\n    \"m_GeneratePropertyBlock\": true,\n    \"m_Guid\": {\n        \"m_GuidSerialized\": \"e96918ee-3bfd-4c51-b6d2-54b34d9ad706\"\n    },\n    \"m_OverrideReferenceName\": \"_ThreadNormalStrength\",\n    \"m_FloatType\": 1,\n    \"m_RangeValues\": {\n        \"x\": 0.0,\n        \"y\": 2.0\n    }\n}"
        },
        {
            "typeInfo": {
                "fullName": "UnityEditor.ShaderGraph.Vector1ShaderProperty"
            },
-            "JSONnodeData": "{\n    \"m_Value\": 0.5,\n    \"m_Name\": \"Thread Smoothness Strength\",\n    \"m_GeneratePropertyBlock\": true,\n    \"m_Guid\": {\n        \"m_GuidSerialized\": \"24ff54bf-3f70-4881-aded-191bd20052f7\"\n    },\n    \"m_DefaultReferenceName\": \"Vector1_D5B952A7\",\n    \"m_OverrideReferenceName\": \"_ThreadSmoothnessStrength\",\n    \"m_FloatType\": 1,\n    \"m_RangeValues\": {\n        \"x\": 0.0,\n        \"y\": 1.0\n    }\n}"
+            "JSONnodeData": "{\n    \"m_Value\": 0.5,\n    \"m_Name\": \"Thread Smoothness Strength\",\n    \"m_GeneratePropertyBlock\": true,\n    \"m_Guid\": {\n        \"m_GuidSerialized\": \"24ff54bf-3f70-4881-aded-191bd20052f7\"\n    },\n    \"m_OverrideReferenceName\": \"_ThreadSmoothnessStrength\",\n    \"m_FloatType\": 1,\n    \"m_RangeValues\": {\n        \"x\": 0.0,\n        \"y\": 1.0\n    }\n}"
        }
    ],
    "m_GUID": {
--- a/Assets/Graph/ThirdPersonCharacter/Challenger/Materials/SGR_uvCombine.shadersubgraph
+++ b/Assets/Graph/ThirdPersonCharacter/Challenger/Materials/SGR_uvCombine.shadersubgraph
@ -428,5 +428,5 @@
            "m_Guid": ""
        }
    },
-    "m_Path": ""
+    "m_Path": "Sub Graphs"
 }
--- a/Assets/Graph/ThirdPersonCharacter/Challenger/Materials/SG_CottonWool_SSSTransmission.ShaderGraph
+++ b/Assets/Graph/ThirdPersonCharacter/Challenger/Materials/SG_CottonWool_SSSTransmission.ShaderGraph
--- a/Packages/manifest.json
+++ b/Packages/manifest.json
@ -1,12 +1,12 @@
 {
  "dependencies": {
-    "com.unity.ads": "2.0.8",
+    "com.unity.ads": "2.3.1",
    "com.unity.analytics": "3.2.2",
    "com.unity.cinemachine": "2.2.7",
-    "com.unity.collab-proxy": "1.2.11",
+    "com.unity.collab-proxy": "1.2.15",
    "com.unity.package-manager-ui": "2.0.3",
-    "com.unity.purchasing": "2.0.1",
-    "com.unity.render-pipelines.high-definition": "4.6.0-preview",
+    "com.unity.purchasing": "2.0.3",
+    "com.unity.render-pipelines.high-definition": "4.7.0-preview",
    "com.unity.textmeshpro": "1.3.0",
    "com.unity.visualeffectgraph": "4.6.0-preview",
    "net.peeweek.gameplay-ingredients": "file:../LocalPackages/net.peeweek.gameplay-ingredients",
@ -40,5 +40,6 @@
    "com.unity.modules.vr": "1.0.0",
    "com.unity.modules.wind": "1.0.0",
    "com.unity.modules.xr": "1.0.0"
-  }
+  },
+  "registry": "https://staging-packages.unity.com"
 }
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:83c1f4f55e482a4802bb156c296ec646bbc2ae7a750cc3e21023071a22f2f3ec
-size 19727
+oid sha256:b929e7be1dbbbdc439c601e60d3be2191c23d865183bad8e64fbc5af176a22e9
+size 19751
--- a/ProjectSettings/QualitySettings.asset
+++ b/ProjectSettings/QualitySettings.asset
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5a36ed1c6b46fb60352909074e89abff1072c26c84638b524c49449105baee27
-size 3299
+oid sha256:08e5bb39c704e2e698ddfbbe0979ebe4b46ba90d01c604565a21a381db2e1415
+size 3300