1

egret/libs/tc/manager/ABNetManager.ts

@@ -32,7 +32,7 @@ export abstract class ABNetManager {
             realUrl += net.addUrl;
         }
 
-        $.ajax({
+        window['$'].ajax({
             type: net.type,
             // url: realUrl + gTime,
             url: realUrl,

egret/libs/tc/util/GTime.ts

+import { TimeFormat } from "../enum/TimeFormat";
+export class GTime {
+    /**
+     * 获取当前时间戳
+     * @returns {number}
+     */
+    public static getTimestamp(): number {
+        return new Date().getTime();
+    }
+
+    /**
+     * 传入秒数返回带格式的时间
+     * @param time 单位秒
+     * @param type 枚举类型CountDownType
+     * @param dibit 是否双位
+     */
+    public static formatTime(time: number, type: string = TimeFormat.HMS, dibit = false, suffixs = ['d', 'h', 'm', 's']): string {
+        let countdown = this.getCountDown(time, type, dibit);
+        countdown = countdown.map((val, index) => `${val < 10 ? '0' + val : val}${suffixs[index]}`);
+        return countdown.join('');
+    }
+
+    /**
+     * 倒计时
+     * @param time 单位秒
+     * @param type 枚举类型CountDownType
+     * @param dibit 是否双位
+     */
+    public static getCountDown(time: number, type: string = TimeFormat.HMS, dibit = false): any[] {
+        let result: any[] = [];
+        if (type.indexOf('s') !== -1) {
+            result.push(time % 60);
+        }
+
+        if (type.indexOf('m') !== -1) {
+            result.unshift(Math.floor((time % 3600) / 60));
+        }
+
+        if (type.indexOf('h') >= 0) {
+            if (type == TimeFormat.HMS) {
+                result.unshift(Math.floor(time / 3600));
+            }
+            else {
+                result.unshift(Math.floor((time % 86400) / 3600));
+            }
+        }
+
+        if (type.indexOf('d') >= 0) {
+            result.unshift(Math.floor(time / 86400));
+        }
+
+        if (dibit)
+            result = result.map((ele) => {
+                return ele < 10 ? `0${ele}` : ele;
+            })
+        return result;
+    }
+}
\ No newline at end of file

egret/libs/tw/data/Data.ts

-import { IData } from 'duiba-tc';
+import { IData } from "../../tc/interface/IData";
+
+// import { IData } from "../../tc/interface/IData";
 /**
  *Created by cuiliqiang on 2018/3/12
  * 数据基类

egret/libs/tw/data/common/lottery/LotteryData.ts

@@ -3,8 +3,9 @@
  * 奖品信息
  */
 import { LotteryType } from "../../../enum/LotteryType";
-import { IData } from "duiba-tc";
+// import { IData } from "../../../../tc/interface/IData";
 import { IExposureData } from "../IExposureData";
+import { IData } from "../../../../tc/interface/IData";
 
 export class LotteryData implements IData {
     /**

egret/libs/tw/data/custom/ajaxThroughInfo/IThroughInfoData.ts

-import { IData } from "duiba-tc";
 
 /**
  *Created by cuiliqiang on 2018/3/12

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

-import { GPool } from "duiba-tc";
+import { GPool } from '../../../../tc/util/GPool';
 import { LotteryData } from "../../common/lottery/LotteryData";
 import { Data } from "../../Data";
 import { IExposureData } from "../../common/IExposureData";

egret/libs/tw/data/game/cfg/IAppData.ts

-import { IData } from "duiba-tc";
 /**
  *Created by cuiliqiang on 2018/3/1
  */

egret/libs/tw/data/game/cfg/IExtraCfgData.ts

-import { IData } from "duiba-tc";
 
 export interface IExtraCfgData {
     /**

egret/libs/tw/data/game/cfg/IGameCfgData.ts

-import { GetInfoData } from '../getInfo/GetInfoData';
 import { IAppData } from './IAppData';
-import { IGameData } from './IGameData';
-import { IExtraCfgData } from './IExtraCfgData';
 import { IDefenseStrategyData } from './IDefenseStrategyData';
+import { IExtraCfgData } from './IExtraCfgData';
+import { IGameData } from './IGameData';
 export interface IGameCfgData {
     /**
      * App数据

egret/libs/tw/data/game/cfg/IGameData.ts

-import { IData } from "duiba-tc";
 import { IRecommendData } from "./IRecommendData";
 export interface IGameData {
     /**

egret/libs/tw/data/game/cfg/IRecommendData.ts

-import { IData } from "duiba-tc";
 
 /**
  *Created by cuiliqiang on 2018/3/1

egret/libs/tw/data/game/doStart/ExtraData.ts

-import { IData } from "duiba-tc";
 
 /**
  *Created by cuiliqiang on 2018/3/12

egret/libs/tw/data/game/getInfo/IStatusData.ts

-import { IData } from "duiba-tc";
 
 /**
  *Created by cuiliqiang on 2018/3/1

egret/libs/tw/data/game/submit/GameGetSubmitResultData.ts

 import { IExposureData } from './../../common/IExposureData';
-import { GPool } from "duiba-tc";
+// import { GPool } from '../../../../tc/util/GPool';
 import { GetInfoData } from './../getInfo/GetInfoData';
 import { LotteryData } from './../../common/lottery/LotteryData';
 import { Data } from './../../Data';
+import { GPool } from '../../../../tc/util/GPool';
 /**
  * 获取游戏抽奖结果
  */

egret/libs/tw/data/pet/SignInfoVo.ts

 import { IData } from "../../../tc/interface/IData";
 
-// import { IData } from "duiba-tc";
+// import { IData } from "../../../../tc/interface/IData";
+// 
+// import { IData } from "../../../../tc/interface/IData";
 
 /**
  * 签到信息查询

egret/libs/tw/data/pets/IUsingPetToysData.ts

-import { IData } from "duiba-tc";
 /**
  *Created by ck on 2018/5/16
  */

egret/libs/tw/data/pets/IVisitPetData.ts

-import { IData } from "duiba-tc";
+
+// import { IData } from "../../../../tc/interface/IData";
 /**
  *Created by ck on 2018/8/24
  */
 export interface IVisitPetData {
+    
     /**
      * 宠物唯一标识
      */

egret/libs/tw/data/pets/IWanderPetData.ts

-// import { IData } from "duiba-tc";
+// import { IData } from "../../../../tc/interface/IData";
 /**
  *Created by ck on 2018/5/16
  */

egret/libs/tw/data/pets/PetsIndexData.ts

 /**
  *Created by ck on 2018/5/2
  */
-// import { IData } from "duiba-tc";
+// import { IData } from "../../../../tc/interface/IData";
 import { Data } from "../Data";
 import { GetHomeInfoData } from "./GetHomeInfoData";
 

egret/libs/tw/data/plug/doJoinPlugDraw/GetPlugOrderStatusData.ts

 import { IExposureData } from './../../common/IExposureData';
-// import { GPool } from "duiba-tc";
+// import { GPool } from '../../../../tc/util/GPool';
 import { LotteryData } from "../../common/lottery/LotteryData";
 import { Data } from "../../Data";
 import { GPool } from '../../../../tc/util/GPool';

egret/libs/tw/manager/NetManager.ts

@@ -1346,7 +1346,7 @@ export class NetManager extends ABNetManager {
             realUrl += net.addUrl;
         }
 
-        $.ajax({
+        window['$'].ajax({
             type: net.type,
             // url: realUrl + gTime,
             url: realUrl,

egret/libs/tw/model/common/ActivityModel.ts

-import { DoJoinPlugDrawData } from './../../data/plug/doJoinPlugDraw/DoJoinPlugDrawData';
-import { DataManager } from './../../manager/DataManager';
-import { Model } from './../Model';
+// import { IExposureData } from '../../data/common/IExposureData';
+import { IExposureData } from '../../data/common/IExposureData';
 import { LotteryData } from '../../data/common/lottery/LotteryData';
 import { LotteryType } from '../../enum/LotteryType';
 import { NetManager } from '../../manager/NetManager';
-import { IExposureData } from '../..';
+import { DataManager } from './../../manager/DataManager';
+import { Model } from './../Model';
 
 /**
  * 兑吧活动领域模型

egret/libs/tw/model/common/GameModel.ts

 import { DataManager } from './../../manager/DataManager';
 import { NetManager } from "../../manager/NetManager";
 import { ActivityModel } from "../common/ActivityModel";
-import { IDynamicData } from '../..';
+import { IDynamicData } from '../../data/game/datapash/IDynamicData';
 
 export class GameModel extends ActivityModel {
     /**

egret/libs/tw/model/common/SignModel.ts

-import { SignInfoData } from './../../data/pet/SignInfoData';
+//  import { NetManager } from "../../manager/NetManager"; import { DataManager } from "../../manager/DataManager";
+import { PetIndexData } from "../../data/pet/PetIndexData";
 import { PetHomeInfoData } from './../../data/pet/PetHomeInfoData';
+import { SignInfoData } from './../../data/pet/SignInfoData';
 import { ActivityModel } from "./ActivityModel";
-import { NetManager, DataManager } from "../..";
-import { PetIndexData } from "../../data/pet/PetIndexData";
+import { NetManager } from "../../manager/NetManager";
+import { DataManager } from "../../manager/DataManager";
 
 export class SignModel extends ActivityModel {
     /**

egret/libs/tw/model/custom/CustomPlayModel.ts

-import { CustomModel } from './../common/CustomModel';
 import { DataManager } from '../../manager/DataManager';
 import { TwLang } from '../../util/TwLang';
-import { GFun } from "duiba-tc";
-import { ICustomOptionData, IPlugOptionData } from '../..';
+import { CustomModel } from './../common/CustomModel';
+import { GFun } from '../../../tc/util/GFun';
+import { ICustomOptionData } from '../../data/custom/ajaxElement/ICustomOptionData';
 /**
  * 自定义活动工具玩法模型
  */

egret/libs/tw/model/custom/CustomPlayThroughModel.ts

 import { CustomPlayModel } from './CustomPlayModel';
-import { NetManager } from '../../manager/NetManager';
-import { ThroughSubmitData } from '../../data/custom/throughSubmit/ThroughSubmitData';
-import { DataManager } from '../../manager/DataManager';
 export class CustomPlayThroughModel extends CustomPlayModel {
 
 }
\ No newline at end of file

egret/libs/tw/model/custom/CustomWinModel.ts

 import { CustomModel } from './../common/CustomModel';
 import { LotteryData } from './../../data/common/lottery/LotteryData';
 import { DataManager } from './../../manager/DataManager';
-import { IExposureData } from '../..';
+import { IExposureData } from '../../data/common/IExposureData';
+// import { IExposureData } from '../../data/common/IExposureData';
 
 export class CustomWinModel extends CustomModel {
     /**

egret/libs/tw/model/game/GameEndModel.ts

 import { DataManager } from './../../manager/DataManager';
-import { GFun } from "duiba-tc";
+// import { GFun } from '../../../tc/util/GFun';
 import { TwLang } from '../../util/TwLang';
 import { GameModel } from '../common/GameModel';
+import { GFun } from '../../../tc/util/GFun';
 
 export class GameEndModel extends GameModel {
     /**

egret/libs/tw/model/game/GameLoseModel.ts

 import { GameModel } from '../common/GameModel';
 import { DataManager } from './../../manager/DataManager';
 import { TwLang } from '../../util/TwLang';
-import { GFun } from "duiba-tc";
+import { GFun } from '../../../tc/util/GFun';
 export class GameLoseModel extends GameModel {
     /**
      * 剩余次数文案
@@ -10,10 +10,10 @@ export class GameLoseModel extends GameModel {
         return DataManager.ins.getInfoData.status.text;
     }
 
-     /**
-     * 排名文案
-     * @param str
-     */
+    /**
+    * 排名文案
+    * @param str
+    */
     public getRankTxt(str: string = TwLang.lang_018): string {
         return GFun.replace(str, [DataManager.ins.getInfoData.rank]);
     }

egret/libs/tw/model/game/GameOptionModel.ts

 import { GameModel } from '../common/GameModel';
 import { DataManager } from '../../manager/DataManager';
 import { TwLang } from '../../util/TwLang';
-import { GFun } from "duiba-tc";
-import { IGameOptionData } from '../..';
+import { GFun } from '../../../tc/util/GFun';
+import { IGameOptionData } from '../../data/game/getOptions/IGameOptionData';
+// import { IGameOptionData } from '../../data/game/getOptions/IGameOptionData';
 export class GameOptionModel extends GameModel {
     /**
      * 活动结束时间

egret/libs/tw/model/game/GamePlayModel.ts

 import { NetManager } from './../../manager/NetManager';
 import { DataManager } from './../../manager/DataManager';
 import { GameModel } from '../common/GameModel';
-import { GMath, GCache } from "duiba-tc";
-import { IDynamicData } from '../..';
+// import { GMath, GCache } from "duiba-tc";
+import { IDynamicData } from '../../data/game/datapash/IDynamicData';
+import { GMath } from '../../../tc/util/GMath';
+import { GCache } from '../../../tc/util/GCache';
+// import { IDynamicData } from '../../data/game/datapash/IDynamicData';
 export class GamePlayModel extends GameModel {
     /**
      * 阶段提交次数

egret/libs/tw/model/game/GameRealTimeRankModel.ts

 import { GameModel } from '../common/GameModel';
 import { DataManager } from './../../manager/DataManager';
 import { TwLang } from '../../util/TwLang';
-import { GFun } from "duiba-tc";
-import { IUserData } from '../..';
+import { GFun } from '../../../tc/util/GFun';
+import { IUserData } from '../../data/game/common/IUserData';
+// import { IUserData } from '../../data/game/common/IUserData';
 export class GameRealTimeRankModel extends GameModel {
     /**
      * 我得排行文案

egret/libs/tw/model/game/GameWinModel.ts

@@ -4,8 +4,8 @@ import { LotteryData } from '../../data/common/lottery/LotteryData';
 import { TwLang } from '../../util/TwLang';
 import { GFun } from '../../../tc/util/GFun';
 import { IExposureData } from '../../data/common/IExposureData';
-// import { GFun } from "duiba-tc";
-// import { IExposureData } from '../..';
+// import { GFun } from '../../../tc/util/GFun';
+// import { IExposureData } from '../../data/common/IExposureData';
 
 export class GameWinModel extends GameModel {
     /**

egret/libs/tw/model/plug/PlugWinModel.ts

@@ -3,7 +3,7 @@ import { DataManager } from './../../manager/DataManager';
 import { NetManager } from '../../manager/NetManager';
 import { LotteryData } from '../../data/common/lottery/LotteryData';
 import { IExposureData } from '../../data/common/IExposureData';
-// import { IExposureData } from '../..';
+// import { IExposureData } from '../../data/common/IExposureData';
 export class PlugWinModel extends ActivityModel {
     /**
      * 奖品数据

egret/src/ctrls/net/getRule.ts

-import { DataManager, NetManager } from "duiba-tw";
+// ∏import { DataManager, NetManager } from "duiba-tw";
+import { DataManager } from "../../../libs/tw/manager/DataManager";
+import { NetManager } from "../../../libs/tw/manager/NetManager";
 import Loading from "../../loading/Loading";
 
 export default

egret/src/ctrls/net/realtimerank.ts

-import { NetManager } from "duiba-tw";
+// import { NetManager } from "../../../libs/tw/manager/NetManager";
 import Loading from "../../loading/Loading";
+import { NetManager } from "../../../libs/tw/manager/NetManager";
 
 /**
 * 实时排行榜

egret/src/playScene/PlayScene.ts

 
-import { INetData } from 'duiba-tc';
-import { NetManager, DataManager, NetName } from 'duiba-tw';
-import Scene from "../views/Scene";
+// import { INetData } from '../../libs/tc/interface/INetData';
+//  import { DataManager } from '../../libs/tw/manager/DataManager'; import { NetManager } from '../../libs/tw/manager/NetManager';
+import { INetData } from '../../libs/tc/interface/INetData';
 import PanelCtrl from '../ctrls/panelCtrl';
 import { ModuleTypes } from '../types/sceneTypes';
+import Scene from "../views/Scene";
+import { DataManager } from '../../libs/tw/manager/DataManager';
+import { NetManager } from '../../libs/tw/manager/NetManager';
 
 const { TouchEvent } = egret;
 export default class PlayScene extends Scene {

egret/src/rulePanel/RulePanel.ts

-import { NetManager } from 'duiba-tw';
-import { DataManager } from 'duiba-tw';
+
 import Panel from "../views/Panel";
+import { NetManager } from '../../libs/tw/manager/NetManager';
+import { DataManager } from "../../libs/tw/manager/DataManager";
 export default class RulePanel extends Panel {
     constructor(){
         super()