Merge branch 'new2' of git.eoxnet.com:pan/pixelheros into new2

assets/resources/gui/element/hbox.prefab.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "1.1.50",
+  "importer": "prefab",
+  "imported": true,
+  "uuid": "8f17083e-f41c-4ceb-bb04-f0aff89268c9",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {
+    "syncNodeName": "hbox"
+  }
+}

assets/resources/gui/element/mission.prefab

@@ -15770,7 +15770,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 606.898,
+      "y": 589.929,
       "z": 0
     },
     "_lrot": {
@@ -15860,7 +15860,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 188.72900390625,
+      "width": 299.56640625,
       "height": 54.4
     },
     "_anchorPoint": {
@@ -15899,8 +15899,8 @@
     "_string": "招募第     个英雄",
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
-    "_actualFontSize": 25,
+    "_actualFontSize": 40,
-    "_fontSize": 25,
+    "_fontSize": 40,
     "_fontFamily": "Arial",
     "_lineHeight": 40,
     "_overflow": 0,
@@ -16019,8 +16019,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 20.6845703125,
+      "width": 29.02685546875,
-      "height": 54.4
+      "height": 60.7
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -16058,10 +16058,10 @@
     "_string": "1",
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
-    "_actualFontSize": 30,
+    "_actualFontSize": 45,
-    "_fontSize": 30,
+    "_fontSize": 45,
     "_fontFamily": "Arial",
-    "_lineHeight": 40,
+    "_lineHeight": 45,
     "_overflow": 0,
     "_enableWrapText": true,
     "_font": null,
@@ -16128,8 +16128,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 400,
+      "width": 500,
-      "height": 58
+      "height": 80
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",