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

assets/script/game/data/GData.ts

@@ -16,6 +16,7 @@ import { CashPigData } from "./module/CashPigData";
 import { AdData } from "./AdData";
 import { RewardData } from "./module/RewardData";
 import MoreGameData from "./MoreGameData";
+import { Data } from "../../mk/data/Data";
 
 /**
  * 数据集合全局类
@@ -38,16 +39,16 @@ class GData {
     //module
     public reward: RewardData;
     public help: HelpData;
-    public push: PushData;
     public turnable: TurnableData;
     public fission: FissionData;
     public pigbank: PigBankData;
     public luckybag: LuckyBagData;
     public sign: SignData;
     public cashNormal: CashNormalData;
-    public cashPig: CashPigData;
     public moreGame: MoreGameData;
 
+    public moduleData:Map<number,Data>;
+
     init() {
         this.appData = new AppData();
         this.loginData = new LoginData();
@@ -59,16 +60,22 @@ class GData {
 
         this.reward = new RewardData();
         this.help = new HelpData();
-        this.pigbank = new PigBankData();
-        this.push = new PushData();
         this.turnable = new TurnableData();
         this.fission = new FissionData();
         this.pigbank = new PigBankData();
         this.luckybag = new LuckyBagData();
         this.sign = new SignData();
         this.cashNormal = new CashNormalData();
-        this.cashPig = new CashPigData();
         this.moreGame = new MoreGameData();
+
+        this.moduleData = new Map<number,Data>();
+        this.moduleData.set(Fun.moreGame,this.moreGame);
+        this.moduleData.set(Fun.turnable,this.turnable);
+        this.moduleData.set(Fun.fission,this.fission);
+        this.moduleData.set(Fun.pigbank,this.pigbank);
+        this.moduleData.set(Fun.luckybag,this.luckybag);
+        this.moduleData.set(Fun.sign,this.sign);
+        this.moduleData.set(Fun.cashNormal,this.cashNormal);
     }
 }
 
@@ -76,14 +83,13 @@ class GData {
  * 提现模块的功能ID
  */
 export enum Fun {
-    push = 1,       //互推
+    moreGame = 1,   //互推
     turnable = 2,   //转盘
     fission = 3,    //裂变
     pigbank = 4,    //存钱罐
     luckybag = 5,   //福袋
     sign = 6,       //签到
     cashNormal = 7, //常规提现
-    cashPig = 8,    //金猪提现
 }
 
 declare global {

assets/script/game/data/GameData.ts

@@ -15,6 +15,7 @@ export class GameData {
 
 
     public configs: any = {};
+    public gameData:any;
 
     public props: Map<number, number>;
 
@@ -36,6 +37,7 @@ export class GameData {
         if (response.errcode != 0) {
             return;
         }
+        this.gameData = response.data;
 
         if (this.props == null) {
             this.props = new Map<number, number>();
@@ -43,6 +45,10 @@ export class GameData {
 
         this.initProps(response.data.gameUserData);
 
+        gData.moduleData.forEach(element => {
+            element.init();
+        });
+
         this.dataFinish = true;
 
         gData.moreGame.init()

assets/script/game/data/MoreGameData.ts

@@ -4,9 +4,10 @@
  * @author kaka
  */
 
+import { Data } from "../../mk/data/Data";
 import JsbSystem from "../../mk/system/JsbSystem"
 
-export default class MoreGameData {
+export default class MoreGameData extends Data{
     /**推荐游戏信息 */
     private _moreGameList = null
 

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

@@ -1,6 +1,11 @@
 import { Data } from "../../../mk/data/Data";
 import { GameProp } from "../GameData";
 
+interface TurntableItem{
+    id:string,
+    type:string,
+}
+
 /**
  * @description 转盘数据
  * @author 邹勇
@@ -9,7 +14,11 @@ export class TurnableData extends Data {
 
 
     public leftTimes: number = 2;
+    public config:TurntableItem[];
 
+    public init(){
+        this.config = gData.gameData.configs.TurntableCfg;
+    }
 
     public setAdData(data) {
         super.setAdData(data);

assets/script/mk/data/Data.ts

@@ -4,9 +4,16 @@
  */
 export class Data {
     
+    /** 网络配置，登录后就有 */
+    public config:any;
+
     /** 视频广告后的奖励数据 */
     public adData:any;
 
+    public init(){
+        
+    }
+
     public setAdData(data){
         this.adData = data;
     }