zouyong %!s(int64=5) %!d(string=hai) anos
pai
achega
2901ffc2fc

+ 4 - 4
assets/resources/module/turnable/turnable.prefab

@@ -2783,7 +2783,7 @@
     "asset": {
     "asset": {
       "__uuid__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
       "__uuid__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
     },
     },
-    "fileId": "98tZFsVchCNqiH+21Hg8Pf",
+    "fileId": "96OFt53tJJ8LwV4I3Wnhpv",
     "sync": false
     "sync": false
   },
   },
   {
   {
@@ -2915,7 +2915,7 @@
     "asset": {
     "asset": {
       "__uuid__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
       "__uuid__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
     },
     },
-    "fileId": "33XHZ+cFdHQ72koAf3nOHa",
+    "fileId": "e9zMIi/O9AMLC0VIFL2DnO",
     "sync": false
     "sync": false
   },
   },
   {
   {
@@ -3047,7 +3047,7 @@
     "asset": {
     "asset": {
       "__uuid__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
       "__uuid__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
     },
     },
-    "fileId": "76y9rbSvdB/arTt6Y9vVDt",
+    "fileId": "9djisWet5HoZiQZ6D48nw0",
     "sync": false
     "sync": false
   },
   },
   {
   {
@@ -3260,7 +3260,7 @@
     "asset": {
     "asset": {
       "__uuid__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
       "__uuid__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
     },
     },
-    "fileId": "90fH3bk+BFt4UZhrI6H0MI",
+    "fileId": "depjIjvP5JPKe3COY2pno4",
     "sync": false
     "sync": false
   },
   },
   {
   {

+ 12 - 0
assets/script/game/data/AdData.ts

@@ -11,4 +11,16 @@
         
         
     }
     }
     
     
+}
+
+/**
+ * 看视频类型
+ */
+export enum AdFun{
+    bubble = 1,         //气泡视频
+    checkpoint = 2,     //关卡视频
+    settlement = 3,     //关卡结算视频
+    turntable = 4,      //转盘视频
+    sign = 5,           //签到视频
+    bigCash =6,         //福袋视频
 }
 }

+ 12 - 2
assets/script/game/data/GameData.ts

@@ -42,8 +42,18 @@ export class GameData {
 }
 }
 
 
 /**
 /**
- * 核心玩法游戏数据
+ * 游戏数据
  */
  */
 export enum GameProp{
 export enum GameProp{
-    
+    /** ------------------ 游戏核心数据 --------------------------- */
+
+
+    /** ------------------ 转盘数据 ------------------------------ */
+    turnable_leftTimes = 20,
+
+
+    /** ------------------ 存钱罐数据 ----------------------------- */
+
+
+    /** ------------------ 签到数据 ----------------------------- */
 }
 }

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

@@ -29,8 +29,7 @@ export default class Turnable extends cc.Component {
             let sc = this.node_items[i].getComponent(TurnableItem);
             let sc = this.node_items[i].getComponent(TurnableItem);
             sc.initData(i + "");
             sc.initData(i + "");
         }
         }
-        let times = 1;
-        this.lbl_left.string = `剩余:<color=#FFED99>${times}</color>次`;
+        this.updateLeftTimes();
     }
     }
 
 
     clickDraw() {
     clickDraw() {
@@ -40,16 +39,21 @@ export default class Turnable extends cc.Component {
     }
     }
 
 
     private draw() {
     private draw() {
+        g.turnable.leftTimes--;
         this.node_turn.rotation = 1800;
         this.node_turn.rotation = 1800;
         let index = 2;
         let index = 2;
-        let tar = -index * 60;
+        let tar = index * 60;
         cc.tween(this.node_turn)
         cc.tween(this.node_turn)
-            .to(3, { rotation: -1800 }, { easing: 'quintIn' })
+            .to(3, { rotation: tar }, { easing: 'expoInOut' })
             .call(() => {
             .call(() => {
-
+                this.updateLeftTimes();
             }, this).start();
             }, this).start();
     }
     }
 
 
+    updateLeftTimes(){
+        this.lbl_left.string = `剩余:<color=#FFED99>${g.turnable.leftTimes}</color>次`;
+    }
+
     update() {
     update() {
         if (!g.turnable.dataFinish) {
         if (!g.turnable.dataFinish) {
             g.turnable.init();
             g.turnable.init();