From 79df2ced39ceeef2879549c5215c16db39ab02fb Mon Sep 17 00:00:00 2001 From: mmyduckx <308303735@qq.com> Date: Sat, 8 Oct 2022 17:10:18 +0800 Subject: [PATCH] add network-module in function-corpping (#12896) --- editor/engine-features/render-config.json | 15 ++++++++++++++- editor/i18n/en/localization.js | 10 +++++++++- editor/i18n/zh/localization.js | 10 +++++++++- 3 files changed, 32 insertions(+), 3 deletions(-) diff --git a/editor/engine-features/render-config.json b/editor/engine-features/render-config.json index 2220c7bf6d..7d2c9fb079 100644 --- a/editor/engine-features/render-config.json +++ b/editor/engine-features/render-config.json @@ -192,12 +192,21 @@ "description": "i18n:ENGINE.features.tween.description", "wechatPlugin": true }, + "websocket": { + "default": ["websocket"], + "label": "i18n:ENGINE.features.websocket.label", + "description": "i18n:ENGINE.features.websocket.description", + "native": "USE_SOCKET", + "wechatPlugin": false, + "category": "network" + }, "websocket-server": { "default": [], "label": "i18n:ENGINE.features.websocket_server.label", "description": "i18n:ENGINE.features.websocket_server.description", "native": "USE_WEBSOCKET_SERVER", - "wechatPlugin": false + "wechatPlugin": false, + "category": "network" }, "terrain": { "default": ["terrain"], @@ -255,6 +264,10 @@ "animation": { "label": "i18n:ENGINE.features.categories.animation.label", "description": "i18n:ENGINE.features.categories.animation.description" + }, + "network": { + "label": "i18n:ENGINE.features.categories.network.label", + "description": "i18n:ENGINE.features.categories.network.description" } } } diff --git a/editor/i18n/en/localization.js b/editor/i18n/en/localization.js index f2ea6f2b11..4d9f944665 100755 --- a/editor/i18n/en/localization.js +++ b/editor/i18n/en/localization.js @@ -774,6 +774,10 @@ module.exports = { label: 'Animation', description: 'Animation System.', }, + network: { + label: 'Network', + description: 'Network Module.', + }, }, core: { label: "Core", @@ -923,9 +927,13 @@ module.exports = { label: "Custom Render Pipeline (Experimental)", description: "Enable custom render pipeline", }, + websocket: { + label: "WebSocket", + description: "Enable WebSocket for native. For implementation, iOS/macOS uses SocketRocket, Android uses OkHttp, and Windows uses libwebsockets.", + }, websocket_server: { label: "WebSocket Server", - description: "Enable WebSocket Server for native.", + description: "Enable WebSocket Server for native. Note: WebSocket must also be enabled.", }, }, renderable_2d: { diff --git a/editor/i18n/zh/localization.js b/editor/i18n/zh/localization.js index 0d9c286f4f..d992fc3347 100755 --- a/editor/i18n/zh/localization.js +++ b/editor/i18n/zh/localization.js @@ -755,6 +755,10 @@ module.exports = { label: '动画', description: '动画系统。', }, + network: { + label: '网络', + description: '网络模块。', + }, }, core: { label: "核心功能", @@ -904,9 +908,13 @@ module.exports = { label: "自定义渲染管线(实验)", description: "启用自定义渲染管线。", }, + websocket: { + label: "WebSocket", + description: "对原生启用 WebSocket。其中iOS/macOS使用SocketRocket实现, Android使用OkHttp实现, Windows使用libwebsockets实现。", + }, websocket_server: { label: "WebSocket Server", - description: "对原生启用 WebSocket Server。", + description: "对原生启用 WebSocket Server。注意: 必须同时启用 WebSocket。", }, }, renderable_2d: {