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

assets/resources/animation/dtShow.anim

@@ -0,0 +1,63 @@
+{
+  "__type__": "cc.AnimationClip",
+  "_name": "dtShow",
+  "_objFlags": 0,
+  "_native": "",
+  "_duration": 2,
+  "sample": 60,
+  "speed": 1,
+  "wrapMode": 1,
+  "curveData": {
+    "props": {
+      "opacity": [
+        {
+          "frame": 0,
+          "value": 0
+        },
+        {
+          "frame": 1.8333333333333333,
+          "value": 0
+        },
+        {
+          "frame": 2,
+          "value": 255
+        }
+      ],
+      "scale": [
+        {
+          "frame": 0,
+          "value": {
+            "__type__": "cc.Vec2",
+            "x": 0,
+            "y": 0
+          }
+        },
+        {
+          "frame": 1.8333333333333333,
+          "value": {
+            "__type__": "cc.Vec2",
+            "x": 0,
+            "y": 0
+          }
+        },
+        {
+          "frame": 1.9833333333333334,
+          "value": {
+            "__type__": "cc.Vec2",
+            "x": 1.2,
+            "y": 1.2
+          }
+        },
+        {
+          "frame": 2,
+          "value": {
+            "__type__": "cc.Vec2",
+            "x": 1,
+            "y": 1
+          }
+        }
+      ]
+    }
+  },
+  "events": []
+}

assets/resources/animation/dtShow.anim.meta

@@ -0,0 +1,5 @@
+{
+  "ver": "2.1.0",
+  "uuid": "ad45b0ef-9064-4616-b541-b8d386b87f3a",
+  "subMetas": {}
+}

assets/resources/game/prefab/game.prefab

@@ -3662,7 +3662,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 750,
-      "height": 280
+      "height": 222
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -3674,7 +3674,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        53,
+        18,
         0,
         0,
         0,
@@ -3714,10 +3714,10 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "74dc7948-2570-4026-85cd-ba99392158fe"
+      "__uuid__": "558441c9-ed5b-43e8-a72e-603343a2cc07"
     },
     "_type": 0,
-    "_sizeMode": 0,
+    "_sizeMode": 1,
     "_fillType": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
@@ -3737,13 +3737,13 @@
     "node": {
       "__id__": 109
     },
-    "_enabled": true,
+    "_enabled": false,
     "alignMode": 1,
     "_target": null,
     "_alignFlags": 41,
     "_left": 0,
     "_right": 0,
-    "_top": -183,
+    "_top": -90,
     "_bottom": 1237,
     "_verticalCenter": 0,
     "_horizontalCenter": 0,
@@ -3795,8 +3795,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 149,
-      "height": 149
+      "width": 141,
+      "height": 141
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -3973,8 +3973,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 118,
-      "height": 118
+      "width": 117,
+      "height": 117
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -4029,7 +4029,7 @@
       "__uuid__": "66810a82-f3a8-4023-90b7-c83a87a2e4a1"
     },
     "_type": 0,
-    "_sizeMode": 0,
+    "_sizeMode": 1,
     "_fillType": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
@@ -4204,8 +4204,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 217,
-      "height": 58
+      "width": 185,
+      "height": 52
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -4260,7 +4260,7 @@
       "__uuid__": "146c87a4-54bc-43db-8e7a-c1e92835c69c"
     },
     "_type": 0,
-    "_sizeMode": 0,
+    "_sizeMode": 1,
     "_fillType": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
@@ -4734,8 +4734,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 217,
-      "height": 58
+      "width": 185,
+      "height": 52
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -4790,7 +4790,7 @@
       "__uuid__": "146c87a4-54bc-43db-8e7a-c1e92835c69c"
     },
     "_type": 0,
-    "_sizeMode": 0,
+    "_sizeMode": 1,
     "_fillType": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",

assets/resources/game/texture/main/bg.png.meta

@@ -8,7 +8,7 @@
   "genMipmaps": false,
   "packable": true,
   "width": 750,
-  "height": 1700,
+  "height": 2300,
   "platformSettings": {},
   "subMetas": {
     "bg": {
@@ -23,9 +23,9 @@
       "trimX": 0,
       "trimY": 0,
       "width": 750,
-      "height": 1700,
+      "height": 2300,
       "rawWidth": 750,
-      "rawHeight": 1700,
+      "rawHeight": 2300,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/resources/game/texture/main/head.png.meta

@@ -7,8 +7,8 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 149,
-  "height": 149,
+  "width": 141,
+  "height": 141,
   "platformSettings": {},
   "subMetas": {
     "head": {
@@ -22,10 +22,10 @@
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 149,
-      "height": 149,
-      "rawWidth": 149,
-      "rawHeight": 149,
+      "width": 141,
+      "height": 141,
+      "rawWidth": 141,
+      "rawHeight": 141,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/resources/game/texture/main/head1.png.meta

@@ -7,8 +7,8 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 106,
-  "height": 106,
+  "width": 117,
+  "height": 117,
   "platformSettings": {},
   "subMetas": {
     "head1": {
@@ -22,10 +22,10 @@
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 106,
-      "height": 106,
-      "rawWidth": 106,
-      "rawHeight": 106,
+      "width": 117,
+      "height": 117,
+      "rawWidth": 117,
+      "rawHeight": 117,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/resources/game/texture/main/icon_hb.png.meta

@@ -7,8 +7,8 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 56,
-  "height": 74,
+  "width": 54,
+  "height": 70,
   "platformSettings": {},
   "subMetas": {
     "icon_hb": {
@@ -22,10 +22,10 @@
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 56,
-      "height": 74,
-      "rawWidth": 56,
-      "rawHeight": 74,
+      "width": 54,
+      "height": 70,
+      "rawWidth": 54,
+      "rawHeight": 70,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/resources/game/texture/main/icon_jb.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "d7beaef7-6df3-48d4-8b72-fcdcb44710f7",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 62,
+  "height": 65,
+  "platformSettings": {},
+  "subMetas": {
+    "icon_jb": {
+      "ver": "1.0.4",
+      "uuid": "e0920ddd-d397-4821-84c9-1649b0e7c4bc",
+      "rawTextureUuid": "d7beaef7-6df3-48d4-8b72-fcdcb44710f7",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 62,
+      "height": 65,
+      "rawWidth": 62,
+      "rawHeight": 65,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/game/texture/main/tixian_bg.png.meta

@@ -22,10 +22,10 @@
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 217,
-      "height": 60,
-      "rawWidth": 217,
-      "rawHeight": 60,
+      "width": 185,
+      "height": 52,
+      "rawWidth": 185,
+      "rawHeight": 52,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/resources/game/texture/main/top.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "15b53b44-f9bb-4d22-9ace-f7683e00bba2",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 750,
+  "height": 222,
+  "platformSettings": {},
+  "subMetas": {
+    "top": {
+      "ver": "1.0.4",
+      "uuid": "558441c9-ed5b-43e8-a72e-603343a2cc07",
+      "rawTextureUuid": "15b53b44-f9bb-4d22-9ace-f7683e00bba2",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 750,
+      "height": 222,
+      "rawWidth": 750,
+      "rawHeight": 222,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/module/agreementTip/agreementTip.prefab

@@ -24,17 +24,17 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 53
+        "__id__": 52
       },
       {
-        "__id__": 54
+        "__id__": 53
       },
       {
-        "__id__": 55
+        "__id__": 54
       }
     ],
     "_prefab": {
-      "__id__": 56
+      "__id__": 55
     },
     "_opacity": 255,
     "_color": {
@@ -116,11 +116,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 51
+        "__id__": 50
       }
     ],
     "_prefab": {
-      "__id__": 52
+      "__id__": 51
     },
     "_opacity": 255,
     "_color": {
@@ -1602,7 +1602,7 @@
       }
     ],
     "_prefab": {
-      "__id__": 50
+      "__id__": 49
     },
     "_opacity": 255,
     "_color": {
@@ -1770,24 +1770,10 @@
     "panel_name": "game/prefab/game",
     "open_type": 0,
     "transition_type": 3,
-    "onComplete": [
-      {
-        "__id__": 49
-      }
-    ],
+    "onComplete": [],
     "_id": ""
   },
   {
-    "__type__": "cc.ClickEvent",
-    "target": {
-      "__id__": 1
-    },
-    "component": "",
-    "_componentId": "27e8eZbIM9ApIU8LRLiALwU",
-    "handler": "clickAgreeCall",
-    "customEventData": ""
-  },
-  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1

assets/resources/module/reward/reward.prefab

@@ -721,7 +721,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -29.271,
+        -30,
         -17.804,
         0,
         0,
@@ -829,7 +829,7 @@
       "ctor": "Float64Array",
       "array": [
         -30,
-        -18.174,
+        -18,
         0,
         0,
         0,
@@ -939,7 +939,7 @@
       "ctor": "Float64Array",
       "array": [
         -30,
-        -17.942,
+        -18,
         0,
         0,
         0,

assets/resources/module/reward/rewardLuck.prefab

@@ -19,25 +19,28 @@
     "_children": [
       {
         "__id__": 2
+      },
+      {
+        "__id__": 116
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 116
+        "__id__": 121
       },
       {
-        "__id__": 117
+        "__id__": 122
       },
       {
-        "__id__": 118
+        "__id__": 123
       },
       {
-        "__id__": 119
+        "__id__": 124
       }
     ],
     "_prefab": {
-      "__id__": 120
+      "__id__": 125
     },
     "_opacity": 255,
     "_color": {
@@ -49,8 +52,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 750,
-      "height": 1334
+      "width": 681.8181818181818,
+      "height": 1212.7272727272725
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -68,8 +71,8 @@
         0,
         0,
         1,
-        1,
-        1,
+        1.1,
+        1.1,
         0
       ]
     },
@@ -123,8 +126,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 750,
-      "height": 1334
+      "width": 681.8181818181818,
+      "height": 1212.7272727272725
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -721,8 +724,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -29.271,
-        -17.804,
+        -30,
+        -18,
         0,
         0,
         0,
@@ -829,7 +832,7 @@
       "ctor": "Float64Array",
       "array": [
         -30,
-        -18.174,
+        -18,
         0,
         0,
         0,
@@ -939,7 +942,7 @@
       "ctor": "Float64Array",
       "array": [
         -30,
-        -17.942,
+        -18,
         0,
         0,
         0,
@@ -4177,6 +4180,153 @@
     "sync": false
   },
   {
+    "__type__": "cc.Node",
+    "_name": "btn_close",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 117
+      },
+      {
+        "__id__": 118
+      },
+      {
+        "__id__": 119
+      }
+    ],
+    "_prefab": {
+      "__id__": 120
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 88,
+      "height": 88
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        272.441,
+        491.749,
+        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__": 116
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "6e00eea0-2e49-4c98-b664-a63c8660f4bb"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cdc50kCRVVBa5gcp4XXxVO+",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 116
+    },
+    "_enabled": true,
+    "node_panel": {
+      "__id__": 1
+    },
+    "transition_type": 3,
+    "onComplete": [],
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Animation",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 116
+    },
+    "_enabled": true,
+    "_defaultClip": {
+      "__uuid__": "ad45b0ef-9064-4616-b541-b8d386b87f3a"
+    },
+    "_clips": [
+      {
+        "__uuid__": "ad45b0ef-9064-4616-b541-b8d386b87f3a"
+      }
+    ],
+    "playOnLoad": true,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "eb3877a0-0566-4cd8-bb4e-fe5969e6f0e2"
+    },
+    "fileId": "721k4zYfBHKpZUi6Pjen1t",
+    "sync": false
+  },
+  {
     "__type__": "cc.Widget",
     "_name": "",
     "_objFlags": 0,
@@ -4259,7 +4409,7 @@
     "design_block_node": {
       "__id__": 68
     },
-    "bClickClose": true,
+    "bClickClose": false,
     "_id": ""
   },
   {

assets/resources/module/reward/rewardMission.prefab

@@ -721,8 +721,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -29.271,
-        -17.804,
+        -30,
+        -18,
         0,
         0,
         0,
@@ -829,7 +829,7 @@
       "ctor": "Float64Array",
       "array": [
         -30,
-        -18.174,
+        -18,
         0,
         0,
         0,
@@ -939,7 +939,7 @@
       "ctor": "Float64Array",
       "array": [
         -30,
-        -17.942,
+        -18,
         0,
         0,
         0,

assets/resources/module/reward/texture/close.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "6086578b-692a-4067-944a-f835d1ec0e51",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 88,
+  "height": 88,
+  "platformSettings": {},
+  "subMetas": {
+    "close": {
+      "ver": "1.0.4",
+      "uuid": "6e00eea0-2e49-4c98-b664-a63c8660f4bb",
+      "rawTextureUuid": "6086578b-692a-4067-944a-f835d1ec0e51",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 88,
+      "height": 88,
+      "rawWidth": 88,
+      "rawHeight": 88,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/script/game/module/agreementTip/agreementTip.ts

@@ -16,13 +16,6 @@ export default class agreementTip extends cc.Component {
     }
 
     /**
-     * 同意按钮回调
-     */
-    private clickAgreeCall() {
-        mk.storage.setStorage('notShowAgreementTip', true)
-    }
-
-    /**
      * 点击协议按钮
      * @param data 协议类型
      */

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

@@ -80,7 +80,7 @@ export default class BlessingBag extends cc.Component {
 
     onEnable() {
         this.isPlayAni = false;
-        this.isPlayInitAni = false;
+        this.isPlayInitAni = true;
         gData.blessingBag.isPlayAniUpdate = false;
         gData.blessingBag.init_videoRbData = true;
     }

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

@@ -112,14 +112,14 @@ export default class Reward extends cc.Component {
         const cash_bar = gData.redBagCash.cash_bar;
         let cash_data = gData.redBagCash.getItemDataByIndex(cash_bar);
         if (!cash_data) return;
-
+        const newRedMoney = redMoney > cash_data.type_value ? cash_data.type_value : redMoney;
         this.lbl_cash.string = cash_data.money / 100 + '元';
-        this.lbl_cash_out.string = redMoney + '/' + cash_data.type_value;
-        const fillRange = redMoney / cash_data.type_value >= 1 ? 1 : redMoney / cash_data.type_value;
+        this.lbl_cash_out.string = newRedMoney + '/' + cash_data.type_value;
+        const fillRange = newRedMoney / cash_data.type_value >= 1 ? 1 : newRedMoney / cash_data.type_value;
         // this.spr_cash_out.fillRange = fillRange;
         cc.tween(this.spr_cash_out).to(fillRange, { fillRange: fillRange }).start();
     }
-    
+
     /**
      * 看广告
      */