Skip to content

N
new_taobao
Commit 4ff24518 authored by wildfirecode13's avatar wildfirecode13
Browse files
Options

1

parent d98b08e5
Expand all Show whitespace changes
Inline Side-by-side
Showing with 2869 additions and 381 deletions
project/src/canvas/game/output.js
View file @ 4ff24518
......@@ -2195,15 +2195,6 @@ var Main = (function () {
_a.sent();
console.log("initLottieList完成");
FYGE.GDispatcher.dispatchEvent("loadEnd");
<<<<<<< HEAD
=======
TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.getAppData, {}, function (s, res) {
console.log('getAppData success,res', s, res);
});
TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.getActivityBaseInfoById, {}, function (s, res) {
console.log('getActivityBaseInfoById success,res', s, res);
});
>>>>>>> d7dfacb49210b7d977b14056cde24ca6994aee22
return [2];
}
});
......@@ -2499,7 +2490,7 @@ var Cat = (function (_super) {
console.log(this.catLottieArr);
this.initCat();
this.initDialog();
this.setCatAnimShow(1);
this.setCatAnimShow(0);
this.initEvents();
};
Cat.prototype.initCatLottieArr = function () {
......@@ -46852,6 +46843,7 @@ var MainScene = (function (_super) {
var _this = _super !== null && _super.apply(this, arguments) || this;
_this.bgUUID = [];
_this.maxEnergy = 1500;
_this.level = 0;
return _this;
}
MainScene.prototype.initUi = function () {
project/src/canvas/game/output.js.map
View file @ 4ff24518
This diff is collapsed.
project/src/canvas/game/released/output.js
View file @ 4ff24518
......@@ -2197,15 +2197,6 @@ var Main = (function () {
_a.sent();
console.log("initLottieList完成");
FYGE.GDispatcher.dispatchEvent("loadEnd");
<<<<<<< HEAD
=======
TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.getAppData, {}, function (s, res) {
console.log('getAppData success,res', s, res);
});
TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.getActivityBaseInfoById, {}, function (s, res) {
console.log('getActivityBaseInfoById success,res', s, res);
});
>>>>>>> d7dfacb49210b7d977b14056cde24ca6994aee22
return [2];
}
});
......@@ -2501,7 +2492,7 @@ var Cat = (function (_super) {
console.log(this.catLottieArr);
this.initCat();
this.initDialog();
this.setCatAnimShow(1);
this.setCatAnimShow(0);
this.initEvents();
};
Cat.prototype.initCatLottieArr = function () {
......@@ -46854,6 +46845,7 @@ var MainScene = (function (_super) {
var _this = _super !== null && _super.apply(this, arguments) || this;
_this.bgUUID = [];
_this.maxEnergy = 1500;
_this.level = 0;
return _this;
}
MainScene.prototype.initUi = function () {
taobao_mini/client/pages/pagecanvas/output.js
View file @ 4ff24518
This source diff could not be displayed because it is too large. You can view the blob instead.
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