Skip to content

Commit

Permalink
feat: map discoverability (#2734)
Browse files Browse the repository at this point in the history
  • Loading branch information
davidejensen authored Jan 10, 2025
1 parent 64a55e1 commit 9d3bc4b
Show file tree
Hide file tree
Showing 514 changed files with 70,659 additions and 6,931 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ MonoBehaviour:
- {fileID: 11400000, guid: b0cf54056ee616e4f95ca4f6412797f4, type: 2}
- {fileID: 11400000, guid: d69f0851a5898cf4ba59318db8b8e5a7, type: 2}
- {fileID: 11400000, guid: a903880c604249b459f12f3694fff4ec, type: 2}
- {fileID: 11400000, guid: 75e39198ff3dc48d69796cc18d70263c, type: 2}
- {fileID: 11400000, guid: 2a527a8829af84b0ead18f070ac084f7, type: 2}
- {fileID: 11400000, guid: f79a626e4753e19409657b7be5170ae9, type: 2}
- {fileID: 11400000, guid: 7e1132d3d598145dfa151599ee05dd96, type: 2}
Expand Down
45 changes: 45 additions & 0 deletions Explorer/Assets/AddressableAssetsData/AssetGroups/Essentials.asset
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,11 @@ MonoBehaviour:
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 1b149c5240fcd49309285605ce2e8067
m_Address: CategoryMarkerObject
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 1d026bc5d9fd448798b32a455c0f3978
m_Address: Nametag
m_ReadOnly: 0
Expand Down Expand Up @@ -87,6 +92,11 @@ MonoBehaviour:
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 2eac55a1aa3034858a71ab0e06baf5de
m_Address: ClusterMarkerObject
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 35aa85d68d15435418848a03a2db81ec
m_Address: Assets/TextMesh Pro/Fonts & Materials/Inter-Regular SDF.asset
m_ReadOnly: 0
Expand All @@ -102,6 +112,11 @@ MonoBehaviour:
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 3d761805ce62940dbafaa7bb64be222c
m_Address: ClusterMarkerObjectForSearchResults
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 3efe8a48fc3905f47a0648abd6859394
m_Address: MapCameraObject
m_ReadOnly: 0
Expand Down Expand Up @@ -147,6 +162,11 @@ MonoBehaviour:
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 58f16fd4b3584431d87e11f043b40408
m_Address: Assets/DCL/Navmap/Assets/EventScheduleElement.prefab
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 5c36aa92efab46341b9b02fd6a38a4e7
m_Address: StylizedSkyboxController
m_ReadOnly: 0
Expand All @@ -167,11 +187,21 @@ MonoBehaviour:
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 624d527621f514c5999533539668c4d3
m_Address: Assets/DCL/Navmap/Assets/EventEntry.prefab
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 62f68ba25f6c905428b36a081b072566
m_Address: EmoteAudioSource
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 65104014709704f75838386ed5173c45
m_Address: Assets/DCL/MapRenderer/Addressables/SearchResultMarkerObject.prefab
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 654e496ed12f12e4f80243ab9f1d97c7
m_Address: Character Camera
m_ReadOnly: 0
Expand Down Expand Up @@ -202,6 +232,11 @@ MonoBehaviour:
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 73e736ffedc4d4e1c9acc6461c55248b
m_Address: MapLayerCategoryIconMapping
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 7491e2fb7fd484d2b8aed984dfc7c6ab
m_Address: NftRarityColors
m_ReadOnly: 0
Expand Down Expand Up @@ -302,6 +337,11 @@ MonoBehaviour:
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: bda7566751d4243fb842e1a272cb9f83
m_Address: MapCategoryIconMapping
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: beceeda1295384ef4921493b30d5cf45
m_Address: EditorImg
m_ReadOnly: 0
Expand Down Expand Up @@ -362,6 +402,11 @@ MonoBehaviour:
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: fdd9de2cf51974e4f9be30ab72d8eabd
m_Address: MapLayerIconMapping
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
m_ReadOnly: 0
m_Settings: {fileID: 11400000, guid: fc8a9d2b539788c47a5b305639fa8b34, type: 2}
m_SchemaSet:
Expand Down
4 changes: 2 additions & 2 deletions Explorer/Assets/DCL/Audio/AudioConfigs/Map_Hover_On_Map.asset
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ MonoBehaviour:
m_Name: Map_Hover_On_Map
m_EditorClassIdentifier:
audioClips:
- {fileID: 0}
relativeVolume: 0.108
- {fileID: 8300000, guid: 1ad8cf9c6af76414eb0117dd9833ac0b, type: 3}
relativeVolume: 1
audioCategory: 0
pitchVariation: 0
clipSelectionMode: 0
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,15 @@ public enum DecentralandUrl
PrivacyPolicy,
TermsOfUse,

ApiChunks,

ApiPlaces,
POI,
Map,
ContentModerationReport,

ApiEvents,

ApiAuth,
AuthSignature,

Expand All @@ -26,6 +31,7 @@ public enum DecentralandUrl
OpenSea,

PeerAbout,
RemotePeers,

DAO,

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,16 +80,18 @@ private static string RawUrl(DecentralandUrl decentralandUrl) =>
DecentralandUrl.ApiAuth => $"https://auth-api.decentraland.{ENV}",
DecentralandUrl.AuthSignature => $"https://decentraland.{ENV}/auth/requests",
DecentralandUrl.POI => $"https://dcl-lists.decentraland.{ENV}/pois",
DecentralandUrl.Map => $"https://places.decentraland.{ENV}/api/map",
DecentralandUrl.ContentModerationReport => $"https://places.decentraland.{ENV}/api/report",
DecentralandUrl.GateKeeperSceneAdapter =>
$"https://comms-gatekeeper.decentraland.{ENV}/get-scene-adapter",
DecentralandUrl.GateKeeperSceneAdapter => $"https://comms-gatekeeper.decentraland.{ENV}/get-scene-adapter",
DecentralandUrl.ApiEvents => $"https://events.decentraland.{ENV}/api/events",
DecentralandUrl.OpenSea => $"https://opensea.decentraland.{ENV}",
DecentralandUrl.Host => $"https://decentraland.{ENV}",
DecentralandUrl.ApiChunks => $"https://api.decentraland.{ENV}/v1/map.png",
DecentralandUrl.PeerAbout => $"https://peer.decentraland.{ENV}/about",
DecentralandUrl.RemotePeers => $"https://archipelago-ea-stats.decentraland.{ENV}/comms/peers",
DecentralandUrl.DAO => $"https://decentraland.{ENV}/dao/",
DecentralandUrl.Notification => $"https://notifications.decentraland.{ENV}/notifications",
DecentralandUrl.NotificationRead =>
$"https://notifications.decentraland.{ENV}/notifications/read",
DecentralandUrl.NotificationRead => $"https://notifications.decentraland.{ENV}/notifications/read",
DecentralandUrl.FeatureFlags => $"https://feature-flags.decentraland.{ENV}",
DecentralandUrl.Help => $"https://decentraland.{ENV}/help/",
DecentralandUrl.Market => $"https://market.decentraland.{ENV}",
Expand All @@ -99,7 +101,7 @@ private static string RawUrl(DecentralandUrl decentralandUrl) =>
DecentralandUrl.GatekeeperStatus => $"https://comms-gatekeeper.decentraland.{ENV}/status",
DecentralandUrl.Genesis => GENESIS_URL,
DecentralandUrl.Badges => $"https://badges.decentraland.{ENV}",
DecentralandUrl.CameraReelUsers => $"https://camera-reel-service.decentraland.{ENV}/api/users",
DecentralandUrl.CameraReelUsers => $"https://camera-reel-service.decentraland.{ENV}/api/users",
DecentralandUrl.CameraReelImages => $"https://camera-reel-service.decentraland.{ENV}/api/images",
DecentralandUrl.CameraReelPlaces => $"https://camera-reel-service.decentraland.{ENV}/api/places",
DecentralandUrl.CameraReelLink => $"https://reels.decentraland.{ENV}",
Expand Down
3 changes: 2 additions & 1 deletion Explorer/Assets/DCL/Browser/UnityAppWebBrowser.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using DCL.Multiplayer.Connections.DecentralandUrls;
using System;
using UnityEngine;

namespace DCL.Browser
Expand All @@ -14,7 +15,7 @@ public UnityAppWebBrowser(IDecentralandUrlsSource decentralandUrlsSource)

public void OpenUrl(string url)
{
Application.OpenURL(url);
Application.OpenURL(Uri.EscapeUriString(url));
}

public void OpenUrl(DecentralandUrl url)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ public class URLBuilder : IURLBuilder
{
private readonly StringBuilder stringBuilder = new ();

private byte parametersCount;
private ushort parametersCount;

public URLDomain? URLDomain { get; private set; }
public URLPath? URLPath { get; private set; }
Expand Down
3 changes: 3 additions & 0 deletions Explorer/Assets/DCL/EventsApi.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 22 additions & 0 deletions Explorer/Assets/DCL/EventsApi/DCL.EventsApi.asmdef
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"name": "DCL.EventsApi",
"rootNamespace": "",
"references": [
"GUID:f51ebe6a0ceec4240a699833d6309b23",
"GUID:4a12c0b1b77ec6b418a8d7bd5c925be3",
"GUID:9b4463c7170cb485aaf17878a8b7281e",
"GUID:fa7b3fdbb04d67549916da7bd2af58ab",
"GUID:8322ea9340a544c59ddc56d4793eac74",
"GUID:3640f3c0b42946b0b8794a1ed8e06ca5",
"GUID:91cf8206af184dac8e30eb46747e9939"
],
"includePlatforms": [],
"excludePlatforms": [],
"allowUnsafeCode": false,
"overrideReferences": false,
"precompiledReferences": [],
"autoReferenced": true,
"defineConstraints": [],
"versionDefines": [],
"noEngineReferences": false
}
3 changes: 3 additions & 0 deletions Explorer/Assets/DCL/EventsApi/DCL.EventsApi.asmdef.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

33 changes: 33 additions & 0 deletions Explorer/Assets/DCL/EventsApi/EventDTO.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
using System;

namespace DCL.EventsApi
{
[Serializable]
public struct EventDTO
{
public string id;
public string name;
public string image;
public string description;
public string next_start_at;
public string next_finish_at;
public string finish_at;
public string scene_name;
public int[] coordinates;
public string server;
public int total_attendees;
public bool live;
public string user_name;
public bool highlighted;
public bool trending;
public bool attending;
public string[] categories;
public bool recurrent;
public double duration;
public string start_at;
public string[] recurrent_dates;
public bool world;
public int x;
public int y;
}
}
3 changes: 3 additions & 0 deletions Explorer/Assets/DCL/EventsApi/EventDTO.cs.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions Explorer/Assets/DCL/EventsApi/EventDTOListResponse.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
namespace DCL.EventsApi
{
public struct EventDTOListResponse
{
public bool ok;
public EventDTO[] data;
}
}
3 changes: 3 additions & 0 deletions Explorer/Assets/DCL/EventsApi/EventDTOListResponse.cs.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions Explorer/Assets/DCL/EventsApi/EventsApiException.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
using System;

namespace DCL.EventsApi
{
public class EventsApiException : Exception
{
public EventsApiException(string message) : base(message) { }

public EventsApiException(string message, Exception innerException) : base(message, innerException) { }
}
}
3 changes: 3 additions & 0 deletions Explorer/Assets/DCL/EventsApi/EventsApiException.cs.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

37 changes: 37 additions & 0 deletions Explorer/Assets/DCL/EventsApi/GoogleUserCalendar.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
using CommunicationData.URLHelpers;
using DCL.Browser;
using System;

namespace DCL.EventsApi
{
public class GoogleUserCalendar : IUserCalendar
{
private const string GOOGLE_CALENDAR_DOMAIN = "https://www.google.com/calendar/event";
private const string ACTION_PARAM = "action";
private const string ACTION_TEMPLATE = "TEMPLATE";
private const string TITLE_PARAM = "text";
private const string DATES_PARAM = "dates";
private const string DESCRIPTION_PARAM = "details";

private readonly IWebBrowser webBrowser;
private readonly URLBuilder urlBuilder = new ();

public GoogleUserCalendar(IWebBrowser webBrowser)
{
this.webBrowser = webBrowser;
}

public void Add(string title, string description, DateTime startAt, DateTime endAt)
{
urlBuilder.Clear();

urlBuilder.AppendDomain(URLDomain.FromString(GOOGLE_CALENDAR_DOMAIN))
.AppendParameter(new URLParameter(ACTION_PARAM, ACTION_TEMPLATE))
.AppendParameter(new URLParameter(TITLE_PARAM, title))
.AppendParameter(new URLParameter(DATES_PARAM, $"{startAt:yyyyMMddTHHmmssZ}/{endAt:yyyyMMddTHHmmssZ}"))
.AppendParameter(new URLParameter(DESCRIPTION_PARAM, description));

webBrowser.OpenUrl(urlBuilder.Build());
}
}
}
3 changes: 3 additions & 0 deletions Explorer/Assets/DCL/EventsApi/GoogleUserCalendar.cs.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 9d3bc4b

Please sign in to comment.