Skip to content

X
xiaoxiaole
Commit 9026ec28 authored by wildfirecode's avatar wildfirecode
Browse files
Options

1

parent 8392da50
Show whitespace changes
Inline Side-by-side
Showing with 44 additions and 26 deletions
egret/resource/assets/box/boxbg.png
View replaced file @ 8392da50 View file @ 9026ec28
egret/resource/assets/box/boxbg.png

291 KB | W: | H:

egret/resource/assets/box/boxbg.png

293 KB | W: | H:

egret/resource/assets/box/boxbg.png
egret/resource/assets/box/boxbg.png
egret/resource/assets/box/boxbg.png
egret/resource/assets/box/boxbg.png
  • 2-up
  • Swipe
  • Onion skin
egret/resource/assets/box/boxbtn.png
View replaced file @ 8392da50 View file @ 9026ec28
egret/resource/assets/box/boxbtn.png

20.7 KB | W: | H:

egret/resource/assets/box/boxbtn.png

33.7 KB | W: | H:

egret/resource/assets/box/boxbtn.png
egret/resource/assets/box/boxbtn.png
egret/resource/assets/box/boxbtn.png
egret/resource/assets/box/boxbtn.png
  • 2-up
  • Swipe
  • Onion skin
egret/resource/default.res.json
View file @ 9026ec28
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
"name": "blood" "name": "blood"
}, },
{ {
"keys": "boxbtn_png,boxbg_png", "keys": "boxbtn_png,boxbg_png,box_star_png",
"name": "box" "name": "box"
}, },
{ {
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
"name": "signprize" "name": "signprize"
}, },
{ {
"keys": "turnnoprize再来一次2_png,toast_png,sharenums_png,sharenums_fnt,share_btn2_png,share_btn1_png,prizePanelbg_png,nums3_png,nums3_fnt,nums2_png,nums2_fnt,nums_png,nums_fnt,lightani_png,exchangebtn_png,cutTimeFont_png,cutTimeFont_fnt,common_yuanbao_png,common_prop3_png,common_prop2_png,common_prop1_png,common_prizelight_png,common_money_png,common_blood_png,common_adbg_png,commmon_okbtn1_png,closeCommonBtn_png,btn_png,alertbg_png,朋友圈中间分享蒙层1_jpg,按钮 副本 4_png,按钮 副本 3_png,common_block_png,common_block_front_png,common_block_bg_yellow_png,common_block_bg_red_png,common_block_bg_blue_png,chocolate3_png,chocolate1_png,chocolate0_png,chocolate2_png,turnprize_icon3_png,turnprize_icon2_png,turnprize_icon1_png,commom_prop_bg_png,arrowbg_png,common_closebtn2_png,nums4_png,nums4_fnt,commom_share1_png,turnnoprize继续闯关2_png,commom_prop_bg2_png,combglight_png", "keys": "turnnoprize再来一次2_png,toast_png,sharenums_png,sharenums_fnt,share_btn2_png,share_btn1_png,prizePanelbg_png,nums3_png,nums3_fnt,nums2_png,nums2_fnt,nums_png,nums_fnt,lightani_png,exchangebtn_png,cutTimeFont_png,cutTimeFont_fnt,common_yuanbao_png,common_prop3_png,common_prop2_png,common_prop1_png,common_prizelight_png,common_money_png,common_blood_png,common_adbg_png,commmon_okbtn1_png,closeCommonBtn_png,btn_png,alertbg_png,朋友圈中间分享蒙层1_jpg,按钮 副本 4_png,按钮 副本 3_png,common_block_png,common_block_front_png,common_block_bg_yellow_png,common_block_bg_red_png,common_block_bg_blue_png,chocolate3_png,chocolate1_png,chocolate0_png,chocolate2_png,turnprize_icon3_png,turnprize_icon2_png,turnprize_icon1_png,commom_prop_bg_png,arrowbg_png,common_closebtn2_png,nums4_png,nums4_fnt,commom_share1_png,turnnoprize继续闯关2_png,combglight_png,common_box_btn_png",
"name": "common" "name": "common"
}, },
{ {
...@@ -4948,11 +4948,6 @@ ...@@ -4948,11 +4948,6 @@
"type": "sound", "type": "sound",
"name": "haha_mp3" "name": "haha_mp3"
}, },
{
"url": "assets/common/commom_prop_bg.png",
"type": "image",
"name": "commom_prop_bg2_png"
},
{ {
"url": "assets/recharge/recharge_icon.png", "url": "assets/recharge/recharge_icon.png",
"type": "image", "type": "image",
...@@ -5367,6 +5362,16 @@ ...@@ -5367,6 +5362,16 @@
"url": "assets/common/commom_share1.png", "url": "assets/common/commom_share1.png",
"type": "image", "type": "image",
"name": "commom_share1_png" "name": "commom_share1_png"
},
{
"url": "assets/box/box_star.png",
"type": "image",
"name": "box_star_png"
},
{
"url": "assets/common/common_box_btn.png",
"type": "image",
"name": "common_box_btn_png"
} }
] ]
} }
\ No newline at end of file
egret/resource/skins/Box2Skin.exml
View file @ 9026ec28
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<e:Skin class="Box2Skin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing"> <e:Skin class="Box2Skin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<w:Config id="16ccc954c14"/> <w:Config id="16ccc954c14"/>
<e:Component id="ad" y="921.52" skinName="ADSmallSkin" x="84" visible="false"/> <e:Component id="ad" y="839.52" skinName="ADSmallSkin" horizontalCenter="0" visible="false"/>
<e:Image y="163.76" horizontalCenter="0" source="box2_bg_png"/> <e:Image y="-6.24" horizontalCenter="0" source="box2_bg_png"/>
<e:Button id="closeBtn" label="" x="615.94" y="163.3"> <e:Button id="closeBtn" label="" x="599.8" y="181.3">
<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="closeCommonBtn_png" source.down="closeCommonBtn_png" source.disabled="closeCommonBtn_png"/> <e:Image width="100%" height="100%" source="closeCommonBtn_png" source.down="closeCommonBtn_png" source.disabled="closeCommonBtn_png"/>
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
</e:Skin> </e:Skin>
</e:skinName> </e:skinName>
</e:Button> </e:Button>
<e:Button id="close2Btn" label="" y="781" scaleX="1.1" scaleY="1.1" horizontalCenter="0"> <e:Button id="close2Btn" label="" y="685" scaleX="1.1" scaleY="1.1" horizontalCenter="0">
<e:skinName> <e:skinName>
<e:Skin states="up,down,disabled"> <e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="按钮 副本 4_png" source.down="按钮 副本 4_png" source.disabled="按钮 副本 4_png"/> <e:Image width="100%" height="100%" source="按钮 副本 4_png" source.down="按钮 副本 4_png" source.disabled="按钮 副本 4_png"/>
......
egret/resource/skins/BoxSkin.exml
View file @ 9026ec28
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<e:Skin class="BoxSkin" width="750" height="1205" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing"> <e:Skin class="BoxSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<w:Config id="16cc233ca3b"/> <w:Config id="16cc233ca3b"/>
<e:Component y="824.52" skinName="ADSmallSkin" x="84" visible="false"/> <e:Component y="854.52" skinName="ADSmallSkin" horizontalCenter="0.5" visible="false"/>
<e:Image source="boxbg_png" y="46.1" horizontalCenter="0" scale9Grid="93,413,564,43" height="783"/> <e:Image id="combglight" source="combglight_png" y="241" anchorOffsetX="375" anchorOffsetY="418" horizontalCenter="0"/>
<e:Image id="combglight1" source="combglight_png" y="241" anchorOffsetX="375" anchorOffsetY="418" horizontalCenter="0"/>
<e:Image source="boxbg_png" y="-147.9" scale9Grid="93,413,564,43" x="0"/>
<e:Image id="img" width="508" height="225" source="{data.url}" horizontalCenter="0" y="429.63" visible="false"/> <e:Image id="img" width="508" height="225" source="{data.url}" horizontalCenter="0" y="429.63" visible="false"/>
<e:Image id="img2" horizontalCenter="10.5" y="429.63" source="{data.url2}" scaleX="0.7" scaleY="0.7" visible="false"/> <e:Image id="img2" horizontalCenter="10.5" y="429.63" source="{data.url2}" scaleX="0.7" scaleY="0.7" visible="false"/>
<e:Image id="money" y="430.07" scaleX="0.6" scaleY="0.6" x="150" source="signprize元宝_png" visible="false"/> <e:Image id="money" y="430.07" scaleX="0.6" scaleY="0.6" x="150" source="signprize元宝_png" visible="false"/>
...@@ -20,7 +22,7 @@ ...@@ -20,7 +22,7 @@
</e:Skin> </e:Skin>
</e:skinName> </e:skinName>
</e:Button> </e:Button>
<e:Button id="close2Btn" label="" y="687.34" horizontalCenter="0"> <e:Button id="close2Btn" label="" y="716.99" 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="boxbtn_png" source.down="boxbtn_png" source.disabled="boxbtn_png"/> <e:Image width="100%" height="100%" source="boxbtn_png" source.down="boxbtn_png" source.disabled="boxbtn_png"/>
...@@ -28,5 +30,10 @@ ...@@ -28,5 +30,10 @@
</e:Skin> </e:Skin>
</e:skinName> </e:skinName>
</e:Button> </e:Button>
<e:Label id="tips" text="再收集23颗星星就可开启下个宝箱咯" y="376" textColor="0xf54500" fontFamily="FZY3JW" horizontalCenter="0" size="28"/> <e:Group id="tipswrapper" y="676.34" horizontalCenter="0.5">
<e:Label text="下次开启需要:" fontFamily="FZY3JW" size="28" textColor="0xc17343" x="0"/>
<e:Label id="tips" text="x23" textColor="0xC17343" fontFamily="FZY3JW" size="28" x="243"/>
<e:Image source="box_star_png" x="181.5" y="-13"/>
</e:Group>
<e:Image id="propbg" source="commom_prop_bg_png" x="113.02" y="403.62"/>
</e:Skin> </e:Skin>
\ No newline at end of file
egret/src/panels/Box2Panel.ts
View file @ 9026ec28
...@@ -11,7 +11,7 @@ export default class Box2Panel extends Panel { ...@@ -11,7 +11,7 @@ export default class Box2Panel extends Panel {
// }, this); // }, this);
this.showlog(); this.showlog();
// this.data.img = DataManager.ins.getData('getPlugOrderStatus').lottery.imgurl; // this.data.img = DataManager.ins.getData('getPlugOrderStatus').lottery.imgurl;
addAdComp(68,921.52,this,27) addAdComp(68,839.52,this,27)
} }
showlog() { showlog() {
NetManager.ins.showLog(getlogItem(27)); NetManager.ins.showLog(getlogItem(27));
......
egret/src/panels/BoxPanel.ts
View file @ 9026ec28
...@@ -7,6 +7,8 @@ import AdSmallComp from "../mapScene/AdSmallComp"; ...@@ -7,6 +7,8 @@ import AdSmallComp from "../mapScene/AdSmallComp";
export default class BoxPanel extends Panel { export default class BoxPanel extends Panel {
start(data) { start(data) {
this['propbg'].visible=false;
this['tipswrapper'].visible=false;
super.start(); super.start();
this['close2Btn'].addEventListener(egret.TouchEvent.TOUCH_TAP, () => { this['close2Btn'].addEventListener(egret.TouchEvent.TOUCH_TAP, () => {
NetManager.ins.clickLog(getlogItem(17)); NetManager.ins.clickLog(getlogItem(17));
...@@ -14,7 +16,7 @@ export default class BoxPanel extends Panel { ...@@ -14,7 +16,7 @@ export default class BoxPanel extends Panel {
}, this); }, this);
this.showlog(); this.showlog();
addAdComp(68, 919, this, 27); addAdComp(68, 854.52, this, 27);
const hc_openTreasureBox = DataManager.ins.getData('hc_openTreasureBox'); const hc_openTreasureBox = DataManager.ins.getData('hc_openTreasureBox');
const boxdata = hc_openTreasureBox.data; const boxdata = hc_openTreasureBox.data;
...@@ -23,12 +25,13 @@ export default class BoxPanel extends Panel { ...@@ -23,12 +25,13 @@ export default class BoxPanel extends Panel {
const homedata = getHomeData(); const homedata = getHomeData();
let num = homedata.nextRangeStarsNum - homedata.totalStars; let num = homedata.nextRangeStarsNum - homedata.totalStars;
if (num < 0) { if (num <= 0) {
num = 0; num = 0;
this['tips'].text =``; this['tips'].text =``;
} }
else { else {
this['tips'].text = `再收集${num}颗星星就可开启下个宝箱咯`; this['tips'].text = `x${num}`;
this['tipswrapper'].visible=true;
} }
} }
...@@ -41,19 +44,22 @@ export default class BoxPanel extends Panel { ...@@ -41,19 +44,22 @@ export default class BoxPanel extends Panel {
this['propnums'].text = 'x' + num; this['propnums'].text = 'x' + num;
} }
switch (categoryType) { switch (categoryType) {
case 2: case 2://blood
this['blood'].visible = true; this['blood'].visible = true;
this['numsgroup'].visible = true; this['numsgroup'].visible = true;
this['propbg'].visible=true;
break; break;
case 3: case 3://prop
this['numsgroup'].visible = true; this['numsgroup'].visible = true;
this['img2'].visible = true; this['img2'].visible = true;
this.data.url2 = `common_prop${propType}_png`; this.data.url2 = `common_prop${propType}_png`;
this['propbg'].visible=true;
break; break;
case 4: case 4://money
this['numsgroup'].visible = true; this['numsgroup'].visible = true;
this['money'].visible = true; this['money'].visible = true;
this['propnums2'].text = `x${realValue}`; this['propnums2'].text = `x${realValue}`;
this['propbg'].visible=true;
break; break;
default: default:
this['img'].visible = true; this['img'].visible = true;
......
egret/src/panels/RechargePanel.ts
View file @ 9026ec28
...@@ -153,7 +153,7 @@ export default class RechargePanel extends Panel { ...@@ -153,7 +153,7 @@ export default class RechargePanel extends Panel {
NetManager.ins.exchangeCoin((success, res) => { NetManager.ins.exchangeCoin((success, res) => {
if(!success) { if(!success) {
this.btn.touchEnabled = true; this.btn.touchEnabled = true;
showToast('网络开小差啦，请稍后再试'); showToast('抱歉，剩余云钻不足');
return; return;
} }
// const data = res.data; // const data = res.data;
......
mock/happyclear/home.json
View file @ 9026ec28
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
"timestamp": 1566885811031, "timestamp": 1566885811031,
"data": { "data": {
"wealth": 7960, "wealth": 7960,
"totalStars": 145, "totalStars": 150,
"levels": [ "levels": [
{ {
"levelNum": 1, "levelNum": 1,
......
mock/happyclear/openTreasureBox.json
View file @ 9026ec28
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
"data": { "data": {
"canReceiveTreasureBoxNum": 1110, "canReceiveTreasureBoxNum": 1110,
"nextRangeStarsNum": 200, "nextRangeStarsNum": 200,
"totalStars": 100, "totalStars": 200,
"isGetAllTreasureBox": false, "isGetAllTreasureBox": false,
"orderNum": null, "orderNum": null,
"option": { "option": {
......
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