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

assets/resources/module/reward/reward.prefab

@@ -926,7 +926,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 113.96,
+      "width": 42.67,
       "height": 41.8
     },
     "_anchorPoint": {
@@ -978,8 +978,8 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "888/3888",
-    "_N$string": "888/3888",
+    "_string": "0/0",
+    "_N$string": "0/0",
     "_fontSize": 25,
     "_lineHeight": 30,
     "_enableWrapText": true,
@@ -1219,8 +1219,8 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "0.5元",
-    "_N$string": "0.5元",
+    "_string": "0.0元",
+    "_N$string": "0.0元",
     "_fontSize": 34,
     "_lineHeight": 30,
     "_enableWrapText": true,

assets/resources/module/reward/rewardMission.prefab

@@ -926,7 +926,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 113.96,
+      "width": 42.67,
       "height": 41.8
     },
     "_anchorPoint": {
@@ -978,8 +978,8 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "888/3888",
-    "_N$string": "888/3888",
+    "_string": "0/0",
+    "_N$string": "0/0",
     "_fontSize": 25,
     "_lineHeight": 30,
     "_enableWrapText": true,
@@ -1219,8 +1219,8 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "0.5元",
-    "_N$string": "0.5元",
+    "_string": "0.0元",
+    "_N$string": "0.0元",
     "_fontSize": 34,
     "_lineHeight": 30,
     "_enableWrapText": true,