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

assets/resources/game/prefab/game.prefab

@@ -40,22 +40,19 @@
       },
       {
         "__id__": 105
-      },
-      {
-        "__id__": 173
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 176
+        "__id__": 173
       },
       {
-        "__id__": 177
+        "__id__": 174
       }
     ],
     "_prefab": {
-      "__id__": 178
+      "__id__": 175
     },
     "_opacity": 255,
     "_color": {
@@ -5723,114 +5720,6 @@
     "sync": true
   },
   {
-    "__type__": "cc.Node",
-    "_name": "New Label",
-    "_objFlags": 0,
-    "_parent": {
-      "__id__": 1
-    },
-    "_children": [],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 174
-      }
-    ],
-    "_prefab": {
-      "__id__": 175
-    },
-    "_opacity": 255,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
-      "a": 255
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 118.63,
-      "height": 50.4
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_trs": {
-      "__type__": "TypedArray",
-      "ctor": "Float64Array",
-      "array": [
-        130.817,
-        91.572,
-        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__": 173
-    },
-    "_enabled": true,
-    "_materials": [
-      {
-        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
-      }
-    ],
-    "_srcBlendFactor": 770,
-    "_dstBlendFactor": 771,
-    "_string": "111111",
-    "_N$string": "111111",
-    "_fontSize": 40,
-    "_lineHeight": 40,
-    "_enableWrapText": true,
-    "_N$file": null,
-    "_isSystemFontUsed": true,
-    "_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.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__uuid__": "b4dea4a9-29c8-46bc-a50d-5754afa7a2bd"
-    },
-    "fileId": "b4H9DpE2ZHbrPSMoC/ScjU",
-    "sync": false
-  },
-  {
     "__type__": "8760dQYasROwLaLe1idTS07",
     "_name": "",
     "_objFlags": 0,

assets/resources/module/cashNormal/cashNormal.prefab

@@ -19,25 +19,22 @@
     "_children": [
       {
         "__id__": 2
-      },
-      {
-        "__id__": 42
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 49
-      },
-      {
         "__id__": 50
       },
       {
         "__id__": 51
+      },
+      {
+        "__id__": 52
       }
     ],
     "_prefab": {
-      "__id__": 52
+      "__id__": 53
     },
     "_opacity": 255,
     "_color": {
@@ -104,20 +101,23 @@
         "__id__": 13
       },
       {
-        "__id__": 26
+        "__id__": 33
       },
       {
-        "__id__": 37
+        "__id__": 44
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 40
+        "__id__": 47
+      },
+      {
+        "__id__": 48
       }
     ],
     "_prefab": {
-      "__id__": 41
+      "__id__": 49
     },
     "_opacity": 255,
     "_color": {
@@ -536,19 +536,22 @@
     "_children": [
       {
         "__id__": 14
+      },
+      {
+        "__id__": 23
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 23
+        "__id__": 30
       },
       {
-        "__id__": 24
+        "__id__": 31
       }
     ],
     "_prefab": {
-      "__id__": 25
+      "__id__": 32
     },
     "_opacity": 255,
     "_color": {
@@ -561,19 +564,19 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 750,
-      "height": 140
+      "height": 500
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
       "x": 0.5,
-      "y": 0.5
+      "y": 0
     },
     "_trs": {
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
         0,
-        596.935,
+        526.935,
         0,
         0,
         0,
@@ -644,7 +647,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        0,
+        72,
         0,
         0,
         0,
@@ -932,6 +935,237 @@
     "sync": false
   },
   {
+    "__type__": "cc.Node",
+    "_name": "关闭按钮",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 13
+    },
+    "_children": [
+      {
+        "__id__": 24
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 27
+      },
+      {
+        "__id__": 28
+      }
+    ],
+    "_prefab": {
+      "__id__": 29
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 100,
+      "height": 100
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        -325,
+        72,
+        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__": 23
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 25
+      }
+    ],
+    "_prefab": {
+      "__id__": 26
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 22,
+      "height": 36
+    },
+    "_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.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 24
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "96791d9f-b2a7-406c-84c0-d63af62e60ea"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "18ca563c-e8dc-4633-bf04-5fdd65113bb0"
+    },
+    "fileId": "0dlg0I2lZG1qc4IeCj/tO2",
+    "sync": false
+  },
+  {
+    "__type__": "cdc50kCRVVBa5gcp4XXxVO+",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 23
+    },
+    "_enabled": true,
+    "node_panel": {
+      "__id__": 1
+    },
+    "transition_type": 3,
+    "onComplete": [],
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 23
+    },
+    "_enabled": true,
+    "alignMode": 1,
+    "_target": null,
+    "_alignFlags": 8,
+    "_left": 0,
+    "_right": 0,
+    "_top": 18,
+    "_bottom": 0,
+    "_verticalCenter": 0,
+    "_horizontalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 0,
+    "_originalHeight": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "18ca563c-e8dc-4633-bf04-5fdd65113bb0"
+    },
+    "fileId": "2cmqLl4atKsLJuZC2Zq8dq",
+    "sync": false
+  },
+  {
     "__type__": "cc.Sprite",
     "_name": "",
     "_objFlags": 0,
@@ -972,12 +1206,14 @@
     },
     "_enabled": true,
     "alignMode": 1,
-    "_target": null,
+    "_target": {
+      "__id__": 2
+    },
     "_alignFlags": 1,
     "_left": 0,
     "_right": 0,
-    "_top": 0.06500000000005457,
-    "_bottom": 0,
+    "_top": -359.93499999999995,
+    "_bottom": 1193.935,
     "_verticalCenter": 0,
     "_horizontalCenter": 0,
     "_isAbsLeft": true,
@@ -987,7 +1223,7 @@
     "_isAbsHorizontalCenter": true,
     "_isAbsVerticalCenter": true,
     "_originalWidth": 0,
-    "_originalHeight": 0,
+    "_originalHeight": 140,
     "_id": ""
   },
   {
@@ -1010,23 +1246,23 @@
     },
     "_children": [
       {
-        "__id__": 27
+        "__id__": 34
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 33
+        "__id__": 40
       },
       {
-        "__id__": 34
+        "__id__": 41
       },
       {
-        "__id__": 35
+        "__id__": 42
       }
     ],
     "_prefab": {
-      "__id__": 36
+      "__id__": 43
     },
     "_opacity": 255,
     "_color": {
@@ -1080,24 +1316,24 @@
     "_name": "view",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 26
+      "__id__": 33
     },
     "_children": [
       {
-        "__id__": 28
+        "__id__": 35
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 30
+        "__id__": 37
       },
       {
-        "__id__": 31
+        "__id__": 38
       }
     ],
     "_prefab": {
-      "__id__": 32
+      "__id__": 39
     },
     "_opacity": 255,
     "_color": {
@@ -1151,13 +1387,13 @@
     "_name": "content",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 27
+      "__id__": 34
     },
     "_children": [],
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 29
+      "__id__": 36
     },
     "_opacity": 255,
     "_color": {
@@ -1222,7 +1458,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 27
+      "__id__": 34
     },
     "_enabled": true,
     "_materials": [
@@ -1242,7 +1478,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 27
+      "__id__": 34
     },
     "_enabled": true,
     "alignMode": 1,
@@ -1282,7 +1518,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 26
+      "__id__": 33
     },
     "_enabled": true,
     "horizontal": false,
@@ -1294,10 +1530,10 @@
     "scrollEvents": [],
     "cancelInnerEvents": false,
     "_N$content": {
-      "__id__": 28
+      "__id__": 35
     },
     "content": {
-      "__id__": 28
+      "__id__": 35
     },
     "_N$horizontalScrollBar": null,
     "_N$verticalScrollBar": null,
@@ -1308,7 +1544,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 26
+      "__id__": 33
     },
     "_enabled": true,
     "pre_item": [
@@ -1327,7 +1563,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 26
+      "__id__": 33
     },
     "_enabled": true,
     "alignMode": 1,
@@ -1373,11 +1609,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 38
+        "__id__": 45
       }
     ],
     "_prefab": {
-      "__id__": 39
+      "__id__": 46
     },
     "_opacity": 255,
     "_color": {
@@ -1431,7 +1667,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 37
+      "__id__": 44
     },
     "_enabled": true,
     "_materials": [
@@ -1500,234 +1736,13 @@
     "_id": ""
   },
   {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__uuid__": "18ca563c-e8dc-4633-bf04-5fdd65113bb0"
-    },
-    "fileId": "94yiGj0RFACpXt5xGEvfHf",
-    "sync": false
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "关闭按钮",
-    "_objFlags": 0,
-    "_parent": {
-      "__id__": 1
-    },
-    "_children": [
-      {
-        "__id__": 43
-      }
-    ],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 46
-      },
-      {
-        "__id__": 47
-      }
-    ],
-    "_prefab": {
-      "__id__": 48
-    },
-    "_opacity": 255,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 100,
-      "height": 100
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_trs": {
-      "__type__": "TypedArray",
-      "ctor": "Float64Array",
-      "array": [
-        -325,
-        596.033,
-        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__": 42
-    },
-    "_children": [],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 44
-      }
-    ],
-    "_prefab": {
-      "__id__": 45
-    },
-    "_opacity": 255,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 22,
-      "height": 36
-    },
-    "_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.Sprite",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 43
-    },
-    "_enabled": true,
-    "_materials": [
-      {
-        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
-      }
-    ],
-    "_srcBlendFactor": 770,
-    "_dstBlendFactor": 771,
-    "_spriteFrame": {
-      "__uuid__": "96791d9f-b2a7-406c-84c0-d63af62e60ea"
-    },
-    "_type": 0,
-    "_sizeMode": 1,
-    "_fillType": 0,
-    "_fillCenter": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0
-    },
-    "_fillStart": 0,
-    "_fillRange": 0,
-    "_isTrimmedMode": true,
-    "_atlas": null,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__uuid__": "18ca563c-e8dc-4633-bf04-5fdd65113bb0"
-    },
-    "fileId": "2fogzjyg1Eeb4o3xdTj4nf",
-    "sync": false
-  },
-  {
-    "__type__": "cdc50kCRVVBa5gcp4XXxVO+",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 42
-    },
-    "_enabled": true,
-    "node_panel": {
-      "__id__": 1
-    },
-    "transition_type": 3,
-    "onComplete": [],
-    "_id": ""
-  },
-  {
-    "__type__": "cc.Widget",
+    "__type__": "173866Ll/lFN6TBCxDmQuqC",
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 42
+      "__id__": 2
     },
     "_enabled": true,
-    "alignMode": 1,
-    "_target": null,
-    "_alignFlags": 9,
-    "_left": 0,
-    "_right": 0,
-    "_top": 20.966999999999985,
-    "_bottom": 0,
-    "_verticalCenter": 0,
-    "_horizontalCenter": 0,
-    "_isAbsLeft": true,
-    "_isAbsRight": true,
-    "_isAbsTop": true,
-    "_isAbsBottom": true,
-    "_isAbsHorizontalCenter": true,
-    "_isAbsVerticalCenter": true,
-    "_originalWidth": 0,
-    "_originalHeight": 0,
     "_id": ""
   },
   {
@@ -1738,7 +1753,7 @@
     "asset": {
       "__uuid__": "18ca563c-e8dc-4633-bf04-5fdd65113bb0"
     },
-    "fileId": "c8jvBP2fNFRbU3kLiQJ9Sl",
+    "fileId": "94yiGj0RFACpXt5xGEvfHf",
     "sync": false
   },
   {
@@ -1777,13 +1792,13 @@
     },
     "_enabled": true,
     "scroll_view": {
-      "__id__": 33
+      "__id__": 40
     },
     "lbl_rmb_total": {
       "__id__": 19
     },
     "lbl_none": {
-      "__id__": 38
+      "__id__": 45
     },
     "_id": ""
   },
@@ -1803,9 +1818,10 @@
       "a": 230
     },
     "design_block_node": {
-      "__id__": 37
+      "__id__": 44
     },
     "bClickClose": false,
+    "onComplete": [],
     "_id": ""
   },
   {

assets/resources/module/hotUpdate.meta

@@ -1,12 +0,0 @@
-{
-  "ver": "1.1.2",
-  "uuid": "27ca9321-290b-4769-b0e6-bd95cdf80996",
-  "isBundle": false,
-  "bundleName": "",
-  "priority": 1,
-  "compressionType": {},
-  "optimizeHotUpdate": {},
-  "inlineSpriteFrames": {},
-  "isRemoteBundle": {},
-  "subMetas": {}
-}

assets/resources/module/hotUpdate/perfab.meta

@@ -1,12 +0,0 @@
-{
-  "ver": "1.1.2",
-  "uuid": "e45f4d0f-7aa3-4f6e-a64f-6b9bcde71855",
-  "isBundle": false,
-  "bundleName": "",
-  "priority": 1,
-  "compressionType": {},
-  "optimizeHotUpdate": {},
-  "inlineSpriteFrames": {},
-  "isRemoteBundle": {},
-  "subMetas": {}
-}

assets/script/game/component/NumberAnim.ts

@@ -22,7 +22,7 @@ export default class NumberAnim extends cc.Component {
         this.toFixed = toFixed;
         this.len_target = new_value.toString().length;
         this.targetProgress = new_value;
-        this.PlayMoneyAni(0.3)
+        this.PlayMoneyAni(0.3);
     }
 
     //////////////////////////////////数字滚动效果//////////////////////////////////
@@ -43,12 +43,11 @@ export default class NumberAnim extends cc.Component {
     /** 保留小数点位数 */
     private toFixed: number = 0;
 
-    private PlayMoneyAni(time) {
+    private PlayMoneyAni(time: number) {
         this.totalTime = time;
-        this.delta = (this.targetProgress - this.lastNum) / time;
+        this.delta = (this.targetProgress - this.lastNum);// / time;
         this.curValue = this.lastNum;
         this.curTime = 0;
-        // console.log("--->Update Time: " + time + " delta: " + this.delta + " curValue: " + this.curValue + " lastNum: " + this.lastNum);
         this.isPlayAni = true;
     }
 
@@ -62,18 +61,20 @@ export default class NumberAnim extends cc.Component {
                     this.curValue = this.targetProgress;
                     this.lastNum = this.targetProgress;
                 }
-                // console.log("-->CurValue:" + this.curValue);
             } else {
                 this.isPlayAni = false;
                 this.curTime = this.totalTime;
-                //this.unschedule(this.UpdateAni);
                 this.curValue = this.targetProgress;
                 this.lastNum = this.targetProgress;
             }
             if (this.curValue == this.targetProgress) {
                 this.lbl_count.string = `${this.targetProgress}`;
             } else {
-                this.lbl_count.string = `${this.curValue.toFixed(this.toFixed)}`;
+                if (!this.curValue) {
+                    mk.console.log('数字动画出现异常：', this.curValue);
+                    this.curValue = this.targetProgress;
+                }
+                this.lbl_count.string = this.curValue.toFixed(this.toFixed);
             }
         }
     }

assets/script/game/data/GameData.ts

@@ -85,6 +85,7 @@ export class GameData {
     }
 
     private initConfigs(data) {
+        // console.log('config  ', data);
         this.configs = data;
         this.funOpenData = this.configs.ServerConfig.Functionswitch.split(",");
     }

assets/script/game/data/module/BlessingBagData.ts

@@ -111,6 +111,11 @@ export class BlessingBagData extends Data {
         this.isPlayAniUpdate = false;
         this.videoRbData = response.data.UserRedMoneyInfo;
 
+        const rewardNum = Math.round(gData.blessingBag.taskRbNum * 100);
+        gData.receiptNotice.receip_rmb = rewardNum;
+        gData.cashNormal.receip_total_rmb += gData.receiptNotice.receip_rmb;
+        mk.ui.openPanel('module/receiptNotice/receiptNotice');
+
         // if (response.data.code == 1) {
         //     AdM.onSendEvent('VideoCash_' + this.taskRbId, '视频红包第' + this.taskRbId + '档领取成功', 'VideoCash');
         // }

assets/script/game/data/module/MoreGameData.ts

@@ -79,9 +79,14 @@ export class MoreGameData extends Data {
 
     async sendRecommendList() {
         if (this._moreGameList == null || this._moreGameList == undefined) {
-            let data = {};
-            let response = await mk.http.sendData('/fission/recommendList', data);
-
+            let data = {
+                //是否支持小游戏 1：支持，0：不支持
+                isSupportMiniGames: 1
+            };
+            let response = await mk.http.sendData('/fission/recommend-info', data);
+            // let response = await mk.http.sendData('/fission/recommendList', data);
+
+            // console.log('recommend-info  ', response)
             if (response.errcode != 0) {
                 return;
             }
@@ -96,9 +101,9 @@ export class MoreGameData extends Data {
     }
 
     /**上报 */
-    sendAppDownloadLog(downLoadAppId: string) {
+    async sendAppDownloadLog(downLoadAppId: string) {
         let data = { "downloadAppId": downLoadAppId };
-        let response = mk.http.sendRequest('/fission/appDownloadLog', 'POST', JSON.stringify(data));
+        let response = await mk.http.sendData('/fission/appDownloadLog', data);
     }
 
     /**
@@ -191,10 +196,25 @@ export class MoreGameData extends Data {
 
     /** 弹出互推红包弹窗 */
     popMoreGamePopNode() {
-        if (Math.random() <= gData.gameData.configs.globalCfg.popMoreGame) {
+        if (Math.random() <= gData.gameData.configs.ServerConfig.popMoreGame) {
             mk.ui.openPanel('module/moreGame/moreGamePopNode');
         }
     }
+
+    /** 点击互推插屏获取红包币 */
+    async popNodeGetRedBag() {
+        let data = {};
+        let response = await mk.http.sendData('saveDailyRedMoney', data);
+        if (response.errcode != 0) {
+            return;
+        }
+
+        if (response.data.redMoneyAddition != 0) {
+            let rewardData = [{ rewardType: 1, rewardNum: response.data.redMoneyAddition }]
+            gData.reward.data = rewardData;
+            mk.ui.openPanel('module/reward/reward')
+        }
+    }
 }
 
 /** 下载任务 */

assets/script/game/data/module/RewardData.ts

@@ -53,6 +53,7 @@ export class RewardData extends Data {
         const i_count = gData.reward.data.length;
         for (let i = 0; i < i_count; i++) {
             if (gData.reward.data[i].rewardType === RewardType.rmb) continue;
+            if (gData.reward.data[i].rewardNum == 0) continue;
             let start_node_pos = new cc.Vec2(0, -300);
             mk.fly.PlayCoinAnim(gData.reward.data[i].rewardType, 10, start_node_pos, '', () => {
                 is_add_money && this.addReward();

assets/script/game/game/Game.ts

@@ -56,6 +56,30 @@ export default class Game extends cc.Component {
         if (gData.gameData.getProp(GameProp.guideID) < 11111111) {
             mk.guide.open(1);
         }
+        // // 测试代码
+        // this.schedule(() => {
+
+        //     let data = {
+        //         videoRedMoney: {
+        //             videoRewardList: [
+        //                 {
+        //                     rewardType: 1,
+        //                     rewardNum: 500
+        //                 },
+        //                 {
+        //                     rewardType: 2,
+        //                     rewardNum: 0
+        //                 },
+        //                 {
+        //                     rewardType: 3,
+        //                     rewardNum: 0
+        //                 }
+        //             ]
+        //         }
+        //     };
+        //     gData.reward.adData = data;
+        //     mk.ui.openPanel('module/reward/reward')
+        // }, 3)
     }
 
     update() {
@@ -107,8 +131,10 @@ export default class Game extends cc.Component {
         // this.lbl_rmb.node.getComponent('NumberAnim').setValue(gData.gameData.gameData.piggyBank);
 
         const new_count = gData.gameData.gameData.piggyBank / 100;
-        if (this.lbl_rmb.string != new_count.toFixed(2)) {
-            this.lbl_rmb.node.getComponent(NumberAnim).setValue(parseFloat(new_count.toFixed(2)), 2);
+        if (parseInt(this.lbl_rmb.string) == 0 && new_count != 0 || parseInt(this.lbl_rmb.string) != 0 && new_count == 0) {
+            if (this.lbl_rmb.string != new_count.toFixed(2)) {
+                this.lbl_rmb.node.getComponent(NumberAnim).setValue(parseFloat(new_count.toFixed(2)), 2);
+            }
         }
         gData.gameData.init_coin = false;
     }

assets/script/game/module/blessingBag/BlessingBag.ts

@@ -321,7 +321,9 @@ export default class BlessingBag extends cc.Component {
                 this.rbOpenBtn.active = true;
                 this.nodeRb.active = false;
 
-                gData.cashPro.openCashPro(cashProType.blessing_taskCash, gData.blessingBag.taskRbNum)
+                gData.blessingBag.HttpCashTask();
+                // gData.cashPro.openCashPro(cashProType.blessing_taskCash, gData.blessingBag.taskRbNum)
+
                 this.canOpen = true;
             }, 1000);
         }

assets/script/game/module/hotUpdate.meta

@@ -1,12 +0,0 @@
-{
-  "ver": "1.1.2",
-  "uuid": "6ab0dcf5-b307-420f-ab3a-88befa72e960",
-  "isBundle": false,
-  "bundleName": "",
-  "priority": 1,
-  "compressionType": {},
-  "optimizeHotUpdate": {},
-  "inlineSpriteFrames": {},
-  "isRemoteBundle": {},
-  "subMetas": {}
-}

assets/script/game/module/moreGame/MoreGameNormalItem.ts

@@ -55,28 +55,34 @@ export default class MoreGameNormalItem extends cc.Component {
         this.labDes.string = this.data.introduction
         this.spRed.active = false
 
-        if (JsbSystem.ifCanStartGame(this.data.packageName, false)) {
-            this.btnDown.active = false
-            this.btnOpen.active = true
-        } else {
-            if (JsbSystem.isFileExist(this.data.nebulaAppId + ".apk")) {
+        if (this.data.appType == 1) {
+            if (JsbSystem.ifCanStartGame(this.data.packageName, false)) {
                 this.btnDown.active = false
                 this.btnOpen.active = true
             } else {
-                this.btnDown.active = true
-                this.btnOpen.active = false
-                // this.spRed.active = true
-
-                let info = gData.moreGame.getTaskInfo(this.data.nebulaAppId)
-                if (info != null) {
-                    this.schedule(() => {
-                        this.showDownloadProgress()
-                    }, 0.5)
+                if (JsbSystem.isFileExist(this.data.nebulaAppId + ".apk")) {
+                    this.btnDown.active = false
+                    this.btnOpen.active = true
                 } else {
-                    this.progressLabel.string = "下载"
+                    this.btnDown.active = true
+                    this.btnOpen.active = false
+                    // this.spRed.active = true
+
+                    let info = gData.moreGame.getTaskInfo(this.data.nebulaAppId)
+                    if (info != null) {
+                        this.schedule(() => {
+                            this.showDownloadProgress()
+                        }, 0.5)
+                    } else {
+                        this.progressLabel.string = "下载"
+                    }
                 }
             }
         }
+        else if (this.data.appType == 2) {
+            this.btnDown.active = false
+            this.btnOpen.active = true
+        }
     }
 
     cool = false
@@ -91,13 +97,19 @@ export default class MoreGameNormalItem extends cc.Component {
             this.cool = false
         }, 3)
 
-        let result = gData.moreGame.createNewTask(this.data)
-        if (result != null) {
-            this.schedule(() => {
-                this.showDownloadProgress()
-            }, 0.5)
-        } else {
-            this.progressLabel.string = ""
+        if (this.data.appType == 1) {
+            let result = gData.moreGame.createNewTask(this.data)
+            if (result != null) {
+                this.schedule(() => {
+                    this.showDownloadProgress()
+                }, 0.5)
+            } else {
+                this.progressLabel.string = ""
+            }
+        }
+        else if (this.data.appType == 2) {
+            cc.sys.openURL(this.data.recommendLink);
+            // JsbSystem.sendEvent('hutuiEventLaunch_' + this.data.nebulaAppId, "互推启动" + this.data.title, 'hutuiEventLaunch')
         }
     }
 

assets/script/game/module/moreGame/MoreGamePopNode.ts

@@ -63,15 +63,10 @@ export default class MoreGamePopNode extends cc.Component {
 
         this.cool = true
 
-        if (!JsbSystem.ifCanStartGame(this.data.packageName, true)) {
+        if (cc.sys.isNative && !JsbSystem.ifCanStartGame(this.data.packageName, true)) {
             gData.moreGame.createNewTask(this.data)
         }
-    }
 
-    onClosePanel() {
-        // mk.audio.playEffect('getGold');
-        mk.tip.pop('红包币+300');
-        //     GameM.commonData.updateRedMoney(300, RecordTYPE.online)
-        mk.fly.PlayCoinAnim(RewardType.pigRmb, 20, cc.v2(0, -300));
+        gData.moreGame.popNodeGetRedBag();
     }
 }

assets/script/mk/system/AdSystem.ts

@@ -149,7 +149,10 @@ export default class AdSystem {
         if (!this.ifShowAd) {
             return;
         }
-        this.adSdk.showBannerAd();
+
+        if (gData.gameData.adShowConfig && gData.gameData.adShowConfig.is_show_banner == 1) {
+            this.adSdk.showBannerAd();
+        }
     }
 
     /**
@@ -160,6 +163,7 @@ export default class AdSystem {
         if (!this.ifShowAd) {
             return;
         }
+
         this.adSdk.showInter();
     }
 
@@ -167,9 +171,15 @@ export default class AdSystem {
      * 根据几率检测弹出插屏
      */
     public checkShowInterByChance() {
-        let random = Math.random();
-        if (random < 0.5) {
+        if (!gData.gameData.adShowConfig) {
+            return;
+        }
+
+        if (Math.random() <= gData.gameData.adShowConfig.insert_probability) {
             this.showInterAd(0);
         }
+        else {
+            gData.moreGame.popMoreGamePopNode();
+        }
     }
 }

assets/script/mk/system/FlySystem.ts

@@ -65,6 +65,10 @@ export default class FlySystem extends cc.Component {
                 }
                 else if (type == RewardType.pigRmb) {
                     url = 'Canvas/界面层/game/node_ui/顶部个人信息/金猪币按钮/icon_zb';
+                } else {
+                    // 未知类型
+                    mk.pool.return('game/prefab/coin', target);
+                    return;
                 }
                 end = url;
             }

packages-hot-update/cfg.json

@@ -1,7 +1,7 @@
 {
     "version": "1.0.2",
     "serverRootDir": "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminateTest/baseRemote/",
-    "resourceRootDir": "D:\\App\\mk_framework\\build\\jsb-link",
+    "resourceRootDir": "D:\\mokaszProjects\\mk_framework\\build\\jsb-link",
     "genManifestDir": "",
     "hotAddressArray": [
         "http://",