1

egret/src/Main.ts

@@ -16,10 +16,8 @@ import ToastPanel from './toastPanel/ToastPanel';
 
 //////
 
-import CreditsTipPanel from './Panels/CreditsTipPanel/CreditsTipPanel';
-import NoMorePanel from "./Panels/NoMorePanel/NoMorePanel";
-import NoPrizePanel from "./Panels/NoPrizePanel/NoPrizePanel";
-import PrizePanel from "./Panels/PrizePanel/PrizePanel";
+import TurnTableNoPrizePanel from "./Panels/TurnTableNoPrizePanel/TurnTableNoPrizePanel";
+import TurnTablePrizePanel from "./Panels/TurnTablePrizePanel/TurnTablePrizePanel";
 import RulePanel from "./Panels/RulePanel/RulePanel";
 import IndexScene from "./indexScene/IndexScene";
 import TurnTablePanel from "./Panels/TurnTablePanel/TurnTablePanel";
@@ -29,11 +27,10 @@ import TurnTablePanel from "./Panels/TurnTablePanel/TurnTablePanel";
 class Main extends eui.UILayer {
     protected createChildren(): void {
         super.createChildren();
-        // alert(1)
 
         egret.lifecycle.addLifecycleListener((context) => {
             // custom lifecycle plugin
-        })
+        });
 
         let assetAdapter = new AssetAdapter();
         egret.registerImplementation("eui.IAssetAdapter", assetAdapter);
@@ -62,10 +59,8 @@ class Main extends eui.UILayer {
 
         PanelCtrl.instance.registerPanelClass(ModuleTypes.TURNTABLE_PANEL, TurnTablePanel);
 
-        PanelCtrl.instance.registerPanelClass(ModuleTypes.CREDITS_TIP_PANEL, CreditsTipPanel);
-        PanelCtrl.instance.registerPanelClass(ModuleTypes.NO_MORE_PANEL, NoMorePanel);
-        PanelCtrl.instance.registerPanelClass(ModuleTypes.NO_PRIZE_PANEL, NoPrizePanel);
-        PanelCtrl.instance.registerPanelClass(ModuleTypes.PRIZE_PANEL, PrizePanel);
+        PanelCtrl.instance.registerPanelClass(ModuleTypes.TURNTABLE_NO_PRIZE_PANEL, TurnTableNoPrizePanel);
+        PanelCtrl.instance.registerPanelClass(ModuleTypes.TURNTABLE_PRIZE_PANEL, TurnTablePrizePanel);
         PanelCtrl.instance.registerPanelClass(ModuleTypes.RULE_PANEL, RulePanel);
         
 

egret/src/Panels/PrizePanel/PrizePanel.ts

-import Panel from "../../views/Panel";
-import { DataManager } from "../../../libs/tw/manager/DataManager";
-import { NetName } from "../../../libs/tw/enum/NetName";
-import { NetManager } from "../../../libs/tw/manager/NetManager";
-
-export default class PrizePanel extends Panel {
-	public closeBtn: eui.Button;
-	public prizeImg: eui.Image;
-	public prizeName: eui.Label;
-	public ok_btn: eui.Button;
-
-	public get skinKey() { return 'PrizePanel' }
-	public get groupName() { return 'prize_panel' }
-
-	private url: string;
-
-	constructor(data?) {
-		super(data);
-
-	}
-	initEvents() {
-		this.ok_btn.addEventListener(egret.TouchEvent.TOUCH_TAP, this.touch_tap_ok_btn, this);
-		this.closeBtn.addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTouchTap, this);
-	}
-
-	onTouchTap(){
-		super.onTouchTap();
-	}
-
-	touch_tap_ok_btn() {
-		if (this.data == 'coupon') {	// 如果是优惠卷则查询链接并跳转
-			let userRecordId = DataManager.ins.getData(NetName.GET_PRIZE).data.userRecordId;
-			NetManager.ins.getCouponInfo((success) => {
-				if (!success) {
-					return;
-				}
-				let link = DataManager.ins.getData(NetName.GET_COUPON_INFO).data.link;
-				window.location.href = link;
-			}, userRecordId, () => {
-				let data = DataManager.ins.getData(NetName.GET_COUPON_INFO);
-				return !(data.success && data.code == '0000000000')
-			}, 10);
-
-		} else {	// 不是优惠卷直接跳转链接
-			window.location.href = this.url;
-		}
-
-	}
-
-	removeEvents() {
-		this.ok_btn.removeEventListener(egret.TouchEvent.TOUCH_TAP, this.touch_tap_ok_btn, this);
-		this.closeBtn.removeEventListener(egret.TouchEvent.TOUCH_TAP, this.onTouchTap, this);
-	}
-
-
-
-	protected onSkinComplete(): void {
-		super.onSkinComplete();
-
-		this.preLoadRes();
-		this.onLoad();
-
-	}
-
-	protected onLoad(): void {
-		this.initUI();
-		this.url = this.data;
-	}
-
-	private initUI(): void {
-		let data = DataManager.ins.getData(NetName.QUERY_PRIZE_INFO).data;
-		this.prizeImg.source = data[0].icon;
-		this.prizeName.text = data[0].name;
-	}
-
-	protected async preLoadRes() {
-
-		return new Promise(function (resolve, reject) {
-			resolve();
-		});
-	}
-}
\ No newline at end of file

egret/src/Panels/NoPrizePanel/NoPrizePanel.ts → egret/src/Panels/TurnTableIDouPanel/TurnTableIDouPanel.ts

 import Panel from "../../views/Panel";
 
-export default class NoPrizePanel extends Panel {
-	public ok_btn: eui.Button;
+export default class TurnTableIDouPanel extends Panel {
 	public closeBtn: eui.Button;
+	public prizeImg: eui.Image;
+	public prizeName: eui.Label;
+	public ok_btn: eui.Button;
 
-	public get skinKey() { return 'NoPrizePanel' }
-	public get groupName() { return 'noPrize_panel' }
 	constructor(data?) {
 		super(data);
 
 	}
 	initEvents() {
-		this.ok_btn.addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTouchTap, this);
+		this.ok_btn.addEventListener(egret.TouchEvent.TOUCH_TAP, this.touch_tap_ok_btn, this);
 		this.closeBtn.addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTouchTap, this);
 	}
 
+	onTouchTap(){
+		super.onTouchTap();
+	}
+
+	touch_tap_ok_btn() {
+
+	}
+
 	removeEvents() {
-		this.ok_btn.removeEventListener(egret.TouchEvent.TOUCH_TAP, this.onTouchTap, this);
+		this.ok_btn.removeEventListener(egret.TouchEvent.TOUCH_TAP, this.touch_tap_ok_btn, this);
 		this.closeBtn.removeEventListener(egret.TouchEvent.TOUCH_TAP, this.onTouchTap, this);
 	}
 
+
+
 	protected onSkinComplete(): void {
 		super.onSkinComplete();
 
@@ -28,10 +38,6 @@ export default class NoPrizePanel extends Panel {
 
 	}
 
-	start(data?) {
-
-	}
-
 	protected onLoad(): void {
 		this.initUI();
 	}
@@ -42,9 +48,11 @@ export default class NoPrizePanel extends Panel {
 
 	protected async preLoadRes() {
 
-
 		return new Promise(function (resolve, reject) {
 			resolve();
 		});
 	}
+
+	public get skinKey() { return 'TurnTableIDouPanel' }
+	public get groupName() { return 'turnTableIDou_panel' }
 }
\ No newline at end of file

egret/src/Panels/NoMorePanel/NoMorePanel.ts → egret/src/Panels/TurnTableNoPrizePanel/TurnTableNoPrizePanel.ts

 import Panel from "../../views/Panel";
 
-export default class NoMorePanel extends Panel {
+export default class TurnTableNoPrizePanel extends Panel {
 	public ok_btn: eui.Button;
 	public closeBtn: eui.Button;
 
-	public get skinKey() { return 'NoMorePanel' }
-	public get groupName() { return 'noMore_panel' }
+	public get skinKey() { return 'TurnTableNoPrizePanel' }
+	public get groupName() { return 'TurnTableNoPrize_panel' }
 	constructor(data?) {
 		super(data);
 
@@ -42,9 +42,5 @@ export default class NoMorePanel extends Panel {
 
 	protected async preLoadRes() {
 
-
-		return new Promise(function (resolve, reject) {
-			resolve();
-		});
 	}
 }
\ No newline at end of file

egret/src/Panels/CreditsTipPanel/CreditsTipPanel.ts → egret/src/Panels/TurnTablePrizePanel/TurnTablePrizePanel.ts

 import Panel from "../../views/Panel";
-import { GDispatcher } from "../../../libs/tc/util/GDispatcher";
 
-export default class CreditsTipPanel extends Panel {
-	public ok_btn: eui.Button;
+export default class TurnTablePrizePanel extends Panel {
 	public closeBtn: eui.Button;
+	public prizeImg: eui.Image;
+	public prizeName: eui.Label;
+	public ok_btn: eui.Button;
 
-	public get skinKey() { return 'CreditsTipPanel' }
-	public get groupName() { return 'creditsTip_panel' }
 	constructor(data?) {
 		super(data);
 
@@ -16,9 +15,12 @@ export default class CreditsTipPanel extends Panel {
 		this.closeBtn.addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTouchTap, this);
 	}
 
-	touch_tap_ok_btn(){
-		GDispatcher.dispatchEvent('queryPrize');
-		this.onTouchTap();
+	onTouchTap(){
+		super.onTouchTap();
+	}
+
+	touch_tap_ok_btn() {
+
 	}
 
 	removeEvents() {
@@ -26,17 +28,31 @@ export default class CreditsTipPanel extends Panel {
 		this.closeBtn.removeEventListener(egret.TouchEvent.TOUCH_TAP, this.onTouchTap, this);
 	}
 
+
+
 	protected onSkinComplete(): void {
 		super.onSkinComplete();
 
 		this.preLoadRes();
+		this.onLoad();
+
 	}
 
-	protected async preLoadRes() {
+	protected onLoad(): void {
+		this.initUI();
+	}
 
+	private initUI(): void {
+
+	}
+
+	protected async preLoadRes() {
 
 		return new Promise(function (resolve, reject) {
 			resolve();
 		});
 	}
+
+	public get skinKey() { return 'TurnTablePrizePanel' }
+	public get groupName() { return 'turnTablePrize_panel' }
 }
\ No newline at end of file

egret/src/types/sceneTypes.ts

@@ -9,9 +9,11 @@ export enum ModuleTypes {
     NO_MORE_PANEL,
     NO_TIMES_PANEL,
     NO_PRIZE_PANEL,
-    PRIZE_PANEL,
+
+
+    TURNTABLE_PRIZE_PANEL,
+    TURNTABLE_NO_PRIZE_PANEL,
     RULE_PANEL,
-    MYPRIZE_SCENE,
     TURNTABLE_PANEL,
 
 }
\ No newline at end of file