Skip to content

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

1

parent a244e702
Show whitespace changes
Inline Side-by-side
Showing with 55 additions and 49 deletions
egret/index.html
View file @ 56cddaf9
......@@ -60,7 +60,7 @@
<script src="libs/fileSave.js"></script>
<img id="pic" style="width:100%;position: absolute;z-index: 999;display: none;"/>
<script>
window.fresp=990.00001;
window.fresp=0.00001;
// localStorage.clear();
window['testUrl'] = 'http://cuxiaoprexg.m.cnsuning.com/scms/cx521.html?activityId=SL446689024459878400&subactivityId=SUB446689681678090240&businessid=cx521';
window['hbRainTime'] = 30; // 红包雨倒计时
......
egret/resource/skins/RedBombTips2Skin.exml
View file @ 56cddaf9
......@@ -3,6 +3,6 @@
<e:Image id="rulebtn" source="redbagtips活动规则_png" y="814" horizontalCenter="0"/>
<e:Group id="btn" y="693.31" horizontalCenter="0">
<e:Image source="redbagtips按钮_png" y="0" x="0"/>
<e:Label text="找铃铛" verticalCenter="-10" horizontalCenter="0" size="38" strokeColor="0x0389ff" stroke="2" fontFamily="FZY3JW"/>
<e:Label text="找红包" verticalCenter="-10" horizontalCenter="0" size="38" strokeColor="0x0389ff" stroke="2" fontFamily="FZY3JW"/>
</e:Group>
</e:Skin>
\ No newline at end of file
egret/src/mainScene/MainScene.ts
View file @ 56cddaf9
......@@ -3099,7 +3099,8 @@ export default class MainScene extends Scene {
//完成了，发接口，到时需要修改，对于接口没成功的不设置
if (!this.festivalTargetNum) {
NetManager.ins.hc_redBombAward((success) => {
if (success) this.redBombPanelMark = true;
// if (success) // TODO 无论成功失败都弹，失败则为无奖励
this.redBombPanelMark = true;
});
}
}
......@@ -3120,7 +3121,7 @@ export default class MainScene extends Scene {
}
}, 56 / 60 * 1000)
}
//时间再调
//时间再调cd
// setTimeout(() => {
callback();
// }, 80)
......
egret/src/mapScene/MapScene.ts
View file @ 56cddaf9
......@@ -31,6 +31,7 @@ import ActIcon from "./icon/ActIcon";
import { NetName } from "../../libs/tw/enum/NetName";
import TaskCenterIcon from "./icon/TaskCenterIcon";
import HbBombIcon from "./icon/HbBombIcon";
import { createEffect1MovieClip } from "../effect/createEffect1";
let doHelpFlag = false;
// let doScratchHelpFlag = false;
......
egret/src/mapScene/RedBagAni.ts
View file @ 56cddaf9
......@@ -26,7 +26,7 @@ export default class RedBagAni {
}
export const createRedBagIcon = (parent)=>{
const icon = RES.getRes('mapredbagicom2_png');
const icon = RES.getRes('mapredbagicom_png'); /// TODO 洒出的图片
const bmp = new egret.Bitmap(icon);
bmp.anchorOffsetX=32;
bmp.anchorOffsetY=33;
......
egret/src/panels/RedBombAlertPanel.ts
View file @ 56cddaf9
......@@ -15,6 +15,8 @@ export default class RedBombAlertPanel extends Panel {
public numsbg:eui.Image;
public propnums:eui.Label;
private alertHeight = 100; // TODO 高度修改
async start(data) {
super.start();
......@@ -28,7 +30,7 @@ export default class RedBombAlertPanel extends Panel {
egret.Tween.get(this['group']).wait(1500).to({alpha: 1}, 300);
loadSvga(getResPath() + 'resource/assets/svgas/redbomb.svga').then(async (mv: any) => {
this.addChild(mv);
mv.y = -200;
mv.y = this.alertHeight;
mv.once(egret.Event.COMPLETE, () => {
mv.stop();
this.removeChild(mv);
......@@ -45,7 +47,7 @@ export default class RedBombAlertPanel extends Panel {
playNoPrizeAni() {
loadSvga(getResPath() + 'resource/assets/svgas/redbomb_noprize.svga').then(async (mv: any) => {
mv.y = -200;
mv.y = this.alertHeight;
//去掉文案
egret.Tween.get(this['group']).to({alpha: 0}, 300);
this.addChild(mv);
......@@ -69,7 +71,7 @@ export default class RedBombAlertPanel extends Panel {
playPrizeAni() {
loadSvga(getResPath() + 'resource/assets/svgas/redbomb_prize.svga').then(async (mv: any) => {
mv.y = -200;
mv.y = this.alertHeight;
//去掉文案
egret.Tween.get(this['group']).to({alpha: 0}, 300);
this.addChildAt(mv, 1);
......@@ -115,7 +117,7 @@ export default class RedBombAlertPanel extends Panel {
setTimeout(()=>{
this.numsgroup.visible = isShow;
}, 1700);
mv.setImage("img_11871", img);
mv.setImage("img_12064", img);
}, 100)
});
}
......
egret/src/something/anisCall/FesRedBombShowAni.ts
View file @ 56cddaf9
......@@ -5,30 +5,30 @@ import { RecoverName } from "../enum/RecoverName";
export class FesRedBombShowAni extends egret.DisplayObjectContainer {
// 红包
constructor() {
super();
var textureDown: egret.Texture = RES.getRes("fesRedBombSta1_png");
var down = new egret.Bitmap(textureDown);
down.x = -textureDown.textureWidth / 2;
down.y = -textureDown.textureHeight / 2;
this.addChild(down);
var textureUp: egret.Texture = RES.getRes("xingxingbi_png");
var up = new egret.Bitmap(textureUp);
up.x = -textureUp.textureWidth / 2; //-89
up.y = -100;
this.addChild(up);
}
// 铃铛
// constructor() {
// super()
// var textureDown: egret.Texture = RES.getRes("fesRedBombSta1_png");
// var textureDown: egret.Texture = RES.getRes("fesRedBombSta2_png");
// var down = new egret.Bitmap(textureDown);
// down.x = -textureDown.textureWidth / 2;
// down.y = -textureDown.textureHeight / 2;
// this.addChild(down);
// var textureUp: egret.Texture = RES.getRes("xingxingbi_png");
// var up = new egret.Bitmap(textureUp);
// up.x = -textureUp.textureWidth / 2; //-89
// up.y = -100;
// this.addChild(up);
// }
// 铃铛
constructor() {
super()
var textureDown: egret.Texture = RES.getRes("fesRedBombSta2_png");
var down = new egret.Bitmap(textureDown);
down.x = -textureDown.textureWidth / 2;
down.y = -textureDown.textureHeight / 2;
this.addChild(down);
}
play(position: number[], callback: Function) {
this.scaleX = this.scaleY = 0.29;
......
egret/src/something/anisCall/FesRedShootAni2.ts
View file @ 56cddaf9
......@@ -3,7 +3,6 @@ import { RecoverName } from "../enum/RecoverName";
import { Element } from "../class/Element";
import { Tool } from "../Tool";
import { ElementType } from "../enum/ElementType";
import { loadSvga } from "../../loadSvga";
export const stepPosition: number[] = [125, 115];
......
egret/src/something/class/Element.ts
View file @ 56cddaf9
......@@ -353,7 +353,8 @@ export class Element extends eui.Component {
else if (type == ElementType.FESTIVALELE_BIG) {
this.festivalEle = Pool.takeOut(RecoverName.FESTIVAL_ELE)
if (!this.festivalEle) {
this.festivalEle = new FestivalEle2();
this.festivalEle = new FestivalEle();
// this.festivalEle = new FestivalEle2();
} else {
this.festivalEle.reset();
}
......@@ -423,7 +424,8 @@ export class Element extends eui.Component {
this.festivalEle = this.festivalEle || Pool.takeOut(RecoverName.FESTIVAL_ELE)
if (!this.festivalEle) {
//新建
this.festivalEle = new FestivalEle2();
this.festivalEle = new FestivalEle();
// this.festivalEle = new FestivalEle2();
} else {
this.festivalEle.reset();
}
......
egret/src/something/logic/AiControl.ts
View file @ 56cddaf9
......@@ -165,10 +165,10 @@ export class AiControl {
let endIndex = six[a];
let lat = thisObj.lattices[endIndex];
let ele = lat.element;
// let fesRedShootAni: FesRedShootAni = Pool.takeOut(RecoverName.FESREDSHOOT_ANI);
// if (!fesRedShootAni) fesRedShootAni = new FesRedShootAni();
let fesRedShootAni: FesRedShootAni2 = Pool.takeOut(RecoverName.FESREDSHOOT_ANI2);
if (!fesRedShootAni) fesRedShootAni = new FesRedShootAni2();
let fesRedShootAni: FesRedShootAni = Pool.takeOut(RecoverName.FESREDSHOOT_ANI);
if (!fesRedShootAni) fesRedShootAni = new FesRedShootAni();
// let fesRedShootAni: FesRedShootAni2 = Pool.takeOut(RecoverName.FESREDSHOOT_ANI2);
// if (!fesRedShootAni) fesRedShootAni = new FesRedShootAni2();
setTimeout(() => {
thisObj.addChild(fesRedShootAni);
fesRedShootAni.play(p, ele, () => {
......@@ -184,21 +184,22 @@ export class AiControl {
})
}, 100 * a)
}
loadSvga(getResPath() + 'resource/assets/svgas/雪花炸开效果.svga').then(
(mv: any) => {
mv.stop();
setTimeout(() => {
mv.gotoAndPlay(1, true);
mv.x = p[0] - 350;
mv.y = p[1] - 350;
thisObj.addChild(mv);
}, 100);
mv.addEventListener(egret.Event.COMPLETE, () => {
mv.stop();
thisObj.removeChild(mv);
}, this);
}
)
// TODO 圣诞版需要！！！！！！
// loadSvga(getResPath() + 'resource/assets/svgas/雪花炸开效果.svga').then(
// (mv: any) => {
// mv.stop();
// setTimeout(() => {
// mv.gotoAndPlay(1, true);
// mv.x = p[0] - 350;
// mv.y = p[1] - 350;
// thisObj.addChild(mv);
// }, 100);
// mv.addEventListener(egret.Event.COMPLETE, () => {
// mv.stop();
// thisObj.removeChild(mv);
// }, this);
// }
// )
})
}
......
mock/happyclear/award.json
View file @ 56cddaf9
{
"success": true,
"success": false,
"code": "600016",
"desc": "游戏分数提交失败~如有疑问，请联系客服",
"timestamp": 1577072570382,
......
mock/happyclear/getTaskInfo.json
View file @ 56cddaf9
......@@ -31,7 +31,7 @@
"terminalType": "9",
"taskName": null,
"taskId": null,
"count": 1,
"count": 0,
"tips": "你好"
},
{
......
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