Skip to content

X
xiaoxiaole
Commit 753107cb authored by wildfirecode's avatar wildfirecode
Browse files
Options

1

parent ca3e1d83
Show whitespace changes
Inline Side-by-side
Showing with 153 additions and 53 deletions
egret/libs/new_wx/components/NoPrizePanel.ts
View file @ 753107cb
...@@ -9,11 +9,14 @@ import { DataManager } from "../../tw/manager/DataManager"; ...@@ -9,11 +9,14 @@ import { DataManager } from "../../tw/manager/DataManager";
import getShowOffPic from "../../../src/getShowOffPic"; import getShowOffPic from "../../../src/getShowOffPic";
import { showShare } from "../../../src/shareCtrl"; import { showShare } from "../../../src/shareCtrl";
import { iswx } from "../../../src/iswx"; import { iswx } from "../../../src/iswx";
import wait from "../../new_tc/wait";
export default class NoPrizePanel extends Panel { export default class NoPrizePanel extends Panel {
_level; _level;
start(data) { start(data) {
super.start(); super.start();
// this.data.score = `本局分数 ${DataManager.ins.getData('ngameSubmit').data.score}`; setGray(this['pica']);
setGray(this['picb']);
setGray(this['picc']);
this._level = parseInt(data.level + ''); this._level = parseInt(data.level + '');
this['shareBtn'].addEventListener(egret.TouchEvent.TOUCH_TAP, () => { this['shareBtn'].addEventListener(egret.TouchEvent.TOUCH_TAP, () => {
NetManager.ins.clickLog(getlogItem(16)); NetManager.ins.clickLog(getlogItem(16));
...@@ -51,30 +54,55 @@ export default class NoPrizePanel extends Panel { ...@@ -51,30 +54,55 @@ export default class NoPrizePanel extends Panel {
} }
protected get closeBtns(): eui.Button[] { return [this['closeBtn']] } protected get closeBtns(): eui.Button[] { return [this['closeBtn']] }
setStar(nums: number) { async setStar(nums: number) {
if (nums == 0) { this['pic1'].visible = this['pic2'].visible = this['pic3'].visible = false;
setGray(this['pic1']); this['light'].visible = false;
setGray(this['pic2']); await wait(500);
setGray(this['pic3']);
}
if (nums == 1) { if (nums == 1) {
setGray(this['pic2']); this['pic1'].visible = true;
setGray(this['pic3']); await this.playAni1();
} }
if (nums == 2) { if (nums == 2) {
setGray(this['pic3']); this['pic1'].visible = true;
await this.playAni1();
this['pic2'].visible = true;
await this.playAni2();
} }
if (nums == 3) { if (nums == 3) {
this['pic1'].visible = true;
await this.playAni1();
this['pic2'].visible = true;
await this.playAni2();
this['pic3'].visible = true;
await this.playAni3();
}
if(nums>=1) {
this['light'].visible = true;
egret.Tween.get(this['light']).set({ scaleX: 0, scaleY: 0 ,alpha:0,}).to({ scaleX: 1, scaleY: 1,alpha:1 }, 300).call(() => {
egret.Tween.get(this['light'], { loop: true }).to({ rotation: 360 }, 3000);
});
} }
} }
// onTouchTap_closeBtn(): any { async playAni1() {
// super.onTouchTap_closeBtn(); return new Promise(r => {
// SceneCtrl.instance.change(ModuleTypes.START_SCENE); egret.Tween.get(this['pic1']).set({ scaleX: 0, scaleY: 0 }).to({ scaleX: 1, scaleY: 1 }, 400, egret.Ease.getBackOut(1)).call(r)
// } })
}
async playAni2() {
return new Promise(r => {
egret.Tween.get(this['pic2']).set({ scaleX: 0, scaleY: 0 }).to({ scaleX: 1, scaleY: 1 }, 400, egret.Ease.getBackOut(1)).call(r)
})
}
async playAni3() {
return new Promise(r => {
egret.Tween.get(this['pic3']).set({ scaleX: 0, scaleY: 0 }).to({ scaleX: -1, scaleY: 1 }, 400, egret.Ease.getBackOut(1)).call(r)
})
}
destroy() {
super.destroy();
egret.Tween.removeTweens(this['light']);
}
get skinKey() { return 'NoPrize' } get skinKey() { return 'NoPrize' }
// protected get closeBtns(): eui.Button[] {
// return [this['closeBtn'], this['onceAgainBtn']]
// }
} }
\ No newline at end of file
egret/libs/new_wx/components/PrizePanel.ts
View file @ 753107cb
...@@ -8,6 +8,7 @@ import SceneCtrl from "../ctrls/sceneCtrl"; ...@@ -8,6 +8,7 @@ import SceneCtrl from "../ctrls/sceneCtrl";
import { ModuleTypes } from "../types/sceneTypes"; import { ModuleTypes } from "../types/sceneTypes";
import Panel from "./Panel"; import Panel from "./Panel";
import getShowOffPic from "../../../src/getShowOffPic"; import getShowOffPic from "../../../src/getShowOffPic";
import wait from "../../new_tc/wait";
export default class PrizePanel extends Panel { export default class PrizePanel extends Panel {
_level; _level;
start(data) { start(data) {
...@@ -22,7 +23,7 @@ export default class PrizePanel extends Panel { ...@@ -22,7 +23,7 @@ export default class PrizePanel extends Panel {
this['shareBtn'].addEventListener(egret.TouchEvent.TOUCH_TAP, () => { this['shareBtn'].addEventListener(egret.TouchEvent.TOUCH_TAP, () => {
NetManager.ins.clickLog(getlogItem(15)); NetManager.ins.clickLog(getlogItem(15));
if (iswx()) { if (iswx()) {
getShowOffPic(this.stage,this); getShowOffPic(this.stage, this);
} else } else
showShare(2); showShare(2);
}, this); }, this);
...@@ -37,6 +38,7 @@ export default class PrizePanel extends Panel { ...@@ -37,6 +38,7 @@ export default class PrizePanel extends Panel {
NetManager.ins.hc_home(() => { }, window['collectRuleId']); NetManager.ins.hc_home(() => { }, window['collectRuleId']);
const hc_submitData = DataManager.ins.getData('hc_submit').data; const hc_submitData = DataManager.ins.getData('hc_submit').data;
this.setStar(hc_submitData.stars); this.setStar(hc_submitData.stars);
} }
...@@ -44,23 +46,56 @@ export default class PrizePanel extends Panel { ...@@ -44,23 +46,56 @@ export default class PrizePanel extends Panel {
NetManager.ins.showLog(getlogItem(15)); NetManager.ins.showLog(getlogItem(15));
} }
setStar(nums: number) { async setStar(nums: number) {
this['pic1'].visible=this['pic2'].visible=this['pic3'].visible=false this['pic1'].visible = this['pic2'].visible = this['pic3'].visible = false;
if (nums == 0) { this['light'].visible = false;
await wait(500);
}
if (nums == 1) { if (nums == 1) {
this['pic1'].visible=true; this['pic1'].visible = true;
await this.playAni1();
} }
if (nums == 2) { if (nums == 2) {
this['pic1'].visible=true; this['pic1'].visible = true;
this['pic2'].visible=true; await this.playAni1();
this['pic2'].visible = true;
await this.playAni2();
} }
if (nums == 3) { if (nums == 3) {
this['pic1'].visible=true; this['pic1'].visible = true;
this['pic2'].visible=true; await this.playAni1();
this['pic3'].visible=true; this['pic2'].visible = true;
await this.playAni2();
this['pic3'].visible = true;
await this.playAni3();
}
if(nums>=1) {
this['light'].visible = true;
egret.Tween.get(this['light']).set({ scaleX: 0, scaleY: 0 ,alpha:0,}).to({ scaleX: 1, scaleY: 1,alpha:1 }, 300).call(() => {
egret.Tween.get(this['light'], { loop: true }).to({ rotation: 360 }, 3000);
});
}
} }
async playAni1() {
return new Promise(r => {
egret.Tween.get(this['pic1']).set({ scaleX: 0, scaleY: 0 }).to({ scaleX: 1, scaleY: 1 }, 400, egret.Ease.getBackOut(1)).call(r)
})
}
async playAni2() {
return new Promise(r => {
egret.Tween.get(this['pic2']).set({ scaleX: 0, scaleY: 0 }).to({ scaleX: 1, scaleY: 1 }, 400, egret.Ease.getBackOut(1)).call(r)
})
}
async playAni3() {
return new Promise(r => {
egret.Tween.get(this['pic3']).set({ scaleX: 0, scaleY: 0 }).to({ scaleX: -1, scaleY: 1 }, 400, egret.Ease.getBackOut(1)).call(r)
})
}
destroy() {
super.destroy();
egret.Tween.removeTweens(this['light']);
} }
onTouchTap_closeBtn(): any { onTouchTap_closeBtn(): any {
......
egret/resource/skins/NoPrizeSkin.exml
View file @ 753107cb
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<e:Skin class="NoPrizeSkin" width="750" height="1000" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing"> <e:Skin class="NoPrizeSkin" width="750" height="1000" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<e:Image id="light" source="common_prizelight_png" x="374.19" y="329.51" anchorOffsetX="375.76" anchorOffsetY="327.27"/>
<e:Image y="-2.45" source="擦肩而过弹窗 _png" horizontalCenter="0"/> <e:Image y="-2.45" source="擦肩而过弹窗 _png" horizontalCenter="0"/>
<e:Button id="closeBtn" label="" x="617" y="323"> <e:Button id="closeBtn" label="" x="617" y="323">
<e:skinName> <e:skinName>
...@@ -9,9 +10,12 @@ ...@@ -9,9 +10,12 @@
</e:Skin> </e:Skin>
</e:skinName> </e:skinName>
</e:Button> </e:Button>
<e:Image id="pic1" source="点亮 副本 2_png" x="142" y="179"/> <e:Image id="picb" source="点亮 副本 2_png" x="142" y="179"/>
<e:Image id="pic3" source="点亮 副本 2_png" x="608" y="179" scaleX="-1"/> <e:Image id="pica" source="点亮 副本 2_png" x="608" y="179" scaleX="-1"/>
<e:Image id="pic2" source="点亮_png" y="130" horizontalCenter="0"/> <e:Image id="picc" source="点亮_png" y="130" x="280"/>
<e:Image id="pic1" source="点亮 副本 2_png" x="218" y="237" anchorOffsetX="76" anchorOffsetY="58"/>
<e:Image id="pic3" source="点亮 副本 2_png" x="534" y="235" scaleX="-1" anchorOffsetX="74" anchorOffsetY="56"/>
<e:Image id="pic2" source="点亮_png" y="200" horizontalCenter="0" anchorOffsetX="98" anchorOffsetY="70"/>
<e:Button id="shareBtn" label="" y="614" horizontalCenter="-145.5"> <e:Button id="shareBtn" label="" y="614" horizontalCenter="-145.5">
<e:skinName> <e:skinName>
<e:Skin states="up,down,disabled"> <e:Skin states="up,down,disabled">
......
egret/resource/skins/Prize2Skin.exml
View file @ 753107cb
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<e:Skin class="Prize2Skin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing"> <e:Skin class="Prize2Skin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<w:Config id="169005181d0"/> <w:Config id="169005181d0"/>
<e:Image id="light" source="common_prizelight_png" x="374.19" y="329.51" anchorOffsetX="375.76" anchorOffsetY="327.27"/>
<e:Image source="prizePanelbg_png" y="142.96" horizontalCenter="0"/> <e:Image source="prizePanelbg_png" y="142.96" horizontalCenter="0"/>
<e:Button id="closeBtn" label="" x="608" y="333"> <e:Button id="closeBtn" label="" x="608" y="333">
<e:skinName> <e:skinName>
...@@ -29,9 +30,9 @@ ...@@ -29,9 +30,9 @@
<e:Image id="picb" source="点亮 副本 2_png" x="142" y="191"/> <e:Image id="picb" source="点亮 副本 2_png" x="142" y="191"/>
<e:Image id="pica" source="点亮 副本 2_png" x="608" y="191" scaleX="-1"/> <e:Image id="pica" source="点亮 副本 2_png" x="608" y="191" scaleX="-1"/>
<e:Image id="picc" source="点亮_png" y="142" x="280"/> <e:Image id="picc" source="点亮_png" y="142" x="280"/>
<e:Image id="pic1" source="点亮 副本 2_png" x="142" y="191"/> <e:Image id="pic1" source="点亮 副本 2_png" x="222" y="249" anchorOffsetX="80" anchorOffsetY="58"/>
<e:Image id="pic3" source="点亮 副本 2_png" x="608" y="191" scaleX="-1"/> <e:Image id="pic3" source="点亮 副本 2_png" x="536" y="243" scaleX="-1" anchorOffsetX="72" anchorOffsetY="52"/>
<e:Image id="pic2" source="点亮_png" y="142" horizontalCenter="0"/> <e:Image id="pic2" source="点亮_png" y="218" horizontalCenter="0" anchorOffsetX="96" anchorOffsetY="76"/>
<e:Label id="tips" text="X30" y="637" x="481.85" size="46" textColor="0xb7592a"/> <e:Label id="tips" text="X30" y="637" x="481.85" size="46" textColor="0xb7592a"/>
<e:Image source="prize2_icon_png" y="518.53" horizontalCenter="-26.5"/> <e:Image source="prize2_icon_png" y="518.53" horizontalCenter="-26.5"/>
</e:Skin> </e:Skin>
\ No newline at end of file
egret/resource/skins/PrizeSkin.exml
View file @ 753107cb
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
<e:Image id="picb" source="点亮 副本 2_png" x="142" y="191"/> <e:Image id="picb" source="点亮 副本 2_png" x="142" y="191"/>
<e:Image id="pica" source="点亮 副本 2_png" x="608" y="191" scaleX="-1"/> <e:Image id="pica" source="点亮 副本 2_png" x="608" y="191" scaleX="-1"/>
<e:Image id="picc" source="点亮_png" y="142" x="280"/> <e:Image id="picc" source="点亮_png" y="142" x="280"/>
<e:Image id="pic1" source="点亮 副本 2_png" x="142" y="191"/> <e:Image id="pic1" source="点亮 副本 2_png" x="223.82" y="251.61" anchorOffsetX="81.82" anchorOffsetY="60.61"/>
<e:Image id="pic3" source="点亮 副本 2_png" x="608" y="191" scaleX="-1"/> <e:Image id="pic3" source="点亮 副本 2_png" x="532.24" y="251.61" scaleX="-1" anchorOffsetX="75.76" anchorOffsetY="60.61"/>
<e:Image id="pic2" source="点亮_png" y="142" x="280"/> <e:Image id="pic2" source="点亮_png" y="214.73" x="373.94" anchorOffsetX="93.94" anchorOffsetY="72.73"/>
</e:Skin> </e:Skin>
\ No newline at end of file
egret/src/mapScene/MapScene.ts
View file @ 753107cb
...@@ -28,8 +28,9 @@ export default class MapScene extends Scene { ...@@ -28,8 +28,9 @@ export default class MapScene extends Scene {
NetManager.ins.hc_submit(() => { }, 1, 1, null, ''); NetManager.ins.hc_submit(() => { }, 1, 1, null, '');
NetManager.ins.getPlugOrderStatus(() => { }, 1, () => { return false }) NetManager.ins.getPlugOrderStatus(() => { }, 1, () => { return false })
setTimeout(() => { setTimeout(() => {
// PanelCtrl.instance.show('prize2', { level: 1 })
PanelCtrl.instance.show(ModuleTypes.PRIZE_PANEL, { level: 1 })
PanelCtrl.instance.show(ModuleTypes.NO_PRIZE_PANEL, { level: 1 })
}, 2000); }, 2000);
......
egret/src/panels/Prize2Panel.ts
View file @ 753107cb
...@@ -8,6 +8,7 @@ import setGray from "../setGray"; ...@@ -8,6 +8,7 @@ import setGray from "../setGray";
import getShowOffPic from "../getShowOffPic"; import getShowOffPic from "../getShowOffPic";
import { showShare } from "../shareCtrl"; import { showShare } from "../shareCtrl";
import { iswx } from "../iswx"; import { iswx } from "../iswx";
import wait from "../../libs/new_tc/wait";
export default class Prize2Panel extends Panel { export default class Prize2Panel extends Panel {
_level; _level;
...@@ -48,25 +49,55 @@ export default class Prize2Panel extends Panel { ...@@ -48,25 +49,55 @@ export default class Prize2Panel extends Panel {
showlog() { showlog() {
NetManager.ins.showLog(getlogItem(15)); NetManager.ins.showLog(getlogItem(15));
} }
setStar(nums: number) { async setStar(nums: number) {
this['pic1'].visible=this['pic2'].visible=this['pic3'].visible=false this['pic1'].visible = this['pic2'].visible = this['pic3'].visible = false;
if (nums == 0) { this['light'].visible = false;
await wait(500);
}
if (nums == 1) { if (nums == 1) {
this['pic1'].visible=true; this['pic1'].visible = true;
await this.playAni1();
} }
if (nums == 2) { if (nums == 2) {
this['pic1'].visible=true; this['pic1'].visible = true;
this['pic2'].visible=true; await this.playAni1();
this['pic2'].visible = true;
await this.playAni2();
} }
if (nums == 3) { if (nums == 3) {
this['pic1'].visible=true; this['pic1'].visible = true;
this['pic2'].visible=true; await this.playAni1();
this['pic3'].visible=true; this['pic2'].visible = true;
await this.playAni2();
this['pic3'].visible = true;
await this.playAni3();
}
if(nums>=1) {
this['light'].visible = true;
egret.Tween.get(this['light']).set({ scaleX: 0, scaleY: 0 ,alpha:0,}).to({ scaleX: 1, scaleY: 1,alpha:1 }, 300).call(() => {
egret.Tween.get(this['light'], { loop: true }).to({ rotation: 360 }, 3000);
});
} }
} }
async playAni1() {
return new Promise(r => {
egret.Tween.get(this['pic1']).set({ scaleX: 0, scaleY: 0 }).to({ scaleX: 1, scaleY: 1 }, 400, egret.Ease.getBackOut(1)).call(r)
})
}
async playAni2() {
return new Promise(r => {
egret.Tween.get(this['pic2']).set({ scaleX: 0, scaleY: 0 }).to({ scaleX: 1, scaleY: 1 }, 400, egret.Ease.getBackOut(1)).call(r)
})
}
async playAni3() {
return new Promise(r => {
egret.Tween.get(this['pic3']).set({ scaleX: 0, scaleY: 0 }).to({ scaleX: -1, scaleY: 1 }, 400, egret.Ease.getBackOut(1)).call(r)
})
}
destroy() {
super.destroy();
egret.Tween.removeTweens(this['light']);
}
onTouchTap_closeBtn(): any { onTouchTap_closeBtn(): any {
super.onTouchTap_closeBtn(); super.onTouchTap_closeBtn();
SceneCtrl.instance.change(ModuleTypes.START_SCENE); SceneCtrl.instance.change(ModuleTypes.START_SCENE);
......
mock/happyclear/submit.json
View file @ 753107cb
...@@ -12,6 +12,6 @@ ...@@ -12,6 +12,6 @@
"errorMsg":null, "errorMsg":null,
"success":true "success":true
}, },
"stars":2 "stars":3
} }
} }
\ No newline at end of file
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