Bläddra i källkod

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

kaka 5 år sedan
förälder
incheckning
ad57d8db4f

+ 0 - 12
assets/resources/animation/Main.meta

@@ -1,12 +0,0 @@
-{
-  "ver": "1.1.2",
-  "uuid": "be1fccbf-ec57-4137-81e6-a4e98c84b0db",
-  "isBundle": false,
-  "bundleName": "",
-  "priority": 1,
-  "compressionType": {},
-  "optimizeHotUpdate": {},
-  "inlineSpriteFrames": {},
-  "isRemoteBundle": {},
-  "subMetas": {}
-}

+ 6 - 6
assets/resources/game/prefab/game.prefab

@@ -6663,7 +6663,7 @@
       "__id__": 198
     },
     "_enabled": true,
-    "panel_name": "",
+    "panel_name": "module/newOpenRedBag/newOpenRedBag",
     "bool_Auth": false,
     "open_type": 0,
     "transition_type": 0,
@@ -6956,7 +6956,7 @@
     "asset": {
       "__uuid__": "b4dea4a9-29c8-46bc-a50d-5754afa7a2bd"
     },
-    "fileId": "6dGaJvj+BGIJ+qaA7x9kHI",
+    "fileId": "d0Mq87qDFGnrCJyQNhifdI",
     "sync": false
   },
   {
@@ -7086,7 +7086,7 @@
     "asset": {
       "__uuid__": "b4dea4a9-29c8-46bc-a50d-5754afa7a2bd"
     },
-    "fileId": "85M2lgal5ECqOLlfk1zWab",
+    "fileId": "4f4WdNBG5Lppk2klq2VQfs",
     "sync": false
   },
   {
@@ -7216,7 +7216,7 @@
     "asset": {
       "__uuid__": "b4dea4a9-29c8-46bc-a50d-5754afa7a2bd"
     },
-    "fileId": "961tNKKxJDcqU9Omwo8mBm",
+    "fileId": "be0ePQsF1CeZgxFIrQmbby",
     "sync": false
   },
   {
@@ -7449,7 +7449,7 @@
     "asset": {
       "__uuid__": "b4dea4a9-29c8-46bc-a50d-5754afa7a2bd"
     },
-    "fileId": "35SavA+3ZBpq5KxzsVp0jf",
+    "fileId": "424/yMmqtKr4YRUGfPkTNP",
     "sync": false
   },
   {
@@ -7579,7 +7579,7 @@
     "asset": {
       "__uuid__": "b4dea4a9-29c8-46bc-a50d-5754afa7a2bd"
     },
-    "fileId": "f6g8xi+1hDNYwmFINXZayX",
+    "fileId": "63E1m1UoNONZhICncwxbx8",
     "sync": false
   },
   {

+ 0 - 12
assets/script/before/view/ui.meta

@@ -1,12 +0,0 @@
-{
-  "ver": "1.1.2",
-  "uuid": "71ec4ef3-838b-4699-9ef6-3126eb87a343",
-  "isBundle": false,
-  "bundleName": "",
-  "priority": 1,
-  "compressionType": {},
-  "optimizeHotUpdate": {},
-  "inlineSpriteFrames": {},
-  "isRemoteBundle": {},
-  "subMetas": {}
-}

+ 39 - 0
assets/script/game/module/newOpenRedBag/NewOpenRedBag.ts

@@ -1,4 +1,6 @@
 import Util from "../../../before/util/Util";
+import { AdFun } from "../../data/AdData";
+import { VideoAdType } from "../../data/GameData";
 
 const { ccclass, property } = cc._decorator;
 @ccclass
@@ -13,6 +15,34 @@ export default class NewOpenRedBag extends cc.Component{
 
     }
 
+    update(dt)
+    {
+        if (gData.reward.adData) {
+            this.showWatchAdReward();
+            gData.turnable.adData = null;
+        }
+    }
+
+    private showWatchAdReward()
+    {
+        if(gData.reward.adData)
+        {
+            let v= '0.30';
+            v.replace('.','');
+            let c = v.split('');
+            for(let i = 0; i != this.lbl_value.length; ++i)
+            {
+                if(i < c.length)
+                {
+                    this.lbl_value[i].string = c[i];
+                }else
+                {
+                    this.lbl_value[i].string = '0';
+                }
+            }
+        }
+    }
+
     showChangePart() {
         //this.changePart.active = true
         let len = this.lbl_value.length;
@@ -27,7 +57,16 @@ export default class NewOpenRedBag extends cc.Component{
     private clickOpenBtn(){
         mk.audio.playEffect("button");
 
+        mk.ad.videoAdType = VideoAdType.StartQiPaoRedBag;
+        mk.ad.watchAd((success: boolean) => {
+            mk.console.log("watchAD:" + success);
+            if (success) {
+                gData.adData.watchVideo(AdFun.bubble);
+            }
+        });
+
     }
+
     private clickCloseBtn(){
 
         mk.audio.playEffect("closeButton");