Merge branch 'master' of http://zhi-edu.com:3000/lan/zedu_client

gameRes/gameChildSeme/S451/G04/P06/data_451_4_6.json

@@ -164,32 +164,32 @@
       "v": "8"
     },
     {
-      "name": "item29",
+      "name": "item30",
       "tex": "",
       "x": "836.1",
       "y": "131.7",
       "w": "100.1",
       "h": "113.4",
-      "lb": "15",
+      "lb": "24",
       "fontSize": 90,
-      "color": "d55011",
+      "color": "2373b7",
       "act": 0,
       "isTo": false,
-      "v": "9"
+      "v": "10"
     },
     {
-      "name": "item210",
+      "name": "item29",
       "tex": "",
       "x": "994.4",
       "y": "131.7",
       "w": "100.1",
       "h": "113.4",
-      "lb": "24",
+      "lb": "15",
       "fontSize": 90,
-      "color": "2373b7",
+      "color": "d55011",
       "act": 0,
       "isTo": false,
-      "v": "10"
+      "v": "9"
     }
   ],
   "bgNode": [

settings/project.json

@@ -37,7 +37,7 @@
       "enable": false
     }
   },
-  "last-module-event-record-time": 1633673996356,
+  "last-module-event-record-time": 1634612051488,
   "migrate-history": [
     "cloud-function"
   ]