Merge branch 'master' of http://git.mokasz.com/zouyong/mk_framework

assets/resources/game/prefab/game.prefab

@@ -4120,7 +4120,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 217,
-      "height": 60
+      "height": 58
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -4132,7 +4132,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        0,
+        -1,
         0,
         0,
         0,
@@ -4175,7 +4175,7 @@
       "__uuid__": "146c87a4-54bc-43db-8e7a-c1e92835c69c"
     },
     "_type": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillType": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
@@ -4229,8 +4229,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 90.75,
-      "height": 44.32
+      "width": 59.53,
+      "height": 48.36
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -4241,8 +4241,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        0,
-        0,
+        -6,
+        2.5,
         0,
         0,
         0,
@@ -4281,10 +4281,10 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "300元",
-    "_N$string": "300元",
-    "_fontSize": 32,
-    "_lineHeight": 32,
+    "_string": "0元",
+    "_N$string": "0元",
+    "_fontSize": 36,
+    "_lineHeight": 36,
     "_enableWrapText": true,
     "_N$file": {
       "__uuid__": "0bc2f1e8-1dd4-45ba-8f7e-36c47dde4152"
@@ -4316,7 +4316,7 @@
       "b": 0,
       "a": 255
     },
-    "_width": 2,
+    "_width": 1.5,
     "_id": ""
   },
   {
@@ -4637,7 +4637,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 217,
-      "height": 60
+      "height": 58
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -4649,7 +4649,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        0,
+        -1,
         0,
         0,
         0,
@@ -4692,7 +4692,7 @@
       "__uuid__": "146c87a4-54bc-43db-8e7a-c1e92835c69c"
     },
     "_type": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillType": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
@@ -4746,8 +4746,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 95.25,
-      "height": 44.32
+      "width": 23.53,
+      "height": 48.36
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -4758,8 +4758,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        0,
-        0,
+        -6,
+        2.5,
         0,
         0,
         0,
@@ -4798,10 +4798,10 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "22222",
-    "_N$string": "22222",
-    "_fontSize": 32,
-    "_lineHeight": 32,
+    "_string": "0",
+    "_N$string": "0",
+    "_fontSize": 36,
+    "_lineHeight": 36,
     "_enableWrapText": true,
     "_N$file": {
       "__uuid__": "0bc2f1e8-1dd4-45ba-8f7e-36c47dde4152"
@@ -4833,7 +4833,7 @@
       "b": 0,
       "a": 255
     },
-    "_width": 2,
+    "_width": 1.5,
     "_id": ""
   },
   {

assets/resources/module/pigBank/pigBank.prefab

@@ -688,7 +688,7 @@
       "ctor": "Float64Array",
       "array": [
         243.665,
-        -359.42,
+        -375,
         0,
         0,
         0,
@@ -1523,7 +1523,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 428,
+      "width": 460,
       "height": 60
     },
     "_anchorPoint": {
@@ -1536,7 +1536,7 @@
       "ctor": "Float64Array",
       "array": [
         -10.56,
-        -359.255,
+        -375,
         0,
         0,
         0,
@@ -1590,7 +1590,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 264,
+      "width": 284,
       "height": 54.4
     },
     "_anchorPoint": {
@@ -1602,7 +1602,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -82,
+        -88,
         0,
         0,
         0,
@@ -1644,7 +1644,7 @@
     "_dstBlendFactor": 771,
     "_string": "每观看一个视频，都有",
     "_N$string": "每观看一个视频，都有",
-    "_fontSize": 26,
+    "_fontSize": 28,
     "_lineHeight": 40,
     "_enableWrapText": true,
     "_N$file": {
@@ -1721,7 +1721,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 108,
+      "width": 116,
       "height": 54.4
     },
     "_anchorPoint": {
@@ -1733,7 +1733,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        104,
+        112,
         0,
         0,
         0,
@@ -1775,7 +1775,7 @@
     "_dstBlendFactor": 771,
     "_string": "一笔现金",
     "_N$string": "一笔现金",
-    "_fontSize": 26,
+    "_fontSize": 28,
     "_lineHeight": 40,
     "_enableWrapText": true,
     "_N$file": {
@@ -1852,7 +1852,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 56,
+      "width": 60,
       "height": 54.4
     },
     "_anchorPoint": {
@@ -1864,7 +1864,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        186,
+        200,
         0,
         0,
         0,
@@ -1906,7 +1906,7 @@
     "_dstBlendFactor": 771,
     "_string": "存入",
     "_N$string": "存入",
-    "_fontSize": 26,
+    "_fontSize": 28,
     "_lineHeight": 40,
     "_enableWrapText": true,
     "_N$file": {
@@ -1963,7 +1963,7 @@
     "_enabled": true,
     "_layoutSize": {
       "__type__": "cc.Size",
-      "width": 428,
+      "width": 460,
       "height": 60
     },
     "_resize": 1,

assets/script/game/module/help/Help.ts

@@ -12,7 +12,6 @@ export default class Help extends cc.Component {
     lbl_desc: cc.Label = null;
 
     start(){
-        mk.audio.playEffect("button");
     }
 
     update() {