From 68606361c5dc6acd2669a06e92e43502b2fe83c0 Mon Sep 17 00:00:00 2001 From: Juanma Hidalgo Date: Wed, 12 Jun 2024 14:57:23 +0200 Subject: [PATCH 01/10] feat: add main The Graph subgraphs to use dcl provider (#6213) --- browser-interface/packages/config/index.ts | 2 +- .../DCL/ServiceProviders/TheGraph/TheGraph.cs | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/browser-interface/packages/config/index.ts b/browser-interface/packages/config/index.ts index 6c24b16446..527984da30 100644 --- a/browser-interface/packages/config/index.ts +++ b/browser-interface/packages/config/index.ts @@ -197,7 +197,7 @@ export namespace ethereumConfigurations { wss: 'wss://rpc.decentraland.org/mainnet', http: 'https://rpc.decentraland.org/mainnet', etherscan: 'https://etherscan.io', - names: 'https://api.thegraph.com/subgraphs/name/decentraland/marketplace', + names: 'https://subgraph.decentraland.org/marketplace', // contracts LANDProxy: assertValue(contractInfo.mainnet.LANDProxy), diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/ServiceProviders/TheGraph/TheGraph.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/ServiceProviders/TheGraph/TheGraph.cs index 73a6ff2bcd..bc3c8c6300 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/ServiceProviders/TheGraph/TheGraph.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/ServiceProviders/TheGraph/TheGraph.cs @@ -11,12 +11,12 @@ public class TheGraph : ITheGraph { private const float DEFAULT_CACHE_TIME = 5 * 60; - private const string LAND_SUBGRAPH_URL_ORG = "https://api.thegraph.com/subgraphs/name/decentraland/land-manager"; - private const string LAND_SUBGRAPH_URL_ZONE = "https://api.thegraph.com/subgraphs/name/decentraland/land-manager-sepolia"; - private const string MANA_SUBGRAPH_URL_ETHEREUM = "https://api.thegraph.com/subgraphs/name/decentraland/mana-ethereum-mainnet"; - private const string MANA_SUBGRAPH_URL_POLYGON = "https://api.thegraph.com/subgraphs/name/decentraland/mana-matic-mainnet"; - private const string NFT_COLLECTIONS_SUBGRAPH_URL_ETHEREUM = "https://api.thegraph.com/subgraphs/name/decentraland/collections-ethereum-mainnet"; - private const string NFT_COLLECTIONS_SUBGRAPH_URL_MATIC = "https://api.thegraph.com/subgraphs/name/decentraland/collections-matic-mainnet"; + private const string LAND_SUBGRAPH_URL_ORG = "https://subgraph.decentraland.org/land-manager"; + private const string LAND_SUBGRAPH_URL_ZONE = "https://api.studio.thegraph.com/query/49472/land-manager-sepolia/version/latest"; + private const string MANA_SUBGRAPH_URL_ETHEREUM = "https://subgraph.decentraland.org/mana-ethereum-mainnet"; + private const string MANA_SUBGRAPH_URL_POLYGON = "https://subgraph.decentraland.org/mana-matic-mainnet"; + private const string NFT_COLLECTIONS_SUBGRAPH_URL_ETHEREUM = "https://subgraph.decentraland.org/collections-ethereum-mainnet"; + private const string NFT_COLLECTIONS_SUBGRAPH_URL_MATIC = "https://subgraph.decentraland.org/collections-matic-mainnet"; private readonly IDataCache> landQueryCache = new DataCache>(); From 7616bd02346b84745620c6fbfc7a93118fac2f2a Mon Sep 17 00:00:00 2001 From: Alejandro Alvarez Melucci <163010988+AlejandroAlvarezMelucciDCL@users.noreply.github.com> Date: Fri, 14 Jun 2024 16:45:23 -0300 Subject: [PATCH 02/10] chore: support for uiText wrapping (#6207) * Potential fix for uiText wrapping * Support for new property TextWrap in UIText * Update package.json pointing to protocol branch and generated class to test new property not yet merged in protocol and sdk. Will be updated before merging this branch. * Updated package.json to use the latest protocol version --- scripts/package-lock.json | 14 ++-- scripts/package.json | 2 +- .../ECSComponents/UIText/UiTextHandler.cs | 6 ++ .../DCL/DecentralandProtocol/UiText.gen.cs | 78 +++++++++++++++++-- 4 files changed, 85 insertions(+), 15 deletions(-) diff --git a/scripts/package-lock.json b/scripts/package-lock.json index 06ddd45b22..ae929d0c7e 100644 --- a/scripts/package-lock.json +++ b/scripts/package-lock.json @@ -9,7 +9,7 @@ "version": "1.0.0", "license": "Apache-2.0", "dependencies": { - "@dcl/protocol": "^1.0.0-9115457439.commit-926ebd1", + "@dcl/protocol": "1.0.0-9466805132.commit-365e0bb", "@protobuf-ts/protoc": "^2.8.2", "@types/fs-extra": "^11.0.1", "@types/glob": "^8.0.1", @@ -36,9 +36,9 @@ } }, "node_modules/@dcl/protocol": { - "version": "1.0.0-9115457439.commit-926ebd1", - "resolved": "https://registry.npmjs.org/@dcl/protocol/-/protocol-1.0.0-9115457439.commit-926ebd1.tgz", - "integrity": "sha512-4MA1sx4cpfapP+EDAZdpdaONthoDlv4VMc0CwAKcmhp0vxGgExeEpLkPh6gvNXmkl8z8z3nEcDOX1X95dvCYuA==", + "version": "1.0.0-9466805132.commit-365e0bb", + "resolved": "https://registry.npmjs.org/@dcl/protocol/-/protocol-1.0.0-9466805132.commit-365e0bb.tgz", + "integrity": "sha512-CMO2/JkdMPLJQj+jdT5yqolKFDPkQF2hkS/HEUtsxCzkLoN3H0xXmDUhRuh2LTmBBl401meH/tJ+fQcPyd9xLQ==", "dependencies": { "@dcl/ts-proto": "1.154.0" } @@ -569,9 +569,9 @@ } }, "@dcl/protocol": { - "version": "1.0.0-9115457439.commit-926ebd1", - "resolved": "https://registry.npmjs.org/@dcl/protocol/-/protocol-1.0.0-9115457439.commit-926ebd1.tgz", - "integrity": "sha512-4MA1sx4cpfapP+EDAZdpdaONthoDlv4VMc0CwAKcmhp0vxGgExeEpLkPh6gvNXmkl8z8z3nEcDOX1X95dvCYuA==", + "version": "1.0.0-9466805132.commit-365e0bb", + "resolved": "https://registry.npmjs.org/@dcl/protocol/-/protocol-1.0.0-9466805132.commit-365e0bb.tgz", + "integrity": "sha512-CMO2/JkdMPLJQj+jdT5yqolKFDPkQF2hkS/HEUtsxCzkLoN3H0xXmDUhRuh2LTmBBl401meH/tJ+fQcPyd9xLQ==", "requires": { "@dcl/ts-proto": "1.154.0" } diff --git a/scripts/package.json b/scripts/package.json index 34bf9a475b..7a1c4ba427 100644 --- a/scripts/package.json +++ b/scripts/package.json @@ -16,7 +16,7 @@ "typescript": "^4.2.3" }, "dependencies": { - "@dcl/protocol": "^1.0.0-9115457439.commit-926ebd1", + "@dcl/protocol": "1.0.0-9466805132.commit-365e0bb", "@protobuf-ts/protoc": "^2.8.2", "@types/fs-extra": "^11.0.1", "@types/glob": "^8.0.1", diff --git a/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIText/UiTextHandler.cs b/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIText/UiTextHandler.cs index 859df20cdf..9c11d55b47 100644 --- a/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIText/UiTextHandler.cs +++ b/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIText/UiTextHandler.cs @@ -39,6 +39,12 @@ public void OnComponentRemoved(IParcelScene scene, IDCLEntity entity) public void OnComponentModelUpdated(IParcelScene scene, IDCLEntity entity, PBUiText model) { uiElement.text = model.Value; + + var wrapMode = WhiteSpace.Normal; // Default mode is Wrap enabled + if (model.HasTextWrap && model.TextWrap == TextWrap.TwNoWrap) + wrapMode = WhiteSpace.NoWrap; + + uiElement.style.whiteSpace = wrapMode; uiElement.style.color = model.GetColor().ToUnityColor(); uiElement.style.fontSize = model.GetFontSize(); uiElement.style.unityTextAlign = model.GetTextAlign().ToUnityTextAlign(); diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/DecentralandProtocol/UiText.gen.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/DecentralandProtocol/UiText.gen.cs index c67d9c843e..fd57440d07 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/DecentralandProtocol/UiText.gen.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/DecentralandProtocol/UiText.gen.cs @@ -27,23 +27,34 @@ static UiTextReflection() { "CilkZWNlbnRyYWxhbmQvc2RrL2NvbXBvbmVudHMvdWlfdGV4dC5wcm90bxIb", "ZGVjZW50cmFsYW5kLnNkay5jb21wb25lbnRzGiBkZWNlbnRyYWxhbmQvY29t", "bW9uL2NvbG9ycy5wcm90bxouZGVjZW50cmFsYW5kL3Nkay9jb21wb25lbnRz", - "L2NvbW1vbi90ZXh0cy5wcm90byKbAgoIUEJVaVRleHQSDQoFdmFsdWUYASAB", + "L2NvbW1vbi90ZXh0cy5wcm90byLoAgoIUEJVaVRleHQSDQoFdmFsdWUYASAB", "KAkSLwoFY29sb3IYAiABKAsyGy5kZWNlbnRyYWxhbmQuY29tbW9uLkNvbG9y", "NEgAiAEBEkoKCnRleHRfYWxpZ24YAyABKA4yMS5kZWNlbnRyYWxhbmQuc2Rr", "LmNvbXBvbmVudHMuY29tbW9uLlRleHRBbGlnbk1vZGVIAYgBARI7CgRmb250", "GAQgASgOMiguZGVjZW50cmFsYW5kLnNkay5jb21wb25lbnRzLmNvbW1vbi5G", - "b250SAKIAQESFgoJZm9udF9zaXplGAUgASgFSAOIAQFCCAoGX2NvbG9yQg0K", - "C190ZXh0X2FsaWduQgcKBV9mb250QgwKCl9mb250X3NpemVCFKoCEURDTC5F", - "Q1NDb21wb25lbnRzYgZwcm90bzM=")); + "b250SAKIAQESFgoJZm9udF9zaXplGAUgASgFSAOIAQESPQoJdGV4dF93cmFw", + "GAYgASgOMiUuZGVjZW50cmFsYW5kLnNkay5jb21wb25lbnRzLlRleHRXcmFw", + "SASIAQFCCAoGX2NvbG9yQg0KC190ZXh0X2FsaWduQgcKBV9mb250QgwKCl9m", + "b250X3NpemVCDAoKX3RleHRfd3JhcConCghUZXh0V3JhcBILCgdUV19XUkFQ", + "EAASDgoKVFdfTk9fV1JBUBABQhSqAhFEQ0wuRUNTQ29tcG9uZW50c2IGcHJv", + "dG8z")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { global::Decentraland.Common.ColorsReflection.Descriptor, global::DCL.ECSComponents.TextsReflection.Descriptor, }, - new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::DCL.ECSComponents.PBUiText), global::DCL.ECSComponents.PBUiText.Parser, new[]{ "Value", "Color", "TextAlign", "Font", "FontSize" }, new[]{ "Color", "TextAlign", "Font", "FontSize" }, null, null, null) + new pbr::GeneratedClrTypeInfo(new[] {typeof(global::DCL.ECSComponents.TextWrap), }, null, new pbr::GeneratedClrTypeInfo[] { + new pbr::GeneratedClrTypeInfo(typeof(global::DCL.ECSComponents.PBUiText), global::DCL.ECSComponents.PBUiText.Parser, new[]{ "Value", "Color", "TextAlign", "Font", "FontSize", "TextWrap" }, new[]{ "Color", "TextAlign", "Font", "FontSize", "TextWrap" }, null, null, null) })); } #endregion } + #region Enums + public enum TextWrap { + [pbr::OriginalName("TW_WRAP")] TwWrap = 0, + [pbr::OriginalName("TW_NO_WRAP")] TwNoWrap = 1, + } + + #endregion + #region Messages public sealed partial class PBUiText : pb::IMessage #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE @@ -86,6 +97,7 @@ public PBUiText(PBUiText other) : this() { textAlign_ = other.textAlign_; font_ = other.font_; fontSize_ = other.fontSize_; + textWrap_ = other.textWrap_; _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); } @@ -99,7 +111,7 @@ public PBUiText Clone() { public const int ValueFieldNumber = 1; private string value_ = ""; /// - /// the text content + /// the text content, tag <b> and <i> are supported /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] @@ -209,6 +221,34 @@ public void ClearFontSize() { _hasBits0 &= ~4; } + /// Field number for the "text_wrap" field. + public const int TextWrapFieldNumber = 6; + private global::DCL.ECSComponents.TextWrap textWrap_; + /// + /// wrap text when the border is reached (default: TW_WRAP) + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public global::DCL.ECSComponents.TextWrap TextWrap { + get { if ((_hasBits0 & 8) != 0) { return textWrap_; } else { return global::DCL.ECSComponents.TextWrap.TwWrap; } } + set { + _hasBits0 |= 8; + textWrap_ = value; + } + } + /// Gets whether the "text_wrap" field is set + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public bool HasTextWrap { + get { return (_hasBits0 & 8) != 0; } + } + /// Clears the value of the "text_wrap" field + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public void ClearTextWrap() { + _hasBits0 &= ~8; + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override bool Equals(object other) { @@ -229,6 +269,7 @@ public bool Equals(PBUiText other) { if (TextAlign != other.TextAlign) return false; if (Font != other.Font) return false; if (FontSize != other.FontSize) return false; + if (TextWrap != other.TextWrap) return false; return Equals(_unknownFields, other._unknownFields); } @@ -241,6 +282,7 @@ public override int GetHashCode() { if (HasTextAlign) hash ^= TextAlign.GetHashCode(); if (HasFont) hash ^= Font.GetHashCode(); if (HasFontSize) hash ^= FontSize.GetHashCode(); + if (HasTextWrap) hash ^= TextWrap.GetHashCode(); if (_unknownFields != null) { hash ^= _unknownFields.GetHashCode(); } @@ -279,6 +321,10 @@ public void WriteTo(pb::CodedOutputStream output) { output.WriteRawTag(40); output.WriteInt32(FontSize); } + if (HasTextWrap) { + output.WriteRawTag(48); + output.WriteEnum((int) TextWrap); + } if (_unknownFields != null) { _unknownFields.WriteTo(output); } @@ -309,6 +355,10 @@ public void WriteTo(pb::CodedOutputStream output) { output.WriteRawTag(40); output.WriteInt32(FontSize); } + if (HasTextWrap) { + output.WriteRawTag(48); + output.WriteEnum((int) TextWrap); + } if (_unknownFields != null) { _unknownFields.WriteTo(ref output); } @@ -334,6 +384,9 @@ public int CalculateSize() { if (HasFontSize) { size += 1 + pb::CodedOutputStream.ComputeInt32Size(FontSize); } + if (HasTextWrap) { + size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) TextWrap); + } if (_unknownFields != null) { size += _unknownFields.CalculateSize(); } @@ -364,6 +417,9 @@ public void MergeFrom(PBUiText other) { if (other.HasFontSize) { FontSize = other.FontSize; } + if (other.HasTextWrap) { + TextWrap = other.TextWrap; + } _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); } @@ -402,6 +458,10 @@ public void MergeFrom(pb::CodedInputStream input) { FontSize = input.ReadInt32(); break; } + case 48: { + TextWrap = (global::DCL.ECSComponents.TextWrap) input.ReadEnum(); + break; + } } } #endif @@ -440,6 +500,10 @@ public void MergeFrom(pb::CodedInputStream input) { FontSize = input.ReadInt32(); break; } + case 48: { + TextWrap = (global::DCL.ECSComponents.TextWrap) input.ReadEnum(); + break; + } } } } From 5bb1fffea6b327228c22ac692f3b69ee5a8f0f1e Mon Sep 17 00:00:00 2001 From: Santi Andrade Date: Mon, 17 Jun 2024 14:27:55 +0200 Subject: [PATCH 03/10] fix: update help and support link (#6216) * fix. update help and support link * Update IntercomWindow.jslib * Update IntercomWindow.jslib --- .../Assets/Plugins/IntercomWindow/IntercomWindow.jslib | 4 ++-- .../HUD/HelpAndSupportHUD/HelpAndSupportHUDController.cs | 2 +- .../DCL/Controllers/HUD/TaskbarHUD/TaskbarHUDController.cs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/unity-renderer/Assets/Plugins/IntercomWindow/IntercomWindow.jslib b/unity-renderer/Assets/Plugins/IntercomWindow/IntercomWindow.jslib index 359e632e58..b3b6b511d2 100644 --- a/unity-renderer/Assets/Plugins/IntercomWindow/IntercomWindow.jslib +++ b/unity-renderer/Assets/Plugins/IntercomWindow/IntercomWindow.jslib @@ -4,11 +4,11 @@ var IntercomWindow = { const windowHeight = window.innerHeight const windowWidth = window.innerWidth const popupHeight = Math.min(700, windowHeight) - const popupWidth = Math.min(400, windowWidth) + const popupWidth = Math.min(450, windowWidth) const top = Math.max(windowHeight - popupHeight, 0) const left = Math.max(windowWidth - popupWidth - 20, 0) - window.open('https://intercom.decentraland.org', 'intercom', `popup,top=${top},left=${left},width=${popupWidth},height=${popupHeight}`) + window.open('https://decentraland.org/help', 'intercom', `popup,top=${top},left=${left},width=${popupWidth},height=${popupHeight}`) } }; diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/HelpAndSupportHUD/HelpAndSupportHUDController.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/HelpAndSupportHUD/HelpAndSupportHUDController.cs index 5ba0e0ed38..fffad4a3ec 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/HelpAndSupportHUD/HelpAndSupportHUDController.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/HelpAndSupportHUD/HelpAndSupportHUDController.cs @@ -9,7 +9,7 @@ namespace DCL.HelpAndSupportHUD { public class HelpAndSupportHUDController : IHUD { - internal const string CONTACT_SUPPORT_URL = "https://intercom.decentraland.org"; + internal const string CONTACT_SUPPORT_URL = "https://decentraland.org/help"; internal const string JOIN_DISCORD_URL = "https://dcl.gg/discord"; internal const string FAQ_URL = "https://docs.decentraland.org/decentraland/faq/"; public IHelpAndSupportHUDView view { get; } diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/TaskbarHUD/TaskbarHUDController.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/TaskbarHUD/TaskbarHUDController.cs index 1734566d74..4fb249af31 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/TaskbarHUD/TaskbarHUDController.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/TaskbarHUD/TaskbarHUDController.cs @@ -14,7 +14,7 @@ public class TaskbarHUDController : IHUD { - private const string INTERCOM_URL = "https://intercom.decentraland.org/"; + private const string INTERCOM_URL = "https://decentraland.org/help/"; private readonly IChatController chatController; private readonly IFriendsController friendsController; From 880235a638c38a90d3f6622336d5afb58aff8eee Mon Sep 17 00:00:00 2001 From: Ashley Canning Date: Tue, 18 Jun 2024 13:36:08 +0100 Subject: [PATCH 04/10] fix: disable sentry plugin (#6219) Disable sentry plugin Signed-off-by: Ashley Canning --- unity-renderer/Assets/DCLPlugins/SentryPlugin/SentryPlugin.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/unity-renderer/Assets/DCLPlugins/SentryPlugin/SentryPlugin.cs b/unity-renderer/Assets/DCLPlugins/SentryPlugin/SentryPlugin.cs index 8e5634234f..d050ceed96 100644 --- a/unity-renderer/Assets/DCLPlugins/SentryPlugin/SentryPlugin.cs +++ b/unity-renderer/Assets/DCLPlugins/SentryPlugin/SentryPlugin.cs @@ -13,6 +13,7 @@ public class SentryPlugin : IPlugin public SentryPlugin() { + /* // Sentry doesn't provide a public getter accessor to its instance // So we unfortunately need a bit of magic Type type = typeof(SentrySdk); @@ -24,11 +25,14 @@ public SentryPlugin() } controller = new SentryController(DataStore.i.player, DataStore.i.realm, info.GetValue(null) as IHub); + */ } public void Dispose() { + /* controller?.Dispose(); + */ } } } From a70112d3e15bbff5a16545c5b4d7c1e09dd3992c Mon Sep 17 00:00:00 2001 From: Alejandro Alvarez Melucci <163010988+AlejandroAlvarezMelucciDCL@users.noreply.github.com> Date: Mon, 24 Jun 2024 06:44:00 -0300 Subject: [PATCH 05/10] Revert "chore: support for uiText wrapping" (#6223) Revert "chore: support for uiText wrapping (#6207)" This reverts commit 7616bd02346b84745620c6fbfc7a93118fac2f2a. --- scripts/package-lock.json | 14 ++-- scripts/package.json | 2 +- .../ECSComponents/UIText/UiTextHandler.cs | 6 -- .../DCL/DecentralandProtocol/UiText.gen.cs | 78 ++----------------- 4 files changed, 15 insertions(+), 85 deletions(-) diff --git a/scripts/package-lock.json b/scripts/package-lock.json index ae929d0c7e..06ddd45b22 100644 --- a/scripts/package-lock.json +++ b/scripts/package-lock.json @@ -9,7 +9,7 @@ "version": "1.0.0", "license": "Apache-2.0", "dependencies": { - "@dcl/protocol": "1.0.0-9466805132.commit-365e0bb", + "@dcl/protocol": "^1.0.0-9115457439.commit-926ebd1", "@protobuf-ts/protoc": "^2.8.2", "@types/fs-extra": "^11.0.1", "@types/glob": "^8.0.1", @@ -36,9 +36,9 @@ } }, "node_modules/@dcl/protocol": { - "version": "1.0.0-9466805132.commit-365e0bb", - "resolved": "https://registry.npmjs.org/@dcl/protocol/-/protocol-1.0.0-9466805132.commit-365e0bb.tgz", - "integrity": "sha512-CMO2/JkdMPLJQj+jdT5yqolKFDPkQF2hkS/HEUtsxCzkLoN3H0xXmDUhRuh2LTmBBl401meH/tJ+fQcPyd9xLQ==", + "version": "1.0.0-9115457439.commit-926ebd1", + "resolved": "https://registry.npmjs.org/@dcl/protocol/-/protocol-1.0.0-9115457439.commit-926ebd1.tgz", + "integrity": "sha512-4MA1sx4cpfapP+EDAZdpdaONthoDlv4VMc0CwAKcmhp0vxGgExeEpLkPh6gvNXmkl8z8z3nEcDOX1X95dvCYuA==", "dependencies": { "@dcl/ts-proto": "1.154.0" } @@ -569,9 +569,9 @@ } }, "@dcl/protocol": { - "version": "1.0.0-9466805132.commit-365e0bb", - "resolved": "https://registry.npmjs.org/@dcl/protocol/-/protocol-1.0.0-9466805132.commit-365e0bb.tgz", - "integrity": "sha512-CMO2/JkdMPLJQj+jdT5yqolKFDPkQF2hkS/HEUtsxCzkLoN3H0xXmDUhRuh2LTmBBl401meH/tJ+fQcPyd9xLQ==", + "version": "1.0.0-9115457439.commit-926ebd1", + "resolved": "https://registry.npmjs.org/@dcl/protocol/-/protocol-1.0.0-9115457439.commit-926ebd1.tgz", + "integrity": "sha512-4MA1sx4cpfapP+EDAZdpdaONthoDlv4VMc0CwAKcmhp0vxGgExeEpLkPh6gvNXmkl8z8z3nEcDOX1X95dvCYuA==", "requires": { "@dcl/ts-proto": "1.154.0" } diff --git a/scripts/package.json b/scripts/package.json index 7a1c4ba427..34bf9a475b 100644 --- a/scripts/package.json +++ b/scripts/package.json @@ -16,7 +16,7 @@ "typescript": "^4.2.3" }, "dependencies": { - "@dcl/protocol": "1.0.0-9466805132.commit-365e0bb", + "@dcl/protocol": "^1.0.0-9115457439.commit-926ebd1", "@protobuf-ts/protoc": "^2.8.2", "@types/fs-extra": "^11.0.1", "@types/glob": "^8.0.1", diff --git a/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIText/UiTextHandler.cs b/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIText/UiTextHandler.cs index 9c11d55b47..859df20cdf 100644 --- a/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIText/UiTextHandler.cs +++ b/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIText/UiTextHandler.cs @@ -39,12 +39,6 @@ public void OnComponentRemoved(IParcelScene scene, IDCLEntity entity) public void OnComponentModelUpdated(IParcelScene scene, IDCLEntity entity, PBUiText model) { uiElement.text = model.Value; - - var wrapMode = WhiteSpace.Normal; // Default mode is Wrap enabled - if (model.HasTextWrap && model.TextWrap == TextWrap.TwNoWrap) - wrapMode = WhiteSpace.NoWrap; - - uiElement.style.whiteSpace = wrapMode; uiElement.style.color = model.GetColor().ToUnityColor(); uiElement.style.fontSize = model.GetFontSize(); uiElement.style.unityTextAlign = model.GetTextAlign().ToUnityTextAlign(); diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/DecentralandProtocol/UiText.gen.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/DecentralandProtocol/UiText.gen.cs index fd57440d07..c67d9c843e 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/DecentralandProtocol/UiText.gen.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/DecentralandProtocol/UiText.gen.cs @@ -27,34 +27,23 @@ static UiTextReflection() { "CilkZWNlbnRyYWxhbmQvc2RrL2NvbXBvbmVudHMvdWlfdGV4dC5wcm90bxIb", "ZGVjZW50cmFsYW5kLnNkay5jb21wb25lbnRzGiBkZWNlbnRyYWxhbmQvY29t", "bW9uL2NvbG9ycy5wcm90bxouZGVjZW50cmFsYW5kL3Nkay9jb21wb25lbnRz", - "L2NvbW1vbi90ZXh0cy5wcm90byLoAgoIUEJVaVRleHQSDQoFdmFsdWUYASAB", + "L2NvbW1vbi90ZXh0cy5wcm90byKbAgoIUEJVaVRleHQSDQoFdmFsdWUYASAB", "KAkSLwoFY29sb3IYAiABKAsyGy5kZWNlbnRyYWxhbmQuY29tbW9uLkNvbG9y", "NEgAiAEBEkoKCnRleHRfYWxpZ24YAyABKA4yMS5kZWNlbnRyYWxhbmQuc2Rr", "LmNvbXBvbmVudHMuY29tbW9uLlRleHRBbGlnbk1vZGVIAYgBARI7CgRmb250", "GAQgASgOMiguZGVjZW50cmFsYW5kLnNkay5jb21wb25lbnRzLmNvbW1vbi5G", - "b250SAKIAQESFgoJZm9udF9zaXplGAUgASgFSAOIAQESPQoJdGV4dF93cmFw", - "GAYgASgOMiUuZGVjZW50cmFsYW5kLnNkay5jb21wb25lbnRzLlRleHRXcmFw", - "SASIAQFCCAoGX2NvbG9yQg0KC190ZXh0X2FsaWduQgcKBV9mb250QgwKCl9m", - "b250X3NpemVCDAoKX3RleHRfd3JhcConCghUZXh0V3JhcBILCgdUV19XUkFQ", - "EAASDgoKVFdfTk9fV1JBUBABQhSqAhFEQ0wuRUNTQ29tcG9uZW50c2IGcHJv", - "dG8z")); + "b250SAKIAQESFgoJZm9udF9zaXplGAUgASgFSAOIAQFCCAoGX2NvbG9yQg0K", + "C190ZXh0X2FsaWduQgcKBV9mb250QgwKCl9mb250X3NpemVCFKoCEURDTC5F", + "Q1NDb21wb25lbnRzYgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { global::Decentraland.Common.ColorsReflection.Descriptor, global::DCL.ECSComponents.TextsReflection.Descriptor, }, - new pbr::GeneratedClrTypeInfo(new[] {typeof(global::DCL.ECSComponents.TextWrap), }, null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::DCL.ECSComponents.PBUiText), global::DCL.ECSComponents.PBUiText.Parser, new[]{ "Value", "Color", "TextAlign", "Font", "FontSize", "TextWrap" }, new[]{ "Color", "TextAlign", "Font", "FontSize", "TextWrap" }, null, null, null) + new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { + new pbr::GeneratedClrTypeInfo(typeof(global::DCL.ECSComponents.PBUiText), global::DCL.ECSComponents.PBUiText.Parser, new[]{ "Value", "Color", "TextAlign", "Font", "FontSize" }, new[]{ "Color", "TextAlign", "Font", "FontSize" }, null, null, null) })); } #endregion } - #region Enums - public enum TextWrap { - [pbr::OriginalName("TW_WRAP")] TwWrap = 0, - [pbr::OriginalName("TW_NO_WRAP")] TwNoWrap = 1, - } - - #endregion - #region Messages public sealed partial class PBUiText : pb::IMessage #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE @@ -97,7 +86,6 @@ public PBUiText(PBUiText other) : this() { textAlign_ = other.textAlign_; font_ = other.font_; fontSize_ = other.fontSize_; - textWrap_ = other.textWrap_; _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); } @@ -111,7 +99,7 @@ public PBUiText Clone() { public const int ValueFieldNumber = 1; private string value_ = ""; /// - /// the text content, tag <b> and <i> are supported + /// the text content /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] @@ -221,34 +209,6 @@ public void ClearFontSize() { _hasBits0 &= ~4; } - /// Field number for the "text_wrap" field. - public const int TextWrapFieldNumber = 6; - private global::DCL.ECSComponents.TextWrap textWrap_; - /// - /// wrap text when the border is reached (default: TW_WRAP) - /// - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public global::DCL.ECSComponents.TextWrap TextWrap { - get { if ((_hasBits0 & 8) != 0) { return textWrap_; } else { return global::DCL.ECSComponents.TextWrap.TwWrap; } } - set { - _hasBits0 |= 8; - textWrap_ = value; - } - } - /// Gets whether the "text_wrap" field is set - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public bool HasTextWrap { - get { return (_hasBits0 & 8) != 0; } - } - /// Clears the value of the "text_wrap" field - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public void ClearTextWrap() { - _hasBits0 &= ~8; - } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override bool Equals(object other) { @@ -269,7 +229,6 @@ public bool Equals(PBUiText other) { if (TextAlign != other.TextAlign) return false; if (Font != other.Font) return false; if (FontSize != other.FontSize) return false; - if (TextWrap != other.TextWrap) return false; return Equals(_unknownFields, other._unknownFields); } @@ -282,7 +241,6 @@ public override int GetHashCode() { if (HasTextAlign) hash ^= TextAlign.GetHashCode(); if (HasFont) hash ^= Font.GetHashCode(); if (HasFontSize) hash ^= FontSize.GetHashCode(); - if (HasTextWrap) hash ^= TextWrap.GetHashCode(); if (_unknownFields != null) { hash ^= _unknownFields.GetHashCode(); } @@ -321,10 +279,6 @@ public void WriteTo(pb::CodedOutputStream output) { output.WriteRawTag(40); output.WriteInt32(FontSize); } - if (HasTextWrap) { - output.WriteRawTag(48); - output.WriteEnum((int) TextWrap); - } if (_unknownFields != null) { _unknownFields.WriteTo(output); } @@ -355,10 +309,6 @@ public void WriteTo(pb::CodedOutputStream output) { output.WriteRawTag(40); output.WriteInt32(FontSize); } - if (HasTextWrap) { - output.WriteRawTag(48); - output.WriteEnum((int) TextWrap); - } if (_unknownFields != null) { _unknownFields.WriteTo(ref output); } @@ -384,9 +334,6 @@ public int CalculateSize() { if (HasFontSize) { size += 1 + pb::CodedOutputStream.ComputeInt32Size(FontSize); } - if (HasTextWrap) { - size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) TextWrap); - } if (_unknownFields != null) { size += _unknownFields.CalculateSize(); } @@ -417,9 +364,6 @@ public void MergeFrom(PBUiText other) { if (other.HasFontSize) { FontSize = other.FontSize; } - if (other.HasTextWrap) { - TextWrap = other.TextWrap; - } _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); } @@ -458,10 +402,6 @@ public void MergeFrom(pb::CodedInputStream input) { FontSize = input.ReadInt32(); break; } - case 48: { - TextWrap = (global::DCL.ECSComponents.TextWrap) input.ReadEnum(); - break; - } } } #endif @@ -500,10 +440,6 @@ public void MergeFrom(pb::CodedInputStream input) { FontSize = input.ReadInt32(); break; } - case 48: { - TextWrap = (global::DCL.ECSComponents.TextWrap) input.ReadEnum(); - break; - } } } } From 12939952f0b69abfca6c6c1543eb376191059b91 Mon Sep 17 00:00:00 2001 From: Nicolas Lorusso <56365551+lorux0@users.noreply.github.com> Date: Mon, 24 Jun 2024 06:44:18 -0300 Subject: [PATCH 06/10] fix: duplicated ids on video streaming (#6222) * added ogs to WebVideoPlayer * added kernel: prefix in logs * added parcel coord to logs * force enable logs * added error log * add scene id into video id * changed id generation by scene number * removed logs on WebVideoPlayer * reverted many changes --- .../ECS7/ECSComponents/VideoPlayer/VideoPlayerHandler.cs | 3 ++- .../DCL/Components/Video/Tests/WebVideoPlayerShould.cs | 7 +++---- .../DCL/WorldRuntime/DebugController/DebugController.cs | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/VideoPlayer/VideoPlayerHandler.cs b/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/VideoPlayer/VideoPlayerHandler.cs index 9e65dbc6c3..5b8cc9b8b4 100644 --- a/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/VideoPlayer/VideoPlayerHandler.cs +++ b/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/VideoPlayer/VideoPlayerHandler.cs @@ -89,7 +89,8 @@ public void OnComponentModelUpdated(IParcelScene scene, IDCLEntity entity, PBVid { videoPlayer?.Dispose(); - var id = entity.entityId.ToString(); + var entityId = entity.entityId.ToString(); + string id = scene.sceneData.sceneNumber > 0 ? scene.sceneData.sceneNumber + entityId : scene.GetHashCode() + entityId; VideoType videoType = VideoType.Common; if (model.Src.StartsWith("livekit-video://")) diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Components/Video/Tests/WebVideoPlayerShould.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/Components/Video/Tests/WebVideoPlayerShould.cs index b53757530d..905b9a5aea 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Components/Video/Tests/WebVideoPlayerShould.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Components/Video/Tests/WebVideoPlayerShould.cs @@ -1,4 +1,3 @@ -using System.Collections; using DCL.Components.Video.Plugin; using NSubstitute; using NUnit.Framework; @@ -161,7 +160,7 @@ public void SetErrorStateWhenUpdateIsCalled() plugin.Received(1).GetError(ID); Assert.IsTrue(webVideoPlayer.isError); - UnityEngine.TestTools.LogAssert.Expect(LogType.Error, ERROR_MESSAGE); + LogAssert.Expect(LogType.Error, ERROR_MESSAGE); } [Test] @@ -187,7 +186,7 @@ public void DontDoAnythingWhenErrorStateIsSet() plugin.Received(0).SetPlaybackRate(ID, Arg.Any()); plugin.Received(0).GetTime(ID); plugin.Received(0).GetDuration(ID); - UnityEngine.TestTools.LogAssert.Expect(LogType.Error, ERROR_MESSAGE); + LogAssert.Expect(LogType.Error, ERROR_MESSAGE); } [Test] @@ -210,4 +209,4 @@ public void ReturnValidNumberWhenVideoDurationIsNaN() Assert.AreEqual(-1, duration); } } -} \ No newline at end of file +} diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/WorldRuntime/DebugController/DebugController.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/WorldRuntime/DebugController/DebugController.cs index d57d6f2e10..edb10943e8 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/WorldRuntime/DebugController/DebugController.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/WorldRuntime/DebugController/DebugController.cs @@ -83,7 +83,7 @@ public void ShowFPSPanel() { isFPSPanelVisible.Set(true); } - + public void ToggleFPSPanel() { isFPSPanelVisible.Set(!isFPSPanelVisible.Get()); @@ -182,7 +182,7 @@ public void SetAnimationCulling(bool enabled) { Environment.i.platform.cullingController.SetAnimationCulling(enabled); } - + public void Dispose() { @@ -215,4 +215,4 @@ private void OnKernelConfigChanged(KernelConfigModel current, KernelConfigModel previewSceneLimitsWarning?.SetActive(enablePrevewSceneLimitWarning); } } -} \ No newline at end of file +} From bfba99fc0d86825b32a2f44e84fcb0f08675e449 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 14:15:44 +0100 Subject: [PATCH 07/10] chore: sync main to dev (#6215) feat: add main The Graph subgraphs to use dcl provider (#6213) Co-authored-by: Juanma Hidalgo Co-authored-by: Patricio Guerra Co-authored-by: Ludmilafantaniella Co-authored-by: Ani <139157886+anicalbano@users.noreply.github.com> From 0c17644ee3a7281699434b266224a12826144ffe Mon Sep 17 00:00:00 2001 From: davidejensen Date: Wed, 26 Jun 2024 15:44:29 +0200 Subject: [PATCH 08/10] Update auto_assign_config.yml (#6226) Signed-off-by: davidejensen --- .github/auto_assign_config.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/auto_assign_config.yml b/.github/auto_assign_config.yml index 915330c25d..567418c250 100644 --- a/.github/auto_assign_config.yml +++ b/.github/auto_assign_config.yml @@ -10,7 +10,6 @@ reviewGroups: - lorux0 - davidejensen - popuz - - Kinerius - mikhail-dcl - pravusjif qa: From f782a1245d8737db2eeaad1939f3fbc17749f4f1 Mon Sep 17 00:00:00 2001 From: Alejandro Alvarez Melucci <163010988+AlejandroAlvarezMelucciDCL@users.noreply.github.com> Date: Fri, 28 Jun 2024 11:05:37 -0300 Subject: [PATCH 09/10] chore: re introduce uitext wrapping (#6228) Re-introduced ui text wrap with no-wrap as the default behavior --- scripts/package-lock.json | 14 ++-- scripts/package.json | 2 +- .../ECSComponents/UIText/UiTextHandler.cs | 6 ++ .../DCL/DecentralandProtocol/UiText.gen.cs | 78 +++++++++++++++++-- 4 files changed, 85 insertions(+), 15 deletions(-) diff --git a/scripts/package-lock.json b/scripts/package-lock.json index 06ddd45b22..84ebe85bba 100644 --- a/scripts/package-lock.json +++ b/scripts/package-lock.json @@ -9,7 +9,7 @@ "version": "1.0.0", "license": "Apache-2.0", "dependencies": { - "@dcl/protocol": "^1.0.0-9115457439.commit-926ebd1", + "@dcl/protocol": "^1.0.0-9466805132.commit-365e0bb", "@protobuf-ts/protoc": "^2.8.2", "@types/fs-extra": "^11.0.1", "@types/glob": "^8.0.1", @@ -36,9 +36,9 @@ } }, "node_modules/@dcl/protocol": { - "version": "1.0.0-9115457439.commit-926ebd1", - "resolved": "https://registry.npmjs.org/@dcl/protocol/-/protocol-1.0.0-9115457439.commit-926ebd1.tgz", - "integrity": "sha512-4MA1sx4cpfapP+EDAZdpdaONthoDlv4VMc0CwAKcmhp0vxGgExeEpLkPh6gvNXmkl8z8z3nEcDOX1X95dvCYuA==", + "version": "1.0.0-9466805132.commit-365e0bb", + "resolved": "https://registry.npmjs.org/@dcl/protocol/-/protocol-1.0.0-9466805132.commit-365e0bb.tgz", + "integrity": "sha512-CMO2/JkdMPLJQj+jdT5yqolKFDPkQF2hkS/HEUtsxCzkLoN3H0xXmDUhRuh2LTmBBl401meH/tJ+fQcPyd9xLQ==", "dependencies": { "@dcl/ts-proto": "1.154.0" } @@ -569,9 +569,9 @@ } }, "@dcl/protocol": { - "version": "1.0.0-9115457439.commit-926ebd1", - "resolved": "https://registry.npmjs.org/@dcl/protocol/-/protocol-1.0.0-9115457439.commit-926ebd1.tgz", - "integrity": "sha512-4MA1sx4cpfapP+EDAZdpdaONthoDlv4VMc0CwAKcmhp0vxGgExeEpLkPh6gvNXmkl8z8z3nEcDOX1X95dvCYuA==", + "version": "1.0.0-9466805132.commit-365e0bb", + "resolved": "https://registry.npmjs.org/@dcl/protocol/-/protocol-1.0.0-9466805132.commit-365e0bb.tgz", + "integrity": "sha512-CMO2/JkdMPLJQj+jdT5yqolKFDPkQF2hkS/HEUtsxCzkLoN3H0xXmDUhRuh2LTmBBl401meH/tJ+fQcPyd9xLQ==", "requires": { "@dcl/ts-proto": "1.154.0" } diff --git a/scripts/package.json b/scripts/package.json index 34bf9a475b..662dd18886 100644 --- a/scripts/package.json +++ b/scripts/package.json @@ -16,7 +16,7 @@ "typescript": "^4.2.3" }, "dependencies": { - "@dcl/protocol": "^1.0.0-9115457439.commit-926ebd1", + "@dcl/protocol": "^1.0.0-9466805132.commit-365e0bb", "@protobuf-ts/protoc": "^2.8.2", "@types/fs-extra": "^11.0.1", "@types/glob": "^8.0.1", diff --git a/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIText/UiTextHandler.cs b/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIText/UiTextHandler.cs index 859df20cdf..7867b62440 100644 --- a/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIText/UiTextHandler.cs +++ b/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIText/UiTextHandler.cs @@ -38,7 +38,13 @@ public void OnComponentRemoved(IParcelScene scene, IDCLEntity entity) public void OnComponentModelUpdated(IParcelScene scene, IDCLEntity entity, PBUiText model) { + var wrapMode = WhiteSpace.NoWrap; // Default mode is No Wrap enabled + + if (model.HasTextWrap && model.TextWrap == TextWrap.TwWrap) + wrapMode = WhiteSpace.Normal; + uiElement.text = model.Value; + uiElement.style.whiteSpace = wrapMode; uiElement.style.color = model.GetColor().ToUnityColor(); uiElement.style.fontSize = model.GetFontSize(); uiElement.style.unityTextAlign = model.GetTextAlign().ToUnityTextAlign(); diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/DecentralandProtocol/UiText.gen.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/DecentralandProtocol/UiText.gen.cs index c67d9c843e..fd57440d07 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/DecentralandProtocol/UiText.gen.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/DecentralandProtocol/UiText.gen.cs @@ -27,23 +27,34 @@ static UiTextReflection() { "CilkZWNlbnRyYWxhbmQvc2RrL2NvbXBvbmVudHMvdWlfdGV4dC5wcm90bxIb", "ZGVjZW50cmFsYW5kLnNkay5jb21wb25lbnRzGiBkZWNlbnRyYWxhbmQvY29t", "bW9uL2NvbG9ycy5wcm90bxouZGVjZW50cmFsYW5kL3Nkay9jb21wb25lbnRz", - "L2NvbW1vbi90ZXh0cy5wcm90byKbAgoIUEJVaVRleHQSDQoFdmFsdWUYASAB", + "L2NvbW1vbi90ZXh0cy5wcm90byLoAgoIUEJVaVRleHQSDQoFdmFsdWUYASAB", "KAkSLwoFY29sb3IYAiABKAsyGy5kZWNlbnRyYWxhbmQuY29tbW9uLkNvbG9y", "NEgAiAEBEkoKCnRleHRfYWxpZ24YAyABKA4yMS5kZWNlbnRyYWxhbmQuc2Rr", "LmNvbXBvbmVudHMuY29tbW9uLlRleHRBbGlnbk1vZGVIAYgBARI7CgRmb250", "GAQgASgOMiguZGVjZW50cmFsYW5kLnNkay5jb21wb25lbnRzLmNvbW1vbi5G", - "b250SAKIAQESFgoJZm9udF9zaXplGAUgASgFSAOIAQFCCAoGX2NvbG9yQg0K", - "C190ZXh0X2FsaWduQgcKBV9mb250QgwKCl9mb250X3NpemVCFKoCEURDTC5F", - "Q1NDb21wb25lbnRzYgZwcm90bzM=")); + "b250SAKIAQESFgoJZm9udF9zaXplGAUgASgFSAOIAQESPQoJdGV4dF93cmFw", + "GAYgASgOMiUuZGVjZW50cmFsYW5kLnNkay5jb21wb25lbnRzLlRleHRXcmFw", + "SASIAQFCCAoGX2NvbG9yQg0KC190ZXh0X2FsaWduQgcKBV9mb250QgwKCl9m", + "b250X3NpemVCDAoKX3RleHRfd3JhcConCghUZXh0V3JhcBILCgdUV19XUkFQ", + "EAASDgoKVFdfTk9fV1JBUBABQhSqAhFEQ0wuRUNTQ29tcG9uZW50c2IGcHJv", + "dG8z")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { global::Decentraland.Common.ColorsReflection.Descriptor, global::DCL.ECSComponents.TextsReflection.Descriptor, }, - new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::DCL.ECSComponents.PBUiText), global::DCL.ECSComponents.PBUiText.Parser, new[]{ "Value", "Color", "TextAlign", "Font", "FontSize" }, new[]{ "Color", "TextAlign", "Font", "FontSize" }, null, null, null) + new pbr::GeneratedClrTypeInfo(new[] {typeof(global::DCL.ECSComponents.TextWrap), }, null, new pbr::GeneratedClrTypeInfo[] { + new pbr::GeneratedClrTypeInfo(typeof(global::DCL.ECSComponents.PBUiText), global::DCL.ECSComponents.PBUiText.Parser, new[]{ "Value", "Color", "TextAlign", "Font", "FontSize", "TextWrap" }, new[]{ "Color", "TextAlign", "Font", "FontSize", "TextWrap" }, null, null, null) })); } #endregion } + #region Enums + public enum TextWrap { + [pbr::OriginalName("TW_WRAP")] TwWrap = 0, + [pbr::OriginalName("TW_NO_WRAP")] TwNoWrap = 1, + } + + #endregion + #region Messages public sealed partial class PBUiText : pb::IMessage #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE @@ -86,6 +97,7 @@ public PBUiText(PBUiText other) : this() { textAlign_ = other.textAlign_; font_ = other.font_; fontSize_ = other.fontSize_; + textWrap_ = other.textWrap_; _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); } @@ -99,7 +111,7 @@ public PBUiText Clone() { public const int ValueFieldNumber = 1; private string value_ = ""; /// - /// the text content + /// the text content, tag <b> and <i> are supported /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] @@ -209,6 +221,34 @@ public void ClearFontSize() { _hasBits0 &= ~4; } + /// Field number for the "text_wrap" field. + public const int TextWrapFieldNumber = 6; + private global::DCL.ECSComponents.TextWrap textWrap_; + /// + /// wrap text when the border is reached (default: TW_WRAP) + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public global::DCL.ECSComponents.TextWrap TextWrap { + get { if ((_hasBits0 & 8) != 0) { return textWrap_; } else { return global::DCL.ECSComponents.TextWrap.TwWrap; } } + set { + _hasBits0 |= 8; + textWrap_ = value; + } + } + /// Gets whether the "text_wrap" field is set + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public bool HasTextWrap { + get { return (_hasBits0 & 8) != 0; } + } + /// Clears the value of the "text_wrap" field + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public void ClearTextWrap() { + _hasBits0 &= ~8; + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override bool Equals(object other) { @@ -229,6 +269,7 @@ public bool Equals(PBUiText other) { if (TextAlign != other.TextAlign) return false; if (Font != other.Font) return false; if (FontSize != other.FontSize) return false; + if (TextWrap != other.TextWrap) return false; return Equals(_unknownFields, other._unknownFields); } @@ -241,6 +282,7 @@ public override int GetHashCode() { if (HasTextAlign) hash ^= TextAlign.GetHashCode(); if (HasFont) hash ^= Font.GetHashCode(); if (HasFontSize) hash ^= FontSize.GetHashCode(); + if (HasTextWrap) hash ^= TextWrap.GetHashCode(); if (_unknownFields != null) { hash ^= _unknownFields.GetHashCode(); } @@ -279,6 +321,10 @@ public void WriteTo(pb::CodedOutputStream output) { output.WriteRawTag(40); output.WriteInt32(FontSize); } + if (HasTextWrap) { + output.WriteRawTag(48); + output.WriteEnum((int) TextWrap); + } if (_unknownFields != null) { _unknownFields.WriteTo(output); } @@ -309,6 +355,10 @@ public void WriteTo(pb::CodedOutputStream output) { output.WriteRawTag(40); output.WriteInt32(FontSize); } + if (HasTextWrap) { + output.WriteRawTag(48); + output.WriteEnum((int) TextWrap); + } if (_unknownFields != null) { _unknownFields.WriteTo(ref output); } @@ -334,6 +384,9 @@ public int CalculateSize() { if (HasFontSize) { size += 1 + pb::CodedOutputStream.ComputeInt32Size(FontSize); } + if (HasTextWrap) { + size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) TextWrap); + } if (_unknownFields != null) { size += _unknownFields.CalculateSize(); } @@ -364,6 +417,9 @@ public void MergeFrom(PBUiText other) { if (other.HasFontSize) { FontSize = other.FontSize; } + if (other.HasTextWrap) { + TextWrap = other.TextWrap; + } _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); } @@ -402,6 +458,10 @@ public void MergeFrom(pb::CodedInputStream input) { FontSize = input.ReadInt32(); break; } + case 48: { + TextWrap = (global::DCL.ECSComponents.TextWrap) input.ReadEnum(); + break; + } } } #endif @@ -440,6 +500,10 @@ public void MergeFrom(pb::CodedInputStream input) { FontSize = input.ReadInt32(); break; } + case 48: { + TextWrap = (global::DCL.ECSComponents.TextWrap) input.ReadEnum(); + break; + } } } } From b3b170e404ec43bb8bc08ec1f6072812005ebad3 Mon Sep 17 00:00:00 2001 From: Aga Date: Tue, 9 Jul 2024 16:22:36 +0100 Subject: [PATCH 10/10] chore: update the auto assign review config (#6233) --- .github/auto_assign_config.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/auto_assign_config.yml b/.github/auto_assign_config.yml index 567418c250..4bc99fe26b 100644 --- a/.github/auto_assign_config.yml +++ b/.github/auto_assign_config.yml @@ -10,11 +10,12 @@ reviewGroups: - lorux0 - davidejensen - popuz - - mikhail-dcl - pravusjif + - mikhail-dcl + - dalkia + - AlejandroAlvarezMelucciDCL qa: - Ludmilafantaniella - - LucasLioyQA - anicalbano filterLabels: