Commit 731809b5 authored by wildfirecode's avatar wildfirecode

1

parent d71dc056
...@@ -45,9 +45,9 @@ ...@@ -45,9 +45,9 @@
<script src="libs/security.js"></script> <script src="libs/security.js"></script>
<script src="libs/downloadApp.js"></script> <script src="libs/downloadApp.js"></script>
<script> <script>
// localStorage.clear(); localStorage.clear();
// localStorage.setItem('currentLevel','1'); localStorage.setItem('currentLevel','1');
// localStorage.setItem('currentScore','4'); localStorage.setItem('currentScore','4');
window['development'] = true; window['development'] = true;
var gameId = 1; var gameId = 1;
var CFG = { var CFG = {
......
import { DataManager } from "../../tw/manager/DataManager";
export default ()=>{
return DataManager.ins.gameGetSubmitResultData.lottery ? true : false;
}
\ No newline at end of file
...@@ -21,6 +21,7 @@ import { ModuleTypes } from "./types/sceneTypes"; ...@@ -21,6 +21,7 @@ import { ModuleTypes } from "./types/sceneTypes";
import layers from "./views/layers"; import layers from "./views/layers";
import SlotPanel from "./components/SlotPanel"; import SlotPanel from "./components/SlotPanel";
import RotatePanel from "./components/RotatePanel"; import RotatePanel from "./components/RotatePanel";
import NoPrizePanel from "./components/NoPrizePanel";
export default class MainBase extends eui.UILayer { export default class MainBase extends eui.UILayer {
constructor() { constructor() {
...@@ -39,6 +40,7 @@ export default class MainBase extends eui.UILayer { ...@@ -39,6 +40,7 @@ export default class MainBase extends eui.UILayer {
[ModuleTypes.HTML_RULE_PANEL, { cls: HTMLRulePanel }], [ModuleTypes.HTML_RULE_PANEL, { cls: HTMLRulePanel }],
[ModuleTypes.OPTIONS_PANEL, { cls: OptionsPanel }], [ModuleTypes.OPTIONS_PANEL, { cls: OptionsPanel }],
[ModuleTypes.PRIZE_PANEL, { cls: PrizePanel }], [ModuleTypes.PRIZE_PANEL, { cls: PrizePanel }],
[ModuleTypes.NO_PRIZE_PANEL, { cls: NoPrizePanel }],
[ModuleTypes.RANK_PANEL, { cls: RankPanel }], [ModuleTypes.RANK_PANEL, { cls: RankPanel }],
[ModuleTypes.TREASURE_PANEL, { cls: TreasurePanel }], [ModuleTypes.TREASURE_PANEL, { cls: TreasurePanel }],
[ModuleTypes.SLOT_PANEL, { cls: SlotPanel }], [ModuleTypes.SLOT_PANEL, { cls: SlotPanel }],
......
import Panel from "./Panel";
export default class NoPrizePanel extends Panel {
start(data) {
this.data.message = '很遗憾,您与奖品擦肩而过';
}
get skinKey() { return 'Alert' }
protected get closeBtns(): eui.Button[] {
return [this['closeBtn']]
}
}
\ No newline at end of file
...@@ -8,6 +8,7 @@ import Panel from "./Panel"; ...@@ -8,6 +8,7 @@ import Panel from "./Panel";
import centerAnchorOffset from "../views/centerAnchorOffset" import centerAnchorOffset from "../views/centerAnchorOffset"
import showAlertPanel from "../../../libs/new_wx/ctrls/showAlertPanel"; import showAlertPanel from "../../../libs/new_wx/ctrls/showAlertPanel";
import getCountTxt from "../../../libs/new_tw/datas/getCountTxt"; import getCountTxt from "../../../libs/new_tw/datas/getCountTxt";
import gameIsWinning from "../../new_tw/datas/gameIsWinning";
export default class SlotPanel extends Panel { export default class SlotPanel extends Panel {
...@@ -102,7 +103,13 @@ export default class SlotPanel extends Panel { ...@@ -102,7 +103,13 @@ export default class SlotPanel extends Panel {
this.speed = 4 this.speed = 4
this.prizeIndex = this.optionList.findIndex(item => item.name === prizeName) this.prizeIndex = this.optionList.findIndex(item => item.name === prizeName)
console.log(this.prizeIndex) console.log(this.prizeIndex)
wait(300).then(() => PanelCtrl.instance.show(ModuleTypes.PRIZE_PANEL)); wait(300).then(() => {
if (gameIsWinning()) {
PanelCtrl.instance.show(ModuleTypes.PRIZE_PANEL);
} else {
PanelCtrl.instance.show(ModuleTypes.NO_PRIZE_PANEL);
}
});
wait(300).then(() => { wait(300).then(() => {
NetManager.ins.getInfo() NetManager.ins.getInfo()
this.gameReset() this.gameReset()
......
...@@ -7,6 +7,7 @@ export enum ModuleTypes { ...@@ -7,6 +7,7 @@ export enum ModuleTypes {
HTML_RULE_PANEL, HTML_RULE_PANEL,
OPTIONS_PANEL, OPTIONS_PANEL,
PRIZE_PANEL, PRIZE_PANEL,
NO_PRIZE_PANEL,
RANK_PANEL, RANK_PANEL,
TREASURE_PANEL, TREASURE_PANEL,
SLOT_PANEL, SLOT_PANEL,
......
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"alert","version":5,"files":["../assets/alert/alertbg.png"]}
\ No newline at end of file
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"preload","version":5,"files":["../assets/startScene/scorebg.png","../assets/startScene/progressbg.png","../assets/startScene/progressfront.png","../assets/startScene/progress_f3.png","../assets/startScene/progress_f2.png","../assets/startScene/progress_f1.png"]}
\ No newline at end of file
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"prize","version":5,"files":["../assets/prize/PrizePanelX.png","../assets/prize/prizePanelUseBtn.png","../assets/prize/prizePanelbg.png"]}
\ No newline at end of file
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"rotate","version":5,"files":["../assets/rotate/wheel.png","../assets/rotate/rotate_start_btn.png","../assets/rotate/rotate_close.png","../assets/rotate/light.png"]}
\ No newline at end of file
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"slot","version":5,"files":["../assets/slot/slot_wrap-top.png","../assets/slot/slot_wrap-top.png","../assets/slot/slot_wrap-bottom.png","../assets/slot/slot_wrap-bottom.png","../assets/slot/slot_start_btn.png","../assets/slot/slot_start_btn.png","../assets/slot/slot_close.png","../assets/slot/slot_close.png","../assets/slot/conveyor.png","../assets/slot/conveyor.png"]}
\ No newline at end of file
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"start","version":5,"files":["../assets/startScene/start_btn.png","../assets/startScene/start_btn_gray.png","../assets/startScene/ruleBtn.png","../assets/startScene/recordbtn.png","../assets/startScene/rankBtn.png","../assets/startScene/optionBtn.png","../assets/startScene/glass.png","../assets/startScene/bubble.png","../assets/startScene/basket_top.png","../assets/startScene/basket_bottom.png"]} {"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"start","version":5,"files":["../assets/startScene/start_btn.png","../assets/startScene/start_btn_gray.png","../assets/startScene/scorebg.png","../assets/startScene/ruleBtn.png","../assets/startScene/recordbtn.png","../assets/startScene/rankBtn.png","../assets/startScene/progressfront.png","../assets/startScene/progressbg.png","../assets/startScene/progress_f3.png","../assets/startScene/progress_f2.png","../assets/startScene/progress_f1.png","../assets/startScene/optionBtn.png","../assets/startScene/lvbg.png","../assets/startScene/lv4.png","../assets/startScene/lv3.png","../assets/startScene/lv2.png","../assets/startScene/lv1.png","../assets/startScene/lv_common.png","../assets/startScene/lightBasket.png","../assets/startScene/glass.png","../assets/startScene/closeBtn.png","../assets/startScene/bubble.png","../assets/startScene/basket_top.png","../assets/startScene/basket_bottom.png","../assets/startScene/allpassed.png","../assets/startScene/5.png","../assets/startScene/20.png","../assets/startScene/15.png","../assets/startScene/10.png"]}
\ No newline at end of file \ No newline at end of file
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"treasure","version":5,"files":["../assets/treasure/treasurebg2.png","../assets/treasure/treasurebg.png","../assets/treasure/hand.png"]}
\ No newline at end of file
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
"name": "rule" "name": "rule"
}, },
{ {
"keys": "startscenebg_jpg,start_btn_png,start_btn_gray_png,scorebg_png,ruleBtn_png,recordbtn_png,rankBtn_png,progressfront_png,progressbg_png,progress_f3_png,progress_f2_png,progress_f1_png,optionBtn_png,lvbg_png,lv4_png,lv3_png,lv2_png,lv1_png,lv_common_png,lightBasket_png,glass_png,bubble_png,basket_top_png,basket_bottom_png,allpassed_png,5_png,20_png,15_png,10_png", "keys": "startscenebg_jpg,start_btn_png,start_btn_gray_png,scorebg_png,ruleBtn_png,recordbtn_png,rankBtn_png,progressfront_png,progressbg_png,progress_f3_png,progress_f2_png,progress_f1_png,optionBtn_png,lvbg_png,lv4_png,lv3_png,lv2_png,lv1_png,lv_common_png,lightBasket_png,glass_png,closeBtn_png,bubble_png,basket_top_png,basket_bottom_png,allpassed_png,5_png,20_png,15_png,10_png",
"name": "start" "name": "start"
}, },
{ {
...@@ -17,8 +17,16 @@ ...@@ -17,8 +17,16 @@
"name": "alert" "name": "alert"
}, },
{ {
"name": "preload", "keys": "slot_wrap-top2_png,slot_wrap-top_png,slot_wrap-bottom2_png,slot_wrap-bottom_png,slot_start_btn2_png,slot_start_btn_png,slot_close2_png,slot_close_png,conveyor2_png,conveyor_png",
"keys": "conveyor_png,slot_close_png,slot_start_btn_png,slot_wrap-bottom_png,slot_wrap-top_png,closeBtn2_png,hand2_png,treasurebg3_png,treasurebg22_png,conveyor2_png,slot_close2_png,slot_start_btn2_png,slot_wrap-bottom2_png,slot_wrap-top2_png,light_png,wheel_png,rotate_start_btn_png,rotate_close_png" "name": "slot"
},
{
"keys": "wheel_png,rotate_start_btn_png,rotate_close_png,light_png",
"name": "rotate"
},
{
"keys": "PrizePanelX_png,prizePanelUseBtn_png,prizePanelbg_png",
"name": "prize"
} }
], ],
"resources": [ "resources": [
...@@ -290,94 +298,89 @@ ...@@ -290,94 +298,89 @@
"name": "closeBtn_png" "name": "closeBtn_png"
}, },
{ {
"name": "conveyor_png", "url": "assets/slot/conveyor.png",
"type": "image",
"url": "assets/slot/conveyor.png"
},
{
"name": "slot_close_png",
"type": "image", "type": "image",
"url": "assets/slot/slot_close.png" "name": "conveyor_png"
}, },
{ {
"name": "slot_start_btn_png", "url": "assets/slot/slot_close.png",
"type": "image", "type": "image",
"url": "assets/slot/slot_start_btn.png" "name": "slot_close_png"
}, },
{ {
"name": "slot_wrap-bottom_png", "url": "assets/slot/slot_start_btn.png",
"type": "image", "type": "image",
"url": "assets/slot/slot_wrap-bottom.png" "name": "slot_start_btn_png"
}, },
{ {
"name": "slot_wrap-top_png", "url": "assets/slot/slot_wrap-bottom.png",
"type": "image", "type": "image",
"url": "assets/slot/slot_wrap-top.png" "name": "slot_wrap-bottom_png"
}, },
{ {
"name": "closeBtn2_png", "url": "assets/slot/slot_wrap-top.png",
"type": "image", "type": "image",
"url": "assets/startScene/closeBtn.png" "name": "slot_wrap-top_png"
}, },
{ {
"name": "hand2_png", "url": "assets/treasure/hand.png",
"type": "image", "type": "image",
"url": "assets/treasure/hand.png" "name": "hand2_png"
}, },
{ {
"name": "treasurebg3_png", "url": "assets/treasure/treasurebg.png",
"type": "image", "type": "image",
"url": "assets/treasure/treasurebg.png" "name": "treasurebg3_png"
}, },
{ {
"name": "treasurebg22_png", "url": "assets/treasure/treasurebg2.png",
"type": "image", "type": "image",
"url": "assets/treasure/treasurebg2.png" "name": "treasurebg22_png"
}, },
{ {
"name": "conveyor2_png", "url": "assets/slot/conveyor.png",
"type": "image", "type": "image",
"url": "assets/slot/conveyor.png" "name": "conveyor2_png"
}, },
{ {
"name": "slot_close2_png", "url": "assets/slot/slot_close.png",
"type": "image", "type": "image",
"url": "assets/slot/slot_close.png" "name": "slot_close2_png"
}, },
{ {
"name": "slot_start_btn2_png", "url": "assets/slot/slot_start_btn.png",
"type": "image", "type": "image",
"url": "assets/slot/slot_start_btn.png" "name": "slot_start_btn2_png"
}, },
{ {
"name": "slot_wrap-bottom2_png", "url": "assets/slot/slot_wrap-bottom.png",
"type": "image", "type": "image",
"url": "assets/slot/slot_wrap-bottom.png" "name": "slot_wrap-bottom2_png"
}, },
{ {
"name": "slot_wrap-top2_png", "url": "assets/slot/slot_wrap-top.png",
"type": "image", "type": "image",
"url": "assets/slot/slot_wrap-top.png" "name": "slot_wrap-top2_png"
}, },
{ {
"name": "light_png", "url": "assets/rotate/light.png",
"type": "image", "type": "image",
"url": "assets/rotate/light.png" "name": "light_png"
}, },
{ {
"name": "wheel_png", "url": "assets/rotate/wheel.png",
"type": "image", "type": "image",
"url": "assets/rotate/wheel.png" "name": "wheel_png"
}, },
{ {
"name": "rotate_start_btn_png", "url": "assets/rotate/rotate_start_btn.png",
"type": "image", "type": "image",
"url": "assets/rotate/rotate_start_btn.png" "name": "rotate_start_btn_png"
}, },
{ {
"name": "rotate_close_png", "url": "assets/rotate/rotate_close.png",
"type": "image", "type": "image",
"url": "assets/rotate/rotate_close.png" "name": "rotate_close_png"
} }
] ]
} }
\ No newline at end of file
{ {
"skins": {}, "skins": {},
"autoGenerateExmlsList": true, "autoGenerateExmlsList": true,
"exmls": [ "exmls": [
"resource/skins/AlertSkin.exml", "resource/skins/AlertSkin.exml",
"resource/skins/OptionItemSkin.exml", "resource/skins/OptionItemSkin.exml",
"resource/skins/OptionsSkin.exml", "resource/skins/OptionsSkin.exml",
"resource/skins/PlaySkin.exml", "resource/skins/PlaySkin.exml",
"resource/skins/PrizeSkin.exml", "resource/skins/PrizeSkin.exml",
"resource/skins/RankItemSkin.exml", "resource/skins/RankItemSkin.exml",
"resource/skins/RankSkin.exml", "resource/skins/RankSkin.exml",
"resource/skins/RuleSkin.exml", "resource/skins/RotateSkin.exml",
"resource/skins/StartSkin.exml", "resource/skins/RuleSkin.exml",
"resource/skins/TreasureSkin.exml", "resource/skins/SlotSkin.exml",
"resource/skins/SlotSkin.exml", "resource/skins/StartSkin.exml",
"resource/skins/RotateSkin.exml", "resource/skins/TreasureSkin.exml",
"resource/skins/VScrollBarSkin.exml" "resource/skins/VScrollBarSkin.exml"
], ],
"path": "resource/default.thm.json" "path": "resource/default.thm.json"
} }
\ No newline at end of file
...@@ -8,6 +8,7 @@ import showAlertPanel from "../libs/new_wx/ctrls/showAlertPanel"; ...@@ -8,6 +8,7 @@ import showAlertPanel from "../libs/new_wx/ctrls/showAlertPanel";
import { ModuleTypes } from "../libs/new_wx/types/sceneTypes"; import { ModuleTypes } from "../libs/new_wx/types/sceneTypes";
import { DataManager } from "../libs/tw/manager/DataManager"; import { DataManager } from "../libs/tw/manager/DataManager";
import { NetManager } from "../libs/tw/manager/NetManager"; import { NetManager } from "../libs/tw/manager/NetManager";
import gameIsWinning from "../libs/new_tw/datas/gameIsWinning";
export default class TreasurePanel extends Panel { export default class TreasurePanel extends Panel {
start(data) { start(data) {
...@@ -52,7 +53,12 @@ export default class TreasurePanel extends Panel { ...@@ -52,7 +53,12 @@ export default class TreasurePanel extends Panel {
Loading.instace.show(); Loading.instace.show();
submitAfterDostart(() => { submitAfterDostart(() => {
PanelCtrl.instance.show(ModuleTypes.PRIZE_PANEL); if (gameIsWinning()) {
PanelCtrl.instance.show(ModuleTypes.PRIZE_PANEL);
} else {
PanelCtrl.instance.show(ModuleTypes.NO_PRIZE_PANEL);
}
Loading.instace.hide(); Loading.instace.hide();
wait(300).then(() => NetManager.ins.getInfo()); wait(300).then(() => NetManager.ins.getInfo());
}, 10); }, 10);
......
...@@ -28,8 +28,9 @@ export default class StartScene extends StartSceneBase { ...@@ -28,8 +28,9 @@ export default class StartScene extends StartSceneBase {
onPanelRemoved(e: egret.Event) { onPanelRemoved(e: egret.Event) {
const { panel, closeType } = e.data; const { panel, closeType } = e.data;
const c1 = panel.type == ModuleTypes.PRIZE_PANEL; const c1 = panel.type == ModuleTypes.PRIZE_PANEL;
const c3 = panel.type == ModuleTypes.NO_PRIZE_PANEL;
const c2 = closeType == 'closeByClick'; const c2 = closeType == 'closeByClick';
if (!c1 && !c2) return; if (!c1 && !c2 && !c3) return;
if (toNextLevel()) { if (toNextLevel()) {
this.initLevelView(); this.initLevelView();
this.playLevelAni(); this.playLevelAni();
......
...@@ -42,7 +42,7 @@ const check = (_this: StartScene) => { ...@@ -42,7 +42,7 @@ const check = (_this: StartScene) => {
} }
else if (i.label == LabelType.egg) { else if (i.label == LabelType.egg) {
_this._egretRender.remove(i); _this._egretRender.remove(i);
PanelCtrl.instance.show(ModuleTypes.TREASURE_PANEL); PanelCtrl.instance.show(ModuleTypes.SLOT_PANEL);
} }
else if (i.label == LabelType.candy) { else if (i.label == LabelType.candy) {
_this._egretRender.remove(i); _this._egretRender.remove(i);
......
...@@ -6,7 +6,7 @@ import LabelType from "./items/LabelType"; ...@@ -6,7 +6,7 @@ import LabelType from "./items/LabelType";
import { getCurrentItems, getCurrentScore } from "./levels"; import { getCurrentItems, getCurrentScore } from "./levels";
export const createNewBubble = (_this: StartScene, type: LabelType) => { export const createNewBubble = (_this: StartScene, type: LabelType) => {
createBubble(_this, type, 750 / 2, 220-50, { x: 0, y: 0 },0.001*10); createBubble(_this, type, 750 / 2, 220+60, { x: 0, y: 0 },0.001*10);
} }
const createBubble = (_this: StartScene, type: LabelType, x: number, y: number, force = { x: 0, y: 0 }, density = 0.001) => { const createBubble = (_this: StartScene, type: LabelType, x: number, y: number, force = { x: 0, y: 0 }, density = 0.001) => {
......
...@@ -6,13 +6,13 @@ ...@@ -6,13 +6,13 @@
"success": true, "success": true,
"message": "请求成功", "message": "请求成功",
"tip": "免费", "tip": "免费",
"option": { "opt1ion": {
"name": "优惠券测试", "name": "优惠券测试",
"image": "//yun.duiba.com.cn/images/201705/j7vbab38iw.jpg", "image": "//yun.duiba.com.cn/images/201705/j7vbab38iw.jpg",
"link": "//trade.m.duiba.com.cn/crecord/recordDetailNew?orderId=655916401264300001&fromPage=record&dbnewopen&dpm=1.19.1.0&dcm=101.37155.0.0", "link": "//trade.m.duiba.com.cn/crecord/recordDetailNew?orderId=655916401264300001&fromPage=record&dbnewopen&dpm=1.19.1.0&dcm=101.37155.0.0",
"type": "coupon", "type": "coupon",
"itemId": 37155, "itemId": 37155,
"lottery": { "lot1tery": {
"androidDownloadUrl": "https://h5.ele.me/baida/#group_sn=47a6055b57a86adb2a67556934f5d2c3&", "androidDownloadUrl": "https://h5.ele.me/baida/#group_sn=47a6055b57a86adb2a67556934f5d2c3&",
"coupon_code": "", "coupon_code": "",
"st_info_dpm_go_use": "{\"dpm\":\"1.4.1.0\",\"consumerId\":1,\"domain\":\"//embedlog.duiba.com.cn\",\"appId\":1,\"dcm\":\"101.37155.0.0\"}", "st_info_dpm_go_use": "{\"dpm\":\"1.4.1.0\",\"consumerId\":1,\"domain\":\"//embedlog.duiba.com.cn\",\"appId\":1,\"dcm\":\"101.37155.0.0\"}",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment