Commit 1971dc05 authored by wildfirecode's avatar wildfirecode

1

parent 38c92dce
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
<script> <script>
// localStorage.clear(); // localStorage.clear();
localStorage.setItem('currentLv','Gift2'); localStorage.setItem('currentLv','Gift2');
localStorage.setItem('data',JSON.stringify({"IceCream":3,"Donut":3,"Egg":3,"Candy2":3,"Gift2":3})) localStorage.setItem('data',JSON.stringify({"IceCream":3,"Donut":3,"Egg":3,"Candy2":3,"Gift2":2}))
window['development'] = true; window['development'] = true;
var gameId = 1; var gameId = 1;
var CFG = { var CFG = {
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<e:Skin class="BoomPrizeSkin" width="750" height="1222" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing"> <e:Skin class="BoomPrizeSkin" width="750" height="1222" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<e:Image source="boomprizebg_png" y="147" horizontalCenter="0"/> <e:Image source="boomprizebg_png" y="66.69" horizontalCenter="0.5"/>
<e:Button id="closeBtn" label="" y="315" right="53"> <e:Button id="closeBtn" label="" y="234.69" right="53">
<e:skinName> <e:skinName>
<e:Skin states="up,down,disabled"> <e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="closeBtn_png" source.down="closeBtn_png" source.disabled="closeBtn_png"/> <e:Image width="100%" height="100%" source="closeBtn_png" source.down="closeBtn_png" source.disabled="closeBtn_png"/>
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
</e:Skin> </e:Skin>
</e:skinName> </e:skinName>
</e:Button> </e:Button>
<e:Button id="useBtn" label="" y="845" horizontalCenter="0"> <e:Button id="useBtn" label="" y="764.69" horizontalCenter="0.5">
<e:skinName> <e:skinName>
<e:Skin states="up,down,disabled"> <e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="getbtn_png" source.down="getbtn_png" source.disabled="getbtn_png"/> <e:Image width="100%" height="100%" source="getbtn_png" source.down="getbtn_png" source.disabled="getbtn_png"/>
...@@ -18,5 +18,5 @@ ...@@ -18,5 +18,5 @@
</e:skinName> </e:skinName>
</e:Button> </e:Button>
<e:Label text="{data.name}" y="810" horizontalCenter="0" width="508" textAlign="center" size="28" visible="false"/> <e:Label text="{data.name}" y="810" horizontalCenter="0" width="508" textAlign="center" size="28" visible="false"/>
<e:Image id="img" y="567.12" horizontalCenter="3.5" touchEnabled="true" source="{data.img}"/> <e:Image id="img" y="486.81" horizontalCenter="7.5" touchEnabled="true" source="{data.img}"/>
</e:Skin> </e:Skin>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<e:Skin class="CashBigPrizeSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing"> <e:Skin class="CashBigPrizeSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<e:Image source="cashbigprizebg_png" x="0" y="-38"/> <e:Image source="cashbigprizebg_png" x="0" y="-94"/>
<e:Button id="closeBtn" label="" y="264" right="55"> <e:Button id="closeBtn" label="" y="208" right="55">
<e:skinName> <e:skinName>
<e:Skin states="up,down,disabled" xmlns:w="http://ns.egret.com/wing"> <e:Skin states="up,down,disabled" xmlns:w="http://ns.egret.com/wing">
<e:Image width="100%" height="100%" source="closeBtn_png" source.down="closeBtn_png" source.disabled="closeBtn_png"/> <e:Image width="100%" height="100%" source="closeBtn_png" source.down="closeBtn_png" source.disabled="closeBtn_png"/>
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
</e:Skin> </e:Skin>
</e:skinName> </e:skinName>
</e:Button> </e:Button>
<e:Image id="useBtn" source="getbtn2_png" y="889" horizontalCenter="0"/> <e:Image id="useBtn" source="getbtn2_png" y="833" horizontalCenter="0"/>
<e:Label text="{data.name}" y="842" horizontalCenter="0" width="508" textAlign="center" size="28" visible="false"/> <e:Label text="{data.name}" y="842" horizontalCenter="0" width="508" textAlign="center" size="28" visible="false"/>
<e:Image id="img" y="558" horizontalCenter="0" touchEnabled="true" source="{data.img}"/> <e:Image id="img" y="502" horizontalCenter="11.5" touchEnabled="true" source="{data.img}"/>
</e:Skin> </e:Skin>
\ No newline at end of file
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
<e:Image id="guild2pic" source="垃圾桶_png" x="15.03" y="1230.06" touchEnabled="false" visible="false"/> <e:Image id="guild2pic" source="垃圾桶_png" x="15.03" y="1230.06" touchEnabled="false" visible="false"/>
<e:Label id="tips" text="点击左右按钮控制跷跷板的方向" width="100%" size="26" y="1122.7" x="0" textColor="0xffffff" verticalAlign="middle" textAlign="center" visible="false"/> <e:Label id="tips" text="点击左右按钮控制跷跷板的方向" width="100%" size="26" y="1122.7" x="0" textColor="0xffffff" verticalAlign="middle" textAlign="center" visible="false"/>
<e:Label id="tips2" text="炸弹放进垃圾桶就安全了哦~" size="26" y="1165.7" x="21" textColor="0xFFFFFF" verticalAlign="middle" textAlign="left" visible="false"/> <e:Label id="tips2" text="炸弹放进垃圾桶就安全了哦~" size="26" y="1165.7" x="21" textColor="0xFFFFFF" verticalAlign="middle" textAlign="left" visible="false"/>
<e:Button id="getitBtn" label="" x="497" y="1149.03" visible="false"> <e:Button id="getitBtn" label="" x="304.5" y="1237.5" visible="false">
<e:skinName> <e:skinName>
<e:Skin states="up,down,disabled"> <e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="getit_png" source.down="getit_png" source.disabled="getit_png"/> <e:Image width="100%" height="100%" source="getit_png" source.down="getit_png" source.disabled="getit_png"/>
...@@ -113,8 +113,8 @@ ...@@ -113,8 +113,8 @@
</e:skinName> </e:skinName>
</e:Button> </e:Button>
<e:Label id="countTxt" text="" width="100%" verticalAlign="middle" textAlign="center" size="26" y="1458.67" textColor="0xffd434"/> <e:Label id="countTxt" text="" width="100%" verticalAlign="middle" textAlign="center" size="26" y="1458.67" textColor="0xffd434"/>
<e:Image id="toast_failed" source="toast_failed_png" y="1077" x="375.5" alpha="0" anchorOffsetX="256.5" anchorOffsetY="86" touchEnabled="false"/> <e:Image id="toast_failed" source="toast_failed_png" y="1077" x="375.5" alpha="0" anchorOffsetX="256.5" anchorOffsetY="86" touchEnabled="false" locked="true"/>
<e:Image id="toast_success" source="toast_success_png" y="1101" x="375.5" alpha="0" anchorOffsetX="254.5" anchorOffsetY="99" touchEnabled="false"/> <e:Image id="toast_success" source="toast_success_png" y="1101" x="375.5" alpha="0" anchorOffsetX="254.5" anchorOffsetY="99" touchEnabled="false" locked="true"/>
</e:Group> </e:Group>
<e:Button id="recordBtn" label="奖品记录" y="16" scaleX="1" scaleY="1" right="23" visible="false"> <e:Button id="recordBtn" label="奖品记录" y="16" scaleX="1" scaleY="1" right="23" visible="false">
<e:skinName> <e:skinName>
......
...@@ -3,6 +3,7 @@ import BoomPrizePanel from "./BoomPrizePanel"; ...@@ -3,6 +3,7 @@ import BoomPrizePanel from "./BoomPrizePanel";
export default class CashBigPrizePanel extends BoomPrizePanel { export default class CashBigPrizePanel extends BoomPrizePanel {
get picBigWidth() { return 510+30 +20}; get picBigWidth() { return 300};
get skinKey() { return 'CashBigPrize' } get skinKey() { return 'CashBigPrize' }
get bigPicRatio() { return 300 / 300 }
} }
\ No newline at end of file
...@@ -115,7 +115,7 @@ const check = (_this: StartScene) => { ...@@ -115,7 +115,7 @@ const check = (_this: StartScene) => {
plugDoJoin(() => { plugDoJoin(() => {
Loading.instace.hide(); Loading.instace.hide();
if (plugIsWinning()) { if (plugIsWinning()) {
if (DataManager.ins.getPlugOrderStatusData.lottery.type == LotteryType.OBJECT) if (DataManager.ins.getPlugOrderStatusData.lottery.type == LotteryType.ALIPAY)
PanelCtrl.instance.show(ModuleTypes.CashBigPrize); PanelCtrl.instance.show(ModuleTypes.CashBigPrize);
else else
PanelCtrl.instance.show(ModuleTypes.CashPrizePanel); PanelCtrl.instance.show(ModuleTypes.CashPrizePanel);
......
...@@ -24,7 +24,7 @@ const ontick = () => { ...@@ -24,7 +24,7 @@ const ontick = () => {
}; };
if (pastFrame >= frameInterval) pastFrame = 0; if (pastFrame >= frameInterval) pastFrame = 0;
let i = Math.floor(Math.random() * types.length); let i = Math.floor(Math.random() * types.length);
if (tags == 0) { i = 1; tags = 1; frameInterval = 120; } if (tags == 0) { i = 1; tags = 1; frameInterval = 180; }
else if (tags == 1) { i = 0; tags = 2; } else if (tags == 1) { i = 0; tags = 2; }
else if (tags == 2) { else if (tags == 2) {
frameInterval = 60; frameInterval = 60;
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
"st_info_dpm_img": "{\"dpm\":\"1.4.1.0\",\"consumerId\":1,\"domain\":\"//activity.m.duiba.com.cn\",\"appId\":1,\"dcm\":\"104.29945.0.0\"}", "st_info_dpm_img": "{\"dpm\":\"1.4.1.0\",\"consumerId\":1,\"domain\":\"//activity.m.duiba.com.cn\",\"appId\":1,\"dcm\":\"104.29945.0.0\"}",
"tip": "一句话描述", "tip": "一句话描述",
"title": "腾讯视频会员8.8折", "title": "腾讯视频会员8.8折",
"type": "lucky", "type": "alipay",
"useBtnText": "马上使用", "useBtnText": "马上使用",
"validate": "2019-12-31" "validate": "2019-12-31"
}, },
......
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