Skip to content

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

1

parent efad7d2f
Hide whitespace changes
Inline Side-by-side
Showing with 55 additions and 15 deletions
egret/libs/new_wx/MainBase.ts
View file @ 51e3a491
...@@ -331,6 +331,7 @@ export default class MainBase extends eui.UILayer { ...@@ -331,6 +331,7 @@ export default class MainBase extends eui.UILayer {
RES.getResAsync("线条尾部炸开_0000" + i + "_png"); RES.getResAsync("线条尾部炸开_0000" + i + "_png");
} }
var arr = [ var arr = [
"alert_blood","alert_prop1","alert_prop2","alert_prop3","alert_yb",
"rectLatWhite", "rectLatWhite",
"redBombBStar","redBombYStar","redBombBSnow", "redBombBStar","redBombYStar","redBombBSnow",
"fesRedBigLight", "fesRedBombSta1", "fesRedBombSta2", "fesRedCap", "fesRedDown", "fesRedSmallLight", "fesRedUp", "xingxingbi", "fesRedBigLight", "fesRedBombSta1", "fesRedBombSta2", "fesRedCap", "fesRedDown", "fesRedSmallLight", "fesRedUp", "xingxingbi",
......
egret/resource/TextureMerger/redbombalert.tmproject
View file @ 51e3a491
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"redbombalert","version":5,"files":["../assets/redbombalert/redbombalert文案.png","../assets/redbombalert/redAlert_btn.png"]} {"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"redbombalert","version":5,"files":["../assets/redbombalert/redbombalert文案.png","../assets/redbombalert/redAlert_btn.png","../assets/redbombalert/alert_yb.png","../assets/redbombalert/alert_prop3.png","../assets/redbombalert/alert_prop2.png","../assets/redbombalert/alert_prop1.png","../assets/redbombalert/alert_blood.png"]}
\ No newline at end of file \ No newline at end of file
egret/resource/default.res.json
View file @ 51e3a491
...@@ -225,12 +225,8 @@ ...@@ -225,12 +225,8 @@
"name": "recharge" "name": "recharge"
}, },
{ {
"keys": "redbombalert文案_png,redAlert_btn_png", "keys": "redbombalert文案_png,redAlert_btn_png,alert_yb_png,alert_prop3_png,alert_prop2_png,alert_prop1_png,alert_blood_png",
"name": "redbombalert" "name": "redbombalert"
},
{
"keys": "线条尾部炸开_00000_png,线条尾部炸开_00001_png,线条尾部炸开_00002_png,线条尾部炸开_00003_png,线条尾部炸开_00005_png,线条尾部炸开_00004_png,线条尾部炸开_00006_png,线条尾部炸开_00008_png,线条尾部炸开_00007_png",
"name": "preload"
} }
], ],
"resources": [ "resources": [
...@@ -3920,6 +3916,31 @@ ...@@ -3920,6 +3916,31 @@
"url": "assets/mainScene/线条尾部炸开_00007.png", "url": "assets/mainScene/线条尾部炸开_00007.png",
"type": "image", "type": "image",
"name": "线条尾部炸开_00007_png" "name": "线条尾部炸开_00007_png"
},
{
"url": "assets/redbombalert/alert_prop1.png",
"type": "image",
"name": "alert_prop1_png"
},
{
"url": "assets/redbombalert/alert_yb.png",
"type": "image",
"name": "alert_yb_png"
},
{
"url": "assets/redbombalert/alert_prop2.png",
"type": "image",
"name": "alert_prop2_png"
},
{
"url": "assets/redbombalert/alert_prop3.png",
"type": "image",
"name": "alert_prop3_png"
},
{
"url": "assets/redbombalert/alert_blood.png",
"type": "image",
"name": "alert_blood_png"
} }
] ]
} }
\ No newline at end of file
egret/resource/skins/RedBombAlertSkin.exml
View file @ 51e3a491
<?xml version="1.0" encoding="utf-8"?> <?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: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="388.5" horizontalCenter="0"> <e:Group id="group" y="188.5" horizontalCenter="0">
<e:Image source="redbombalert文案_png" y="0" x="86"/> <e:Image source="redbombalert文案_png" y="0" x="86"/>
<e:Label id="tips" text="今日还有2个红包在其他关卡等你哦~" y="79" textColor="0xffe9c0" x="0"/> <e:Label id="tips" text="今日还有2个红包在其他关卡等你哦~" y="79" textColor="0xffe9c0" x="0"/>
</e:Group> </e:Group>
<e:Group id="btn" x="196" y="1100" visible="false"> <e:Group id="btn" x="196" y="900" visible="false">
<e:Image source="redAlert_btn_png" y="0" x="0"/> <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:Label id="btnLabel" text="愉快收下" y="30" size="38" stroke="2" strokeColor="0x2f7df9" fontFamily="FZY3JW" x="103"/>
</e:Group> </e:Group>
......
egret/src/panels/RedBombAlertPanel.ts
View file @ 51e3a491
...@@ -21,9 +21,11 @@ export default class RedBombAlertPanel extends Panel { ...@@ -21,9 +21,11 @@ export default class RedBombAlertPanel extends Panel {
this['tips'].text = `当日红包任务达成，明日再来~`; this['tips'].text = `当日红包任务达成，明日再来~`;
} }
this['group'].alpha = 0; this['group'].alpha = 0;
egret.Tween.get(this['group']).wait(1500).to({alpha: 1}, 300); egret.Tween.get(this['group']).wait(1500).to({alpha: 1}, 300);
loadSvga(getResPath() + 'resource/assets/svgas/redbomb.svga').then(async (mv: any) => { loadSvga(getResPath() + 'resource/assets/svgas/redbomb.svga').then(async (mv: any) => {
this.addChild(mv); this.addChild(mv);
mv.y = -200;
mv.once(egret.Event.COMPLETE, () => { mv.once(egret.Event.COMPLETE, () => {
mv.stop(); mv.stop();
this.removeChild(mv); this.removeChild(mv);
...@@ -40,6 +42,7 @@ export default class RedBombAlertPanel extends Panel { ...@@ -40,6 +42,7 @@ export default class RedBombAlertPanel extends Panel {
playNoPrizeAni() { playNoPrizeAni() {
loadSvga(getResPath() + 'resource/assets/svgas/redbomb_noprize.svga').then(async (mv: any) => { loadSvga(getResPath() + 'resource/assets/svgas/redbomb_noprize.svga').then(async (mv: any) => {
mv.y = -200;
//去掉文案 //去掉文案
egret.Tween.get(this['group']).to({alpha: 0}, 300); egret.Tween.get(this['group']).to({alpha: 0}, 300);
this.addChild(mv); this.addChild(mv);
...@@ -63,6 +66,7 @@ export default class RedBombAlertPanel extends Panel { ...@@ -63,6 +66,7 @@ export default class RedBombAlertPanel extends Panel {
playPrizeAni() { playPrizeAni() {
loadSvga(getResPath() + 'resource/assets/svgas/redbomb_prize.svga').then(async (mv: any) => { loadSvga(getResPath() + 'resource/assets/svgas/redbomb_prize.svga').then(async (mv: any) => {
mv.y = -200;
//去掉文案 //去掉文案
egret.Tween.get(this['group']).to({alpha: 0}, 300); egret.Tween.get(this['group']).to({alpha: 0}, 300);
this.addChild(mv); this.addChild(mv);
...@@ -82,9 +86,26 @@ export default class RedBombAlertPanel extends Panel { ...@@ -82,9 +86,26 @@ export default class RedBombAlertPanel extends Panel {
}, this); }, this);
}, this); }, this);
setTimeout(() => { setTimeout(() => {
mv.setImage("img_1951", DataManager.ins.getData('hc_redBombAward').data.option.img) let option = DataManager.ins.getData('hc_redBombAward').data.option;
}, 100) const {categoryType, num, propType, realValue} = option;// 2次数 3道具 4元宝 5实物 6优惠券 7虚拟商品
let img = option.img;
switch(categoryType) {
case 2:
img = 'alert_blood_png';
break;
case 3:
img = `alert_prop${propType}_png`;
break;
case 4:
img = 'alert_yb_png';
break;
default:
option.img = img;
break;
}
mv.setImage("img_11871", img);
}, 100)
}); });
} }
......
egret/src/something/anisCall/FesRedShootAni2.ts
View file @ 51e3a491
...@@ -19,9 +19,6 @@ export class FesRedShootAni2 extends egret.DisplayObjectContainer { ...@@ -19,9 +19,6 @@ export class FesRedShootAni2 extends egret.DisplayObjectContainer {
ef:eui.Image; ef:eui.Image;
tarr = []; tarr = [];
mv;
constructor() { constructor() {
super(); super();
......
mock/happyclear/award.json
View file @ 51e3a491
...@@ -7,14 +7,14 @@ ...@@ -7,14 +7,14 @@
"option": { "option": {
"id": "136", "id": "136",
"day": null, "day": null,
"categoryType": 7, "categoryType": 3,
"title": "虚拟商品", "title": "虚拟商品",
"rate": "100", "rate": "100",
"minValue": null, "minValue": null,
"maxValue": null, "maxValue": null,
"coinType": null, "coinType": null,
"realValue": null, "realValue": null,
"propType": null, "propType": 1,
"num": null, "num": null,
"img": "//yun.dui88.com/images/201912/5fyh67cjgh.jpeg", "img": "//yun.dui88.com/images/201912/5fyh67cjgh.jpeg",
"appItemId": 165699, "appItemId": 165699,
......
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