Merge branch 'v3.8.5' into v3.8.5-pipeline

cocos · Nov 18, 2024 · cc54cf5 · cc54cf5
2 parents 3e9ae76 + 9f61f49
commit cc54cf5
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 9 deletions.
diff --git a/editor/engine-features/render-config.json b/editor/engine-features/render-config.json
@@ -151,6 +151,19 @@
                     "default": true,
                     "isNativeModule": true
                 },
+                "physics-2d-box2d-wasm": {
+                    "label": "i18n:ENGINE.features.physics_2d_box2d_wasm.label",
+                    "description": "i18n:ENGINE.features.physics_2d_box2d_wasm.description",
+                    "flags": {
+                        "LOAD_BOX2D_MANUALLY": {
+                            "label": "i18n:ENGINE.features.flags.box2d.loadManual.label",
+                            "description": "i18n:ENGINE.features.flags.box2d.loadManual.description",
+                            "ui-type": "checkbox",
+                            "default": false
+                        }
+                    }
+
+                },
                 "physics-2d-builtin": {
                     "label": "i18n:ENGINE.features.physics_2d_builtin.label",
                     "description": "i18n:ENGINE.features.physics_2d_builtin.description"

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -80,7 +80,7 @@
     "@babel/plugin-proposal-class-properties": "^7.18.6",
     "@cocos/box2d": "1.0.1",
     "@cocos/cannon": "1.2.8",
-    "@cocos/ccbuild": "^2.2.18",
+    "@cocos/ccbuild": "^2.2.19",
     "@cocos/dragonbones-js": "^1.0.1"
   }
 }