Skip to content

Commit 6cfa8da

Browse files
MerlinVRMerlinVR
committed
Apply random auto updates Unity did to assets on 2019
1 parent 9ea5bbe commit 6cfa8da

17 files changed

Lines changed: 226 additions & 101 deletions

‎Assets/USharpVideo/Examples/Prefabs/ReloadButton.prefab‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,13 @@ MonoBehaviour:
5454
m_GameObject: {fileID: 1431598093717007813}
5555
m_Enabled: 1
5656
m_EditorHideFlags: 0
57-
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
57+
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
5858
m_Name:
5959
m_EditorClassIdentifier:
6060
m_Material: {fileID: 2100000, guid: 5f9bbf478c2b961468f0472188c111fb, type: 2}
6161
m_Color: {r: 0, g: 0, b: 0, a: 1}
6262
m_RaycastTarget: 1
63+
m_Maskable: 1
6364
m_OnCullStateChanged:
6465
m_PersistentCalls:
6566
m_Calls: []
@@ -72,6 +73,7 @@ MonoBehaviour:
7273
m_FillClockwise: 1
7374
m_FillOrigin: 0
7475
m_UseSpriteMesh: 0
76+
m_PixelsPerUnitMultiplier: 1
7577
--- !u!1 &1431598094050721560
7678
GameObject:
7779
m_ObjectHideFlags: 0
@@ -166,12 +168,13 @@ MonoBehaviour:
166168
m_GameObject: {fileID: 1431598094597406949}
167169
m_Enabled: 1
168170
m_EditorHideFlags: 0
169-
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
171+
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
170172
m_Name:
171173
m_EditorClassIdentifier:
172174
m_Material: {fileID: 0}
173175
m_Color: {r: 0.21318094, g: 0.18627624, b: 0.21698111, a: 1}
174176
m_RaycastTarget: 1
177+
m_Maskable: 1
175178
m_OnCullStateChanged:
176179
m_PersistentCalls:
177180
m_Calls: []
@@ -184,6 +187,7 @@ MonoBehaviour:
184187
m_FillClockwise: 1
185188
m_FillOrigin: 0
186189
m_UseSpriteMesh: 0
190+
m_PixelsPerUnitMultiplier: 1
187191
--- !u!114 &1431598094597406952
188192
MonoBehaviour:
189193
m_ObjectHideFlags: 0
@@ -193,7 +197,7 @@ MonoBehaviour:
193197
m_GameObject: {fileID: 1431598094597406949}
194198
m_Enabled: 1
195199
m_EditorHideFlags: 0
196-
m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
200+
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
197201
m_Name:
198202
m_EditorClassIdentifier:
199203
m_Navigation:
@@ -207,17 +211,20 @@ MonoBehaviour:
207211
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
208212
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
209213
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
214+
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
210215
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
211216
m_ColorMultiplier: 1
212217
m_FadeDuration: 0.1
213218
m_SpriteState:
214219
m_HighlightedSprite: {fileID: 0}
215220
m_PressedSprite: {fileID: 0}
221+
m_SelectedSprite: {fileID: 0}
216222
m_DisabledSprite: {fileID: 0}
217223
m_AnimationTriggers:
218224
m_NormalTrigger: Normal
219225
m_HighlightedTrigger: Highlighted
220226
m_PressedTrigger: Pressed
227+
m_SelectedTrigger: Highlighted
221228
m_DisabledTrigger: Disabled
222229
m_Interactable: 1
223230
m_TargetGraphic: {fileID: 1431598094597406953}
@@ -319,12 +326,13 @@ MonoBehaviour:
319326
m_GameObject: {fileID: 1431598094942062407}
320327
m_Enabled: 1
321328
m_EditorHideFlags: 0
322-
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
329+
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
323330
m_Name:
324331
m_EditorClassIdentifier:
325332
m_Material: {fileID: 2100000, guid: 5f9bbf478c2b961468f0472188c111fb, type: 2}
326333
m_Color: {r: 0.9433962, g: 0.9433962, b: 0.9433962, a: 1}
327334
m_RaycastTarget: 1
335+
m_Maskable: 1
328336
m_OnCullStateChanged:
329337
m_PersistentCalls:
330338
m_Calls: []
@@ -337,6 +345,7 @@ MonoBehaviour:
337345
m_FillClockwise: 1
338346
m_FillOrigin: 0
339347
m_UseSpriteMesh: 0
348+
m_PixelsPerUnitMultiplier: 1
340349
--- !u!1 &1431598095191993716
341350
GameObject:
342351
m_ObjectHideFlags: 0
@@ -409,7 +418,7 @@ MonoBehaviour:
409418
m_GameObject: {fileID: 1431598095191993716}
410419
m_Enabled: 1
411420
m_EditorHideFlags: 0
412-
m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3}
421+
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
413422
m_Name:
414423
m_EditorClassIdentifier:
415424
m_UiScaleMode: 0
@@ -431,7 +440,7 @@ MonoBehaviour:
431440
m_GameObject: {fileID: 1431598095191993716}
432441
m_Enabled: 1
433442
m_EditorHideFlags: 0
434-
m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3}
443+
m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
435444
m_Name:
436445
m_EditorClassIdentifier:
437446
m_IgnoreReversedGraphics: 1
@@ -483,6 +492,7 @@ MonoBehaviour:
483492
SynchronizePosition: 0
484493
AllowCollisionOwnershipTransfer: 0
485494
Reliable: 0
495+
_syncMethod: 0
486496
serializedProgramAsset: {fileID: 11400000, guid: d7f9b03239edd044cb4bbdefdae8d197,
487497
type: 2}
488498
programSource: {fileID: 11400000, guid: 3fc012837939e6a489d9f6f64ec27520, type: 2}

‎Assets/USharpVideo/Examples/Prefabs/ResyncButton.prefab‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ MonoBehaviour:
7474
m_GameObject: {fileID: 8260284649117073896}
7575
m_Enabled: 1
7676
m_EditorHideFlags: 0
77-
m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3}
77+
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
7878
m_Name:
7979
m_EditorClassIdentifier:
8080
m_UiScaleMode: 0
@@ -96,7 +96,7 @@ MonoBehaviour:
9696
m_GameObject: {fileID: 8260284649117073896}
9797
m_Enabled: 1
9898
m_EditorHideFlags: 0
99-
m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3}
99+
m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
100100
m_Name:
101101
m_EditorClassIdentifier:
102102
m_IgnoreReversedGraphics: 1
@@ -148,6 +148,7 @@ MonoBehaviour:
148148
SynchronizePosition: 0
149149
AllowCollisionOwnershipTransfer: 0
150150
Reliable: 0
151+
_syncMethod: 0
151152
serializedProgramAsset: {fileID: 11400000, guid: 377e497fec4aab94bae637352dde5bd8,
152153
type: 2}
153154
programSource: {fileID: 11400000, guid: 0a13206cc5d9b754a8da562b0311412a, type: 2}
@@ -224,12 +225,13 @@ MonoBehaviour:
224225
m_GameObject: {fileID: 8260284649301864963}
225226
m_Enabled: 1
226227
m_EditorHideFlags: 0
227-
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
228+
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
228229
m_Name:
229230
m_EditorClassIdentifier:
230231
m_Material: {fileID: 2100000, guid: 5f9bbf478c2b961468f0472188c111fb, type: 2}
231232
m_Color: {r: 0.21318094, g: 0.18627624, b: 0.21698111, a: 1}
232233
m_RaycastTarget: 1
234+
m_Maskable: 1
233235
m_OnCullStateChanged:
234236
m_PersistentCalls:
235237
m_Calls: []
@@ -242,6 +244,7 @@ MonoBehaviour:
242244
m_FillClockwise: 1
243245
m_FillOrigin: 0
244246
m_UseSpriteMesh: 0
247+
m_PixelsPerUnitMultiplier: 1
245248
--- !u!114 &8260284649301864966
246249
MonoBehaviour:
247250
m_ObjectHideFlags: 0
@@ -251,7 +254,7 @@ MonoBehaviour:
251254
m_GameObject: {fileID: 8260284649301864963}
252255
m_Enabled: 1
253256
m_EditorHideFlags: 0
254-
m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
257+
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
255258
m_Name:
256259
m_EditorClassIdentifier:
257260
m_Navigation:
@@ -265,17 +268,20 @@ MonoBehaviour:
265268
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
266269
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
267270
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
271+
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
268272
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
269273
m_ColorMultiplier: 1
270274
m_FadeDuration: 0.1
271275
m_SpriteState:
272276
m_HighlightedSprite: {fileID: 0}
273277
m_PressedSprite: {fileID: 0}
278+
m_SelectedSprite: {fileID: 0}
274279
m_DisabledSprite: {fileID: 0}
275280
m_AnimationTriggers:
276281
m_NormalTrigger: Normal
277282
m_HighlightedTrigger: Highlighted
278283
m_PressedTrigger: Pressed
284+
m_SelectedTrigger: Highlighted
279285
m_DisabledTrigger: Disabled
280286
m_Interactable: 1
281287
m_TargetGraphic: {fileID: 8260284649301864967}
@@ -362,12 +368,13 @@ MonoBehaviour:
362368
m_GameObject: {fileID: 8260284649691530199}
363369
m_Enabled: 1
364370
m_EditorHideFlags: 0
365-
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
371+
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
366372
m_Name:
367373
m_EditorClassIdentifier:
368374
m_Material: {fileID: 2100000, guid: 5f9bbf478c2b961468f0472188c111fb, type: 2}
369375
m_Color: {r: 0.14800748, g: 0.07689569, b: 0.1509434, a: 1}
370376
m_RaycastTarget: 1
377+
m_Maskable: 1
371378
m_OnCullStateChanged:
372379
m_PersistentCalls:
373380
m_Calls: []
@@ -380,6 +387,7 @@ MonoBehaviour:
380387
m_FillClockwise: 1
381388
m_FillOrigin: 0
382389
m_UseSpriteMesh: 0
390+
m_PixelsPerUnitMultiplier: 1
383391
--- !u!114 &8260284649691530197
384392
MonoBehaviour:
385393
m_ObjectHideFlags: 0
@@ -449,12 +457,13 @@ MonoBehaviour:
449457
m_GameObject: {fileID: 8260284650045182351}
450458
m_Enabled: 1
451459
m_EditorHideFlags: 0
452-
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
460+
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
453461
m_Name:
454462
m_EditorClassIdentifier:
455463
m_Material: {fileID: 2100000, guid: 5f9bbf478c2b961468f0472188c111fb, type: 2}
456464
m_Color: {r: 0.8773585, g: 0.8773585, b: 0.8773585, a: 1}
457465
m_RaycastTarget: 0
466+
m_Maskable: 1
458467
m_OnCullStateChanged:
459468
m_PersistentCalls:
460469
m_Calls: []

0 commit comments

Comments
 (0)