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

assets/resources/game/prefab/game.prefab

@@ -4310,7 +4310,7 @@
       "ctor": "Float64Array",
       "array": [
         -6,
-        2.5,
+        0,
         0,
         0,
         0,
@@ -4840,7 +4840,7 @@
       "ctor": "Float64Array",
       "array": [
         -6,
-        2.5,
+        0,
         0,
         0,
         0,

assets/resources/module/turnable/texture/zhuanpan2.png.meta

@@ -22,10 +22,10 @@
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 548,
-      "height": 535,
-      "rawWidth": 548,
-      "rawHeight": 535,
+      "width": 543,
+      "height": 543,
+      "rawWidth": 543,
+      "rawHeight": 543,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/resources/module/turnable/turnable.prefab

@@ -1007,20 +1007,20 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 548,
-      "height": 535
+      "width": 543,
+      "height": 543
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
-      "x": 0.504,
-      "y": 0.499
+      "x": 0.5,
+      "y": 0.5
     },
     "_trs": {
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
         0,
-        0.5,
+        0,
         0,
         0,
         0,
@@ -2026,7 +2026,7 @@
     "asset": {
       "__uuid__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
     },
-    "fileId": "eaCLbJlPRKEZBCfqME/KD7",
+    "fileId": "29/AcapIZLmqmssBhzRqEu",
     "sync": false
   },
   {
@@ -2158,7 +2158,7 @@
     "asset": {
       "__uuid__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
     },
-    "fileId": "81/5BDdi1LIqwIWPzdjdur",
+    "fileId": "a8atJCGYFKaJx17Wg3+l/y",
     "sync": false
   },
   {
@@ -2290,7 +2290,7 @@
     "asset": {
       "__uuid__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
     },
-    "fileId": "59EpiRO/RJrLF6CHIaIWnb",
+    "fileId": "71qR0fGVJGOLPiGggNy3Wc",
     "sync": false
   },
   {
@@ -2503,7 +2503,7 @@
     "asset": {
       "__uuid__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
     },
-    "fileId": "a4MpVqY8pOvqBtAyamKRuW",
+    "fileId": "24KD3TvB9FoYVrfEL7BXfA",
     "sync": false
   },
   {

assets/script/game/component/BangsFit.ts

@@ -1,7 +1,7 @@
 
 const {ccclass, property} = cc._decorator;
-const LeftPadding = 50;
-const RightPadding = 50;
+const LeftPadding = 65;
+const RightPadding = 65;
 /**
  * 刘海屏适配
  * @author 薛鸿潇

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

@@ -50,6 +50,9 @@ export default class Reward extends cc.Component {
     private lbl_cash_out: cc.Label = null;
     @property({ displayName: '提现金额', type: cc.Label })
     private lbl_cash: cc.Label = null;
+    @property({ displayName: '提现按钮', type: cc.Animation })
+    private node_cash: cc.Animation = null;
+
 
 
     /** 当前阶段 */
@@ -124,6 +127,11 @@ export default class Reward extends cc.Component {
         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();
+        if (redMoney >= cash_data.type_value) {
+            this.node_cash.play();
+        } else {
+            this.node_cash.stop();
+        }
     }
 
     /**
@@ -140,13 +148,19 @@ export default class Reward extends cc.Component {
                 }
             });
         } else {
-            mk.ad.watchAd((success: boolean) => {
-                mk.console.log("watchAD:" + success);
-                if (success) {
-                    gData.adData.watchVideo(gData.reward.subType === 2 ? AdFun.checkpoint : AdFun.bubble);
-                    gData.reward.subType = null;
-                }
-            });
+            if (true) {
+                mk.ad.watchAd((success: boolean) => {
+                    mk.console.log("watchAD:" + success);
+                    if (success) {
+                        gData.adData.watchVideo(gData.reward.subType === 2 ? AdFun.checkpoint : AdFun.bubble);
+                        gData.reward.subType = null;
+                    }
+                });
+            } else {
+                // 用户第一次看此视频时，可不需要看直接领取奖励
+                gData.adData.watchVideo(gData.reward.subType === 2 ? AdFun.checkpoint : AdFun.bubble);
+                gData.reward.subType = null;
+            }
         }
         // gData.reward.adData = {}
         // gData.reward.adData.videoRedMoney = {}