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

# Conflicts:
#	assets/script/game/data/GData.ts.meta

assets/script/game/data/AdData.ts

@@ -23,12 +23,11 @@ export class AdData {
     /** 视频类型 */
     public ad_subType: AdFun;
 
-    /** 看视频后回复的数据 每个功能回复的内容不一样，具体看接口文档 */
-    public data: any;
+    private datas: any[];
 
 
     public init() {
-
+        this.datas = [,null, null, null, gData.turnable, gData.sign, gData.luckybag];
     }
 
 
@@ -60,13 +59,22 @@ export class AdData {
         if (response.errcode != 0) {
             return;
         }
-        switch(this.ad_subType){
-            case AdFun.bubble:
 
-            break;
-            case AdFun.sign
+        if(this.datas[this.ad_subType]){
+            this.datas[this.ad_subType].adData = response.data;
         }
-        this.data = response.data;
     }
 
 }
+
+/**
+ * 看视频类型
+ */
+export enum AdFun {
+    bubble = 1,         //气泡视频
+    checkpoint = 2,     //关卡视频
+    settlement = 3,     //关卡结算视频
+    turntable = 4,      //转盘视频
+    sign = 5,           //签到视频
+    bigCash = 6,         //福袋视频
+}

assets/script/game/data/GData.ts

@@ -1,5 +1,3 @@
-import { Data } from "../../mk/data/Data";
-import { AdData } from "./AdData";
 import { AppData } from "./AppData";
 import { GameData } from "./GameData";
 import { HttpData } from "./HttpData";
@@ -15,6 +13,7 @@ import { FissionData } from "./module/FissionData";
 import { LuckyBagData } from "./module/LuckyBagData";
 import { CashNormalData } from "./module/CashNormalData";
 import { CashPigData } from "./module/CashPigData";
+import { AdData } from "./AdData";
 
 /**
  * 数据集合全局类

assets/script/game/data/LoginData.ts

@@ -111,7 +111,7 @@ export class LoginData {
         else {
             this.isNew = true;
         }
-        mk.storage.setStorage('uin', this.uin);
+        mk.storage.setStorage(StorageKey.uin, this.uin);
 
         //checkLogin
         let tmp_key = '';

assets/script/game/data/g.ts.meta

@@ -1,9 +0,0 @@
-{
-  "ver": "1.0.8",
-  "uuid": "ecf8b557-7327-4c26-9f0c-a0ab356c57a9",
-  "isPlugin": false,
-  "loadPluginInWeb": true,
-  "loadPluginInNative": true,
-  "loadPluginInEditor": false,
-  "subMetas": {}
-}

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

@@ -1,8 +1,10 @@
+import { Data } from "../../../mk/data/Data";
+
 /**
  * @description 常规提现数据
  * @author 邹勇
  */
- export class CashNormalData{
+ export class CashNormalData extends Data{
 
     
 }

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

@@ -1,8 +1,10 @@
+import { Data } from "../../../mk/data/Data";
+
 /**
  * @description 金猪提现数据
  * @author 邹勇
  */
- export class CashPigData{
+ export class CashPigData extends Data{
 
     
 }

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

@@ -1,8 +1,10 @@
+import { Data } from "../../../mk/data/Data";
+
 /**
  * @description 裂变数据
  * @author 邹勇
  */
- export class FissionData{
+ export class FissionData extends Data{
 
     
 }

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

@@ -1,8 +1,10 @@
+import { Data } from "../../../mk/data/Data";
+
 /**
  * @description 福袋数据
  * @author 邹勇
  */
- export class LuckyBagData{
+ export class LuckyBagData extends Data{
 
     
 }

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

@@ -1,3 +1,5 @@
+import { Data } from "../../../mk/data/Data";
+
 /**
  * 存钱罐数据
  * - 提现描述显示：
@@ -8,7 +10,7 @@
  *      不满足显示：“满x可提”
  * @author 薛鸿潇
  */
-export class PigBankData {
+export class PigBankData extends Data {
     /** 标志位：是否需要刷新数据 */
     public init_data: boolean = true;
     /** 是否可提现 */

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

@@ -1,8 +1,10 @@
+import { Data } from "../../../mk/data/Data";
+
 /**
  * @description 互推数据
  * @author 邹勇
  */
- export class PushData{
+ export class PushData extends Data{
 
     
 }

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

@@ -1,10 +1,11 @@
+import { Data } from "../../../mk/data/Data";
 import { RewardState } from "../GameData";
 
 /**
  * @description 签到数据
  * @author 邹勇 薛鸿潇
  */
-export class SignData {
+export class SignData  extends Data{
     /** 标志位：是否需要刷新数据 */
     public init_data: boolean = false;
 

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

@@ -1,12 +1,17 @@
+import { Data } from "../../../mk/data/Data";
+
 /**
  * @description 转盘数据
  * @author 邹勇
  */
- export class TurnableData{
+ export class TurnableData extends Data{
 
 
     public leftTimes:number = 2;
 
+
+    
+
     
     public async draw(){
         let data = {};

assets/script/game/module/module/sign/Sign.ts

@@ -22,7 +22,7 @@ export default class Sign extends cc.Component {
     }
 
     start() {
-        gData.sign.sign_can = gData.gameData.getProp(GameProp.sign_can)
+        // gData.sign.sign_can = gData.gameData.getProp(GameProp.sign_can)
         gData.sign.initListData();
         gData.sign.init_data = true;
     }
@@ -39,10 +39,23 @@ export default class Sign extends cc.Component {
      * 点击领取按钮
      */
     private clickReceiveReward() {
+        if (!gData.sign.sign_can) return;
         gData.sign.sign_can = 0;
         gData.sign.sign_last_bar++;
-        gData.gameData.setProp(GameProp.sign_can, gData.sign.sign_can)
-        gData.gameData.setProp(GameProp.sign_last_bar, gData.sign.sign_last_bar)
+        let test = null;
+        // let data = [
+        //     {
+        //         key: GameProp.sign_can,
+        //         value: gData.sign.sign_can
+        //     },
+        //     {
+        //         key: GameProp.sign_last_bar,
+        //         value: gData.sign.sign_last_bar
+        //     }
+        // ]
+        // gData.gameData.setProps(data)
+        // gData.gameData.setProp(GameProp.sign_can, gData.sign.sign_can)
+        // gData.gameData.setProp(GameProp.sign_last_bar, gData.sign.sign_last_bar)
     }
 
     update(dt) {
@@ -50,6 +63,7 @@ export default class Sign extends cc.Component {
             gData.sign.init_data = false;
             this.initScollView();
             this.initBtnStyle();
+            cc.log(1)
         }
     }
 

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

@@ -37,7 +37,7 @@ export default class Turnable extends cc.Component {
     clickDraw() {
         if (gData.turnable.leftTimes > 0 && !this.isPlaying) {
             this.isPlaying = true;
-            g.adData.watchVideo(AdFun.turntable);
+            gData.adData.watchVideo(AdFun.turntable);
         }
     }
 
@@ -58,12 +58,6 @@ export default class Turnable extends cc.Component {
     }
 
     update() {
-        if(g.turnable.)
-        if (!gData.turnable.dataFinish) {
-            gData.turnable.init();
-        }
-        else{
-            this.initData();
-        }
+        
     }
 }

assets/script/mk/data/Data.ts

@@ -4,4 +4,6 @@
  */
 export class Data {
     
+    /** 视频广告后的奖励数据 */
+    public adData:any;
 }