Skip to content

X
xiaoxiaole
Commit 9e0e8eb2 authored by 邱旭's avatar 邱旭
Browse files
Options

Merge branch 'dev' of http://gitlab2.dui88.com/wanghongyuan/xiaoxiaole into dev

parents 6f0b0ab7 67c1faf4
Hide whitespace changes
Inline Side-by-side
Showing with 280 additions and 75 deletions
egret/.wing/exml.json
View file @ 9e0e8eb2
......@@ -261,6 +261,29 @@
"key": "data.url",
"value": "http://yun.duiba.com.cn/db_games/1022/111.png"
}
]
],
"guideLines": [
{
"type": "h",
"pos": -24.242
},
{
"type": "h",
"pos": -130.303
},
{
"type": "h",
"pos": -115.152
},
{
"type": "h",
"pos": -69.697
},
{
"type": "h",
"pos": 1196.97
}
],
"guideLinesEnabled": true
}
}
\ No newline at end of file
egret/libs/new_wx/components/Panel.ts
View file @ 9e0e8eb2
......@@ -3,8 +3,14 @@ import ComponentBase from "./ComponentBase";
export default class Panel extends ComponentBase {
public onShowAnim(){
console.log('panel height',this.height,'stage height',this.stage.stageHeight);
const targetY = this.stage.stageHeight/2-this.height/2;
console.log('panel height',this.height,'stage height',this.stage.stageHeight,'pane skin',this.skinKey);
let targetY:number;
if(this.skinKey=='Turntable'){
targetY = 0;
}else{
targetY = this.stage.stageHeight/2-this.height/2;
}
egret.Tween.get(this).set({ y: -200 }).to({ y: targetY }, 500, egret.Ease.quartOut);
}
......
egret/resource/default.res.json
View file @ 9e0e8eb2
......@@ -246,7 +246,7 @@
},
{
"name": "preload",
"keys": "help_blood_fail_text2_png,help_blood_fail_text3_png,help_blood_fail_text4_png,help_invite2_text3_png,help_invite2_text4_png,help_invite_text_png,help_invite_success_txt_png,help_closebtn1_png,help_invite_btn1_png"
"keys": "help_blood_fail_text2_png,help_blood_fail_text3_png,help_blood_fail_text4_png,help_invite2_text3_png,help_invite2_text4_png,commom_prop_bg2_png,turnprize_icon12_png,turnprize_icon22_png,turnprize_icon32_png,help_blood_1_bg2_png,help_blood_1_btn2_png,help_blood_1_text2_png,help_blood_fail2_png,help_blood_fail_btn2_png,help_blood_fail_text5_png,help_blood_fail_text22_png,help_blood_fail_text32_png,help_blood_fail_text42_png,help_blood_success2_png,help_blood_success_text3_png,help_blood_success_text22_png,help_closebtn_png,help_invite22_png,help_invite2_btn3_png,help_invite2_btn22_png,help_invite2_text5_png,help_invite2_text22_png,help_invite_bg2_png,help_invite_btn_png,help_invite_fail2_png,help_invite_fail_btn2_png,help_invite_fail_text12_png,help_invite_fail_text22_png,help_invite_fail_text32_png,help_invite_fail_text42_png,help_invite_success2_png,help_invite_success_btn2_png,recharge_icon2_png,help_invite2_text32_png,help_invite2_text42_png,turntabletit_png,turntable_paneldi_png"
}
],
"resources": [
......@@ -5107,24 +5107,189 @@
"url": "assets/help/help_invite2_text4.png"
},
{
"name": "help_invite_text_png",
"name": "commom_prop_bg2_png",
"type": "image",
"url": "assets/help/help_invite_text.png"
"url": "assets/common/commom_prop_bg.png"
},
{
"name": "help_invite_success_txt_png",
"name": "turnprize_icon12_png",
"type": "image",
"url": "assets/help/help_invite_success_txt.png"
"url": "assets/common/turnprize_icon1.png"
},
{
"name": "help_closebtn1_png",
"name": "turnprize_icon22_png",
"type": "image",
"url": "assets/help/help_closebtn1.png"
"url": "assets/common/turnprize_icon2.png"
},
{
"name": "help_invite_btn1_png",
"name": "turnprize_icon32_png",
"type": "image",
"url": "assets/help/help_invite_btn1.png"
"url": "assets/common/turnprize_icon3.png"
},
{
"name": "help_blood_1_bg2_png",
"type": "image",
"url": "assets/help/help_blood_1_bg.png"
},
{
"name": "help_blood_1_btn2_png",
"type": "image",
"url": "assets/help/help_blood_1_btn.png"
},
{
"name": "help_blood_1_text2_png",
"type": "image",
"url": "assets/help/help_blood_1_text.png"
},
{
"name": "help_blood_fail2_png",
"type": "image",
"url": "assets/help/help_blood_fail.png"
},
{
"name": "help_blood_fail_btn2_png",
"type": "image",
"url": "assets/help/help_blood_fail_btn.png"
},
{
"name": "help_blood_fail_text5_png",
"type": "image",
"url": "assets/help/help_blood_fail_text.png"
},
{
"name": "help_blood_fail_text22_png",
"type": "image",
"url": "assets/help/help_blood_fail_text2.png"
},
{
"name": "help_blood_fail_text32_png",
"type": "image",
"url": "assets/help/help_blood_fail_text3.png"
},
{
"name": "help_blood_fail_text42_png",
"type": "image",
"url": "assets/help/help_blood_fail_text4.png"
},
{
"name": "help_blood_success2_png",
"type": "image",
"url": "assets/help/help_blood_success.png"
},
{
"name": "help_blood_success_text3_png",
"type": "image",
"url": "assets/help/help_blood_success_text.png"
},
{
"name": "help_blood_success_text22_png",
"type": "image",
"url": "assets/help/help_blood_success_text2.png"
},
{
"name": "help_closebtn_png",
"type": "image",
"url": "assets/help/help_closebtn.png"
},
{
"name": "help_invite22_png",
"type": "image",
"url": "assets/help/help_invite2.png"
},
{
"name": "help_invite2_btn3_png",
"type": "image",
"url": "assets/help/help_invite2_btn.png"
},
{
"name": "help_invite2_btn22_png",
"type": "image",
"url": "assets/help/help_invite2_btn2.png"
},
{
"name": "help_invite2_text5_png",
"type": "image",
"url": "assets/help/help_invite2_text.png"
},
{
"name": "help_invite2_text22_png",
"type": "image",
"url": "assets/help/help_invite2_text2.png"
},
{
"name": "help_invite_bg2_png",
"type": "image",
"url": "assets/help/help_invite_bg.png"
},
{
"name": "help_invite_btn_png",
"type": "image",
"url": "assets/help/help_invite_btn.png"
},
{
"name": "help_invite_fail2_png",
"type": "image",
"url": "assets/help/help_invite_fail.png"
},
{
"name": "help_invite_fail_btn2_png",
"type": "image",
"url": "assets/help/help_invite_fail_btn.png"
},
{
"name": "help_invite_fail_text12_png",
"type": "image",
"url": "assets/help/help_invite_fail_text1.png"
},
{
"name": "help_invite_fail_text22_png",
"type": "image",
"url": "assets/help/help_invite_fail_text2.png"
},
{
"name": "help_invite_fail_text32_png",
"type": "image",
"url": "assets/help/help_invite_fail_text3.png"
},
{
"name": "help_invite_fail_text42_png",
"type": "image",
"url": "assets/help/help_invite_fail_text4.png"
},
{
"name": "help_invite_success2_png",
"type": "image",
"url": "assets/help/help_invite_success.png"
},
{
"name": "help_invite_success_btn2_png",
"type": "image",
"url": "assets/help/help_invite_success_btn.png"
},
{
"name": "recharge_icon2_png",
"type": "image",
"url": "assets/recharge/recharge_icon.png"
},
{
"name": "help_invite2_text32_png",
"type": "image",
"url": "assets/help/help_invite2_text3.png"
},
{
"name": "help_invite2_text42_png",
"type": "image",
"url": "assets/help/help_invite2_text4.png"
},
{
"name": "turntabletit_png",
"type": "image",
"url": "assets/turntable/turntabletit.png"
},
{
"name": "turntable_paneldi_png",
"type": "image",
"url": "assets/turntable/turntable_paneldi.png"
}
]
}
\ No newline at end of file
egret/resource/skins/TurnRuleSkin.exml
View file @ 9e0e8eb2
<?xml version="1.0" encoding="utf-8"?>
<e:Skin class="InviteRuleSkin" width="750" height="1624" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<e:Image id="ruleBg" horizontalCenter="0.5" y="152" source="turnrule抽奖说明_png"/>
<e:Scroller id="scroller" width="545" x="104.76" height="507" y="377.2">
<e:Skin class="InviteRuleSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<e:Image id="ruleBg" source="turnrule抽奖说明_png" horizontalCenter="0" verticalCenter="0"/>
<e:Scroller id="scroller" width="545" height="507" horizontalCenter="0.5" y="355.97">
<e:Group id="group" width="100%">
<e:Label id="labContent" width="100%" text="" lineSpacing="10" size="30" multiline="true" textColor="0xa54615" fontFamily="FZY3JW"/>
<e:layout>
......@@ -9,7 +9,7 @@
</e:layout>
</e:Group>
</e:Scroller>
<e:Button id="closeBtn" label="" x="614" y="301">
<e:Button id="closeBtn" label="" x="605" y="246.94">
<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"/>
......
egret/resource/skins/TurntableNoPrizeSkin.exml
View file @ 9e0e8eb2
<?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">
<e:Skin class="TurntableNoPrizeSkin" width="750" height="1206" 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:Image source="turnnoprizebg_png" verticalCenter="-113.5" horizontalCenter="0"/>
<e:Button id="closeBtn" label="" x="605" verticalCenter="-307.5">
<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"/>
......@@ -11,7 +11,7 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Group y="494.67" horizontalCenter="0.5">
<e:Group horizontalCenter="0.5" verticalCenter="14.5">
<e:Button id="btn1" label="" y="0" x="9.09">
<e:skinName>
<e:Skin states="up,down,disabled">
......@@ -29,13 +29,13 @@
</e:skinName>
</e:Button>
<e:Label id="status2" 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">
<e:Label text="）" x="132" y="2" size="22" touchEnabled="false" fontFamily="FZY3JW"/>
<e:Label id="nums" text="（-50" x="0" y="3" size="22" textAlign="right" width="82" touchEnabled="false" fontFamily="FZY3JW"/>
<e:Image source="common_yuanbao_png" x="91.99" y="1.67"/>
<e:Group id="status1" x="48.01" y="69.32" touchChildren="false" touchEnabled="false">
<e:Label text="）" x="120.61" size="22" touchEnabled="false" fontFamily="FZY3JW" verticalCenter="0"/>
<e:Label id="nums" text="（-50" x="7" size="22" textAlign="right" width="82" touchEnabled="false" fontFamily="FZY3JW" verticalCenter="0"/>
<e:Image source="common_yuanbao_png" x="94" scaleX="0.2" scaleY="0.2" verticalCenter="0"/>
</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:Image id="tips1" source="turnnoprize换个姿势再来一次！_png" y="436.8" horizontalCenter="0" visible="false"/>
<e:Image id="tips2" source="turnnoprize奖励溜走了，再试一次吧！_png" y="423.65" horizontalCenter="0" visible="false"/>
<e:Image id="tips3" source="turnnoprize离奖励只差一毫米！ 再来一次吧！_png" y="403.65" horizontalCenter="0.5" visible="false"/>
</e:Skin>
\ No newline at end of file
egret/resource/skins/TurntablePrize2Skin.exml
View file @ 9e0e8eb2
<?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">
<e:Skin class="TurntablePrize2" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<w:Config id="16e02c1ad57"/>
<e:Image id="light2" source="invitebg2_png" x="376" y="297" anchorOffsetX="356" anchorOffsetY="296"/>
<e:Image id="light1" source="invitebg2_png" x="386" y="307" anchorOffsetX="356" anchorOffsetY="296"/>
<e:Image id="light2" source="invitebg2_png" x="376" y="297" anchorOffsetX="356" anchorOffsetY="296" visible="false"/>
<e:Image id="light1" source="invitebg2_png" x="386" y="307" anchorOffsetX="356" anchorOffsetY="296" visible="false"/>
<e:Group id="container" y="-98.45" x="-3"/>
<e:Image source="turnprize2bg_png" y="159" horizontalCenter="0"/>
<e:Image y="323" source="scratch_card_bg_png" horizontalCenter="0"/>
<e:Image id="prizeImg" width="508" height="225" source="" y="345" x="121"/>
<e:Button id="closeBtn" label="" y="242.88" x="615">
<e:Image source="turnprize2bg_png" horizontalCenter="0" verticalCenter="-241.5"/>
<e:Image y="362.02" source="scratch_card_bg_png" horizontalCenter="0"/>
<e:Image id="prizeImg" width="508" height="225" source="" y="384.02" x="121"/>
<e:Button id="closeBtn" label="" y="249.9" x="605">
<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"/>
......@@ -15,8 +15,8 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Image id="btn" source="turnprize2按钮_png" y="677" horizontalCenter="0"/>
<e:Group x="124" y="606" width="506" height="57" anchorOffsetX="0" anchorOffsetY="0">
<e:Image id="btn" source="turnprize2按钮_png" y="716.02" horizontalCenter="0"/>
<e:Group x="124" y="641.02" width="506" height="57" anchorOffsetX="0" anchorOffsetY="0">
<e:Image id="progressMask" source="scratch_progress_bg_png" anchorOffsetX="0" anchorOffsetY="0" x="7" verticalCenter="0"/>
<e:Group id="progressGroup" x="8" verticalCenter="0">
<e:Image id="progressBg" source="scratch_progress_bg_png" anchorOffsetX="0" anchorOffsetY="0" x="0" y="0" width="437" height="22"/>
......
egret/resource/skins/TurntablePrizeSkin.exml
View file @ 9e0e8eb2
<?xml version="1.0" encoding="utf-8"?>
<e:Skin class="TurntablePrize" width="750" height="1624" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<e:Skin class="TurntablePrize" width="750" height="1206" 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="297" anchorOffsetX="356" anchorOffsetY="296"/>
<e:Image id="light1" source="invitebg2_png" x="386" y="307" anchorOffsetX="356" anchorOffsetY="296"/>
<e:Image id="light2" source="invitebg2_png" x="376" y="297" anchorOffsetX="356" anchorOffsetY="296" visible="false"/>
<e:Image id="light1" source="invitebg2_png" x="386" y="307" anchorOffsetX="356" anchorOffsetY="296" visible="false"/>
<e:Group id="container" y="-98.45" x="-3"/>
<e:Image id="bg" source="turprizebg_png" y="161" horizontalCenter="0.5"/>
<e:Image id="img" width="508" height="225" source="{data.url}" horizontalCenter="0" y="337.76"/>
<e:Image id="money" source="signprize元宝_png" y="336.2" horizontalCenter="0" scaleX="0.8" scaleY="0.8" visible="false"/>
<e:Image id="blood" source="singprize体力_png" y="298.8" horizontalCenter="0" visible="false"/>
<e:Group id="numsgroup" x="407.38" y="326.4" scaleX="1.5" scaleY="1.5" locked="true" visible="false">
<e:Image id="bg" source="turprizebg_png" y="-158" horizontalCenter="0.5"/>
<e:Image id="img" width="508" height="225" source="{data.url}" horizontalCenter="0" y="411.76"/>
<e:Image id="money" source="signprize元宝_png" y="400.2" horizontalCenter="0" scaleX="0.8" scaleY="0.8" visible="false"/>
<e:Image id="blood" source="singprize体力_png" y="362.8" horizontalCenter="0" visible="false"/>
<e:Group id="numsgroup" x="407.38" y="390.4" scaleX="1.5" scaleY="1.5" visible="false">
<e:Image id="numsbg" source="signprize_numsbg_png" x="0" y="0"/>
<e:Label id="propnums" text="X8" size="22" horizontalCenter="0" verticalCenter="0" verticalAlign="middle" textAlign="center"/>
</e:Group>
<e:Button id="closeBtn" label="" y="242.88" x="615">
<e:Button id="closeBtn" label="" y="255" x="605">
<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"/>
......@@ -21,7 +21,7 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Group y="631.67" horizontalCenter="0.5">
<e:Group y="693.67" horizontalCenter="0.5">
<e:Button id="btn1" label="" y="0" x="9.09">
<e:skinName>
<e:Skin states="up,down,disabled">
......@@ -38,11 +38,11 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Group id="status1" x="52" y="60">
<e:Label text="）" x="128.96" y="2" size="22" touchEnabled="false" fontFamily="FZY3JW"/>
<e:Label id="nums" text="（-50" x="3.04" y="1.52" size="22" textAlign="right" width="82" touchEnabled="false" fontFamily="FZY3JW"/>
<e:Image source="common_yuanbao_png" x="91.99" y="1.67"/>
<e:Group id="status1" x="52" y="69.32">
<e:Label text="）" x="120.61" size="22" touchEnabled="false" fontFamily="FZY3JW" verticalCenter="0"/>
<e:Label id="nums" text="（-50" x="7" size="22" textAlign="right" width="82" touchEnabled="false" fontFamily="FZY3JW" verticalCenter="0"/>
<e:Image source="common_yuanbao_png" x="94" scaleX="0.2" scaleY="0.2" verticalCenter="0"/>
</e:Group>
</e:Group>
<e:Label id="status2" text="（免费次数:1）" x="169.3" y="693.66" size="22" touchEnabled="false" visible="false"/>
<e:Label id="status2" text="（免费次数:1）" x="169.3" y="764.97" size="22" touchEnabled="false" visible="false"/>
</e:Skin>
\ No newline at end of file
egret/resource/skins/TurntableSkin.exml
View file @ 9e0e8eb2
<?xml version="1.0" encoding="utf-8"?>
<e:Skin class="LoadingSceneSkin" width="750" height="1624" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<e:Group id="container" y="-45.45" x="-3"/>
<e:Image source="turntabletit_png" horizontalCenter="0" verticalCenter="-623"/>
<e:Image scaleX="1" scaleY="1" y="73.35" horizontalCenter="0" source=""/>
<e:Group horizontalCenter="0" verticalCenter="-190" touchEnabled="false">
<e:Image id="di" source="turntable_paneldi_png" scaleX="1" scaleY="1" y="232" width="761" horizontalCenter="-5.5" height="883"/>
<e:Group touchEnabled="false" verticalCenter="19.5" horizontalCenter="0.5">
<e:Group id="panel" anchorOffsetX="253.5" anchorOffsetY="253.5" rotation="0" horizontalCenter="0" verticalCenter="0" width="507" height="507">
<e:Image scaleX="1" scaleY="1" anchorOffsetX="253.5" anchorOffsetY="253.5" rotation="0" horizontalCenter="0" verticalCenter="0" source="turntable_panel_png"/>
<e:Group id="prize0" y="-10" x="179">
<e:Image id="img0" y="50" width="83" height="83" rotation="0" horizontalCenter="0" source="turntable_wealth_png"/>
<e:Image scaleX="1" scaleY="1" anchorOffsetX="234" anchorOffsetY="234" rotation="0" verticalCenter="0" source="turntable_panel_png" fillMode="scale" width="468" height="468" horizontalCenter="0"/>
<e:Group id="prize0" y="-8.98" x="179.33" anchorOffsetX="0" width="154" anchorOffsetY="0" height="133">
<e:Image id="img0" y="50" width="83" height="83" rotation="0" source="turntable_wealth_png" horizontalCenter="0"/>
<e:Label id="lab0" text="Label" y="0" size="24" rotation="0" textAlign="center" verticalAlign="middle" anchorOffsetX="75" width="150" anchorOffsetY="0" height="50" skewX="0" textColor="0xe33330" horizontalCenter="0" visible="false"/>
</e:Group>
<e:Group id="prize1" y="187" x="-11" rotation="-60">
<e:Group id="prize1" y="191.9" x="-14.22" rotation="300.32" anchorOffsetX="0" width="154" anchorOffsetY="0" height="133">
<e:Image id="img1" y="50" width="83" height="83" rotation="0" horizontalCenter="0" source="turntable_oupon_png"/>
<e:Label id="lab1" text="Label" y="0" size="24" rotation="0" textAlign="center" verticalAlign="middle" anchorOffsetX="75" width="150" anchorOffsetY="0" height="50" skewX="0" textColor="0xE33330" horizontalCenter="0" visible="false"/>
</e:Group>
<e:Group id="prize2" y="450" x="64" rotation="-120">
<e:Group id="prize2" y="461.55" x="63.47" rotation="-120" anchorOffsetX="0" width="154" anchorOffsetY="0" height="133">
<e:Image id="img2" y="50" width="83" height="83" rotation="0" horizontalCenter="0" source="turntable_prop_png"/>
<e:Label id="lab2" text="Label" y="0" size="24" rotation="0" textAlign="center" verticalAlign="middle" anchorOffsetX="75" width="150" anchorOffsetY="0" height="50" skewX="0" textColor="0xE33330" horizontalCenter="0" visible="false"/>
</e:Group>
<e:Group id="prize3" y="516.5" rotation="-180" x="329">
<e:Group id="prize3" y="526.5" rotation="-180" x="332" width="154" height="133">
<e:Image id="img3" y="50" width="83" height="83" rotation="0" horizontalCenter="0" source="turntable_scratch_png"/>
<e:Label id="lab3" text="Label" y="0" size="24" rotation="0" textAlign="center" verticalAlign="middle" anchorOffsetX="75" width="150" anchorOffsetY="0" height="50" skewX="0" textColor="0xE33330" horizontalCenter="0" visible="false"/>
</e:Group>
<e:Group id="prize4" y="320.1" rotation="-240" x="519.18">
<e:Group id="prize4" y="327.1" rotation="-240" x="523.18" width="154">
<e:Image id="img4" y="50" width="83" height="83" rotation="0" horizontalCenter="0" source="turntable_thanks_png"/>
<e:Label id="lab4" text="Label" y="0" size="24" rotation="0" textAlign="center" verticalAlign="middle" anchorOffsetX="75" width="150" anchorOffsetY="0" height="50" skewX="0" textColor="0xE33330" horizontalCenter="0" visible="false"/>
</e:Group>
<e:Group id="prize5" y="56.5" rotation="-300" x="444.18">
<e:Group id="prize5" y="57.5" rotation="-300" x="448.18" width="154">
<e:Image id="img5" y="50" width="83" height="83" rotation="0" horizontalCenter="0" source="turntable_gameTime_png"/>
<e:Label id="lab5" text="Label" y="0" size="24" rotation="0" textAlign="center" verticalAlign="middle" anchorOffsetX="75" width="150" anchorOffsetY="0" height="50" skewX="0" textColor="0xE33330" horizontalCenter="0" visible="false"/>
</e:Group>
......@@ -38,9 +40,9 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Label id="btnLabel" text="Label" size="20" verticalCenter="30.5" verticalAlign="middle" textAlign="center" bold="true" horizontalCenter="0" touchEnabled="false" fontFamily="FZY3JW"/>
</e:Group>
<e:Button id="closeBtn" label="" y="292.88" x="565.89">
<e:Button id="closeBtn" label="" y="421.37" x="605">
<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"/>
......@@ -49,6 +51,7 @@
</e:skinName>
</e:Button>
<e:Group id="container2"/>
<e:Label id="nums" text="当前可用元宝：0" y="951" textColor="0xffe9c0" horizontalCenter="0" fontFamily="FZY3JW"/>
<e:Image id="rulebtn" source="turntable_rulebtn_png" y="1000" horizontalCenter="0"/>
<e:Label id="nums" text="我的元宝：0" y="379.95" fontFamily="FZY3JW" horizontalCenter="0.5" textColor="0xffe9c0" size="32"/>
<e:Label id="btnLabel" text="Label" size="28" verticalCenter="353" verticalAlign="middle" textAlign="center" bold="true" touchEnabled="false" fontFamily="FZY3JW" horizontalCenter="0.5" textColor="0xffe9c0"/>
<e:Image id="rulebtn" source="turntable_rulebtn_png" y="1200.01" horizontalCenter="0"/>
</e:Skin>
\ No newline at end of file
egret/src/panels/TurntablePanel/Turntable.ts
View file @ 9e0e8eb2
......@@ -43,11 +43,18 @@ export default class Turntable extends Panel {
async start(data?) {
super.start();
NetManager.ins.showLog(getlogItem(45));
this['container'].addChild(this.data.mv);
// this['container'].addChild(this.data.mv);
this.hand = await loadSvga(getResPath() + 'resource/assets/svgas/hand.svga', this['container2'])
var startpy = this["start_btn"].y;
startpy = 281;
var whandy = this["start_btn"].parent.localToGlobal(0,startpy).y;
var handy = this['container2'].globalToLocal(0,whandy).y-1334/2;
this.hand.y = handy;
// console.log("hand位置",startpy,whandy,this.stage.stageHeight/2,this.height/2,this['container2'].y);
this['container2'].touchEnabled = false;
this['container2'].touchChildren = false;
this['nums'].text = `当前可用元宝：${getHomeData().wealth}`;
this['nums'].text = `我的元宝：${getHomeData().wealth}`;
this['btnLabel'].text = "";
this.initUI();
}
......@@ -132,6 +139,7 @@ export default class Turntable extends Panel {
// return;
// }
GDispatcher.dispatchEvent('updateTurntableIcon'); // 更新icon
const data = res.data;
......
egret/src/panels/TurntablePanel/TurntableNoPrizePanel.ts
View file @ 9e0e8eb2
......@@ -13,7 +13,7 @@ export default class TurntableNoPrizePanel extends Panel {
super.start();
this.showlog();
addAdComp(84, 635, this,48);
addAdComp(84,707, this,48);
if (this['tips' + data.type])
this['tips' + data.type].visible = true;
NetManager.ins.hc_turnableBaseInfo((success, res) => {
......
egret/src/panels/TurntablePanel/TurntablePrize2Panel.ts
View file @ 9e0e8eb2
......@@ -61,13 +61,13 @@ export default class TurnPrize2Panel extends Panel {
}, 500);
this['light1'].visible = this['light2'].visible = false;
addAdComp(84, 816, this,48);
data.mv.gotoAndPlay(10, true)
addAdComp(84, 862, this,48);
data.mv.gotoAndPlay(10, true);
data.mv.once(egret.Event.COMPLETE, () => {
data.mv.stop(1);
this.playBgAni();
// data.mv.stop(1);
// this.playBgAni();
}, this);
this['container'].addChild(data.mv);
// this['container'].addChild(data.mv);
}
private setProgress(progress) {
......
egret/src/panels/TurntablePanel/TurntablePrizePanel.ts
View file @ 9e0e8eb2
......@@ -14,13 +14,13 @@ export default class TurnPrizePanel extends Panel {
this['light1'].visible = this['light2'].visible = false;
addAdComp(84, 788, this,48);
addAdComp(84, 862, this,48);
data.mv.gotoAndPlay(10, true)
data.mv.once(egret.Event.COMPLETE, () => {
data.mv.stop(1);
this.playBgAni();
// this.playBgAni();
}, this);
this['container'].addChild(data.mv);
// this['container'].addChild(data.mv);
NetManager.ins.hc_turnableBaseInfo((success, res) => {
const data = res.data;
......
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