Skip to content

X
xiaoxiaole
Commit 5f5767dd authored by wildfirecode's avatar wildfirecode
Browse files
Options

1

parent 30344d41
Show whitespace changes
Inline Side-by-side
Showing with 56 additions and 36 deletions
egret/resource/assets/box/boxbg.png
View replaced file @ 30344d41 View file @ 5f5767dd
egret/resource/assets/box/boxbg.png

84.5 KB | W: | H:

egret/resource/assets/box/boxbg.png

291 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 @ 30344d41 View file @ 5f5767dd
egret/resource/assets/box/boxbtn.png

20.1 KB | W: | H:

egret/resource/assets/box/boxbtn.png

20.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/skins/BoxSkin.exml
View file @ 5f5767dd
<?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="1205" 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="739.52" skinName="ADSmallSkin" x="84" visible="false"/> <e:Component y="824.52" skinName="ADSmallSkin" x="84" visible="false"/>
<e:Image source="boxbg_png" y="-32.9" horizontalCenter="0" scale9Grid="93,413,564,43" height="783"/> <e:Image source="boxbg_png" y="46.1" horizontalCenter="0" scale9Grid="93,413,564,43" height="783"/>
<e:Button id="closeBtn" label="" x="604.96" y="124.18"> <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="money" y="430.07" scaleX="0.6" scaleY="0.6" source="common_money_png" x="150" visible="false"/>
<e:Image id="blood" y="432.67" horizontalCenter="1.5" source="common_blood_png" scaleX="0.7" scaleY="0.7" visible="false"/>
<e:Group id="numsgroup" x="396.38" y="432.27" 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:Label id="propnums2" text="30" textColor="0x885037" bold="true" y="564.95" width="75" textAlign="right" x="287.16" visible="false"/>
<e:Button id="closeBtn" label="" x="604.96" y="250.18">
<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,14 +20,7 @@ ...@@ -11,14 +20,7 @@
</e:Skin> </e:Skin>
</e:skinName> </e:skinName>
</e:Button> </e:Button>
<e:Image id="img" width="508" height="225" source="{data.url}" horizontalCenter="0" y="311.1"/> <e:Button id="close2Btn" label="" y="687.34" horizontalCenter="0">
<e:Image id="money" source="signprize元宝_png" y="301.54" horizontalCenter="0" scaleX="0.8" scaleY="0.8" visible="false"/>
<e:Image id="blood" source="singprize体力_png" y="264.14" horizontalCenter="0" visible="false"/>
<e:Group id="numsgroup" x="396.38" y="309.74" 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="close2Btn" label="" y="597.34" 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="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"/>
...@@ -26,4 +28,5 @@ ...@@ -26,4 +28,5 @@
</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:Skin> </e:Skin>
\ No newline at end of file
egret/resource/skins/PrizeSkin.exml
View file @ 5f5767dd
...@@ -43,5 +43,5 @@ ...@@ -43,5 +43,5 @@
<e:Image id="pic1" source="点亮 副本 2_png" x="214.18" y="391.39" anchorOffsetX="81.82" anchorOffsetY="60.61" scaleX="-1"/> <e:Image id="pic1" source="点亮 副本 2_png" x="214.18" y="391.39" anchorOffsetX="81.82" anchorOffsetY="60.61" scaleX="-1"/>
<e:Image id="pic3" source="点亮 副本 2_png" x="528.24" y="394.89" scaleX="1" anchorOffsetX="71.76" anchorOffsetY="66.61"/> <e:Image id="pic3" source="点亮 副本 2_png" x="528.24" y="394.89" scaleX="1" anchorOffsetX="71.76" anchorOffsetY="66.61"/>
<e:Image id="pic2" source="点亮_png" y="388.01" anchorOffsetX="73.94" anchorOffsetY="74.73" x="375.94"/> <e:Image id="pic2" source="点亮_png" y="388.01" anchorOffsetX="73.94" anchorOffsetY="74.73" x="375.94"/>
<e:Label id="lvTxt" text="关卡1" y="276" textColor="0xff841b" horizontalCenter="0.5"/> <e:Label id="lvTxt" text="关卡1" y="276" textColor="0xff841b" horizontalCenter="0.5" fontFamily="FZY3JW"/>
</e:Skin> </e:Skin>
\ No newline at end of file
egret/resource/skins/SignPrizeSkin.exml
View file @ 5f5767dd
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<e:Skin class="SignPrizeSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing"> <e:Skin class="SignPrizeSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<w:Config id="16d5c2563cb"/> <w:Config id="16d5c2563cb"/>
<e:Component y="733.37" skinName="ADSmallSkin" x="84" visible="false"/> <e:Component y="779.37" skinName="ADSmallSkin" x="84" visible="false"/>
<e:Image source="singprizebg_png" y="54.85" horizontalCenter="0"/> <e:Image source="singprizebg_png" y="54.85" horizontalCenter="0"/>
<e:Image id="img" y="375.77" touchEnabled="true" source="{data.img}" width="512" height="240" scaleX="1" scaleY="1" horizontalCenter="0"/> <e:Image id="img" y="375.77" touchEnabled="true" source="{data.img}" width="512" height="240" scaleX="1" scaleY="1" horizontalCenter="0"/>
<e:Image id="money" y="366.4" horizontalCenter="0.5" scaleX="0.7" scaleY="0.7" source="common_money_png" visible="false"/> <e:Image id="money" y="366.4" horizontalCenter="0.5" scaleX="0.7" scaleY="0.7" source="common_money_png" visible="false"/>
......
egret/src/mapScene/MapScene.ts
View file @ 5f5767dd
...@@ -946,7 +946,7 @@ export default class MapScene extends Scene { ...@@ -946,7 +946,7 @@ export default class MapScene extends Scene {
const homeData = DataManager.ins.getData('hc_home').data; const homeData = DataManager.ins.getData('hc_home').data;
homeData.canReceiveTreasureBoxNum = boxdata.canReceiveTreasureBoxNum; homeData.canReceiveTreasureBoxNum = boxdata.canReceiveTreasureBoxNum;
homeData.nextRangeStarsNum = boxdata.nextRangeStarsNum; homeData.nextRangeStarsNum = boxdata.nextRangeStarsNum;
homeData.totalStarts = boxdata.totalStarts; homeData.totalStars = boxdata.totalStars;
homeData.isGetAllTreasureBox = boxdata.isGetAllTreasureBox; homeData.isGetAllTreasureBox = boxdata.isGetAllTreasureBox;
this.updateBox(); this.updateBox();
......
egret/src/panels/BoxPanel.ts
View file @ 5f5767dd
import Panel from "../../libs/new_wx/components/Panel"; import Panel from "../../libs/new_wx/components/Panel";
import { DataManager } from "../../libs/tw/manager/DataManager"; import { DataManager } from "../../libs/tw/manager/DataManager";
import { NetManager } from "../../libs/tw/manager/NetManager"; import { NetManager } from "../../libs/tw/manager/NetManager";
import getHomeData from "../getHomeData";
import { getlogItem } from "../Main"; import { getlogItem } from "../Main";
import AdSmallComp from "../mapScene/AdSmallComp"; import AdSmallComp from "../mapScene/AdSmallComp";
...@@ -13,19 +14,34 @@ export default class BoxPanel extends Panel { ...@@ -13,19 +14,34 @@ export default class BoxPanel extends Panel {
}, this); }, this);
this.showlog(); this.showlog();
addAdComp(84,739.52,this,27); addAdComp(84, 824.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;
this.updateOption(boxdata.option); this.updateOption(boxdata.option);
const homedata = getHomeData();
let num = homedata.nextRangeStarsNum - homedata.totalStars;
if (num < 0) {
num = 0;
this['tips'].text =``;
}
else {
this['tips'].text = `再收集${num}颗星星就可开启下个宝箱咯`;
}
} }
updateOption(option: any) { updateOption(option: any) {
const { categoryType, img, num, propType,realValue } = option;// 2次数 3道具 4元宝 5实物 6优惠券 7虚拟商品 const { categoryType, img, num, propType, realValue } = option;// 2次数 3道具 4元宝 5实物 6优惠券 7虚拟商品
this['propnums'].text = 'x1'; this['propnums'].text = 'x1';
if(num) this['propnums2'].text = 'x1';
if (num) {
this['propnums'].text = 'x' + num; this['propnums'].text = 'x' + num;
this['propnums2'].text = 'x' + num;
}
switch (categoryType) { switch (categoryType) {
case 2: case 2:
this['blood'].visible = true; this['blood'].visible = true;
...@@ -33,13 +49,14 @@ export default class BoxPanel extends Panel { ...@@ -33,13 +49,14 @@ export default class BoxPanel extends Panel {
break; break;
case 3: case 3:
this['numsgroup'].visible = true; this['numsgroup'].visible = true;
this['img'].visible = true; this['img2'].visible = true;
this.data.url = `turnprize_icon${propType}_png`; this.data.url2 = `common_prop${propType}_png`;
break; break;
case 4: case 4:
this['numsgroup'].visible = true; this['numsgroup'].visible = false;
this['propnums2'].visible = true;
this['money'].visible = true; this['money'].visible = true;
this['propnums'].text = 'x' + realValue; this['propnums2'].text = realValue;
break; break;
default: default:
this['img'].visible = true; this['img'].visible = true;
...@@ -52,15 +69,15 @@ export default class BoxPanel extends Panel { ...@@ -52,15 +69,15 @@ export default class BoxPanel extends Panel {
NetManager.ins.showLog(getlogItem(17)); NetManager.ins.showLog(getlogItem(17));
NetManager.ins.showLog(getlogItem(27)); NetManager.ins.showLog(getlogItem(27));
} }
protected get closeBtns(): eui.Button[] { return [this['closeBtn'],this['close2Btn']] } protected get closeBtns(): eui.Button[] { return [this['closeBtn'], this['close2Btn']] }
get skinKey() { return 'Box' } get skinKey() { return 'Box' }
} }
export const addAdComp = (x,y,parent:egret.DisplayObjectContainer,logid)=>{ export const addAdComp = (x, y, parent: egret.DisplayObjectContainer, logid) => {
const comp = new AdSmallComp(); const comp = new AdSmallComp();
comp.loadSkin(); comp.loadSkin();
comp.start({logid:logid}); comp.start({ logid: logid });
parent.addChildAt(comp,0); parent.addChildAt(comp, 0);
comp.x=x; comp.x = x;
comp.y=y; comp.y = y;
} }
egret/src/panels/SignPrizePanel.ts
View file @ 5f5767dd
...@@ -36,7 +36,7 @@ export default class SignPrizePanel extends Panel { ...@@ -36,7 +36,7 @@ export default class SignPrizePanel extends Panel {
if(prizeType=='coin') { if(prizeType=='coin') {
this['numsgroup'].visible=false; this['numsgroup'].visible=false;
} }
addAdComp(84,698.52,this,24); addAdComp(84,779.37,this,24);
this.showlog(); this.showlog();
} }
......
mock/happyclear/advert.json
View file @ 5f5767dd
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
"timestamp":1566199822308, "timestamp":1566199822308,
"data":{ "data":{
"popupAdvert":{ "popupAdvert":{
"enable":false, "enable":true,
"advertList":[ "advertList":[
{ {
"img":"http://yun.dui88.com/images/201909/lsh4tdkp5n.jpg", "img":"http://yun.dui88.com/images/201909/lsh4tdkp5n.jpg",
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
] ]
}, },
"mapAdvert":{ "mapAdvert":{
"enable":false, "enable":true,
"advertList":[ "advertList":[
{ {
"img":"http://yun.dui88.com/images/201909/lsh4tdkp5n.jpg", "img":"http://yun.dui88.com/images/201909/lsh4tdkp5n.jpg",
......
mock/happyclear/home.json
View file @ 5f5767dd
...@@ -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 @ 5f5767dd
...@@ -5,15 +5,15 @@ ...@@ -5,15 +5,15 @@
"timestamp": 1572332426229, "timestamp": 1572332426229,
"data": { "data": {
"canReceiveTreasureBoxNum": 1110, "canReceiveTreasureBoxNum": 1110,
"nextRangeStarsNum": 8, "nextRangeStarsNum": 200,
"totalStars": 6, "totalStars": 300,
"isGetAllTreasureBox": false, "isGetAllTreasureBox": false,
"orderNum": null, "orderNum": null,
"option": { "option": {
"id": "41", "id": "41",
"day": null, "day": null,
"realValue":87, "realValue":87,
"categoryType": 4, "categoryType": 2,
"title": "游戏次数2", "title": "游戏次数2",
"rate": "10", "rate": "10",
"minValue": null, "minValue": null,
......
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