Skip to content

Commit d1b5b93

Browse files
authored
Feat: camera reel gallery section (#5525)
- Verify CameraReel section in ExploreMenu is not presented on .org without feature flag (with wallet). - verify CameraReel section in ExploreMenu is not presented in guest mode
1 parent a45472c commit d1b5b93

File tree

175 files changed

+15556
-355
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

175 files changed

+15556
-355
lines changed
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
2+
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=assets_005Cfeatures/@EntryIndexedValue">True</s:Boolean>
3+
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=assets_005Cfeatures_005Ccamerareel_005Cgallery_005Cscripts/@EntryIndexedValue">True</s:Boolean>
4+
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=assets_005Cfeatures_005Ccamerareel_005Cscreenshotviewer_005Cscripts/@EntryIndexedValue">True</s:Boolean>
5+
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=assets_005Cfeatures_005Ccamerareel_005C_005Fcommon/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

unity-renderer/Assets/AddressableAssetsData/AddressableAssetSettings.asset

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ MonoBehaviour:
5757
- {fileID: 11400000, guid: 42b8415fe384b52409e4383ba44ad2fd, type: 2}
5858
- {fileID: 11400000, guid: f4354ea28d1af7a4aabaac70fcb83933, type: 2}
5959
- {fileID: 11400000, guid: d004c5b62f4364cddbf08486300adc75, type: 2}
60+
- {fileID: 11400000, guid: ca9e28a3bdf76514a971ee4dab74607c, type: 2}
6061
m_BuildSettings:
6162
m_CompileScriptsInVirtualMode: 0
6263
m_CleanupStreamingAssetsAfterBuilds: 1
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &11400000
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3}
13+
m_Name: CameraReel
14+
m_EditorClassIdentifier:
15+
m_GroupName: CameraReel
16+
m_Data:
17+
m_SerializedData: []
18+
m_GUID: 0c25c397835febc4da1b4295af52dd49
19+
m_SerializeEntries:
20+
- m_GUID: 02c9c3e59ec665748b30c0ca02b0f871
21+
m_Address: CameraReelSectionView
22+
m_ReadOnly: 0
23+
m_SerializedLabels: []
24+
- m_GUID: 08892dc27f1f1f549a7a2e521aaad444
25+
m_Address: ScreenshotView
26+
m_ReadOnly: 0
27+
m_SerializedLabels: []
28+
m_ReadOnly: 0
29+
m_Settings: {fileID: 11400000, guid: 436e0d4fdc1cdfa4aaef13be2e8bcef8, type: 2}
30+
m_SchemaSet:
31+
m_Schemas:
32+
- {fileID: 11400000, guid: 3dcf6c20b9a67014fb75d2bca9d16747, type: 2}
33+
- {fileID: 11400000, guid: 0e077ce760593b24fa94d19741089391, type: 2}

unity-renderer/Assets/AddressableAssetsData/AssetGroups/CameraReel.asset.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

unity-renderer/Assets/AddressableAssetsData/AssetGroups/Duplicate Asset Isolation.asset

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -493,10 +493,6 @@ MonoBehaviour:
493493
m_Address: ContainerShadowRadiusSix
494494
m_ReadOnly: 0
495495
m_SerializedLabels: []
496-
- m_GUID: 4e9a4135cdf6d42afb73b12a76bf53f2
497-
m_Address: JumpInSquare
498-
m_ReadOnly: 0
499-
m_SerializedLabels: []
500496
- m_GUID: 47acd065431664e80a9a8cdedf8acb31
501497
m_Address: BubblePeak
502498
m_ReadOnly: 0
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &11400000
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 11500000, guid: e5d17a21594effb4e9591490b009e7aa, type: 3}
13+
m_Name: CameraReel_BundledAssetGroupSchema
14+
m_EditorClassIdentifier:
15+
m_Group: {fileID: 11400000, guid: ca9e28a3bdf76514a971ee4dab74607c, type: 2}
16+
m_InternalBundleIdMode: 1
17+
m_Compression: 1
18+
m_IncludeAddressInCatalog: 1
19+
m_IncludeGUIDInCatalog: 1
20+
m_IncludeLabelsInCatalog: 1
21+
m_InternalIdNamingMode: 0
22+
m_CacheClearBehavior: 0
23+
m_IncludeInBuild: 1
24+
m_BundledAssetProviderType:
25+
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
26+
m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider
27+
m_ForceUniqueProvider: 0
28+
m_UseAssetBundleCache: 1
29+
m_UseAssetBundleCrc: 1
30+
m_UseAssetBundleCrcForCachedBundles: 1
31+
m_UseUWRForLocalBundles: 0
32+
m_Timeout: 0
33+
m_ChunkedTransfer: 0
34+
m_RedirectLimit: -1
35+
m_RetryCount: 0
36+
m_BuildPath:
37+
m_Id: 0f0c8053dfdfc8948bf4fe3581dcae4b
38+
m_LoadPath:
39+
m_Id: 1d7a2f926c51ab64086dffd3ec97813b
40+
m_BundleMode: 0
41+
m_AssetBundleProviderType:
42+
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
43+
m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider
44+
m_BundleNaming: 0
45+
m_AssetLoadMode: 0

unity-renderer/Assets/AddressableAssetsData/AssetGroups/Schemas/CameraReel_BundledAssetGroupSchema.asset.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &11400000
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 11500000, guid: 5834b5087d578d24c926ce20cd31e6d6, type: 3}
13+
m_Name: CameraReel_ContentUpdateGroupSchema
14+
m_EditorClassIdentifier:
15+
m_Group: {fileID: 11400000, guid: ca9e28a3bdf76514a971ee4dab74607c, type: 2}
16+
m_StaticContent: 0

unity-renderer/Assets/AddressableAssetsData/AssetGroups/Schemas/CameraReel_ContentUpdateGroupSchema.asset.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)