Skip to content

Commit b1acbd8

Browse files
committed
Update to 2019.4.17f1 and hopefully fix shit...
...in the process. Kept you waiting, huh?
1 parent bc8a1f5 commit b1acbd8

File tree

5 files changed

+20
-217
lines changed

5 files changed

+20
-217
lines changed

Assets/NodeListServer/Example/List Example.unity

Lines changed: 8 additions & 205 deletions
Original file line numberDiff line numberDiff line change
@@ -369,84 +369,6 @@ Transform:
369369
m_Father: {fileID: 0}
370370
m_RootOrder: 4
371371
m_LocalEulerAnglesHint: {x: 45, y: 180, z: 0}
372-
--- !u!1 &123981370
373-
GameObject:
374-
m_ObjectHideFlags: 0
375-
m_CorrespondingSourceObject: {fileID: 0}
376-
m_PrefabInstance: {fileID: 0}
377-
m_PrefabAsset: {fileID: 0}
378-
serializedVersion: 6
379-
m_Component:
380-
- component: {fileID: 123981371}
381-
- component: {fileID: 123981373}
382-
- component: {fileID: 123981372}
383-
m_Layer: 5
384-
m_Name: Text
385-
m_TagString: Untagged
386-
m_Icon: {fileID: 0}
387-
m_NavMeshLayer: 0
388-
m_StaticEditorFlags: 0
389-
m_IsActive: 1
390-
--- !u!224 &123981371
391-
RectTransform:
392-
m_ObjectHideFlags: 0
393-
m_CorrespondingSourceObject: {fileID: 0}
394-
m_PrefabInstance: {fileID: 0}
395-
m_PrefabAsset: {fileID: 0}
396-
m_GameObject: {fileID: 123981370}
397-
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
398-
m_LocalPosition: {x: 0, y: 0, z: 0}
399-
m_LocalScale: {x: 1, y: 1, z: 1}
400-
m_Children: []
401-
m_Father: {fileID: 276447173}
402-
m_RootOrder: 0
403-
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
404-
m_AnchorMin: {x: 0, y: 0}
405-
m_AnchorMax: {x: 1, y: 1}
406-
m_AnchoredPosition: {x: 0, y: 0}
407-
m_SizeDelta: {x: 0, y: 0}
408-
m_Pivot: {x: 0.5, y: 0.5}
409-
--- !u!114 &123981372
410-
MonoBehaviour:
411-
m_ObjectHideFlags: 0
412-
m_CorrespondingSourceObject: {fileID: 0}
413-
m_PrefabInstance: {fileID: 0}
414-
m_PrefabAsset: {fileID: 0}
415-
m_GameObject: {fileID: 123981370}
416-
m_Enabled: 1
417-
m_EditorHideFlags: 0
418-
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
419-
m_Name:
420-
m_EditorClassIdentifier:
421-
m_Material: {fileID: 0}
422-
m_Color: {r: 1, g: 1, b: 1, a: 1}
423-
m_RaycastTarget: 1
424-
m_Maskable: 1
425-
m_OnCullStateChanged:
426-
m_PersistentCalls:
427-
m_Calls: []
428-
m_FontData:
429-
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
430-
m_FontSize: 12
431-
m_FontStyle: 0
432-
m_BestFit: 0
433-
m_MinSize: 1
434-
m_MaxSize: 40
435-
m_Alignment: 4
436-
m_AlignByGeometry: 0
437-
m_RichText: 1
438-
m_HorizontalOverflow: 0
439-
m_VerticalOverflow: 0
440-
m_LineSpacing: 1
441-
m_Text: Cancel
442-
--- !u!222 &123981373
443-
CanvasRenderer:
444-
m_ObjectHideFlags: 0
445-
m_CorrespondingSourceObject: {fileID: 0}
446-
m_PrefabInstance: {fileID: 0}
447-
m_PrefabAsset: {fileID: 0}
448-
m_GameObject: {fileID: 123981370}
449-
m_CullTransparentMesh: 0
450372
--- !u!1 &177548782
451373
GameObject:
452374
m_ObjectHideFlags: 0
@@ -603,125 +525,6 @@ CanvasRenderer:
603525
m_PrefabAsset: {fileID: 0}
604526
m_GameObject: {fileID: 232720476}
605527
m_CullTransparentMesh: 0
606-
--- !u!1 &276447172
607-
GameObject:
608-
m_ObjectHideFlags: 0
609-
m_CorrespondingSourceObject: {fileID: 0}
610-
m_PrefabInstance: {fileID: 0}
611-
m_PrefabAsset: {fileID: 0}
612-
serializedVersion: 6
613-
m_Component:
614-
- component: {fileID: 276447173}
615-
- component: {fileID: 276447176}
616-
- component: {fileID: 276447175}
617-
- component: {fileID: 276447174}
618-
m_Layer: 5
619-
m_Name: ButtonCancel
620-
m_TagString: Untagged
621-
m_Icon: {fileID: 0}
622-
m_NavMeshLayer: 0
623-
m_StaticEditorFlags: 0
624-
m_IsActive: 0
625-
--- !u!224 &276447173
626-
RectTransform:
627-
m_ObjectHideFlags: 0
628-
m_CorrespondingSourceObject: {fileID: 0}
629-
m_PrefabInstance: {fileID: 0}
630-
m_PrefabAsset: {fileID: 0}
631-
m_GameObject: {fileID: 276447172}
632-
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
633-
m_LocalPosition: {x: 0, y: 0, z: 0}
634-
m_LocalScale: {x: 1, y: 1, z: 1}
635-
m_Children:
636-
- {fileID: 123981371}
637-
m_Father: {fileID: 1926990971}
638-
m_RootOrder: 3
639-
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
640-
m_AnchorMin: {x: 0, y: 0}
641-
m_AnchorMax: {x: 1, y: 0}
642-
m_AnchoredPosition: {x: 4, y: 16}
643-
m_SizeDelta: {x: -8, y: 20}
644-
m_Pivot: {x: 0, y: 0.5}
645-
--- !u!114 &276447174
646-
MonoBehaviour:
647-
m_ObjectHideFlags: 0
648-
m_CorrespondingSourceObject: {fileID: 0}
649-
m_PrefabInstance: {fileID: 0}
650-
m_PrefabAsset: {fileID: 0}
651-
m_GameObject: {fileID: 276447172}
652-
m_Enabled: 1
653-
m_EditorHideFlags: 0
654-
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
655-
m_Name:
656-
m_EditorClassIdentifier:
657-
m_Navigation:
658-
m_Mode: 3
659-
m_SelectOnUp: {fileID: 0}
660-
m_SelectOnDown: {fileID: 0}
661-
m_SelectOnLeft: {fileID: 0}
662-
m_SelectOnRight: {fileID: 0}
663-
m_Transition: 1
664-
m_Colors:
665-
m_NormalColor: {r: 0.32156864, g: 0.32156864, b: 0.32156864, a: 1}
666-
m_HighlightedColor: {r: 0.3529412, g: 0.3529412, b: 0.3529412, a: 1}
667-
m_PressedColor: {r: 0.3882353, g: 0.3882353, b: 0.3882353, a: 1}
668-
m_SelectedColor: {r: 0.3529412, g: 0.3529412, b: 0.3529412, a: 1}
669-
m_DisabledColor: {r: 0.3882353, g: 0.3882353, b: 0.3882353, a: 0.2509804}
670-
m_ColorMultiplier: 1
671-
m_FadeDuration: 0.1
672-
m_SpriteState:
673-
m_HighlightedSprite: {fileID: 0}
674-
m_PressedSprite: {fileID: 0}
675-
m_SelectedSprite: {fileID: 0}
676-
m_DisabledSprite: {fileID: 0}
677-
m_AnimationTriggers:
678-
m_NormalTrigger: Normal
679-
m_HighlightedTrigger: Highlighted
680-
m_PressedTrigger: Pressed
681-
m_SelectedTrigger: Highlighted
682-
m_DisabledTrigger: Disabled
683-
m_Interactable: 1
684-
m_TargetGraphic: {fileID: 276447175}
685-
m_OnClick:
686-
m_PersistentCalls:
687-
m_Calls: []
688-
--- !u!114 &276447175
689-
MonoBehaviour:
690-
m_ObjectHideFlags: 0
691-
m_CorrespondingSourceObject: {fileID: 0}
692-
m_PrefabInstance: {fileID: 0}
693-
m_PrefabAsset: {fileID: 0}
694-
m_GameObject: {fileID: 276447172}
695-
m_Enabled: 1
696-
m_EditorHideFlags: 0
697-
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
698-
m_Name:
699-
m_EditorClassIdentifier:
700-
m_Material: {fileID: 0}
701-
m_Color: {r: 1, g: 1, b: 1, a: 1}
702-
m_RaycastTarget: 1
703-
m_Maskable: 1
704-
m_OnCullStateChanged:
705-
m_PersistentCalls:
706-
m_Calls: []
707-
m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
708-
m_Type: 1
709-
m_PreserveAspect: 0
710-
m_FillCenter: 1
711-
m_FillMethod: 4
712-
m_FillAmount: 1
713-
m_FillClockwise: 1
714-
m_FillOrigin: 0
715-
m_UseSpriteMesh: 0
716-
m_PixelsPerUnitMultiplier: 1
717-
--- !u!222 &276447176
718-
CanvasRenderer:
719-
m_ObjectHideFlags: 0
720-
m_CorrespondingSourceObject: {fileID: 0}
721-
m_PrefabInstance: {fileID: 0}
722-
m_PrefabAsset: {fileID: 0}
723-
m_GameObject: {fileID: 276447172}
724-
m_CullTransparentMesh: 0
725528
--- !u!1 &354490534
726529
GameObject:
727530
m_ObjectHideFlags: 0
@@ -2709,13 +2512,14 @@ MonoBehaviour:
27092512
communicationKey: NodeListServerDefaultKey
27102513
refreshOnStart: 1
27112514
refreshInterval: 10
2712-
popup: {fileID: 0}
2713-
mainStatusText: {fileID: 0}
2714-
popupStatusText: {fileID: 0}
2715-
ListElementPrefab: {fileID: 0}
2716-
ListElementContainer: {fileID: 0}
2717-
refreshButton: {fileID: 0}
2718-
supportButton: {fileID: 0}
2515+
popup: {fileID: 1926990970}
2516+
mainStatusText: {fileID: 712827152}
2517+
popupStatusText: {fileID: 1081204139}
2518+
ListElementPrefab: {fileID: 1259177336467004, guid: c6ca829569179c749a037f1b7d8631a0,
2519+
type: 3}
2520+
ListElementContainer: {fileID: 583153858}
2521+
refreshButton: {fileID: 1004751479}
2522+
supportButton: {fileID: 993261495}
27192523
--- !u!4 &1731173845
27202524
Transform:
27212525
m_ObjectHideFlags: 0
@@ -2883,7 +2687,6 @@ RectTransform:
28832687
- {fileID: 747705679}
28842688
- {fileID: 13922437}
28852689
- {fileID: 1081204138}
2886-
- {fileID: 276447173}
28872690
m_Father: {fileID: 1206549608}
28882691
m_RootOrder: 2
28892692
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Packages/manifest.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
"com.unity.2d.sprite": "1.0.0",
44
"com.unity.2d.tilemap": "1.0.0",
55
"com.unity.ide.rider": "1.1.4",
6-
"com.unity.ide.vscode": "1.2.2",
6+
"com.unity.ide.vscode": "1.2.3",
77
"com.unity.multiplayer-hlapi": "1.0.6",
8-
"com.unity.test-framework": "1.1.18",
8+
"com.unity.test-framework": "1.1.19",
99
"com.unity.timeline": "1.2.6",
1010
"com.unity.ugui": "1.0.0",
11-
"com.unity.xr.legacyinputhelpers": "2.1.4",
11+
"com.unity.xr.legacyinputhelpers": "2.1.6",
1212
"com.unity.modules.ai": "1.0.0",
1313
"com.unity.modules.androidjni": "1.0.0",
1414
"com.unity.modules.animation": "1.0.0",

Packages/packages-lock.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"dependencies": {}
1414
},
1515
"com.unity.ext.nunit": {
16-
"version": "1.0.0",
16+
"version": "1.0.5",
1717
"depth": 1,
1818
"source": "registry",
1919
"dependencies": {},
@@ -29,7 +29,7 @@
2929
"url": "https://packages.unity.com"
3030
},
3131
"com.unity.ide.vscode": {
32-
"version": "1.2.2",
32+
"version": "1.2.3",
3333
"depth": 0,
3434
"source": "registry",
3535
"dependencies": {},
@@ -45,11 +45,11 @@
4545
"url": "https://packages.unity.com"
4646
},
4747
"com.unity.test-framework": {
48-
"version": "1.1.18",
48+
"version": "1.1.19",
4949
"depth": 0,
5050
"source": "registry",
5151
"dependencies": {
52-
"com.unity.ext.nunit": "1.0.0",
52+
"com.unity.ext.nunit": "1.0.5",
5353
"com.unity.modules.imgui": "1.0.0",
5454
"com.unity.modules.jsonserialize": "1.0.0"
5555
},
@@ -72,7 +72,7 @@
7272
}
7373
},
7474
"com.unity.xr.legacyinputhelpers": {
75-
"version": "2.1.4",
75+
"version": "2.1.6",
7676
"depth": 0,
7777
"source": "registry",
7878
"dependencies": {},

ProjectSettings/PackageManagerSettings.asset

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ MonoBehaviour:
99
m_GameObject: {fileID: 0}
1010
m_Enabled: 1
1111
m_EditorHideFlags: 0
12-
m_Script: {fileID: 0}
12+
m_Script: {fileID: 13960, guid: 0000000000000000e000000000000000, type: 0}
1313
m_Name:
14-
m_EditorClassIdentifier: UnityEditor:UnityEditor.PackageManager.UI:PackageManagerProjectSettings
14+
m_EditorClassIdentifier:
1515
m_ScopedRegistriesSettingsExpanded: 1
1616
oneTimeWarningShown: 0
1717
m_Registries:

ProjectSettings/ProjectVersion.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
m_EditorVersion: 2019.4.13f1
2-
m_EditorVersionWithRevision: 2019.4.13f1 (518737b1de84)
1+
m_EditorVersion: 2019.4.17f1
2+
m_EditorVersionWithRevision: 2019.4.17f1 (667c8606c536)

0 commit comments

Comments
 (0)