Skip to content

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

Merge branch 'hotfix20200330_' of gitlab2.dui88.com:wanghongyuan/xiaoxiaole into hotfix20200330_

parents 5ea37125 863ee601
Show whitespace changes
Inline Side-by-side
Showing with 59 additions and 35 deletions
egret/src/mainScene/MainScene.ts
View file @ bf9e686d
......@@ -414,7 +414,7 @@ export default class MainScene extends Scene {
//如果有节日的加
if (this.festivalTarget) svgas.push("redBombLight");
//到时候用炮台石头的替换todo
svgas.push("canno");
svgas.push("cannoblock");
for (let i = 0; i < svgas.length; i++) {
if (movieClips[svgas[i]]) continue;
......@@ -423,15 +423,16 @@ export default class MainScene extends Scene {
svgaParser.load(resPath + 'resource/assets/svgas/' + svgas[i] + ".svga", (videoItem) => {
var mv = new window["SVGA"].EgretMovieClip(videoItem);
mv.lockStep = true;
if(svgas[i]=="canno"){
if(svgas[i]=="cannoblock"){
// console.log("石头破裂动画",mv);
}
else if (svgas[i] != "bonusTime") {
if (svgas[i] != "bonusTime") {
mv.x = (750 - 520) / 2;
mv.y = 500;
}
mv.stop();
movieClips[svgas[i]] = mv;
let fun;
mv.addEventListener(egret.Event.COMPLETE, fun = function (e) {
e.target.stop()
......@@ -439,7 +440,6 @@ export default class MainScene extends Scene {
e.target.parent.removeChild(e.target)
}
}, this)
movieClips[svgas[i]] = mv;
}, function (error) {
// alert(error.message);
})
......@@ -452,7 +452,7 @@ export default class MainScene extends Scene {
var resPath = getResPath();
this.cannoEffect = new Array();
if (!svgaParser) svgaParser = new window["SVGA"].Parser();
var svgas = ["cannofire","cannolight","cannoparticle"];//新增大炮的动画
var svgas = ["cannofire1","cannolight","cannoparticle"];//新增大炮的动画
for(let i=0;i<arr.length;i++){
let icanno:Element = arr[i].ele;
......@@ -487,12 +487,13 @@ export default class MainScene extends Scene {
// mv.lockStep = true;
mv.gotoAndStop(1);
mv["cannoidx"] = i;
if(jsvgname=="cannofire"){
mv.x = icannoboxwid-6;
mv.y = -icannoboxhei*3/2+5;
if(jsvgname=="cannofire1"){
var mvwidth = 1009;
var mvheight = 100;
mv.x = icannoboxwid-8;
mv.y = (icannoboxhei-mvwidth)+180;
mv.rotation = 90;
// console.log("cannofireTotal-------",mv. totalFrames);
// console.log("cannofireTotal-------",mv,mv.totalFrames);
mv.addEventListener(egret.Event.ENTER_FRAME,this.listenCnfire,this);
}else if(jsvgname=="cannolight"){
var mvwidth = 400;
......@@ -520,7 +521,7 @@ export default class MainScene extends Scene {
listenCnfire(e){
var target = e.target;
var curframe = target.currentFrame;
if(curframe>=48){
if(curframe>=30){
// console.log("fire播放完成",target["cannoidx"]);
target.gotoAndStop(1);
if(target.parent){
......@@ -558,12 +559,12 @@ export default class MainScene extends Scene {
}
}else if(curframe==60){
var icannoidx = target["cannoidx"];
this.selectPlayCannoEffect(icannoidx,"cannofire");
this.selectPlayCannoEffect(icannoidx,"cannofire1");
}
}
selectPlayCannoFire(idx:number){
var arridx = this.getCannoArrByIdx(idx);
this.selectPlayCannoEffect(arridx,"cannofire");
this.selectPlayCannoEffect(arridx,"cannofire1");
}
/**
* 播放炮台动画
......@@ -1298,7 +1299,13 @@ export default class MainScene extends Scene {
onTap_quitBtn() {
PanelCtrl.instance.show("quit", { level: this.chapter });
}
// testchangeShow(num:number){
// var cannoele = this.cannoArr[0].ele;
// var cur = cannoele.cannoMoveClip.currentFrame;
// cur += num*10;
// cannoele.cannoMoveClip.gotoAndStop(cur);
// console.log(cannoele.cannoMoveClip.currentFrame);
// }
onTap_boomBtn() {
NetManager.ins.clickLog(getlogItem(7));
if (this.propBtnCon.boomBtn.propNumShow.count <= 0) {
......@@ -2563,7 +2570,7 @@ export default class MainScene extends Scene {
canno.fireCanno();
var cannoidx = canno.index;
var cannoarridx = this.getCannoArrByIdx(cannoidx);
this.selectPlayCannoEffect(cannoarridx,"cannoparticle");
// this.selectPlayCannoEffect(cannoarridx,"cannoparticle");
// setTimeout(()=>{
// this.eliminate();
......@@ -3721,16 +3728,17 @@ export default class MainScene extends Scene {
removeCannoBlock(index:number){
this.removeOperation(index);
//炮台石头的动效
var blockmv = movieClips["canno"];
var blockmv = movieClips["cannoblock"];
if(blockmv){
console.log("播放炮台石头的动效");
var blpos = Tool.getPositionByIndex(index);
var bwpos = this.elementContainer.localToGlobal(blpos[0],blpos[1]);
var blockwid = 116;
var blockhei = 116;
blockmv.x = bwpos.x-blockwid/2;
blockmv.y = bwpos.y-blockhei/2;
var blockwid = 112;
var blockhei = 97;
blockmv.x = bwpos.x-blockwid-5;
blockmv.y = bwpos.y-35;
this.addChild(blockmv);
// blockmv.gotoAndStop(1);
blockmv.gotoAndPlay(1,1);
}
}
......@@ -3810,6 +3818,9 @@ export default class MainScene extends Scene {
if (!this.lattices[index] || !this.lattices[index].element) return null
//先赋值指向
let ele = this.lattices[index].element;
let eletype = ele.type;
let eleffectype = ele.effectType;
//添加进emptys
this.emptys.push(index)
//从容器移除
......@@ -3821,6 +3832,7 @@ export default class MainScene extends Scene {
//返回下，有地方要用
//炮台充能
// console.log("消除元素类型",eletype,eleffectype);
for(let p=0;p<this.cannoArr.length;p++){
let pcannoidx = this.cannoArr[p].idx;
var isnext = Tool.checkNebByidx(pcannoidx,index);
......
egret/src/something/class/Element.ts
View file @ bf9e686d
......@@ -47,8 +47,16 @@ export class Element extends eui.Component {
cannoMoveClip:any;
// cannoCnClip:any;
cannoStat:number[] = [1,61,121,181,241,361];
// cannoStat:number[] = [1,71,131,191,241,361];
/**
* 1--初始
* 71--一格能量
* 131--两格
* 191--三格
* 351--开始蓄力
* 441--开始发射，
* 481--结束
*/
//尝试设置碰撞状态，如果之前被特效集中，那么可以设置碰撞状态。碰撞状态之后可以准备消除。
setFishNebFlag() {
if (this._fishState > 0) {
......@@ -216,7 +224,7 @@ export class Element extends eui.Component {
if(this.cannoMoveClip){
var endframe:number;
var curframe:number = this.cannoMoveClip.currentFrame;
if(curframe>=241){
if(curframe>=351){
if(_stat==3||_stat==2){
return;
}
......@@ -226,16 +234,16 @@ export class Element extends eui.Component {
endframe = 1;
}else if(_stat==1){
curframe = 61;
endframe = 121;
endframe = 71;
}else if(_stat==2){
curframe = 121
endframe = 181;
endframe = 131;
}else if(_stat==3){
curframe = 181;
endframe = 241;
endframe = 191;
}else if(_stat==4){
curframe = 241;
endframe = 361;
curframe = 351;
endframe = 481;
}
// console.log("ele播放大炮动画",curframe,endframe,_stat);
// this.cannoMoveClip.gotoAndPlay(curframe,true);
......@@ -513,17 +521,18 @@ export class Element extends eui.Component {
return;
}
if (!svgaParser) svgaParser = new window["SVGA"].Parser();
var svgas = ["canno"]//,"cannofire","cannoparticle","cannolight"];
var svgas = ["canno1"]//,"cannofire","cannoparticle","cannolight"];
for(let i=0;i<svgas.length;i++){
let mvname = svgas[i];
svgaParser.load(resPath + 'resource/assets/svgas/'+mvname+'.svga',(videoItem)=>{
if(mvname=="canno"){
if(mvname=="canno1"){
this.cannoMoveClip = new window["SVGA"].EgretMovieClip(videoItem);
// this.cannoMoveClip.lockStep = true;
var mvwidth = 102;
var mvheight = 116;
var mvwidth = 82;
var mvheight = 132;
this.cannoMoveClip.x = (this.cannoboxwid-mvwidth)/2;
this.cannoMoveClip.y = 0;
this.cannoMoveClip.y = -mvheight/4;
this.cannobox.addChild(this.cannoMoveClip);
this.cannoMoveClip.gotoAndStop(1);
this.cannoMoveClip.addEventListener(egret.Event.ENTER_FRAME,this.toFrameAni,this);
......@@ -538,8 +547,11 @@ export class Element extends eui.Component {
*/
toFrameAni(){
var curframe = this.cannoMoveClip.currentFrame;
if(curframe==441){//发射光柱
this.mainScene.selectPlayCannoFire(this.index);
}
if(curframe>=this.stopFrame){
if(this.stopFrame==361){
if(this.stopFrame==481){
this.cannoMoveClip.gotoAndStop(1);
return;
// console.log("炮台发射完毕");
......
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