Skip to content

Commit 49bd42a

Browse files
setchisetchi
committed
Update Unity Editor 5.5.2f1 -> 2017.1.0f3
1 parent 18d15eb commit 49bd42a

File tree

6 files changed

+231
-56
lines changed

6 files changed

+231
-56
lines changed

‎Assets/Scenes/NoteEditor.unity‎

Lines changed: 61 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ OcclusionCullingSettings:
1313
--- !u!104 &2
1414
RenderSettings:
1515
m_ObjectHideFlags: 0
16-
serializedVersion: 7
16+
serializedVersion: 8
1717
m_Fog: 0
1818
m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
1919
m_FogMode: 3
@@ -25,6 +25,7 @@ RenderSettings:
2525
m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
2626
m_AmbientIntensity: 1
2727
m_AmbientMode: 0
28+
m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
2829
m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0}
2930
m_HaloStrength: 0.5
3031
m_FlareStrength: 1
@@ -41,7 +42,7 @@ RenderSettings:
4142
--- !u!157 &4
4243
LightmapSettings:
4344
m_ObjectHideFlags: 0
44-
serializedVersion: 7
45+
serializedVersion: 11
4546
m_GIWorkflowMode: 0
4647
m_GISettings:
4748
serializedVersion: 2
@@ -53,7 +54,7 @@ LightmapSettings:
5354
m_EnableBakedLightmaps: 1
5455
m_EnableRealtimeLightmaps: 1
5556
m_LightmapEditorSettings:
56-
serializedVersion: 4
57+
serializedVersion: 9
5758
m_Resolution: 2
5859
m_BakeResolution: 40
5960
m_TextureWidth: 1024
@@ -66,13 +67,27 @@ LightmapSettings:
6667
m_LightmapParameters: {fileID: 0}
6768
m_LightmapsBakeMode: 1
6869
m_TextureCompression: 1
69-
m_DirectLightInLightProbes: 1
7070
m_FinalGather: 0
7171
m_FinalGatherFiltering: 1
7272
m_FinalGatherRayCount: 1024
7373
m_ReflectionCompression: 2
74+
m_MixedBakeMode: 1
75+
m_BakeBackend: 0
76+
m_PVRSampling: 1
77+
m_PVRDirectSampleCount: 32
78+
m_PVRSampleCount: 500
79+
m_PVRBounces: 2
80+
m_PVRFiltering: 0
81+
m_PVRFilteringMode: 1
82+
m_PVRCulling: 1
83+
m_PVRFilteringGaussRadiusDirect: 1
84+
m_PVRFilteringGaussRadiusIndirect: 5
85+
m_PVRFilteringGaussRadiusAO: 2
86+
m_PVRFilteringAtrousColorSigma: 1
87+
m_PVRFilteringAtrousNormalSigma: 1
88+
m_PVRFilteringAtrousPositionSigma: 1
7489
m_LightingDataAsset: {fileID: 0}
75-
m_RuntimeCPUUsage: 25
90+
m_UseShadowmask: 0
7691
--- !u!196 &5
7792
NavMeshSettings:
7893
serializedVersion: 2
@@ -89,6 +104,8 @@ NavMeshSettings:
89104
minRegionArea: 2
90105
manualCellSize: 0
91106
cellSize: 0.16666667
107+
manualTileSize: 0
108+
tileSize: 256
92109
accuratePlacement: 0
93110
m_NavMeshData: {fileID: 0}
94111
--- !u!1 &32780993
@@ -167,6 +184,7 @@ MonoBehaviour:
167184
m_PreferredHeight: -1
168185
m_FlexibleWidth: -1
169186
m_FlexibleHeight: -1
187+
m_LayoutPriority: 1
170188
--- !u!1 &41238603
171189
GameObject:
172190
m_ObjectHideFlags: 0
@@ -655,6 +673,8 @@ Camera:
655673
m_TargetDisplay: 0
656674
m_TargetEye: 3
657675
m_HDR: 0
676+
m_AllowMSAA: 1
677+
m_ForceIntoRT: 0
658678
m_OcclusionCulling: 1
659679
m_StereoConvergence: 10
660680
m_StereoSeparation: 0.022
@@ -1715,7 +1735,7 @@ MonoBehaviour:
17151735
m_Alignment: 3
17161736
m_AlignByGeometry: 0
17171737
m_RichText: 0
1718-
m_HorizontalOverflow: 0
1738+
m_HorizontalOverflow: 1
17191739
m_VerticalOverflow: 0
17201740
m_LineSpacing: 1
17211741
m_Text: 0
@@ -1885,7 +1905,7 @@ MonoBehaviour:
18851905
m_Alignment: 3
18861906
m_AlignByGeometry: 0
18871907
m_RichText: 0
1888-
m_HorizontalOverflow: 0
1908+
m_HorizontalOverflow: 1
18891909
m_VerticalOverflow: 0
18901910
m_LineSpacing: 1
18911911
m_Text: 120
@@ -2434,6 +2454,7 @@ MonoBehaviour:
24342454
m_PreferredHeight: -1
24352455
m_FlexibleWidth: -1
24362456
m_FlexibleHeight: -1
2457+
m_LayoutPriority: 1
24372458
--- !u!114 &302783615
24382459
MonoBehaviour:
24392460
m_ObjectHideFlags: 0
@@ -3258,6 +3279,7 @@ MonoBehaviour:
32583279
m_PreferredHeight: -1
32593280
m_FlexibleWidth: -1
32603281
m_FlexibleHeight: -1
3282+
m_LayoutPriority: 1
32613283
--- !u!222 &397513636
32623284
CanvasRenderer:
32633285
m_ObjectHideFlags: 0
@@ -4172,7 +4194,7 @@ MonoBehaviour:
41724194
m_Alignment: 3
41734195
m_AlignByGeometry: 0
41744196
m_RichText: 0
4175-
m_HorizontalOverflow: 0
4197+
m_HorizontalOverflow: 1
41764198
m_VerticalOverflow: 0
41774199
m_LineSpacing: 1
41784200
m_Text:
@@ -4240,6 +4262,7 @@ MonoBehaviour:
42404262
m_PreferredHeight: -1
42414263
m_FlexibleWidth: -1
42424264
m_FlexibleHeight: -1
4265+
m_LayoutPriority: 1
42434266
--- !u!222 &554541599
42444267
CanvasRenderer:
42454268
m_ObjectHideFlags: 0
@@ -5265,6 +5288,7 @@ MonoBehaviour:
52655288
m_PreferredHeight: -1
52665289
m_FlexibleWidth: -1
52675290
m_FlexibleHeight: -1
5291+
m_LayoutPriority: 1
52685292
--- !u!1 &729710303
52695293
GameObject:
52705294
m_ObjectHideFlags: 0
@@ -5890,7 +5914,7 @@ Canvas:
58905914
m_PrefabInternal: {fileID: 0}
58915915
m_GameObject: {fileID: 798471440}
58925916
m_Enabled: 1
5893-
serializedVersion: 2
5917+
serializedVersion: 3
58945918
m_RenderMode: 0
58955919
m_Camera: {fileID: 67050166}
58965920
m_PlaneDistance: 100
@@ -5899,6 +5923,7 @@ Canvas:
58995923
m_OverrideSorting: 0
59005924
m_OverridePixelPerfect: 0
59015925
m_SortingBucketNormalizedSize: 0
5926+
m_AdditionalShaderChannelsFlag: 25
59025927
m_SortingLayerID: 0
59035928
m_SortingOrder: 0
59045929
m_TargetDisplay: 0
@@ -6041,6 +6066,7 @@ MonoBehaviour:
60416066
m_PreferredHeight: -1
60426067
m_FlexibleWidth: -1
60436068
m_FlexibleHeight: -1
6069+
m_LayoutPriority: 1
60446070
--- !u!222 &804642300
60456071
CanvasRenderer:
60466072
m_ObjectHideFlags: 0
@@ -6408,7 +6434,7 @@ MonoBehaviour:
64086434
m_Alignment: 3
64096435
m_AlignByGeometry: 0
64106436
m_RichText: 0
6411-
m_HorizontalOverflow: 0
6437+
m_HorizontalOverflow: 1
64126438
m_VerticalOverflow: 0
64136439
m_LineSpacing: 1
64146440
m_Text: 120
@@ -6688,6 +6714,7 @@ MonoBehaviour:
66886714
m_PreferredHeight: -1
66896715
m_FlexibleWidth: -1
66906716
m_FlexibleHeight: -1
6717+
m_LayoutPriority: 1
66916718
--- !u!114 &955272495
66926719
MonoBehaviour:
66936720
m_ObjectHideFlags: 0
@@ -8287,7 +8314,7 @@ Light:
82878314
m_PrefabInternal: {fileID: 0}
82888315
m_GameObject: {fileID: 1237447638}
82898316
m_Enabled: 1
8290-
serializedVersion: 7
8317+
serializedVersion: 8
82918318
m_Type: 1
82928319
m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
82938320
m_Intensity: 1
@@ -8312,6 +8339,22 @@ Light:
83128339
m_Lightmapping: 4
83138340
m_AreaSize: {x: 1, y: 1}
83148341
m_BounceIntensity: 1
8342+
m_FalloffTable:
8343+
m_Table[0]: 0
8344+
m_Table[1]: 0
8345+
m_Table[2]: 0
8346+
m_Table[3]: 0
8347+
m_Table[4]: 0
8348+
m_Table[5]: 0
8349+
m_Table[6]: 0
8350+
m_Table[7]: 0
8351+
m_Table[8]: 0
8352+
m_Table[9]: 0
8353+
m_Table[10]: 0
8354+
m_Table[11]: 0
8355+
m_Table[12]: 0
8356+
m_ColorTemperature: 6570
8357+
m_UseColorTemperature: 0
83158358
m_ShadowRadius: 0
83168359
m_ShadowAngle: 0
83178360
--- !u!4 &1237447640
@@ -8541,6 +8584,7 @@ MonoBehaviour:
85418584
m_PreferredHeight: -1
85428585
m_FlexibleWidth: -1
85438586
m_FlexibleHeight: -1
8587+
m_LayoutPriority: 1
85448588
--- !u!222 &1283695312
85458589
CanvasRenderer:
85468590
m_ObjectHideFlags: 0
@@ -8924,6 +8968,7 @@ MonoBehaviour:
89248968
m_PreferredHeight: -1
89258969
m_FlexibleWidth: -1
89268970
m_FlexibleHeight: -1
8971+
m_LayoutPriority: 1
89278972
--- !u!1 &1334814936
89288973
GameObject:
89298974
m_ObjectHideFlags: 0
@@ -9930,7 +9975,7 @@ MonoBehaviour:
99309975
m_Alignment: 3
99319976
m_AlignByGeometry: 0
99329977
m_RichText: 0
9933-
m_HorizontalOverflow: 0
9978+
m_HorizontalOverflow: 1
99349979
m_VerticalOverflow: 0
99359980
m_LineSpacing: 1
99369981
m_Text:
@@ -10740,7 +10785,7 @@ MonoBehaviour:
1074010785
m_Alignment: 3
1074110786
m_AlignByGeometry: 0
1074210787
m_RichText: 0
10743-
m_HorizontalOverflow: 0
10788+
m_HorizontalOverflow: 1
1074410789
m_VerticalOverflow: 0
1074510790
m_LineSpacing: 1
1074610791
m_Text: 120
@@ -11740,6 +11785,7 @@ MonoBehaviour:
1174011785
m_PreferredHeight: -1
1174111786
m_FlexibleWidth: -1
1174211787
m_FlexibleHeight: -1
11788+
m_LayoutPriority: 1
1174311789
--- !u!222 &1910481097
1174411790
CanvasRenderer:
1174511791
m_ObjectHideFlags: 0
@@ -12209,6 +12255,7 @@ MonoBehaviour:
1220912255
m_PreferredHeight: -1
1221012256
m_FlexibleWidth: -1
1221112257
m_FlexibleHeight: -1
12258+
m_LayoutPriority: 1
1221212259
--- !u!114 &1956531579
1221312260
MonoBehaviour:
1221412261
m_ObjectHideFlags: 0
@@ -12987,6 +13034,7 @@ MonoBehaviour:
1298713034
m_PreferredHeight: -1
1298813035
m_FlexibleWidth: -1
1298913036
m_FlexibleHeight: -1
13037+
m_LayoutPriority: 1
1299013038
--- !u!114 &2127211279
1299113039
MonoBehaviour:
1299213040
m_ObjectHideFlags: 0

‎Assets/Scripts/Presenter/MusicSelector/MusicLoader.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ IEnumerator LoadMusic(string fileName)
2727

2828
EditCommandManager.Clear();
2929
ResetEditor();
30-
Audio.Source.clip = www.audioClip;
30+
Audio.Source.clip = www.GetAudioClip();
3131

3232
if (Audio.Source.clip == null)
3333
{

‎Assets/Shaders/Waveform.shader‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
v2f vert(appdata v) {
2929
v2f o;
30-
o.pos = mul(UNITY_MATRIX_MVP, v.vertex);
30+
o.pos = UnityObjectToClipPos(v.vertex);
3131
o.uv = TRANSFORM_TEX(v.texcoord, _MainTex);
3232
return o;
3333
}

‎ProjectSettings/GraphicsSettings.asset‎

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
--- !u!30 &1
44
GraphicsSettings:
55
m_ObjectHideFlags: 0
6-
serializedVersion: 7
6+
serializedVersion: 12
77
m_Deferred:
88
m_Mode: 1
99
m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0}
@@ -35,33 +35,28 @@ GraphicsSettings:
3535
- {fileID: 15106, guid: 0000000000000000f000000000000000, type: 0}
3636
- {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0}
3737
- {fileID: 10782, guid: 0000000000000000f000000000000000, type: 0}
38+
- {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
3839
m_PreloadedShaders: []
3940
m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
4041
type: 0}
41-
m_ShaderSettings_Tier1:
42-
useCascadedShadowMaps: 1
43-
standardShaderQuality: 2
44-
useReflectionProbeBoxProjection: 1
45-
useReflectionProbeBlending: 1
46-
m_ShaderSettings_Tier2:
47-
useCascadedShadowMaps: 1
48-
standardShaderQuality: 2
49-
useReflectionProbeBoxProjection: 1
50-
useReflectionProbeBlending: 1
51-
m_ShaderSettings_Tier3:
52-
useCascadedShadowMaps: 1
53-
standardShaderQuality: 2
54-
useReflectionProbeBoxProjection: 1
55-
useReflectionProbeBlending: 1
56-
m_BuildTargetShaderSettings: []
42+
m_CustomRenderPipeline: {fileID: 0}
43+
m_TransparencySortMode: 0
44+
m_TransparencySortAxis: {x: 0, y: 0, z: 1}
45+
m_DefaultRenderingPath: 1
46+
m_DefaultMobileRenderingPath: 1
47+
m_TierSettings: []
5748
m_LightmapStripping: 0
5849
m_FogStripping: 0
50+
m_InstancingStripping: 0
5951
m_LightmapKeepPlain: 1
6052
m_LightmapKeepDirCombined: 1
61-
m_LightmapKeepDirSeparate: 1
6253
m_LightmapKeepDynamicPlain: 1
6354
m_LightmapKeepDynamicDirCombined: 1
64-
m_LightmapKeepDynamicDirSeparate: 1
55+
m_LightmapKeepShadowMask: 1
56+
m_LightmapKeepSubtractive: 1
6557
m_FogKeepLinear: 1
6658
m_FogKeepExp: 1
6759
m_FogKeepExp2: 1
60+
m_AlbedoSwatchInfos: []
61+
m_LightsUseLinearIntensity: 0
62+
m_LightsUseColorTemperature: 0

0 commit comments

Comments
 (0)