Commit 4cd88964 authored by zhangjinzhou's avatar zhangjinzhou

代码暂存

parent a327deb9
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
function injectProps(p) { function injectProps(p) {
engine.injectProp(props, p); engine.injectProp(props, p);
} }
//# sourceMappingURL=props.js.map
function getTexture(uuid) { function getTexture(uuid) {
return engine.Texture.from(getAssetByUUID(uuid).uuid); return engine.Texture.from(getAssetByUUID(uuid).uuid);
...@@ -45,7 +44,6 @@ ...@@ -45,7 +44,6 @@
}); });
}); });
} }
//# sourceMappingURL=utils.js.map
var Tool = (function () { var Tool = (function () {
function Tool() { function Tool() {
...@@ -74,7 +72,6 @@ ...@@ -74,7 +72,6 @@
Tool.picPool = new Array(); Tool.picPool = new Array();
return Tool; return Tool;
}()); }());
//# sourceMappingURL=Tool.js.map
var qietu = (function (url, type1, rows, cols, parent, inshowurl) { return tslib.__awaiter(void 0, void 0, void 0, function () { var qietu = (function (url, type1, rows, cols, parent, inshowurl) { return tslib.__awaiter(void 0, void 0, void 0, function () {
var t, t1, setimgwid, mwid1, mhei1, picarr, picnames, startlix, addlix, startliy, addliy, twid1, thei1, r, startx, c, starty, nsprite, isprite, nsp, ispritename, e_1; var t, t1, setimgwid, mwid1, mhei1, picarr, picnames, startlix, addlix, startliy, addliy, twid1, thei1, r, startx, c, starty, nsprite, isprite, nsp, ispritename, e_1;
...@@ -163,7 +160,6 @@ ...@@ -163,7 +160,6 @@
} }
}); });
}); }); }); });
//# sourceMappingURL=qietu.js.map
var GameView = (function (_super) { var GameView = (function (_super) {
tslib.__extends(GameView, _super); tslib.__extends(GameView, _super);
...@@ -620,7 +616,6 @@ ...@@ -620,7 +616,6 @@
}; };
return GameWrapper; return GameWrapper;
}(engine.Container)); }(engine.Container));
//# sourceMappingURL=GameWrapper.js.map
function index (props) { function index (props) {
prepareProps(); prepareProps();
...@@ -628,7 +623,6 @@ ...@@ -628,7 +623,6 @@
var instance = new GameWrapper(); var instance = new GameWrapper();
return instance; return instance;
} }
//# sourceMappingURL=index.js.map
return index; return index;
......
This diff is collapsed.
...@@ -505,6 +505,7 @@ ...@@ -505,6 +505,7 @@
_this._seq = 1; _this._seq = 1;
_this.sptime = Date.now(); _this.sptime = Date.now();
_this.useBoom = false; _this.useBoom = false;
_this.haveffect = true;
_this._score = 0; _this._score = 0;
_this.inEliminate = false; _this.inEliminate = false;
_this.newSelect = false; _this.newSelect = false;
...@@ -627,14 +628,17 @@ ...@@ -627,14 +628,17 @@
}; };
GameView.prototype.playComp = function () { GameView.prototype.playComp = function () {
}; };
GameView.prototype.init = function (time, level, mode, mute) { GameView.prototype.init = function (time, level, mode, mute, haveffect) {
if (mute === void 0) { mute = 1; } if (mute === void 0) { mute = 1; }
if (haveffect === void 0) { haveffect = true; }
this.score = 0; this.score = 0;
this.gametime = time; this.gametime = time;
this.seq = 1; this.seq = 1;
this.level = level; this.level = level;
this.ingameover = false; this.ingameover = false;
this.mute = mute; this.mute = mute;
this.haveffect = haveffect;
console.log("动效播放", haveffect);
this.changeHomeShow(mode); this.changeHomeShow(mode);
this.initContainer(); this.initContainer();
this.sptime = Date.now(); this.sptime = Date.now();
...@@ -1215,11 +1219,13 @@ ...@@ -1215,11 +1219,13 @@
_this.container.removeChild(rcele); _this.container.removeChild(rcele);
MapData.recoverEle(rcele, rcetype); MapData.recoverEle(rcele, rcetype);
}); });
if ((this.haveffect + "") == "true") {
var oneffect = this.getOneEffect(); var oneffect = this.getOneEffect();
oneffect.x = rcelex; oneffect.x = rcelex;
oneffect.y = rceley; oneffect.y = rceley;
this.anicontainer.addChild(oneffect); this.anicontainer.addChild(oneffect);
oneffect.play(1); oneffect.play(1);
}
}; };
GameView.prototype.goDisplayAni = function (ielitype, ielix, ieliy) { GameView.prototype.goDisplayAni = function (ielitype, ielix, ieliy) {
var _this = this; var _this = this;
...@@ -2033,7 +2039,8 @@ ...@@ -2033,7 +2039,8 @@
var level = event.data.level; var level = event.data.level;
var mode = event.data.mode; var mode = event.data.mode;
var mute = event.data.mute; var mute = event.data.mute;
this._gameView.init(time, level, mode, mute); var playeffect = event.data.playeffect;
this._gameView.init(time, level, mode, mute, playeffect);
}; };
GameWrapper.prototype.reset = function (event) { GameWrapper.prototype.reset = function (event) {
var time = event.data.time; var time = event.data.time;
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -292,14 +292,16 @@ export default class GameView extends engine.Container { ...@@ -292,14 +292,16 @@ export default class GameView extends engine.Container {
// this.homeimgday.stop(1); // this.homeimgday.stop(1);
// this.homeimgnight.stop(1); // this.homeimgnight.stop(1);
} }
haveffect = true;
init(time,level,mode,mute=1){ init(time,level,mode,mute=1,haveffect=true){
this.score = 0; this.score = 0;
this.gametime = time; this.gametime = time;
this.seq = 1; this.seq = 1;
this.level = level; this.level = level;
this.ingameover = false; this.ingameover = false;
this.mute = mute; this.mute = mute;
this.haveffect = haveffect;
console.log("动效播放",haveffect);
this.changeHomeShow(mode); this.changeHomeShow(mode);
this.initContainer(); this.initContainer();
...@@ -960,12 +962,14 @@ export default class GameView extends engine.Container { ...@@ -960,12 +962,14 @@ export default class GameView extends engine.Container {
MapData.recoverEle(rcele,rcetype); MapData.recoverEle(rcele,rcetype);
}) })
if((this.haveffect+"")=="true"){
let oneffect = this.getOneEffect(); let oneffect = this.getOneEffect();
oneffect.x = rcelex; oneffect.x = rcelex;
oneffect.y = rceley; oneffect.y = rceley;
this.anicontainer.addChild(oneffect); this.anicontainer.addChild(oneffect);
oneffect.play(1); oneffect.play(1);
} }
}
//原地消失 //原地消失
goDisplayAni(ielitype,ielix,ieliy){ goDisplayAni(ielitype,ielix,ieliy){
// console.log("老原地消失"); // console.log("老原地消失");
......
...@@ -30,7 +30,8 @@ export class GameWrapper extends engine.Container { ...@@ -30,7 +30,8 @@ export class GameWrapper extends engine.Container {
let level = event.data.level; let level = event.data.level;
let mode = event.data.mode; let mode = event.data.mode;
let mute = event.data.mute; let mute = event.data.mute;
this._gameView.init(time,level,mode,mute); let playeffect = event.data.playeffect;
this._gameView.init(time,level,mode,mute,playeffect);
} }
reset(event:engine.Event){ reset(event:engine.Event){
// console.log("gamewrapper-reset",event); // console.log("gamewrapper-reset",event);
......
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