浏览代码

[Shader Graph] Fix some assets.

/main
Tim Cooper 12 年前
当前提交
6b771e90
共有 18 个文件被更改,包括 1531 次插入22 次删除
  1. 8
      UnityProject/MaterialEditor.csproj
  2. 13
      UnityProject/ProjectSettings/AudioManager.asset
  3. 18
      UnityProject/ProjectSettings/DynamicsManager.asset
  4. 9
      UnityProject/ProjectSettings/EditorBuildSettings.asset
  5. 250
      UnityProject/ProjectSettings/InputManager.asset
  6. 135
      UnityProject/ProjectSettings/NavMeshLayers.asset
  7. 10
      UnityProject/ProjectSettings/NetworkManager.asset
  8. 40
      UnityProject/ProjectSettings/TagManager.asset
  9. 10
      UnityProject/ProjectSettings/TimeManager.asset
  10. 5
      UnityProject/Assets/Editor.meta
  11. 5
      UnityProject/Assets/Graphs.meta
  12. 5
      UnityProject/Assets/MaterialGraph.meta
  13. 5
      UnityProject/Assets/TestData.meta
  14. 31
      UnityProject/Assets/TestData/TestMat1.mat
  15. 4
      UnityProject/Assets/TestData/TestMat1.mat.meta
  16. 1001
      UnityProject/Assets/Graphs/Frenel.ShaderGraph
  17. 4
      UnityProject/Assets/Graphs/Frenel.ShaderGraph.meta

8
UnityProject/MaterialEditor.csproj


<None Include="Assets\FirstShader.shader" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\unity\Editor\Graphs\UnityEditor.Graphs\UnityEditor.Graphs.csproj">
<ProjectReference Include="..\..\unity\Editor\Graphs\UnityEditor.Graphs\UnityEditor.Graphs.csproj">
<ProjectReference Include="..\unity\Projects\CSharp\UnityEditor.csproj">
<ProjectReference Include="..\..\unity\Projects\CSharp\UnityEditor.csproj">
<ProjectReference Include="..\unity\Projects\CSharp\UnityEngine.csproj">
<ProjectReference Include="..\..\unity\Projects\CSharp\UnityEngine.csproj">
<ProjectReference Include="..\unity\Runtime\Graphs\UnityEngine.Graphs\UnityEngine.Graphs.csproj">
<ProjectReference Include="..\..\unity\Runtime\Graphs\UnityEngine.Graphs\UnityEngine.Graphs.csproj">
<Project>{10E97B21-AEA1-4E95-BC6B-717815F18EBE}</Project>
<Name>UnityEngine.Graphs</Name>
</ProjectReference>

13
UnityProject/ProjectSettings/AudioManager.asset


� 4.0.0b12���� AudioManagerBaseUInt32m_ObjectHideFlagsfloatm_VolumefloatRolloff Scalefloatm_SpeedOfSoundfloatDoppler FactorSInt32Default Speaker Modeintm_DSPBufferSize �?�?��C�?
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!11 &1
AudioManager:
m_ObjectHideFlags: 0
m_Volume: 1
Rolloff Scale: 1
m_SpeedOfSound: 347
Doppler Factor: 1
Default Speaker Mode: 2
m_DSPBufferSize: 0
m_DisableAudio: 0

18
UnityProject/ProjectSettings/DynamicsManager.asset


�� 4.0.0b12����7PhysicsManagerBase����� UInt32m_ObjectHideFlagsVector3fm_Gravity  floatx floaty floatz PPtr<PhysicMaterial>m_DefaultMaterialSInt32m_FileIDSInt32m_PathIDfloatm_BounceThreshold floatm_SleepVelocity
floatm_SleepAngularVelocity floatm_MaxAngularVelocity floatm_MinPenetrationForPenalty intm_SolverIterationCountboolm_RaycastsHitTriggers@vectorm_LayerCollisionMatrix����ArrayArray����SInt32sizeUInt32data�77���@��>)\>�@
�#< ��������������������������������������������������������������������������������������������������������������������������������
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!55 &1
PhysicsManager:
m_ObjectHideFlags: 0
m_Gravity: {x: 0, y: -9.81000042, z: 0}
m_DefaultMaterial: {fileID: 0}
m_BounceThreshold: 2
m_SleepVelocity: .150000006
m_SleepAngularVelocity: .140000001
m_MaxAngularVelocity: 7
m_MinPenetrationForPenalty: .00999999978
m_SolverIterationCount: 6
m_RaycastsHitTriggers: 1
m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

9
UnityProject/ProjectSettings/EditorBuildSettings.asset


� 4.0.0b12����EditorBuildSettingsBase�����UInt32m_ObjectHideFlagsvectorm_Scenes�����ArrayArray�����SInt32sizeScenedata�����boolenabled@stringpath�����ArrayArray����@SInt32size chardata

%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1045 &1
EditorBuildSettings:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Scenes: []

250
UnityProject/ProjectSettings/InputManager.asset


t� 4.0.0b12���� InputManagerBase�����UInt32m_ObjectHideFlagsvectorm_Axes�����ArrayArray�����SInt32sizeInputAxisdata�����stringm_Name�����ArrayArray����HSInt32sizechardata stringdescriptiveName����
�ArrayArray���� HSInt32size chardata stringdescriptiveNegativeName�����ArrayArray����HSInt32sizechardatastringnegativeButton�����ArrayArray����HSInt32sizechardatastringpositiveButton�����ArrayArray����HSInt32sizechardatastringaltNegativeButton�����ArrayArray����HSInt32sizechardatastringaltPositiveButton�����ArrayArray����HSInt32size chardata!floatgravity"floatdead#floatsensitivity$boolsnap%boolinvert&Hinttype'intaxis(intjoyNum)� 
Horizontalleftrightad@@o�:@@Verticaldownupsw@@o�:@@Fire1 left ctrlmouse 0zDo�:zDFire2left altmouse 1zDo�:zDFire3left cmdmouse 2zDo�:zDJumpspacezDo�:zDMouse X���=Mouse Y���=Mouse ScrollWheel���=
Horizontal\�B>�?Vertical\�B>�?Fire1joystick button 0zDo�:zDFire2joystick button 1zDo�:zDFire3joystick button 2zDo�:zDJumpjoystick button 3zDo�:zD
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!13 &1
InputManager:
m_ObjectHideFlags: 0
m_Axes:
- serializedVersion: 3
m_Name: Horizontal
descriptiveName:
descriptiveNegativeName:
negativeButton: left
positiveButton: right
altNegativeButton: a
altPositiveButton: d
gravity: 3
dead: .00100000005
sensitivity: 3
snap: 1
invert: 0
type: 0
axis: 0
joyNum: 0
- serializedVersion: 3
m_Name: Vertical
descriptiveName:
descriptiveNegativeName:
negativeButton: down
positiveButton: up
altNegativeButton: s
altPositiveButton: w
gravity: 3
dead: .00100000005
sensitivity: 3
snap: 1
invert: 0
type: 0
axis: 0
joyNum: 0
- serializedVersion: 3
m_Name: Fire1
descriptiveName:
descriptiveNegativeName:
negativeButton:
positiveButton: left ctrl
altNegativeButton:
altPositiveButton: mouse 0
gravity: 1000
dead: .00100000005
sensitivity: 1000
snap: 0
invert: 0
type: 0
axis: 0
joyNum: 0
- serializedVersion: 3
m_Name: Fire2
descriptiveName:
descriptiveNegativeName:
negativeButton:
positiveButton: left alt
altNegativeButton:
altPositiveButton: mouse 1
gravity: 1000
dead: .00100000005
sensitivity: 1000
snap: 0
invert: 0
type: 0
axis: 0
joyNum: 0
- serializedVersion: 3
m_Name: Fire3
descriptiveName:
descriptiveNegativeName:
negativeButton:
positiveButton: left cmd
altNegativeButton:
altPositiveButton: mouse 2
gravity: 1000
dead: .00100000005
sensitivity: 1000
snap: 0
invert: 0
type: 0
axis: 0
joyNum: 0
- serializedVersion: 3
m_Name: Jump
descriptiveName:
descriptiveNegativeName:
negativeButton:
positiveButton: space
altNegativeButton:
altPositiveButton:
gravity: 1000
dead: .00100000005
sensitivity: 1000
snap: 0
invert: 0
type: 0
axis: 0
joyNum: 0
- serializedVersion: 3
m_Name: Mouse X
descriptiveName:
descriptiveNegativeName:
negativeButton:
positiveButton:
altNegativeButton:
altPositiveButton:
gravity: 0
dead: 0
sensitivity: .100000001
snap: 0
invert: 0
type: 1
axis: 0
joyNum: 0
- serializedVersion: 3
m_Name: Mouse Y
descriptiveName:
descriptiveNegativeName:
negativeButton:
positiveButton:
altNegativeButton:
altPositiveButton:
gravity: 0
dead: 0
sensitivity: .100000001
snap: 0
invert: 0
type: 1
axis: 1
joyNum: 0
- serializedVersion: 3
m_Name: Mouse ScrollWheel
descriptiveName:
descriptiveNegativeName:
negativeButton:
positiveButton:
altNegativeButton:
altPositiveButton:
gravity: 0
dead: 0
sensitivity: .100000001
snap: 0
invert: 0
type: 1
axis: 2
joyNum: 0
- serializedVersion: 3
m_Name: Horizontal
descriptiveName:
descriptiveNegativeName:
negativeButton:
positiveButton:
altNegativeButton:
altPositiveButton:
gravity: 0
dead: .189999998
sensitivity: 1
snap: 0
invert: 0
type: 2
axis: 0
joyNum: 0
- serializedVersion: 3
m_Name: Vertical
descriptiveName:
descriptiveNegativeName:
negativeButton:
positiveButton:
altNegativeButton:
altPositiveButton:
gravity: 0
dead: .189999998
sensitivity: 1
snap: 0
invert: 1
type: 2
axis: 1
joyNum: 0
- serializedVersion: 3
m_Name: Fire1
descriptiveName:
descriptiveNegativeName:
negativeButton:
positiveButton: joystick button 0
altNegativeButton:
altPositiveButton:
gravity: 1000
dead: .00100000005
sensitivity: 1000
snap: 0
invert: 0
type: 0
axis: 0
joyNum: 0
- serializedVersion: 3
m_Name: Fire2
descriptiveName:
descriptiveNegativeName:
negativeButton:
positiveButton: joystick button 1
altNegativeButton:
altPositiveButton:
gravity: 1000
dead: .00100000005
sensitivity: 1000
snap: 0
invert: 0
type: 0
axis: 0
joyNum: 0
- serializedVersion: 3
m_Name: Fire3
descriptiveName:
descriptiveNegativeName:
negativeButton:
positiveButton: joystick button 2
altNegativeButton:
altPositiveButton:
gravity: 1000
dead: .00100000005
sensitivity: 1000
snap: 0
invert: 0
type: 0
axis: 0
joyNum: 0
- serializedVersion: 3
m_Name: Jump
descriptiveName:
descriptiveNegativeName:
negativeButton:
positiveButton: joystick button 3
altNegativeButton:
altPositiveButton:
gravity: 1000
dead: .00100000005
sensitivity: 1000
snap: 0
invert: 0
type: 0
axis: 0
joyNum: 0

135
UnityProject/ProjectSettings/NavMeshLayers.asset
文件差异内容过多而无法显示
查看文件

10
UnityProject/ProjectSettings/NetworkManager.asset


� 4.0.0b12�����NetworkManagerBase����UInt32m_ObjectHideFlagsintm_DebugLevelfloatm_Sendratemapm_AssetToPrefab����ArrayArray����SInt32sizepairdataGUIDfirstUInt32data[0] UInt32data[1]
UInt32data[2] UInt32data[3] PPtr<GameObject>second SInt32m_FileIDSInt32m_PathID��pA
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!149 &1
NetworkManager:
m_ObjectHideFlags: 0
m_DebugLevel: 0
m_Sendrate: 15
m_AssetToPrefab: {}

40
UnityProject/ProjectSettings/TagManager.asset


F `4.0.0b12����NTagManagerBase�����!vectortags�����ArrayArray�����SInt32sizestringdata�����ArrayArray����HSInt32sizechardatastringBuiltin Layer 0�����ArrayArray���� @SInt32size
chardata stringBuiltin Layer 1���� �ArrayArray���� @SInt32sizechardatastringBuiltin Layer 2�����ArrayArray����@SInt32sizechardatastringBuiltin Layer 3�����ArrayArray����@SInt32sizechardatastringBuiltin Layer 4�����ArrayArray����@SInt32sizechardatastringBuiltin Layer 5�����ArrayArray����@SInt32sizechardatastringBuiltin Layer 6���� �ArrayArray����!@SInt32size"chardata#stringBuiltin Layer 7����$�ArrayArray����%@SInt32size&chardata'stringUser Layer 8����(�ArrayArray����)@SInt32size*chardata+stringUser Layer 9����,�ArrayArray����-@SInt32size.chardata/stringUser Layer 10����0�ArrayArray����1@SInt32size2chardata3stringUser Layer 11����4�ArrayArray����5@SInt32size6chardata7stringUser Layer 12����8�ArrayArray����9@SInt32size:chardata;stringUser Layer 13����<�ArrayArray����=@SInt32size>chardata?stringUser Layer 14����@�ArrayArray����A@SInt32sizeBchardataCstringUser Layer 15����D�ArrayArray����E@SInt32sizeFchardataGstringUser Layer 16����H�ArrayArray����I@SInt32sizeJchardataKstringUser Layer 17����L�ArrayArray����M@SInt32sizeNchardataOstringUser Layer 18����P�ArrayArray����Q@SInt32sizeRchardataSstringUser Layer 19����T�ArrayArray����U@SInt32sizeVchardataWstringUser Layer 20����X�ArrayArray����Y@SInt32sizeZchardata[stringUser Layer 21����\�ArrayArray����]@SInt32size^chardata_stringUser Layer 22����`�ArrayArray����a@SInt32sizebchardatacstringUser Layer 23����d�ArrayArray����e@SInt32sizefchardatagstringUser Layer 24����h�ArrayArray����i@SInt32sizejchardatakstringUser Layer 25����l�ArrayArray����m@SInt32sizenchardataostringUser Layer 26����p�ArrayArray����q@SInt32sizerchardatasstringUser Layer 27����t�ArrayArray����u@SInt32sizevchardatawstringUser Layer 28����x�ArrayArray����y@SInt32sizezchardata{stringUser Layer 29����|�ArrayArray����}@SInt32size~chardatastringUser Layer 30������ArrayArray�����@SInt32size�chardata�stringUser Layer 31������ArrayArray�����@SInt32size�chardata��NNDefault TransparentFXIgnore RaycastWater
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!78 &1
TagManager:
tags:
-
Builtin Layer 0: Default
Builtin Layer 1: TransparentFX
Builtin Layer 2: Ignore Raycast
Builtin Layer 3:
Builtin Layer 4: Water
Builtin Layer 5:
Builtin Layer 6:
Builtin Layer 7:
User Layer 8:
User Layer 9:
User Layer 10:
User Layer 11:
User Layer 12:
User Layer 13:
User Layer 14:
User Layer 15:
User Layer 16:
User Layer 17:
User Layer 18:
User Layer 19:
User Layer 20:
User Layer 21:
User Layer 22:
User Layer 23:
User Layer 24:
User Layer 25:
User Layer 26:
User Layer 27:
User Layer 28:
User Layer 29:
User Layer 30:
User Layer 31:

10
UnityProject/ProjectSettings/TimeManager.asset


 4.0.0b12����TimeManagerBaseUInt32m_ObjectHideFlagsfloatFixed TimestepfloatMaximum Allowed Timestepfloatm_TimeScale
ף<���>�?
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!5 &1
TimeManager:
m_ObjectHideFlags: 0
Fixed Timestep: .0199999996
Maximum Allowed Timestep: .333333343
m_TimeScale: 1

5
UnityProject/Assets/Editor.meta


fileFormatVersion: 2
guid: af35822cb60c9a44cba3e3f0317ac0ac
folderAsset: yes
DefaultImporter:
userData:

5
UnityProject/Assets/Graphs.meta


fileFormatVersion: 2
guid: 8f82c34c146b71b4bb05d6936b5d6dc3
folderAsset: yes
DefaultImporter:
userData:

5
UnityProject/Assets/MaterialGraph.meta


fileFormatVersion: 2
guid: b3a6e625f54bd884a818ed4c3a17f60d
folderAsset: yes
DefaultImporter:
userData:

5
UnityProject/Assets/TestData.meta


fileFormatVersion: 2
guid: 6af88f25a63b90d42893deacda6aa03e
folderAsset: yes
DefaultImporter:
userData:

31
UnityProject/Assets/TestData/TestMat1.mat


%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 3
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: TestMat1
m_Shader: {fileID: 4800000, guid: 50986b93405b085409d7082137ae7752, type: 2}
m_ShaderKeywords: []
m_SavedProperties:
serializedVersion: 2
m_TexEnvs:
data:
first:
name: _MainTex
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats: {}
m_Colors:
data:
first:
name: _Color
second: {r: 1, g: 1, b: 1, a: 1}
data:
first:
name: MyProp
second: {r: 2.08999991, g: 0, b: 0, a: 0}

4
UnityProject/Assets/TestData/TestMat1.mat.meta


fileFormatVersion: 2
guid: 84169261e50a2ce4fbbe8756bffa498f
NativeFormatImporter:
userData:

1001
UnityProject/Assets/Graphs/Frenel.ShaderGraph
文件差异内容过多而无法显示
查看文件

4
UnityProject/Assets/Graphs/Frenel.ShaderGraph.meta


fileFormatVersion: 2
guid: 50986b93405b085409d7082137ae7752
NativeFormatImporter:
userData:
正在加载...
取消
保存