Skip to content

Commit 896f238

Browse files
committed
Minor changes to addressables storage, upgrading to 2020.3.10f1
1 parent e80dc68 commit 896f238

File tree

10 files changed

+50
-40
lines changed

10 files changed

+50
-40
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,3 +65,5 @@ sysinfo.txt
6565
crashlytics-build.properties
6666

6767
Assets/AddressableAssets/*
68+
Assets/AddressableAssets.zip
69+
Assets/AddressableAssets.zip.meta

Assets/AddressableAssets/AllenCCF/1.obj.meta

Lines changed: 5 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/AddressableAssets/AllenCCF/8.obj.meta

Lines changed: 5 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/AddressableAssetsData/AddressableAssetSettings.asset

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ MonoBehaviour:
3939
m_Id: https://data.virtualbrainlab.org/AddressablesStorage/[BuildTarget]
4040
m_ContentStateBuildPath:
4141
m_BuildAddressablesWithPlayerBuild: 2
42-
m_overridePlayerVersion: 0.2.0
42+
m_overridePlayerVersion: 0.2.1
4343
m_GroupAssets:
4444
- {fileID: 11400000, guid: 00da88e96c23d4436b4556538b52b7ed, type: 2}
4545
- {fileID: 11400000, guid: fb9255cf0519440f8be816d4b44d3d1f, type: 2}
Binary file not shown.
Binary file not shown.

Packages/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"dependencies": {
33
"com.unity.addressables": "1.19.19",
4-
"com.unity.collab-proxy": "1.17.1",
4+
"com.unity.collab-proxy": "1.17.2",
55
"com.unity.ide.rider": "3.0.15",
66
"com.unity.ide.visualstudio": "2.0.16",
77
"com.unity.ide.vscode": "1.2.5",

Packages/packages-lock.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"url": "https://packages.unity.com"
2525
},
2626
"com.unity.collab-proxy": {
27-
"version": "1.17.1",
27+
"version": "1.17.2",
2828
"depth": 0,
2929
"source": "registry",
3030
"dependencies": {

ProjectSettings/ProjectVersion.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
m_EditorVersion: 2021.3.8f1
2-
m_EditorVersionWithRevision: 2021.3.8f1 (b30333d56e81)
1+
m_EditorVersion: 2021.3.10f1
2+
m_EditorVersionWithRevision: 2021.3.10f1 (1c7d0df0160b)

UserSettings/Layouts/default-2021.dwlt

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ MonoBehaviour:
1919
width: 2544
2020
height: 1341
2121
m_ShowMode: 4
22-
m_Title: Addressables Groups
22+
m_Title: Project
2323
m_RootView: {fileID: 6}
2424
m_MinSize: {x: 875, y: 300}
2525
m_MaxSize: {x: 10000, y: 10000}
@@ -48,7 +48,7 @@ MonoBehaviour:
4848
m_MinSize: {x: 300, y: 200}
4949
m_MaxSize: {x: 24288, y: 16192}
5050
vertical: 0
51-
controlID: 93
51+
controlID: 77
5252
--- !u!114 &3
5353
MonoBehaviour:
5454
m_ObjectHideFlags: 52
@@ -111,7 +111,7 @@ MonoBehaviour:
111111
m_Enabled: 1
112112
m_EditorHideFlags: 1
113113
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
114-
m_Name: AddressableAssetsWindow
114+
m_Name: ProjectBrowser
115115
m_EditorClassIdentifier:
116116
m_Children: []
117117
m_Position:
@@ -120,15 +120,15 @@ MonoBehaviour:
120120
y: 781
121121
width: 2029
122122
height: 510
123-
m_MinSize: {x: 431, y: 271}
124-
m_MaxSize: {x: 4001, y: 4021}
125-
m_ActualView: {fileID: 12}
123+
m_MinSize: {x: 231, y: 271}
124+
m_MaxSize: {x: 10001, y: 10021}
125+
m_ActualView: {fileID: 14}
126126
m_Panes:
127127
- {fileID: 14}
128128
- {fileID: 19}
129129
- {fileID: 12}
130-
m_Selected: 2
131-
m_LastSelected: 1
130+
m_Selected: 0
131+
m_LastSelected: 2
132132
--- !u!114 &6
133133
MonoBehaviour:
134134
m_ObjectHideFlags: 52
@@ -224,7 +224,7 @@ MonoBehaviour:
224224
m_MinSize: {x: 200, y: 200}
225225
m_MaxSize: {x: 16192, y: 16192}
226226
vertical: 1
227-
controlID: 38
227+
controlID: 85
228228
--- !u!114 &10
229229
MonoBehaviour:
230230
m_ObjectHideFlags: 52
@@ -249,7 +249,7 @@ MonoBehaviour:
249249
m_MinSize: {x: 200, y: 100}
250250
m_MaxSize: {x: 16192, y: 8096}
251251
vertical: 0
252-
controlID: 39
252+
controlID: 86
253253
--- !u!114 &11
254254
MonoBehaviour:
255255
m_ObjectHideFlags: 52
@@ -309,9 +309,9 @@ MonoBehaviour:
309309
m_GroupEditor:
310310
m_TreeState:
311311
scrollPos: {x: 0, y: 0}
312-
m_SelectedIDs:
313-
m_LastClickedID: 0
314-
m_ExpandedIDs:
312+
m_SelectedIDs: 334b03f7
313+
m_LastClickedID: -150779085
314+
m_ExpandedIDs: 5d80ff86
315315
m_RenameOverlay:
316316
m_UserAcceptedRename: 0
317317
m_Name:
@@ -327,7 +327,7 @@ MonoBehaviour:
327327
m_IsRenaming: 0
328328
m_OriginalEventType: 11
329329
m_IsRenamingFilename: 0
330-
m_ClientGUIView: {fileID: 0}
330+
m_ClientGUIView: {fileID: 5}
331331
m_SearchString:
332332
m_Mchs:
333333
m_Columns:
@@ -443,10 +443,10 @@ MonoBehaviour:
443443
m_Tooltip:
444444
m_Pos:
445445
serializedVersion: 2
446-
x: 4
447-
y: 866
448-
width: 2031
449-
height: 491
446+
x: 8
447+
y: 862
448+
width: 2028
449+
height: 489
450450
m_ViewDataDictionary: {fileID: 0}
451451
m_OverlayCanvas:
452452
m_LastAppliedPresetName: Default
@@ -464,22 +464,22 @@ MonoBehaviour:
464464
m_SkipHidden: 0
465465
m_SearchArea: 1
466466
m_Folders:
467-
- Assets/AddressableAssetsData
467+
- Assets/AddressableAssets/AllenCCF
468468
m_Globs: []
469469
m_OriginalText:
470470
m_ViewMode: 1
471471
m_StartGridSize: 64
472472
m_LastFolders:
473-
- Assets/AddressableAssetsData
473+
- Assets/AddressableAssets/AllenCCF
474474
m_LastFoldersGridSize: -1
475475
m_LastProjectPath: C:\proj\VBL\AddressablesStorage
476476
m_LockTracker:
477477
m_IsLocked: 0
478478
m_FolderTreeState:
479479
scrollPos: {x: 0, y: 0}
480-
m_SelectedIDs: 9a4e0100
481-
m_LastClickedID: 85658
482-
m_ExpandedIDs: 00000000066f0000086f00000a6f00000c6f00000e6f0000106f0000126f0000146f0000166f0000186f00001a6f00001c6f0000
480+
m_SelectedIDs: dc7d0000
481+
m_LastClickedID: 32220
482+
m_ExpandedIDs: 00000000046f0000066f0000086f00000a6f00000c6f00000e6f0000106f0000126f0000146f0000166f0000186f00001a6f0000
483483
m_RenameOverlay:
484484
m_UserAcceptedRename: 0
485485
m_Name:
@@ -507,7 +507,7 @@ MonoBehaviour:
507507
scrollPos: {x: 0, y: 0}
508508
m_SelectedIDs:
509509
m_LastClickedID: 0
510-
m_ExpandedIDs: 00000000066f0000086f00000a6f00000c6f00000e6f0000106f0000126f0000146f0000166f0000186f00001a6f00001c6f0000
510+
m_ExpandedIDs: 00000000046f0000066f0000086f00000a6f00000c6f00000e6f0000106f0000126f0000146f0000166f0000186f00001a6f0000
511511
m_RenameOverlay:
512512
m_UserAcceptedRename: 0
513513
m_Name:
@@ -534,7 +534,7 @@ MonoBehaviour:
534534
m_ListAreaState:
535535
m_SelectedInstanceIDs:
536536
m_LastClickedInstanceID: 0
537-
m_HadKeyboardFocusLastEvent: 0
537+
m_HadKeyboardFocusLastEvent: 1
538538
m_ExpandedInstanceIDs: c6230000
539539
m_RenameOverlay:
540540
m_UserAcceptedRename: 0
@@ -594,7 +594,7 @@ MonoBehaviour:
594594
m_ObjectsLockedBeforeSerialization: []
595595
m_InstanceIDsLockedBeforeSerialization:
596596
m_PreviewResizer:
597-
m_CachedPref: 160
597+
m_CachedPref: 608
598598
m_ControlHash: -371814159
599599
m_PrefName: Preview_InspectorPreview
600600
m_LastInspectedObjectInstanceID: -1
@@ -635,7 +635,7 @@ MonoBehaviour:
635635
m_SceneHierarchy:
636636
m_TreeViewState:
637637
scrollPos: {x: 0, y: 0}
638-
m_SelectedIDs:
638+
m_SelectedIDs: 346f0000
639639
m_LastClickedID: 0
640640
m_ExpandedIDs: 32fbffff
641641
m_RenameOverlay:
@@ -886,9 +886,9 @@ MonoBehaviour:
886886
m_PlayAudio: 0
887887
m_AudioPlay: 0
888888
m_Position:
889-
m_Target: {x: 0, y: 0, z: 0}
889+
m_Target: {x: -638.19336, y: 19169.438, z: 7392.4194}
890890
speed: 2
891-
m_Value: {x: 0, y: 0, z: 0}
891+
m_Value: {x: -638.19336, y: 19169.438, z: 7392.4194}
892892
m_RenderMode: 0
893893
m_CameraMode:
894894
drawMode: 0
@@ -935,13 +935,13 @@ MonoBehaviour:
935935
m_GridAxis: 1
936936
m_gridOpacity: 0.5
937937
m_Rotation:
938-
m_Target: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226}
938+
m_Target: {x: 0.5700521, y: 0.40373313, z: 0.60678625, w: -0.37930304}
939939
speed: 2
940-
m_Value: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226}
940+
m_Value: {x: 0.5718641, y: 0.40258938, z: 0.60506725, w: -0.3805087}
941941
m_Size:
942-
m_Target: 10
942+
m_Target: 20280.92
943943
speed: 2
944-
m_Value: 10
944+
m_Value: 19407.578
945945
m_Ortho:
946946
m_Target: 0
947947
speed: 2

0 commit comments

Comments
 (0)