Skip to content
This repository was archived by the owner on May 9, 2025. It is now read-only.

Commit 4b6bd3f

Browse files
Update to 2018.2.14f1
1 parent 9ab2cc1 commit 4b6bd3f

File tree

4 files changed

+109
-107
lines changed

4 files changed

+109
-107
lines changed
Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
%YAML 1.1
2-
%TAG !u! tag:unity3d.com,2011:
3-
--- !u!1045 &1
4-
EditorBuildSettings:
5-
m_ObjectHideFlags: 0
6-
serializedVersion: 2
7-
m_Scenes:
8-
- enabled: 1
9-
path: Assets/Scenes/SampleScene.unity
10-
guid: 99c9720ab356a0642a771bea13969a05
11-
m_configObjects: {}
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!1045 &1
4+
EditorBuildSettings:
5+
m_ObjectHideFlags: 0
6+
serializedVersion: 2
7+
m_Scenes:
8+
- enabled: 0
9+
path:
10+
guid: 00000000000000000000000000000000
11+
m_configObjects: {}
Lines changed: 63 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,63 @@
1-
%YAML 1.1
2-
%TAG !u! tag:unity3d.com,2011:
3-
--- !u!30 &1
4-
GraphicsSettings:
5-
m_ObjectHideFlags: 0
6-
serializedVersion: 12
7-
m_Deferred:
8-
m_Mode: 1
9-
m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0}
10-
m_DeferredReflections:
11-
m_Mode: 1
12-
m_Shader: {fileID: 74, guid: 0000000000000000f000000000000000, type: 0}
13-
m_ScreenSpaceShadows:
14-
m_Mode: 1
15-
m_Shader: {fileID: 64, guid: 0000000000000000f000000000000000, type: 0}
16-
m_LegacyDeferred:
17-
m_Mode: 1
18-
m_Shader: {fileID: 63, guid: 0000000000000000f000000000000000, type: 0}
19-
m_DepthNormals:
20-
m_Mode: 1
21-
m_Shader: {fileID: 62, guid: 0000000000000000f000000000000000, type: 0}
22-
m_MotionVectors:
23-
m_Mode: 1
24-
m_Shader: {fileID: 75, guid: 0000000000000000f000000000000000, type: 0}
25-
m_LightHalo:
26-
m_Mode: 1
27-
m_Shader: {fileID: 105, guid: 0000000000000000f000000000000000, type: 0}
28-
m_LensFlare:
29-
m_Mode: 1
30-
m_Shader: {fileID: 102, guid: 0000000000000000f000000000000000, type: 0}
31-
m_AlwaysIncludedShaders:
32-
- {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
33-
- {fileID: 15104, guid: 0000000000000000f000000000000000, type: 0}
34-
- {fileID: 15105, guid: 0000000000000000f000000000000000, type: 0}
35-
- {fileID: 15106, guid: 0000000000000000f000000000000000, type: 0}
36-
- {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0}
37-
- {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0}
38-
m_PreloadedShaders: []
39-
m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
40-
type: 0}
41-
m_CustomRenderPipeline: {fileID: 0}
42-
m_TransparencySortMode: 0
43-
m_TransparencySortAxis: {x: 0, y: 0, z: 1}
44-
m_DefaultRenderingPath: 1
45-
m_DefaultMobileRenderingPath: 1
46-
m_TierSettings: []
47-
m_LightmapStripping: 0
48-
m_FogStripping: 0
49-
m_InstancingStripping: 0
50-
m_LightmapKeepPlain: 1
51-
m_LightmapKeepDirCombined: 1
52-
m_LightmapKeepDynamicPlain: 1
53-
m_LightmapKeepDynamicDirCombined: 1
54-
m_LightmapKeepShadowMask: 1
55-
m_LightmapKeepSubtractive: 1
56-
m_FogKeepLinear: 1
57-
m_FogKeepExp: 1
58-
m_FogKeepExp2: 1
59-
m_AlbedoSwatchInfos: []
60-
m_LightsUseLinearIntensity: 0
61-
m_LightsUseColorTemperature: 0
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!30 &1
4+
GraphicsSettings:
5+
m_ObjectHideFlags: 0
6+
serializedVersion: 12
7+
m_Deferred:
8+
m_Mode: 1
9+
m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0}
10+
m_DeferredReflections:
11+
m_Mode: 1
12+
m_Shader: {fileID: 74, guid: 0000000000000000f000000000000000, type: 0}
13+
m_ScreenSpaceShadows:
14+
m_Mode: 1
15+
m_Shader: {fileID: 64, guid: 0000000000000000f000000000000000, type: 0}
16+
m_LegacyDeferred:
17+
m_Mode: 1
18+
m_Shader: {fileID: 63, guid: 0000000000000000f000000000000000, type: 0}
19+
m_DepthNormals:
20+
m_Mode: 1
21+
m_Shader: {fileID: 62, guid: 0000000000000000f000000000000000, type: 0}
22+
m_MotionVectors:
23+
m_Mode: 1
24+
m_Shader: {fileID: 75, guid: 0000000000000000f000000000000000, type: 0}
25+
m_LightHalo:
26+
m_Mode: 1
27+
m_Shader: {fileID: 105, guid: 0000000000000000f000000000000000, type: 0}
28+
m_LensFlare:
29+
m_Mode: 1
30+
m_Shader: {fileID: 102, guid: 0000000000000000f000000000000000, type: 0}
31+
m_AlwaysIncludedShaders:
32+
- {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
33+
- {fileID: 15104, guid: 0000000000000000f000000000000000, type: 0}
34+
- {fileID: 15105, guid: 0000000000000000f000000000000000, type: 0}
35+
- {fileID: 15106, guid: 0000000000000000f000000000000000, type: 0}
36+
- {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0}
37+
- {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0}
38+
- {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
39+
- {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
40+
m_PreloadedShaders: []
41+
m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
42+
type: 0}
43+
m_CustomRenderPipeline: {fileID: 0}
44+
m_TransparencySortMode: 0
45+
m_TransparencySortAxis: {x: 0, y: 0, z: 1}
46+
m_DefaultRenderingPath: 1
47+
m_DefaultMobileRenderingPath: 1
48+
m_TierSettings: []
49+
m_LightmapStripping: 0
50+
m_FogStripping: 0
51+
m_InstancingStripping: 0
52+
m_LightmapKeepPlain: 1
53+
m_LightmapKeepDirCombined: 1
54+
m_LightmapKeepDynamicPlain: 1
55+
m_LightmapKeepDynamicDirCombined: 1
56+
m_LightmapKeepShadowMask: 1
57+
m_LightmapKeepSubtractive: 1
58+
m_FogKeepLinear: 1
59+
m_FogKeepExp: 1
60+
m_FogKeepExp2: 1
61+
m_AlbedoSwatchInfos: []
62+
m_LightsUseLinearIntensity: 0
63+
m_LightsUseColorTemperature: 0

ProjectSettings/ProjectVersion.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
m_EditorVersion: 2018.2.10f1
1+
m_EditorVersion: 2018.2.14f1
Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
1-
%YAML 1.1
2-
%TAG !u! tag:unity3d.com,2011:
3-
--- !u!310 &1
4-
UnityConnectSettings:
5-
m_ObjectHideFlags: 0
6-
m_Enabled: 0
7-
m_TestMode: 0
8-
m_TestEventUrl:
9-
m_TestConfigUrl:
10-
m_TestInitMode: 0
11-
CrashReportingSettings:
12-
m_EventUrl: https://perf-events.cloud.unity3d.com/api/events/crashes
13-
m_NativeEventUrl: https://perf-events.cloud.unity3d.com/symbolicate
14-
m_Enabled: 0
15-
m_CaptureEditorExceptions: 1
16-
UnityPurchasingSettings:
17-
m_Enabled: 0
18-
m_TestMode: 0
19-
UnityAnalyticsSettings:
20-
m_Enabled: 1
21-
m_InitializeOnStartup: 1
22-
m_TestMode: 0
23-
m_TestEventUrl:
24-
m_TestConfigUrl:
25-
UnityAdsSettings:
26-
m_Enabled: 0
27-
m_InitializeOnStartup: 1
28-
m_TestMode: 0
29-
m_IosGameId:
30-
m_AndroidGameId:
31-
m_GameIds: {}
32-
m_GameId:
33-
PerformanceReportingSettings:
34-
m_Enabled: 0
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!310 &1
4+
UnityConnectSettings:
5+
m_ObjectHideFlags: 0
6+
m_Enabled: 1
7+
m_TestMode: 0
8+
m_TestEventUrl:
9+
m_TestConfigUrl:
10+
m_TestInitMode: 0
11+
CrashReportingSettings:
12+
m_EventUrl: https://perf-events.cloud.unity3d.com/api/events/crashes
13+
m_NativeEventUrl: https://perf-events.cloud.unity3d.com/symbolicate
14+
m_Enabled: 0
15+
m_CaptureEditorExceptions: 1
16+
UnityPurchasingSettings:
17+
m_Enabled: 0
18+
m_TestMode: 0
19+
UnityAnalyticsSettings:
20+
m_Enabled: 1
21+
m_InitializeOnStartup: 1
22+
m_TestMode: 0
23+
m_TestEventUrl:
24+
m_TestConfigUrl:
25+
UnityAdsSettings:
26+
m_Enabled: 0
27+
m_InitializeOnStartup: 1
28+
m_TestMode: 0
29+
m_IosGameId:
30+
m_AndroidGameId:
31+
m_GameIds: {}
32+
m_GameId:
33+
PerformanceReportingSettings:
34+
m_Enabled: 0

0 commit comments

Comments
 (0)