Skip to content

X
xiaoxiaole
Commit 93ff4961 authored by wildfirecode's avatar wildfirecode
Browse files
Options

1

parent 6eadff8a
Show whitespace changes
Inline Side-by-side
Showing with 185 additions and 19 deletions
egret/libs/new_wx/MainBase.ts
View file @ 93ff4961
...@@ -60,6 +60,8 @@ import BagQuitPanel from "../../src/panels/BagQuitPanel"; ...@@ -60,6 +60,8 @@ import BagQuitPanel from "../../src/panels/BagQuitPanel";
import H52Scene from "../../src/H52Scene"; import H52Scene from "../../src/H52Scene";
import TurnPrizePanel from "../../src/panels/TurntablePanel/TurntablePrizePanel"; import TurnPrizePanel from "../../src/panels/TurntablePanel/TurntablePrizePanel";
import TurnRulePanel from "./components/TurnRulePanel"; import TurnRulePanel from "./components/TurnRulePanel";
import TurntableNoPrizePanel from "../../src/panels/TurntablePanel/TurntableNoPrizePanel";
import TurnPrize2Panel from "../../src/panels/TurntablePanel/TurntablePrize2Panel";
export default class MainBase extends eui.UILayer { export default class MainBase extends eui.UILayer {
constructor() { constructor() {
...@@ -108,6 +110,8 @@ export default class MainBase extends eui.UILayer { ...@@ -108,6 +110,8 @@ export default class MainBase extends eui.UILayer {
['turnTable', { cls: Turntable }], ['turnTable', { cls: Turntable }],
['TurnRulePanel', { cls: TurnRulePanel }], ['TurnRulePanel', { cls: TurnRulePanel }],
['TurnPrizePanel', { cls: TurnPrizePanel }], ['TurnPrizePanel', { cls: TurnPrizePanel }],
['TurnPrize2Panel', { cls: TurnPrize2Panel }],
['TurntableNoPrizePanel', { cls: TurntableNoPrizePanel }],
['friend', { cls: FriendPanel }], ['friend', { cls: FriendPanel }],
['ad', { cls: ADPanel }], ['ad', { cls: ADPanel }],
]; ];
......
egret/resource/default.res.json
View file @ 93ff4961
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
"name": "signprize" "name": "signprize"
}, },
{ {
"keys": "toast_png,share_btn2_png,share_btn1_png,prizePanelbg_png,nums2_png,nums2_fnt,nums_png,nums_fnt,lightani_png,common_yuanbao_png,common_prizelight_png,common_adbg_png,commmon_okbtn1_png,closeCommonBtn_png,btn_png,alertbg_png,朋友圈中间分享蒙层1_jpg,按钮 副本 4_png,按钮 副本 3_png,exchangebtn_png", "keys": "toast_png,share_btn2_png,share_btn1_png,prizePanelbg_png,nums2_png,nums2_fnt,nums_png,nums_fnt,lightani_png,common_yuanbao_png,common_prizelight_png,common_adbg_png,commmon_okbtn1_png,closeCommonBtn_png,btn_png,alertbg_png,朋友圈中间分享蒙层1_jpg,按钮 副本 4_png,按钮 副本 3_png,exchangebtn_png,turnnoprize再来一次2_png",
"name": "common" "name": "common"
}, },
{ {
...@@ -157,7 +157,7 @@ ...@@ -157,7 +157,7 @@
"name": "back" "name": "back"
}, },
{ {
"keys": "turnprize再抽一次按钮_png,turprize继续闯关按钮_png,turprizebg_png", "keys": "turprize继续闯关按钮_png,turprizebg_png",
"name": "turntableprize" "name": "turntableprize"
}, },
{ {
...@@ -167,6 +167,14 @@ ...@@ -167,6 +167,14 @@
{ {
"keys": "turnnoprize再来一次_png,turnnoprize离奖励只差一毫米！ 再来一次吧！_png,turnnoprize奖励溜走了，再试一次吧！_png,turnnoprize继续闯关_png,turnnoprize换个姿势再来一次！_png", "keys": "turnnoprize再来一次_png,turnnoprize离奖励只差一毫米！ 再来一次吧！_png,turnnoprize奖励溜走了，再试一次吧！_png,turnnoprize继续闯关_png,turnnoprize换个姿势再来一次！_png",
"name": "turntablenoprize" "name": "turntablenoprize"
},
{
"keys": "h52按钮_png",
"name": "h52"
},
{
"name": "preload",
"keys": "turnnoprizebg_png"
} }
], ],
"resources": [ "resources": [
...@@ -2605,11 +2613,6 @@ ...@@ -2605,11 +2613,6 @@
"type": "image", "type": "image",
"name": "backbg_png" "name": "backbg_png"
}, },
{
"url": "assets/turntableprize/turnprize再抽一次按钮.png",
"type": "image",
"name": "turnprize再抽一次按钮_png"
},
{ {
"url": "assets/turntableprize/turprize继续闯关按钮.png", "url": "assets/turntableprize/turprize继续闯关按钮.png",
"type": "image", "type": "image",
...@@ -2699,6 +2702,26 @@ ...@@ -2699,6 +2702,26 @@
"url": "assets/turnnoprize/turnnoprize继续闯关.png", "url": "assets/turnnoprize/turnnoprize继续闯关.png",
"type": "image", "type": "image",
"name": "turnnoprize继续闯关_png" "name": "turnnoprize继续闯关_png"
},
{
"url": "assets/h52/h52按钮.png",
"type": "image",
"name": "h52按钮_png"
},
{
"url": "assets/h52bg.jpg",
"type": "image",
"name": "h52bg_jpg"
},
{
"url": "assets/common/turnnoprize再来一次.png",
"type": "image",
"name": "turnnoprize再来一次2_png"
},
{
"name": "turnnoprizebg_png",
"type": "image",
"url": "assets/turnnoprize/turnnoprizebg.png"
} }
] ]
} }
\ No newline at end of file
egret/resource/default.thm.json
View file @ 93ff4961
...@@ -76,8 +76,9 @@ ...@@ -76,8 +76,9 @@
"resource/skins/Toast2Skin.exml", "resource/skins/Toast2Skin.exml",
"resource/skins/TurntableSkin.exml", "resource/skins/TurntableSkin.exml",
"resource/skins/TurnRuleSkin.exml", "resource/skins/TurnRuleSkin.exml",
"resource/skins/TurntablePrize2Skin.exml",
"resource/skins/TurntablePrizeSkin.exml", "resource/skins/TurntablePrizeSkin.exml",
"resource/skins/TurntableNoPrizeSkin.exml",
"resource/skins/VScrollBarSkin.exml" "resource/skins/VScrollBarSkin.exml"
], ],
"path": "resource/default.thm.json" "path": "resource/default.thm.json"
......
egret/resource/skins/H52Skin.exml
View file @ 93ff4961
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<e:Skin class="H52Skin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing"> <e:Skin class="H52Skin" width="750" height="1624" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<e:Image source="invitebg_jpg"/> <e:Group id="group" y="0" x="0">
<e:Image id="gobtn" source="h5_gobtn_png" y="995" horizontalCenter="0"/> <e:Image source="h52bg_jpg" x="0" y="0"/>
<e:Image id="gobtn" y="1196" source="h52按钮_png" alpha="0" x="135"/>
</e:Group>
<e:Image id="rulebtn" source="h5btn_png" y="954" horizontalCenter="0" visible="false"/> <e:Image id="rulebtn" source="h5btn_png" y="954" horizontalCenter="0" visible="false"/>
</e:Skin> </e:Skin>
\ No newline at end of file
egret/resource/skins/TurntableNoPrizeSkin.exml 0 → 100644
View file @ 93ff4961
<?xml version="1.0" encoding="utf-8"?>
<e:Skin class="TurntableNoPrizeSkin" width="750" height="1624" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<w:Config id="16e02c1ad57"/>
<e:Component y="635" skinName="ADSmallSkin" horizontalCenter="0" visible="false"/>
<e:Image y="161" horizontalCenter="0.5" source="turnnoprizebg_png"/>
<e:Button id="closeBtn" label="" y="224.88" x="623">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="closeCommonBtn_png" source.down="closeCommonBtn_png" source.disabled="closeCommonBtn_png"/>
<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
</e:Skin>
</e:skinName>
</e:Button>
<e:Group y="494.67" horizontalCenter="0.5">
<e:Button id="btn1" label="" y="0" x="9.09">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="turnnoprize再来一次_png" source.down="turnnoprize再来一次_png" source.disabled="turnnoprize再来一次_png"/>
<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
</e:Skin>
</e:skinName>
</e:Button>
<e:Button id="btn2" label="" y="0" x="279">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="turnnoprize继续闯关_png" source.down="turnnoprize继续闯关_png" source.disabled="turnnoprize继续闯关_png"/>
<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
</e:Skin>
</e:skinName>
</e:Button>
<e:Label id="satus2" text="（免费次数:1）" x="69.3" y="62.66" size="22" touchEnabled="false" visible="false"/>
<e:Group id="status1" x="52" y="60" touchChildren="false" touchEnabled="false" visible="false">
<e:Label text="）" x="132" y="2" size="22" touchEnabled="false"/>
<e:Label id="nums" text="（-50" x="0" y="0" size="22" textAlign="right" width="82" touchEnabled="false"/>
<e:Image source="common_yuanbao_png" x="91.99" y="1.67"/>
</e:Group>
</e:Group>
<e:Image id="tips1" source="turnnoprize换个姿势再来一次！_png" y="358" horizontalCenter="0" visible="false"/>
<e:Image id="tips2" source="turnnoprize奖励溜走了，再试一次吧！_png" y="360" horizontalCenter="0" visible="false"/>
<e:Image id="tips3" source="turnnoprize离奖励只差一毫米！ 再来一次吧！_png" y="340" horizontalCenter="0.5" visible="false"/>
</e:Skin>
\ No newline at end of file
egret/resource/skins/TurntablePrize2Skin.exml 0 → 100644
View file @ 93ff4961
<?xml version="1.0" encoding="utf-8"?>
<e:Skin class="TurntablePrize2" width="750" height="1624" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<w:Config id="16e02c1ad57"/>
<e:Component y="788" skinName="ADSmallSkin" horizontalCenter="0" visible="false"/>
<e:Image id="light2" source="invitebg2_png" x="376" y="317" anchorOffsetX="356" anchorOffsetY="296"/>
<e:Image id="light1" source="invitebg2_png" x="386" y="327" anchorOffsetX="356" anchorOffsetY="296"/>
<e:Group id="container" y="-45.45" x="-3"/>
<e:Image source="turprizebg_png" y="161" horizontalCenter="0.5"/>
<e:Image width="508" height="225" source="{data.url}" horizontalCenter="0" y="355.76"/>
<e:Button id="closeBtn" label="" y="242.88" x="615">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="closeCommonBtn_png" source.down="closeCommonBtn_png" source.disabled="closeCommonBtn_png"/>
<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
</e:Skin>
</e:skinName>
</e:Button>
<e:Group y="631.67" horizontalCenter="0.5">
<e:Button id="btn1" label="" y="0" x="9.09">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="turnnoprize再来一次_png" source.down="turnnoprize再来一次_png" source.disabled="turnnoprize再来一次_png"/>
<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
</e:Skin>
</e:skinName>
</e:Button>
<e:Button id="btn2" label="" y="0" x="279">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="turprize继续闯关按钮_png" source.down="turprize继续闯关按钮_png" source.disabled="turprize继续闯关按钮_png"/>
<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
</e:Skin>
</e:skinName>
</e:Button>
<e:Group id="status1" x="52" y="60" visible="false">
<e:Label text="）" x="132" y="2" size="22" touchEnabled="false"/>
<e:Label id="nums" text="（-50" x="0" y="0" size="22" textAlign="right" width="82" touchEnabled="false"/>
<e:Image source="common_yuanbao_png" x="91.99" y="1.67"/>
</e:Group>
</e:Group>
<e:Label id="satus2" text="（免费次数:1）" x="169.3" y="693.66" size="22" touchEnabled="false" visible="false"/>
</e:Skin>
\ No newline at end of file
egret/resource/skins/TurntablePrizeSkin.exml
View file @ 93ff4961
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<e:Button id="btn1" label="" y="0" x="9.09"> <e:Button id="btn1" label="" y="0" x="9.09">
<e:skinName> <e:skinName>
<e:Skin states="up,down,disabled"> <e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="turnprize再抽一次按钮_png" source.down="turnprize再抽一次按钮_png" source.disabled="turnprize再抽一次按钮_png"/> <e:Image width="100%" height="100%" source="turnnoprize再来一次_png" source.down="turnnoprize再来一次_png" source.disabled="turnnoprize再来一次_png"/>
<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/> <e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
</e:Skin> </e:Skin>
</e:skinName> </e:skinName>
...@@ -32,7 +32,11 @@ ...@@ -32,7 +32,11 @@
</e:Skin> </e:Skin>
</e:skinName> </e:skinName>
</e:Button> </e:Button>
<e:Label text="）" x="184" y="62" size="22" touchEnabled="false"/> <e:Group id="status1" x="52" y="60" visible="false">
<e:Label id="nums" text="（-50" x="52" y="60" size="22" textAlign="right" width="82" touchEnabled="false"/> <e:Label text="）" x="132" y="2" size="22" touchEnabled="false"/>
<e:Label id="nums" text="（-50" x="0" y="0" size="22" textAlign="right" width="82" touchEnabled="false"/>
<e:Image source="common_yuanbao_png" x="91.99" y="1.67"/>
</e:Group> </e:Group>
</e:Group>
<e:Label id="satus2" text="（免费次数:1）" x="169.3" y="693.66" size="22" touchEnabled="false" visible="false"/>
</e:Skin> </e:Skin>
\ No newline at end of file
egret/src/H52Scene.ts
View file @ 93ff4961
...@@ -7,6 +7,8 @@ export default class H52Scene extends Scene { ...@@ -7,6 +7,8 @@ export default class H52Scene extends Scene {
async start(data?) { async start(data?) {
super.start(); super.start();
this['group'].y = (this.stage.stageHeight -1624)/2
// this.height=this.stage.stageHeight;
// this['rulebtn'].addEventListener(egret.TouchEvent.TOUCH_TAP,()=>{ // this['rulebtn'].addEventListener(egret.TouchEvent.TOUCH_TAP,()=>{
// PanelCtrl.instance.show('inviterule') // PanelCtrl.instance.show('inviterule')
// },this); // },this);
......
egret/src/panels/TurntablePanel/Turntable.ts
View file @ 93ff4961
...@@ -70,7 +70,8 @@ export default class Turntable extends Panel { ...@@ -70,7 +70,8 @@ export default class Turntable extends Panel {
// this.setBtnTouch(false); // 锁定按钮 // this.setBtnTouch(false); // 锁定按钮
// Loading.instace.show(); // Loading.instace.show();
// GDispatcher.dispatchEvent('queryPrize'); // GDispatcher.dispatchEvent('queryPrize');
PanelCtrl.instance.show('TurnPrizePanel'); //1换个姿势再来一次2 奖励溜走了3 离奖励只差一毫米
PanelCtrl.instance.show('TurnPrize2Panel');
} }
// 设置全部按钮是否可以点击 // 设置全部按钮是否可以点击
......
egret/src/panels/TurntablePanel/TurntableNoPrizePanel.ts
View file @ 93ff4961
...@@ -11,7 +11,9 @@ export default class TurntableNoPrizePanel extends Panel { ...@@ -11,7 +11,9 @@ export default class TurntableNoPrizePanel extends Panel {
super.start(); super.start();
this.showlog(); this.showlog();
addAdComp(84, 788, this); addAdComp(84, 635, this);
if (this['tips' + data.type])
this['tips' + data.type].visible = true;
} }
showlog() { showlog() {
...@@ -31,7 +33,7 @@ export default class TurntableNoPrizePanel extends Panel { ...@@ -31,7 +33,7 @@ export default class TurntableNoPrizePanel extends Panel {
console.log('再来一次'); console.log('再来一次');
loadSvga(getResPath() + 'resource/assets/svgas/turntable.svga').then(async (mv: any) => { loadSvga(getResPath() + 'resource/assets/svgas/turntable.svga').then(async (mv: any) => {
// await wait(100); // await wait(100);
PanelCtrl.instance.show('turnTable', { onceAgain: 1,mv:mv }); PanelCtrl.instance.show('turnTable', { onceAgain: 1, mv: mv });
}) })
} }
onTap_btn2() { onTap_btn2() {
......
egret/src/panels/TurntablePanel/TurntablePrize2Panel.ts 0 → 100644
View file @ 93ff4961
import Panel from "../../../libs/new_wx/components/Panel";
import { addAdComp } from "../BoxPanel";
import { gotoNextLevel } from "../gotoNextLevel";
import PanelCtrl from "../../../libs/new_wx/ctrls/panelCtrl";
import { loadSvga } from "../../loadSvga";
import getResPath from "../../../libs/new_tc/getResPath";
export default class TurnPrize2Panel extends Panel {
start(data) {
super.start();
this.showlog();
this.data.url = "http://yun.duiba.com.cn/db_games/1022/111.png";
addAdComp(84, 788, this);
}
showlog() {
// NetManager.ins.showLog(getlogItem(3));
// NetManager.ins.showLog(getlogItem(4));
}
initEvents() {
super.initEvents();
this['btn1'].addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTap_btn1, this)
this['btn2'].addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTap_btn2, this)
}
onTap_btn1() {//再来一次
//if 有免费次数或积分充足
//else show toast
console.log('再来一次');
loadSvga(getResPath() + 'resource/assets/svgas/turntable.svga').then(async (mv: any) => {
// await wait(100);
PanelCtrl.instance.show('turnTable', { onceAgain: 1,mv:mv });
})
}
onTap_btn2() {
gotoNextLevel()
}
protected get closeBtns(): eui.Button[] { return [this['closeBtn']] }
get skinKey() { return 'TurntablePrize2' }
}
\ 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