Merge branch 'master' of https://github.com/esengine/ecs-framework

# Conflicts: # .gitmodules # extensions/cocos/cocos-ecs/package-lock.json # extensions/cocos/cocos-ecs/package.json
2025-07-08 08:57:11 +08:00
parent 7b85039b17 2bc45fa574
commit 731edf5872
4 changed files with 14 additions and 1 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -16,6 +16,9 @@
 [submodule "examples/lawn-mower-demo"]
 	path = examples/lawn-mower-demo
 	url = https://github.com/esengine/lawn-mower-demo.git
+[submodule "extensions/cocos/cocos-ecs/extensions/mvvm-designer"]
+	path = extensions/cocos/cocos-ecs/extensions/mvvm-designer
+	url = https://github.com/esengine/mvvm-designer.git
 [submodule "thirdparty/mvvm-ui-framework"]
 	path = thirdparty/mvvm-ui-framework
 	url = https://github.com/esengine/mvvm-ui-framework.git
--- a/extensions/cocos/cocos-ecs/assets/scripts/mvvm-framework.meta
+++ b/extensions/cocos/cocos-ecs/assets/scripts/mvvm-framework.meta
@@ -0,0 +1,9 @@
+{
+  "ver": "1.2.0",
+  "importer": "directory",
+  "imported": true,
+  "uuid": "0ce4b9fe-436f-4735-8ef3-b90bead65200",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}
--- a/extensions/cocos/cocos-ecs/extensions/mvvm-designer
+++ b/extensions/cocos/cocos-ecs/extensions/mvvm-designer
--- a/extensions/cocos/cocos-ecs/package.json
+++ b/extensions/cocos/cocos-ecs/package.json
@@ -10,4 +10,4 @@
    "@esengine/ecs-framework": "^2.1.23",
    "@esengine/mvvm-ui-framework": "^1.0.3"
  }
-}
+}