比较提交
合并到: unity-tech-cn:main
unity-tech-cn:/main
unity-tech-cn:/release-2019.3
unity-tech-cn:/release-2021.1
unity-tech-cn:/release-2021.2
拉取从: unity-tech-cn:release-2019.3
unity-tech-cn:/main
unity-tech-cn:/release-2019.3
unity-tech-cn:/release-2021.1
unity-tech-cn:/release-2021.2
此合并请求有变更与目标分支冲突。
/Packages/manifest.json
/ProjectSettings/EditorSettings.asset
/ProjectSettings/HDRPProjectSettings.asset
/ProjectSettings/ProjectVersion.txt
/README.md
/Assets/HDRPDefaultResources/Foliage Diffusion Profile.asset
/Assets/HDRPDefaultResources/Foliage Diffusion Profile.asset.meta
/Assets/HDRPDefaultResources/Skin Diffusion Profile.asset
/Assets/3D SCENE/HDRenderPipelineAssetRayTracing.asset
/Assets/3D SCENE/Materials/Scene Settings ProfileQuality.asset
/Assets/3D SCENE/Materials/Scene Settings ProfilePerformance.asset
/Assets/3D SCENE/RayTracingPerformance.unity
/Assets/3D SCENE/RayTracingQuality.unity
/Assets/HDRPDefaultResources/DefaultSceneRoot.prefab
/Assets/HDRPDefaultResources/DefaultSceneRoot.prefab.meta
/Assets/HDRPDefaultResources/Sky and Fog Settings Profile.asset.meta
/LocalPackages/com.unity.render-pipelines.high-definition-config/CHANGELOG.md
/LocalPackages/com.unity.render-pipelines.high-definition-config/LICENSE.md
/LocalPackages/com.unity.render-pipelines.high-definition-config/package.json
/Assets/HDRPDefaultResources/Foliage Diffusion Profile.asset
/Assets/HDRPDefaultResources/Foliage Diffusion Profile.asset.meta
/Assets/HDRPDefaultResources/Skin Diffusion Profile.asset
/Assets/HDRPDefaultResources/Skin Diffusion Profile.asset.meta
11 次代码提交
main
...
release-2019.3
| 作者 | SHA1 | 备注 | 提交日期 |
|---|---|---|---|
GitHub
|
584dbcea | Update README.md | 4 年前 |
sebastienlagarde
|
60a6b2f5 | Update README.md | 4 年前 |
|
sebastienlagarde
|
50152daf | Update README.md | 4 年前 |
|
sebastienlagarde
|
8a9ab6f4 | update default scene | 4 年前 |
|
sebastienlagarde
|
6065ffb9 | fix meta and default scene | 4 年前 |
|
sebastienlagarde
|
b197997c | fixs fog | 4 年前 |
|
sebastienlagarde
|
35d0ecc6 | fixes 2 | 4 年前 |
|
sebastienlagarde
|
952c0c9d | fixes | 4 年前 |
|
sebastienlagarde
|
5678d4a3 | update files | 4 年前 |
|
sebastienlagarde
|
9601dd22 | update shader config package for 7.3.1 | 4 年前 |
Anis
|
714c59be | Downgrading the project to 2019.3 | 4 年前 |
共有 22 个文件被更改，包括 776 次插入 和 1124 次删除
-
3Assets/3D SCENE/HDRenderPipelineAssetRayTracing.asset
-
84Assets/3D SCENE/Materials/Scene Settings ProfileQuality.asset
-
149Assets/3D SCENE/Materials/Scene Settings ProfilePerformance.asset
-
331Assets/3D SCENE/RayTracingPerformance.unity
-
532Assets/3D SCENE/RayTracingQuality.unity
-
535Assets/HDRPDefaultResources/DefaultSceneRoot.prefab
-
66Assets/HDRPDefaultResources/Sky and Fog Settings Profile.asset
-
2Assets/HDRPDefaultResources/DefaultSceneRoot.prefab.meta
-
2Assets/HDRPDefaultResources/Sky and Fog Settings Profile.asset.meta
-
5Packages/manifest.json
-
56ProjectSettings/EditorSettings.asset
-
4ProjectSettings/ProjectVersion.txt
-
11ProjectSettings/HDRPProjectSettings.asset
-
7LocalPackages/com.unity.render-pipelines.high-definition-config/CHANGELOG.md
-
2LocalPackages/com.unity.render-pipelines.high-definition-config/LICENSE.md
-
8LocalPackages/com.unity.render-pipelines.high-definition-config/package.json
-
27README.md
-
26Assets/HDRPDefaultResources/Foliage Diffusion Profile.asset
-
8Assets/HDRPDefaultResources/Foliage Diffusion Profile.asset.meta
-
26Assets/HDRPDefaultResources/Skin Diffusion Profile.asset
-
8Assets/HDRPDefaultResources/Skin Diffusion Profile.asset.meta
-
8Assets/3D MATERIAL/Metal_Dark.meta
|
|||
fileFormatVersion: 2 |
|||
guid: 02e0c9b083520174c95423173575ca53 |
|||
guid: ec7d38f95b2996044a594538f1e16917 |
|||
PrefabImporter: |
|||
externalObjects: {} |
|||
userData: |
|||
|
|||
%YAML 1.1 |
|||
%TAG !u! tag:unity3d.com,2011: |
|||
--- !u!159 &1 |
|||
EditorSettings: |
|||
m_ObjectHideFlags: 0 |
|||
serializedVersion: 7 |
|||
m_ExternalVersionControlSupport: Visible Meta Files |
|||
m_SerializationMode: 2 |
|||
m_LineEndingsForNewScripts: 2 |
|||
m_DefaultBehaviorMode: 0 |
|||
m_SpritePackerMode: 0 |
|||
m_SpritePackerPaddingPower: 1 |
|||
m_EtcTextureCompressorBehavior: 1 |
|||
m_EtcTextureFastCompressor: 1 |
|||
m_EtcTextureNormalCompressor: 2 |
|||
m_EtcTextureBestCompressor: 4 |
|||
m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd |
|||
m_ProjectGenerationRootNamespace: |
|||
m_UserGeneratedProjectSuffix: |
|||
m_CollabEditorSettings: |
|||
inProgressEnabled: 1 |
|||
%YAML 1.1 |
|||
%TAG !u! tag:unity3d.com,2011: |
|||
--- !u!159 &1 |
|||
EditorSettings: |
|||
m_ObjectHideFlags: 0 |
|||
serializedVersion: 9 |
|||
m_ExternalVersionControlSupport: Visible Meta Files |
|||
m_SerializationMode: 2 |
|||
m_LineEndingsForNewScripts: 2 |
|||
m_DefaultBehaviorMode: 0 |
|||
m_PrefabRegularEnvironment: {fileID: 0} |
|||
m_PrefabUIEnvironment: {fileID: 0} |
|||
m_SpritePackerMode: 0 |
|||
m_SpritePackerPaddingPower: 1 |
|||
m_EtcTextureCompressorBehavior: 1 |
|||
m_EtcTextureFastCompressor: 1 |
|||
m_EtcTextureNormalCompressor: 2 |
|||
m_EtcTextureBestCompressor: 4 |
|||
m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd;asmref |
|||
m_ProjectGenerationRootNamespace: |
|||
m_CollabEditorSettings: |
|||
inProgressEnabled: 1 |
|||
m_EnableTextureStreamingInEditMode: 1 |
|||
m_EnableTextureStreamingInPlayMode: 1 |
|||
m_AsyncShaderCompilation: 1 |
|||
m_EnterPlayModeOptionsEnabled: 0 |
|||
m_EnterPlayModeOptions: 3 |
|||
m_ShowLightmapResolutionOverlay: 1 |
|||
m_UseLegacyProbeSampleCount: 1 |
|||
m_AssetPipelineMode: 1 |
|||
m_CacheServerMode: 0 |
|||
m_CacheServerEndpoint: |
|||
m_CacheServerNamespacePrefix: default |
|||
m_CacheServerEnableDownload: 1 |
|||
m_CacheServerEnableUpload: 1 |
|||
|
|||
m_EditorVersion: 2020.1.0a23 |
|||
m_EditorVersionWithRevision: 2020.1.0a23 (242010beed50) |
|||
m_EditorVersion: 2019.3.6f1 |
|||
m_EditorVersionWithRevision: 2019.3.6f1 (0ed6ebcf4320) |
|||
|
|||
Render Pipeline Core copyright © 2020 Unity Technologies ApS |
|||
com.unity.render-pipelines.high-definition-config copyright © 2020 Unity Technologies ApS |
|||
|
|||
Licensed under the Unity Companion License for Unity-dependent projects--see [Unity Companion License](http://www.unity3d.com/legal/licenses/Unity_Companion_License). |
|||
|
|||
|
|||
{ |
|||
"name": "com.unity.render-pipelines.high-definition-config", |
|||
"description": "Configuration files for the High Definition Render Pipeline.", |
|||
"version": "8.0.0", |
|||
"unity": "2020.1", |
|||
"unityRelease": "0a15", |
|||
"version": "7.3.1", |
|||
"unity": "2019.3", |
|||
"unityRelease": "2f1", |
|||
"com.unity.render-pipelines.core": "7.2.0" |
|||
"com.unity.render-pipelines.core": "7.3.1" |
|||
} |
|||
} |
|||
|
|||
%YAML 1.1 |
|||
%TAG !u! tag:unity3d.com,2011: |
|||
--- !u!114 &11400000 |
|||
MonoBehaviour: |
|||
m_ObjectHideFlags: 0 |
|||
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: b2686e09ec7aef44bad2843e4416f057, type: 3} |
|||
m_Name: Foliage Diffusion Profile |
|||
m_EditorClassIdentifier: |
|||
profile: |
|||
name: Foliage |
|||
scatteringDistance: {r: 0.7568628, g: 0.7019608, b: 0.24313727, a: 1} |
|||
transmissionTint: {r: 1, g: 1, b: 1, a: 1} |
|||
texturingMode: 0 |
|||
transmissionMode: 1 |
|||
thicknessRemap: {x: 0, y: 0.2873168} |
|||
worldScale: 1 |
|||
ior: 1.4 |
|||
hash: 1081692787 |
|||
m_Version: 1 |
|||
profiles: [] |
|||
|
|||
fileFormatVersion: 2 |
|||
guid: ae36879b80aefa8439df3c16b4e760a7 |
|||
NativeFormatImporter: |
|||
externalObjects: {} |
|||
mainObjectFileID: 11400000 |
|||
userData: |
|||
assetBundleName: |
|||
assetBundleVariant: |
|||
|
|||
%YAML 1.1 |
|||
%TAG !u! tag:unity3d.com,2011: |
|||
--- !u!114 &11400000 |
|||
MonoBehaviour: |
|||
m_ObjectHideFlags: 0 |
|||
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: b2686e09ec7aef44bad2843e4416f057, type: 3} |
|||
m_Name: Skin Diffusion Profile |
|||
m_EditorClassIdentifier: |
|||
profile: |
|||
name: Skin |
|||
scatteringDistance: {r: 0.7568628, g: 0.32156864, b: 0.20000002, a: 1} |
|||
transmissionTint: {r: 0.7568628, g: 0.32156864, b: 0.20000002, a: 1} |
|||
texturingMode: 0 |
|||
transmissionMode: 0 |
|||
thicknessRemap: {x: 0, y: 8.152544} |
|||
worldScale: 1 |
|||
ior: 1.4 |
|||
hash: 1075477546 |
|||
m_Version: 1 |
|||
profiles: [] |
|||
|
|||
fileFormatVersion: 2 |
|||
guid: 448ddb14ddbd6c04f9c1611f4a9ff1f3 |
|||
NativeFormatImporter: |
|||
externalObjects: {} |
|||
mainObjectFileID: 0 |
|||
userData: |
|||
assetBundleName: |
|||
assetBundleVariant: |
|||
|
|||
fileFormatVersion: 2 |
|||
guid: e97be146bb2f3ee46b0791bce088b194 |
|||
folderAsset: yes |
|||
DefaultImporter: |
|||
externalObjects: {} |
|||
userData: |
|||
assetBundleName: |
|||
assetBundleVariant: |
|||
撰写
预览
正在加载...
取消
保存
Reference in new issue