Skip to content

X
xiaoxiaole
Commit ae492224 authored by 邱旭's avatar 邱旭
Browse files
Options

1

parent 0b985d36
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 17 deletions
egret/resource/skins/HbPrizeSkin.exml
View file @ ae492224
......@@ -4,9 +4,9 @@
<e:Image y="59.5" source="hbPrize_bg_png" horizontalCenter="0"/>
<e:Image id="img" width="508" height="225" source="{data.url}" y="466.96" horizontalCenter="0"/>
<e:Image id="money" source="signprize元宝_png" y="465.4" scaleX="0.8" scaleY="0.8" horizontalCenter="0" visible="false"/>
<e:Image id="blood" source="singprize体力_png" y="428" horizontalCenter="0" visible="false"/>
<e:Group id="numsgroup" x="397.38" y="473.6" visible="false">
<e:Image id="numsbg" source="signprize_numsbg_png" x="0" y="0"/>
<e:Image id="blood" source="singprize体力_png" y="428" horizontalCenter="0"/>
<e:Group id="numsgroup" x="411.02" y="470.56" scaleX="1.5" scaleY="1.5">
<e:Image id="numsbg" source="signprize_numsbg_png" x="0" y="0" scaleX="1" scaleY="1"/>
<e:Label id="propnums" text="X8" size="22" horizontalCenter="0" verticalCenter="0" verticalAlign="middle" textAlign="center"/>
</e:Group>
<e:Button id="ok_btn" label="" y="826" anchorOffsetX="150" anchorOffsetY="48" horizontalCenter="0">
......
egret/resource/skins/Prize2Skin.exml
View file @ ae492224
......@@ -35,7 +35,7 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Group id="numsgroup" x="393.38" y="373.38">
<e:Group id="numsgroup" x="407.38" y="365.38" scaleX="1.5" scaleY="1.5">
<e:Image id="numsbg0" source="signprize_numsbg_png" x="0" y="0"/>
<e:Label id="tips" text="X8" size="22" horizontalCenter="0" verticalCenter="0" verticalAlign="middle" textAlign="center"/>
</e:Group>
......
egret/resource/skins/PrizeSkin.exml
View file @ ae492224
......@@ -8,7 +8,7 @@
<e:Image id="img2" horizontalCenter="0" y="515.76" source="{data.url2}" scaleX="0.7" scaleY="0.7" visible="false"/>
<e:Image id="money" y="516.2" scaleX="0.6" scaleY="0.6" source="common_money_png" x="150" visible="false"/>
<e:Image id="blood" y="518.8" horizontalCenter="1.5" source="common_blood_png" scaleX="0.7" scaleY="0.7" visible="false"/>
<e:Group id="numsgroup" x="396.38" y="518.4" visible="false">
<e:Group id="numsgroup" x="410.38" y="513.4" scaleX="1.5" scaleY="1.5">
<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>
......
egret/resource/skins/RedBombAlertSkin.exml
View file @ ae492224
<?xml version="1.0" encoding="utf-8"?>
<e:Skin class="RedBombAlertSkin" width="750" height="1624" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<e:Group id="group" y="188.5" horizontalCenter="0">
<e:Group id="group" y="470" horizontalCenter="0">
<e:Image source="redbombalert文案_png" y="0" x="86"/>
<e:Label id="tips" text="今日还有2个红包在其他关卡等你哦~" y="79" textColor="0xffe9c0" x="0"/>
</e:Group>
......@@ -8,4 +8,8 @@
<e:Image source="redAlert_btn_png" y="0" x="0"/>
<e:Label id="btnLabel" text="愉快收下" y="30" size="38" stroke="2" strokeColor="0x2f7df9" fontFamily="FZY3JW" x="103"/>
</e:Group>
<e:Group id="numsgroup" x="410" y="265.6" scaleX="1.5" scaleY="1.5" visible="false">
<e:Image id="numsbg" source="signprize_numsbg_png" x="0" y="0" scaleX="1" scaleY="1"/>
<e:Label id="propnums" text="X8" size="22" horizontalCenter="0" verticalCenter="0" verticalAlign="middle" textAlign="center"/>
</e:Group>
</e:Skin>
\ No newline at end of file
egret/resource/skins/SignPrizeSkin.exml
View file @ ae492224
......@@ -7,7 +7,7 @@
<e:Image id="money" y="366.4" horizontalCenter="0.5" scaleX="0.7" scaleY="0.7" source="signprize元宝_png" visible="false"/>
<e:Label id="propnums2" text="30" textColor="0x885037" bold="true" y="525.64" width="75" textAlign="right" x="282.6" fontFamily="FZY3JW" visible="false"/>
<e:Image id="blood" y="368.16" horizontalCenter="0" source="common_blood_png" scaleX="0.7" scaleY="0.7" visible="false"/>
<e:Group id="numsgroup" x="396.38" y="367.12">
<e:Group id="numsgroup" x="396.38" y="367.12" scaleX="1.5" scaleY="1.5">
<e:Image id="numsbg" source="signprize_numsbg_png" x="0" y="0"/>
<e:Label id="nums" text="X8" size="22" horizontalCenter="0" verticalCenter="0" verticalAlign="middle" textAlign="center" fontFamily="FZY3JW"/>
</e:Group>
......
egret/resource/skins/TurntablePrizeSkin.exml
View file @ ae492224
......@@ -9,7 +9,7 @@
<e:Image id="img" width="508" height="225" source="{data.url}" horizontalCenter="0" y="337.76"/>
<e:Image id="money" source="signprize元宝_png" y="336.2" horizontalCenter="0" scaleX="0.8" scaleY="0.8" visible="false"/>
<e:Image id="blood" source="singprize体力_png" y="298.8" horizontalCenter="0" visible="false"/>
<e:Group id="numsgroup" x="396.38" y="344.4" visible="false">
<e:Group id="numsgroup" x="407.38" y="326.4" scaleX="1.5" scaleY="1.5" locked="true" 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>
......
egret/src/mapScene/MapScene.ts
View file @ ae492224
......@@ -215,12 +215,12 @@ export default class MapScene extends Scene {
for(let i = 0; i < taskInfoRes.data.length; i++) {
if(taskInfoRes.data[i].count > 0) {
panels.push('task');
localStorage.setItem('taskCenter' + window['CFG'].consumerId, 'false');
break;
}
}
}
}
localStorage.setItem('taskCenter' + window['CFG'].consumerId, 'false');
if(!readCache() && getHomeData().levels.length <= 0) { //引导
const guide = new GuideCon(() => {
......
egret/src/panels/RedBombAlertPanel.ts
View file @ ae492224
......@@ -7,10 +7,13 @@ import { getlogItem } from "../Main";
import { NetManager } from "../../libs/tw/manager/NetManager";
export default class RedBombAlertPanel extends Panel {
public group: eui.Group;
public tips: eui.Label;
public btn: eui.Group;
public btnLabel: eui.Label;
public group:eui.Group;
public tips:eui.Label;
public btn:eui.Group;
public btnLabel:eui.Label;
public numsgroup:eui.Group;
public numsbg:eui.Image;
public propnums:eui.Label;
async start(data) {
super.start();
......@@ -69,7 +72,7 @@ export default class RedBombAlertPanel extends Panel {
mv.y = -200;
//去掉文案
egret.Tween.get(this['group']).to({alpha: 0}, 300);
this.addChild(mv);
this.addChildAt(mv, 1);
setTimeout(() => {
this.btn.visible = true;
this.btnLabel.text = '愉快收下';
......@@ -89,21 +92,29 @@ export default class RedBombAlertPanel extends Panel {
let option = DataManager.ins.getData('hc_redBombAward').data.option;
const {categoryType, num, propType, realValue} = option;// 2次数 3道具 4元宝 5实物 6优惠券 7虚拟商品
let isShow = true;
let img = option.img;
switch(categoryType) {
case 2:
this.propnums.text ='x'+ num;
img = 'alert_blood_png';
break;
case 3:
this.propnums.text ='x'+ num;
img = `alert_prop${propType}_png`;
break;
case 4:
this.propnums.text ='x'+ realValue;
img = 'alert_yb_png';
break;
default:
isShow = false;
option.img = img;
break;
}
setTimeout(()=>{
this.numsgroup.visible = isShow;
}, 1700);
mv.setImage("img_11871", img);
}, 100)
});
......
egret/src/something/logic/AiControl.ts
View file @ ae492224
......@@ -26,7 +26,7 @@ const chickenNum: number = 4;
//节日大红包的小红包数量
export const fesELeSmallNum: number = 6;
export const fesELeSmallNum: number = 4;
export class AiControl {
private static _ins: AiControl
......
mock/happyclear/award.json
View file @ ae492224
......@@ -13,9 +13,9 @@
"minValue": null,
"maxValue": null,
"coinType": null,
"realValue": null,
"realValue": 50,
"propType": 1,
"num": null,
"num": 10,
"img": "//yun.dui88.com/images/201912/5fyh67cjgh.jpeg",
"appItemId": 165699,
"name": "yqq测试03-虚拟商品",
......
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