Commit 5f022e4f authored by wangzhujun's avatar wangzhujun

更新图片

parent ccb794a3
...@@ -52,6 +52,7 @@ ...@@ -52,6 +52,7 @@
<script src="output.js"></script> <script src="output.js"></script>
<script src="https://res.wx.qq.com/open/js/jweixin-1.3.2.js"></script> <script src="https://res.wx.qq.com/open/js/jweixin-1.3.2.js"></script>
<script> <script>
window['prizeurl'] = "https://film.qq.com/weixin/v3/asset/index.html#ticket"
var development = true; var development = true;
//微众银行 //微众银行
......
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"preload","version":5,"files":["..\\assets\\msg_panel\\msgCloseBtn.png","..\\assets\\rule_panel\\ruleCloseBtn.png","..\\assets\\start_scene\\logo.png","..\\assets\\start_scene\\prizeBtn.png","..\\assets\\start_scene\\ruleBtn.png","..\\assets\\toast_panel\\endHintBg.png","..\\assets\\start_scene\\playBtn.png","..\\assets\\start_scene\\hint.png","..\\assets\\start_scene\\timeBg.png","..\\assets\\msg_panel\\goGetBtn.png","..\\assets\\msg_panel\\goRecordBtn.png","..\\assets\\msg_panel\\msgKonwBtn.png","..\\assets\\msg_panel\\tryBtn.png","..\\assets\\toast_panel\\toastBtn.png","..\\assets\\toast_panel\\box.png","..\\assets\\prize_panel\\goToSee.png","..\\assets\\prize_panel\\noPrizeBg.png","..\\assets\\prize_panel\\prizeBg.png","..\\assets\\prize_panel\\chooseBg.png","..\\assets\\toast_panel\\title1.png"]} {"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"preload","version":5,"files":["..\\assets\\msg_panel\\msgCloseBtn.png","..\\assets\\rule_panel\\ruleCloseBtn.png","..\\assets\\start_scene\\logo.png","..\\assets\\start_scene\\ruleBtn.png","..\\assets\\toast_panel\\endHintBg.png","..\\assets\\start_scene\\timeBg.png","..\\assets\\msg_panel\\goGetBtn.png","..\\assets\\msg_panel\\msgKonwBtn.png","..\\assets\\msg_panel\\tryBtn.png","..\\assets\\toast_panel\\toastBtn.png","..\\assets\\toast_panel\\box.png","..\\assets\\prize_panel\\noPrizeBg.png","..\\assets\\prize_panel\\prizeBg.png","..\\assets\\prize_panel\\chooseBg.png","..\\assets\\toast_panel\\title1.png","..\\assets\\msg_panel\\goRecordBtn.png","..\\assets\\start_scene\\playBtn.png","..\\assets\\start_scene\\card.png","..\\assets\\start_scene\\hint.png","..\\assets\\start_scene\\prizeBtn.png","..\\assets\\prize_panel\\goToSee.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":"prize_panel","version":5,"files":["..\\assets\\prize_panel\\prizeBg.png","..\\assets\\prize_panel\\noPrizeBg.png","..\\assets\\prize_panel\\goToSee.png","..\\assets\\prize_panel\\chooseBg.png"]} {"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"prize_panel","version":5,"files":["..\\assets\\prize_panel\\prizeBg.png","..\\assets\\prize_panel\\noPrizeBg.png","..\\assets\\prize_panel\\chooseBg.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":"start_scene","version":5,"files":["..\\assets\\start_scene\\ruleBtn.png","..\\assets\\start_scene\\prizeBtn.png","..\\assets\\start_scene\\logo.png","..\\assets\\start_scene\\hint.png","..\\assets\\start_scene\\playBtn.png","..\\assets\\start_scene\\timeBg.png"]} {"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"start_scene","version":5,"files":["..\\assets\\start_scene\\ruleBtn.png","..\\assets\\start_scene\\logo.png","..\\assets\\start_scene\\timeBg.png"]}
\ No newline at end of file \ No newline at end of file
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
"name": "loading" "name": "loading"
}, },
{ {
"keys": "msgCloseBtn_png,ruleCloseBtn_png,logo_png,prizeBtn_png,ruleBtn_png,endHintBg_png,card_1_jpg,playBtn_png,card_2_jpg,card_3_jpg,hint_png,timeBg_png,ruleBg_jpg,winPrizeBg_jpg,abNormal1_jpg,abNormal2_jpg,goGetBtn_png,goRecordBtn_png,msgKonwBtn_png,noPrize_jpg,noStock_jpg,noTime_jpg,timeTop_jpg,tryBtn_png,selection_3_jpg,selection_1_jpg,selection_2_jpg,noStartBg_jpg,toastBtn_png,box_png,goToSee_png,noPrizeBg_png,prizeBg_png,chooseBg_png,stratBg_jpg,title1_png", "keys": "msgCloseBtn_png,ruleCloseBtn_png,logo_png,ruleBtn_png,endHintBg_png,card_1_jpg,card_2_jpg,card_3_jpg,timeBg_png,ruleBg_jpg,winPrizeBg_jpg,abNormal1_jpg,goGetBtn_png,msgKonwBtn_png,noPrize_jpg,noStock_jpg,noTime_jpg,tryBtn_png,selection_3_jpg,selection_1_jpg,selection_2_jpg,toastBtn_png,box_png,noPrizeBg_png,prizeBg_png,chooseBg_png,title1_png,goRecordBtn_png,abNormal2_jpg,playBtn_png,card_png,hint_png,prizeBtn_png,goToSee_png,timeTop_jpg,stratBg_jpg,noStartBg_jpg",
"name": "preload" "name": "preload"
}, },
{ {
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
"name": "msg_panel" "name": "msg_panel"
}, },
{ {
"keys": "ruleBtn_png,prizeBtn_png,logo_png,hint_png,card_3_jpg,card_2_jpg,card_1_jpg,playBtn_png,timeBg_png,stratBg_jpg,selection_3_jpg,selection_2_jpg,selection_1_jpg", "keys": "ruleBtn_png,logo_png,card_3_jpg,card_2_jpg,card_1_jpg,timeBg_png,selection_3_jpg,selection_2_jpg,selection_1_jpg",
"name": "start_scene" "name": "start_scene"
}, },
{ {
...@@ -21,11 +21,11 @@ ...@@ -21,11 +21,11 @@
"name": "rule_panel" "name": "rule_panel"
}, },
{ {
"keys": "endHintBg_png,box_png,noStartBg_jpg,toastBtn_png,title1_png", "keys": "endHintBg_png,box_png,toastBtn_png,title1_png",
"name": "toast_panel" "name": "toast_panel"
}, },
{ {
"keys": "prizeBg_png,noPrizeBg_png,goToSee_png,chooseBg_png", "keys": "prizeBg_png,noPrizeBg_png,chooseBg_png",
"name": "prize_panel" "name": "prize_panel"
} }
], ],
...@@ -55,11 +55,6 @@ ...@@ -55,11 +55,6 @@
"type": "image", "type": "image",
"name": "logo_png" "name": "logo_png"
}, },
{
"url": "assets/start_scene/prizeBtn.png",
"type": "image",
"name": "prizeBtn_png"
},
{ {
"url": "assets/start_scene/ruleBtn.png", "url": "assets/start_scene/ruleBtn.png",
"type": "image", "type": "image",
...@@ -75,11 +70,6 @@ ...@@ -75,11 +70,6 @@
"type": "image", "type": "image",
"name": "card_1_jpg" "name": "card_1_jpg"
}, },
{
"url": "assets/start_scene/playBtn.png",
"type": "image",
"name": "playBtn_png"
},
{ {
"url": "assets/start_scene/card_2.jpg", "url": "assets/start_scene/card_2.jpg",
"type": "image", "type": "image",
...@@ -90,11 +80,6 @@ ...@@ -90,11 +80,6 @@
"type": "image", "type": "image",
"name": "card_3_jpg" "name": "card_3_jpg"
}, },
{
"url": "assets/start_scene/hint.png",
"type": "image",
"name": "hint_png"
},
{ {
"url": "assets/start_scene/timeBg.png", "url": "assets/start_scene/timeBg.png",
"type": "image", "type": "image",
...@@ -115,21 +100,11 @@ ...@@ -115,21 +100,11 @@
"type": "image", "type": "image",
"name": "abNormal1_jpg" "name": "abNormal1_jpg"
}, },
{
"url": "assets/msg_panel/abNormal2.jpg",
"type": "image",
"name": "abNormal2_jpg"
},
{ {
"url": "assets/msg_panel/goGetBtn.png", "url": "assets/msg_panel/goGetBtn.png",
"type": "image", "type": "image",
"name": "goGetBtn_png" "name": "goGetBtn_png"
}, },
{
"url": "assets/msg_panel/goRecordBtn.png",
"type": "image",
"name": "goRecordBtn_png"
},
{ {
"url": "assets/msg_panel/msgKonwBtn.png", "url": "assets/msg_panel/msgKonwBtn.png",
"type": "image", "type": "image",
...@@ -150,11 +125,6 @@ ...@@ -150,11 +125,6 @@
"type": "image", "type": "image",
"name": "noTime_jpg" "name": "noTime_jpg"
}, },
{
"url": "assets/msg_panel/timeTop.jpg",
"type": "image",
"name": "timeTop_jpg"
},
{ {
"url": "assets/msg_panel/tryBtn.png", "url": "assets/msg_panel/tryBtn.png",
"type": "image", "type": "image",
...@@ -175,11 +145,6 @@ ...@@ -175,11 +145,6 @@
"type": "image", "type": "image",
"name": "selection_2_jpg" "name": "selection_2_jpg"
}, },
{
"url": "assets/toast_panel/noStartBg.jpg",
"type": "image",
"name": "noStartBg_jpg"
},
{ {
"url": "assets/toast_panel/toastBtn.png", "url": "assets/toast_panel/toastBtn.png",
"type": "image", "type": "image",
...@@ -190,11 +155,6 @@ ...@@ -190,11 +155,6 @@
"type": "image", "type": "image",
"name": "box_png" "name": "box_png"
}, },
{
"url": "assets/prize_panel/goToSee.png",
"type": "image",
"name": "goToSee_png"
},
{ {
"url": "assets/prize_panel/noPrizeBg.png", "url": "assets/prize_panel/noPrizeBg.png",
"type": "image", "type": "image",
...@@ -211,14 +171,59 @@ ...@@ -211,14 +171,59 @@
"name": "chooseBg_png" "name": "chooseBg_png"
}, },
{ {
"url": "assets/start_scene/stratBg.jpg", "url": "assets/toast_panel/title1.png",
"type": "image", "type": "image",
"name": "stratBg_jpg" "name": "title1_png"
}, },
{ {
"url": "assets/toast_panel/title1.png", "name": "goRecordBtn_png",
"type": "image", "type": "image",
"name": "title1_png" "url": "assets/msg_panel/goRecordBtn.png"
},
{
"name": "abNormal2_jpg",
"type": "image",
"url": "assets/msg_panel/abNormal2.jpg"
},
{
"name": "playBtn_png",
"type": "image",
"url": "assets/start_scene/playBtn.png"
},
{
"name": "card_png",
"type": "image",
"url": "assets/start_scene/card.png"
},
{
"name": "hint_png",
"type": "image",
"url": "assets/start_scene/hint.png"
},
{
"name": "prizeBtn_png",
"type": "image",
"url": "assets/start_scene/prizeBtn.png"
},
{
"name": "goToSee_png",
"type": "image",
"url": "assets/prize_panel/goToSee.png"
},
{
"name": "timeTop_jpg",
"type": "image",
"url": "assets/msg_panel/timeTop.jpg"
},
{
"name": "stratBg_jpg",
"type": "image",
"url": "assets/start_scene/stratBg.jpg"
},
{
"name": "noStartBg_jpg",
"type": "image",
"url": "assets/toast_panel/noStartBg.jpg"
} }
] ]
} }
\ No newline at end of file
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
</e:Button> </e:Button>
</e:Group> </e:Group>
<e:Group id="winPrizeGroup" anchorOffsetX="0" width="697" height="751" anchorOffsetY="0" horizontalCenter="0" y="114" visible="false"> <e:Group id="winPrizeGroup" anchorOffsetX="0" width="697" height="751" anchorOffsetY="0" horizontalCenter="0" y="114" visible="false">
<e:Image id="winPrizeBg" x="0" y="0" source="winPrizeBg_jpg"/> <e:Image id="winPrizeBg" source="winPrizeBg_jpg" x="75" y="154"/>
......
...@@ -7,14 +7,14 @@ ...@@ -7,14 +7,14 @@
<e:Image id="logo" x="18" y="212" source="logo_png"/> <e:Image id="logo" x="18" y="212" source="logo_png"/>
<e:Image id="title2" x="108" y="670" source="title1_png"/> <e:Image id="title2" x="108" y="670" source="title1_png" visible="false"/>
<e:Image id="hint" y="1260" source="hint_png" x="180"/> <e:Image id="hint" y="1260" source="hint_png" x="180" visible="false"/>
<e:Group id="noPrizeGroup" width="750" height="1624" x="0" y="-120" visible="false"> <e:Group id="noPrizeGroup" width="750" height="1624" x="0" y="-120" visible="false">
<e:Image id="box" x="34" y="891" source="box_png" scaleX="1" scaleY="1"/> <e:Image id="box" x="34" y="891" source="box_png" scaleX="1" scaleY="1"/>
<e:Image id="noPrizeBg" y="1112" scaleX="1" scaleY="1" source="noPrizeBg_png" x="105"/> <e:Image id="noPrizeBg" y="1112" scaleX="1" scaleY="1" source="noPrizeBg_png" x="105"/>
<e:Label id="npPrizeHintLab" text="网络开小差了\n请稍后重试哦~" y="1148" size="36" textColor="0xFFE98C" width="441" textAlign="center" scaleX="1" scaleY="1" lineSpacing="10" height="80" x="155"/> <e:Label id="npPrizeHintLab" text="网络开小差了\n请稍后重试哦~" y="1148" size="36" textColor="0xFFE98C" width="441" textAlign="center" scaleX="1" scaleY="1" lineSpacing="10" height="80" x="155"/>
</e:Group> </e:Group>
<e:Group id="prizeGroup" width="750" height="1624" y="-120" visible="false"> <e:Group id="prizeGroup" width="750" height="1624" y="-120">
<e:Image id="chooseBg" y="717" scaleX="1" scaleY="1" source="chooseBg_png" x="67" visible="false"/> <e:Image id="chooseBg" y="717" scaleX="1" scaleY="1" source="chooseBg_png" x="67" visible="false"/>
<e:Image id="prizeBg" y="879" scaleX="1" scaleY="1" source="prizeBg_png" x="218"/> <e:Image id="prizeBg" y="879" scaleX="1" scaleY="1" source="prizeBg_png" x="218"/>
<e:Image id="prizeIcon" y="892" scaleX="1" scaleY="1" x="248" source="" width="250" height="250" touchEnabled="false"/> <e:Image id="prizeIcon" y="892" scaleX="1" scaleY="1" x="248" source="" width="250" height="250" touchEnabled="false"/>
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<e:Image id="bg" width="750" x="0" source="stratBg_jpg" height="1624" scaleX="1" scaleY="1" verticalCenter="0"/> <e:Image id="bg" width="750" x="0" source="stratBg_jpg" height="1624" scaleX="1" scaleY="1" verticalCenter="0"/>
<e:Group id="pageGroup" width="750" height="1624" x="0" verticalCenter="0"> <e:Group id="pageGroup" width="750" height="1624" x="0" verticalCenter="0">
<e:Image id="logoPng" x="18" y="259" source="logo_png" scaleX="1" scaleY="1"/> <e:Image id="logoPng" x="18" y="259" source="logo_png" scaleX="1" scaleY="1"/>
<e:Group id="cardGroup_1" width="224" height="320" x="134" y="951" touchEnabled="false" anchorOffsetX="112" anchorOffsetY="160" name="1"> <e:Group id="cardGroup_1" width="224" height="320" x="134" y="951" touchEnabled="false" anchorOffsetX="112" anchorOffsetY="160" name="1" visible="false">
<e:Image id="card_1" x="0" y="0" name="card" source="card_1_jpg"/> <e:Image id="card_1" x="0" y="0" name="card" source="card_1_jpg"/>
<e:Button id="playBtn_1" label="" x="16" y="259"> <e:Button id="playBtn_1" label="" x="16" y="259">
<e:skinName> <e:skinName>
...@@ -16,9 +16,9 @@ ...@@ -16,9 +16,9 @@
</e:skinName> </e:skinName>
</e:Button> </e:Button>
</e:Group> </e:Group>
<e:Group id="cardGroup_2" width="224" height="320" x="377" y="951" touchEnabled="false" anchorOffsetX="112" anchorOffsetY="160" name="2"> <e:Group id="cardGroup_2" touchEnabled="false" name="2" width="616" height="608" anchorOffsetX="308" anchorOffsetY="304" x="375" y="939">
<e:Image id="card_2" x="0" y="0" name="card" source="card_2_jpg"/> <e:Image id="card_2" name="card" source="card_png"/>
<e:Button id="playBtn_2" label="" x="16" y="259"> <e:Button id="playBtn_2" label="" x="193" y="470">
<e:skinName> <e:skinName>
<e:Skin states="up,down,disabled"> <e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="playBtn_png" source.down="playBtn_png" source.disabled="playBtn_png"/> <e:Image width="100%" height="100%" source="playBtn_png" source.down="playBtn_png" source.disabled="playBtn_png"/>
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
</e:skinName> </e:skinName>
</e:Button> </e:Button>
</e:Group> </e:Group>
<e:Group id="cardGroup_3" width="224" height="320" x="621" y="951" touchEnabled="false" anchorOffsetX="112" anchorOffsetY="160" name="3"> <e:Group id="cardGroup_3" width="224" height="320" x="621" y="951" touchEnabled="false" anchorOffsetX="112" anchorOffsetY="160" name="3" visible="false">
<e:Image id="card_3" x="0" y="0" name="card" source="card_3_jpg"/> <e:Image id="card_3" x="0" y="0" name="card" source="card_3_jpg"/>
<e:Button id="playBtn_3" label="" x="16" y="259"> <e:Button id="playBtn_3" label="" x="16" y="259">
<e:skinName> <e:skinName>
...@@ -39,17 +39,17 @@ ...@@ -39,17 +39,17 @@
</e:Button> </e:Button>
</e:Group> </e:Group>
<e:Image id="selection_1" x="138" y="920" anchorOffsetX="315.5" anchorOffsetY="300.5" name="selection_1" source="selection_1_jpg" visible="false"/> <e:Image id="selection_1" x="138" y="920" anchorOffsetX="315.5" anchorOffsetY="300.5" name="selection_1" source="selection_1_jpg" visible="false"/>
<e:Image id="selection_2" x="365" y="919" anchorOffsetX="315.5" anchorOffsetY="300.5" name="selection_2" source="selection_2_jpg" visible="false"/> <e:Image id="selection_2" name="selection_2" source="card_png" anchorOffsetX="308" anchorOffsetY="304" x="375" y="939" visible="false"/>
<e:Image id="selection_3" x="594" y="920" anchorOffsetX="315.5" anchorOffsetY="300.5" name="selection_3" source="selection_3_jpg" visible="false"/> <e:Image id="selection_3" x="594" y="920" anchorOffsetX="315.5" anchorOffsetY="300.5" name="selection_3" source="selection_3_jpg" visible="false"/>
<e:Group id="timeGroup" width="331" height="50" y="1207" anchorOffsetX="0" anchorOffsetY="0" x="208" scaleX="1" scaleY="1"> <e:Group id="timeGroup" width="331" height="50" y="1207" anchorOffsetX="0" anchorOffsetY="0" x="208" scaleX="1" scaleY="1">
<e:Image id="timeBg" x="0" y="0" source="timeBg_png"/> <e:Image id="timeBg" x="0" y="0" source="timeBg_png"/>
<e:Label id="timeLab" text="还剩2次翻牌机会" size="24" textColor="0xffdf88" horizontalCenter="0" verticalCenter="0"/> <e:Label id="timeLab" text="还剩2次领取机会" size="24" textColor="0xffdf88" horizontalCenter="0" verticalCenter="0"/>
</e:Group> </e:Group>
<e:Image id="hintPng" x="175" y="1284" source="hint_png" scaleX="1" scaleY="1"/> <e:Image id="hintPng" x="175" y="1284" source="hint_png" scaleX="1" scaleY="1"/>
<e:Group id="aniGroup" width="224" height="320" touchEnabled="false" anchorOffsetX="112" anchorOffsetY="160" scaleX="1.5" scaleY="1.5" x="375" y="812" visible="false"> <e:Group id="aniGroup" width="616" height="608" touchEnabled="false" anchorOffsetX="308" anchorOffsetY="304" x="375" y="812" visible="false">
<e:Image id="card_0" x="0" y="0" name="card" source="card_1_jpg"/> <e:Image id="card_0" x="0" y="0" name="card" source="card_png"/>
<e:Button id="playBtn_0" label="" x="16" y="259"> <e:Button id="playBtn_0" label="" x="193" y="471">
<e:skinName> <e:skinName>
<e:Skin states="up,down,disabled"> <e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="playBtn_png" source.down="playBtn_png" source.disabled="playBtn_png"/> <e:Image width="100%" height="100%" source="playBtn_png" source.down="playBtn_png" source.disabled="playBtn_png"/>
......
...@@ -17,8 +17,8 @@ ...@@ -17,8 +17,8 @@
<e:Label id="hintLab" text="活动已结束" y="979" size="42" textColor="0xffe98c" width="409" x="167" textAlign="center"/> <e:Label id="hintLab" text="活动已结束" y="979" size="42" textColor="0xffe98c" width="409" x="167" textAlign="center"/>
<e:Image id="logo" x="18" y="212" source="logo_png"/> <e:Image id="logo" x="18" y="212" source="logo_png"/>
<e:Image id="title1" x="108" y="670" source="title1_png"/> <e:Image id="title1" x="108" y="670" source="title1_png" visible="false"/>
<e:Image id="hint" y="1260" source="hint_png" x="175"/> <e:Image id="hint" y="1260" source="hint_png" x="175" visible="false"/>
</e:Group> </e:Group>
</e:Group> </e:Group>
......
...@@ -252,17 +252,17 @@ export default class MsgPanel extends Panel { ...@@ -252,17 +252,17 @@ export default class MsgPanel extends Panel {
console.log("去领取"); console.log("去领取");
let curButton:eui.Button = e.target; let curButton:eui.Button = e.target;
PanelCtrl.instance.btnDelay(curButton); PanelCtrl.instance.btnDelay(curButton);
//url:"/pages/coupon/prize?id=" + DataManager.ins.doJoinData.orderId + "&receive=true" // url:"/pages/coupon/prize?id=" + DataManager.ins.doJoinData.orderId + "&receive=true"
window.location.href = 'https://film.qq.com/weixin/v3/asset/index.html#ticket'; // window.location.href = 'https://film.qq.com/weixin/v3/asset/index.html#ticket';
// if(this.mData && this.mData.url) if(this.mData && this.mData.url)
// { {
// console.log("跳转的url----",this.mData.url); console.log("跳转的url----",this.mData.url);
// window['wx'].miniProgram.navigateTo({url: this.mData.url}); window['wx'].miniProgram.navigateTo({url: this.mData.url});
// } }
// else else
// { {
// console.log("跳转的url出错",this.mData.url); console.log("跳转的url出错",this.mData.url);
// } }
} }
private onClickGoBuyBtn(){ private onClickGoBuyBtn(){
......
...@@ -109,7 +109,9 @@ export default class PrizePanel extends Panel { ...@@ -109,7 +109,9 @@ export default class PrizePanel extends Panel {
}else{ }else{
this.prizeGroup.visible = false; this.prizeGroup.visible = false;
this.noPrizeGroup.visible = true; this.noPrizeGroup.visible = true;
this.npPrizeHintLab.text = '很遗憾,无中奖纪录\n下次一定会有好运的哦~'; // this.npPrizeHintLab.text = '很遗憾,无领取纪录\n新人完成首刷任务,即可领取超前点播券哦~';
this.npPrizeHintLab.textFlow = [{text:"很遗憾,无领取纪录\n",style:{"size":34}},
{text:"新人完成首刷任务,即可领取超前点播券哦~",style:{"size":22}}]
} }
} }
private onClick(){ private onClick(){
...@@ -135,7 +137,7 @@ export default class PrizePanel extends Panel { ...@@ -135,7 +137,7 @@ export default class PrizePanel extends Panel {
SceneCtrl.instance.change(ModuleTypes.START_SCENE); SceneCtrl.instance.change(ModuleTypes.START_SCENE);
}else{ }else{
PanelCtrl.instance.show(ModuleTypes.MSG_PANEL,{msgType:PopupType.POPUPTYPE_ABNORMAL_2, PanelCtrl.instance.show(ModuleTypes.MSG_PANEL,{msgType:PopupType.POPUPTYPE_ABNORMAL_2,
content:["活动过于火爆,",'请稍后前往中奖记录查看是否中奖~']}); content:["活动过于火爆,",'请稍后前往“领取记录”查看是否领取成功~']});
Loading.instace.hide(); Loading.instace.hide();
} }
}.bind(this)); }.bind(this));
...@@ -144,6 +146,8 @@ export default class PrizePanel extends Panel { ...@@ -144,6 +146,8 @@ export default class PrizePanel extends Panel {
private goToSee_Tap(){ private goToSee_Tap(){
console.log("跳转链接",this.prizeData.url) console.log("跳转链接",this.prizeData.url)
window['wx'].miniProgram.navigateTo({url: this.prizeData.url}); window['wx'].miniProgram.navigateTo({url: this.prizeData.url});
// window['wx'].miniProgram.navigateTo({url:window['prizeurl']})
// window.location.href = 'https://film.qq.com/weixin/v3/asset/index.html#ticket'
//window['wx'].miniProgram.navigateTo({url: 'https://film.qq.com/weixin/v3/asset/index.html#ticket'}); //window['wx'].miniProgram.navigateTo({url: 'https://film.qq.com/weixin/v3/asset/index.html#ticket'});
//window.location.href = 'https://film.qq.com/weixin/v3/asset/index.html#ticket' //window.location.href = 'https://film.qq.com/weixin/v3/asset/index.html#ticket'
} }
......
...@@ -89,10 +89,10 @@ export default class StartScene1 extends Scene { ...@@ -89,10 +89,10 @@ export default class StartScene1 extends Scene {
super.onSkinComplete(); super.onSkinComplete();
this.bg.texture = this.bgTexture; this.bg.texture = this.bgTexture;
this.card_1.source = 'card_1_jpg'; this.card_1.source = 'card_1_jpg';
this.card_2.source = 'card_2_jpg'; this.card_2.source = 'card_png';
this.card_3.source = 'card_3_jpg'; this.card_3.source = 'card_3_jpg';
this.selection_1.source = 'selection_1_jpg'; this.selection_1.source = 'selection_1_jpg';
this.selection_2.source = 'selection_2_jpg'; this.selection_2.source = 'card_png';
this.selection_3.source = 'selection_3_jpg'; this.selection_3.source = 'selection_3_jpg';
this.once(egret.Event.ADDED_TO_STAGE, this.onLoad, this); this.once(egret.Event.ADDED_TO_STAGE, this.onLoad, this);
if (this.stage) { if (this.stage) {
...@@ -102,7 +102,7 @@ export default class StartScene1 extends Scene { ...@@ -102,7 +102,7 @@ export default class StartScene1 extends Scene {
private onLoad(): void { private onLoad(): void {
console.log('用户uid',window['CFG'].uid); console.log('用户uid',window['CFG'].uid);
this.timeLab.text = '还剩0次翻牌机会'; this.timeLab.text = '还剩0次领取机会';
this.playAniEnd = false; this.playAniEnd = false;
this.pollingEnd = false; this.pollingEnd = false;
//1暂定app渠道Banner 2暂定小程序首页Banner //1暂定app渠道Banner 2暂定小程序首页Banner
...@@ -142,13 +142,13 @@ export default class StartScene1 extends Scene { ...@@ -142,13 +142,13 @@ export default class StartScene1 extends Scene {
if(this.mData && this.mData.refresh == false) if(this.mData && this.mData.refresh == false)
{ {
let timeData = DataManager.ins.getData('remainTimes').data.remainTimes>0 ? DataManager.ins.getData('remainTimes').data.remainTimes : 0; let timeData = DataManager.ins.getData('remainTimes').data.remainTimes>0 ? DataManager.ins.getData('remainTimes').data.remainTimes : 0;
this.timeLab.text = `还剩${timeData}翻牌机会`; this.timeLab.text = `还剩${timeData}领取机会`;
}else if(this.mData && this.mData.refresh == 'abnormal'){ }else if(this.mData && this.mData.refresh == 'abnormal'){
PanelCtrl.instance.show(ModuleTypes.MSG_PANEL,{msgType:PopupType.POPUPTYPE_ABNORMAL_1, PanelCtrl.instance.show(ModuleTypes.MSG_PANEL,{msgType:PopupType.POPUPTYPE_ABNORMAL_1,
content:["活动过于火爆,",'请稍后再试~']}); content:["活动过于火爆,",'请稍后再试~']});
}else if(this.mData && this.mData.refresh == 'notime'){ }else if(this.mData && this.mData.refresh == 'notime'){
PanelCtrl.instance.show(ModuleTypes.MSG_PANEL,{msgType:PopupType.POPUPTYPE_NOTIME, PanelCtrl.instance.show(ModuleTypes.MSG_PANEL,{msgType:PopupType.POPUPTYPE_NOTIME,
content:["很抱歉,您无抽奖资格"]}); content:["很抱歉,您无领取资格"]});
} }
else{ else{
this.updateRemainTimes(); this.updateRemainTimes();
...@@ -167,7 +167,7 @@ export default class StartScene1 extends Scene { ...@@ -167,7 +167,7 @@ export default class StartScene1 extends Scene {
//更新数据 //更新数据
private updateRemainTimes(){ private updateRemainTimes(){
if(!this.activityTime()){ if(!this.activityTime()){
this.timeLab.text = '还剩0次翻牌机会'; this.timeLab.text = '还剩0次领取机会';
return; return;
} }
NetManager.ins.getRemainTimes(function(success,result){ NetManager.ins.getRemainTimes(function(success,result){
...@@ -180,13 +180,13 @@ export default class StartScene1 extends Scene { ...@@ -180,13 +180,13 @@ export default class StartScene1 extends Scene {
} }
if(success){ if(success){
if(result.data.remainTimes){ if(result.data.remainTimes){
this.timeLab.text = `还剩${result.data.remainTimes}翻牌机会`; this.timeLab.text = `还剩${result.data.remainTimes}领取机会`;
}else{ }else{
this.timeLab.text = '还剩0次翻牌机会'; this.timeLab.text = '还剩0次领取机会';
} }
}else{ }else{
this.timeLab.text = '还剩0次翻牌机会'; this.timeLab.text = '还剩0次领取机会';
switch (result.code) { switch (result.code) {
case '100197': case '100197':
PanelCtrl.instance.show(ModuleTypes.MSG_PANEL,{msgType:PopupType.POPUPTYPE_NOTIME, PanelCtrl.instance.show(ModuleTypes.MSG_PANEL,{msgType:PopupType.POPUPTYPE_NOTIME,
...@@ -285,7 +285,7 @@ export default class StartScene1 extends Scene { ...@@ -285,7 +285,7 @@ export default class StartScene1 extends Scene {
this.aniGroup.visible = true; this.aniGroup.visible = true;
egret.Tween.get(this.aniGroup,{loop:false}) egret.Tween.get(this.aniGroup,{loop:false})
.to({x:375,y:812,scaleX:1.5,scaleY:1.5},500,egret.Ease.backIn) .to({scaleX:1.5,scaleY:1.5},500,egret.Ease.backIn) //x:375,y:812,
.wait(300) .wait(300)
.call(()=>{ .call(()=>{
cardNode.visible = false; cardNode.visible = false;
...@@ -302,7 +302,7 @@ export default class StartScene1 extends Scene { ...@@ -302,7 +302,7 @@ export default class StartScene1 extends Scene {
.to({scaleX:-1.5},200) .to({scaleX:-1.5},200)
.to({scaleX:1.5},650,egret.Ease.cubicOut) .to({scaleX:1.5},650,egret.Ease.cubicOut)
.wait(300) .wait(300)
.to({x:cardNode.x,y:cardNode.y,scaleX:1,scaleY:1},500,egret.Ease.backIn) .to({scaleX:1,scaleY:1},500,egret.Ease.backIn)//x:cardNode.x,y:cardNode.y,
.call(()=>{ .call(()=>{
cardNode.visible = true; cardNode.visible = true;
this.aniGroup.visible = false; this.aniGroup.visible = false;
...@@ -357,14 +357,14 @@ export default class StartScene1 extends Scene { ...@@ -357,14 +357,14 @@ export default class StartScene1 extends Scene {
//次数已用完 //次数已用完
console.log('dojoin无次数') console.log('dojoin无次数')
PanelCtrl.instance.show(ModuleTypes.MSG_PANEL,{msgType:PopupType.POPUPTYPE_TIMETOPLIMIT, PanelCtrl.instance.show(ModuleTypes.MSG_PANEL,{msgType:PopupType.POPUPTYPE_TIMETOPLIMIT,
content:["每日消费1笔即可获得砸蛋机会哦,",'每日最多获得1次砸蛋机会~']}); content:["每日消费1笔即可获得领取机会哦,",'每日最多获得1次领取机会~']});
}else if(DataManager.ins.doJoinData.code == 'E1002090020'){ }else if(DataManager.ins.doJoinData.code == 'E1002090020'){
console.log("尚有抽奖流程未结束"); console.log("尚有领取流程未结束");
this.winRecordPopup(); this.winRecordPopup();
} }
else{//未中奖 else{//未中奖
console.log("抽奖出错"); console.log("领取出错");
this.networkErrorPopup(); this.networkErrorPopup();
} }
} }
...@@ -372,7 +372,7 @@ export default class StartScene1 extends Scene { ...@@ -372,7 +372,7 @@ export default class StartScene1 extends Scene {
} }
private winRecordPopup(){ private winRecordPopup(){
PanelCtrl.instance.show(ModuleTypes.MSG_PANEL,{msgType:PopupType.POPUPTYPE_ABNORMAL_2, PanelCtrl.instance.show(ModuleTypes.MSG_PANEL,{msgType:PopupType.POPUPTYPE_ABNORMAL_2,
content:["活动过于火爆,",'请稍后前往中奖记录查看是否中奖~']}); content:["活动过于火爆,",'请稍后前往“领取记录”查看是否领取成功~']});
} }
private networkErrorPopup(){ private networkErrorPopup(){
PanelCtrl.instance.show(ModuleTypes.MSG_PANEL,{msgType:PopupType.POPUPTYPE_ABNORMAL_1, PanelCtrl.instance.show(ModuleTypes.MSG_PANEL,{msgType:PopupType.POPUPTYPE_ABNORMAL_1,
...@@ -387,7 +387,7 @@ export default class StartScene1 extends Scene { ...@@ -387,7 +387,7 @@ export default class StartScene1 extends Scene {
this.submit(); this.submit();
let drawTime = DataManager.ins.getData('remainTimes').data.remainTimes - 1; let drawTime = DataManager.ins.getData('remainTimes').data.remainTimes - 1;
this.timeLab.text = `还剩${drawTime>0?drawTime:0}翻牌机会`; this.timeLab.text = `还剩${drawTime>0?drawTime:0}领取机会`;
} }
//捞奖 //捞奖
private submit():void{ private submit():void{
......
...@@ -4,6 +4,26 @@ ...@@ -4,6 +4,26 @@
"desc":"ok", "desc":"ok",
"timestamp":-3451244678853272, "timestamp":-3451244678853272,
"data":[ "data":[
{
"title":"6个月腾讯视频VIP",
"url":null,
"orderNum":"4234242",
"gmtCreate":"2019-09-18 09:10:23",
"imageUrl":""
},
{
"title":"5元兰博基尼优惠券",
"url":"/pages/coupon/prize?id=4234242",
"orderNum":"4234242",
"gmtCreate":"2019-09-18 09:11:23",
"imageUrl":""
},
{
"title":"兰博基尼车模",
"url":"/pages/common/address?id=123456",
"orderNum":"123456",
"gmtCreate":"2019-09-18 09:13:23",
"imageUrl":""
}
] ]
} }
\ 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