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

assets/scene/Editor.fire

@@ -174,7 +174,7 @@
       "array": [
         0,
         0,
-        526.6516986764118,
+        692.820323027551,
         0,
         0,
         0,

assets/script/ui/gameMode/BaseGameUI.ts

@@ -130,7 +130,7 @@ export class BaseGameUI extends BaseUI {
                     }
                 }
                 let labelNode = cc.find('label', node)
-                let label
+                let label: cc.Label
                 if (data.lb) {
                     if (!labelNode) {
                         labelNode = new cc.Node()
@@ -144,6 +144,9 @@ export class BaseGameUI extends BaseUI {
                     label.string = data.lb
                     label.fontSize = data.fontSize
                     label.lineHeight = data.fontSize
+                    label.verticalAlign = cc.Label.VerticalAlign.CENTER
+                    label.horizontalAlign = cc.Label.HorizontalAlign.CENTER
+                    // @ts-ignore
                     label._forceUpdateRenderData(true)
                     node.width = labelNode.width
                     node.height = labelNode.height

gameRes/gameChildSeme/S231/G06/P01/data_231_6_1.json

@@ -11,7 +11,7 @@
       "x": "634.0",
       "y": "342.0",
       "act": -1,
-      "v": "1"
+      "v": "-1"
     },
     {
       "name": "item2",
@@ -19,7 +19,7 @@
       "x": "835.0",
       "y": "342.0",
       "act": -1,
-      "v": "-1"
+      "v": "1"
     },
     {
       "name": "item3",

gameRes/gameHomeSeme/S341/G03/P01/data_341_3_1.json

@@ -11,7 +11,7 @@
       "x": "239.1",
       "y": "181.0",
       "act": 0,
-      "v": "1"
+      "v": "-1"
     },
     {
       "name": "circle",
@@ -19,7 +19,7 @@
       "x": "517.1",
       "y": "181.0",
       "act": 0,
-      "v": "1"
+      "v": "-1"
     },
     {
       "name": "circle",
@@ -35,7 +35,7 @@
       "x": "1073.1",
       "y": "181.0",
       "act": 0,
-      "v": "1"
+      "v": "-1"
     }
   ],
   "bgNode": [

gameRes/gameHomeSeme/S341/G03/P02/data_341_3_2.json

@@ -11,7 +11,7 @@
       "x": "239.1",
       "y": "181.0",
       "act": 0,
-      "v": "1"
+      "v": "-1"
     },
     {
       "name": "circle",
@@ -27,7 +27,7 @@
       "x": "795.1",
       "y": "181.0",
       "act": 0,
-      "v": "1"
+      "v": "-1"
     },
     {
       "name": "circle",
@@ -35,7 +35,7 @@
       "x": "1073.1",
       "y": "181.0",
       "act": 0,
-      "v": "1"
+      "v": "-1"
     }
   ],
   "bgNode": [

gameRes/gameHomeSeme/S341/G03/P03/data_341_3_3.json

@@ -11,7 +11,7 @@
       "x": "363.5",
       "y": "381.6",
       "act": 0,
-      "v": "1"
+      "v": "-1"
     },
     {
       "name": "circle",
@@ -19,7 +19,7 @@
       "x": "868.7",
       "y": "381.6",
       "act": 0,
-      "v": "1"
+      "v": "-1"
     },
     {
       "name": "circle",
@@ -35,7 +35,7 @@
       "x": "868.7",
       "y": "138.6",
       "act": 0,
-      "v": "1"
+      "v": "-1"
     }
   ],
   "bgNode": [

gameRes/gameHomeSeme/S341/G03/P04/data_341_3_4.json

@@ -19,7 +19,7 @@
       "x": "517.1",
       "y": "181.0",
       "act": 0,
-      "v": "1"
+      "v": "-1"
     },
     {
       "name": "circle",
@@ -27,7 +27,7 @@
       "x": "795.1",
       "y": "181.0",
       "act": 0,
-      "v": "1"
+      "v": "-1"
     },
     {
       "name": "circle",
@@ -35,7 +35,7 @@
       "x": "1073.1",
       "y": "181.0",
       "act": 0,
-      "v": "1"
+      "v": "-1"
     }
   ],
   "bgNode": [

gameRes/gameHomeSeme/S341/G03/P05/data_341_3_5.json

@@ -11,7 +11,7 @@
       "x": "239.1",
       "y": "181.0",
       "act": 0,
-      "v": "1"
+      "v": "-1"
     },
     {
       "name": "circle",
@@ -19,7 +19,7 @@
       "x": "517.1",
       "y": "181.0",
       "act": 0,
-      "v": "1"
+      "v": "-1"
     },
     {
       "name": "circle",
@@ -35,7 +35,7 @@
       "x": "1073.1",
       "y": "181.0",
       "act": 0,
-      "v": "1"
+      "v": "-1"
     }
   ],
   "bgNode": [

gameRes/gameHomeSeme/S341/G03/P06/data_341_3_6.json

@@ -11,7 +11,7 @@
       "x": "239.1",
       "y": "181.0",
       "act": 0,
-      "v": "1"
+      "v": "-1"
     },
     {
       "name": "circle",
@@ -27,7 +27,7 @@
       "x": "795.1",
       "y": "181.0",
       "act": 0,
-      "v": "1"
+      "v": "-1"
     },
     {
       "name": "circle",
@@ -35,7 +35,7 @@
       "x": "1073.1",
       "y": "181.0",
       "act": 0,
-      "v": "1"
+      "v": "-1"
     }
   ],
   "bgNode": [

gameRes/gameHomeSeme/S341/G03/P07/data_341_3_7.json

@@ -19,7 +19,7 @@
       "x": "517.1",
       "y": "181.0",
       "act": 0,
-      "v": "1"
+      "v": "-1"
     },
     {
       "name": "circle",
@@ -27,7 +27,7 @@
       "x": "795.1",
       "y": "181.0",
       "act": 0,
-      "v": "1"
+      "v": "-1"
     },
     {
       "name": "circle",
@@ -35,7 +35,7 @@
       "x": "1073.1",
       "y": "181.0",
       "act": 0,
-      "v": "1"
+      "v": "-1"
     }
   ],
   "bgNode": [

gameRes/gameHomeSeme/S341/G03/P08/data_341_3_8.json

@@ -11,7 +11,7 @@
       "x": "239.1",
       "y": "181.0",
       "act": 0,
-      "v": "1"
+      "v": "-1"
     },
     {
       "name": "circle",
@@ -27,7 +27,7 @@
       "x": "795.1",
       "y": "181.0",
       "act": 0,
-      "v": "1"
+      "v": "-1"
     },
     {
       "name": "circle",
@@ -35,7 +35,7 @@
       "x": "1073.1",
       "y": "181.0",
       "act": 0,
-      "v": "1"
+      "v": "-1"
     }
   ],
   "bgNode": [

gameRes/gameHomeSeme/S341/G03/P09/data_341_3_9.json

@@ -11,7 +11,7 @@
       "x": "239.1",
       "y": "181.0",
       "act": 0,
-      "v": "1"
+      "v": "-1"
     },
     {
       "name": "circle",
@@ -19,7 +19,7 @@
       "x": "517.1",
       "y": "181.0",
       "act": 0,
-      "v": "1"
+      "v": "-1"
     },
     {
       "name": "circle",
@@ -27,7 +27,7 @@
       "x": "795.1",
       "y": "181.0",
       "act": 0,
-      "v": "1"
+      "v": "-1"
     },
     {
       "name": "circle",

gameRes/gameHomeSeme/S341/G03/P10/data_341_3_10.json

@@ -19,7 +19,7 @@
       "x": "517.1",
       "y": "181.0",
       "act": 0,
-      "v": "1"
+      "v": "-1"
     },
     {
       "name": "circle",
@@ -27,7 +27,7 @@
       "x": "795.1",
       "y": "181.0",
       "act": 0,
-      "v": "1"
+      "v": "-1"
     },
     {
       "name": "circle",
@@ -35,7 +35,7 @@
       "x": "1073.1",
       "y": "181.0",
       "act": 0,
-      "v": "1"
+      "v": "-1"
     }
   ],
   "bgNode": [