1

build.js

@@ -14,4 +14,14 @@ if (cmd === 'build' && process.argv[3] === 'prod') {
   if (process.argv[4] === 'exml')
     cmd = 'buildProdEXML';
 }
-build[cmd]('egret');
+
\ No newline at end of file
+else if (cmd === 'build' && process.argv[3] === 'prod2') {
+  // if (cmd === 'build' && remain[1] === 'prod') {
+  cmd = 'notinypng';
+  if (process.argv[4] === 'ts')
+    cmd = 'buildProdTS';
+  if (process.argv[4] === 'exml')
+    cmd = 'buildProdEXML';
+}
+build[cmd]('egret');
+console.log();
\ No newline at end of file

egret/libs/tw/manager/NetManager.ts

@@ -325,7 +325,7 @@ export class NetManager extends ABNetManager {
             callback: callback,
             pollingCount: pollingCount,
             pollingCheck: pollingCheck,
-            hideMsg:true,
+            // hideMsg:true,
         };
         this.send(net);
     }
@@ -729,13 +729,11 @@ export class NetManager extends ABNetManager {
         const net: INetData = {
             name: NetName.IQIYI_ELEMENT,
             uri: '/hdtool/recon/ajaxElement',
-            type: 'post',
+            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.oaId,
             },
             callback: callback
         };
@@ -780,7 +778,7 @@ export class NetManager extends ABNetManager {
             dataType: 'json',
             param: param,
             callback: callback,
-            hideMsg:true,
+            // hideMsg:false,
         };
         this.getToken(net);
     }

egret/resource/TextureMerger/creditsTip_panel.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"creditsTip_panel","version":5,"files":["../assets/creditsTip_panel/creditsTip_bg.png","../assets/creditsTip_panel/creditsTip_btn.png"]}
\ No newline at end of file

egret/resource/TextureMerger/hbNoPrize.tmproject

+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"hbNoPrize","version":5,"files":["../assets/hbNoPrize/hbNoPrize_share_tips.png","../assets/hbNoPrize/hbNoPrize_share_btn.png","../assets/hbNoPrize/hbNoPrize_ok_btn.png","../assets/hbNoPrize/hbNoPrize_bg.png"]}
\ No newline at end of file

egret/resource/TextureMerger/hbPrize.tmproject

+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"hbPrize","version":5,"files":["../assets/hbPrize/hbPrize_bg.png","../assets/hbPrize/hbPrize_item_bg.png","../assets/hbPrize/hbPrize_item_line.png","../assets/hbPrize/hbPrize_ok_btn.png","../assets/hbPrize/hbPrize_share_btn.png","../assets/hbPrize/hbPrize_share_tips.png"]}
\ No newline at end of file

egret/resource/TextureMerger/hbRainGame.tmproject

+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"hbRainGame","version":5,"files":["../assets/hbGame/hbGame_tips.png","../assets/hbGame/hbGame_hongbao.png","../assets/hbGame/hbGame_hongbao_effect.png","../assets/hbGame/hbGame_bg.png","../assets/hbGame/hbGame_3.png","../assets/hbGame/hbGame_2.png","../assets/hbGame/hbGame_1.png"]}
\ No newline at end of file

egret/resource/TextureMerger/index_scene.tmproject

+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"index_scene","version":5,"files":["../assets/index_scene/index_bg.png","../assets/index_scene/index_again_btn.png","../assets/index_scene/index_hongbao.png","../assets/index_scene/index_myprize_btn.png","../assets/index_scene/index_panel_bg.png","../assets/index_scene/index_rule_btn.png","../assets/index_scene/index_tips_cuting.png","../assets/index_scene/index_tips_raining.png","../assets/index_scene/index_hongbao_current.png","../assets/index_scene/index_start_btn.png","../assets/index_scene/index_disable_btn.png"]}
\ No newline at end of file

egret/resource/TextureMerger/noMore_panel.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"noMore_panel","version":5,"files":["../assets/noMore_panel/noMore_bg.png"]}
\ No newline at end of file

egret/resource/TextureMerger/noNetWork.tmproject

+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"noNetWork","version":5,"files":["../assets/noNetWork_panel/noNetWork_bg.png","../assets/noNetWork_panel/noNetWork_ok.png"]}
\ No newline at end of file

egret/resource/TextureMerger/noPrize_panel.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"noPrize_panel","version":5,"files":["../assets/noPrize_panel/noPrize_bg.png"]}
\ No newline at end of file

egret/resource/TextureMerger/noTimes_panel.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"noTimes_panel","version":5,"files":["../assets/noTimes_panel/noTimes_bg.png"]}
\ No newline at end of file

egret/resource/TextureMerger/preload.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"preload","version":5,"files":["../assets/common/closeBtn.png","../assets/start_scene/start_atc_btn.png","../assets/start_scene/start_myPrize_btn.png"]}
\ No newline at end of file

egret/resource/TextureMerger/prize_panel.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"prize_panel","version":5,"files":["../assets/prize_panel/prize_bg.png","../assets/prize_panel/prize_btn.png"]}
\ No newline at end of file

egret/resource/TextureMerger/start_scene.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"start_scene","version":5,"files":["../assets/start_scene/start_bg.png","../assets/start_scene/start_btn.png","../assets/start_scene/start_panel_bg.png","../assets/start_scene/start_panel.png","../assets/start_scene/start_atc_btn.png","../assets/start_scene/start_myPrize_btn.png"]}
\ No newline at end of file

egret/resource/default.res.json

@@ -31,6 +31,10 @@
 		{
 			"keys": "hbNoPrize_share_tips_png,hbNoPrize_share_btn_png,hbNoPrize_ok_btn_png,hbNoPrize_bg_png",
 			"name": "hbNoPrize"
+		},
+		{
+			"keys": "noNetWork_bg_png,noNetWork_ok_png",
+			"name": "noNetWork"
 		}
 	],
 	"resources": [
@@ -213,6 +217,16 @@
 			"url": "assets/index_scene/index_disable_btn.png",
 			"type": "image",
 			"name": "index_disable_btn_png"
+		},
+		{
+			"url": "assets/noNetWork_panel/noNetWork_bg.png",
+			"type": "image",
+			"name": "noNetWork_bg_png"
+		},
+		{
+			"url": "assets/noNetWork_panel/noNetWork_ok.png",
+			"type": "image",
+			"name": "noNetWork_ok_png"
 		}
 	]
 }
\ No newline at end of file

egret/resource/default.thm.json

 {
-    "skins": {},
-    "autoGenerateExmlsList": true,
-    "exmls": [
-        "resource/skins/LoadingSceneSkin.exml",
-        "resource/skins/LoadingSkin.exml",
-        "resource/skins/HbGameSkin.exml",
-        "resource/skins/HbPrizeSkin.exml",
-        "resource/skins/HbNoPrizeSkin.exml",
-        "resource/skins/IndexSceneSkin.exml",
-        "resource/skins/HbPrizeItemSkin.exml",
-        "resource/skins/ToastPanelSkin.exml",
-        "resource/skins/ui/IconButtonSkin.exml",
-        "resource/skins/ui/ProgressBarSkin.exml",
-        "resource/skins/ui/TimeProgressBarSkin.exml"
-    ],
-    "path": "resource/default.thm.json"
+	"skins": {},
+	"autoGenerateExmlsList": true,
+	"exmls": [
+		"resource/skins/HbGameSkin.exml",
+		"resource/skins/HbNoPrizeSkin.exml",
+		"resource/skins/HbPrizeItemSkin.exml",
+		"resource/skins/HbPrizeSkin.exml",
+		"resource/skins/HbPrize_backSkin.exml",
+		"resource/skins/IndexSceneSkin.exml",
+		"resource/skins/LoadingSceneSkin.exml",
+		"resource/skins/LoadingSkin.exml",
+		"resource/skins/NoNetWorkPanelSkin.exml",
+		"resource/skins/RulePanelSkin.exml",
+		"resource/skins/ToastPanelSkin.exml",
+		"resource/skins/ui/IconButtonSkin.exml",
+		"resource/skins/ui/ProgressBarSkin.exml",
+		"resource/skins/ui/TimeProgressBarSkin.exml"
+	],
+	"path": "resource/default.thm.json"
 }
\ No newline at end of file

egret/resource/skins/NoNetWorkPanelSkin.exml

+<?xml version="1.0" encoding="utf-8"?>
+<e:Skin class="CreditsTip" width="750" height="1335" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
+	<e:Image y="205" source="noNetWork_bg_png" horizontalCenter="0"/>
+	<e:Button id="ok_btn" label="" y="703" scaleX="1" scaleY="1" anchorOffsetY="0" anchorOffsetX="0" horizontalCenter="0">
+		<e:skinName>
+			<e:Skin states="up,down,disabled">
+			<e:Image width="100%" height="100%" source="noNetWork_ok_png" source.down="noNetWork_ok_png" source.disabled="noNetWork_ok_png"/>
+			<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
+			</e:Skin>
+		</e:skinName>
+	</e:Button>
+	<e:Button id="closeBtn" label="" x="603" y="274">
+		<e:skinName>
+			<e:Skin states="up,down,disabled">
+			<e:Image width="100%" height="100%" source="closeBtn_png" source.down="closeBtn_png" source.disabled="closeBtn_png"/>
+			<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
+			</e:Skin>
+		</e:skinName>
+	</e:Button>.33" anchorOffsetX="9.33" anchorOffsetY="25.33"/>
+</e:Skin>
\ No newline at end of file

egret/scripts/MyExmlPlugin.ts

@@ -14,7 +14,8 @@ export class MyExmlPlugin extends ExmlPlugin2 implements plugins.Command {
             'msgBg1.png',
             'msgBg2.png',
             'msgBg3.png',
-            'main_star_an.png'
+            'main_star_an.png',
+            'cutTimeFont.png',
         ];
         if (excludes.indexOf(file.basename) != -1) {
             return file;

egret/src/Main.ts

@@ -21,9 +21,7 @@ import IndexScene from "./indexScene/IndexScene";
 import HbPrize from "./HongbaoRain/HbPrize";
 import HbNoPrize from "./HongbaoRain/HbNoPrize";
 import HbGame from "./HongbaoRain/HbGame";
-import { NetManager } from "../libs/tw/manager/NetManager";
-import { ABNetManager } from "../libs/tc/manager/ABNetManager";
-import { showToast } from "./comm/UtilsConst";
+import NoNetWorkPanel from "./Panels/NoNetWorkPanel";
 
 //////
 
@@ -67,6 +65,7 @@ class Main extends eui.UILayer {
             [ModuleTypes.RULE_PANEL, RulePanel],
             [ModuleTypes.HBPRIZE_PANEL, HbPrize],
             [ModuleTypes.HBNOPRIZE_PANEL, HbNoPrize],
+            [ModuleTypes.NO_NETWORK_PANEL, NoNetWorkPanel],
         ]);
 
         TopLayerCtrl.instance.registerPanelClass(ModuleTypes.TOAST_PANEL, ToastPanel);

egret/src/Panels/NoNetWorkPanel.ts

+import Panel from "../views/Panel";
+import { ModuleTypes } from "../types/sceneTypes";
+import SceneCtrl from "../ctrls/sceneCtrl";
+
+export default class NoNetWorkPanel extends Panel {
+    public closeBtn: eui.Button;
+    public ok_btn: eui.Button;
+
+    constructor(data?) {
+        super();
+    }
+
+    start() {
+        super.start();
+        this.onLoad();
+    }
+
+    protected getTapEvts(): any[] {
+        return super.getTapEvts().concat([
+            [this.ok_btn, this.onTouchClose, this],
+            [this.closeBtn, this.onTouchClose, this],
+        ])
+    }
+
+    // onTouchClose(): any {
+    //     // SceneCtrl.instance.change(ModuleTypes.INDEX_SCENE);
+    //     return super.onTouchClose();
+    // }
+
+    protected onLoad(): void {
+        this.initUI();
+    }
+
+    private initUI(): void {
+
+    }
+
+    public get skinKey() {
+        return 'NoNetWorkPanel';
+    }
+
+    get groupName() {
+        return 'noNetWork';
+    }
+}
\ No newline at end of file

egret/src/Panels/RulePanel/RulePanel.ts

@@ -8,7 +8,7 @@ export default class RulePanel extends Panel {
 	public ruleLabel: eui.Label;
 
 	public get skinKey() { return 'RulePanel' }
-	public get groupName() { return 'prize_panel' }
+	// public get groupName() { return 'prize_panel' }
 	constructor(data?) {
 		super(data);
 

egret/src/comm/NetConst.ts

@@ -15,17 +15,18 @@ export const JoinGame = function() {
                 reject(res);
                 return;
             }
+            resolve(res);
             const data = res.data;
-            NetManager.ins.getStartStatus((success, res) => {
-                // Loading.instace.hide();
-                if(!success) {
-                    reject(res);
-                    return;
-                }
-                resolve(res);
-            }, data, (res) => {
-                return res.code != "0000000000";
-            }, 10);
+            // NetManager.ins.getStartStatus((success, res) => {
+            //     // Loading.instace.hide();
+            //     if(!success) {
+            //         reject(res);
+            //         return;
+            //     }
+            //     resolve(res);
+            // }, data, (res) => {
+            //     return res.code != "0000000000";
+            // }, 10);
         });
     });
 };

egret/src/comm/onNotSuccess.ts

 import { Data } from "../../libs/tw/data/Data";
 import { NetName } from "../../libs/tw/enum/NetName";
 import { showToast } from "./UtilsConst";
+import PanelCtrl from "../ctrls/panelCtrl";
+import { ModuleTypes } from "../types/sceneTypes";
 
 export const onNotSuccess = function(data?: Data, netname?: NetName) {
     if(!data) {
-        showToast('网络异常\n请隔一段时间再尝试');
+        PanelCtrl.instance.show(ModuleTypes.NO_NETWORK_PANEL);
+        // showToast('网络异常\n请隔一段时间再尝试');
         return;
     }
     if(data.code == 'E999999999') {//系统级别错误  系统异常，\n请刷新后重试。
-        showToast('网络异常\n请隔一段时间再尝试');
+        PanelCtrl.instance.show(ModuleTypes.NO_NETWORK_PANEL);
+        // showToast('网络异常\n请隔一段时间再尝试');
     } else if(data.code == 'E100201001') {
         showToast('请登录后重试。');
     } else if(data.code == 'E100201007') {
@@ -16,7 +20,8 @@ export const onNotSuccess = function(data?: Data, netname?: NetName) {
     } else if(data.code == 'E100202007' || data.code == 'E100202008' || data.code == 'E100202009' || data.code == 'E100202010') {
         showToast('对不起 您的今日游戏次数已达上限 明天再来吧~');
     } else {//其他异常
-        showToast('网络异常\n请隔一段时间再尝试');
+        PanelCtrl.instance.show(ModuleTypes.NO_NETWORK_PANEL);
+        // showToast('网络异常\n请隔一段时间再尝试');
     }
 
 };
\ No newline at end of file

egret/src/indexScene/IndexScene.ts

 import Scene from "../views/Scene";
 import { ModuleTypes } from "../types/sceneTypes";
 import PanelCtrl from "../ctrls/panelCtrl";
-import { JoinGame } from "../comm/NetConst";
 import { gotoRecord, showToast } from "../comm/UtilsConst";
 import SceneCtrl from "../ctrls/sceneCtrl";
 import { NetManager } from "../../libs/tw/manager/NetManager";
 import CutTimer from "../comm/CutTimer";
 import Utils from "../comm/Utils";
-import tr = egret.sys.tr;
 import { getlogItem } from "../getlogItem";
-import { Data } from "../../libs/tw/data/Data";
 import { DataManager } from "../../libs/tw/manager/DataManager";
 import { NetName } from "../../libs/tw/enum/NetName";
 import { HtmlTextParser } from "../../libs/tc/util/HtmlTextParser";
@@ -34,7 +31,7 @@ export default class IndexScene extends Scene {
     }
 
     public get groupName() {
-        return 'index'
+        return 'index_scene'
     }
 
     constructor(data?) {
@@ -53,7 +50,8 @@ export default class IndexScene extends Scene {
     private onTouchTap(e: egret.TouchEvent) {
         switch(e.target) {
             case this.btn:  // 开始按钮，再次开始按钮
-                const extra = DataManager.ins.getData(NetName.IQIYI_ELEMENT).data;
+                const data = DataManager.ins.getData(NetName.IQIYI_ELEMENT).data;
+                const extra = data.extra;
                 extra.shared ? NetManager.ins.clickLog(getlogItem(34)) : NetManager.ins.clickLog(getlogItem(21));
                 this.btn.touchEnabled = false;
                 SceneCtrl.instance.change(ModuleTypes.HBGAME_SCENE);
@@ -94,7 +92,7 @@ export default class IndexScene extends Scene {
 
     private initUI(): void {
         this.scroller.height = this.width / window.innerWidth * window.innerHeight;
-        let _str = `今日还剩</spen><u><font color="#72f8fd">${window['hbTips']}</font></u>次免费抽奖机会`;
+        let _str = `抢</spen><u><font color="#72f8fd">${window['hbTips']}</font></u>元现金红包`;
         this.hbLabel.textFlow = new HtmlTextParser().parse(_str);
         this.setMidGroup();
         this.ajaxElement();
@@ -120,7 +118,20 @@ export default class IndexScene extends Scene {
 
     private ajaxElement() {
         NetManager.ins.iqiyiAjaxElement((success, res) => {
-            if(!success) {
+            // 设置红包
+            for(let i = 1; i < 4; i++) {
+                this[`hongbao${i}`].source = 'index_hongbao_png';
+                this[`label${i}`].alpha = 0.8;
+            }
+
+            if(!success || !res || !res.data || !res.data.extra){
+                this.btn.visible = true;
+                this.btn.source = 'index_disable_btn_png';
+                this.btn.touchEnabled = false;
+                this.btn.removeEventListener(egret.TouchEvent.TOUCH_TAP, this.onTouchTap, this);
+                this.btn.y = 9;
+                this.cutLabel.visible = false;
+                this.tipsLabel.visible = false;
                 return;
             }
             // console.log(res);
@@ -153,8 +164,20 @@ export default class IndexScene extends Scene {
                     this.tipsLabel.visible = false;
                 } else {
                     this.tipsLabel.y = 5;
-                    this.tipsLabel.text = `距离下一场开始还剩`;
-                    this.btn.visible = false;
+                    switch(true) {
+                        case(currentTimeSlot == 1 || currentTimeSlot == 2):
+                            this.tipsLabel.text = `距离第一场开始还剩`;
+                            break;
+                        case(currentTimeSlot == 4):
+                            this.tipsLabel.text = `距离第二场开始还剩`;
+                            break;
+                        case(currentTimeSlot == 6):
+                            this.tipsLabel.text = `距离第三场开始还剩`;
+                            break;
+                        default:
+                            this.tipsLabel.text = `距离第一场开始还剩`;
+                            break;
+                    }
                     this.cutLabel.visible = true;
                     this.tips_img.source = 'index_tips_cuting_png';
                     _label = this.cutLabel;
@@ -173,11 +196,6 @@ export default class IndexScene extends Scene {
                 this.cutTimer.start(nextTimestamp - timestamp + 3000);
             }
 
-            // 设置红包
-            for(let i = 1; i < 4; i++) {
-                this[`hongbao${i}`].source = 'index_hongbao_png';
-                this[`label${i}`].alpha = 0.8;
-            }
             let _hbData = {3: '1', 5: '2', 7: '3'};
             if(Utils.isInArray(currentTimeSlot, canGameArr) && extra.joinCount > 0) {
                 this[`hongbao${_hbData[currentTimeSlot]}`].source = 'index_hongbao_current_png';

egret/src/types/sceneTypes.ts

@@ -16,5 +16,6 @@ export enum ModuleTypes {
     HBPRIZE_PANEL,
     HBNOPRIZE_PANEL,
     RULE_PANEL,
+    NO_NETWORK_PANEL,
 
 }
\ No newline at end of file

package.json

@@ -6,6 +6,7 @@
   "scripts": {
     "dev": "node build.js dev",
     "build": "node build.js build prod",
+    "build2": "node build.js build prod2",
     "buildTS": "node build.js build prod ts",
     "buildExml": "node build.js build prod exml",
     "backup": "node build.js backup",