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

assets/resources/game/prefab/game.prefab

@@ -30,13 +30,13 @@
         "__id__": 16
       },
       {
-        "__id__": 176
+        "__id__": 184
       },
       {
-        "__id__": 179
+        "__id__": 187
       },
       {
-        "__id__": 188
+        "__id__": 196
       },
       {
         "__id__": 120
@@ -45,14 +45,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 190
+        "__id__": 198
       },
       {
-        "__id__": 192
+        "__id__": 200
       }
     ],
     "_prefab": {
-      "__id__": 193
+      "__id__": 201
     },
     "_opacity": 255,
     "_color": {
@@ -527,7 +527,7 @@
       }
     ],
     "_prefab": {
-      "__id__": 175
+      "__id__": 183
     },
     "_opacity": 255,
     "_color": {
@@ -3753,29 +3753,29 @@
     },
     "_children": [
       {
-        "__id__": 157
+        "__id__": 165
       },
       {
-        "__id__": 160
+        "__id__": 168
       },
       {
-        "__id__": 165
+        "__id__": 173
       },
       {
-        "__id__": 168
+        "__id__": 176
       },
       {
-        "__id__": 171
+        "__id__": 179
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 173
+        "__id__": 181
       }
     ],
     "_prefab": {
-      "__id__": 174
+      "__id__": 182
     },
     "_opacity": 255,
     "_color": {
@@ -3851,11 +3851,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 155
+        "__id__": 163
       }
     ],
     "_prefab": {
-      "__id__": 156
+      "__id__": 164
     },
     "_opacity": 255,
     "_color": {
@@ -4510,20 +4510,20 @@
         "__id__": 142
       },
       {
-        "__id__": 147
+        "__id__": 155
       },
       {
-        "__id__": 150
+        "__id__": 158
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 153
+        "__id__": 161
       }
     ],
     "_prefab": {
-      "__id__": 154
+      "__id__": 162
     },
     "_opacity": 255,
     "_color": {
@@ -4681,26 +4681,97 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "现金",
+    "_name": "现金布局",
     "_objFlags": 0,
     "_parent": {
       "__id__": 138
     },
-    "_children": [],
-    "_active": true,
-    "_components": [
+    "_children": [
       {
         "__id__": 143
       },
       {
+        "__id__": 148
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 153
+      }
+    ],
+    "_prefab": {
+      "__id__": 154
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 113.16,
+      "height": 60
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "现金",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 142
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
         "__id__": 144
       },
       {
         "__id__": 145
+      },
+      {
+        "__id__": 146
       }
     ],
     "_prefab": {
-      "__id__": 146
+      "__id__": 147
     },
     "_opacity": 255,
     "_color": {
@@ -4712,7 +4783,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 59.53,
+      "width": 74.16,
       "height": 48.36
     },
     "_anchorPoint": {
@@ -4724,7 +4795,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -6,
+        -19.5,
         0,
         0,
         0,
@@ -4754,7 +4825,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 142
+      "__id__": 143
     },
     "_enabled": true,
     "_materials": [
@@ -4764,8 +4835,8 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "0元",
-    "_N$string": "0元",
+    "_string": "0.00",
+    "_N$string": "0.00",
     "_fontSize": 36,
     "_lineHeight": 36,
     "_enableWrapText": true,
@@ -4789,8 +4860,152 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
+      "__id__": 143
+    },
+    "_enabled": true,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 0,
+      "b": 0,
+      "a": 255
+    },
+    "_width": 1.5,
+    "_id": ""
+  },
+  {
+    "__type__": "88626F5Zl9BIKjmKaYlyRWH",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 143
+    },
+    "_enabled": true,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "b4dea4a9-29c8-46bc-a50d-5754afa7a2bd"
+    },
+    "fileId": "555WjycVxIQpVRAf+7+DL7",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "元",
+    "_objFlags": 0,
+    "_parent": {
       "__id__": 142
     },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 149
+      },
+      {
+        "__id__": 150
+      },
+      {
+        "__id__": 151
+      }
+    ],
+    "_prefab": {
+      "__id__": 152
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 39,
+      "height": 48.36
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        37.08,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 148
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "元",
+    "_N$string": "元",
+    "_fontSize": 36,
+    "_lineHeight": 36,
+    "_enableWrapText": true,
+    "_N$file": {
+      "__uuid__": "0bc2f1e8-1dd4-45ba-8f7e-36c47dde4152"
+    },
+    "_isSystemFontUsed": false,
+    "_spacingX": 0,
+    "_batchAsBitmap": false,
+    "_styleFlags": 0,
+    "_underlineHeight": 0,
+    "_N$horizontalAlign": 1,
+    "_N$verticalAlign": 1,
+    "_N$fontFamily": "Arial",
+    "_N$overflow": 0,
+    "_N$cacheMode": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.LabelOutline",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 148
+    },
     "_enabled": true,
     "_color": {
       "__type__": "cc.Color",
@@ -4807,9 +5022,52 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
+      "__id__": 148
+    },
+    "_enabled": true,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "b4dea4a9-29c8-46bc-a50d-5754afa7a2bd"
+    },
+    "fileId": "4ftsQxx6JC76L/8y21vtA9",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Layout",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
       "__id__": 142
     },
     "_enabled": true,
+    "_layoutSize": {
+      "__type__": "cc.Size",
+      "width": 113.16,
+      "height": 60
+    },
+    "_resize": 1,
+    "_N$layoutType": 1,
+    "_N$cellSize": {
+      "__type__": "cc.Size",
+      "width": 40,
+      "height": 40
+    },
+    "_N$startAxis": 0,
+    "_N$paddingLeft": 0,
+    "_N$paddingRight": 0,
+    "_N$paddingTop": 0,
+    "_N$paddingBottom": 0,
+    "_N$spacingX": 0,
+    "_N$spacingY": 0,
+    "_N$verticalDirection": 1,
+    "_N$horizontalDirection": 0,
+    "_N$affectedByScale": false,
     "_id": ""
   },
   {
@@ -4820,7 +5078,7 @@
     "asset": {
       "__uuid__": "b4dea4a9-29c8-46bc-a50d-5754afa7a2bd"
     },
-    "fileId": "62APxhu0xKMIg7d9gVuAvk",
+    "fileId": "ee6PU8DTpOxJC0LyYnJFxT",
     "sync": false
   },
   {
@@ -4834,11 +5092,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 148
+        "__id__": 156
       }
     ],
     "_prefab": {
-      "__id__": 149
+      "__id__": 157
     },
     "_opacity": 255,
     "_color": {
@@ -4892,7 +5150,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 147
+      "__id__": 155
     },
     "_enabled": true,
     "_materials": [
@@ -4941,11 +5199,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 151
+        "__id__": 159
       }
     ],
     "_prefab": {
-      "__id__": 152
+      "__id__": 160
     },
     "_opacity": 255,
     "_color": {
@@ -4999,7 +5257,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 150
+      "__id__": 158
     },
     "_enabled": true,
     "_materials": [
@@ -5114,11 +5372,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 158
+        "__id__": 166
       }
     ],
     "_prefab": {
-      "__id__": 159
+      "__id__": 167
     },
     "_opacity": 255,
     "_color": {
@@ -5172,7 +5430,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 157
+      "__id__": 165
     },
     "_enabled": true,
     "_materials": [
@@ -5221,17 +5479,17 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 161
+        "__id__": 169
       },
       {
-        "__id__": 162
+        "__id__": 170
       },
       {
-        "__id__": 163
+        "__id__": 171
       }
     ],
     "_prefab": {
-      "__id__": 164
+      "__id__": 172
     },
     "_opacity": 255,
     "_color": {
@@ -5285,7 +5543,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 160
+      "__id__": 168
     },
     "_enabled": true,
     "_materials": [
@@ -5320,7 +5578,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 160
+      "__id__": 168
     },
     "_enabled": true,
     "_color": {
@@ -5338,7 +5596,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 160
+      "__id__": 168
     },
     "_enabled": true,
     "_id": ""
@@ -5365,11 +5623,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 166
+        "__id__": 174
       }
     ],
     "_prefab": {
-      "__id__": 167
+      "__id__": 175
     },
     "_opacity": 255,
     "_color": {
@@ -5423,7 +5681,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 165
+      "__id__": 173
     },
     "_enabled": true,
     "_materials": [
@@ -5472,11 +5730,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 169
+        "__id__": 177
       }
     ],
     "_prefab": {
-      "__id__": 170
+      "__id__": 178
     },
     "_opacity": 255,
     "_color": {
@@ -5530,7 +5788,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 168
+      "__id__": 176
     },
     "_enabled": true,
     "_materials": [
@@ -5575,7 +5833,7 @@
       "__id__": 118
     },
     "_prefab": {
-      "__id__": 172
+      "__id__": 180
     },
     "_name": "nodeRedPoint",
     "_active": true,
@@ -5606,7 +5864,7 @@
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 171
+      "__id__": 179
     },
     "asset": {
       "__uuid__": "f88b1639-f17d-4814-85b9-a3d3220bb997"
@@ -5662,11 +5920,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 177
+        "__id__": 185
       }
     ],
     "_prefab": {
-      "__id__": 178
+      "__id__": 186
     },
     "_opacity": 255,
     "_color": {
@@ -5720,7 +5978,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 176
+      "__id__": 184
     },
     "_enabled": true,
     "_materials": [
@@ -5777,20 +6035,20 @@
     },
     "_children": [
       {
-        "__id__": 180
+        "__id__": 188
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 184
+        "__id__": 192
       },
       {
-        "__id__": 186
+        "__id__": 194
       }
     ],
     "_prefab": {
-      "__id__": 187
+      "__id__": 195
     },
     "_opacity": 255,
     "_color": {
@@ -5844,20 +6102,20 @@
     "_name": "Background",
     "_objFlags": 512,
     "_parent": {
-      "__id__": 179
+      "__id__": 187
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 181
+        "__id__": 189
       },
       {
-        "__id__": 182
+        "__id__": 190
       }
     ],
     "_prefab": {
-      "__id__": 183
+      "__id__": 191
     },
     "_opacity": 255,
     "_color": {
@@ -5911,7 +6169,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 180
+      "__id__": 188
     },
     "_enabled": true,
     "_materials": [
@@ -5943,7 +6201,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 180
+      "__id__": 188
     },
     "_enabled": true,
     "alignMode": 0,
@@ -5981,7 +6239,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 179
+      "__id__": 187
     },
     "_enabled": true,
     "_normalMaterial": null,
@@ -5990,7 +6248,7 @@
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 185
+        "__id__": 193
       }
     ],
     "_N$interactable": true,
@@ -6058,7 +6316,7 @@
       "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
     },
     "_N$target": {
-      "__id__": 180
+      "__id__": 188
     },
     "_id": ""
   },
@@ -6077,7 +6335,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 179
+      "__id__": 187
     },
     "_enabled": true,
     "_defaultClip": {
@@ -6109,7 +6367,7 @@
       "__id__": 1
     },
     "_prefab": {
-      "__id__": 189
+      "__id__": 197
     },
     "_name": "游戏核心",
     "_active": false,
@@ -6140,7 +6398,7 @@
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 188
+      "__id__": 196
     },
     "asset": {
       "__uuid__": "4c49ec9e-c64a-4921-84eb-9bdd737656e5"
@@ -6157,7 +6415,7 @@
     },
     "_enabled": true,
     "node_gameplay": {
-      "__id__": 188
+      "__id__": 196
     },
     "node_btn": {
       "__id__": 16
@@ -6166,16 +6424,16 @@
       "__id__": 133
     },
     "lbl_redMoney": {
-      "__id__": 161
+      "__id__": 169
     },
     "lbl_rmb": {
-      "__id__": 143
+      "__id__": 144
     },
     "btn_cashOutNormal": {
-      "__id__": 169
+      "__id__": 177
     },
     "btn_cashOutGold": {
-      "__id__": 151
+      "__id__": 159
     },
     "btn_getRed1": {
       "__id__": 8
@@ -6187,19 +6445,19 @@
       "__id__": 12
     },
     "btn_start": {
-      "__id__": 184
+      "__id__": 192
     },
     "icon_hb": {
-      "__id__": 165
+      "__id__": 173
     },
     "icon_zb": {
-      "__id__": 147
+      "__id__": 155
     },
     "node_top_ui": {
       "__id__": 119
     },
     "nodeRedPoint": {
-      "__id__": 191
+      "__id__": 199
     },
     "_id": ""
   },
@@ -6212,7 +6470,7 @@
       "__id__": 84
     },
     "node_redbagCash": {
-      "__id__": 171
+      "__id__": 179
     },
     "node_blessingBag": {
       "__id__": 99

assets/script/game/module/reward/Reward.ts

@@ -219,7 +219,7 @@ export default class Reward extends cc.Component {
         }
         let rewardNum: number = gData.reward.data[0].rewardNum || 0;
         if (gData.reward.data[0].rewardType === RewardType.pigRmb) {
-            this.lbl_reward_value.string = (rewardNum / 100).toFixed(2);
+            this.lbl_reward_value.string = (rewardNum / 100).toFixed(2) + '元';
         } else {
             this.lbl_reward_value.string = `${rewardNum}`;
         }