Skip to content

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

1

parent 2ec6f4ed
Show whitespace changes
Inline Side-by-side
Showing with 54 additions and 50 deletions
egret/resource/assets/ad/adbg.png
View replaced file @ 2ec6f4ed View file @ 5e4b48bf
egret/resource/assets/ad/adbg.png

181 KB | W: | H:

egret/resource/assets/ad/adbg.png

266 KB | W: | H:

egret/resource/assets/ad/adbg.png
egret/resource/assets/ad/adbg.png
egret/resource/assets/ad/adbg.png
egret/resource/assets/ad/adbg.png
  • 2-up
  • Swipe
  • Onion skin
egret/resource/default.res.json
View file @ 5e4b48bf
......@@ -81,7 +81,7 @@
"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",
"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",
"name": "common"
},
{
......@@ -173,7 +173,7 @@
"name": "turntable"
},
{
"keys": "turnprize_icon1_png,turnprize_icon2_png,turnprize_icon3_png,turprizebg_png,turprize继续闯关按钮_png",
"keys": "turprizebg_png,turprize继续闯关按钮_png",
"name": "turntableprize"
},
{
......@@ -2807,21 +2807,6 @@
"type": "image",
"name": "turntable_startbtn_png"
},
{
"url": "assets/turntableprize/turnprize_icon1.png",
"type": "image",
"name": "turnprize_icon1_png"
},
{
"url": "assets/turntableprize/turnprize_icon2.png",
"type": "image",
"name": "turnprize_icon2_png"
},
{
"url": "assets/turntableprize/turnprize_icon3.png",
"type": "image",
"name": "turnprize_icon3_png"
},
{
"url": "assets/turntableprize/turprizebg.png",
"type": "image",
......@@ -4947,6 +4932,26 @@
"url": "assets/recharge/recharge_icon.png",
"type": "image",
"name": "recharge_icon_png"
},
{
"url": "assets/common/turnprize_icon1.png",
"type": "image",
"name": "turnprize_icon1_png"
},
{
"url": "assets/common/turnprize_icon2.png",
"type": "image",
"name": "turnprize_icon2_png"
},
{
"url": "assets/common/turnprize_icon3.png",
"type": "image",
"name": "turnprize_icon3_png"
},
{
"url": "assets/common/commom_prop_bg.png",
"type": "image",
"name": "commom_prop_bg_png"
}
]
}
\ No newline at end of file
egret/resource/skins/ADSkin.exml
View file @ 5e4b48bf
<?xml version="1.0" encoding="utf-8"?>
<e:Skin class="AddSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<w:Config id="16db3bd8eb8"/>
<e:Image source="adbg_png" y="14.49" horizontalCenter="-11"/>
<e:Image id="adBtn" y="266.49" width="560" height="600" source="{data.img}" x="95"/>
<e:Button id="closeBtn" label="" y="198.88" horizontalCenter="284">
<e:Image source="adbg_png" y="-52.51" horizontalCenter="0"/>
<e:Image id="adBtn" y="437.49" width="504" height="536" source="{data.img}" horizontalCenter="0"/>
<e:Button id="closeBtn" label="" y="308.88" horizontalCenter="275.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,5 +11,4 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Rect id="mask" width="560" height="600" x="95" y="266.49" ellipseWidth="100" ellipseHeight="100"/>
</e:Skin>
\ No newline at end of file
egret/resource/skins/BackIndexSkin.exml
View file @ 5e4b48bf
<?xml version="1.0" encoding="utf-8"?>
<e:Skin class="BackSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<w:Config id="16e0235c541"/>
<e:Button id="closeBtn" label="" x="24" y="80">
<e:Button id="closeBtn" label="" y="57" horizontalCenter="0">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="backindex_png" source.down="backindex_png" source.disabled="backindex_png"/>
......
egret/resource/skins/BackSkin.exml
View file @ 5e4b48bf
<?xml version="1.0" encoding="utf-8"?>
<e:Skin class="BackSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<w:Config id="16e0235c541"/>
<e:Component y="848.94" skinName="ADSmallSkin" horizontalCenter="0" visible="false"/>
<e:Image y="-52.45" source="backbg_png" horizontalCenter="0" scale9Grid="93,550,564,42" height="910"/>
<e:Image source="backbg_png" scale9Grid="93,550,564,42" y="-105" horizontalCenter="0"/>
<e:Image y="-20.27" horizontalCenter="0" x="10" source=""/>
<e:Image id="img" width="508" height="225" source="{data.url}" horizontalCenter="0" y="377.76" visible="false"/>
<e:Image id="money" source="signprize元宝_png" y="368.2" horizontalCenter="0" scaleX="0.8" scaleY="0.8" visible="false"/>
<e:Image id="blood" source="singprize体力_png" y="330.8" horizontalCenter="0" visible="false"/>
<e:Group id="numsgroup" x="396.38" y="376.4" visible="false">
<e:Image id="blood" source="singprize体力_png" y="330.8" horizontalCenter="0"/>
<e:Group id="numsgroup" x="396.38" y="376.4">
<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>
......@@ -27,4 +26,5 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Component y="929.94" skinName="ADSmallSkin" x="68"/>
</e:Skin>
\ No newline at end of file
egret/src/panels/ADPanel.ts
View file @ 5e4b48bf
......@@ -14,7 +14,7 @@ export default class ADPanel extends Panel {
const { noticeAdvert } = hc_advert;
this.visible = noticeAdvert.enable;
this['adBtn'].mask = this['mask'];
// this['adBtn'].mask = this['mask'];
result = noticeAdvert.advertList;
if (Array.isArray(noticeAdvert.advertList)) {
......
egret/src/panels/BackPanel.ts
View file @ 5e4b48bf
......@@ -9,7 +9,7 @@ export default class BackPanel extends Panel {
start(data) {
super.start();
this.showlog();
addAdComp(84, 848.94, this,56)
addAdComp(68, 929.94, this,56);
const backData = DataManager.ins.getData('hc_getBackReward');
this.updateOption(backData.data);
NetManager.ins.showLog(getlogItem(56));
......
egret/src/panels/BoxPanel.ts
View file @ 5e4b48bf
......@@ -14,7 +14,7 @@ export default class BoxPanel extends Panel {
}, this);
this.showlog();
addAdComp(84, 824.52, this, 27);
addAdComp(68, 919, this, 27);
const hc_openTreasureBox = DataManager.ins.getData('hc_openTreasureBox');
const boxdata = hc_openTreasureBox.data;
......@@ -74,7 +74,7 @@ export const addAdComp = (x, y, parent: egret.DisplayObjectContainer, logid?) =>
const comp = new AdSmallComp();
comp.loadSkin();
comp.start({ logid: logid });
parent.addChildAt(comp, 0);
parent.addChild(comp);
comp.x = x;
comp.y = y;
}
\ No newline at end of file
egret/src/panels/RechargePanel.ts
View file @ 5e4b48bf
......@@ -134,7 +134,7 @@ export default class RechargePanel extends Panel {
}
this.setNumBtn();
this.numLabel.text = '' + this.nowNumber;
this.btnLabel.text = `-${this.nowNumber * 10}云钻`;
this.btnLabel.text = `${this.nowNumber * 10}云钻`;
setGlow2(this.btnLabel,0xff7038,1);
}
......
egret/src/panels/ShopPanel.ts
View file @ 5e4b48bf
......@@ -4,7 +4,7 @@ import { NetManager } from "../../libs/tw/manager/NetManager";
import { getlogItem } from "../Main";
import getHomeData from "../getHomeData";
const setGlow = (img: egret.DisplayObject, color: number,alpha:number) => {
const setGlow = (img: egret.DisplayObject, color: number, alpha: number) => {
// const color = 0x33CCFF; /// 光晕的颜色，十六进制，不包含透明度
// const alpha = 0.8; /// 光晕的颜色透明度，是对 color 参数的透明度设定。有效值为 0.0 到 1.0。例如，0.8 设置透明度值为 80%。
const blurX = 3; /// 水平模糊量。有效值为 0 到 255.0（浮点）
......@@ -19,7 +19,7 @@ const setGlow = (img: egret.DisplayObject, color: number,alpha:number) => {
}
export const setGlow2 = (img: egret.DisplayObject, color: number,alpha:number) => {
export const setGlow2 = (img: egret.DisplayObject, color: number, alpha: number) => {
// const color = 0x33CCFF; /// 光晕的颜色，十六进制，不包含透明度
// const alpha = 0.8; /// 光晕的颜色透明度，是对 color 参数的透明度设定。有效值为 0.0 到 1.0。例如，0.8 设置透明度值为 80%。
const blurX = 3; /// 水平模糊量。有效值为 0 到 255.0（浮点）
......@@ -51,19 +51,19 @@ export default class ShopPanel extends Panel {
this['price3Txt'].text = window['price4'];
this['price4Txt'].text = window['price5'];
this['price1Txt'].touchEnabled=false;
this['price2Txt'].touchEnabled=false;
this['price3Txt'].touchEnabled=false;
setGlow(this['price1Txt'],0xea5317,1);
setGlow(this['price2Txt'],0xea5317,1);
setGlow(this['price3Txt'],0xea5317,1);
this['price1Txt'].touchEnabled = false;
this['price2Txt'].touchEnabled = false;
this['price3Txt'].touchEnabled = false;
setGlow(this['price1Txt'], 0xea5317, 1);
setGlow(this['price2Txt'], 0xea5317, 1);
setGlow(this['price3Txt'], 0xea5317, 1);
this['moneyTxt'].text = getHomeData().wealth;
}
private goRecharge() {
NetManager.ins.clickLog(getlogItem(68));
PanelCtrl.instance.show('recharge', {from: 'Shop', data: null});
PanelCtrl.instance.show('recharge', { from: 'Shop', data: null });
}
destroy() {
......@@ -84,12 +84,12 @@ export default class ShopPanel extends Panel {
}
onBuy4() {
PanelCtrl.instance.show('ExchangePanel', {from: 'Shop', data: null});
PanelCtrl.instance.show('ExchangePanel', { from: 'Shop', data: null });
NetManager.ins.clickLog(getlogItem(40));
}
onBuy1() {
PanelCtrl.instance.show('Buy1', {from: 'Shop', data: null});
PanelCtrl.instance.show('Buy1', { from: 'Shop', data: null });
NetManager.ins.clickLog(getlogItem(9));
// this.buyBtn1.enabled = false;
// NetManager.ins.hc_exchange((success) => {
......@@ -103,7 +103,7 @@ export default class ShopPanel extends Panel {
}
onBuy2() {
PanelCtrl.instance.show('Buy2', {from: 'Shop', data: null});
PanelCtrl.instance.show('Buy2', { from: 'Shop', data: null });
NetManager.ins.clickLog(getlogItem(6));
// this.buyBtn2.enabled = false;
// NetManager.ins.hc_exchange((success) => {
......@@ -118,7 +118,7 @@ export default class ShopPanel extends Panel {
onBuy3() {
NetManager.ins.clickLog(getlogItem(12));
PanelCtrl.instance.show('Buy3', {from: 'Shop', data: null});
PanelCtrl.instance.show('Buy3', { from: 'Shop', data: null });
// this.buyBtn3.enabled = false;
// NetManager.ins.hc_exchange((success) => {
// this.buyBtn3.enabled = true;
......
mock/happyclear/exchange.json
View file @ 5e4b48bf
{
"success": true,
"code": "444444",
"success": false,
"code": "44444411",
"desc": "操作太频繁，请稍后再试",
"timestamp": 1576726906439,
"data": null
......
mock/happyclear/hasBackReward.json
View file @ 5e4b48bf
{
"success": 0,
"success": 1,
"code": "600074",
"desc": "用户未达到回归奖励领取条件",
"timestamp": 1578472496421,
......
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