Commit 8f0410f3 authored by Edwise's avatar Edwise 🍷

134

parent b0017f03
...@@ -46945,6 +46945,8 @@ var MainScene = (function (_super) { ...@@ -46945,6 +46945,8 @@ var MainScene = (function (_super) {
that.initCat(); that.initCat();
that.initEnergy(); that.initEnergy();
that.energyUp1(); that.energyUp1();
var a = Ins_1.Ins.initLabel({ text: "ergergergergerg", x: 300, y: 800 });
this.addChildAt(a, 999);
}; };
MainScene.prototype.initCat = function () { MainScene.prototype.initCat = function () {
var that = this; var that = this;
...@@ -47357,8 +47359,8 @@ var StartScene = (function (_super) { ...@@ -47357,8 +47359,8 @@ var StartScene = (function (_super) {
else { else {
Ins_1.Ins.catIsOut = false; Ins_1.Ins.catIsOut = false;
} }
Ins_1.Ins.hideLoading();
ctrls_1.changeScene(MainScene_1.MainScene); ctrls_1.changeScene(MainScene_1.MainScene);
Ins_1.Ins.hideLoading();
} }
else { else {
Ins_1.Ins.hideLoading(); Ins_1.Ins.hideLoading();
This diff is collapsed.
...@@ -46947,6 +46947,8 @@ var MainScene = (function (_super) { ...@@ -46947,6 +46947,8 @@ var MainScene = (function (_super) {
that.initCat(); that.initCat();
that.initEnergy(); that.initEnergy();
that.energyUp1(); that.energyUp1();
var a = Ins_1.Ins.initLabel({ text: "ergergergergerg", x: 300, y: 800 });
this.addChildAt(a, 999);
}; };
MainScene.prototype.initCat = function () { MainScene.prototype.initCat = function () {
var that = this; var that = this;
...@@ -47359,8 +47361,8 @@ var StartScene = (function (_super) { ...@@ -47359,8 +47361,8 @@ var StartScene = (function (_super) {
else { else {
Ins_1.Ins.catIsOut = false; Ins_1.Ins.catIsOut = false;
} }
Ins_1.Ins.hideLoading();
ctrls_1.changeScene(MainScene_1.MainScene); ctrls_1.changeScene(MainScene_1.MainScene);
Ins_1.Ins.hideLoading();
} }
else { else {
Ins_1.Ins.hideLoading(); Ins_1.Ins.hideLoading();
...@@ -10,5 +10,5 @@ export const ResJson = { ...@@ -10,5 +10,5 @@ export const ResJson = {
"name": "startScene" "name": "startScene"
} }
], ],
"path": "https://yun.duiba.com.cn/db_games/activity/babycare_xiaoxiao/1601176297/resource/" "path": "https://yun.duiba.com.cn/db_games/activity/babycare_xiaoxiao/1602246983/resource/"
} }
\ No newline at end of file
...@@ -102,6 +102,8 @@ export class MainScene extends Scene { ...@@ -102,6 +102,8 @@ export class MainScene extends Scene {
that.initEnergy(); that.initEnergy();
that.energyUp1(); that.energyUp1();
// that.initGuide(Ins.curScene > 3 ? 3 : Ins.curScene); // that.initGuide(Ins.curScene > 3 ? 3 : Ins.curScene);
var a = Ins.initLabel({text:"ergergergergerg",x:300,y:800});
this.addChildAt(a,999);
} }
/**初始化猫咪 */ /**初始化猫咪 */
......
...@@ -61,8 +61,8 @@ export class StartScene extends Scene { ...@@ -61,8 +61,8 @@ export class StartScene extends Scene {
} else { } else {
Ins.catIsOut = false; Ins.catIsOut = false;
} }
Ins.hideLoading();
changeScene(MainScene) changeScene(MainScene)
Ins.hideLoading();
}else{ }else{
Ins.hideLoading(); Ins.hideLoading();
Ins.showToast(r.message); Ins.showToast(r.message);
......
...@@ -27,7 +27,7 @@ App({ ...@@ -27,7 +27,7 @@ App({
*/ */
handleQuery(query) { handleQuery(query) {
const { activityId } = query; const { activityId } = query;
this.activityId = activityId || '5f7183e852bbded304b27d71'; this.activityId = activityId || '5f8022919da671f3b6d5fb14';
} }
}); });
...@@ -46947,6 +46947,8 @@ var MainScene = (function (_super) { ...@@ -46947,6 +46947,8 @@ var MainScene = (function (_super) {
that.initCat(); that.initCat();
that.initEnergy(); that.initEnergy();
that.energyUp1(); that.energyUp1();
// var a = Ins_1.Ins.initLabel({ text: "ergergergergerg", x: 300, y: 800 });
// this.addChildAt(a, 999);
}; };
MainScene.prototype.initCat = function () { MainScene.prototype.initCat = function () {
var that = this; var that = this;
...@@ -47359,8 +47361,8 @@ var StartScene = (function (_super) { ...@@ -47359,8 +47361,8 @@ var StartScene = (function (_super) {
else { else {
Ins_1.Ins.catIsOut = false; Ins_1.Ins.catIsOut = false;
} }
Ins_1.Ins.hideLoading();
ctrls_1.changeScene(MainScene_1.MainScene); ctrls_1.changeScene(MainScene_1.MainScene);
Ins_1.Ins.hideLoading();
} }
else { else {
Ins_1.Ins.hideLoading(); Ins_1.Ins.hideLoading();
This diff is collapsed.
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