更新主界面icon

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

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "3e50b68c-33fb-4eb9-9105-806cd6e929a3",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 501,
+  "height": 38,
+  "platformSettings": {},
+  "subMetas": {
+    "bg": {
+      "ver": "1.0.4",
+      "uuid": "e7f21add-0901-45f9-ba08-7bef0c31b0bb",
+      "rawTextureUuid": "3e50b68c-33fb-4eb9-9105-806cd6e929a3",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 501,
+      "height": 38,
+      "rawWidth": 501,
+      "rawHeight": 38,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/game/texture/btn/btn1.png.meta

@@ -7,8 +7,8 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 84,
-  "height": 84,
+  "width": 95,
+  "height": 118,
   "platformSettings": {},
   "subMetas": {
     "btn1": {
@@ -19,13 +19,13 @@
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": 0,
-      "offsetY": -0.5,
-      "trimX": 2,
-      "trimY": 3,
-      "width": 80,
-      "height": 79,
-      "rawWidth": 84,
-      "rawHeight": 84,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 95,
+      "height": 118,
+      "rawWidth": 95,
+      "rawHeight": 118,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/resources/game/texture/btn/btn2.png.meta

@@ -7,8 +7,8 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 84,
-  "height": 84,
+  "width": 97,
+  "height": 101,
   "platformSettings": {},
   "subMetas": {
     "btn2": {
@@ -19,13 +19,13 @@
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": 0,
-      "offsetY": -0.5,
-      "trimX": 2,
-      "trimY": 3,
-      "width": 80,
-      "height": 79,
-      "rawWidth": 84,
-      "rawHeight": 84,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 97,
+      "height": 101,
+      "rawWidth": 97,
+      "rawHeight": 101,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/resources/game/texture/btn/btn3.png.meta

@@ -7,8 +7,8 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 84,
-  "height": 84,
+  "width": 97,
+  "height": 101,
   "platformSettings": {},
   "subMetas": {
     "btn3": {
@@ -19,13 +19,13 @@
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": 0,
-      "offsetY": -0.5,
-      "trimX": 2,
-      "trimY": 3,
-      "width": 80,
-      "height": 79,
-      "rawWidth": 84,
-      "rawHeight": 84,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 97,
+      "height": 101,
+      "rawWidth": 97,
+      "rawHeight": 101,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/resources/game/texture/btn/btn4.png.meta

@@ -7,8 +7,8 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 84,
-  "height": 84,
+  "width": 97,
+  "height": 101,
   "platformSettings": {},
   "subMetas": {
     "btn4": {
@@ -19,13 +19,13 @@
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": 0,
-      "offsetY": -0.5,
-      "trimX": 2,
-      "trimY": 3,
-      "width": 80,
-      "height": 79,
-      "rawWidth": 84,
-      "rawHeight": 84,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 97,
+      "height": 101,
+      "rawWidth": 97,
+      "rawHeight": 101,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/resources/game/texture/btn/btn5.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "5ba08832-e5ab-416b-95e1-870f402be644",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 97,
+  "height": 101,
+  "platformSettings": {},
+  "subMetas": {
+    "btn5": {
+      "ver": "1.0.4",
+      "uuid": "6fb3d9ec-e23b-4107-a96e-32bb6cf560d6",
+      "rawTextureUuid": "5ba08832-e5ab-416b-95e1-870f402be644",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 97,
+      "height": 101,
+      "rawWidth": 97,
+      "rawHeight": 101,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/game/texture/btn/btn6.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "cab19400-8268-4196-9a31-cec8689bbc87",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 97,
+  "height": 101,
+  "platformSettings": {},
+  "subMetas": {
+    "btn6": {
+      "ver": "1.0.4",
+      "uuid": "b5eec45e-c57a-4d89-97c4-c776cd2145a6",
+      "rawTextureUuid": "cab19400-8268-4196-9a31-cec8689bbc87",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 97,
+      "height": 101,
+      "rawWidth": 97,
+      "rawHeight": 101,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/game/texture/btn/btn7.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "5bdcb3d5-b47d-4dd2-8393-67d2a294fbfc",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 57,
+  "height": 34,
+  "platformSettings": {},
+  "subMetas": {
+    "btn7": {
+      "ver": "1.0.4",
+      "uuid": "069fc611-c839-4040-8c81-e0da49b3507b",
+      "rawTextureUuid": "5bdcb3d5-b47d-4dd2-8393-67d2a294fbfc",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 57,
+      "height": 34,
+      "rawWidth": 57,
+      "rawHeight": 34,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/game/texture/btn/button.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "be3e2064-46a5-4e7e-addd-03598fbe0a7d",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 343,
+  "height": 127,
+  "platformSettings": {},
+  "subMetas": {
+    "button": {
+      "ver": "1.0.4",
+      "uuid": "af1f5888-985e-490b-9942-6d933bb8f95f",
+      "rawTextureUuid": "be3e2064-46a5-4e7e-addd-03598fbe0a7d",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 343,
+      "height": 127,
+      "rawWidth": 343,
+      "rawHeight": 127,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/game/texture/btn/laba.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "a7e4900f-02bd-432a-bcfb-9e2db4306b1e",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 33,
+  "height": 27,
+  "platformSettings": {},
+  "subMetas": {
+    "laba": {
+      "ver": "1.0.4",
+      "uuid": "03225c46-195c-49ac-b8a1-4b68fee5b4a9",
+      "rawTextureUuid": "a7e4900f-02bd-432a-bcfb-9e2db4306b1e",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 33,
+      "height": 27,
+      "rawWidth": 33,
+      "rawHeight": 27,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

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

@@ -1,4 +1,5 @@
 import { Data } from "../../../mk/data/Data";
+import { AdFun } from "../AdData";
 import { GameProp } from "../GameData";
 
 interface TurntableItem{
@@ -18,6 +19,7 @@ export class TurnableData extends Data {
 
     public init(){
         this.config = gData.gameData.configs.TurntableCfg;
+        this.leftTimes = gData.gameData.gameData.turntableTimes;
     }
 
     public setAdData(data) {
@@ -28,11 +30,7 @@ export class TurnableData extends Data {
     }
 
 
-    public async draw() {
-        let data = {};
-        let response = await mk.http.sendRequest('turnable', 'POST', JSON.stringify(data));
-        if (response.errcode != 0) {
-            return;
-        }
+    public draw() {
+        gData.adData.watchVideo(AdFun.turntable);
     }
 }

assets/script/game/module/module/turntable/Turnable.ts

@@ -25,9 +25,11 @@ export default class Turnable extends cc.Component {
      * 初始化奖励和抽奖次数
      */
     private initData() {
-        for (let i = 0; i < this.node_items.length; i++) {
-            let sc = this.node_items[i].getComponent(TurnableItem);
-            sc.initData((i % 3 + 1) + "");
+        if (gData.turnable.config) {
+            for (let i = 0; i < gData.turnable.config.length; i++) {
+                let sc = this.node_items[i].getComponent(TurnableItem);
+                sc.initData(gData.turnable.config[i].type);
+            }
         }
         this.updateLeftTimes();
     }

assets/script/game/module/module/turntable/TurnableItem.ts

@@ -10,7 +10,7 @@ export default class TurnableItem extends cc.Component {
 
     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 ? "中量红包" : "大量红包";
+        this.lbl_name.string = type == "1" ? "少量红包" : type == "2" ? "中量红包" : "大量红包";
     }
 
 }