浏览代码

update various files for 2020.1b

/main
sebastienlagarde 4 年前
当前提交
3acb161e
共有 8 个文件被更改,包括 158 次插入21 次删除
  1. 2
      Assets/HDRPDefaultResources/DefaultSceneRoot.prefab.meta
  2. 2
      Assets/HDRPDefaultResources/Sky and Fog Settings Profile.asset.meta
  3. 6
      Packages/manifest.json
  4. 34
      ProjectSettings/HDRPProjectSettings.asset
  5. 4
      ProjectSettings/ProjectVersion.txt
  6. 12
      ProjectSettings/VFXManager.asset
  7. 111
      Assets/VFXDefaultResources.asset
  8. 8
      Assets/VFXDefaultResources.asset.meta

2
Assets/HDRPDefaultResources/DefaultSceneRoot.prefab.meta


fileFormatVersion: 2
guid: ec7d38f95b2996044a594538f1e16917
guid: f697286736872f445ade9fd407d5c805
PrefabImporter:
externalObjects: {}
userData:

2
Assets/HDRPDefaultResources/Sky and Fog Settings Profile.asset.meta


fileFormatVersion: 2
guid: 4b689dc4d56e8d548bdaaa016f261b26
guid: 58b63df2a7d431e4d9d78c7f41bd31fe
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0

6
Packages/manifest.json


"dependencies": {
"com.unity.2d.sprite": "1.0.0",
"com.unity.2d.tilemap": "1.0.0",
"com.unity.ads": "3.3.1",
"com.unity.ads": "3.4.4",
"com.unity.collab-proxy": "1.3.6",
"com.unity.collab-proxy": "1.3.7",
"com.unity.ext.nunit": "1.0.0",
"com.unity.ide.rider": "1.2.1",
"com.unity.ide.visualstudio": "2.0.0",

"com.unity.purchasing": "2.0.6",
"com.unity.render-pipelines.high-definition": "7.3.1",
"com.unity.render-pipelines.high-definition": "8.0.1",
"com.unity.render-pipelines.high-definition-config": "file:../LocalPackages/com.unity.render-pipelines.high-definition-config",
"com.unity.test-framework": "1.1.11",
"com.unity.timeline": "1.2.6",

34
ProjectSettings/HDRPProjectSettings.asset


version https://git-lfs.github.com/spec/v1
<<<<<<< HEAD
oid sha256:eee4486153fb20c8b32d2410ca112eeee8d7e849112fa859dc7dff0642178ffd
size 280
=======
oid sha256:6967035b014d297906fb895af7b56e2d0abc0d915c73bf3da9bc1ba48cf57e9d
size 880
>>>>>>> b841e2f... update default scene
%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: 63a2978a97e4fc04cb9d905947216f3d, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 1
m_DefaultScenePrefabSaved: {fileID: 5823510469358171751, guid: f697286736872f445ade9fd407d5c805,
type: 3}
m_DefaultDXRScenePrefabSaved: {fileID: 4798200196228829883, guid: f93c9eb7b4c6c75499f2d7f958dbe8b4,
type: 3}
m_ProjectSettingFolderPath: HDRPDefaultResources
m_WizardPopupAtStart: 1
m_WizardPopupAlreadyShownOnce: 0
m_WizardActiveTab: 0
m_WizardNeedRestartAfterChangingToDX12: 0
m_WizardNeedToRunFixAllAgainAfterDomainReload: 0
m_LastMaterialVersion: 2

4
ProjectSettings/ProjectVersion.txt


m_EditorVersion: 2020.1.0a23
m_EditorVersionWithRevision: 2020.1.0a23 (242010beed50)
m_EditorVersion: 2020.1.0b3
m_EditorVersionWithRevision: 2020.1.0b3 (6955a944264e)

12
ProjectSettings/VFXManager.asset


--- !u!937362698 &1
VFXManager:
m_ObjectHideFlags: 0
m_IndirectShader: {fileID: 7200000, guid: 84a17cfa13e40ae4082ef42714f0a81c, type: 3}
m_CopyBufferShader: {fileID: 7200000, guid: 23c51f21a3503f6428b527b01f8a2f4e, type: 3}
m_SortShader: {fileID: 7200000, guid: ea257ca3cfb12a642a5025e612af6b2a, type: 3}
m_StripUpdateShader: {fileID: 7200000, guid: 8fa6c4009fe2a4d4486c62736fc30ad8, type: 3}
m_IndirectShader: {fileID: 0}
m_CopyBufferShader: {fileID: 0}
m_SortShader: {fileID: 0}
m_StripUpdateShader: {fileID: 0}
m_CompiledVersion: 0
m_RuntimeVersion: 0
m_CompiledVersion: 2
m_RuntimeVersion: 12

111
Assets/VFXDefaultResources.asset


%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: cd0a560c562a33e4b94f515804e2bd27, type: 3}
m_Name: VFXDefaultResources
m_EditorClassIdentifier:
particleTexture: {fileID: 2800000, guid: 276d9e395ae18fe40a9b4988549f2349, type: 3}
noiseTexture: {fileID: 2800000, guid: 1d8481de16af723418a688958c41224b, type: 3}
vectorField: {fileID: 0}
signedDistanceField: {fileID: 0}
mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0}
animationCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.25
value: 0.25
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
gradient:
serializedVersion: 2
key0: {r: 1, g: 1, b: 1, a: 0}
key1: {r: 0.5, g: 0.5, b: 0.5, a: 1}
key2: {r: 0, g: 0, b: 0, a: 0.8}
key3: {r: 0, g: 0, b: 0, a: 0}
key4: {r: 0, g: 0, b: 0, a: 0}
key5: {r: 0, g: 0, b: 0, a: 0}
key6: {r: 0, g: 0, b: 0, a: 0}
key7: {r: 0, g: 0, b: 0, a: 0}
ctime0: 0
ctime1: 65535
ctime2: 0
ctime3: 0
ctime4: 0
ctime5: 0
ctime6: 0
ctime7: 0
atime0: 0
atime1: 6554
atime2: 52428
atime3: 65535
atime4: 0
atime5: 0
atime6: 0
atime7: 0
m_Mode: 0
m_NumColorKeys: 2
m_NumAlphaKeys: 4
gradientMapRamp:
serializedVersion: 2
key0: {r: 0, g: 0, b: 0, a: 0}
key1: {r: 0.75, g: 0.15, b: 0, a: 1}
key2: {r: 1.25, g: 0.56, b: 0.12, a: 0}
key3: {r: 3.5, g: 2, b: 0.5, a: 0}
key4: {r: 4, g: 3.5, b: 1.2, a: 0}
key5: {r: 12, g: 10, b: 2.5, a: 0}
key6: {r: 0, g: 0, b: 0, a: 0}
key7: {r: 0, g: 0, b: 0, a: 0}
ctime0: 0
ctime1: 19661
ctime2: 32768
ctime3: 45875
ctime4: 58982
ctime5: 65535
ctime6: 0
ctime7: 0
atime0: 0
atime1: 65535
atime2: 0
atime3: 0
atime4: 0
atime5: 0
atime6: 0
atime7: 0
m_Mode: 0
m_NumColorKeys: 6
m_NumAlphaKeys: 2
shader: {fileID: 0}

8
Assets/VFXDefaultResources.asset.meta


fileFormatVersion: 2
guid: 9d9c1c205fdd6434ea9b2f23d77591e4
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:
正在加载...
取消
保存