1

egret/index.html

@@ -50,29 +50,7 @@
         window['renderMode'] = 'webgl';
         window['development'] = true;
         var gameId = 1;
-        var CFG = {
-            appInfo: {
-                "appId": 1,
-                "earnCreditsUrl": "https://www.baidu.com/",
-                "loginProgram": "",
-                "open": false,
-                "openLogin": false
-            },
-            gameInfo: {
-                "id": 1317,
-                "oaId": 19951,
-                "offDate": "2018-04-17 11:00",
-                "openTotalScoreSwitch": false,
-                "rankPrize": true,
-                "skincontent": ""
-            },
-            extra: {
-                "embedDomain": "//embedlog.duibatest.com.cn"
-            },
-            defenseStrategy: {
-                "scoreUnit": 10
-            }
-        }
+        var CFG = { "actId": "3335069", "oaId": "3335069", "unitName": "积分", "btnUnitName": "积分", "doJoin": "/hdtool/doJoin?dpm=1.3.1.0&activityId=3335069", "quireOrder": "/hdtool/getOrderStatus", "styleConfig": "/hdtool/getHdtoolConfig", "getElement": "/hdtool/ajaxElement", "getPrizeDetail": "/hdtool/prizeDetail", "ajaxThroughInfo": "/hdtool/ajaxThroughInfo", "throughSubmit": "/hdtool/throughSubmit", "gameGetOrder": "/hdtool/getOrderInfo", "gameSubmit": "/hdtool/gameSubmit", "doSubmit": "/hdtool/submit", "adslotId": "", "consumerId": "1", "isNotLoginUser": false, "uid": "1", "hdType": "duiba", "hdToolId": "42363", "appType": "credits", "subType": "custom", "directSendCoupon": "false", "ajaxAction": "", "recommendQueue": "/recommend/getRecommend", "recommendSkin": "/recommend/getRecommendSkin", "isShowDetail": true, "preview": false, "from": "", "login": "//activity.m.duiba.com.cn/hdtool/login?dpm=1.3.3.0", "flowRedirectUrl": "", "flowRedirectTuiaUrl": "", "isOpenRecommend": false, "getCreditsLink": "http://baidu.com?uid=1&dbnewopen", "appId": "1", "recordUrl": "//activity.m.duiba.com.cn/crecord/record?dbnewopen&dpm=1.3.2.0", "shareDesc": "分享分享文案文案", "entranceDesc": "测试领奖，也可到我的奖品领奖，24小时内有效哦", "isSHowMeat": true, "needCouponModal": true, "needRecommendModal": true, "asyncFiles": [], "shareAndroidLinkActivity": "http://www.duiba.com.cn", "shareIosLinkActivity": "http://www.iqiyi.com", "appName": "custom", "needShare": true, "shareTitle": "", "shareSubTitle": "", "sharePicUrl": "", "shareLink": "", "shareAndroidDeeplink": "", "shareIOSDeeplink": "" };
         var recordUrl = 'record/';
         var resPath = '';
         function resolve(a) {

egret/libs/new_tw/ctrls/doStart.ts

-import { NetManager } from "../../../libs/tw/manager/NetManager";
-import { DataManager } from "../../../libs/tw/manager/DataManager";
-
-/**
- * 开始游戏
- * @param callback 
- * @param isAgain
- * @param credits 
- * @param customizedType 
- */
-const doStart = (callback: Function, isAgain = false, credits?: number, customizedType?: number) => {
-    if (window['requirelogin']) {
-        window['requirelogin']();
-        return;
-    }
-    NetManager.ins.doStart((success: boolean) => {
-        if (success) {
-            getStartOrderStatus(callback, customizedType);
-        } else {
-            callback(success);
-        }
-    },
-        isAgain,
-        credits,
-        customizedType);
-}
-
-/**
- * 查询订单结果
- * @param callback 
- * @param ticketId 
- * @param customizedType
- */
-const getStartOrderStatus = (callback: Function, customizedType?: number) => {
-    NetManager.ins.getStartStatus(
-        callback,
-        DataManager.ins.doStartData.ticketId,
-        () => { return DataManager.ins.getStartStatusData.code != 1; },
-        5,
-        customizedType);
-}
-export default doStart;
\ No newline at end of file

egret/libs/new_tw/ctrls/hdGameDoDojoin.ts

+import { DataManager } from "../../tw/manager/DataManager";
+import { NetManager } from "../../tw/manager/NetManager";
+
+const getHdGameOrderStatus = (callback: Function): void => {
+    const dojoin = DataManager.ins.getData('dojoin');
+    NetManager.ins.getNgameStartStatus(callback, dojoin.data, () => {
+        const data = DataManager.ins.getData('getNgameStartStatus');
+        return data.code == 'C000000001';
+    });
+}
+
+/**
+ * 活动工具类型游戏子类型抽奖
+ * @param callback
+ * @param nextStep 下一步做什么，轮询结果或者前置开奖等
+ */
+const hdGameDoDojoin = (callback: Function, collectRuleId?: number): void => {
+    if (window['uid'] == 'not_login') {
+        window['requirelogin']();
+        return;
+    }
+    NetManager.ins.doJoin((success: boolean) => {
+        if (success) {
+            getHdGameOrderStatus(callback);
+        } else {
+            callback(success);
+        }
+    });
+}
+
+export default hdGameDoDojoin
\ No newline at end of file

egret/libs/new_tw/ctrls/submit.ts

@@ -23,21 +23,20 @@ const submit = (callback: Function, score: number, checkScore?: boolean, customi
 * @param customizedType 定制类型 1推币机    
 */
 const gameSubmitData = (callback: Function, score: number, allDynamics: IDynamicData[][], checkScore?: boolean, customizedType?: number) => {
-    NetManager.ins.gameSubmit(
+    NetManager.ins.ngameSubmit(
         (success: boolean) => {
             if (success) {
-                getSubmitResult(callback, DataManager.ins.gameSubmitData.orderId);
+                getOrderStatus(callback, DataManager.ins.getData('dojoin').data);
             } else {
                 callback(success);
             }
         },
-        DataManager.ins.doStartData.ticketId,
+        DataManager.ins.getData('dojoin').data,
         score,
         '[]',
-        DataManager.ins.doStartData.submitToken,
-        JSON.stringify(allDynamics),
-        checkScore,
-        customizedType);
+        '[]',
+        DataManager.ins.getData('getNgameStartStatus').data.submitToken,
+        window['rankId']);
 }
 
 /**
@@ -45,9 +44,9 @@ const gameSubmitData = (callback: Function, score: number, allDynamics: IDynamic
  * @param callback 
  * @param orderId 
  */
-const getSubmitResult = (callback: Function, orderId: number) => {
-    NetManager.ins.getSubmitResult(callback, orderId, () => {
-        return DataManager.ins.gameGetSubmitResultData.flag;
+const getOrderStatus = (callback: Function, orderId: number) => {
+    NetManager.ins.getOrderStatus(callback, orderId, () => {
+        return DataManager.ins.getData('getOrderStatus').code == 'C000000001';
     });
 }
 

egret/libs/new_tw/ctrls/submitAfterDostart.ts

-import doStart from "./doStart";
-import submit from "./submit";
-
-const submitAfterDostart = (cb, score) => {
-    doStart(
-        () => {
-            setTimeout(() => {
-                submit(cb, score)
-            }, 200);//延迟200ms，这是后端约定
-        }
-    )
-}
-
-export default submitAfterDostart
\ No newline at end of file

egret/libs/new_tw/datas/getCountTxt.ts

-import { DataManager } from "../../tw/manager/DataManager";
-
-/**
- * 剩余次数
- * 为了按钮字体的美观，不展示开始游戏之外的文案，非常规状态由业务文案代替展示。
- */
-const getCountTxt = () => {
-    let txt: string;
-    if (DataManager.ins.getInfoData.status.code != 0) {
-        txt = DataManager.ins.getInfoData.status.btnText;
-    } else {
-        txt = DataManager.ins.getInfoData.status.text;
-    }
-    return txt;
-}
-
-export default getCountTxt;
\ No newline at end of file

egret/libs/new_tw/datas/getStartBtnEnable.ts

-import { DataManager } from "../../tw/manager/DataManager";
-/**
-    * 开始游戏按钮状态
-    */
-const getStartBtnEnable = () => {
-    let enable: boolean;
-    if (DataManager.ins.getInfoData.status.btnDisable || DataManager.ins.getInfoData.status.code == 6) {
-        enable = false;
-    } else {
-        enable = true;
-    }
-    return enable;
-}
-
-export default getStartBtnEnable;
\ No newline at end of file

egret/libs/new_wx/MainBase.ts

 import PlayScene from "../../src/playScene/PlayScene";
 import StartScene from "../../src/startScene/StartScene";
 import getResPath from "../new_tc/getResPath";
-import { check_webp_feature } from "../tc/util/GFun";
 import { DataManager } from "../tw/manager/DataManager";
 import { NetManager } from "../tw/manager/NetManager";
 import AssetAdapter from "./adapter/AssetAdapter";
@@ -20,14 +19,13 @@ import { ModuleTypes } from "./types/sceneTypes";
 import layers from "./views/layers";
 import RelivePanel from "../../src/panels/RelivePanel";
 import NoPrizePanel from "./components/NoPrizePanel";
+import { Buried } from "../tw/util/Buried";
 
 export default class MainBase extends eui.UILayer {
     constructor() {
         super();
-        check_webp_feature();
         Loading.instace.loadImage();
-        DataManager.ins.gameCfgData = window['CFG'];
-        DataManager.ins.gameCfgData.gameInfo.gameId = window["gameId"];
+        DataManager.ins.customCfgData = window['CFG'];
         this.getData();
     }
 
@@ -93,7 +91,6 @@ export default class MainBase extends eui.UILayer {
 
         this.registerModules();
 
-        // this.loadFirstScreen();
         Loading.instace.show();
 
         RES.setMaxLoadingThread(10);
@@ -102,43 +99,6 @@ export default class MainBase extends eui.UILayer {
         })
     }
 
-    loadAtlas() {
-        // if (!window['development']) {
-        //     loadSpriteSheet().then((spritesheet: egret.SpriteSheet) => {
-        //         Loading.instace.setSpriteSheet(spritesheet);
-        //         const t = Date.now() - window['__startTime__'];
-        //         console.log(`首屏loading显示时间：${t}ms`);
-        //     })
-        // }
-    }
-
-    // _firstBgLoaded = false;
-    // loadFirstScreen() {
-    //     this.loadFirstBG((bitmap: egret.Bitmap) => {
-    //         const t = Date.now() - window['__startTime__'];
-    //         console.log(`首屏背景显示时间：${t}ms`);
-    //         layers.addFirstBackground(bitmap);
-    //         this._firstBgLoaded = true;
-    //         this.check();
-    //     });
-    // }
-
-    // loadFirstBG(callback) {
-    //     const onImageLoaded = (e: egret.Event) => {
-    //         const imageLoader: egret.ImageLoader = e.currentTarget;
-    //         const bitmapData: egret.BitmapData = imageLoader.data;
-    //         const texture = new egret.Texture();
-    //         texture._setBitmapData(bitmapData);
-    //         const bitmap = new egret.Bitmap(texture);
-    //         callback(bitmap);
-    //     }
-    //     const imageLoader = new egret.ImageLoader();
-    //     imageLoader.once(egret.Event.COMPLETE, onImageLoaded, this);
-    //     const url = getResPath() + "resource/assets/startScene/startscenebg.jpg";
-    //     // url = getImgURL(url);
-    //     imageLoader.load(url);
-    // }
-
     private async runGame() {
         await this.loadResource()
 
@@ -183,15 +143,13 @@ export default class MainBase extends eui.UILayer {
         })
     }
 
-    /**
-     * 创建场景界面
-     * Create scene interface
-     */
-    // _startSceneReady = false;
     protected createGameScene() {
-        NetManager.ins.getInfo(() => {
+        NetManager.ins.ajaxElement(async () => {
+            Buried.init();
+
             SceneCtrl.instance.change(ModuleTypes.START_SCENE);
-        });
+
+        })
 
     }
 }
\ No newline at end of file

egret/libs/new_wx/components/NoPrizePanel.ts

-import doStart from "../../new_tw/ctrls/doStart";
 import { DataManager } from "../../tw/manager/DataManager";
 import { NetManager } from "../../tw/manager/NetManager";
 import SceneCtrl from "../ctrls/sceneCtrl";
 import { ModuleTypes } from "../types/sceneTypes";
-import Loading from "./Loading";
 import Panel from "./Panel";
 export default class NoPrizePanel extends Panel {
     start(data) {
@@ -12,25 +10,6 @@ export default class NoPrizePanel extends Panel {
         NetManager.ins.getInfo();
     }
 
-    initEvents() {
-        super.initEvents();
-        // this['onceAgainBtn'].once(egret.TouchEvent.TOUCH_TAP, this.onTouchTap, this);
-    }
-
-    // onTouchTap() {
-    //     this.closeBtns.forEach(
-    //         btn => { if (btn) btn.touchEnabled = false }
-    //     );
-    //     Loading.instace.show();
-    //     doStart((success) => {
-    //         Loading.instace.hide();
-    //         if (success) {
-    //             this.hidePanel();
-    //             SceneCtrl.instance.change(ModuleTypes.PLAY_SCENE);
-    //         }
-    //     });
-    // }
-
     onTouchTap_closeBtn(): any {
         super.onTouchTap_closeBtn();
         SceneCtrl.instance.change(ModuleTypes.START_SCENE);
@@ -38,6 +17,6 @@ export default class NoPrizePanel extends Panel {
     get skinKey() { return 'NoPrize' }
 
     protected get closeBtns(): eui.Button[] {
-        return [this['closeBtn'],this['onceAgainBtn']]
+        return [this['closeBtn'], this['onceAgainBtn']]
     }
 }
\ No newline at end of file

egret/libs/new_wx/components/RulePanel.ts

 import { DataManager } from "../../tw/manager/DataManager";
-import { NetManager } from "../../tw/manager/NetManager";
 import { HtmlTextParser } from "../HtmlTextParser";
 import Panel from "./Panel";
 
@@ -8,19 +7,15 @@ export default class RulePanel extends Panel {
     public scroller: eui.Scroller;
     start() {
         super.start();
-        if (!DataManager.ins.getRuleData)
-            NetManager.ins.getRule(() => {
-                this.addRule();
-            });
-        else
-            this.addRule();
+
+        this.addRule();
     }
 
     group: eui.Group;
     private addRule() {
-        const text = DataManager.ins.getRuleData.ruleText;
-        this.labContent.textFlow = (new HtmlTextParser).parser('<br>'+DataManager.ins.getRuleData.ruleText);
+        const text ='<br>'+ DataManager.ins.ajaxElementData.rule;
+        this.labContent.textFlow = (new HtmlTextParser).parser(text);
     }
 
-     get skinKey() { return 'Rule' }
+    get skinKey() { return 'Rule' }
 }
\ No newline at end of file

egret/libs/tw/data/custom/ajaxElement/CreditsType.ts

+enum CreditsType{
+    virtual='virtual'
+}
+
+export default CreditsType
\ No newline at end of file

egret/libs/tw/data/custom/ajaxElement/IcreditsConf.ts

+import CreditsType from "./CreditsType";
+import IcreditsConfPrize from "./IcreditsConfPrize";
+
+export default interface IcreditsConf{
+    creditsDown:number,
+    creditsUp:number,
+    creditsType:CreditsType;
+    prize:IcreditsConfPrize[];
+}

egret/libs/tw/data/custom/ajaxElement/IcreditsConfPrize.ts

+export default interface IcreditsConfPrize{
+    img,
+    credits:number,
+    id:number,
+    title:string
+}
\ No newline at end of file

egret/libs/tw/data/custom/ajaxElement/ReconAjaxElementData.ts

+import { Data } from "../../Data";
+import { ICustomOptionData } from "./ICustomOptionData";
+import { IElementData } from "./IElementData";
+import IcreditsConf from "./IcreditsConf";
+
+export class ReconAjaxElementData extends Data {
+    /**
+     * 闯关信息
+     */
+    public throughCurrent: number;
+
+    /**
+     * 闯关模式
+     */
+    public throughMode: number;
+
+    /**
+     * 关卡ID
+     */
+    public throughNum: number;
+
+    /**
+     * 站点位置
+     */
+    public throughCurrentStep: number;
+
+    /**
+     * 弹层js
+     */
+    public jsTest: string;
+
+    /**
+     * 弹层css
+     */
+    public cssTest: string;
+
+    /**
+     * 活动规则
+     */
+    public rule: any;
+
+    /**
+     * 活动类型
+     */
+    public type: string;
+
+    /**
+     * 奖项列表
+     */
+    public options: ICustomOptionData[];
+
+
+    /**
+     * 页面展示信息
+     */
+    public element: IElementData;
+
+    creditsConf: IcreditsConf;
+    thanksOpt: ICustomOptionData;
+
+    public update(result: any): void {
+        if (!result) {
+            return;
+        }
+        super.update(result);
+        this.throughCurrent = result.throughCurrent;
+        this.throughMode = result.throughMode;
+        this.throughNum = result.throughNum;
+        this.throughCurrentStep = result.throughCurrentStep;
+        this.jsTest = result.jsTest;
+        this.cssTest = result.cssTest;
+        this.rule = result.rule;
+        this.type = result.type;
+        this.options = result.options;
+        this.element = result.element;
+        this.creditsConf = result.creditsConf;
+        const thanksList = this.options.filter(opt => opt.prizeType == 'thanks');
+        if (thanksList) this.thanksOpt = thanksList[0]
+    }
+}
\ No newline at end of file

egret/libs/tw/data/custom/doJoin/DoJoinData.ts

@@ -8,7 +8,7 @@ export class DoJoinData extends Data {
     /**
      * 所需积分
      */
-    public needCredits: number;
+    // public needCredits: number;
 
     /**
      * 订单ID
@@ -20,7 +20,7 @@ export class DoJoinData extends Data {
             return;
         }
         super.update(data);
-        this.needCredits = data.needCredits;
-        this.orderId = data.orderId;
+        // this.needCredits = data.needCredits;
+        this.orderId = data.data;
     }
 }
\ No newline at end of file

egret/libs/tw/manager/DataManager.ts

-import { GetVisitInfoData } from './../data/pets/GetVisitInfoData';
-import { GetSummerInfoData } from './../data/game/getInfo/GetSummerInfoData';
-import { GetReviveCardNumData } from './../data/game/doRevive/GetReviveCardNumData';
-import { DoReviveData } from './../data/game/doRevive/DoReviveData';
-import { DoJoinPlugDrawData } from './../data/plug/doJoinPlugDraw/DoJoinPlugDrawData';
-import { NetName } from './../enum/NetName';
-import { QuestionSubmitData } from './../data/custom/questionSbumit/QuestionSubmitData';
-import { GetCollectRuleData } from './../data/common/getCollectRule/GetCollectRuleData';
-import { DatapashData } from './../data/game/datapash/DatapashData';
-import { OpenCollectGoodsPrizeData } from './../data/common/openCollectGoodsPrize/openCollectGoodsPrizeData';
-import { TwLang } from "../util/TwLang";
+import { ABDataManager } from '../../tc/manager/ABDataManager';
+import { AddTimesForActivityData } from "../data/common/addTimesForActivity/AddTimesForActivityData";
+import { GetCreditsData } from "../data/common/getCredits/GetCreditsData";
+import { GetRecordData } from '../data/common/GetRecordData';
+import { GetRoleData } from "../data/common/getRole/GetRoleData";
+import { SetRoleData } from "../data/common/setRole/SetRoleData";
+import { AjaxElementData } from "../data/custom/ajaxElement/AjaxElementData";
+import { ReconAjaxElementData } from '../data/custom/ajaxElement/ReconAjaxElementData';
+import { AjaxThroughInfoData } from "../data/custom/ajaxThroughInfo/AjaxThroughInfoData";
+import { BeforSubmitData } from '../data/custom/beforSubmit/BeforSubmitData';
+import { ICustomCfgData } from '../data/custom/cfg/ICustomCfgData';
+import { DoJoinData } from "../data/custom/doJoin/DoJoinData";
+import { GetCustomOrderStatusData } from "../data/custom/doJoin/GetCustomOrderStatusData";
+import { GetOrderInfoData } from "../data/custom/getOrderInfo/GetOrderInfoData";
+import { ThroughSubmitData } from '../data/custom/throughSubmit/ThroughSubmitData';
+import { Data } from '../data/Data';
+// import { ICustomCfgData } from '..';
+import { IGameCfgData } from '../data/game/cfg/IGameCfgData';
 import { DoStartData } from "../data/game/doStart/DoStartData";
 import { GetStartStatusData } from "../data/game/doStart/GetStartStatusData";
 import { GetInfoData } from "../data/game/getInfo/GetInfoData";
@@ -16,52 +23,46 @@ import { GetOptionsData } from "../data/game/getOptions/GetOptionsData";
 import { GetRuleData } from "../data/game/getRule/GetRuleData";
 import { GetUserTotalScoreData } from "../data/game/getUserTotalScore/GetUserTotalScoreData";
 import { GuessPokerData } from "../data/game/guessPoker/GuessPokerData";
-import { GameSubmitData } from "../data/game/submit/GameSubmitData";
 import { RealTimeRankData } from "../data/game/realtimerank/RealTimeRankData";
+import { GameSubmitData } from "../data/game/submit/GameSubmitData";
 import { WinRanksData } from "../data/game/winranks/WinRanksData";
-import { AjaxElementData } from "../data/custom/ajaxElement/AjaxElementData";
-import { DoJoinData } from "../data/custom/doJoin/DoJoinData";
-import { AjaxThroughInfoData } from "../data/custom/ajaxThroughInfo/AjaxThroughInfoData";
-import { GetOrderInfoData } from "../data/custom/getOrderInfo/GetOrderInfoData";
-import { GetCustomOrderStatusData } from "../data/custom/doJoin/GetCustomOrderStatusData";
-import { GetRoleData } from "../data/common/getRole/GetRoleData";
-import { GetCreditsData } from "../data/common/getCredits/GetCreditsData";
-import { AddTimesForActivityData } from "../data/common/addTimesForActivity/AddTimesForActivityData";
-import { SetRoleData } from "../data/common/setRole/SetRoleData";
-import { GameGetSubmitResultData } from './../data/game/submit/GameGetSubmitResultData';
-import { ThroughSubmitData } from '../data/custom/throughSubmit/ThroughSubmitData';
-import { BeforSubmitData } from '../data/custom/beforSubmit/BeforSubmitData';
+import { CollectData } from "../data/pet/CollectData";
+import { GetFoodPilesData } from '../data/pet/GetFoodPilesData';
+import { GetRankListData } from '../data/pet/GetRankListData';
+import { GetToysData } from "../data/pet/GetToysData";
 import { PetAdopteData } from "../data/pet/PetAdopteData";
 import { PetFeedData } from "../data/pet/PetFeedData";
+import { PetHomeInfoData } from "../data/pet/PetHomeInfoData";
+// import { ABDataManager } from 'duiba-tc';
+import { PetIndexData } from '../data/pet/PetIndexData';
 import { PetStatusData } from "../data/pet/PetStatusData";
 import { SignInfoData } from "../data/pet/SignInfoData";
-import { PetHomeInfoData } from "../data/pet/PetHomeInfoData";
-import { GetToysData } from "../data/pet/GetToysData";
 import { ToyExchangeData } from "../data/pet/ToyExchangeData";
 import { ToyUseData } from "../data/pet/ToyUseData";
-import { CollectData } from "../data/pet/CollectData";
-import { Data } from '../data/Data';
-import { GetPlugOrderStatusData } from '../data/plug/doJoinPlugDraw/GetPlugOrderStatusData';
-import { OptionInfoData } from '../data/plug/optionInfo/OptionInfoData';
-import { UnblockingData } from '../data/plug/unblocking/UnblockingData';
-import { GetPrizeInfoData } from '../data/plug/getPrizeInfo/GetPrizeInfoData';
-// import { ABDataManager } from 'duiba-tc';
-import { PetIndexData } from '../data/pet/PetIndexData';
-// import { ICustomCfgData } from '..';
-import { IGameCfgData } from '../data/game/cfg/IGameCfgData';
-import { GetRankListData } from '../data/pet/GetRankListData';
-import { GetFoodPilesData } from '../data/pet/GetFoodPilesData';
-import { GetRecordData } from '../data/common/GetRecordData';
-import { UseToyData } from '../data/pets/UseToyData';
 import { GetActToysListData } from '../data/pets/GetActToysListData';
-import { ToyExchangesData } from '../data/pets/ToyExchangesData';
-import { GetUserToysListData } from '../data/pets/GetUserToysListData';
 import { GetHomeInfoData } from '../data/pets/GetHomeInfoData';
+import { GetUserToysListData } from '../data/pets/GetUserToysListData';
 import { PetsIndexData } from '../data/pets/PetsIndexData';
-import { VisitStatisticsData } from '../data/pets/VisitStatisticsData';
+import { ToyExchangesData } from '../data/pets/ToyExchangesData';
+import { UseToyData } from '../data/pets/UseToyData';
 import { VisitDetailData } from '../data/pets/VisitDetailData';
-import { ABDataManager } from '../../tc/manager/ABDataManager';
-import { ICustomCfgData } from '../data/custom/cfg/ICustomCfgData';
+import { VisitStatisticsData } from '../data/pets/VisitStatisticsData';
+import { GetPlugOrderStatusData } from '../data/plug/doJoinPlugDraw/GetPlugOrderStatusData';
+import { GetPrizeInfoData } from '../data/plug/getPrizeInfo/GetPrizeInfoData';
+import { OptionInfoData } from '../data/plug/optionInfo/OptionInfoData';
+import { UnblockingData } from '../data/plug/unblocking/UnblockingData';
+import { TwLang } from "../util/TwLang";
+import { GetCollectRuleData } from './../data/common/getCollectRule/GetCollectRuleData';
+import { OpenCollectGoodsPrizeData } from './../data/common/openCollectGoodsPrize/openCollectGoodsPrizeData';
+import { QuestionSubmitData } from './../data/custom/questionSbumit/QuestionSubmitData';
+import { DatapashData } from './../data/game/datapash/DatapashData';
+import { DoReviveData } from './../data/game/doRevive/DoReviveData';
+import { GetReviveCardNumData } from './../data/game/doRevive/GetReviveCardNumData';
+import { GetSummerInfoData } from './../data/game/getInfo/GetSummerInfoData';
+import { GameGetSubmitResultData } from './../data/game/submit/GameGetSubmitResultData';
+import { GetVisitInfoData } from './../data/pets/GetVisitInfoData';
+import { DoJoinPlugDrawData } from './../data/plug/doJoinPlugDraw/DoJoinPlugDrawData';
+import { NetName } from './../enum/NetName';
 
 /**
  *Created by cuiliqiang on 2018/3/8
@@ -117,7 +118,7 @@ export class DataManager extends ABDataManager {
     private _doJoinPlugDrawData: DoJoinPlugDrawData;
     private _getPlugOrderStatusData: GetPlugOrderStatusData;
     private _setRoleData: SetRoleData;
-    private _ajaxElementData: AjaxElementData;
+    private _ajaxElementData: ReconAjaxElementData;
     private _ajaxThroughInfoData: AjaxThroughInfoData;
     private _doJoinData: DoJoinData;
     private _getCustomOrderStatusData: GetCustomOrderStatusData;
@@ -342,9 +343,9 @@ export class DataManager extends ABDataManager {
                 break;
             case NetName.CUSTOM_ELEMENT:
                 if (!this._ajaxElementData) {
-                    this._ajaxElementData = new AjaxElementData();
+                    this._ajaxElementData = new ReconAjaxElementData();
                 }
-                this._ajaxElementData.update(result);
+                this._ajaxElementData.update(result.data);
                 data = this._ajaxElementData;
                 break;
             case NetName.CUSTOM_THROUGH_INFO:
@@ -777,7 +778,7 @@ export class DataManager extends ABDataManager {
     /**
      * 活动工具基础信息
      */
-    public get ajaxElementData(): AjaxElementData {
+    public get ajaxElementData(): ReconAjaxElementData {
         return this._ajaxElementData;
     }
 

egret/libs/tw/manager/NetManager.ts

@@ -406,6 +406,48 @@ export class NetManager extends ABNetManager {
         this.send(net);
     }
 
+    ngameSubmit(callback: Function, orderId: number, score: number, gameData: any, dynamicData: any, submitToken: string, rankId?: number): void {
+        const sign = this.createSgin(orderId, score, gameData, submitToken);
+        const param: any = {
+            orderId: orderId,
+            score: score,
+            gameData: gameData,
+            sgin: sign,
+            dynamicData: JSON.stringify(dynamicData)
+        };
+        if (rankId) {
+            param.rankId = rankId;
+        }
+        const net: INetData = {
+            name: 'ngameSubmit',
+            uri: '/hdtool/recon/ngame/ngameSubmit',
+            type: 'post',
+            dataType: 'json',
+            param: param,
+            hideMsg: true,
+            callback: callback
+        };
+        this.send(net);
+    }
+
+    getOrderStatus(callback: Function, orderId: number, pollingCheck?: Function, pollingCount = 10): void {
+        const param: any = {
+            orderId: orderId
+        };
+        const net: INetData = {
+            name: 'getOrderStatus',
+            uri: '/hdtool/recon/getOrderStatus',
+            type: 'post',
+            dataType: 'json',
+            param: param,
+            hideMsg: true,
+            callback: callback,
+            pollingCheck: pollingCheck,
+            pollingCount: pollingCount
+        };
+        NetManager.ins.send(net);
+    }
+
     /**
      * 提交游戏数据
      *
@@ -681,14 +723,12 @@ export class NetManager extends ABNetManager {
     public ajaxElement(callback: Function): void {
         const net: INetData = {
             name: NetName.CUSTOM_ELEMENT,
-            uri: window['CFG'].getElement,
-            type: 'post',
+            uri: '/hdtool/recon/ajaxElement',
+            type: 'get',
             dataType: 'json',
             param: {
-                hdType: DataManager.ins.customCfgData.hdType,
-                hdToolId: DataManager.ins.customCfgData.hdToolId,
-                actId: DataManager.ins.customCfgData.actId,
-                preview: DataManager.ins.customCfgData.preview
+                duibaId: DataManager.ins.customCfgData.hdToolId,
+                activityId: DataManager.ins.customCfgData.actId,
             },
             callback: callback
         };
@@ -714,21 +754,21 @@ export class NetManager extends ABNetManager {
         this.send(net);
     }
 
-    /**
-     * 活动工具抽奖
-     * @param {number} collectRuleId 集卡规则ID，活动与集卡规则关联才能获得发卡资格
-     */
-    public doJoin(callback: Function, collectRuleId?: number): void {
+    public doJoin(callback: Function, credits?: number, collectRuleId?: number): void {
         const param: any = {
-            actId: DataManager.ins.customCfgData.actId,
-            oaId: DataManager.ins.customCfgData.oaId
+            activityId: DataManager.ins.customCfgData.actId,
+            activityType: 'hdtool',
+            consumerId: window['CFG'].consumerId
         };
+        if (credits) {
+            param.credits = credits;
+        }
         if (collectRuleId) {
             param.collectRuleId = collectRuleId;
         }
         const net: INetData = {
-            name: NetName.CUSTOM_THROUGH_INFO,
-            uri: window['CFG'].doJoin,
+            name: 'dojoin',
+            uri: '/hdtool/recon/doJoin',
             type: 'post',
             dataType: 'json',
             param: param,
@@ -737,6 +777,24 @@ export class NetManager extends ABNetManager {
         this.getToken(net);
     }
 
+    public getNgameStartStatus(callback: Function, orderId: number, pollingCheck: Function, pollingCount = 10): void {
+        const param: any = {
+            orderId: orderId
+        };
+        const net: INetData = {
+            name: 'getNgameStartStatus',
+            uri: '/hdtool/recon/ngame/getNgameStartStatus',
+            type: 'post',
+            dataType: 'json',
+            param: param,
+            hideMsg: true,
+            callback: callback,
+            pollingCheck: pollingCheck,
+            pollingCount: pollingCount
+        };
+        this.send(net);
+    }
+
     /**
      * 活动工具查询订单结果
      * @param orderId

egret/src/playScene/PlayScene.ts

 import submit from "../../libs/new_tw/ctrls/submit";
+import Loading from "../../libs/new_wx/components/Loading";
 import Panel from "../../libs/new_wx/components/Panel";
 import Scene from "../../libs/new_wx/components/Scene";
 import PanelCtrl from "../../libs/new_wx/ctrls/panelCtrl";
-import showAlertPanel from "../../libs/new_wx/ctrls/showAlertPanel";
 import { ModuleTypes } from "../../libs/new_wx/types/sceneTypes";
 import { DataManager } from "../../libs/tw/manager/DataManager";
+import { NetManager } from "../../libs/tw/manager/NetManager";
+import Effect from "../Effect";
+import { playBg, playSound, SoundType, toggleSound } from "../soundCtrl";
 import { Tween } from "../tween/Tween";
+import { getBlocks, resetCounter } from "./blockGen";
 import { createBallItem } from "./factory/createBall";
 import createCircle from "./factory/createCircle";
 import createRegTriangle from "./factory/createRegTriangle";
 import createSpecialRegTriangle from "./factory/createSpecialRegTriangle";
+import createSpeialCircle from "./factory/createSpeialCircle";
 import createSquare from "./factory/createSquare";
-import { BALL_D, LEFT_GROUND, RIGHT_GROUND, LADDER_START, LADDER_END, LADDER_H_NUMS, LADDER_NUMS, ACELE_DELAY } from "./gameconsts";
+import { ACELE_DELAY, BALL_D, LADDER_NUMS, LEFT_GROUND, RIGHT_GROUND } from "./gameconsts";
 import { Ball } from "./physics/Ball";
 import Body from "./physics/Body";
 import { Circle } from "./physics/Circle";
 import { degToRad, radToDeg } from "./physics/Const";
 import { RegTriangle } from "./physics/RegTriangle";
 import Pool from "./Pool";
-import { isSpecialBody, getLadderPosition, getLadderHPosition, getBounce, isSpecialCircle, getLadderGap } from "./utils";
-import { getBlocks, resetCounter, getCounter } from "./blockGen";
-import createSpeialCircle from "./factory/createSpeialCircle";
-import { NetManager } from "../../libs/tw/manager/NetManager";
-import Effect from "../Effect";
-import { toggleSound, playSound, SoundType, playBg } from "../soundCtrl";
-import Loading from "../../libs/new_wx/components/Loading";
+import { getBounce, getLadderGap, getLadderHPosition, getLadderPosition, isSpecialBody, isSpecialCircle } from "./utils";
 
 export default class PlayScene extends Scene {
     initEvents() {
@@ -460,8 +459,8 @@ export default class PlayScene extends Scene {
         let failed = false;
         blocks.forEach(block => {
             console.log('ladderNums', block.ladderNums)
-            // if (block.ladderNums >= 1) {
-            if (block.ladderNums >= 9) {
+            if (block.ladderNums >= 1) {
+                // if (block.ladderNums >= 9) {
                 failed = true;
             }
         });
@@ -475,10 +474,10 @@ export default class PlayScene extends Scene {
                 block.ladderNums++;
                 if (block.ladderNums >= 9) {
                     egret.Tween.get(block.view, { loop: true })
-                        .to({ alpha:0 }, 1000 / 6)
-                        .to({ alpha:1 }, 1000 / 6)
-                        // .to({ rotation: block.view.rotation + 15 }, 1000 / 6)
-                        // .to({ rotation: block.view.rotation }, 1000 / 6)
+                        .to({ alpha: 0 }, 1000 / 6)
+                        .to({ alpha: 1 }, 1000 / 6)
+                    // .to({ rotation: block.view.rotation + 15 }, 1000 / 6)
+                    // .to({ rotation: block.view.rotation }, 1000 / 6)
                     // Tween.to(block.view, 10, { useFrame: true, yoyo: true, rotation: block.view.rotation+ })
                 }
             });

egret/src/startScene/StartScene.ts

-import getIsIOS from "../../libs/new_tc/getIsIOS";
-import doStart from "../../libs/new_tw/ctrls/doStart";
-import getCountTxt from "../../libs/new_tw/datas/getCountTxt";
-import getStartBtnEnable from "../../libs/new_tw/datas/getStartBtnEnable";
+import hdGameDoDojoin from "../../libs/new_tw/ctrls/hdGameDoDojoin";
 import Loading from "../../libs/new_wx/components/Loading";
 import Scene from "../../libs/new_wx/components/Scene";
 import PanelCtrl from "../../libs/new_wx/ctrls/panelCtrl";
@@ -24,13 +21,10 @@ export default class StartScene extends Scene {
     exemptionTxt: eui.Label;
 
     async start(data?) {
-
-        this.startBtn.visible = false;
-        this.updateGetInfoView();
-        this.updateExemptionTxt();
+        this.updateCountTxt();
         super.start();
 
-        egret.Tween.get(this.startBtn,{loop:true}).to({scaleX:.9,scaleY:.9},150).to({scaleX:1,scaleY:1},500,egret.Ease.getBackOut(5)).wait(600);
+        egret.Tween.get(this.startBtn, { loop: true }).to({ scaleX: .9, scaleY: .9 }, 150).to({ scaleX: 1, scaleY: 1 }, 500, egret.Ease.getBackOut(5)).wait(600);
 
         NetManager.ins.getCredits(() => {
             this.data.credit = `我的${DataManager.ins.getCreditsData.unitName}:${DataManager.ins.getCreditsData.consumerCredits}`;
@@ -44,35 +38,20 @@ export default class StartScene extends Scene {
         }
     }
 
-    private updateGetInfoView() {
-        if (DataManager.ins.getInfoData) {
-            this.updateStartBtnStatus();
-            this.updateCountTxt();
+    updateCountTxt() {
+        let countTxt = '';
+
+        const { element } = DataManager.ins.ajaxElementData;
+        if (element.freeLimit > 0) {
+            if (element.status == 5)
+                countTxt = `今日剩余免费次数:${element.freeLimit}次`
+            if (element.status == 7)
+                countTxt = `剩余免费次数:${element.freeLimit}次`
         } else {
-            DataManager.ins.once('dataUpdate', this.updateGetInfoView, this);
-        }
-    }
-
-    async updateStartBtnStatus() {
-        if (this.startBtn) {
-            this.startBtn.visible = true;
-            this.startBtn.enabled = getStartBtnEnable();
-
+            countTxt = `${element.needCredits}${CFG.unitName}/次`
         }
-    }
-
-    updateCountTxt() {
-        this.data.count = `${getCountTxt()}`;
-    }
 
-    updateExemptionTxt() {
-        if (this.exemptionTxt) {
-            if (getIsIOS()) {
-                this.exemptionTxt.visible = true;
-            } else {
-                this.exemptionTxt.visible = false;
-            }
-        }
+        this.data.count = `${countTxt}`;
     }
 
     initEvents() {
@@ -93,6 +72,7 @@ export default class StartScene extends Scene {
     onTap_ruleBtn(e: egret.Event) {
         PanelCtrl.instance.show(ModuleTypes.RULE_PANEL);
     }
+
     onTap_htmlRuleBtn(e: egret.Event) {
         PanelCtrl.instance.show(ModuleTypes.HTML_RULE_PANEL);
     }
@@ -107,7 +87,7 @@ export default class StartScene extends Scene {
     async onTap_startBtn(e?: egret.Event) {
         this.startBtn.touchEnabled = false;
         Loading.instace.show();
-        doStart((success) => {
+        hdGameDoDojoin((success) => {
             Loading.instace.hide();
             this.startBtn.touchEnabled = true;
             if (success)

mock/json/doJoin.json

-{
-  "needCredits": 0,
-  "status": 1,
-  "orderId": "544328581298130001",
-  "success": false,
-  "message": "我靠又报错了"
-}
\ No newline at end of file

mock/json/getCredits.json

@@ -4,7 +4,7 @@
   "desc": "成功",
   "data": {
     "unitName": "金币",
-    "credits": "100"，
-	"consumerCredits":100
+    "credits": "100",
+    "consumerCredits": 100
   }
 }
\ No newline at end of file

mock/newGame/ajaxElement.json

@@ -55,7 +55,7 @@
             "logo": "//yun1.duiba.com.cn/developer/img/activityTool/slotMachine/alipay.png",
             "id": 15585
         }],
-        "rule": "adsfasdf</br>adsfasdf</br>adsfasdf</br>adsfasdf</br>adsfasdf</br>adsfasdf</br>adsfasdf</br>adsfasdf</br>adsfasdf</br>adsfasdf</br>adsfasdf</br>adsfasdf</br>adsfasdf</br>adsfasdf</br>adsfasdf</br>adsfasdf</br>adsfasdf</br>adsfasdf</br>",
+        "rule": "a1<br>aa<br>aa<br>aa<br>aa<br>aa<br>aa<br>aa<br>aa<br>aa<br>aa<br>aa<br>aa<br>aa<br>aa<br>a",
         "type": "hdtool",
         "element": {
             "isCreditsTypeOpen": false,