Merge remote-tracking branch 'origin/develop'

ZigvyCorp · Feb 10, 2023 · 4d15959 · 4d15959
2 parents bef0940 + fb2ab8c
commit 4d15959
Show file tree

Hide file tree

Showing 15 changed files with 565 additions and 109 deletions.
diff --git a/editor/blocks/en.json b/editor/blocks/en.json
@@ -37,6 +37,7 @@
     "CONTROL_DEBUG_ALERT": "alert",
     "CONTROL_DEFAULT_OPTION": "select",
     "CONTROL_REPORT_TEST_RESULT": "report test result %1",
+    "CONTROL_SETGLOBALPARAM": "set global parameter key %1 value %2",
     "CONTROL_GET_SCRIPT_FROM_SPRITE_CUSTOM_BLOCK": "get script for custom block %1 from sprite %2",
     "CONTROL_GET_SCRIPT_FOR_GREEN_FLAG": "get script for green flag click from sprite %1",
     "CONTROL_GET_SCRIPT_FROM_SPRITE_BLOCK": "get scripts for all blocks from sprite %1 into list %2",
@@ -272,7 +273,15 @@
     "MOTION_POINTTOWARDS_POINTER": "mouse-pointer",
     "MOTION_POINTTOWARDS_RANDOM": "random direction",
     "MOTION_POINTTOWARDS_XY" : "Point towards x %1 y %2 in %3 seconds",
-    "MOTION_SET2DSPEED": "set 2D speed %1 direction %2",
+    "MOTION_SET2DSPEEDX": "set 2D speed in x %1",
+    "MOTION_SET2DSPEEDY": "set 2D speed in y %1",
+    "MOTION_SET2DSPEED": "set 2D speed %1 in direction %2",
+    "MOTION_GET2DSPEEDX": "2D speed in x",
+    "MOTION_GET2DSPEEDY": "2D speed in y",
+    "MOTION_POINTIN2DDIRECTION" :"point to 2D speed direction",
+    "MOTION_SET2DACC": "set 2D acceleration in x %1 y %2",
+    "MOTION_SET2DCOLLISION": "turn on 2D collision with %1",
+    "MOTION_GET2DCOLLISION": "in 2D collision %1",
     "MOTION_GOTO": "go to %1",
     "MOTION_GOTO_POINTER": "mouse-pointer",
     "MOTION_GOTO_RANDOM": "random position",
@@ -375,6 +384,7 @@
     "OPERATORS_TEXTTRANSFORM_LOWERCASE": "lowercase",
     "PROCEDURES_DEFINITION": "define %1",
     "SENSING_TOUCHINGOBJECT": "touching %1?",
+    "SENSING_TOUCHINGOBJECTCLONEID": "clone ID of touched %1",
     "SENSING_TOUCHINGOBJECT_POINTER": "mouse-pointer",
     "SENSING_TOUCHINGOBJECT_EDGE": "edge",
     "SENSING_TOUCHINGCOLOR": "touching color %1?",
@@ -629,10 +639,10 @@
     "BODY_SEGMENTATION": "run body segmentation debug %1 into table %2",
     "DATABASE_OPERATOR": "%1 %2 %3",
     "AI_CREATEKNNCLASSIFIER": "create KNN number classifier from table %1  K %2 named %3",
+    "AI_PREDICTKNNCLASSIFIER": "predict for table %1 with classifier %2 show neighbors %3",
     "ERROR_DEBUG_LABEL_KNN": "First column in table {tableName} has to be 'label'",
     "ERROR_DEBUG_PHYSICS_SCENE_NOT_ENABLED": "Please enable physics for the scene first.",
     "ERROR_DEBUG_NUMBER_KNN": "Row <{ROW}> column <{COLUMN}> of table <{tableName}> is not a number",
-    "AI_PREDICTKNNCLASSIFIER": "predict for table %1 with classifier %2 show neighbors %3",
     "ERROR_DEBUG_TESTING_TABLE_KNN": "Table {tableName} should have the same columns as the table that are used to create the knn classifier",
     "ERROR_DEBUG_TESTING_TABLE_KNN_COL": "The testing table should start with the same columns as the training table",
     "DATA_SETLISTTOCOLUMN": "set list %1 to column %2 of table %3",

diff --git a/editor/blocks/es.json b/editor/blocks/es.json
@@ -37,6 +37,7 @@
     "CONTROL_DEBUG_ALERT": "alerta",
     "CONTROL_DEFAULT_OPTION": "Seleccione",
     "CONTROL_REPORT_TEST_RESULT": "resultado de prueba de informe %1",
+    "CONTROL_SETGLOBALPARAM": "establecer clave de parámetro global %1 valor %2",
     "CONTROL_GET_SCRIPT_FROM_SPRITE_CUSTOM_BLOCK": "obtener script para el bloque personalizado %1 del sprite %2",
     "CONTROL_GET_SCRIPT_FOR_GREEN_FLAG": "obtener secuencia de comandos para hacer clic en la bandera verde del sprite %1",
     "CONTROL_GET_SCRIPT_FROM_SPRITE_BLOCK": "obtener scripts para todos los bloques del sprite %1 a la lista %2",
@@ -271,7 +272,15 @@
     "MOTION_POINTTOWARDS_POINTER": "puntero del ratón",
     "MOTION_POINTTOWARDS_RANDOM": "dirección aleatoria",
     "MOTION_POINTTOWARDS_XY" : "Apunta hacia x %1 y %2 en %3 segundos",
-    "MOTION_SET2DSPEED": "establecer velocidad 2D %1 dirección %2",
+    "MOTION_SET2DSPEEDX": "establecer velocidad 2D en x %1",
+    "MOTION_SET2DSPEEDY": "establecer velocidad 2D en y %1",
+    "MOTION_SET2DSPEED": "establecer la velocidad 2D %1 en la dirección %2",
+    "MOTION_GET2DSPEEDX": "velocidad 2D en x",
+    "MOTION_GET2DSPEEDY": "velocidad 2D en y",
+    "MOTION_POINTIN2DDIRECTION":"apunta a la dirección de velocidad 2D",
+    "MOTION_SET2DACC": "establecer 2D aceleración en x %1 y %2",
+    "MOTION_SET2DCOLLISION": "encender colisión 2D con %1",
+    "MOTION_GET2DCOLLISION": "en colisión 2D %1",
     "MOTION_GOTO": "ir a %1",
     "MOTION_GOTO_POINTER": "puntero del ratón",
     "MOTION_GOTO_RANDOM": "posición aleatoria",
@@ -374,6 +383,7 @@
     "OPERATORS_TEXTTRANSFORM_LOWERCASE": "minúsculo",
     "PROCEDURES_DEFINITION": "definir %1",
     "SENSING_TOUCHINGOBJECT": "¿tocando %1?",
+    "SENSING_TOUCHINGOBJECTCLONEID": "¿Clonar ID de tocado %1",
     "SENSING_TOUCHINGOBJECT_POINTER": "puntero del ratón",
     "SENSING_TOUCHINGOBJECT_EDGE": "borde",
     "SENSING_TOUCHINGCOLOR": "¿tocando el color %1?",

diff --git a/editor/blocks/fr.json b/editor/blocks/fr.json
@@ -37,6 +37,7 @@
     "CONTROL_DEBUG_ALERT": "alerte",
     "CONTROL_DEFAULT_OPTION": "sélectionner",
     "CONTROL_REPORT_TEST_RESULT": "rapport du résultat du test %1",
+    "CONTROL_SETGLOBALPARAM": "définir la clé de paramètre global %1 valeur %2",
     "CONTROL_GET_SCRIPT_FROM_SPRITE_CUSTOM_BLOCK": "obtenir le script pour le bloc personnalisé %1 à partir du sprite %2",
     "CONTROL_GET_SCRIPT_FOR_GREEN_FLAG": "obtenir le script pour le clic du drapeau vert à partir du sprite %1",
     "CONTROL_GET_SCRIPT_FROM_SPRITE_BLOCK": "obtenir les scripts pour tous les blocs du sprite %1 dans la liste %2",
@@ -271,7 +272,15 @@
     "MOTION_POINTTOWARDS_POINTER": "pointeur de souris",
     "MOTION_POINTTOWARDS_RANDOM": "direction aléatoire",
     "MOTION_POINTTOWARDS_XY" : "Pointez vers x %1 y %2 en %3 secondes",
-    "MOTION_SET2DSPEED": "régler la vitesse 2D %1 direction %2",
+    "MOTION_SET2DSPEEDX": "régler la vitesse 2D en x %1",
+    "MOTION_SET2DSPEEDY": "régler la vitesse 2D en y %1",
+    "MOTION_SET2DSPEED": "régler la vitesse 2D %1 dans la direction %2",
+    "MOTION_GET2DSPEEDX": "vitesse 2D en x",
+    "MOTION_GET2DSPEEDY": "vitesse 2D en y",
+    "MOTION_POINTIN2DDIRECTION": "pointe vers la direction de la vitesse 2D",
+    "MOTION_SET2DACC": "régler l'accélération 2D en x %1 y %2",
+    "MOTION_SET2DCOLLISION": "allumer la collision 2D avec %1",
+    "MOTION_GET2DCOLLISION": "en collision 2D %1",
     "MOTION_GOTO": "aller à %1",
     "MOTION_GOTO_POINTER": "pointeur de souris",
     "MOTION_GOTO_RANDOM": "position aléatoire",
@@ -374,6 +383,7 @@
     "OPERATORS_TEXTTRANSFORM_LOWERCASE": "minuscule",
     "PROCEDURES_DEFINITION": "définir %1",
     "SENSING_TOUCHINGOBJECT": "touche le %1 ?",
+    "SENSING_TOUCHINGOBJECTCLONEID": "ID de clone de %1 touché",
     "SENSING_TOUCHINGOBJECT_POINTER": "pointeur de souris",
     "SENSING_TOUCHINGOBJECT_EDGE": "bord",
     "SENSING_TOUCHINGCOLOR": "couleur %1 touchée ?",

diff --git a/editor/blocks/zh-cn.json b/editor/blocks/zh-cn.json
@@ -37,6 +37,7 @@
     "CONTROL_DEBUG_ALERT": "弹窗",
     "CONTROL_DEFAULT_OPTION": "选择",
     "CONTROL_REPORT_TEST_RESULT": "报告测试结果 %1",
+    "CONTROL_SETGLOBALPARAM": "设置全局参数 键 %1 值 %2",
     "CONTROL_GET_SCRIPT_FROM_SPRITE_CUSTOM_BLOCK": "从角色 %2 获取自定义积木 %1 的脚本",
     "CONTROL_GET_SCRIPT_FOR_GREEN_FLAG": "从角色 %1 获取绿旗点击积木下的脚本",
     "CONTROL_GET_SCRIPT_FROM_SPRITE_BLOCK": "从角色 %1 获取所有脚本到列表格 %2",
@@ -265,14 +266,22 @@
     "MOTION_RIGHT": "右",
     "MOTION_LEFT": "左",
     "MOTION_BLOCKING": "阻挡",
-    "MOTION_NONBLOCKING": "非阻塞",
+    "MOTION_NONBLOCKING": "非阻挡",
     "MOTION_SPRITE_SELECT": "选择",
     "MOTION_POINTINDIRECTION": "面向 %1 方向",
     "MOTION_POINTTOWARDS": "面向 %1",
     "MOTION_POINTTOWARDS_POINTER": "鼠标指针",
     "MOTION_POINTTOWARDS_RANDOM": "随机方向",
     "MOTION_POINTTOWARDS_XY" : "转向 x %1 y %2 用时 %3",
-    "MOTION_SET2DSPEED": "设置 2D 速度 %1 方向 %2",
+    "MOTION_SET2DSPEEDX": "设置 x 方向速度 %1",
+    "MOTION_SET2DSPEEDY": "设置 y 方向速度 %1",
+    "MOTION_SET2DSPEED": "设方向 %2 上的速度为 %1",
+    "MOTION_GET2DSPEEDX": "x 方向速度",
+    "MOTION_GET2DSPEEDY": "y 方向速度",
+    "MOTION_POINTIN2DDIRECTION" :"面向二维速度方向",
+    "MOTION_SET2DACC": "设置二维加速度 x %1 y %2",
+    "MOTION_SET2DCOLLISION": "打开与 %1 的二维碰撞",
+    "MOTION_GET2DCOLLISION": "在 %1 被阻挡（二维）",
     "MOTION_GOTO": "移到 %1",
     "MOTION_GOTO_POINTER": "鼠标指针",
     "MOTION_GOTO_RANDOM": "随机位置",
@@ -296,8 +305,8 @@
     "MOTION_XPOSITION": "x 坐标",
     "MOTION_YPOSITION": "y 坐标",
     "MOTION_ZPOSITION": "z 坐标",
-    "MOTION_VPXPOSITION": "视口 x 位置",
-    "MOTION_VPYPOSITION": "视口 y 位置",
+    "MOTION_VPXPOSITION": "视窗 x 坐标",
+    "MOTION_VPYPOSITION": "视窗 y 坐标",
     "MOTION_DIRECTION": "方向",
     "MOTION_SCROLLRIGHT": "向右滚动 %1",
     "MOTION_SCROLLUP": "向上滚动 %1",
@@ -375,6 +384,7 @@
     "OPERATORS_TEXTTRANSFORM_LOWERCASE": "小写",
     "PROCEDURES_DEFINITION": "定义 %1",
     "SENSING_TOUCHINGOBJECT": "碰到 %1 ?",
+    "SENSING_TOUCHINGOBJECTCLONEID": "被碰到的 %1 的克隆 ID",
     "SENSING_TOUCHINGOBJECT_POINTER": "鼠标指针",
     "SENSING_TOUCHINGOBJECT_EDGE": "舞台边缘",
     "SENSING_TOUCHINGCOLOR": "碰到颜色 %1 ?",
@@ -629,12 +639,12 @@
     "AI_UPDATEDEBUG": "设置调试模式 %1",
     "BODY_SEGMENTATION": "运行人体识别 调试 %1 保存到表格 %2",
     "DATABASE_OPERATOR": "%1 %2 %3",
-    "AI_CREATEKNNCLASSIFIER": "从名为 %3 的表格 %1 K %2 创建 KNN 编号分类器",
+    "AI_CREATEKNNCLASSIFIER": "从表格 %1 创建 KNN 分类器 K %2 名为 %3",
+    "AI_PREDICTKNNCLASSIFIER": "用分类器 %2 预测表格 %1 显示邻居 %3",
+    "ERROR_DEBUG_TESTING_TABLE_KNN": "表格 {tableName} 应具有与用于创建 knn 分类器的表相同的列",
     "ERROR_DEBUG_LABEL_KNN": "表格 {tableName} 的第一列必须是 'label'",
     "ERROR_DEBUG_PHYSICS_SCENE_NOT_ENABLED": "请先为场景启用物理引擎",
     "ERROR_DEBUG_NUMBER_KNN": "表 <{tableName}> 的行 <{ROW}> 列 <{COLUMN}> 不是数字", 
-    "AI_PREDICTKNNCLASSIFIER": "预测表格 %1, 分类器为 %2, 邻居为 %3",
-    "ERROR_DEBUG_TESTING_TABLE_KNN": "表格 {tableName} 应具有与用于创建 knn 分类器的表相同的列",
     "ERROR_DEBUG_TESTING_TABLE_KNN_COL": "测试表应以与训练表相同的列开头",
     "DATA_SETLISTTOCOLUMN": "将列表格 %1 设置为表格 %3 的列 %2",
     "AI_OPENAIGPT3": "OpenAI GPT-3: 请求 %1 词数限制 %2",

diff --git a/editor/blocks/zh-tw.json b/editor/blocks/zh-tw.json
@@ -37,6 +37,7 @@
     "CONTROL_DEBUG_ALERT": "彈窗",
     "CONTROL_DEFAULT_OPTION": "選擇",
     "CONTROL_REPORT_TEST_RESULT": "報告測試結果 %1",
+    "CONTROL_SETGLOBALPARAM": "設置全局參數 鍵 %1 值 %2",
     "CONTROL_GET_SCRIPT_FROM_SPRITE_CUSTOM_BLOCK": "從角色 %2 獲取自定義積木 %1 的腳本",
     "CONTROL_GET_SCRIPT_FOR_GREEN_FLAG": "從角色 %1 獲取綠旗點擊積木下的腳本",
     "CONTROL_GET_SCRIPT_FROM_SPRITE_BLOCK": "從角色 %1 獲取所有腳本到列表格 %2",
@@ -263,14 +264,22 @@
     "MOTION_RIGHT": "右",
     "MOTION_LEFT": "左",
     "MOTION_BLOCKING": "阻擋",
-    "MOTION_NONBLOCKING": "非阻塞",
+    "MOTION_NONBLOCKING": "非阻擋",
     "MOTION_SPRITE_SELECT": "選擇",
-    "MOTION_POINTINDIRECTION": "面朝 %1 度",
-    "MOTION_POINTTOWARDS": "面朝 %1 向",
+    "MOTION_POINTINDIRECTION": "面向 %1 度",
+    "MOTION_POINTTOWARDS": "面向 %1",
     "MOTION_POINTTOWARDS_POINTER": "鼠標",
     "MOTION_POINTTOWARDS_RANDOM": "隨機",
     "MOTION_POINTTOWARDS_XY" : "轉向 x %1 y %2 用時 %3",
-    "MOTION_SET2DSPEED": "設置 2D 速度 %1 方向 %2",
+    "MOTION_SET2DSPEEDX": "設置 x 方向速度 %1",
+    "MOTION_SET2DSPEEDY": "設置 y 方向速度 %1",
+    "MOTION_SET2DSPEED": "設方向 %2 上的速度為 %1",
+    "MOTION_GET2DSPEEDX": "x 方向速度",
+    "MOTION_GET2DSPEEDY": "y 方向速度",
+    "MOTION_POINTIN2DDIRECTION" :"面向二維速度方向",
+    "MOTION_SET2DACC": "設置二維加速度 x %1 y %2",
+    "MOTION_SET2DCOLLISION": "打開與 %1 的二維碰撞",
+    "MOTION_GET2DCOLLISION": "在 %1 被阻擋（二維）",
     "MOTION_GOTO": "定位到 %1 位置",
     "MOTION_GOTO_POINTER": "鼠標",
     "MOTION_GOTO_RANDOM": "隨機",
@@ -373,6 +382,7 @@
     "OPERATORS_TEXTTRANSFORM_LOWERCASE": "小寫",
     "PROCEDURES_DEFINITION": "定義 %1",
     "SENSING_TOUCHINGOBJECT": "碰到 %1？",
+    "SENSING_TOUCHINGOBJECTCLONEID": "被碰到的 %1 的克隆 ID",
     "SENSING_TOUCHINGOBJECT_POINTER": "鼠標",
     "SENSING_TOUCHINGOBJECT_EDGE": "邊緣",
     "SENSING_TOUCHINGCOLOR": "碰到顏色 %1？",
@@ -616,11 +626,11 @@
     "AI_UPDATEDEBUG": "設置調試模式 %1",
     "BODY_SEGMENTATION": "運行人體識別 調試 %1 保存到表格 %2",
     "DATABASE_OPERATOR": "%1 %2 %3",
-    "AI_CREATEKNNCLASSIFIER": "從名為 %3 的表格 %1 K %2 創建 KNN 編號分類器",
+    "AI_CREATEKNNCLASSIFIER": "從表格 %1 創建 KNN 分類器 K %2 名為 %3",
+    "AI_PREDICTKNNCLASSIFIER": "用分類器 %2 預測表格 %1 顯示鄰居 %3",
     "ERROR_DEBUG_LABEL_KNN": "表格 {tableName} 的第一列必須是 'label'",
     "ERROR_DEBUG_PHYSICS_SCENE_NOT_ENABLED": "請先為場景啟用物理引擎",
     "ERROR_DEBUG_NUMBER_KNN": "表格 <{tableName}> 的行 <{ROW}> 列 <{COLUMN}> 不是數字", 
-    "AI_PREDICTKNNCLASSIFIER": "預測表格 %1, 分類器為 %2, 鄰居為 %3",
     "ERROR_DEBUG_TESTING_TABLE_KNN": "表 {tableName} 應具有與用於創建 knn 分類器的表相同的列",
     "ERROR_DEBUG_TESTING_TABLE_KNN_COL": "測試表應以與訓練表相同的列開頭",
     "DATA_SETLISTTOCOLUMN": "將列表格 %1 設置為表格 %3 的列 %2",