浏览代码

Upgraded Project to Unity 2018.3.0f2

- Upgraded LWRP Package to 4.6.0-preview
- Fixed Colored Rim Graph (Swapped to use Fresnel Node)
/main
Andy Touch 6 年前
当前提交
bc1ce3d3
共有 11 个文件被更改,包括 677 次插入729 次删除
  1. 5
      ShaderGraph_ExampleLibrary_Project/Assets/Characters/AngryBots/Player/Materials-CustomShader/ColorRim/PlayerMat-ColorRim.mat
  2. 10
      ShaderGraph_ExampleLibrary_Project/Assets/Characters/AngryBots/Player/Materials/Player_MAT.mat
  3. 3
      ShaderGraph_ExampleLibrary_Project/Assets/Environment/Rocks/Floating/Floating02/RockFloating02_Mat.mat
  4. 116
      ShaderGraph_ExampleLibrary_Project/Assets/ShaderGraphs/MeshRenderers/MeshRenderer-ColorRim.ShaderGraph
  5. 50
      ShaderGraph_ExampleLibrary_Project/Assets/ShaderGraphs/Scenarios/TriplanarGrassRock-NoiseEdge-Graph.ShaderGraph
  6. 960
      ShaderGraph_ExampleLibrary_Project/Library/ScriptAssemblies/Unity.PackageManagerUI.Editor.dll
  7. 115
      ShaderGraph_ExampleLibrary_Project/Library/ScriptAssemblies/Unity.PackageManagerUI.Editor.dll.mdb
  8. 11
      ShaderGraph_ExampleLibrary_Project/Packages/manifest.json
  9. 123
      ShaderGraph_ExampleLibrary_Project/ProjectSettings/ProjectSettings.asset
  10. 2
      ShaderGraph_ExampleLibrary_Project/ProjectSettings/ProjectVersion.txt
  11. 11
      ShaderGraph_ExampleLibrary_Project/ProjectSettings/VFXManager.asset

5
ShaderGraph_ExampleLibrary_Project/Assets/Characters/AngryBots/Player/Materials-CustomShader/ColorRim/PlayerMat-ColorRim.mat


serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: PlayerMat-ColorRim
m_Shader: {fileID: 4800000, guid: 59cf758fd4d4d419db54f04d01fc1e34, type: 3}
m_ShaderKeywords:

m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- Vector1_D9008F3D: 0.94
- Vector1_D9008F3D: 2.03
m_Colors:
- Color_F0C1164F: {r: 0, g: 1, b: 0.6970329, a: 0.7843137}

10
ShaderGraph_ExampleLibrary_Project/Assets/Characters/AngryBots/Player/Materials/Player_MAT.mat


Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Player_MAT
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
m_ShaderKeywords: _EMISSION _METALLICGLOSSMAP _METALLICSPECGLOSSMAP _NORMALMAP

m_Offset: {x: 0, y: 0}
m_Floats:
- Float_A5A8E873: 0.68
- _AlphaClip: 0
- _Blend: 0
- _Cull: 2
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0

- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _ReceiveShadows: 1
- _Surface: 0
- _UVSec: 0
- _WorkflowMode: 1
- _ZWrite: 1

3
ShaderGraph_ExampleLibrary_Project/Assets/Environment/Rocks/Floating/Floating02/RockFloating02_Mat.mat


serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: RockFloating02_Mat
m_Shader: {fileID: 4800000, guid: 4ef1ae95536706148906d4e78066a53b, type: 3}
m_ShaderKeywords: _METALLICGLOSSMAP _NORMALMAP

116
ShaderGraph_ExampleLibrary_Project/Assets/ShaderGraphs/MeshRenderers/MeshRenderer-ColorRim.ShaderGraph
文件差异内容过多而无法显示
查看文件

50
ShaderGraph_ExampleLibrary_Project/Assets/ShaderGraphs/Scenarios/TriplanarGrassRock-NoiseEdge-Graph.ShaderGraph
文件差异内容过多而无法显示
查看文件

960
ShaderGraph_ExampleLibrary_Project/Library/ScriptAssemblies/Unity.PackageManagerUI.Editor.dll
文件差异内容过多而无法显示
查看文件

115
ShaderGraph_ExampleLibrary_Project/Library/ScriptAssemblies/Unity.PackageManagerUI.Editor.dll.mdb
文件差异内容过多而无法显示
查看文件

11
ShaderGraph_ExampleLibrary_Project/Packages/manifest.json


{
"dependencies": {
"com.unity.ads": "2.0.8",
"com.unity.analytics": "2.0.16",
"com.unity.package-manager-ui": "1.9.11",
"com.unity.ads": "2.3.1",
"com.unity.analytics": "3.2.2",
"com.unity.collab-proxy": "1.2.15",
"com.unity.package-manager-ui": "2.0.3",
"com.unity.render-pipelines.lightweight": "3.0.0-preview",
"com.unity.textmeshpro": "1.2.4",
"com.unity.render-pipelines.lightweight": "4.6.0-preview",
"com.unity.textmeshpro": "1.3.0",
"com.unity.modules.ai": "1.0.0",
"com.unity.modules.animation": "1.0.0",
"com.unity.modules.assetbundle": "1.0.0",

123
ShaderGraph_ExampleLibrary_Project/ProjectSettings/ProjectSettings.asset


m_StackTraceTypes: 010000000100000001000000010000000100000001000000
iosShowActivityIndicatorOnLoading: -1
androidShowActivityIndicatorOnLoading: -1
tizenShowActivityIndicatorOnLoading: -1
iosAppInBackgroundBehavior: 0
displayResolutionDialog: 1
iosAllowHTTPDownload: 1

use32BitDisplayBuffer: 1
preserveFramebufferAlpha: 0
disableDepthAndStencilBuffers: 0
androidStartInFullscreen: 1
androidRenderOutsideSafeArea: 0
androidBlitType: 0
defaultIsNativeResolution: 1
macRetinaSupport: 1

xboxEnableGuest: 0
xboxEnablePIXSampling: 0
metalFramebufferOnly: 0
n3dsDisableStereoscopicView: 0
n3dsEnableSharedListOpt: 1
n3dsEnableVSync: 0
xboxOneResolution: 0
xboxOneSResolution: 0
xboxOneXResolution: 3

xboxOnePresentImmediateThreshold: 0
videoMemoryForVertexBuffers: 0
psp2PowerMode: 0
psp2AcquireBGM: 1
switchQueueCommandMemory: 0
vulkanEnableSetSRGBWrite: 0
m_SupportedAspectRatios:
4:3: 1
5:4: 1

m_HolographicPauseOnTrackingLoss: 1
xboxOneDisableKinectGpuReservation: 0
xboxOneEnable7thCore: 0
isWsaHolographicRemotingEnabled: 0
vrSettings:
cardboard:
depthFormat: 0

hololens:
depthFormat: 1
depthBufferSharingEnabled: 0
enable360StereoCapture: 0
enable360StereoCapture: 0
enableFrameTimingStats: 0
useHDRDisplay: 0
m_ColorGamuts: 00000000
targetPixelDensity: 30

StripUnusedMeshComponents: 0
VertexChannelCompressionMask: 4054
iPhoneSdkVersion: 988
iOSTargetOSVersionString: 8.0
iOSTargetOSVersionString: 9.0
tvOSSdkVersion: 0
tvOSRequireExtendedGameController: 0
tvOSTargetOSVersionString: 9.0

appleDeveloperTeamID:
iOSManualSigningProvisioningProfileID:
tvOSManualSigningProvisioningProfileID:
iOSManualSigningProvisioningProfileType: 0
tvOSManualSigningProvisioningProfileType: 0
appleEnableAutomaticSigning: 0
iOSRequireARKit: 0
appleEnableProMotion: 0

androidSplashScreen: {fileID: 0}
AndroidKeystoreName:
AndroidKeyaliasName:
AndroidBuildApkPerCpuArchitecture: 0
AndroidTVCompatibility: 1
AndroidIsGame: 1
AndroidEnableTango: 0

iPhone: 1
tvOS: 1
m_BuildTargetGroupLightmapEncodingQuality: []
m_BuildTargetGroupLightmapSettings: []
playModeTestRunnerEnabled: 0
runPlayModeTestAsEditModeTest: 0
actionOnDotNetUnhandledException: 1

switchAllowsVideoCapturing: 1
switchAllowsRuntimeAddOnContentInstall: 0
switchDataLossConfirmation: 0
switchUserAccountLockEnabled: 0
switchNativeFsCacheSize: 32
switchIsHoldTypeHorizontal: 0
switchSupportedNpadCount: 8
switchSocketConfigEnabled: 0
switchTcpInitialSendBufferSize: 32
switchTcpInitialReceiveBufferSize: 64

ps4pnGameCustomData: 1
playerPrefsSupport: 0
enableApplicationExit: 0
resetTempFolder: 1
restrictedAudioUsageRights: 0
ps4UseResolutionFallback: 0
ps4ReprojectionSupport: 0

ps4attribEyeToEyeDistanceSettingVR: 0
ps4IncludedModules: []
monoEnv:
psp2Splashimage: {fileID: 0}
psp2NPTrophyPackPath:
psp2NPSupportGBMorGJP: 0
psp2NPAgeRating: 12
psp2NPTitleDatPath:
psp2NPCommsID:
psp2NPCommunicationsID:
psp2NPCommsPassphrase:
psp2NPCommsSig:
psp2ParamSfxPath:
psp2ManualPath:
psp2LiveAreaGatePath:
psp2LiveAreaBackroundPath:
psp2LiveAreaPath:
psp2LiveAreaTrialPath:
psp2PatchChangeInfoPath:
psp2PatchOriginalPackage:
psp2PackagePassword: F69AzBlax3CF3EDNhm3soLBPh71Yexui
psp2KeystoneFile:
psp2MemoryExpansionMode: 0
psp2DRMType: 0
psp2StorageType: 0
psp2MediaCapacity: 0
psp2DLCConfigPath:
psp2ThumbnailPath:
psp2BackgroundPath:
psp2SoundPath:
psp2TrophyCommId:
psp2TrophyPackagePath:
psp2PackagedResourcesPath:
psp2SaveDataQuota: 10240
psp2ParentalLevel: 1
psp2ShortTitle: Not Set
psp2ContentID: IV0000-ABCD12345_00-0123456789ABCDEF
psp2Category: 0
psp2MasterVersion: 01.00
psp2AppVersion: 01.00
psp2TVBootMode: 0
psp2EnterButtonAssignment: 2
psp2TVDisableEmu: 0
psp2AllowTwitterDialog: 1
psp2Upgradable: 0
psp2HealthWarning: 0
psp2UseLibLocation: 0
psp2InfoBarOnStartup: 0
psp2InfoBarColor: 0
psp2ScriptOptimizationLevel: 0
splashScreenBackgroundSourceLandscape: {fileID: 0}
splashScreenBackgroundSourcePortrait: {fileID: 0}
spritePackerPolicy:

webGLUseEmbeddedResources: 0
webGLCompressionFormat: 1
webGLLinkerTarget: 0
webGLThreadsSupport: 0
14: UNITY_POST_PROCESSING_STACK_V2
17: UNITY_POST_PROCESSING_STACK_V2
18: UNITY_POST_PROCESSING_STACK_V2
19: UNITY_POST_PROCESSING_STACK_V2

25: UNITY_POST_PROCESSING_STACK_V2
26: UNITY_POST_PROCESSING_STACK_V2
27: UNITY_POST_PROCESSING_STACK_V2
28: UNITY_POST_PROCESSING_STACK_V2
managedStrippingLevel: {}
allowUnsafeCode: 0
additionalIl2CppArgs:
scriptingRuntimeVersion: 0
apiCompatibilityLevelPerPlatform: {}

metroApplicationDescription: LightweightPipeline
wsaImages: {}
metroTileShortName:
metroCommandLineArgsFile:
metroSupportStreamingInstall: 0
metroLastRequiredScene: 0
metroDefaultTileSize: 1
metroTileForegroundText: 2
metroTileBackgroundColor: {r: 0.13333334, g: 0.17254902, b: 0.21568628, a: 0}

platformCapabilities: {}
metroTargetDeviceFamilies: {}
tizenProductDescription:
tizenProductURL:
tizenSigningProfileName:
tizenGPSPermissions: 0
tizenMicrophonePermissions: 0
tizenDeploymentTarget:
tizenDeploymentTargetType: -1
tizenMinOSVersion: 1
n3dsUseExtSaveData: 0
n3dsCompressStaticMem: 1
n3dsExtSaveDataNumber: 0x12345
n3dsStackSize: 131072
n3dsTargetPlatform: 2
n3dsRegion: 7
n3dsMediaSize: 0
n3dsLogoStyle: 3
n3dsTitle: GameName
n3dsProductCode:
n3dsApplicationId: 0xFF3FF
XboxOneProductId:
XboxOneUpdateKey:
XboxOneSandboxId:

XboxOneGameOsOverridePath:
XboxOnePackagingOverridePath:
XboxOneAppManifestOverridePath:
XboxOneVersion: 1.0.0.0
XboxOnePackageEncryption: 0
XboxOnePackageUpdateGranularity: 2
XboxOneDescription:

XboxOneSplashScreen: {fileID: 0}
XboxOneAllowedProductIds: []
XboxOnePersistentLocalStorageSize: 0
XboxOneXTitleMemory: 8
XboxOneOverrideIdentityName:
luminIcon:
m_Name:
m_ModelFolderPath:
m_PortalFolderPath:
luminCert:
m_CertPath:
m_PrivateKeyPath:
luminIsChannelApp: 0
luminVersion:
m_VersionCode: 1
m_VersionName:
facebookAppId:
facebookCookies: 1
facebookLogging: 1
facebookStatus: 1
facebookXfbml: 0
facebookFrictionlessRequests: 1
framebufferDepthMemorylessMode: 0
legacyClampBlendShapeWeights: 1

2
ShaderGraph_ExampleLibrary_Project/ProjectSettings/ProjectVersion.txt


m_EditorVersion: 2018.2.0f2
m_EditorVersion: 2018.3.0f2

11
ShaderGraph_ExampleLibrary_Project/ProjectSettings/VFXManager.asset


%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!937362698 &1
VFXManager:
m_ObjectHideFlags: 0
m_IndirectShader: {fileID: 0}
m_CopyBufferShader: {fileID: 0}
m_SortShader: {fileID: 0}
m_RenderPipeSettingsPath:
m_FixedTimeStep: 0.016666668
m_MaxDeltaTime: 0.05
正在加载...
取消
保存