Skip to content

Commit 3e8d584

Browse files
author
Andy Touch
committed
Upgraded Project to Unity 2018.3.0f2
- Upgraded LWRP Package to 4.6.0-preview - Fixed Colored Rim Graph (Swapped to use Fresnel Node)
1 parent 8252218 commit 3e8d584

File tree

11 files changed

+129
-198
lines changed

11 files changed

+129
-198
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ Material:
55
serializedVersion: 6
66
m_ObjectHideFlags: 0
77
m_CorrespondingSourceObject: {fileID: 0}
8-
m_PrefabInternal: {fileID: 0}
8+
m_PrefabInstance: {fileID: 0}
9+
m_PrefabAsset: {fileID: 0}
910
m_Name: PlayerMat-ColorRim
1011
m_Shader: {fileID: 4800000, guid: 59cf758fd4d4d419db54f04d01fc1e34, type: 3}
1112
m_ShaderKeywords:
@@ -35,6 +36,6 @@ Material:
3536
m_Scale: {x: 1, y: 1}
3637
m_Offset: {x: 0, y: 0}
3738
m_Floats:
38-
- Vector1_D9008F3D: 0.94
39+
- Vector1_D9008F3D: 2.03
3940
m_Colors:
4041
- Color_F0C1164F: {r: 0, g: 1, b: 0.6970329, a: 0.7843137}

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44
Material:
55
serializedVersion: 6
66
m_ObjectHideFlags: 0
7-
m_PrefabParentObject: {fileID: 0}
8-
m_PrefabInternal: {fileID: 0}
7+
m_CorrespondingSourceObject: {fileID: 0}
8+
m_PrefabInstance: {fileID: 0}
9+
m_PrefabAsset: {fileID: 0}
910
m_Name: Player_MAT
1011
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
1112
m_ShaderKeywords: _EMISSION _METALLICGLOSSMAP _METALLICSPECGLOSSMAP _NORMALMAP
@@ -80,7 +81,10 @@ Material:
8081
m_Offset: {x: 0, y: 0}
8182
m_Floats:
8283
- Float_A5A8E873: 0.68
84+
- _AlphaClip: 0
85+
- _Blend: 0
8386
- _BumpScale: 1
87+
- _Cull: 2
8488
- _Cutoff: 0.5
8589
- _DetailNormalMapScale: 1
8690
- _DstBlend: 0
@@ -91,9 +95,11 @@ Material:
9195
- _Mode: 0
9296
- _OcclusionStrength: 1
9397
- _Parallax: 0.02
98+
- _ReceiveShadows: 1
9499
- _SmoothnessTextureChannel: 0
95100
- _SpecularHighlights: 1
96101
- _SrcBlend: 1
102+
- _Surface: 0
97103
- _UVSec: 0
98104
- _WorkflowMode: 1
99105
- _ZWrite: 1

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ Material:
55
serializedVersion: 6
66
m_ObjectHideFlags: 0
77
m_CorrespondingSourceObject: {fileID: 0}
8-
m_PrefabInternal: {fileID: 0}
8+
m_PrefabInstance: {fileID: 0}
9+
m_PrefabAsset: {fileID: 0}
910
m_Name: RockFloating02_Mat
1011
m_Shader: {fileID: 4800000, guid: 4ef1ae95536706148906d4e78066a53b, type: 3}
1112
m_ShaderKeywords: _METALLICGLOSSMAP _NORMALMAP

ShaderGraph_ExampleLibrary_Project/Assets/ShaderGraphs/MeshRenderers/MeshRenderer-ColorRim.ShaderGraph

Lines changed: 26 additions & 86 deletions
Large diffs are not rendered by default.

ShaderGraph_ExampleLibrary_Project/Assets/ShaderGraphs/Scenarios/TriplanarGrassRock-NoiseEdge-Graph.ShaderGraph

Lines changed: 25 additions & 25 deletions
Large diffs are not rendered by default.
Binary file not shown.
Binary file not shown.

ShaderGraph_ExampleLibrary_Project/Packages/manifest.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
{
22
"dependencies": {
3-
"com.unity.ads": "2.0.8",
4-
"com.unity.analytics": "2.0.16",
5-
"com.unity.package-manager-ui": "1.9.11",
3+
"com.unity.ads": "2.3.1",
4+
"com.unity.analytics": "3.2.2",
5+
"com.unity.collab-proxy": "1.2.15",
6+
"com.unity.package-manager-ui": "2.0.3",
67
"com.unity.purchasing": "2.0.3",
7-
"com.unity.render-pipelines.lightweight": "3.0.0-preview",
8-
"com.unity.textmeshpro": "1.2.4",
8+
"com.unity.render-pipelines.lightweight": "4.6.0-preview",
9+
"com.unity.textmeshpro": "1.3.0",
910
"com.unity.modules.ai": "1.0.0",
1011
"com.unity.modules.animation": "1.0.0",
1112
"com.unity.modules.assetbundle": "1.0.0",

ShaderGraph_ExampleLibrary_Project/ProjectSettings/ProjectSettings.asset

Lines changed: 47 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ PlayerSettings:
5252
m_StackTraceTypes: 010000000100000001000000010000000100000001000000
5353
iosShowActivityIndicatorOnLoading: -1
5454
androidShowActivityIndicatorOnLoading: -1
55-
tizenShowActivityIndicatorOnLoading: -1
5655
iosAppInBackgroundBehavior: 0
5756
displayResolutionDialog: 1
5857
iosAllowHTTPDownload: 1
@@ -64,6 +63,8 @@ PlayerSettings:
6463
use32BitDisplayBuffer: 1
6564
preserveFramebufferAlpha: 0
6665
disableDepthAndStencilBuffers: 0
66+
androidStartInFullscreen: 1
67+
androidRenderOutsideSafeArea: 0
6768
androidBlitType: 0
6869
defaultIsNativeResolution: 1
6970
macRetinaSupport: 1
@@ -97,19 +98,15 @@ PlayerSettings:
9798
xboxEnableGuest: 0
9899
xboxEnablePIXSampling: 0
99100
metalFramebufferOnly: 0
100-
n3dsDisableStereoscopicView: 0
101-
n3dsEnableSharedListOpt: 1
102-
n3dsEnableVSync: 0
103101
xboxOneResolution: 0
104102
xboxOneSResolution: 0
105103
xboxOneXResolution: 3
106104
xboxOneMonoLoggingLevel: 0
107105
xboxOneLoggingLevel: 1
108106
xboxOneDisableEsram: 0
109107
xboxOnePresentImmediateThreshold: 0
110-
videoMemoryForVertexBuffers: 0
111-
psp2PowerMode: 0
112-
psp2AcquireBGM: 1
108+
switchQueueCommandMemory: 0
109+
vulkanEnableSetSRGBWrite: 0
113110
m_SupportedAspectRatios:
114111
4:3: 1
115112
5:4: 1
@@ -123,6 +120,7 @@ PlayerSettings:
123120
m_HolographicPauseOnTrackingLoss: 1
124121
xboxOneDisableKinectGpuReservation: 0
125122
xboxOneEnable7thCore: 0
123+
isWsaHolographicRemotingEnabled: 0
126124
vrSettings:
127125
cardboard:
128126
depthFormat: 0
@@ -137,11 +135,12 @@ PlayerSettings:
137135
hololens:
138136
depthFormat: 1
139137
depthBufferSharingEnabled: 0
140-
enable360StereoCapture: 0
141138
oculus:
142139
sharedDepthBuffer: 0
143140
dashSupport: 0
141+
enable360StereoCapture: 0
144142
protectGraphicsMemory: 0
143+
enableFrameTimingStats: 0
145144
useHDRDisplay: 0
146145
m_ColorGamuts: 00000000
147146
targetPixelDensity: 30
@@ -168,7 +167,7 @@ PlayerSettings:
168167
StripUnusedMeshComponents: 0
169168
VertexChannelCompressionMask: 4054
170169
iPhoneSdkVersion: 988
171-
iOSTargetOSVersionString: 8.0
170+
iOSTargetOSVersionString: 9.0
172171
tvOSSdkVersion: 0
173172
tvOSRequireExtendedGameController: 0
174173
tvOSTargetOSVersionString: 9.0
@@ -229,6 +228,8 @@ PlayerSettings:
229228
appleDeveloperTeamID:
230229
iOSManualSigningProvisioningProfileID:
231230
tvOSManualSigningProvisioningProfileID:
231+
iOSManualSigningProvisioningProfileType: 0
232+
tvOSManualSigningProvisioningProfileType: 0
232233
appleEnableAutomaticSigning: 0
233234
iOSRequireARKit: 0
234235
appleEnableProMotion: 0
@@ -240,6 +241,7 @@ PlayerSettings:
240241
androidSplashScreen: {fileID: 0}
241242
AndroidKeystoreName:
242243
AndroidKeyaliasName:
244+
AndroidBuildApkPerCpuArchitecture: 0
243245
AndroidTVCompatibility: 1
244246
AndroidIsGame: 1
245247
AndroidEnableTango: 0
@@ -273,6 +275,7 @@ PlayerSettings:
273275
iPhone: 1
274276
tvOS: 1
275277
m_BuildTargetGroupLightmapEncodingQuality: []
278+
m_BuildTargetGroupLightmapSettings: []
276279
playModeTestRunnerEnabled: 0
277280
runPlayModeTestAsEditModeTest: 0
278281
actionOnDotNetUnhandledException: 1
@@ -394,7 +397,11 @@ PlayerSettings:
394397
switchAllowsVideoCapturing: 1
395398
switchAllowsRuntimeAddOnContentInstall: 0
396399
switchDataLossConfirmation: 0
400+
switchUserAccountLockEnabled: 0
397401
switchSupportedNpadStyles: 3
402+
switchNativeFsCacheSize: 32
403+
switchIsHoldTypeHorizontal: 0
404+
switchSupportedNpadCount: 8
398405
switchSocketConfigEnabled: 0
399406
switchTcpInitialSendBufferSize: 32
400407
switchTcpInitialReceiveBufferSize: 64
@@ -451,6 +458,7 @@ PlayerSettings:
451458
ps4pnGameCustomData: 1
452459
playerPrefsSupport: 0
453460
enableApplicationExit: 0
461+
resetTempFolder: 1
454462
restrictedAudioUsageRights: 0
455463
ps4UseResolutionFallback: 0
456464
ps4ReprojectionSupport: 0
@@ -474,53 +482,6 @@ PlayerSettings:
474482
ps4attribEyeToEyeDistanceSettingVR: 0
475483
ps4IncludedModules: []
476484
monoEnv:
477-
psp2Splashimage: {fileID: 0}
478-
psp2NPTrophyPackPath:
479-
psp2NPSupportGBMorGJP: 0
480-
psp2NPAgeRating: 12
481-
psp2NPTitleDatPath:
482-
psp2NPCommsID:
483-
psp2NPCommunicationsID:
484-
psp2NPCommsPassphrase:
485-
psp2NPCommsSig:
486-
psp2ParamSfxPath:
487-
psp2ManualPath:
488-
psp2LiveAreaGatePath:
489-
psp2LiveAreaBackroundPath:
490-
psp2LiveAreaPath:
491-
psp2LiveAreaTrialPath:
492-
psp2PatchChangeInfoPath:
493-
psp2PatchOriginalPackage:
494-
psp2PackagePassword: F69AzBlax3CF3EDNhm3soLBPh71Yexui
495-
psp2KeystoneFile:
496-
psp2MemoryExpansionMode: 0
497-
psp2DRMType: 0
498-
psp2StorageType: 0
499-
psp2MediaCapacity: 0
500-
psp2DLCConfigPath:
501-
psp2ThumbnailPath:
502-
psp2BackgroundPath:
503-
psp2SoundPath:
504-
psp2TrophyCommId:
505-
psp2TrophyPackagePath:
506-
psp2PackagedResourcesPath:
507-
psp2SaveDataQuota: 10240
508-
psp2ParentalLevel: 1
509-
psp2ShortTitle: Not Set
510-
psp2ContentID: IV0000-ABCD12345_00-0123456789ABCDEF
511-
psp2Category: 0
512-
psp2MasterVersion: 01.00
513-
psp2AppVersion: 01.00
514-
psp2TVBootMode: 0
515-
psp2EnterButtonAssignment: 2
516-
psp2TVDisableEmu: 0
517-
psp2AllowTwitterDialog: 1
518-
psp2Upgradable: 0
519-
psp2HealthWarning: 0
520-
psp2UseLibLocation: 0
521-
psp2InfoBarOnStartup: 0
522-
psp2InfoBarColor: 0
523-
psp2ScriptOptimizationLevel: 0
524485
splashScreenBackgroundSourceLandscape: {fileID: 0}
525486
splashScreenBackgroundSourcePortrait: {fileID: 0}
526487
spritePackerPolicy:
@@ -536,11 +497,13 @@ PlayerSettings:
536497
webGLUseEmbeddedResources: 0
537498
webGLCompressionFormat: 1
538499
webGLLinkerTarget: 0
500+
webGLThreadsSupport: 0
539501
scriptingDefineSymbols:
540502
1: UNITY_POST_PROCESSING_STACK_V2
541503
4: UNITY_POST_PROCESSING_STACK_V2
542504
7: UNITY_POST_PROCESSING_STACK_V2
543505
13: UNITY_POST_PROCESSING_STACK_V2
506+
14: UNITY_POST_PROCESSING_STACK_V2
544507
17: UNITY_POST_PROCESSING_STACK_V2
545508
18: UNITY_POST_PROCESSING_STACK_V2
546509
19: UNITY_POST_PROCESSING_STACK_V2
@@ -550,10 +513,13 @@ PlayerSettings:
550513
25: UNITY_POST_PROCESSING_STACK_V2
551514
26: UNITY_POST_PROCESSING_STACK_V2
552515
27: UNITY_POST_PROCESSING_STACK_V2
516+
28: UNITY_POST_PROCESSING_STACK_V2
553517
platformArchitecture: {}
554518
scriptingBackend: {}
555519
il2cppCompilerConfiguration: {}
520+
managedStrippingLevel: {}
556521
incrementalIl2cppBuild: {}
522+
allowUnsafeCode: 0
557523
additionalIl2CppArgs:
558524
scriptingRuntimeVersion: 0
559525
apiCompatibilityLevelPerPlatform: {}
@@ -569,41 +535,24 @@ PlayerSettings:
569535
metroApplicationDescription: LightweightPipeline
570536
wsaImages: {}
571537
metroTileShortName:
572-
metroCommandLineArgsFile:
573538
metroTileShowName: 0
574539
metroMediumTileShowName: 0
575540
metroLargeTileShowName: 0
576541
metroWideTileShowName: 0
542+
metroSupportStreamingInstall: 0
543+
metroLastRequiredScene: 0
577544
metroDefaultTileSize: 1
578545
metroTileForegroundText: 2
579546
metroTileBackgroundColor: {r: 0.13333334, g: 0.17254902, b: 0.21568628, a: 0}
580547
metroSplashScreenBackgroundColor: {r: 0.12941177, g: 0.17254902, b: 0.21568628,
581548
a: 1}
582549
metroSplashScreenUseBackgroundColor: 0
583550
platformCapabilities: {}
551+
metroTargetDeviceFamilies: {}
584552
metroFTAName:
585553
metroFTAFileTypes: []
586554
metroProtocolName:
587555
metroCompilationOverrides: 1
588-
tizenProductDescription:
589-
tizenProductURL:
590-
tizenSigningProfileName:
591-
tizenGPSPermissions: 0
592-
tizenMicrophonePermissions: 0
593-
tizenDeploymentTarget:
594-
tizenDeploymentTargetType: -1
595-
tizenMinOSVersion: 1
596-
n3dsUseExtSaveData: 0
597-
n3dsCompressStaticMem: 1
598-
n3dsExtSaveDataNumber: 0x12345
599-
n3dsStackSize: 131072
600-
n3dsTargetPlatform: 2
601-
n3dsRegion: 7
602-
n3dsMediaSize: 0
603-
n3dsLogoStyle: 3
604-
n3dsTitle: GameName
605-
n3dsProductCode:
606-
n3dsApplicationId: 0xFF3FF
607556
XboxOneProductId:
608557
XboxOneUpdateKey:
609558
XboxOneSandboxId:
@@ -613,6 +562,7 @@ PlayerSettings:
613562
XboxOneGameOsOverridePath:
614563
XboxOnePackagingOverridePath:
615564
XboxOneAppManifestOverridePath:
565+
XboxOneVersion: 1.0.0.0
616566
XboxOnePackageEncryption: 0
617567
XboxOnePackageUpdateGranularity: 2
618568
XboxOneDescription:
@@ -626,17 +576,38 @@ PlayerSettings:
626576
XboxOneSplashScreen: {fileID: 0}
627577
XboxOneAllowedProductIds: []
628578
XboxOnePersistentLocalStorageSize: 0
579+
XboxOneXTitleMemory: 8
629580
xboxOneScriptCompiler: 0
581+
XboxOneOverrideIdentityName:
630582
vrEditorSettings:
631583
daydream:
632584
daydreamIconForeground: {fileID: 0}
633585
daydreamIconBackground: {fileID: 0}
634586
cloudServicesEnabled: {}
587+
luminIcon:
588+
m_Name:
589+
m_ModelFolderPath:
590+
m_PortalFolderPath:
591+
luminCert:
592+
m_CertPath:
593+
m_PrivateKeyPath:
594+
luminIsChannelApp: 0
595+
luminVersion:
596+
m_VersionCode: 1
597+
m_VersionName:
635598
facebookSdkVersion: 7.9.4
599+
facebookAppId:
600+
facebookCookies: 1
601+
facebookLogging: 1
602+
facebookStatus: 1
603+
facebookXfbml: 0
604+
facebookFrictionlessRequests: 1
636605
apiCompatibilityLevel: 2
637606
cloudProjectId: bf2c0afe-e914-4208-b0bc-36fafcdbe102
607+
framebufferDepthMemorylessMode: 0
638608
projectName: LightweightPipeline
639609
organizationId: felipe-133245
640610
cloudEnabled: 0
641611
enableNativePlatformBackendsForNewInputSystem: 0
642612
disableOldInputManagerSupport: 0
613+
legacyClampBlendShapeWeights: 1
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
m_EditorVersion: 2018.2.0f2
1+
m_EditorVersion: 2018.3.0f2

0 commit comments

Comments
 (0)