zouyong 5 سال پیش
والد
کامیت
e4d102721c

+ 0 - 0
assets/resources/module/turnable/texture/hb.png → assets/resources/module/turnable/texture/hb3.png


+ 1 - 1
assets/resources/module/turnable/texture/hb.png.meta → assets/resources/module/turnable/texture/hb3.png.meta

@@ -11,7 +11,7 @@
   "height": 94,
   "platformSettings": {},
   "subMetas": {
-    "hb": {
+    "hb3": {
       "ver": "1.0.4",
       "uuid": "90285806-551f-49ec-af5b-d8aea2c938b4",
       "rawTextureUuid": "d1138ae1-71d5-4878-9026-8eb8c586d8f4",

+ 7 - 13
assets/script/game/data/AdData.ts

@@ -32,7 +32,7 @@ export class AdData {
     }
 
 
-    public async updateVideo(type: AdFun) {
+    public async watchVideo(type: AdFun) {
         this.ad_subType = type;
         let data = {
             "imei": g.appData.machineInfo.imei,
@@ -60,19 +60,13 @@ export class AdData {
         if (response.errcode != 0) {
             return;
         }
+        switch(this.ad_subType){
+            case AdFun.bubble:
+
+            break;
+            case AdFun.sign
+        }
         this.data = response.data;
     }
 
 }
-
-/**
- * 看视频类型
- */
-export enum AdFun {
-    bubble = 1,         //气泡视频
-    checkpoint = 2,     //关卡视频
-    settlement = 3,     //关卡结算视频
-    turntable = 4,      //转盘视频
-    sign = 5,           //签到视频
-    bigCash = 6,         //福袋视频
-}

+ 0 - 0
assets/script/game/data/g.ts → assets/script/game/data/GData.ts


+ 0 - 12
assets/script/game/data/module/TurnableData.ts

@@ -4,21 +4,9 @@
  */
  export class TurnableData{
 
-    /** 请求数据完成 */
-    public dataFinish:boolean = false;
 
     public leftTimes:number = 2;
 
-
-
-    public async init(){
-        let data = {};
-        // let response = await mk.http.sendRequest('turnable', 'POST', JSON.stringify(data));
-        // if (response.errcode != 0) {
-        //     return;
-        // }
-        this.dataFinish = true;
-    }
     
     public async draw(){
         let data = {};

+ 7 - 9
assets/script/game/module/module/turntable/Turnable.ts

@@ -1,3 +1,4 @@
+import { AdFun } from "../../../data/AdData";
 import TurnableItem from "./TurnableItem";
 
 const { ccclass, property } = cc._decorator;
@@ -18,7 +19,7 @@ export default class Turnable extends cc.Component {
     private isPlaying: boolean = false;
 
     onLoad() {
-
+        this.initData();
     }
 
     /**
@@ -32,9 +33,11 @@ export default class Turnable extends cc.Component {
         this.updateLeftTimes();
     }
 
+    /** 点击抽奖 */
     clickDraw() {
         if (g.turnable.leftTimes > 0 && !this.isPlaying) {
-            this.draw();
+            this.isPlaying = true;
+            g.adData.watchVideo(AdFun.turntable);
         }
     }
 
@@ -51,15 +54,10 @@ export default class Turnable extends cc.Component {
     }
 
     updateLeftTimes(){
-        this.lbl_left.string = `剩余:<color=#FFED99>${g.turnable.leftTimes}</color>次`;
+        this.lbl_left.string = `剩余:<color=#FFED99>${gData.turnable.leftTimes}</color>次`;
     }
 
     update() {
-        if (!g.turnable.dataFinish) {
-            g.turnable.init();
-        }
-        else{
-            this.initData();
-        }
+        if(g.turnable.)
     }
 }

+ 3 - 4
assets/script/game/module/module/turntable/TurnableItem.ts

@@ -8,10 +8,9 @@ export default class TurnableItem extends cc.Component {
     lbl_name: cc.Label = null;
 
 
-    public async initData(data) {
-        // let src = data.type;
-        // this.icon.spriteFrame = await mk.loader.load(src, cc.SpriteFrame);
-        this.lbl_name.string = data;
+    public async initData(type) {
+        this.icon.spriteFrame = await mk.loader.load('module/turnable/texture/hb' + type, cc.SpriteFrame);
+        this.lbl_name.string = type == 1 ? "少量红包" : type == 2 ? "中量红包" : "大量红包";
     }
 
 }