Commit 68b47ae8 authored by Edwise's avatar Edwise 🍷

更改加载背景图

parent 117d8857
...@@ -2069,7 +2069,13 @@ const resloadingList = { ...@@ -2069,7 +2069,13 @@ const resloadingList = {
ext: '.png', ext: '.png',
uuid: '4e3c6e09-0593-4818-976a-d73fe588580b', uuid: '4e3c6e09-0593-4818-976a-d73fe588580b',
url: 'https://yun.duiba.com.cn/spark/assets/25b18893820ee0b6998c527c41a8b58ee516ac31.png' url: 'https://yun.duiba.com.cn/spark/assets/25b18893820ee0b6998c527c41a8b58ee516ac31.png'
} },
'930f0483-03d4-4a5f-902f-8106bc86ceaa': {
name: 'guideBg1',
ext: '.png',
url: 'https://yun.duiba.com.cn/spark/assets/guideBg1.c5e259a926d486cd1236e224c35c492deb1b9b63.png',
uuid: '930f0483-03d4-4a5f-902f-8106bc86ceaa'
}
} }
/* harmony default export */ __webpack_exports__["default"] = (resloadingList); /* harmony default export */ __webpack_exports__["default"] = (resloadingList);
...@@ -2205,7 +2211,7 @@ var Ins = (function () { ...@@ -2205,7 +2211,7 @@ var Ins = (function () {
label.text = data.text ? data.text : ""; label.text = data.text ? data.text : "";
return label; return label;
}; };
Ins.recoverEnergy = 5 * 60 * 1000; Ins.recoverEnergy = 3 * 60 * 1000;
return Ins; return Ins;
}()); }());
exports.Ins = Ins; exports.Ins = Ins;
...@@ -46805,7 +46811,7 @@ var LoadingScene = (function (_super) { ...@@ -46805,7 +46811,7 @@ var LoadingScene = (function (_super) {
var that = this; var that = this;
that.x = (Ins_1.Ins.stageW - 750) >> 1; that.x = (Ins_1.Ins.stageW - 750) >> 1;
that.y = (Ins_1.Ins.stageH - 1624) >> 1; that.y = (Ins_1.Ins.stageH - 1624) >> 1;
that.bg = new FYGE.Sprite(RES_1.RES.getRes(resloadingList_1.default["42084cc4-390d-4eee-8392-fbbe2e59455e"].url)); that.bg = new FYGE.Sprite(RES_1.RES.getRes(resloadingList_1.default["930f0483-03d4-4a5f-902f-8106bc86ceaa"].url));
that.addChild(that.bg); that.addChild(that.bg);
that.cat = new FYGE.Sprite(RES_1.RES.getRes(resloadingList_1.default["4e3c6e09-0593-4818-976a-d73fe588580b"].url)); that.cat = new FYGE.Sprite(RES_1.RES.getRes(resloadingList_1.default["4e3c6e09-0593-4818-976a-d73fe588580b"].url));
that.addChild(that.cat); that.addChild(that.cat);
...@@ -46945,8 +46951,6 @@ var MainScene = (function (_super) { ...@@ -46945,8 +46951,6 @@ 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;
...@@ -47039,10 +47043,10 @@ var MainScene = (function (_super) { ...@@ -47039,10 +47043,10 @@ var MainScene = (function (_super) {
that.energyGroup.addChild(that.energyDeco); that.energyGroup.addChild(that.energyDeco);
that.energyDialog = Ins_1.Ins.initSprite("69009eb9-4593-4a43-a9d7-a6356ebd6d04", 174, -60); that.energyDialog = Ins_1.Ins.initSprite("69009eb9-4593-4a43-a9d7-a6356ebd6d04", 174, -60);
that.energyGroup.addChild(that.energyDialog); that.energyGroup.addChild(that.energyDialog);
that.energyDialogLabel = Ins_1.Ins.initLabel({ size: 26, text: "每5分钟恢复10点精力" }); that.energyDialogLabel = Ins_1.Ins.initLabel({ size: 26, text: "每3分钟恢复1点精力" });
that.energyDialog.addChild(that.energyDialogLabel); that.energyDialog.addChild(that.energyDialogLabel);
that.energyDialogLabel.x = (that.energyDialog.width - that.energyDialogLabel.textWidth) * 0.5; that.energyDialogLabel.x = (that.energyDialog.width - that.energyDialogLabel.textWidth) * 0.5;
that.energyDialogLabel.y = (that.energyDialog.height - that.energyDialogLabel.textHeight) * 0.5 - 2; that.energyDialogLabel.y = (that.energyDialog.height - that.energyDialogLabel.textHeight) * 0.5 - 6;
that.energyLabel = Ins_1.Ins.initLabel({ size: 26, y: 85 }); that.energyLabel = Ins_1.Ins.initLabel({ size: 26, y: 85 });
that.energyGroup.addChild(that.energyLabel); that.energyGroup.addChild(that.energyLabel);
var mask = new FYGE.Shape(); var mask = new FYGE.Shape();
...@@ -47359,11 +47363,10 @@ var StartScene = (function (_super) { ...@@ -47359,11 +47363,10 @@ var StartScene = (function (_super) {
else { else {
Ins_1.Ins.catIsOut = false; Ins_1.Ins.catIsOut = false;
} }
ctrls_1.changeScene(MainScene_1.MainScene);
Ins_1.Ins.hideLoading(); Ins_1.Ins.hideLoading();
ctrls_1.changeScene(MainScene_1.MainScene);
} }
else { else {
Ins_1.Ins.hideLoading();
Ins_1.Ins.showToast(r.message); Ins_1.Ins.showToast(r.message);
} }
}); });
...@@ -47595,11 +47598,6 @@ var MainSceneBtnUi = (function (_super) { ...@@ -47595,11 +47598,6 @@ var MainSceneBtnUi = (function (_super) {
MainSceneBtnUi.prototype.updateUserInfo = function () { MainSceneBtnUi.prototype.updateUserInfo = function () {
var that = this; var that = this;
var _a = Ins_1.Ins.userInfo, catName = _a.catName, happyCoin = _a.happyCoin, level = _a.level, avatar = _a.avatar, experience = _a.experience, experienceMax = _a.experienceMax; var _a = Ins_1.Ins.userInfo, catName = _a.catName, happyCoin = _a.happyCoin, level = _a.level, avatar = _a.avatar, experience = _a.experience, experienceMax = _a.experienceMax;
var type = avatar.substring(avatar.lastIndexOf(".") + 1, avatar.length);
var avatar1 = avatar;
if (type != 'png' && type != 'jpg') {
avatar1 = avatar + '.jpg';
}
that.catAvatar.texture = FYGE.Texture.fromUrl(avatar); that.catAvatar.texture = FYGE.Texture.fromUrl(avatar);
that.catAvatar.width = 52; that.catAvatar.width = 52;
that.catAvatar.height = 52; that.catAvatar.height = 52;
This diff is collapsed.
...@@ -2071,7 +2071,13 @@ const resloadingList = { ...@@ -2071,7 +2071,13 @@ const resloadingList = {
ext: '.png', ext: '.png',
uuid: '4e3c6e09-0593-4818-976a-d73fe588580b', uuid: '4e3c6e09-0593-4818-976a-d73fe588580b',
url: 'https://yun.duiba.com.cn/spark/assets/25b18893820ee0b6998c527c41a8b58ee516ac31.png' url: 'https://yun.duiba.com.cn/spark/assets/25b18893820ee0b6998c527c41a8b58ee516ac31.png'
} },
'930f0483-03d4-4a5f-902f-8106bc86ceaa': {
name: 'guideBg1',
ext: '.png',
url: 'https://yun.duiba.com.cn/spark/assets/guideBg1.c5e259a926d486cd1236e224c35c492deb1b9b63.png',
uuid: '930f0483-03d4-4a5f-902f-8106bc86ceaa'
}
} }
/* harmony default export */ __webpack_exports__["default"] = (resloadingList); /* harmony default export */ __webpack_exports__["default"] = (resloadingList);
...@@ -2207,7 +2213,7 @@ var Ins = (function () { ...@@ -2207,7 +2213,7 @@ var Ins = (function () {
label.text = data.text ? data.text : ""; label.text = data.text ? data.text : "";
return label; return label;
}; };
Ins.recoverEnergy = 5 * 60 * 1000; Ins.recoverEnergy = 3 * 60 * 1000;
return Ins; return Ins;
}()); }());
exports.Ins = Ins; exports.Ins = Ins;
...@@ -46807,7 +46813,7 @@ var LoadingScene = (function (_super) { ...@@ -46807,7 +46813,7 @@ var LoadingScene = (function (_super) {
var that = this; var that = this;
that.x = (Ins_1.Ins.stageW - 750) >> 1; that.x = (Ins_1.Ins.stageW - 750) >> 1;
that.y = (Ins_1.Ins.stageH - 1624) >> 1; that.y = (Ins_1.Ins.stageH - 1624) >> 1;
that.bg = new FYGE.Sprite(RES_1.RES.getRes(resloadingList_1.default["42084cc4-390d-4eee-8392-fbbe2e59455e"].url)); that.bg = new FYGE.Sprite(RES_1.RES.getRes(resloadingList_1.default["930f0483-03d4-4a5f-902f-8106bc86ceaa"].url));
that.addChild(that.bg); that.addChild(that.bg);
that.cat = new FYGE.Sprite(RES_1.RES.getRes(resloadingList_1.default["4e3c6e09-0593-4818-976a-d73fe588580b"].url)); that.cat = new FYGE.Sprite(RES_1.RES.getRes(resloadingList_1.default["4e3c6e09-0593-4818-976a-d73fe588580b"].url));
that.addChild(that.cat); that.addChild(that.cat);
...@@ -46947,8 +46953,6 @@ var MainScene = (function (_super) { ...@@ -46947,8 +46953,6 @@ 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;
...@@ -47041,10 +47045,10 @@ var MainScene = (function (_super) { ...@@ -47041,10 +47045,10 @@ var MainScene = (function (_super) {
that.energyGroup.addChild(that.energyDeco); that.energyGroup.addChild(that.energyDeco);
that.energyDialog = Ins_1.Ins.initSprite("69009eb9-4593-4a43-a9d7-a6356ebd6d04", 174, -60); that.energyDialog = Ins_1.Ins.initSprite("69009eb9-4593-4a43-a9d7-a6356ebd6d04", 174, -60);
that.energyGroup.addChild(that.energyDialog); that.energyGroup.addChild(that.energyDialog);
that.energyDialogLabel = Ins_1.Ins.initLabel({ size: 26, text: "每5分钟恢复10点精力" }); that.energyDialogLabel = Ins_1.Ins.initLabel({ size: 26, text: "每3分钟恢复1点精力" });
that.energyDialog.addChild(that.energyDialogLabel); that.energyDialog.addChild(that.energyDialogLabel);
that.energyDialogLabel.x = (that.energyDialog.width - that.energyDialogLabel.textWidth) * 0.5; that.energyDialogLabel.x = (that.energyDialog.width - that.energyDialogLabel.textWidth) * 0.5;
that.energyDialogLabel.y = (that.energyDialog.height - that.energyDialogLabel.textHeight) * 0.5 - 2; that.energyDialogLabel.y = (that.energyDialog.height - that.energyDialogLabel.textHeight) * 0.5 - 6;
that.energyLabel = Ins_1.Ins.initLabel({ size: 26, y: 85 }); that.energyLabel = Ins_1.Ins.initLabel({ size: 26, y: 85 });
that.energyGroup.addChild(that.energyLabel); that.energyGroup.addChild(that.energyLabel);
var mask = new FYGE.Shape(); var mask = new FYGE.Shape();
...@@ -47361,11 +47365,10 @@ var StartScene = (function (_super) { ...@@ -47361,11 +47365,10 @@ var StartScene = (function (_super) {
else { else {
Ins_1.Ins.catIsOut = false; Ins_1.Ins.catIsOut = false;
} }
ctrls_1.changeScene(MainScene_1.MainScene);
Ins_1.Ins.hideLoading(); Ins_1.Ins.hideLoading();
ctrls_1.changeScene(MainScene_1.MainScene);
} }
else { else {
Ins_1.Ins.hideLoading();
Ins_1.Ins.showToast(r.message); Ins_1.Ins.showToast(r.message);
} }
}); });
...@@ -47597,11 +47600,6 @@ var MainSceneBtnUi = (function (_super) { ...@@ -47597,11 +47600,6 @@ var MainSceneBtnUi = (function (_super) {
MainSceneBtnUi.prototype.updateUserInfo = function () { MainSceneBtnUi.prototype.updateUserInfo = function () {
var that = this; var that = this;
var _a = Ins_1.Ins.userInfo, catName = _a.catName, happyCoin = _a.happyCoin, level = _a.level, avatar = _a.avatar, experience = _a.experience, experienceMax = _a.experienceMax; var _a = Ins_1.Ins.userInfo, catName = _a.catName, happyCoin = _a.happyCoin, level = _a.level, avatar = _a.avatar, experience = _a.experience, experienceMax = _a.experienceMax;
var type = avatar.substring(avatar.lastIndexOf(".") + 1, avatar.length);
var avatar1 = avatar;
if (type != 'png' && type != 'jpg') {
avatar1 = avatar + '.jpg';
}
that.catAvatar.texture = FYGE.Texture.fromUrl(avatar); that.catAvatar.texture = FYGE.Texture.fromUrl(avatar);
that.catAvatar.width = 52; that.catAvatar.width = 52;
that.catAvatar.height = 52; that.catAvatar.height = 52;
...@@ -34,6 +34,12 @@ const resloadingList = { ...@@ -34,6 +34,12 @@ const resloadingList = {
ext: '.png', ext: '.png',
uuid: '4e3c6e09-0593-4818-976a-d73fe588580b', uuid: '4e3c6e09-0593-4818-976a-d73fe588580b',
url: 'https://yun.duiba.com.cn/spark/assets/25b18893820ee0b6998c527c41a8b58ee516ac31.png' url: 'https://yun.duiba.com.cn/spark/assets/25b18893820ee0b6998c527c41a8b58ee516ac31.png'
} },
'930f0483-03d4-4a5f-902f-8106bc86ceaa': {
name: 'guideBg1',
ext: '.png',
url: 'https://yun.duiba.com.cn/spark/assets/guideBg1.c5e259a926d486cd1236e224c35c492deb1b9b63.png',
uuid: '930f0483-03d4-4a5f-902f-8106bc86ceaa'
}
} }
export default resloadingList; export default resloadingList;
\ No newline at end of file
...@@ -25,7 +25,7 @@ export class LoadingScene extends Scene{ ...@@ -25,7 +25,7 @@ export class LoadingScene extends Scene{
that.x = (Ins.stageW - 750)>>1; that.x = (Ins.stageW - 750)>>1;
that.y = (Ins.stageH - 1624)>>1; that.y = (Ins.stageH - 1624)>>1;
that.bg = new FYGE.Sprite(RES.getRes(resloadingList["42084cc4-390d-4eee-8392-fbbe2e59455e"].url)); that.bg = new FYGE.Sprite(RES.getRes(resloadingList["930f0483-03d4-4a5f-902f-8106bc86ceaa"].url));
that.addChild(that.bg); that.addChild(that.bg);
that.cat = new FYGE.Sprite(RES.getRes(resloadingList["4e3c6e09-0593-4818-976a-d73fe588580b"].url)); that.cat = new FYGE.Sprite(RES.getRes(resloadingList["4e3c6e09-0593-4818-976a-d73fe588580b"].url));
......
...@@ -2071,7 +2071,13 @@ const resloadingList = { ...@@ -2071,7 +2071,13 @@ const resloadingList = {
ext: '.png', ext: '.png',
uuid: '4e3c6e09-0593-4818-976a-d73fe588580b', uuid: '4e3c6e09-0593-4818-976a-d73fe588580b',
url: 'https://yun.duiba.com.cn/spark/assets/25b18893820ee0b6998c527c41a8b58ee516ac31.png' url: 'https://yun.duiba.com.cn/spark/assets/25b18893820ee0b6998c527c41a8b58ee516ac31.png'
} },
'930f0483-03d4-4a5f-902f-8106bc86ceaa': {
name: 'guideBg1',
ext: '.png',
url: 'https://yun.duiba.com.cn/spark/assets/guideBg1.c5e259a926d486cd1236e224c35c492deb1b9b63.png',
uuid: '930f0483-03d4-4a5f-902f-8106bc86ceaa'
}
} }
/* harmony default export */ __webpack_exports__["default"] = (resloadingList); /* harmony default export */ __webpack_exports__["default"] = (resloadingList);
...@@ -46807,7 +46813,7 @@ var LoadingScene = (function (_super) { ...@@ -46807,7 +46813,7 @@ var LoadingScene = (function (_super) {
var that = this; var that = this;
that.x = (Ins_1.Ins.stageW - 750) >> 1; that.x = (Ins_1.Ins.stageW - 750) >> 1;
that.y = (Ins_1.Ins.stageH - 1624) >> 1; that.y = (Ins_1.Ins.stageH - 1624) >> 1;
that.bg = new FYGE.Sprite(RES_1.RES.getRes(resloadingList_1.default["42084cc4-390d-4eee-8392-fbbe2e59455e"].url)); that.bg = new FYGE.Sprite(RES_1.RES.getRes(resloadingList_1.default["930f0483-03d4-4a5f-902f-8106bc86ceaa"].url));
that.addChild(that.bg); that.addChild(that.bg);
that.cat = new FYGE.Sprite(RES_1.RES.getRes(resloadingList_1.default["4e3c6e09-0593-4818-976a-d73fe588580b"].url)); that.cat = new FYGE.Sprite(RES_1.RES.getRes(resloadingList_1.default["4e3c6e09-0593-4818-976a-d73fe588580b"].url));
that.addChild(that.cat); that.addChild(that.cat);
...@@ -46947,8 +46953,6 @@ var MainScene = (function (_super) { ...@@ -46947,8 +46953,6 @@ 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;
...@@ -47365,7 +47369,6 @@ var StartScene = (function (_super) { ...@@ -47365,7 +47369,6 @@ var StartScene = (function (_super) {
ctrls_1.changeScene(MainScene_1.MainScene); ctrls_1.changeScene(MainScene_1.MainScene);
} }
else { else {
Ins_1.Ins.hideLoading();
Ins_1.Ins.showToast(r.message); Ins_1.Ins.showToast(r.message);
} }
}); });
...@@ -47597,11 +47600,6 @@ var MainSceneBtnUi = (function (_super) { ...@@ -47597,11 +47600,6 @@ var MainSceneBtnUi = (function (_super) {
MainSceneBtnUi.prototype.updateUserInfo = function () { MainSceneBtnUi.prototype.updateUserInfo = function () {
var that = this; var that = this;
var _a = Ins_1.Ins.userInfo, catName = _a.catName, happyCoin = _a.happyCoin, level = _a.level, avatar = _a.avatar, experience = _a.experience, experienceMax = _a.experienceMax; var _a = Ins_1.Ins.userInfo, catName = _a.catName, happyCoin = _a.happyCoin, level = _a.level, avatar = _a.avatar, experience = _a.experience, experienceMax = _a.experienceMax;
var type = avatar.substring(avatar.lastIndexOf(".") + 1, avatar.length);
var avatar1 = avatar;
if (type != 'png' && type != 'jpg') {
avatar1 = avatar + '.jpg';
}
that.catAvatar.texture = FYGE.Texture.fromUrl(avatar); that.catAvatar.texture = FYGE.Texture.fromUrl(avatar);
that.catAvatar.width = 52; that.catAvatar.width = 52;
that.catAvatar.height = 52; that.catAvatar.height = 52;
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